Make get_ip() a bit more strict in it's parsing of IP addresses, and
[openssl.git] / crypto / bio / b_sock.c
index adab62135e7ddbf6da275a3bf77b26e50b577eb0..5b66603d7d92a5982908dbde542d7042d737fe76 100644 (file)
@@ -1,5 +1,5 @@
 /* crypto/bio/b_sock.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_SOCK
+#ifndef OPENSSL_NO_SOCK
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
-/*     BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */
-
-#ifdef WIN16
+#ifdef OPENSSL_SYS_WIN16
 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
 #else
 #define SOCKET_PROTOCOL IPPROTO_TCP
 #endif
 
-#ifdef WINDOWS
+#ifdef SO_MAXCONN
+#define MAX_LISTEN  SOMAXCONN
+#elif defined(SO_MAXCONN)
+#define MAX_LISTEN  SO_MAXCONN
+#else
+#define MAX_LISTEN  32
+#endif
+
+#ifdef OPENSSL_SYS_WINDOWS
 static int wsa_init_done=0;
 #endif
 
-unsigned long BIO_ghbn_hits=0L;
-unsigned long BIO_ghbn_miss=0L;
+static unsigned long BIO_ghbn_hits=0L;
+static unsigned long BIO_ghbn_miss=0L;
 
-#ifndef NOPROTO
-static int get_ip(char *str,unsigned char *ip);
-#else
-static int get_ip();
-#endif
+#define GHBN_NUM       4
+static struct ghbn_cache_st
+       {
+       char name[129];
+       struct hostent *ent;
+       unsigned long order;
+       } ghbn_cache[GHBN_NUM];
 
-int BIO_get_host_ip(str,ip)
-char *str;
-unsigned char *ip;
+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);
+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);
-       if (i > 0) return(1);
        if (i < 0)
                {
                BIOerr(BIO_F_BIO_GET_HOST_IP,BIO_R_INVALID_IP_ADDRESS);
-               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);
-                       return(0);
-                       }
+       /* 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 */
 
-               /* 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);
-                       return(0);
-                       }
-               for (i=0; i<4; i++)
-                       ip[i]=he->h_addr_list[0][i];
+       /* 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);
+       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(str,port_ptr)
-char *str;
-short *port_ptr;
+int BIO_get_port(const char *str, unsigned short *port_ptr)
        {
        int i;
        struct servent *s;
@@ -139,8 +167,19 @@ short *port_ptr;
                *port_ptr=(unsigned short)i;
        else
                {
-               s=getservbyname(str,"tcp");
-               if (s == NULL)
+               CRYPTO_w_lock(CRYPTO_LOCK_GETSERVBYNAME);
+               /* Note: under VMS with SOCKETSHR, it seems like the first
+                * parameter is 'char *', instead of 'const char *'
+                */
+               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);
+               if(s == NULL)
                        {
                        if (strcmp(str,"http") == 0)
                                *port_ptr=80;
@@ -162,47 +201,164 @@ short *port_ptr;
 #endif
                        else
                                {
-                               SYSerr(SYS_F_GETSERVBYNAME,errno);
+                               SYSerr(SYS_F_GETSERVBYNAME,get_last_socket_error());
+                               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(sock)
-int sock;
+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
                return(j);
        }
 
-#define GHBN_NUM       4
-static struct ghbn_cache_st
+long BIO_ghbn_ctrl(int cmd, int iarg, char *parg)
        {
-       char name[128];
-       struct hostent ent;
-       unsigned long order;
-       } ghbn_cache[GHBN_NUM];
+       int i;
+       char **p;
 
-struct hostent *BIO_gethostbyname(name)
-char *name;
+       switch (cmd)
+               {
+       case BIO_GHBN_CTRL_HITS:
+               return(BIO_ghbn_hits);
+               /* break; */
+       case BIO_GHBN_CTRL_MISSES:
+               return(BIO_ghbn_miss);
+               /* break; */
+       case BIO_GHBN_CTRL_CACHE_SIZE:
+               return(GHBN_NUM);
+               /* break; */
+       case BIO_GHBN_CTRL_GET_ENTRY:
+               if ((iarg >= 0) && (iarg <GHBN_NUM) &&
+                       (ghbn_cache[iarg].order > 0))
+                       {
+                       p=(char **)parg;
+                       if (p == NULL) return(0);
+                       *p=ghbn_cache[iarg].name;
+                       ghbn_cache[iarg].name[128]='\0';
+                       return(1);
+                       }
+               return(0);
+               /* break; */
+       case BIO_GHBN_CTRL_FLUSH:
+               for (i=0; i<GHBN_NUM; i++)
+                       ghbn_cache[i].order=0;
+               break;
+       default:
+               return(0);
+               }
+       return(1);
+       }
+
+static struct hostent *ghbn_dup(struct hostent *a)
        {
        struct hostent *ret;
-       int i,lowi=0;
+       int i,j;
+
+       MemCheck_off();
+       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 **)OPENSSL_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 **)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=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]=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]=OPENSSL_malloc(a->h_length)) == NULL)
+                       goto err;
+               memcpy(ret->h_addr_list[i],a->h_addr_list[i],a->h_length);
+               }
+       if (0)
+               {
+err:   
+               if (ret != NULL)
+                       ghbn_free(ret);
+               ret=NULL;
+               }
+       MemCheck_on();
+       return(ret);
+       }
+
+static void ghbn_free(struct hostent *a)
+       {
+       int i;
+
+       if(a == NULL)
+           return;
+
+       if (a->h_aliases != NULL)
+               {
+               for (i=0; a->h_aliases[i] != NULL; i++)
+                       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++)
+                       OPENSSL_free(a->h_addr_list[i]);
+               OPENSSL_free(a->h_addr_list);
+               }
+       if (a->h_name != NULL) OPENSSL_free(a->h_name);
+       OPENSSL_free(a);
+       }
+
+struct hostent *BIO_gethostbyname(const char *name)
+       {
+       struct hostent *ret;
+       int i,lowi=0,j;
        unsigned long low= (unsigned long)-1;
 
-       CRYPTO_w_lock(CRYPTO_LOCK_BIO_GETHOSTBYNAME);
-       if (strlen(name) < 128)
+/*     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)
                {
                for (i=0; i<GHBN_NUM; i++)
                        {
@@ -224,26 +380,56 @@ char *name;
        if (i == GHBN_NUM) /* no hit*/
                {
                BIO_ghbn_miss++;
-               ret=gethostbyname(name);
-               if (ret == NULL) return(NULL);
+               /* Note: under VMS with SOCKETSHR, it seems like the first
+                * parameter is 'char *', instead of 'const char *'
+                */
+               ret=gethostbyname(
+#ifndef CONST_STRICT
+                   (char *)
+#endif
+                   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); /* XXX not thread-safe */
+               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);
-               memcpy((char *)&(ghbn_cache[lowi].ent),ret,sizeof(struct hostent));
                ghbn_cache[lowi].order=BIO_ghbn_miss+BIO_ghbn_hits;
                }
        else
                {
                BIO_ghbn_hits++;
-               ret= &(ghbn_cache[i].ent);
+               ret= ghbn_cache[i].ent;
                ghbn_cache[i].order=BIO_ghbn_miss+BIO_ghbn_hits;
                }
-       CRYPTO_w_unlock(CRYPTO_LOCK_BIO_GETHOSTBYNAME);
+end:
+#if 0
+       CRYPTO_w_unlock(CRYPTO_LOCK_GETHOSTBYNAME);
+#endif
        return(ret);
        }
 
-int BIO_sock_init()
+int BIO_sock_init(void)
        {
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
        static struct WSAData wsa_state;
 
        if (!wsa_init_done)
@@ -263,13 +449,13 @@ int BIO_sock_init()
                        return(-1);
                        }
                }
-#endif /* WINDOWS */
+#endif /* OPENSSL_SYS_WINDOWS */
        return(1);
        }
 
-void BIO_sock_cleanup()
+void BIO_sock_cleanup(void)
        {
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
        if (wsa_init_done)
                {
                wsa_init_done=0;
@@ -279,35 +465,22 @@ void BIO_sock_cleanup()
 #endif
        }
 
-int BIO_socket_ioctl(fd,type,arg)
-int fd;
-long type;
-unsigned long *arg;
+#if !defined(OPENSSL_SYS_VMS) || __VMS_VER >= 70000000
+
+int BIO_socket_ioctl(int fd, long type, unsigned long *arg)
        {
-       int i,err;
+       int i;
 
-#ifdef WINDOWS
        i=ioctlsocket(fd,type,arg);
-#else
-       i=ioctl(fd,type,arg);
-#endif
        if (i < 0)
-               {
-#ifdef WINDOWS
-               err=WSAGetLastError();
-#else
-               err=errno;
-#endif
-               SYSerr(SYS_F_IOCTLSOCKET,err);
-               }
+               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 :-( */
-static int get_ip(str,ip)
-char *str;
-unsigned char ip[4];
+static int get_ip(const char *str, unsigned char ip[4])
        {
        unsigned int tmp[4];
        int num=0,c,ok=0;
@@ -321,16 +494,16 @@ 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);
@@ -342,18 +515,19 @@ unsigned char ip[4];
        return(1);
        }
 
-int BIO_get_accept_socket(host)
-char *host;
+int BIO_get_accept_socket(char *host, int bind_mode)
        {
        int ret=0;
-       struct sockaddr_in server;
-       int s= -1;
+       struct sockaddr_in server,client;
+       int s=INVALID_SOCKET,cs;
        unsigned char ip[4];
-       short port;
-       char *str,*h,*p,*e;
+       unsigned short port;
+       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);
 
@@ -379,88 +553,116 @@ char *host;
                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;
-       server.sin_port=htons((unsigned short)port);
+       server.sin_port=htons(port);
 
        if (strcmp(h,"*") == 0)
                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[0]<<16L)|
-                       ((unsigned long)ip[0]<< 8L)|
-                       ((unsigned long)ip[0]);
+                       ((unsigned long)ip[1]<<16L)|
+                       ((unsigned long)ip[2]<< 8L)|
+                       ((unsigned long)ip[3]);
                server.sin_addr.s_addr=htonl(l);
                }
 
+again:
        s=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
        if (s == INVALID_SOCKET)
                {
-#ifdef WINDOWS
-               errno=WSAGetLastError();
-#endif
-               SYSerr(SYS_F_SOCKET,errno);
-               BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,BIO_R_UNABLE_TO_BIND_SOCKET);
+               SYSerr(SYS_F_SOCKET,get_last_socket_error());
+               ERR_add_error_data(3,"port='",host,"'");
+               BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,BIO_R_UNABLE_TO_CREATE_SOCKET);
                goto err;
                }
+
+#ifdef SO_REUSEADDR
+       if (bind_mode == BIO_BIND_REUSEADDR)
+               {
+               int i=1;
+
+               ret=setsockopt(s,SOL_SOCKET,SO_REUSEADDR,(char *)&i,sizeof(i));
+               bind_mode=BIO_BIND_NORMAL;
+               }
+#endif
        if (bind(s,(struct sockaddr *)&server,sizeof(server)) == -1)
                {
-#ifdef WINDOWS
-               errno=WSAGetLastError();
+#ifdef SO_REUSEADDR
+               err_num=get_last_socket_error();
+               if ((bind_mode == BIO_BIND_REUSEADDR_IF_UNUSED) &&
+                       (err_num == EADDRINUSE))
+                       {
+                       memcpy((char *)&client,(char *)&server,sizeof(server));
+                       if (strcmp(h,"*") == 0)
+                               client.sin_addr.s_addr=htonl(0x7F000001);
+                       cs=socket(AF_INET,SOCK_STREAM,SOCKET_PROTOCOL);
+                       if (cs != INVALID_SOCKET)
+                               {
+                               int ii;
+                               ii=connect(cs,(struct sockaddr *)&client,
+                                       sizeof(client));
+                               closesocket(cs);
+                               if (ii == INVALID_SOCKET)
+                                       {
+                                       bind_mode=BIO_BIND_REUSEADDR;
+                                       closesocket(s);
+                                       goto again;
+                                       }
+                               /* else error */
+                               }
+                       /* else error */
+                       }
 #endif
-               SYSerr(SYS_F_BIND,errno);
+               SYSerr(SYS_F_BIND,err_num);
+               ERR_add_error_data(3,"port='",host,"'");
                BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,BIO_R_UNABLE_TO_BIND_SOCKET);
                goto err;
                }
-       if (listen(s,5) == -1)
+       if (listen(s,MAX_LISTEN) == -1)
                {
-#ifdef WINDOWS
-               errno=WSAGetLastError();
-#endif
-               SYSerr(SYS_F_LISTEN,errno);
+               SYSerr(SYS_F_BIND,get_last_socket_error());
+               ERR_add_error_data(3,"port='",host,"'");
                BIOerr(BIO_F_BIO_GET_ACCEPT_SOCKET,BIO_R_UNABLE_TO_LISTEN_SOCKET);
                goto err;
                }
        ret=1;
 err:
-       if (str != NULL) Free(str);
+       if (str != NULL) OPENSSL_free(str);
        if ((ret == 0) && (s != INVALID_SOCKET))
                {
-#ifdef WINDOWS
                closesocket(s);
-#else
-               close(s);
-#endif
                s= INVALID_SOCKET;
                }
        return(s);
        }
 
-int BIO_accept(sock,addr)
-int sock;
-char **addr;
+int BIO_accept(int sock, char **addr)
        {
        int ret=INVALID_SOCKET;
        static struct sockaddr_in from;
        unsigned long l;
-       short port;
+       unsigned short port;
        int len;
        char *p;
 
        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)
                {
-#ifdef WINDOWS
-               errno=WSAGetLastError();
-#endif
-               SYSerr(SYS_F_ACCEPT,errno);
+               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;
                }
@@ -471,7 +673,7 @@ 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;
@@ -488,9 +690,7 @@ end:
        return(ret);
        }
 
-int BIO_set_tcp_ndelay(s,on)
-int s;
-int on;
+int BIO_set_tcp_ndelay(int s, int on)
        {
        int ret=0;
 #if defined(TCP_NODELAY) && (defined(IPPROTO_TCP) || defined(SOL_TCP))
@@ -510,3 +710,14 @@ int on;
        }
 #endif
 
+int BIO_socket_nbio(int s, int mode)
+       {
+       int ret= -1;
+       unsigned long l;
+
+       l=mode;
+#ifdef FIONBIO
+       ret=BIO_socket_ioctl(s,FIONBIO,&l);
+#endif
+       return(ret == 0);
+       }