mirror of
https://github.com/pi-hole/pi-hole.git
synced 2025-04-24 08:10:14 +00:00
Shellcheck networking
This commit is contained in:
parent
350c38ab62
commit
9d39f416c8
1 changed files with 35 additions and 28 deletions
|
@ -181,12 +181,12 @@ distro_check() {
|
||||||
|
|
||||||
processor_check() {
|
processor_check() {
|
||||||
header_write "Checking processor variety"
|
header_write "Checking processor variety"
|
||||||
log_write $(uname -m) && return 0 || return 1
|
log_write "$(uname -m)" && return 0 || return 1
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
|
@ -214,54 +214,61 @@ ip_check() {
|
||||||
# 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)}
|
|
||||||
|
|
||||||
|
|
||||||
if [[ $IPV6_READY ]]; then
|
if [[ $IPV6_READY ]]; then
|
||||||
IPv6_address_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet6") print $(i+1) }')"
|
IPv6_address_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet6") print $(i+1) }')"
|
||||||
log_echo "IPv6 addresses: ${IPv6_address_list:-"not found"}"
|
if [[ "${IPv6_address_list}" ]]; then
|
||||||
|
log_echo "IPv6 addresses found"
|
||||||
|
block_parse "${IPv6_address_list}"
|
||||||
|
else
|
||||||
|
log_echo "IPV6 addresses not found"
|
||||||
|
fi
|
||||||
IPv6_default_gateway=$(ip -6 r | grep default | cut -d ' ' -f 3)
|
IPv6_default_gateway=$(ip -6 r | grep default | cut -d ' ' -f 3)
|
||||||
if [[ -n ${IPv6_default_gateway} ]]; then
|
if [[ -n ${IPv6_default_gateway} ]]; then
|
||||||
|
echo -n "::: Pinging default IPv6 gateway: "
|
||||||
echo -n "::: Pinging default IPv6 gateway ${IPv6_default_gateway}: "
|
|
||||||
IPv6_def_gateway_check="$(ping6 -q -W 3 -c 3 -n "${IPv6_default_gateway}" -I "${IPv6_interface}"| tail -n3)"
|
IPv6_def_gateway_check="$(ping6 -q -W 3 -c 3 -n "${IPv6_default_gateway}" -I "${IPv6_interface}"| tail -n3)"
|
||||||
if [[ -n ${IPv6_def_gateway_check} ]]; then
|
if [[ -n ${IPv6_def_gateway_check} ]]; then
|
||||||
echo "Gateway Responded."
|
echo "Gateway Responded."
|
||||||
|
block_parse "${IPv6_def_gateway_check}"
|
||||||
else
|
else
|
||||||
echo "Gateway did not respond."
|
echo "Gateway did not respond."
|
||||||
block_parse "${IPv6_def_gateway_check}"
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo -n "::: Pinging Internet via IPv6: "
|
echo -n "::: Pinging Internet via IPv6: "
|
||||||
IPv6_inet_check=$(ping6 -q -W 3 -c 3 -n 2001:4860:4860::8888 -I "${IPv6_interface}"| tail -n3) \
|
IPv6_inet_check=$(ping6 -q -W 3 -c 3 -n 2001:4860:4860::8888 -I "${IPv6_interface}"| tail -n3)
|
||||||
&& echo "Query responded." \
|
if [[ ${IPv6_inet_check} ]]; then
|
||||||
|| echo "Query did not respond."
|
echo "Query responded."
|
||||||
block_parse "${IPv6_inet_check}"
|
block_parse "${IPv6_inet_check}"
|
||||||
else
|
else
|
||||||
log_echo="No IPv6 Gateway Detected"
|
echo "Query did not respond."
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
log_echo "No IPv6 Gateway Detected"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
IPv4_addr_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet") print $(i+1) }')" \
|
IPv4_interface=${piholeInterface:-$(ip r | grep default | cut -d ' ' -f 5)}
|
||||||
&& (block_parse "${IPv4_addr_list}" && echo "::: IPv4 addresses located")\
|
IPv4_addr_list="$(ip a | awk -F " " '{ for(i=1;i<=NF;i++) if ($i == "inet") print $(i+1) }')"
|
||||||
|| log_echo "No IPv4 addresses found."
|
if [[ "${IPv4_addr_list}" ]]; then
|
||||||
|
log_echo "IPv4 addresses found"
|
||||||
|
block_parse "${IPv4_addr_list}"
|
||||||
|
else
|
||||||
|
log_echo "IPv4 addresses not found."
|
||||||
|
fi
|
||||||
IPv4_def_gateway=$(ip r | grep default | cut -d ' ' -f 3)
|
IPv4_def_gateway=$(ip r | grep default | cut -d ' ' -f 3)
|
||||||
if [[ $? = 0 ]]; then
|
if [[ "${IPv4_def_gateway}" ]]; then
|
||||||
echo -n "::: Pinging default IPv4 gateway: "
|
echo -n "::: Pinging default IPv4 gateway: "
|
||||||
IPv4_def_gateway_check="$(ping -q -w 3 -c 3 -n "${IPv4_def_gateway}" -I "${IPv4_interface}" | tail -n3)" \
|
IPv4_def_gateway_check="$(ping -q -w 3 -c 3 -n "${IPv4_def_gateway}" -I "${IPv4_interface}" | tail -n3)"
|
||||||
&& echo "Gateway responded." \
|
if [[ "${IPv4_def_gateway_check}" ]]; then
|
||||||
|| echo "Gateway did not respond."
|
echo "Gateway responded."
|
||||||
block_parse "${IPv4_def_gateway_check}"
|
block_parse "${IPv4_def_gateway_check}"
|
||||||
|
else
|
||||||
|
echo "Gateway did not respond."
|
||||||
|
fi
|
||||||
echo -n "::: Pinging Internet via IPv4: "
|
echo -n "::: Pinging Internet via IPv4: "
|
||||||
IPv4_inet_check="$(ping -q -w 5 -c 3 -n 8.8.8.8 -I "${IPv4_interface}" | tail -n3)" \
|
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() {
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue