snow/wireguard-tools
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

wg-config: cleanup ip parsing

Browse source 
This also sorts routes by cidr.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2016-12-20 04:08:41 +01:00
parent 187bf98339
commit 50e1f58fde
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
contrib/wg-config/wg-config
View file

@ -45,7 +45,7 @@ add_default() {
echo "tungate: does not yet support IPv6, skipping ::/0" >&2 echo "tungate: does not yet support IPv6, skipping ::/0" >&2
return 0 return 0
elif [[ $1 == 0.0.0.0/0 ]]; then elif [[ $1 == 0.0.0.0/0 ]]; then
local endpoint="$(wg show "$INTERFACE" endpoints | grep "^$(wg show "$INTERFACE" allowed-ips | grep 0.0.0.0/0 | head -n 1 | cut -f 1)" | cut -f 2 | cut -d : -f 1)" local endpoint="$(join <(wg show "$INTERFACE" allowed-ips) <(wg show "$INTERFACE" endpoints) | sed -n 's/.* 0\.0\.0\.0\/0.* \([0-9.:\/a-z]\+\):[0-9]\+$/\1/p')"
add_route 0/1 add_route 0/1
add_route 128/1 add_route 128/1
killall tungate 2>/dev/null || true killall tungate 2>/dev/null || true
@ -129,7 +129,7 @@ cmd_add() {
done done
up_if up_if
if [[ $AUTO_ROUTE -eq 1 ]]; then if [[ $AUTO_ROUTE -eq 1 ]]; then
for i in $(wg show "$INTERFACE" allowed-ips | cut -f 2 | tr -d ,); do for i in $(wg show "$INTERFACE" allowed-ips | grep -Po '(?<=[\t ])[0-9.:/a-z]+(?<=,)?' | sort -nr -k 2 -t /); do
if ! add_default "$i" && [[ $(ip route get "$i") != *dev\ $INTERFACE\ * ]]; then if ! add_default "$i" && [[ $(ip route get "$i") != *dev\ $INTERFACE\ * ]]; then
add_route "$i" add_route "$i"
fi fi