Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2024-12-25 06:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Begin fixing IP detection functions.

Browse source
This commit is contained in:
Dan Schaper 2017-02-16 16:49:14 -08:00
parent 95fd9d4863
commit cfed3d59e9
No known key found for this signature in database
GPG key ID: 572E999E385B7BFC
1 changed files with 22 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
advanced/Scripts/piholeDebug.sh
View file

@ -26,7 +26,7 @@ ADLISTFILE="/etc/pihole/adlists.list"
PIHOLELOG="/var/log/pihole.log" PIHOLELOG="/var/log/pihole.log"
WHITELISTMATCHES="/tmp/whitelistmatches.list" WHITELISTMATCHES="/tmp/whitelistmatches.list"
IPV6_READY=false IPV6_READY
TIMEOUT=60 TIMEOUT=60
# Header info and introduction # Header info and introduction
cat << EOM cat << EOM
@ -180,7 +180,7 @@ processor_check() {
ipv6_check() { ipv6_check() {
# Check if system is IPv6 enabled, for use in other functions # Check if system is IPv6 enabled, for use in other functions
if [[ $IPv6_address ]]; then if [[ $IPV6_ADDRESS ]]; then
ls /proc/net/if_inet6 &>/dev/null && IPV6_READY=true ls /proc/net/if_inet6 &>/dev/null && IPV6_READY=true
return 0 return 0
else else
@ -196,21 +196,30 @@ ip_check() {
# Check if IPv6 enabled # Check if IPv6 enabled
local IPv6_interface local IPv6_interface
local IPv4_interface local IPv4_interface
ipv6_check && IPv6_interface=${piholeInterface:-$(ip -6 r | grep default | cut -d ' ' -f 5)} if ipv6_check; then
IPv6_interface=${PIHOLE_INTERFACE:-$(ip -6 r | grep default | cut -d ' ' -f 5)}
echo ${PIHOLE_INTERFACE}
echo ${IPv6_interface}
fi
# If declared in setupVars.conf use it, otherwise defer to default # If declared in setupVars.conf use it, otherwise defer to default
# http://stackoverflow.com/questions/2013547/assigning-default-values-to-shell-variables-with-a-single-command-in-bash # http://stackoverflow.com/questions/2013547/assigning-default-values-to-shell-variables-with-a-single-command-in-bash
IPv4_interface=${piholeInterface:-$(ip r | grep default | cut -d ' ' -f 5)} IPv4_interface=${PIHOLE_INTERFACE:-$(ip r | grep default | cut -d ' ' -f 5)}
if [[ IPV6_READY ]]; then if [[ "$IPV6_READY" = true ]]; then
local IPv6_addr_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet6") print $(i+1) }')" \ local IPv6_addr_list="$(ip a | awk -F ' ' '{ for(i=1;i<=NF;i++) if ($i == "inet6") print $(i+1) }')"
&& (log_write "${IPv6_addr_list}" && echo "::: IPv6 addresses located") \ if [[ -n ${IPv6_addr_list} ]]; then
|| log_echo "No IPv6 addresses found." log_write "${IPv6_addr_list}"
echo "::: IPv6 addresses located"
else
log_echo "No IPv6 addresses found."
return 0
fi
local IPv6_def_gateway=$(ip -6 r | grep default | cut -d ' ' -f 3) local IPv6_def_gateway=$(ip -6 r | grep default | cut -d ' ' -f 3)
if [[ $? = 0 ]] && [[ -n ${IPv6_def_gateway} ]]; then if [[ $? = 0 ]] && [[ -n ${IPv6_def_gateway} ]]; then
echo -n "::: Pinging default IPv6 gateway: " echo -n "::: Pinging default IPv6 gateway: "
local IPv6_def_gateway_check="$(ping6 -q -W 3 -c 3 -n "${IPv6_def_gateway}" -I "${IPv6_interface}"| tail -n3)" \ local IPv6_def_gateway_check="$(ping6 -q -W 3 -c 3 -n ${IPv6_def_gateway} -I ${IPv6_interface} | tail -n3)" \
&& echo "Gateway Responded." \ && echo "Gateway Responded." \
|| echo "Gateway did not respond." || echo "Gateway did not respond."
block_parse "${IPv6_def_gateway_check}" block_parse "${IPv6_def_gateway_check}"
@ -223,6 +232,7 @@ ip_check() {
else else
log_echo="No IPv6 Gateway Detected" log_echo="No IPv6 Gateway Detected"
fi fi
fi
local IPv4_addr_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet") print $(i+1) }')" \ local IPv4_addr_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet") print $(i+1) }')" \
&& (block_parse "${IPv4_addr_list}" && echo "::: IPv4 addresses located")\ && (block_parse "${IPv4_addr_list}" && echo "::: IPv4 addresses located")\
@ -231,19 +241,17 @@ local IPv4_addr_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet"
local IPv4_def_gateway=$(ip r | grep default | cut -d ' ' -f 3) local IPv4_def_gateway=$(ip r | grep default | cut -d ' ' -f 3)
if [[ $? = 0 ]]; then if [[ $? = 0 ]]; then
echo -n "::: Pinging default IPv4 gateway: " echo -n "::: Pinging default IPv4 gateway: "
local IPv4_def_gateway_check="$(ping -q -w 3 -c 3 -n "${IPv4_def_gateway}" -I "${IPv4_interface}" | tail -n3)" \ local IPv4_def_gateway_check="$(ping -q -w 3 -c 3 -n ${IPv4_def_gateway} -I ${IPv4_interface} | tail -n3)" \
&& echo "Gateway responded." \ && echo "Gateway responded." \
|| echo "Gateway did not respond." || echo "Gateway did not respond."
block_parse "${IPv4_def_gateway_check}" block_parse "${IPv4_def_gateway_check}"
echo -n "::: Pinging Internet via IPv4: " echo -n "::: Pinging Internet via IPv4: "
local IPv4_inet_check="$(ping -q -w 5 -c 3 -n 8.8.8.8 -I "${IPv4_interface}" | tail -n3)" \ local IPv4_inet_check="$(ping -q -w 5 -c 3 -n 8.8.8.8 -I ${IPv4_interface} | tail -n3)" \
&& echo "Query responded." \ && echo "Query responded." \
|| echo "Query did not respond." || echo "Query did not respond."
block_parse "${IPv4_inet_check}" block_parse "${IPv4_inet_check}"
fi fi
fi
} }
port_check() { port_check() {