New version of iodine-client-start (1.0.6)

pulled from upstream git repository (30ca6fa6).

Adds -oneline to ip(1) calls as a workaround for its changed output.

Thanks: Axel Beckert for the bug report and Barak A. Pearlmutter for the quick fix.
Closes: #898672

diff --git a/debian/iodine-client-start b/debian/iodine-client-start
index 9b7cabf119f47c31f793a6f5e7cb0219c3a6c2a8..3b7e0da1620f6a648870eecd1a829c2d063e9fac 100755 (executable)
--- a/debian/iodine-client-start
+++ b/debian/iodine-client-start
@@ -116,7 +116,7 @@ EOF
 
 function version
 {
-    echo iodine-client-start 1.0.5
+    echo iodine-client-start 1.0.6
 }
 
 case $# in
@@ -272,16 +272,16 @@ fi
 
 ## Fetch some information about the local network
 
-addr=$(ip -4 addr show dev ${interface} scope global \
-    | tail -1 | awk '{print $2}')
+addr=$(ip -oneline -4 addr show dev ${interface} scope global \
+    | awk '{print $4}' | head -1)
 prefix_len=$(echo ${addr} | sed 'sX^.*/XX')
 local_net=$(ipcalc --nobinary ${addr} | awk '$1=="Network:" {print $2}')
 
 echo ==== Local address: ${addr}
 echo ==== Local network: ${local_net}
 
-router=$(ip -4 route list dev ${interface} \
-    | awk '$1=="default" {print $3}' | head -1)
+router=$(ip -oneline -4 route list dev ${interface} default \
+    | awk '{print $3}' | head -1)
 if [ -z ${router} ]; then
     ## This can happen when the default local route is already deleted
     if [ -z ${default_router} ]; then
@@ -366,8 +366,8 @@ fi
 ## (There should be some way to get this information out of iodine, since
 ## it *prints* it as it sets up the tunnel, so it does know it.)
 
-tunnel_remote=$(ip -4 address show dev ${tunnel_interface} \
-    | gawk '$1=="inet" {print gensub("[.][0-9]*/.*", ".1", 1, $2)}' | head -1)
+tunnel_remote=$(ip -oneline -4 address show dev ${tunnel_interface} \
+    | gawk '$3=="inet" {print gensub("[.][0-9]*/.*", ".1", 1, $4)}' | head -1)
 
 if [ -z ${tunnel_remote} ]; then
     echo ERROR: Cannot find DNS tunnel remote endpoint.