Add warning if no dns-servers found for dns.mod. Fixes #333.

eggheads · Apr 19, 2017 · 6bdffe3 · 6bdffe3
1 parent 405b9e6
commit 6bdffe3
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/src/mod/dns.mod/coredns.c b/src/mod/dns.mod/coredns.c
@@ -1273,8 +1273,6 @@ static int init_dns_core(void)
 
   /* Initialise the resolv library. */
   res_init();
-  if (!_res.nscount)
-    putlog(LOG_MISC, "*", "No nameservers found.");
   _res.options |= RES_RECURSE | RES_DEFNAMES | RES_DNSRCH;
   for (i = 0; i < _res.nscount; i++)
     _res.nsaddr_list[i].sin_family = AF_INET;

diff --git a/src/mod/dns.mod/dns.c b/src/mod/dns.mod/dns.c
@@ -228,20 +228,33 @@ static int dns_report(int idx, int details)
     for (i = 0; i < _res.nscount; i++)
       dprintf(idx, " %s:%d", iptostr((struct sockaddr *) &_res.nsaddr_list[i]),
               ntohs(_res.nsaddr_list[i].sin_port));
+    if (!_res.nscount)
+      dprintf(idx, " NO DNS SERVERS FOUND!\n");
     dprintf(idx, "\n");
     dprintf(idx, "    Using %d byte%s of memory\n", size,
             (size != 1) ? "s" : "");
   }
   return 0;
 }
 
+static int dns_check_servercount(void)
+{
+  static int oldcount = -1;
+  if (oldcount != _res.nscount && !_res.nscount) {
+    putlog(LOG_MISC, "*", "WARNING: No nameservers found. Please set the dns-servers config variable.");
+  }
+  oldcount = _res.nscount;
+  return 0;
+}
+
 static char *dns_close()
 {
   int i;
 
   del_hook(HOOK_DNS_HOSTBYIP, (Function) dns_lookup);
   del_hook(HOOK_DNS_IPBYHOST, (Function) dns_forward);
   del_hook(HOOK_SECONDLY, (Function) dns_check_expires);
+  del_hook(HOOK_REHASH, (Function) dns_check_servercount);
   rem_tcl_ints(dnsints);
   rem_tcl_strings(dnsstrings);
   Tcl_UntraceVar(interp, "dns-servers",
@@ -304,6 +317,7 @@ char *dns_start(Function *global_funcs)
   add_hook(HOOK_SECONDLY, (Function) dns_check_expires);
   add_hook(HOOK_DNS_HOSTBYIP, (Function) dns_lookup);
   add_hook(HOOK_DNS_IPBYHOST, (Function) dns_forward);
+  add_hook(HOOK_REHASH, (Function) dns_check_servercount);
   add_tcl_ints(dnsints);
   add_tcl_strings(dnsstrings);
   return NULL;