Changeset 9440414 in code

Timestamp:

Jun 17, 2014, 11:33:22 AM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

120eedd

Parents:

d45051e

Message:

check that reverse dns entry can be resolved

Files:

• dns.c (modified) (3 diffs)
• icbd.c (modified) (1 diff)
• icbd.h (modified) (1 diff)

dns.c

@@ -33 +33 @@
 #include "icbd.h"
 
-void dns_done(struct asr_result *, void *);
+void dns_done_host(struct asr_result *, void *);
+void dns_done_reverse(struct asr_result *, void *);
 
 extern int dodns;
 
 void
-dns_done(struct asr_result *ar, void *arg)
+dns_done_host(struct asr_result *ar, void *arg)
 {
         struct icb_session *is = arg;
 
+        if (ar->ar_addrinfo)
+                freeaddrinfo(ar->ar_addrinfo);
+
+        /* just check that there's no error */
         if (ar->ar_gai_errno == 0) {
-                icbd_log(is, LOG_DEBUG, "dns resolved %s to %s", is->host,
-                    is->hostname);
                 if (strncmp(is->hostname, "localhost",
                     sizeof "localhost" - 1) == 0)
@@ -56 +59 @@
 
 void
-dns_rresolv(struct icb_session *is, struct sockaddr *sa)
+dns_done_reverse(struct asr_result *ar, void *arg)
+{
+        struct icb_session *is = arg;
+        struct asr_query *as;
+        struct addrinfo hints;
+
+        if (ar->ar_gai_errno == 0) {
+                icbd_log(is, LOG_DEBUG, "reverse dns resolved %s to %s",
+                    is->host, is->hostname);
+                /* try to verify that it resolves back */
+                memset(&hints, 0, sizeof(hints));
+                hints.ai_family = PF_UNSPEC;
+                as = getaddrinfo_async(is->hostname, NULL, &hints, NULL);
+                event_asr_run(as, dns_done_host, is);
+        } else
+                icbd_log(is, LOG_WARNING, "reverse dns resolution failed: %s",
+                    gai_strerror(ar->ar_gai_errno));
+}
+
+void
+dns_resolve(struct icb_session *is, struct sockaddr *sa)
 {
         struct asr_query *as;
@@ -68 +91 @@
         as = getnameinfo_async(sa, sa->sa_len, is->hostname,
             sizeof is->hostname, NULL, 0, NI_NOFQDN, NULL);
-        event_asr_run(as, dns_done, is);
+        event_asr_run(as, dns_done_reverse, is);
 }
+

icbd.c

@@ -608 +608 @@
             is->host, sizeof is->host);
 
-        dns_rresolv(is, (struct sockaddr *)&ss);
-}
+        dns_resolve(is, (struct sockaddr *)&ss);
+}

icbd.h

@@ -33 +33 @@
 /* dns.c */
 struct sockaddr;
-void            dns_rresolv(struct icb_session *, struct sockaddr *);
+void            dns_resolve(struct icb_session *, struct sockaddr *);
 
 /* logger.c */