arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-11-20 07:08:13 +00:00
Code Issues Releases Wiki Activity

Mode code realignment. Handle lack of IPv6 gateway gracefully.

Browse Source
This commit is contained in:
Dan Schaper 2016-09-26 18:21:58 -07:00
parent 60c0e59a83
commit 7729ddab30
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
advanced/Scripts/piholeDebug.sh
View File

@ -93,8 +93,8 @@ function ipCheck {
echo "######## IP Address Information #########" >> ${DEBUG_LOG} echo "######## IP Address Information #########" >> ${DEBUG_LOG}
echo "############################################################" >> ${DEBUG_LOG} echo "############################################################" >> ${DEBUG_LOG}
echo "::: Writing local IPs to logfile"
IPADDR=$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet") print $(i+1) }') IPADDR=$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet") print $(i+1) }')
echo "::: Writing local IPs to debug log"
echo "$IPADDR" >> ${DEBUG_LOG} echo "$IPADDR" >> ${DEBUG_LOG}
IP6ADDR=$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet6") print $(i+1) }') IP6ADDR=$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet6") print $(i+1) }')
echo "$IP6ADDR" >> ${DEBUG_LOG} echo "$IP6ADDR" >> ${DEBUG_LOG}
@ -107,9 +107,12 @@ function ipCheck {
echo "$GATEWAY_CHECK" >> ${DEBUG_LOG} echo "$GATEWAY_CHECK" >> ${DEBUG_LOG}
GATEWAY6=$(ip -6 r | grep default | cut -d ' ' -f 3) GATEWAY6=$(ip -6 r | grep default | cut -d ' ' -f 3)
if [ -n "$GATEWAY6" ]
then
GATEWAY6_CHECK=$(ping6 -q -w 1 -c 1 "${GATEWAY6}" > /dev/null && echo ok || echo error) GATEWAY6_CHECK=$(ping6 -q -w 1 -c 1 "${GATEWAY6}" > /dev/null && echo ok || echo error)
echo "IPv6 Gateway check at ${GATEWAY6}:" >> ${DEBUG_LOG} echo "IPv6 Gateway check at ${GATEWAY6}:" >> ${DEBUG_LOG}
echo "$GATEWAY6_CHECK" >> ${DEBUG_LOG} echo "$GATEWAY6_CHECK" >> ${DEBUG_LOG}
fi
echo >> ${DEBUG_LOG} echo >> ${DEBUG_LOG}
} }
function compareWhitelist { function compareWhitelist {