浏览代码

Different way of trapping ipv6 address error

Bob Mottram 7 年前
父节点
当前提交
6e15f791d8
共有 2 个文件被更改,包括 3 次插入4 次删除
  1. 1
    3
      src/freedombone-controlpanel
  2. 2
    1
      src/freedombone-utils-network

+ 1
- 3
src/freedombone-controlpanel 查看文件

522
     echo -n "IPv4: $(get_ipv4_address)/$(get_external_ipv4_address)"
522
     echo -n "IPv4: $(get_ipv4_address)/$(get_external_ipv4_address)"
523
     ipv6_address="$(get_ipv6_address)"
523
     ipv6_address="$(get_ipv6_address)"
524
     if [ ${#ipv6_address} -gt 0 ]; then
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
     fi
526
     fi
529
     echo ''
527
     echo ''
530
     echo ''
528
     echo ''

+ 2
- 1
src/freedombone-utils-network 查看文件

81
 }
81
 }
82
 
82
 
83
 function get_ipv6_address {
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
 # NOTE: deliberately no exit 0
88
 # NOTE: deliberately no exit 0