ENGINE uses a very opaque design, so we can predeclare the structure type

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

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index dce0c0390bba3e34e8e37e4d64807c13685bda43..5b66603d7d92a5982908dbde542d7042d737fe76 100644 (file)
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -65,7 +65,7 @@
 #include "cryptlib.h"
 #include <openssl/bio.h>
 
-#ifdef WIN16
+#ifdef OPENSSL_SYS_WIN16
 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
 #else
 #define SOCKET_PROTOCOL IPPROTO_TCP
@@ -79,7 +79,7 @@
 #define MAX_LISTEN  32
 #endif
 
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
 static int wsa_init_done=0;
 #endif
 
@@ -105,17 +105,22 @@ int BIO_get_host_ip(const char *str, unsigned char *ip)
        struct hostent *he;
 
        i=get_ip(str,ip);
-       if (i > 0) return(1);
        if (i < 0)
                {
                BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_INVALID_IP_ADDRESS);
                goto err;
                }
 
-       /* do a gethostbyname */
-       if (!BIO_sock_init())
-               return(0); /* don't generate another error code here */
+       /* At this point, we have something that is most probably correct
+          in some way, so let's init the socket. */
+       if (BIO_sock_init() != 1)
+               return 0; /* don't generate another error code here */
+
+       /* If the string actually contained an IP address, we need not do
+          anything more */
+       if (i > 0) return(1);
 
+       /* do a gethostbyname */
        CRYPTO_w_lock(CRYPTO_LOCK_GETHOSTBYNAME);
        locked = 1;
        he=BIO_gethostbyname(str);
@@ -166,7 +171,11 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
                /* Note: under VMS with SOCKETSHR, it seems like the first
                 * parameter is 'char *', instead of 'const char *'
                 */
-               s=getservbyname((char *)str,"tcp");
+               s=getservbyname(
+#ifndef CONST_STRICT
+                   (char *)
+#endif
+                   str,"tcp");
                if(s != NULL)
                        *port_ptr=ntohs((unsigned short)s->s_port);
                CRYPTO_w_unlock(CRYPTO_LOCK_GETSERVBYNAME);
@@ -263,14 +272,14 @@ static struct hostent *ghbn_dup(struct hostent *a)
        int i,j;
 
        MemCheck_off();
-       ret=(struct hostent *)Malloc(sizeof(struct hostent));
+       ret=(struct hostent *)OPENSSL_malloc(sizeof(struct hostent));
        if (ret == NULL) return(NULL);
        memset(ret,0,sizeof(struct hostent));
 
        for (i=0; a->h_aliases[i] != NULL; i++)
                ;
        i++;
-       ret->h_aliases = (char **)Malloc(i*sizeof(char *));
+       ret->h_aliases = (char **)OPENSSL_malloc(i*sizeof(char *));
        if (ret->h_aliases == NULL)
                goto err;
        memset(ret->h_aliases, 0, i*sizeof(char *));
@@ -278,25 +287,25 @@ static struct hostent *ghbn_dup(struct hostent *a)
        for (i=0; a->h_addr_list[i] != NULL; i++)
                ;
        i++;
-       ret->h_addr_list=(char **)Malloc(i*sizeof(char *));
+       ret->h_addr_list=(char **)OPENSSL_malloc(i*sizeof(char *));
        if (ret->h_addr_list == NULL)
                goto err;
        memset(ret->h_addr_list, 0, i*sizeof(char *));
 
        j=strlen(a->h_name)+1;
-       if ((ret->h_name=Malloc(j)) == NULL) goto err;
+       if ((ret->h_name=OPENSSL_malloc(j)) == NULL) goto err;
        memcpy((char *)ret->h_name,a->h_name,j);
        for (i=0; a->h_aliases[i] != NULL; i++)
                {
                j=strlen(a->h_aliases[i])+1;
-               if ((ret->h_aliases[i]=Malloc(j)) == NULL) goto err;
+               if ((ret->h_aliases[i]=OPENSSL_malloc(j)) == NULL) goto err;
                memcpy(ret->h_aliases[i],a->h_aliases[i],j);
                }
        ret->h_length=a->h_length;
        ret->h_addrtype=a->h_addrtype;
        for (i=0; a->h_addr_list[i] != NULL; i++)
                {
-               if ((ret->h_addr_list[i]=Malloc(a->h_length)) == NULL)
+               if ((ret->h_addr_list[i]=OPENSSL_malloc(a->h_length)) == NULL)
                        goto err;
                memcpy(ret->h_addr_list[i],a->h_addr_list[i],a->h_length);
                }
@@ -321,17 +330,17 @@ static void ghbn_free(struct hostent *a)
        if (a->h_aliases != NULL)
                {
                for (i=0; a->h_aliases[i] != NULL; i++)
-                       Free(a->h_aliases[i]);
-               Free(a->h_aliases);
+                       OPENSSL_free(a->h_aliases[i]);
+               OPENSSL_free(a->h_aliases);
                }
        if (a->h_addr_list != NULL)
                {
                for (i=0; a->h_addr_list[i] != NULL; i++)
-                       Free(a->h_addr_list[i]);
-               Free(a->h_addr_list);
+                       OPENSSL_free(a->h_addr_list[i]);
+               OPENSSL_free(a->h_addr_list);
                }
-       if (a->h_name != NULL) Free((char *)a->h_name);
-       Free(a);
+       if (a->h_name != NULL) OPENSSL_free(a->h_name);
+       OPENSSL_free(a);
        }
 
 struct hostent *BIO_gethostbyname(const char *name)
@@ -374,7 +383,11 @@ struct hostent *BIO_gethostbyname(const char *name)
                /* Note: under VMS with SOCKETSHR, it seems like the first
                 * parameter is 'char *', instead of 'const char *'
                 */
-               ret=gethostbyname((char *)name);
+               ret=gethostbyname(
+#ifndef CONST_STRICT
+                   (char *)
+#endif
+                   name);
 
                if (ret == NULL)
                        goto end;
@@ -416,7 +429,7 @@ end:
 
 int BIO_sock_init(void)
        {
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
        static struct WSAData wsa_state;
 
        if (!wsa_init_done)
@@ -436,13 +449,13 @@ int BIO_sock_init(void)
                        return(-1);
                        }
                }
-#endif /* WINDOWS */
+#endif /* OPENSSL_SYS_WINDOWS */
        return(1);
        }
 
 void BIO_sock_cleanup(void)
        {
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
        if (wsa_init_done)
                {
                wsa_init_done=0;
@@ -452,7 +465,7 @@ void BIO_sock_cleanup(void)
 #endif
        }
 
-#if !defined(VMS) || __VMS_VER >= 70000000
+#if !defined(OPENSSL_SYS_VMS) || __VMS_VER >= 70000000
 
 int BIO_socket_ioctl(int fd, long type, unsigned long *arg)
        {
@@ -481,16 +494,16 @@ static int get_ip(const char *str, unsigned char ip[4])
                        {
                        ok=1;
                        tmp[num]=tmp[num]*10+c-'0';
-                       if (tmp[num] > 255) return(-1);
+                       if (tmp[num] > 255) return(0);
                        }
                else if (c == '.')
                        {
                        if (!ok) return(-1);
-                       if (num == 3) break;
+                       if (num == 3) return(0);
                        num++;
                        ok=0;
                        }
-               else if ((num == 3) && ok)
+               else if (c == '\0' && (num == 3) && ok)
                        break;
                else
                        return(0);
@@ -506,15 +519,15 @@ int BIO_get_accept_socket(char *host, int bind_mode)
        {
        int ret=0;
        struct sockaddr_in server,client;
-       int s= -1,cs;
+       int s=INVALID_SOCKET,cs;
        unsigned char ip[4];
        unsigned short port;
-       char *str,*e;
+       char *str=NULL,*e;
        const char *h,*p;
        unsigned long l;
        int err_num;
 
-       if (!BIO_sock_init()) return(INVALID_SOCKET);
+       if (BIO_sock_init() != 1) return(INVALID_SOCKET);
 
        if ((str=BUF_strdup(host)) == NULL) return(INVALID_SOCKET);
 
@@ -540,7 +553,7 @@ int BIO_get_accept_socket(char *host, int bind_mode)
                h="*";
                }
 
-       if (!BIO_get_port(p,&port)) return(INVALID_SOCKET);
+       if (!BIO_get_port(p,&port)) goto err;
 
        memset((char *)&server,0,sizeof(server));
        server.sin_family=AF_INET;
@@ -550,7 +563,7 @@ int BIO_get_accept_socket(char *host, int bind_mode)
                server.sin_addr.s_addr=INADDR_ANY;
        else
                {
-               if (!BIO_get_host_ip(h,&(ip[0]))) return(INVALID_SOCKET);
+                if (!BIO_get_host_ip(h,&(ip[0]))) goto err;
                l=(unsigned long)
                        ((unsigned long)ip[0]<<24L)|
                        ((unsigned long)ip[1]<<16L)|
@@ -620,7 +633,7 @@ again:
                }
        ret=1;
 err:
-       if (str != NULL) Free(str);
+       if (str != NULL) OPENSSL_free(str);
        if ((ret == 0) && (s != INVALID_SOCKET))
                {
                closesocket(s);
@@ -648,6 +661,7 @@ int BIO_accept(int sock, char **addr)
        ret=accept(sock,(struct sockaddr *)&from,(void *)&len);
        if (ret == INVALID_SOCKET)
                {
+               if(BIO_sock_should_retry(ret)) return -2;
                SYSerr(SYS_F_ACCEPT,get_last_socket_error());
                BIOerr(BIO_F_BIO_ACCEPT,BIO_R_ACCEPT_ERROR);
                goto end;
@@ -659,7 +673,7 @@ int BIO_accept(int sock, char **addr)
        port=ntohs(from.sin_port);
        if (*addr == NULL)
                {
-               if ((p=Malloc(24)) == NULL)
+               if ((p=OPENSSL_malloc(24)) == NULL)
                        {
                        BIOerr(BIO_F_BIO_ACCEPT,ERR_R_MALLOC_FAILURE);
                        goto end;