From ef30a85afb1653df4d3ce393dd6b8d7ecbb29ab0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Christian=20K=C3=B6nig?= <ckoenig@posteo.de>
Date: Sun, 26 Dec 2021 17:10:48 +0100
Subject: [PATCH] Include port in status function
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Christian König <ckoenig@posteo.de>
---
 pihole | 81 ++++++++++++++++++++++++++++++++++------------------------
 1 file changed, 47 insertions(+), 34 deletions(-)

diff --git a/pihole b/pihole
index 055bd702..faa9fc2e 100755
--- a/pihole
+++ b/pihole
@@ -312,42 +312,55 @@ analyze_ports() {
 }
 
 statusFunc() {
-  # Determine if there is a pihole service is listening on port 53
-  local listening
-  listening="$(lsof -Pni:53)"
-  if grep -q "pihole" <<< "${listening}"; then
-    if [[ "${1}" != "web" ]]; then
-      analyze_ports "${listening}"
-    fi
+  # Determine if there is pihole-FTL service is listening on any UDP port
+  local listening pid port
+
+  pid="$(getFTLPID)"
+  if [[ "$pid" -eq "-1" ]]; then
+      case "${1}" in
+        "web") echo "-1";;
+        *) echo -e "  ${CROSS} DNS service is NOT running";;
+      esac
+      return 0
   else
-    case "${1}" in
-      "web") echo "-1";;
-      *) echo -e "  ${CROSS} DNS service is NOT listening";;
-    esac
-    return 0
-  fi
+      #get the port pihole-FTL is listening on
+      port="$(lsof -Pni UDP -p ${pid} -a | grep -m1 : | awk -F ":" '{print $2}')"
+      listening="$(lsof -Pni:53)"
+      if [[ ! -z "$port" ]]; then
+        if [[ "${1}" != "web" ]]; then
+          analyze_ports "${listening}"
+        fi
+      else
+        case "${1}" in
+          "web") echo "-1";;
+          *) echo -e "  ${CROSS} DNS service is NOT listening";;
+        esac
+        return 0
+      fi
+
+      # Determine if Pi-hole's blocking is enabled
+      if grep -q "BLOCKING_ENABLED=false" /etc/pihole/setupVars.conf; then
+        # A config is commented out
+        case "${1}" in
+          "web") echo 0;;
+          *) echo -e "  ${CROSS} Pi-hole blocking is disabled";;
+        esac
+      elif grep -q "BLOCKING_ENABLED=true" /etc/pihole/setupVars.conf;  then
+        # Configs are set
+        case "${1}" in
+          "web") echo "$port";;
+          *) echo -e "  ${TICK} Pi-hole blocking is enabled";;
+        esac
+      else
+        # No configs were found
+        case "${1}" in
+          "web") echo -2;;
+          *) echo -e "  ${INFO} Pi-hole blocking will be enabled";;
+        esac
+        # Enable blocking
+        "${PI_HOLE_BIN_DIR}"/pihole enable
+      fi
 
-  # Determine if Pi-hole's blocking is enabled
-  if grep -q "BLOCKING_ENABLED=false" /etc/pihole/setupVars.conf; then
-    # A config is commented out
-    case "${1}" in
-      "web") echo 0;;
-      *) echo -e "  ${CROSS} Pi-hole blocking is disabled";;
-    esac
-  elif grep -q "BLOCKING_ENABLED=true" /etc/pihole/setupVars.conf;  then
-    # Configs are set
-    case "${1}" in
-      "web") echo 1;;
-      *) echo -e "  ${TICK} Pi-hole blocking is enabled";;
-    esac
-  else
-    # No configs were found
-    case "${1}" in
-      "web") echo 99;;
-      *) echo -e "  ${INFO} Pi-hole blocking will be enabled";;
-    esac
-    # Enable blocking
-    "${PI_HOLE_BIN_DIR}"/pihole enable
   fi
 }