Changeset b4049f9 in code for icbd.c

Timestamp:

Mar 4, 2014, 10:34:57 AM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

5815eef

Parents:

fa271b8

Message:

Rewrite DNS resolver to do things truly asynchronously

File:

• icbd.c (modified) (4 diffs)

icbd.c

@@ -213 +213 @@
 
         /* start a dns resolver thread */
-        icbd_dns_init();
+        dns_init();
 
         if (!foreground)
@@ -225 +225 @@
 
         return (EX_UNAVAILABLE);
-}
-
-void
-icbd_dns(int fd, short event, void *arg)
-{
-        struct icb_session *is = arg;
-
-        if (event != EV_READ)
-                return;
-
-        if (read(fd, is->host, sizeof is->host) < 0)
-                syslog(LOG_ERR, "read: %m");
-
-        is->host[sizeof is->host - 1] = '\0';
-
-        if (verbose)
-                syslog(LOG_DEBUG, "icbd_dns: resolved %s", is->host);
 }
 
@@ -547 +530 @@
 {
         struct sockaddr_storage ss;
+        struct sockaddr_in *sin = (struct sockaddr_in *)&ss;
+        struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&ss;
         socklen_t ss_len = sizeof ss;
 
@@ -557 +542 @@
         switch (ss.ss_family) {
         case AF_INET:
-                is->port = ntohs(((struct sockaddr_in *)&ss)->sin_port);
+                is->port = ntohs(sin->sin_port);
                 break;
 
         case AF_INET6:
-                is->port = ntohs(((struct sockaddr_in6 *)&ss)->sin6_port);
+                is->port = ntohs(sin6->sin6_port);
                 break;
         }
 
+        inet_ntop(ss.ss_family, ss.ss_family == AF_INET ?
+            (void *)&sin->sin_addr : (void *)&sin6->sin6_addr,
+            is->host, sizeof is->host);
+
         dns_rresolv(is, &ss);
 }