From 2a7d58413d5b2d81e8a658ae5f04a0ccfb9127ab Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sat, 25 Aug 2018 21:30:05 +0200 Subject: [PATCH] gwinfo: Fix greps for IPv4/IPv6/dnsmasq (v1.4.1) Signed-off-by: Adrian Schmutzler --- gwinfo/sendgwinfo.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/gwinfo/sendgwinfo.sh b/gwinfo/sendgwinfo.sh index ba4d32b..842fe32 100755 --- a/gwinfo/sendgwinfo.sh +++ b/gwinfo/sendgwinfo.sh @@ -4,6 +4,9 @@ # Copyright Adrian Schmutzler, 2018. # License GPLv3 # +# v1.4.1 - 2018-08-25 +# - Fixed greps for IPv4/IPv6/dnsmasq +# # v1.4 - 2018-08-23 # - Transmit internal IPv4/IPv6 # - Transmit DHCP range for dnsmasq @@ -45,11 +48,11 @@ 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/')" if [ "$dhcp" = "1" ]; then - dhcpdata="$(ps ax | grep "dnsmasq" | grep "$netif" | sed 's/.*dhcp-range=\([^ ]*\) .*/\1/')" + dhcpdata="$(ps ax | grep "dnsmasq" | grep "$netif " | sed 's/.*dhcp-range=\([^ ]*\) .*/\1/')" dhcpstart="$(echo "$dhcpdata" | cut -d',' -f1)" dhcpend="$(echo "$dhcpdata" | cut -d',' -f2)" #elif [ "$dhcp" = "2" ]; then