Add a pointer to a paper (is the algorithm in section 4.2 the

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

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index eaa471685dbbe343c7a76e9f6bf865e87ba9a321..dce0c0390bba3e34e8e37e4d64807c13685bda43 100644 (file)
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -100,6 +100,8 @@ static struct hostent *ghbn_dup(struct hostent *a);
 int BIO_get_host_ip(const char *str, unsigned char *ip)
        {
        int i;
+       int err = 1;
+       int locked = 0;
        struct hostent *he;
 
        i=get_ip(str,ip);
@@ -107,32 +109,42 @@ int BIO_get_host_ip(const char *str, unsigned char *ip)
        if (i < 0)
                {
                BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_INVALID_IP_ADDRESS);
-               ERR_add_error_data(2,"host=",str);
-               return(0);
+               goto err;
                }
-       else
-               { /* do a gethostbyname */
-               if (!BIO_sock_init()) return(0);
 
-               he=BIO_gethostbyname(str);
-               if (he == NULL)
-                       {
-                       BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_BAD_HOSTNAME_LOOKUP);
-                       ERR_add_error_data(2,"host=",str);
-                       return(0);
-                       }
+       /* do a gethostbyname */
+       if (!BIO_sock_init())
+               return(0); /* don't generate another error code here */
 
-               /* cast to short because of win16 winsock definition */
-               if ((short)he->h_addrtype != AF_INET)
-                       {
-                       BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET);
-                       ERR_add_error_data(2,"host=",str);
-                       return(0);
-                       }
-               for (i=0; i<4; i++)
-                       ip[i]=he->h_addr_list[0][i];
+       CRYPTO_w_lock(CRYPTO_LOCK_GETHOSTBYNAME);
+       locked = 1;
+       he=BIO_gethostbyname(str);
+       if (he == NULL)
+               {
+               BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_BAD_HOSTNAME_LOOKUP);
+               goto err;
                }
-       return(1);
+
+       /* cast to short because of win16 winsock definition */
+       if ((short)he->h_addrtype != AF_INET)
+               {
+               BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_GETHOSTBYNAME_ADDR_IS_NOT_AF_INET);
+               goto err;
+               }
+       for (i=0; i<4; i++)
+               ip[i]=he->h_addr_list[0][i];
+       err = 0;
+
+ err:
+       if (locked)
+               CRYPTO_w_unlock(CRYPTO_LOCK_GETHOSTBYNAME);
+       if (err)
+               {
+               ERR_add_error_data(2,"host=",str);
+               return 0;
+               }
+       else
+               return 1;
        }
 
 int BIO_get_port(const char *str, unsigned short *port_ptr)
@@ -151,7 +163,10 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
        else
                {
                CRYPTO_w_lock(CRYPTO_LOCK_GETSERVBYNAME);
-               s=getservbyname(str,"tcp");
+               /* Note: under VMS with SOCKETSHR, it seems like the first
+                * parameter is 'char *', instead of 'const char *'
+                */
+               s=getservbyname((char *)str,"tcp");
                if(s != NULL)
                        *port_ptr=ntohs((unsigned short)s->s_port);
                CRYPTO_w_unlock(CRYPTO_LOCK_GETSERVBYNAME);
@@ -270,12 +285,12 @@ static struct hostent *ghbn_dup(struct hostent *a)
 
        j=strlen(a->h_name)+1;
        if ((ret->h_name=Malloc(j)) == NULL) goto err;
-       memcpy((char *)ret->h_name,a->h_name,j+1);
+       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;
-               memcpy(ret->h_aliases[i],a->h_aliases[i],j+1);
+               memcpy(ret->h_aliases[i],a->h_aliases[i],j);
                }
        ret->h_length=a->h_length;
        ret->h_addrtype=a->h_addrtype;
@@ -327,7 +342,12 @@ struct hostent *BIO_gethostbyname(const char *name)
 
 /*     return(gethostbyname(name)); */
 
+#if 0 /* It doesn't make sense to use locking here: The function interface
+          * is not thread-safe, because threads can never be sure when
+          * some other thread destroys the data they were given a pointer to.
+          */
        CRYPTO_w_lock(CRYPTO_LOCK_GETHOSTBYNAME);
+#endif
        j=strlen(name);
        if (j < 128)
                {
@@ -351,19 +371,26 @@ struct hostent *BIO_gethostbyname(const char *name)
        if (i == GHBN_NUM) /* no hit*/
                {
                BIO_ghbn_miss++;
-               ret=gethostbyname(name);
+               /* Note: under VMS with SOCKETSHR, it seems like the first
+                * parameter is 'char *', instead of 'const char *'
+                */
+               ret=gethostbyname((char *)name);
 
                if (ret == NULL)
                        goto end;
                if (j > 128) /* too big to cache */
                        {
+#if 0 /* If we were trying to make this function thread-safe (which
+          * is bound to fail), we'd have to give up in this case
+          * (or allocate more memory). */
                        ret = NULL;
+#endif
                        goto end;
                        }
 
                /* else add to cache */
                if (ghbn_cache[lowi].ent != NULL)
-                       ghbn_free(ghbn_cache[lowi].ent);
+                       ghbn_free(ghbn_cache[lowi].ent); /* XXX not thread-safe */
                ghbn_cache[lowi].name[0] = '\0';
 
                if((ret=ghbn_cache[lowi].ent=ghbn_dup(ret)) == NULL)
@@ -381,7 +408,9 @@ struct hostent *BIO_gethostbyname(const char *name)
                ghbn_cache[i].order=BIO_ghbn_miss+BIO_ghbn_hits;
                }
 end:
+#if 0
        CRYPTO_w_unlock(CRYPTO_LOCK_GETHOSTBYNAME);
+#endif
        return(ret);
        }