Changeset 7289823 in code

Timestamp:

Mar 7, 2014, 3:42:03 PM (11 years ago)

Author:

Mike Belopuhov <mike@…>

Branches:

master

Children:

a76f866

Parents:

8871953

Message:

Change DNS resolver to ignore hostnames longer than 39 symbols and
prefer IP/IPv6 addresses instead; substitute "localhost" with
"unknown".

Files:

• dns.c (modified) (2 diffs)
• icb.h (modified) (2 diffs)

dns.c

@@ -43 +43 @@
         union {
                 struct sockaddr_storage req;
-                char                    rep[MAXHOSTNAMELEN];
+                char                    rep[NI_MAXHOST];
         } u;
 };
@@ -168 +168 @@
         }
 
-        memcpy(is->host, q.u.rep, MAXHOSTNAMELEN);
-        is->host[sizeof is->host - 1] = '\0';
+        if (verbose)
+                syslog(LOG_DEBUG, "icbd_dns: resolved %s to %s",
+                    is->host, q.u.rep);
 
-        if (verbose)
-                syslog(LOG_DEBUG, "icbd_dns: resolved %s", is->host);
+        /* XXX */
+        if (strcmp(q.u.rep, "localhost") == 0)
+                strlcpy(is->host, "unknown", ICB_MAXHOSTLEN);
+        else if (strlen(q.u.rep) < ICB_MAXHOSTLEN)
+                strlcpy(is->host, q.u.rep, ICB_MAXHOSTLEN);
 }
 

icb.h

@@ -30 +30 @@
 #define ICB_MAXPASSLEN           32
 #define ICB_MAXTOPICLEN          160
+#define ICB_MAXHOSTLEN           40
 #define ICB_MTABLEN              50 /* XXX */
 
@@ -76 +77 @@
         char                     nick[ICB_MAXNICKLEN];
         char                     client[ICB_MAXNICKLEN];
-        char                     host[MAXHOSTNAMELEN];
+        char                     host[ICB_MAXHOSTLEN];
         char                     buffer[ICB_MSGSIZE];
         struct event             ev;