Define ETHERTYPE_IPV6 ourselves.

[darkstat] / dns.c

diff --git a/dns.c b/dns.c
index ba61adf..c89dc1b 100644 (file)
--- a/dns.c
+++ b/dns.c
@@ -1,5 +1,5 @@
 /* darkstat 3
- * copyright (c) 2001-2008 Emil Mikulic.
+ * copyright (c) 2001-2011 Emil Mikulic.
  *
  * dns.c: synchronous DNS in a child process.
  *
@@ -7,7 +7,7 @@
  * GNU General Public License version 2. (see COPYING.GPL)
  */
 
-#include "darkstat.h"
+#include "cdefs.h"
 #include "conv.h"
 #include "decode.h"
 #include "dns.h"
@@ -16,6 +16,7 @@
 #include "queue.h"
 #include "str.h"
 #include "tree.h"
+#include "bsd.h" /* for setproctitle, strlcpy */
 
 #include <sys/param.h>
 #include <sys/socket.h>
@@ -28,6 +29,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#ifdef __NetBSD__
+# define gethostbyaddr(addr, len, type) \
+         gethostbyaddr((const char *)(addr), len, type)
+#endif
+
 static void dns_main(void) _noreturn_; /* the child process runs this */
 
 #define CHILD 0 /* child process uses this socket */
@@ -38,7 +44,7 @@ static pid_t pid = -1;
 struct dns_reply {
    struct addr addr;
    int error; /* for gai_strerror(), or 0 if no error */
-   char name[MAXHOSTNAMELEN];
+   char name[256]; /* http://tools.ietf.org/html/rfc1034#section-3.1 */
 };
 
 void
@@ -197,8 +203,9 @@ dns_get_result(struct addr *ipaddr, char **name)
             type = "site-local";
          else if (IN6_IS_ADDR_MULTICAST(&reply.addr.ip.v6))
             type = "multicast";
-      } else { /* AF_INET */
-         if (IN_MULTICAST(reply.addr.ip.v4))
+      } else {
+         assert(reply.addr.family == IPv4);
+         if (IN_MULTICAST(htonl(reply.addr.ip.v4)))
             type = "multicast";
       }
       xasprintf(name, "(%s)", type);
@@ -294,9 +301,7 @@ dns_main(void)
 {
    struct addr ip;
 
-#ifdef HAVE_SETPROCTITLE
    setproctitle("DNS child");
-#endif
    fd_set_nonblock(sock[CHILD]);
    verbosef("DNS child entering main DNS loop");
    for (;;) {
@@ -340,6 +345,7 @@ dns_main(void)
          struct dns_reply reply;
          struct sockaddr_in sin;
          struct sockaddr_in6 sin6;
+         struct hostent *he;
          char host[NI_MAXHOST];
          int ret, flags;
 
@@ -354,6 +360,19 @@ dns_main(void)
                sin.sin_addr.s_addr = ip.ip.v4;
                ret = getnameinfo((struct sockaddr *) &sin, sizeof(sin),
                                  host, sizeof(host), NULL, 0, flags);
+               if (ret == EAI_FAMILY) {
+                  verbosef("getnameinfo error %s, trying gethostbyname",
+                     gai_strerror(ret));
+                  he = gethostbyaddr(&sin.sin_addr.s_addr,
+                     sizeof(sin.sin_addr.s_addr), sin.sin_family);
+                  if (he == NULL) {
+                     ret = EAI_FAIL;
+                     verbosef("gethostbyname error %s", hstrerror(h_errno));
+                  } else {
+                     ret = 0;
+                     strlcpy(host, he->h_name, sizeof(host));
+                  }
+               }
                break;
             case IPv6:
                sin6.sin6_family = AF_INET6;