On solaris, the variable name sun clashes, use s_un instead

[openssl.git] / crypto / bio / b_addr.c

diff --git a/crypto/bio/b_addr.c b/crypto/bio/b_addr.c
index 39597b8651876f8b4d17989cfcceff0d38058291..e92876ab99260124cb074149e1f9d78daf5c0142 100644 (file)
--- a/crypto/bio/b_addr.c
+++ b/crypto/bio/b_addr.c
@@ -58,6 +58,7 @@
 
 #include <openssl/err.h>
 #include <openssl/buffer.h>
+#include <ctype.h>
 
 /*
  * Throughout this file and bio_lcl.h, the existence of the macro
@@ -99,18 +100,18 @@ void BIO_ADDR_clear(BIO_ADDR *ap)
 int BIO_ADDR_make(BIO_ADDR *ap, const struct sockaddr *sa)
 {
     if (sa->sa_family == AF_INET) {
-        ap->sin = *(const struct sockaddr_in *)sa;
+        ap->s_in = *(const struct sockaddr_in *)sa;
         return 1;
     }
 #ifdef AF_INET6
     if (sa->sa_family == AF_INET6) {
-        ap->sin6 = *(const struct sockaddr_in6 *)sa;
+        ap->s_in6 = *(const struct sockaddr_in6 *)sa;
         return 1;
     }
 #endif
 #ifdef AF_UNIX
     if (ap->sa.sa_family == AF_UNIX) {
-        ap->sun = *(const struct sockaddr_un *)sa;
+        ap->s_un = *(const struct sockaddr_un *)sa;
         return 1;
     }
 #endif
@@ -124,31 +125,31 @@ int BIO_ADDR_rawmake(BIO_ADDR *ap, int family,
 {
 #ifdef AF_UNIX
     if (family == AF_UNIX) {
-        if (wherelen + 1 > sizeof(ap->sun.sun_path))
+        if (wherelen + 1 > sizeof(ap->s_un.sun_path))
             return 0;
-        memset(&ap->sun, 0, sizeof(ap->sun));
-        ap->sun.sun_family = family;
-        strncpy(ap->sun.sun_path, where, sizeof(ap->sun.sun_path) - 1);
+        memset(&ap->s_un, 0, sizeof(ap->s_un));
+        ap->s_un.sun_family = family;
+        strncpy(ap->s_un.sun_path, where, sizeof(ap->s_un.sun_path) - 1);
         return 1;
     }
 #endif
     if (family == AF_INET) {
         if (wherelen != sizeof(struct in_addr))
             return 0;
-        memset(&ap->sin, 0, sizeof(ap->sin));
-        ap->sin.sin_family = family;
-        ap->sin.sin_port = port;
-        ap->sin.sin_addr = *(struct in_addr *)where;
+        memset(&ap->s_in, 0, sizeof(ap->s_in));
+        ap->s_in.sin_family = family;
+        ap->s_in.sin_port = port;
+        ap->s_in.sin_addr = *(struct in_addr *)where;
         return 1;
     }
 #ifdef AF_INET6
     if (family == AF_INET6) {
         if (wherelen != sizeof(struct in6_addr))
             return 0;
-        memset(&ap->sin6, 0, sizeof(ap->sin6));
-        ap->sin6.sin6_family = family;
-        ap->sin6.sin6_port = port;
-        ap->sin6.sin6_addr = *(struct in6_addr *)where;
+        memset(&ap->s_in6, 0, sizeof(ap->s_in6));
+        ap->s_in6.sin6_family = family;
+        ap->s_in6.sin6_port = port;
+        ap->s_in6.sin6_addr = *(struct in6_addr *)where;
         return 1;
     }
 #endif
@@ -167,19 +168,19 @@ int BIO_ADDR_rawaddress(const BIO_ADDR *ap, void *p, size_t *l)
     const void *addrptr = NULL;
 
     if (ap->sa.sa_family == AF_INET) {
-        len = sizeof(ap->sin.sin_addr);
-        addrptr = &ap->sin.sin_addr;
+        len = sizeof(ap->s_in.sin_addr);
+        addrptr = &ap->s_in.sin_addr;
     }
 #ifdef AF_INET6
     else if (ap->sa.sa_family == AF_INET6) {
-        len = sizeof(ap->sin6.sin6_addr);
-        addrptr = &ap->sin6.sin6_addr;
+        len = sizeof(ap->s_in6.sin6_addr);
+        addrptr = &ap->s_in6.sin6_addr;
     }
 #endif
 #ifdef AF_UNIX
     else if (ap->sa.sa_family == AF_UNIX) {
-        len = strlen(ap->sun.sun_path);
-        addrptr = &ap->sun.sun_path;
+        len = strlen(ap->s_un.sun_path);
+        addrptr = &ap->s_un.sun_path;
     }
 #endif
 
@@ -198,10 +199,10 @@ int BIO_ADDR_rawaddress(const BIO_ADDR *ap, void *p, size_t *l)
 unsigned short BIO_ADDR_rawport(const BIO_ADDR *ap)
 {
     if (ap->sa.sa_family == AF_INET)
-        return ap->sin.sin_port;
+        return ap->s_in.sin_port;
 #ifdef AF_INET6
     if (ap->sa.sa_family == AF_INET6)
-        return ap->sin6.sin6_port;
+        return ap->s_in6.sin6_port;
 #endif
     return 0;
 }
@@ -228,7 +229,7 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
     if (1) {
 #ifdef AI_PASSIVE
         int ret = 0;
-        char host[NI_MAXHOST], serv[NI_MAXSERV];
+        char host[NI_MAXHOST] = "", serv[NI_MAXSERV] = "";
         int flags = 0;
 
         if (numeric)
@@ -250,6 +251,18 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
             }
             return 0;
         }
+
+        /* VMS getnameinfo() has a bug, it doesn't fill in serv, which
+         * leaves it with whatever garbage that happens to be there.
+         * However, we initialise serv with the empty string (serv[0]
+         * is therefore NUL), so it gets real easy to detect when things
+         * didn't go the way one might expect.
+         */
+        if (serv[0] == '\0') {
+            BIO_snprintf(serv, sizeof(serv), "%d",
+                         ntohs(BIO_ADDR_rawport(ap)));
+        }
+
         if (hostname)
             *hostname = OPENSSL_strdup(host);
         if (service)
@@ -257,10 +270,10 @@ static int addr_strings(const BIO_ADDR *ap, int numeric,
     } else {
 #endif
         if (hostname)
-            *hostname = OPENSSL_strdup(inet_ntoa(ap->sin.sin_addr));
+            *hostname = OPENSSL_strdup(inet_ntoa(ap->s_in.sin_addr));
         if (service) {
             char serv[6];        /* port is 16 bits => max 5 decimal digits */
-            BIO_snprintf(serv, sizeof(serv), "%d", ntohs(ap->sin.sin_port));
+            BIO_snprintf(serv, sizeof(serv), "%d", ntohs(ap->s_in.sin_port));
             *service = OPENSSL_strdup(serv);
         }
     }
@@ -292,7 +305,7 @@ char *BIO_ADDR_path_string(const BIO_ADDR *ap)
 {
 #ifdef AF_UNIX
     if (ap->sa.sa_family == AF_UNIX)
-        return OPENSSL_strdup(ap->sun.sun_path);
+        return OPENSSL_strdup(ap->s_un.sun_path);
 #endif
     return NULL;
 }
@@ -327,21 +340,21 @@ struct sockaddr *BIO_ADDR_sockaddr_noconst(BIO_ADDR *ap)
 socklen_t BIO_ADDR_sockaddr_size(const BIO_ADDR *ap)
 {
     if (ap->sa.sa_family == AF_INET)
-        return sizeof(ap->sin);
+        return sizeof(ap->s_in);
 #ifdef AF_INET6
     if (ap->sa.sa_family == AF_INET6)
-        return sizeof(ap->sin6);
+        return sizeof(ap->s_in6);
 #endif
 #ifdef AF_UNIX
     if (ap->sa.sa_family == AF_UNIX)
-        return sizeof(ap->sun);
+        return sizeof(ap->s_un);
 #endif
     return sizeof(*ap);
 }
 
 /**********************************************************************
  *
- * Address into database
+ * Address info database
  *
  */
 
@@ -368,8 +381,24 @@ int BIO_ADDRINFO_socktype(const BIO_ADDRINFO *bai)
 
 int BIO_ADDRINFO_protocol(const BIO_ADDRINFO *bai)
 {
-    if (bai != NULL)
-        return bai->bai_protocol;
+    if (bai != NULL) {
+        if (bai->bai_protocol != 0)
+            return bai->bai_protocol;
+
+#ifdef AF_UNIX
+        if (bai->bai_family == AF_UNIX)
+            return 0;
+#endif
+
+        switch (bai->bai_socktype) {
+        case SOCK_STREAM:
+            return IPPROTO_TCP;
+        case SOCK_DGRAM:
+            return IPPROTO_UDP;
+        default:
+            break;
+        }
+    }
     return 0;
 }