From b86d34b31018ae3692fc739c906f4c960039925b Mon Sep 17 00:00:00 2001
From: nrb <freifunk@nicoboehr.de>
Date: Sun, 10 Jan 2021 17:07:53 +0100
Subject: [PATCH] ffs-set-segment: more debugging output

This will produce more debugging output in case a DNS lookup fails.
Also, use gluon-wan instead of manually specifying the DNS servers.
---
 ffs-set-segment/files/usr/sbin/ffs-set-segment | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ffs-set-segment/files/usr/sbin/ffs-set-segment b/ffs-set-segment/files/usr/sbin/ffs-set-segment
index 3fe94ea..1157b32 100755
--- a/ffs-set-segment/files/usr/sbin/ffs-set-segment
+++ b/ffs-set-segment/files/usr/sbin/ffs-set-segment
@@ -26,15 +26,17 @@ PUBKEY=$(/etc/init.d/fastd show_key mesh_vpn | cut -c1-12)
 DNSDOM="freifunk-stuttgart.de"
 DNSREQ="ffs-${NODEID}-${PUBKEY}.segassign.${DNSDOM}"
 
+LOOKUP_RESULT=$(gluon-wan nslookup ${DNSREQ} 2>&1)
 logger -t $ME "DNSv6 on ${DNSREQ} ..."
-GITSEG=$(nslookup ${DNSREQ} ::1#54 | grep "2001:2:0:711::" | cut -d':' -f7)
+GITSEG=$(echo "$LOOKUP_RESULT" | grep "2001:2:0:711::" | cut -d':' -f7)
 if [ -z "$GITSEG" ]; then
   logger -t $ME "DNSv4 on ${DNSREQ} ..."
-  GITSEG=$(nslookup ${DNSREQ} ::1#54 | grep "198.18.190." | cut -d'.' -f4)
+  GITSEG=$(echo "$LOOKUP_RESULT" | grep "198.18.190." | cut -d'.' -f4)
 fi
 
 if [ -z "$GITSEG" ]; then
-  logger -t $ME "DNS not working!"
+  logger -t $ME "DNS not working: $LOOKUP_RESULT"
+  logger -t $ME "DNS settings: $(cat /var/gluon/wan-dnsmasq/resolv.conf)"
   exit 1
 else
   if [ -n "$BATSEG" ] && [ "$BATSEG" != "$GITSEG" ]; then
-- 
GitLab