From 94cd7f59d43e9cdb39312da25cef913699d208e2 Mon Sep 17 00:00:00 2001 From: DL6ER Date: Wed, 1 Jul 2020 18:49:31 +0200 Subject: [PATCH] Make verbose output the default. Signed-off-by: DL6ER --- pihole | 49 ++++++++++++++++++++++--------------------------- 1 file changed, 22 insertions(+), 27 deletions(-) diff --git a/pihole b/pihole index 159922b0..099eefe5 100755 --- a/pihole +++ b/pihole @@ -253,35 +253,30 @@ Options: analyze_ports() { # FTL is listening at least on at least one port when this # function is getting called - if [[ $(grep -c "IPv4" <<< "${1}") -gt 1 ]] && \ - [[ $(grep -c "IPv6" <<< "${1}") -gt 1 ]]; then - echo -e " ${TICK} DNS service is listening" + echo -e " ${TICK} DNS service is listening" + # Check individual address family/protocol combinations + # For a healthy Pi-hole, they should all be up (nothing printed) + if grep -q "IPv4.*UDP" <<< "${1}"; then + echo -e " ${TICK} UDP (IPv4)" else - echo -e " ${CROSS} DNS service is partially listening" - # Check individual address family/protocol combinations - # For a healthy Pi-hole, they should all be up (nothing printed) - if grep -q "IPv4.*UDP" <<< "${1}"; then - echo -e " ${TICK} UDP (IPv4)" - else - echo -e " ${CROSS} UDP (IPv4)" - fi - if grep -q "IPv4.*TCP" <<< "${1}"; then - echo -e " ${TICK} TCP (IPv4)" - else - echo -e " ${CROSS} TCP (IPv4)" - fi - if grep -q "IPv6.*UDP" <<< "${1}"; then - echo -e " ${TICK} UDP (IPv6)" - else - echo -e " ${CROSS} UDP (IPv6)" - fi - if grep -q "IPv6.*TCP" <<< "${1}"; then - echo -e " ${TICK} TCP (IPv6)" - else - echo -e " ${CROSS} TCP (IPv6)" - fi - echo "" + echo -e " ${CROSS} UDP (IPv4)" + fi + if grep -q "IPv4.*TCP" <<< "${1}"; then + echo -e " ${TICK} TCP (IPv4)" + else + echo -e " ${CROSS} TCP (IPv4)" + fi + if grep -q "IPv6.*UDP" <<< "${1}"; then + echo -e " ${TICK} UDP (IPv6)" + else + echo -e " ${CROSS} UDP (IPv6)" + fi + if grep -q "IPv6.*TCP" <<< "${1}"; then + echo -e " ${TICK} TCP (IPv6)" + else + echo -e " ${CROSS} TCP (IPv6)" fi + echo "" } statusFunc() {