Changeset 2e8523b

Timestamp:

2016-12-31T20:40:09Z (8 years ago)

Author:

dx <dx@…>

Branches:

master

Children:

188b75e, 8768f67

Parents:

7801298

git-author:

Jelmer Vernooij <jelmer@…> (28-12-16 13:50:14)

git-committer:

dx <dx@…> (31-12-16 20:40:09)

Message:

Use NI_MAXHOST rather than HOST_NAME_MAX for host lengths.

This constant is always available and meant to be used with
getnameinfo().

This fixes the build on Debian GNU/kFreeBSD.

Files:

• dcc.c (modified) (1 diff)
• lib/ftutil.c (modified) (5 diffs)
• lib/ftutil.h (modified) (1 diff)
• protocols/jabber/s5bytestream.c (modified) (1 diff)

dcc.c

@@ -92 +92 @@
         struct sockaddr_storage saddr;
         char *errmsg;
-        char host[HOST_NAME_MAX];
+        char host[NI_MAXHOST];
         char port[6];
 

lib/ftutil.c

@@ -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';
 

lib/ftutil.h

@@ -26 +26 @@
 #endif
 
-/* Some ifdefs for ulibc and apparently also BSD (Thanks to Whoopie) */
-#ifndef HOST_NAME_MAX
-#include <sys/param.h>
-#ifdef MAXHOSTNAMELEN
-#define HOST_NAME_MAX MAXHOSTNAMELEN
-#else
-#define HOST_NAME_MAX 255
-#endif
-#endif
-
 /* This function should be used with care. host should be AT LEAST a
-   char[HOST_NAME_MAX+1] and port AT LEAST a char[6]. */
+   char[NI_MAXHOST+1] and port AT LEAST a char[6]. */
 int ft_listen(struct sockaddr_storage *saddr_ptr, char *host, char *port, int copy_fd, int for_bitlbee_client,
               char **errptr);

protocols/jabber/s5bytestream.c

@@ -888 +888 @@
         char *proxy, *next, *errmsg = NULL;
         char port[6];
-        char host[HOST_NAME_MAX + 1];
+        char host[NI_MAXHOST + 1];
         jabber_streamhost_t *sh, *sh2;
         GSList *streamhosts = jd->streamhosts;