ec/ecp_nistz256.c: harmonize with latest indent script.

[oweals/openssl.git] / crypto / bio / b_sock.c

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 54112e6ebe4eaca20b5e7438bc114e0ece684ab7..f7e95ee5c525e557dc77e090734cfff25f0c6d85 100644 (file)
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -150,8 +150,7 @@ int BIO_get_host_ip(const char *str, unsigned char *ip)
                goto err;
                }
 
-       /* cast to short because of win16 winsock definition */
-       if ((short)he->h_addrtype != AF_INET)
+       if (he->h_addrtype != AF_INET)
                {
                BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET);
                goto err;
@@ -233,13 +232,10 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
 int BIO_sock_error(int sock)
        {
        int j,i;
-       int size;
+       union { size_t s; int i; } size;
                 
-#if defined(OPENSSL_SYS_BEOS_R5)
-       return 0;
-#endif
-                
-       size=sizeof(int);
+       /* heuristic way to adapt for platforms that expect 64-bit optlen */
+       size.s=0, size.i=sizeof(j);
        /* Note: under Windows the third parameter is of type (char *)
         * whereas under other systems it is (void *) if you don't have
         * a cast it will choke the compiler: if you do have a cast then
@@ -552,7 +548,8 @@ int BIO_socket_ioctl(int fd, long type, void *arg)
        i=ioctlsocket(fd,type,(char *)arg);
 #else
 # if defined(OPENSSL_SYS_VMS)
-       /* 2011-02-18 SMS.
+       /*-
+        * 2011-02-18 SMS.
         * VMS ioctl() can't tolerate a 64-bit "void *arg", but we
         * observe that all the consumers pass in an "unsigned long *",
         * so we arrange a local copy with a short pointer, and use
@@ -683,6 +680,7 @@ int BIO_get_accept_socket(char *host, int bind_mode)
         * note that commonly IPv6 wildchard socket can service
         * IPv4 connections just as well...  */
        memset(&hint,0,sizeof(hint));
+       hint.ai_flags = AI_PASSIVE;
        if (h)
                {
                if (strchr(h,':'))
@@ -695,7 +693,10 @@ int BIO_get_accept_socket(char *host, int bind_mode)
 #endif
                        }
                else if (h[0]=='*' && h[1]=='\0')
+                       {
+                       hint.ai_family = AF_INET;
                        h=NULL;
+                       }
                }
 
        if ((*p_getaddrinfo.f)(h,p,&hint,&res)) break;
@@ -956,7 +957,6 @@ int BIO_set_tcp_ndelay(int s, int on)
 #endif
        return(ret == 0);
        }
-#endif
 
 int BIO_socket_nbio(int s, int mode)
        {
@@ -969,3 +969,4 @@ int BIO_socket_nbio(int s, int mode)
 #endif
        return(ret == 0);
        }
+#endif