Changeset 7a9d968 for lib/ftutil.c

Timestamp:

2018-03-10T11:30:39Z (6 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

5447c59

Parents:

3f44e43 (diff), 4a9c6b0 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into HEAD

File:

• lib/ftutil.c (modified) (6 diffs)

lib/ftutil.c

@@ -42 +42 @@
         struct addrinfo hints, *rp;
         socklen_t ssize = sizeof(struct sockaddr_storage);
-        struct sockaddr_storage saddrs, *saddr = &saddrs;
+        struct sockaddr_storage saddrs = {0}, *saddr = &saddrs;
         static char errmsg[1024];
         char *ftlisten = global.conf->ft_listen;
@@ -63 +63 @@
                         if (for_bitlbee_client) {
                                 *scolon = '\0';
-                                strncpy(host, ftlisten, HOST_NAME_MAX);
+                                strncpy(host, ftlisten, NI_MAXHOST);
                                 *scolon = ';';
                         } else {
-                                strncpy(host, scolon + 1, HOST_NAME_MAX);
+                                strncpy(host, scolon + 1, NI_MAXHOST);
                         }
                 } else {
-                        strncpy(host, ftlisten, HOST_NAME_MAX);
+                        strncpy(host, ftlisten, NI_MAXHOST);
                 }
 
@@ -78 +78 @@
         } else if (copy_fd >= 0 && getsockname(copy_fd, (struct sockaddr*) &saddrs, &ssize) == 0 &&
                    (saddrs.ss_family == AF_INET || saddrs.ss_family == AF_INET6) &&
-                   getnameinfo((struct sockaddr*) &saddrs, ssize, host, HOST_NAME_MAX,
+                   getnameinfo((struct sockaddr*) &saddrs, ssize, host, NI_MAXHOST,
                                NULL, 0, NI_NUMERICHOST) == 0) {
                 /* We just took our local address on copy_fd, which is likely to be a
@@ -84 +84 @@
                    most sensible we can get easily. */
         } else {
-                ASSERTSOCKOP(gethostname(host, HOST_NAME_MAX + 1), "gethostname()");
+                ASSERTSOCKOP(gethostname(host, NI_MAXHOST), "gethostname()");
         }
 
@@ -109 +109 @@
                        ( void * ) &(( struct sockaddr_in * ) saddr)->sin_addr.s_addr :
                        ( void * ) &(( struct sockaddr_in6 * ) saddr)->sin6_addr.s6_addr,
-                       host, HOST_NAME_MAX)) {
+                       host, NI_MAXHOST)) {
                 strcpy(errmsg, "inet_ntop failed on listening socket");
                 return -1;
@@ -128 +128 @@
 
         /* I hate static-length strings.. */
-        host[HOST_NAME_MAX - 1] = '\0';
+        host[NI_MAXHOST - 1] = '\0';
         port[5] = '\0';