diff options
| author |   Jason A. Donenfeld <Jason@zx2c4.com> | 2017-03-23 15:44:10 +0100 |
|---|---|---|
| committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2017-03-24 04:44:27 +0100 |
| commit | 1f5bfb8085b96531d4dffe845cb935996fc42236 (patch) | |
| tree | 859b4cbec751a9162347ded190a426ef0d1250de /src/tools | |
| parent | socket: avoid deadlock on port retry (diff) | |
| download | wireguard-monolithic-historical-1f5bfb8085b96531d4dffe845cb935996fc42236.tar.xz wireguard-monolithic-historical-1f5bfb8085b96531d4dffe845cb935996fc42236.zip | |
wg-quick: various cleanups
Diffstat (limited to 'src/tools')
| -rwxr-xr-x | src/tools/wg-quick.bash | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tools/wg-quick.bash b/src/tools/wg-quick.bash index 73cfa25..257ea7d 100755 --- a/src/tools/wg-quick.bash +++ b/src/tools/wg-quick.bash @@ -79,9 +79,10 @@ add_if() { } del_if() { - local fwmark="$(wg show "$INTERFACE" fwmark)" + local fwmark + fwmark="$(wg show "$INTERFACE" fwmark)" DEFAULT_TABLE=0 - [[ $fwmark != off ]] && DEFAULT_TABLE=$(( $fwmark )) + [[ $fwmark != off ]] && DEFAULT_TABLE=$(( fwmark )) if [[ $DEFAULT_TABLE -ne 0 ]]; then while [[ $(ip -4 rule show) == *"lookup $DEFAULT_TABLE"* ]]; do cmd ip -4 rule delete table $DEFAULT_TABLE @@ -127,8 +128,8 @@ add_default() { cmd ip $proto route add "$1" dev "$INTERFACE" table $DEFAULT_TABLE cmd ip $proto rule add not fwmark $DEFAULT_TABLE table $DEFAULT_TABLE cmd ip $proto rule add table main suppress_prefixlength 0 - local key equals value - while read -r key equals value; do + local key value + while read -r key _ value; do [[ $value -eq 1 ]] && sysctl -q "$key=2" done < <(sysctl -a -r 'net\.ipv4.conf\..+\.rp_filter') return 0 @@ -153,7 +154,7 @@ save_config() { old_umask="$(umask)" umask 077 current_config="$(cmd wg showconf "$INTERFACE")" - trap "rm -f '$CONFIG_FILE.tmp; exit'" INT TERM EXIT + trap 'rm -f "$CONFIG_FILE.tmp"; exit' INT TERM EXIT echo "${current_config/\[Interface\]$'\n'/$new_config}" > "$CONFIG_FILE.tmp" || die "Could not write configuration file" mv "$CONFIG_FILE.tmp" "$CONFIG_FILE" || die "Could not move configuration file" trap - INT TERM EXIT |