Various bugfixes: Uses locking for some more of the stuff that is not

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

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index d14a7797fdd3206513669c4b222462ad2f8b0ac4..eaa471685dbbe343c7a76e9f6bf865e87ba9a321 100644 (file)
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -63,9 +63,7 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
-
-/*     BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */
+#include <openssl/bio.h>
 
 #ifdef WIN16
 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
@@ -96,16 +94,9 @@ static struct ghbn_cache_st
        unsigned long order;
        } ghbn_cache[GHBN_NUM];
 
-#ifndef NOPROTO
 static int get_ip(const char *str,unsigned char *ip);
 static void ghbn_free(struct hostent *a);
 static struct hostent *ghbn_dup(struct hostent *a);
-#else
-static int get_ip();
-static void ghbn_free();
-static struct hostent *ghbn_dup();
-#endif
-
 int BIO_get_host_ip(const char *str, unsigned char *ip)
        {
        int i;
@@ -159,8 +150,12 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
                *port_ptr=(unsigned short)i;
        else
                {
-               s=getservbyname(str,"tcp");
-               if (s == NULL)
+               CRYPTO_w_lock(CRYPTO_LOCK_GETSERVBYNAME);
+               s=getservbyname(str,"tcp");
+               if(s != NULL)
+                       *port_ptr=ntohs((unsigned short)s->s_port);
+               CRYPTO_w_unlock(CRYPTO_LOCK_GETSERVBYNAME);
+               if(s == NULL)
                        {
                        if (strcmp(str,"http") == 0)
                                *port_ptr=80;
@@ -186,20 +181,23 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
                                ERR_add_error_data(3,"service='",str,"'");
                                return(0);
                                }
-                       return(1);
                        }
-               *port_ptr=htons((unsigned short)s->s_port);
                }
        return(1);
        }
 
 int BIO_sock_error(int sock)
        {
-       int j,i,size;
+       int j,i;
+       int size;
                 
        size=sizeof(int);
-
-       i=getsockopt(sock,SOL_SOCKET,SO_ERROR,(char *)&j,&size);
+       /* 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
+        * you can either go for (char *) or (void *).
+        */
+       i=getsockopt(sock,SOL_SOCKET,SO_ERROR,(void *)&j,(void *)&size);
        if (i < 0)
                return(1);
        else
@@ -257,16 +255,18 @@ static struct hostent *ghbn_dup(struct hostent *a)
        for (i=0; a->h_aliases[i] != NULL; i++)
                ;
        i++;
-       ret->h_aliases=(char **)Malloc(sizeof(char *)*i);
-       memset(ret->h_aliases,0,sizeof(char *)*i);
-       if (ret == NULL) goto err;
+       ret->h_aliases = (char **)Malloc(i*sizeof(char *));
+       if (ret->h_aliases == NULL)
+               goto err;
+       memset(ret->h_aliases, 0, i*sizeof(char *));
 
        for (i=0; a->h_addr_list[i] != NULL; i++)
                ;
        i++;
-       ret->h_addr_list=(char **)Malloc(sizeof(char *)*i);
-       memset(ret->h_addr_list,0,sizeof(char *)*i);
-       if (ret->h_addr_list == NULL) goto err;
+       ret->h_addr_list=(char **)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;
@@ -327,7 +327,7 @@ struct hostent *BIO_gethostbyname(const char *name)
 
 /*     return(gethostbyname(name)); */
 
-       CRYPTO_w_lock(CRYPTO_LOCK_BIO_GETHOSTBYNAME);
+       CRYPTO_w_lock(CRYPTO_LOCK_GETHOSTBYNAME);
        j=strlen(name);
        if (j < 128)
                {
@@ -353,15 +353,25 @@ struct hostent *BIO_gethostbyname(const char *name)
                BIO_ghbn_miss++;
                ret=gethostbyname(name);
 
-               if (ret == NULL) return(NULL);
-               if (j > 128) return(ret); /* too big to cache */
+               if (ret == NULL)
+                       goto end;
+               if (j > 128) /* too big to cache */
+                       {
+                       ret = NULL;
+                       goto end;
+                       }
 
                /* else add to cache */
                if (ghbn_cache[lowi].ent != NULL)
                        ghbn_free(ghbn_cache[lowi].ent);
+               ghbn_cache[lowi].name[0] = '\0';
 
+               if((ret=ghbn_cache[lowi].ent=ghbn_dup(ret)) == NULL)
+                       {
+                       BIOerr(BIO_F_BIO_GETHOSTBYNAME,ERR_R_MALLOC_FAILURE);
+                       goto end;
+                       }
                strncpy(ghbn_cache[lowi].name,name,128);
-               ghbn_cache[lowi].ent=ghbn_dup(ret);
                ghbn_cache[lowi].order=BIO_ghbn_miss+BIO_ghbn_hits;
                }
        else
@@ -370,7 +380,8 @@ struct hostent *BIO_gethostbyname(const char *name)
                ret= ghbn_cache[i].ent;
                ghbn_cache[i].order=BIO_ghbn_miss+BIO_ghbn_hits;
                }
-       CRYPTO_w_unlock(CRYPTO_LOCK_BIO_GETHOSTBYNAME);
+end:
+       CRYPTO_w_unlock(CRYPTO_LOCK_GETHOSTBYNAME);
        return(ret);
        }
 
@@ -412,6 +423,8 @@ void BIO_sock_cleanup(void)
 #endif
        }
 
+#if !defined(VMS) || __VMS_VER >= 70000000
+
 int BIO_socket_ioctl(int fd, long type, unsigned long *arg)
        {
        int i;
@@ -421,6 +434,7 @@ int BIO_socket_ioctl(int fd, long type, unsigned long *arg)
                SYSerr(SYS_F_IOCTLSOCKET,get_last_socket_error());
        return(i);
        }
+#endif /* __VMS_VER */
 
 /* The reason I have implemented this instead of using sscanf is because
  * Visual C 1.52c gives an unresolved external when linking a DLL :-( */
@@ -597,7 +611,12 @@ int BIO_accept(int sock, char **addr)
 
        memset((char *)&from,0,sizeof(from));
        len=sizeof(from);
-       ret=accept(sock,(struct sockaddr *)&from,&len);
+       /* Note: under VMS with SOCKETSHR the fourth parameter is currently
+        * of type (int *) 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 you can either go for (int *) or (void *).
+        */
+       ret=accept(sock,(struct sockaddr *)&from,(void *)&len);
        if (ret == INVALID_SOCKET)
                {
                SYSerr(SYS_F_ACCEPT,get_last_socket_error());