diff --git a/src/freedombone-app-pihole b/src/freedombone-app-pihole index daf57aa3497fbad9ac88d4bf00309461607e25fe..e7382faaff27af7363cbe68f6f7275fc4b95610b 100755 --- a/src/freedombone-app-pihole +++ b/src/freedombone-app-pihole @@ -66,9 +66,8 @@ function pihole_update { return fi - IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}') - IPv4_address=$(ip -o -f inet addr show dev "$IPv4dev" | awk '{print $4}' | awk 'END {print}') - IPv6_address=$(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }') + IPv4_address=$(get_ipv4_address) + IPv6_address=$(get_ipv6_address) setupVars=$piholeDir/setupVars.conf echo "piholeInterface=${PIHOLE_IFACE}" > ${setupVars} diff --git a/src/freedombone-controlpanel b/src/freedombone-controlpanel index 2764de018d64be27ff910902ad9e11a62f7eebe3..acf0fd74a616ede4642c187de636385d6fea270a 100755 --- a/src/freedombone-controlpanel +++ b/src/freedombone-controlpanel @@ -371,8 +371,17 @@ function show_tahoe_introducer { echo '' } +function show_ip_addresses { + echo 'IP/DNS addresses' + echo '================' + echo '' + echo "IPv4: $(get_ipv4_address) IPv6: $(get_ipv6_address)" + echo '' +} + function show_about { clear + show_ip_addresses show_domains show_mirrors_password show_tahoe_introducer diff --git a/src/freedombone-utils-network b/src/freedombone-utils-network index 60ee896d658c2c8a34ef5755e8c66c125f55b2b1..5282ce83dbf0bfe092819999a531ff31be6cefac 100755 --- a/src/freedombone-utils-network +++ b/src/freedombone-utils-network @@ -87,4 +87,13 @@ function install_static_network { mark_completed $FUNCNAME } +function get_ipv4_address { + IPv4dev=$(ip route get 8.8.8.8 | awk '{for(i=1;i<=NF;i++)if($i~/dev/)print $(i+1)}') + echo $(ip -o -f inet addr show dev "$IPv4dev" | awk '{print $4}' | awk 'END {print}') +} + +function get_ipv6_address { + echo $(ip -6 route get 2001:4860:4860::8888 | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "src") print $(i+1) }') +} + # NOTE: deliberately no exit 0