router: filter dig diagnostics from gateway resolve and PTR lookup

When DNS times out, "dig +short" can emit ";; communications error to SERVER#53: timed out" to stdout (not just stderr). resolve_gw's grep -m1 '[0-9]' would accept that line as an "IP" (it contains "10#53"); gw_monitor_tag would carry it through sed and produce a multi-line tag. The latter ended up as state directory names like "gw-;; communications error to ...\\nikev2.hetzner.v6/". Wrap dig in 2>/dev/null and filter "^;" diagnostics; in gw_monitor_tag also take only the first PTR line.

router: filter dig diagnostics from gateway resolve and PTR lookup
097fea9d · Vitaly Lipatov · 5c9edd5f · 097fea9d · 097fea9d
Commit 097fea9d authored May 09, 2026 by Vitaly Lipatov
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

functions router/functions +2 -2

route-health.sh router/route-health.sh +1 -1

No files found.
--- a/router/functions
+++ b/router/functions
@@ -46,9 +46,9 @@ resolve_gw()
        *:*) echo "$val" ;;
        *[a-zA-Z]*)
            if [ "$ipcmd" = "ip -6" ] ; then
-                dig +short AAAA "$val" | grep -m1 ':'
+                dig +short AAAA "$val" 2>/dev/null | grep -v '^;' | grep -m1 ':'
            else
-                dig +short A "$val" | grep -m1 '[0-9]'
+                dig +short A "$val" 2>/dev/null | grep -v '^;' | grep -m1 '[0-9]'
            fi ;;
        *) echo "$val" ;;
    esac

--- a/router/route-health.sh
+++ b/router/route-health.sh
@@ -165,7 +165,7 @@ get_health()
 gw_monitor_tag()
 {
    local gw_ip="$1" ipcmd="$2"
-    local ptr=$(dig +short -x "$gw_ip" 2>/dev/null | sed 's/\.$//')
+    local ptr=$(dig +short -x "$gw_ip" 2>/dev/null | grep -v '^;' | head -1 | sed 's/\.$//')
    [ -z "$ptr" ] && return
    local tag=$(echo "$ptr" | sed 's/\.egw\.etersoft\.ru$//')
    [ "$tag" = "$ptr" ] && return  # not in egw zone