diff --git a/advanced/Scripts/chronometer.sh b/advanced/Scripts/chronometer.sh
index 4f9ea59a..3f85bdfc 100755
--- a/advanced/Scripts/chronometer.sh
+++ b/advanced/Scripts/chronometer.sh
@@ -498,10 +498,6 @@ chronoFunc() {
printFunc " RAM usage: " "$ram_perc%" "$ram_info"
printFunc " HDD usage: " "$disk_perc" "$disk_info"
- if [[ "$scr_lines" -gt 17 ]] && [[ "$chrono_width" != "small" ]]; then
- printFunc " LAN addr: " "${IPV4_ADDRESS/\/*/}" "$lan_info"
- fi
-
if [[ "$DHCP_ACTIVE" == "true" ]]; then
printFunc "DHCP usage: " "$ph_dhcp_percent%" "$dhcp_info"
fi
diff --git a/advanced/Scripts/piholeDebug.sh b/advanced/Scripts/piholeDebug.sh
index 13a886f1..c6294e6e 100755
--- a/advanced/Scripts/piholeDebug.sh
+++ b/advanced/Scripts/piholeDebug.sh
@@ -859,7 +859,6 @@ dig_at() {
# Store the arguments as variables with names
local protocol="${1}"
- local IP="${2}"
echo_current_diagnostic "Name resolution (IPv${protocol}) using a random blocked domain and a known ad-serving domain"
# Set more local variables
# We need to test name resolution locally, via Pi-hole, and via a public resolver
@@ -874,15 +873,15 @@ dig_at() {
if [[ ${protocol} == "6" ]]; then
# Set the IPv6 variables and record type
local local_address="::1"
- local pihole_address="${IP}"
local remote_address="2001:4860:4860::8888"
+ local sed_selector="inet6"
local record_type="AAAA"
# Otherwise, it should be 4
else
# so use the IPv4 values
local local_address="127.0.0.1"
- local pihole_address="${IP}"
local remote_address="8.8.8.8"
+ local sed_selector="inet"
local record_type="A"
fi
@@ -895,25 +894,53 @@ dig_at() {
# First, do a dig on localhost to see if Pi-hole can use itself to block a domain
if local_dig=$(dig +tries=1 +time=2 -"${protocol}" "${random_url}" @${local_address} +short "${record_type}"); then
# If it can, show success
- log_write "${TICK} ${random_url} ${COL_GREEN}is ${local_dig}${COL_NC} via ${COL_CYAN}localhost$COL_NC (${local_address})"
+ log_write "${TICK} ${random_url} ${COL_GREEN}is ${local_dig}${COL_NC} via ${COL_CYAN}localhost$COL_NC at ${COL_CYAN}${local_address}${CON_NC}"
else
# Otherwise, show a failure
- log_write "${CROSS} ${COL_RED}Failed to resolve${COL_NC} ${random_url} via ${COL_RED}localhost${COL_NC} (${local_address})"
+ log_write "${CROSS} ${COL_RED}Failed to resolve${COL_NC} ${random_url} via ${COL_RED}localhost${COL_NC} at ${COL_CYAN}${local_address}${CON_NC}"
fi
# Next we need to check if Pi-hole can resolve a domain when the query is sent to it's IP address
# This better emulates how clients will interact with Pi-hole as opposed to above where Pi-hole is
# just asing itself locally
- # The default timeouts and tries are reduced in case the DNS server isn't working, so the user isn't waiting for too long
+ # The default timeouts and tries are reduced in case the DNS server isn't working, so the user isn't
+ # waiting for too long
+ #
+ # Turn off history expansion such that the "!" in the sed command cannot do silly things
+ set +H
+ # Get interfaces
+ # sed logic breakdown:
+ # / master /d;
+ # Removes all interfaces that are slaves of others (e.g. virtual docker interfaces)
+ # /UP/!d;
+ # Removes all interfaces which are not UP
+ # s/^[0-9]*: //g;
+ # Removes interface index
+ # s/: <.*//g;
+ # Removes everything after the interface name
+ local interfaces="$(ip link show | sed "/ master /d;/UP/!d;s/^[0-9]*: //g;s/: <.*//g;")"
- # If Pi-hole can dig itself from it's IP (not the loopback address)
- if pihole_dig=$(dig +tries=1 +time=2 -"${protocol}" "${random_url}" @"${pihole_address}" +short "${record_type}"); then
- # show a success
- log_write "${TICK} ${random_url} ${COL_GREEN}is ${pihole_dig}${COL_NC} via ${COL_CYAN}Pi-hole${COL_NC} (${pihole_address})"
- else
- # Otherwise, show a failure
- log_write "${CROSS} ${COL_RED}Failed to resolve${COL_NC} ${random_url} via ${COL_RED}Pi-hole${COL_NC} (${pihole_address})"
- fi
+ while IFS= read -r iface ; do
+ # Get addresses of current interface
+ # sed logic breakdown:
+ # /inet(|6) /!d;
+ # Removes all lines from ip a that do not contain either "inet " or "inet6 "
+ # s/^.*inet(|6) //g;
+ # Removes all leading whitespace as well as the "inet " or "inet6 " string
+ # s/\/.*$//g;
+ # Removes CIDR and everything thereafter (e.g., scope properties)
+ local addresses="$(ip address show dev "${iface}" | sed "/${sed_selector} /!d;s/^.*${sed_selector} //g;s/\/.*$//g;")"
+ while IFS= read -r local_address ; do
+ # Check if Pi-hole can use itself to block a domain
+ if local_dig=$(dig +tries=1 +time=2 -"${protocol}" "${random_url}" @${local_address} +short "${record_type}"); then
+ # If it can, show success
+ log_write "${TICK} ${random_url} ${COL_GREEN}is ${local_dig}${COL_NC} on ${COL_CYAN}${iface}${COL_NC} (${COL_CYAN}${local_address}${COL_NC})"
+ else
+ # Otherwise, show a failure
+ log_write "${CROSS} ${COL_RED}Failed to resolve${COL_NC} ${random_url} on ${COL_RED}${iface}${COL_NC} (${COL_RED}${local_address}${COL_NC})"
+ fi
+ done <<< "${addresses}"
+ done <<< "${interfaces}"
# Finally, we need to make sure legitimate queries can out to the Internet using an external, public DNS server
# We are using the static remote_url here instead of a random one because we know it works with IPv4 and IPv6
@@ -1046,12 +1073,8 @@ parse_file() {
check_name_resolution() {
# Check name resolution from localhost, Pi-hole's IP, and Google's name severs
# using the function we created earlier
- dig_at 4 "${IPV4_ADDRESS%/*}"
- # If IPv6 enabled,
- if [[ "${IPV6_ADDRESS}" ]]; then
- # check resolution
- dig_at 6 "${IPV6_ADDRESS%/*}"
- fi
+ dig_at 4
+ dig_at 6
}
# This function can check a directory exists