Преглед на файлове

Show IP addresses on control panel about screen

Bob Mottram преди 8 години
родител
ревизия
e2a6600128
променени са 3 файла, в които са добавени 20 реда и са изтрити 3 реда
  1. 2
    3
      src/freedombone-app-pihole
  2. 9
    0
      src/freedombone-controlpanel
  3. 9
    0
      src/freedombone-utils-network

+ 2
- 3
src/freedombone-app-pihole Целия файл

66
         return
66
         return
67
     fi
67
     fi
68
 
68
 
69
-    IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
70
-    IPv4_address=$(ip -o -f inet addr show dev "$IPv4dev" | awk '{print $4}' | awk 'END {print}')
71
-    IPv6_address=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
69
+    IPv4_address=$(get_ipv4_address)
70
+    IPv6_address=$(get_ipv6_address)
72
 
71
 
73
     setupVars=$piholeDir/setupVars.conf
72
     setupVars=$piholeDir/setupVars.conf
74
     echo "piholeInterface=${PIHOLE_IFACE}" > ${setupVars}
73
     echo "piholeInterface=${PIHOLE_IFACE}" > ${setupVars}

+ 9
- 0
src/freedombone-controlpanel Целия файл

371
     echo ''
371
     echo ''
372
 }
372
 }
373
 
373
 
374
+function show_ip_addresses {
375
+    echo 'IP/DNS addresses'
376
+    echo '================'
377
+    echo ''
378
+    echo "IPv4: $(get_ipv4_address)    IPv6: $(get_ipv6_address)"
379
+    echo ''
380
+}
381
+
374
 function show_about {
382
 function show_about {
375
     clear
383
     clear
384
+    show_ip_addresses
376
     show_domains
385
     show_domains
377
     show_mirrors_password
386
     show_mirrors_password
378
     show_tahoe_introducer
387
     show_tahoe_introducer

+ 9
- 0
src/freedombone-utils-network Целия файл

87
     mark_completed $FUNCNAME
87
     mark_completed $FUNCNAME
88
 }
88
 }
89
 
89
 
90
+function get_ipv4_address {
91
+    IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}')
92
+    echo $(ip -o -f inet addr show dev "$IPv4dev" | awk '{print $4}' | awk 'END {print}')
93
+}
94
+
95
+function get_ipv6_address {
96
+    echo $(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }')
97
+}
98
+
90
 # NOTE: deliberately no exit 0
99
 # NOTE: deliberately no exit 0