Explorar el Código

Different way of trapping ipv6 address error

Bob Mottram hace 7 años
padre
commit
6e15f791d8
Se han modificado 2 ficheros con 3 adiciones y 4 borrados
  1. 1
    3
      src/freedombone-controlpanel
  2. 2
    1
      src/freedombone-utils-network

+ 1
- 3
src/freedombone-controlpanel Ver fichero

@@ -522,9 +522,7 @@ function show_ip_addresses {
522 522
     echo -n "IPv4: $(get_ipv4_address)/$(get_external_ipv4_address)"
523 523
     ipv6_address="$(get_ipv6_address)"
524 524
     if [ ${#ipv6_address} -gt 0 ]; then
525
-        if [[ "$ipv6_address" != *'unreachable'* ]]; then
526
-            echo "    IPv6: ${ipv6_address}"
527
-        fi
525
+        echo "    IPv6: ${ipv6_address}"
528 526
     fi
529 527
     echo ''
530 528
     echo ''

+ 2
- 1
src/freedombone-utils-network Ver fichero

@@ -81,7 +81,8 @@ function get_ipv4_address {
81 81
 }
82 82
 
83 83
 function get_ipv6_address {
84
-    echo $(ip -6 route get $IPV6_ADDRESS_TEST_DESTINATION | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
84
+    retval=$(ip -6 route get $IPV6_ADDRESS_TEST_DESTINATION 2> /dev/null)
85
+    echo $(echo "$retval" | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
85 86
 }
86 87
 
87 88
 # NOTE: deliberately no exit 0