Make get_ip() a bit more strict in it's parsing of IP addresses, and

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

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index e971a07de0e13998a087f99fc7de6d426a357058..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
 
@@ -429,7 +429,7 @@ end:
 
 int BIO_sock_init(void)
        {
-#ifdef WINDOWS
+#ifdef OPENSSL_SYS_WINDOWS
        static struct WSAData wsa_state;
 
        if (!wsa_init_done)
@@ -449,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;
@@ -465,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)
        {
@@ -494,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);
@@ -519,10 +519,10 @@ 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;
@@ -553,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;
@@ -563,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)|
@@ -661,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;