From 4f6107f36011f9fe6e3fac04ce0edb62438356a4 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 20 Dec 2016 19:14:19 +0100 Subject: tools: allowed-ips is easier to parse with spaces instead of ", " --- contrib/examples/wg-config/wg-config | 2 +- 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"); } -- cgit v1.2.3-59-g8ed1b