From 4d638c3744e2215b4ea147be8792f8556c131958 Mon Sep 17 00:00:00 2001
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Date: Wed, 17 Oct 2018 18:19:36 +0200
Subject: [PATCH] gwinfo: Fix IPv4/IPv6 sed (leading space in match pattern,
 v1.4.6)

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 gwinfo/gwinfofirmware.sh | 9 ++++++---
 gwinfo/sendgwinfo.sh     | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/gwinfo/gwinfofirmware.sh b/gwinfo/gwinfofirmware.sh
index 20a0e4a..b9ec82a 100755
--- a/gwinfo/gwinfofirmware.sh
+++ b/gwinfo/gwinfofirmware.sh
@@ -6,6 +6,9 @@
 #
 # designed for GATEWAY FIRMWARE
 #
+# v1.4.6 - 2018-10-17
+# - Fix IPv4/IPv6 sed (leading space in match pattern)
+#
 # v1.4.3 - 2018-08-28
 # - Added version to json
 # - GW-Firmware: Only append IPv4/IPv6/DHCP to bat0
@@ -49,7 +52,7 @@ statslink="$(uci -q get gateway.@gateway[0].statslink)"
 
 # Code
 tmp=$(/bin/mktemp)
-echo "{\"version\":\"1.4\",\"hostname\":\"$hostname\",\"stats_page\":\"$statslink\",\"netifs\":[" > $tmp
+echo "{\"version\":\"1.4.6\",\"hostname\":\"$hostname\",\"stats_page\":\"$statslink\",\"netifs\":[" > $tmp
 
 comma=""
 for netif in $(ls /sys/class/net); do
@@ -64,8 +67,8 @@ for netif in $(ls /sys/class/net); do
 	dhcpstart=""
 	dhcpend=""
 	if [ "$netif" = "bat0" ]; then
-		ipv4="$(ip -4 addr show dev br-mesh | grep " 10\." | sed 's/.*\(10\.[^ ]*\/[^ ]*\) .*/\1/')"
-		ipv6="$(ip -6 addr show dev br-mesh | grep " fd43" | grep '::' | sed 's/.*\(fd43[^ ]*\) .*/\1/')"
+		ipv4="$(ip -4 addr show dev br-mesh | grep " 10\." | sed 's/.* \(10\.[^ ]*\/[^ ]*\) .*/\1/')"
+		ipv6="$(ip -6 addr show dev br-mesh | grep " fd43" | grep '::' | sed 's/.* \(fd43[^ ]*\) .*/\1/')"
 		[ "$(echo "$ipv6" | wc -l)" = "1" ] || ipv6=""
 		dhcpstart="$(uci -q get dhcp.mesh.start)"
 	fi
diff --git a/gwinfo/sendgwinfo.sh b/gwinfo/sendgwinfo.sh
index 406ff35..a5096fa 100755
--- a/gwinfo/sendgwinfo.sh
+++ b/gwinfo/sendgwinfo.sh
@@ -6,6 +6,9 @@
 #
 # designed for GATEWAY SERVER
 #
+# v1.4.6 - 2018-10-17
+# - Fix IPv4/IPv6 sed (leading space in match pattern)
+#
 # v1.4.5 - 2018-08-29
 # - Fix one bug regarding DHCP range processing
 #
@@ -54,7 +57,7 @@ dhcp=1 # 0=disabled, 1=dnsmasq, 2=isc-dhcp-server
 
 # Code
 tmp=$(/bin/mktemp)
-echo "{\"version\":\"1.4\",\"hostname\":\"$hostname\",\"stats_page\":\"$statslink\",\"netifs\":[" > $tmp
+echo "{\"version\":\"1.4.6\",\"hostname\":\"$hostname\",\"stats_page\":\"$statslink\",\"netifs\":[" > $tmp
 
 comma=""
 for netif in $(ls /sys/class/net); do
@@ -64,8 +67,8 @@ for netif in $(ls /sys/class/net); do
 	mac="$(cat "/sys/class/net/$netif/address")"
 	batctl="$("$batctlpath" -m "$netif" if | grep "fff" | sed -n 's/:.*//p')"
 
-	ipv4="$(ip -4 addr show dev "$netif" | grep " 10\." | sed 's/.*\(10\.[^ ]*\/[^ ]*\) .*/\1/')"
-	ipv6="$(ip -6 addr show dev "$netif" | grep " fd43" | sed 's/.*\(fd43[^ ]*\) .*/\1/')"
+	ipv4="$(ip -4 addr show dev "$netif" | grep " 10\." | sed 's/.* \(10\.[^ ]*\/[^ ]*\) .*/\1/')"
+	ipv6="$(ip -6 addr show dev "$netif" | grep " fd43" | sed 's/.* \(fd43[^ ]*\) .*/\1/')"
 	[ "$(echo "$ipv6" | wc -l)" = "1" ] || ipv6=""
 
 	dhcpstart=""