summaryrefslogtreecommitdiffstatshomepage
path: root/src/tools
diff options
context:
space:
mode:
authorJason A. Donenfeld <Jason@zx2c4.com>2017-10-25 21:55:17 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2017-10-31 17:25:23 +0100
commit2352ec0d802c3adf47345520aa5bea2abc37c86c (patch)
tree05e2b668b648036ec91f4b38bdca863d16898466 /src/tools
parentqemu: test using four cores (diff)
downloadwireguard-monolithic-historical-2352ec0d802c3adf47345520aa5bea2abc37c86c.tar.xz
wireguard-monolithic-historical-2352ec0d802c3adf47345520aa5bea2abc37c86c.zip
wg-quick: allow specifiying multiple hooks
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/wg-quick.83
-rwxr-xr-xsrc/tools/wg-quick.bash36
2 files changed, 21 insertions, 18 deletions
diff --git a/src/tools/wg-quick.8 b/src/tools/wg-quick.8
index b39eff8..2839cc9 100644
--- a/src/tools/wg-quick.8
+++ b/src/tools/wg-quick.8
@@ -80,7 +80,8 @@ PreUp, PostUp, PreDown, PostDown \(em script snippets which will be executed by
.BR bash (1)
before/after setting up/tearing down the interface, most commonly used
to configure custom DNS options or firewall rules. The special string `%i'
-is expanded to \fIINTERFACE\fP.
+is expanded to \fIINTERFACE\fP. Each one may be specified multiple times, in which case
+the commands are executed in order.
.IP \(bu
SaveConfig \(em if set to `true', the configuration is saved from the current state of the
interface upon shutdown.
diff --git a/src/tools/wg-quick.bash b/src/tools/wg-quick.bash
index 015df85..def78af 100755
--- a/src/tools/wg-quick.bash
+++ b/src/tools/wg-quick.bash
@@ -15,10 +15,10 @@ INTERFACE=""
ADDRESSES=( )
MTU=""
DNS=( )
-PRE_UP=""
-POST_UP=""
-PRE_DOWN=""
-POST_DOWN=""
+PRE_UP=( )
+POST_UP=( )
+PRE_DOWN=( )
+POST_DOWN=( )
SAVE_CONFIG=0
CONFIG_FILE=""
PROGRAM="${0##*/}"
@@ -43,10 +43,10 @@ parse_options() {
Address) ADDRESSES+=( ${value//,/ } ); continue ;;
MTU) MTU="$value"; continue ;;
DNS) DNS+=( ${value//,/ } ); continue ;;
- PreUp) PRE_UP="$value"; continue ;;
- PreDown) PRE_DOWN="$value"; continue ;;
- PostUp) POST_UP="$value"; continue ;;
- PostDown) POST_DOWN="$value"; continue ;;
+ PreUp) PRE_UP+=( "$value" ); continue ;;
+ PreDown) PRE_DOWN+=( "$value" ); continue ;;
+ PostUp) POST_UP+=( "$value" ); continue ;;
+ PostDown) POST_DOWN+=( "$value" ); continue ;;
SaveConfig) read_bool SAVE_CONFIG "$value"; continue ;;
esac
fi
@@ -197,11 +197,13 @@ save_config() {
umask "$old_umask"
}
-execute_hook() {
- [[ -n $1 ]] || return 0
- local hook="${1//%i/$INTERFACE}"
- echo "[#] $hook" >&2
- (eval "$hook")
+execute_hooks() {
+ local hook
+ for hook in "$@"; do
+ hook="${hook//%i/$INTERFACE}"
+ echo "[#] $hook" >&2
+ (eval "$hook")
+ done
}
cmd_usage() {
@@ -232,7 +234,7 @@ cmd_up() {
local i
[[ -z $(ip link show dev "$INTERFACE" 2>/dev/null) ]] || die "\`$INTERFACE' already exists"
trap 'del_if; exit' INT TERM EXIT
- execute_hook "$PRE_UP"
+ execute_hooks "${PRE_UP[@]}"
add_if
set_config
for i in "${ADDRESSES[@]}"; do
@@ -244,17 +246,17 @@ cmd_up() {
for i in $(while read -r _ i; do for i in $i; do [[ $i =~ ^[0-9a-z:.]+/[0-9]+$ ]] && echo "$i"; done; done < <(wg show "$INTERFACE" allowed-ips) | sort -nr -k 2 -t /); do
[[ $(ip route get "$i" 2>/dev/null) == *dev\ $INTERFACE\ * ]] || add_route "$i"
done
- execute_hook "$POST_UP"
+ execute_hooks "${POST_UP[@]}"
trap - INT TERM EXIT
}
cmd_down() {
[[ " $(wg show interfaces) " == *" $INTERFACE "* ]] || die "\`$INTERFACE' is not a WireGuard interface"
- execute_hook "$PRE_DOWN"
+ execute_hooks "${PRE_DOWN[@]}"
[[ $SAVE_CONFIG -eq 0 ]] || save_config
unset_dns
del_if
- execute_hook "$POST_DOWN"
+ execute_hooks "${POST_DOWN[@]}"
}
if [[ $# -eq 1 && ( $1 == --help || $1 == -h || $1 == help ) ]]; then