diff options
author | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-12-20 19:14:19 +0100 |
---|---|---|
committer | Jason A. Donenfeld <Jason@zx2c4.com> | 2016-12-23 21:09:23 +0100 |
commit | 4f6107f36011f9fe6e3fac04ce0edb62438356a4 (patch) | |
tree | a5a2b6eb6d5960f63f298fc65dfbfe1b480c4b7b | |
parent | routing-table: simplify and mask reparented root (diff) | |
download | wireguard-monolithic-historical-4f6107f36011f9fe6e3fac04ce0edb62438356a4.tar.xz wireguard-monolithic-historical-4f6107f36011f9fe6e3fac04ce0edb62438356a4.zip |
tools: allowed-ips is easier to parse with spaces instead of ", "
-rwxr-xr-x | contrib/examples/wg-config/wg-config | 2 | ||||
-rw-r--r-- | src/tools/show.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/contrib/examples/wg-config/wg-config b/contrib/examples/wg-config/wg-config index f2272b3..d7ea38c 100755 --- a/contrib/examples/wg-config/wg-config +++ b/contrib/examples/wg-config/wg-config @@ -129,7 +129,7 @@ cmd_add() { done up_if if [[ $AUTO_ROUTE -eq 1 ]]; then - for i in $(wg show "$INTERFACE" allowed-ips | grep -Po '(?<=[\t ])[0-9.:/a-z]+(?<=,)?' | sort -nr -k 2 -t /); 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 add_route "$i" fi diff --git a/src/tools/show.c b/src/tools/show.c index 624f789..7c32af9 100644 --- a/src/tools/show.c +++ b/src/tools/show.c @@ -288,7 +288,7 @@ static bool ugly_print(struct wgdevice *device, const char *param, bool with_int printf("%s\t", key(peer->public_key)); if (peer->num_ipmasks) { for_each_wgipmask(peer, ipmask, j) - printf("%s/%u%s", ip(ipmask), ipmask->cidr, j == (size_t)peer->num_ipmasks - 1 ? "\n" : ", "); + printf("%s/%u%c", ip(ipmask), ipmask->cidr, j == (size_t)peer->num_ipmasks - 1 ? '\n' : ' '); } else printf("(none)\n"); } |