Make sure we get the definition of OPENSSL_NO_SOCK.

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

diff --git a/crypto/bio/bss_acpt.c b/crypto/bio/bss_acpt.c
index e6961f2305082b0eea607ba0697664bb3c446cd7..d090b7272fb69d51d6189217f41071ab2d5880d0 100644 (file)
--- a/crypto/bio/bss_acpt.c
+++ b/crypto/bio/bss_acpt.c
@@ -56,22 +56,22 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef NO_SOCK
-
 #include <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
 
-#ifdef WIN16
+#ifndef OPENSSL_NO_SOCK
+
+#ifdef OPENSSL_SYS_WIN16
 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
 #else
 #define SOCKET_PROTOCOL IPPROTO_TCP
 #endif
 
-#if (__VMS_VER < 70000000) /* FIONBIO used as a switch to enable ioctl, 
-                             and that isn't in VMS < 7.0 */
+#if (defined(OPENSSL_SYS_VMS) && __VMS_VER < 70000000)
+/* FIONBIO used as a switch to enable ioctl, and that isn't in VMS < 7.0 */
 #undef FIONBIO
 #endif
 
@@ -92,10 +92,10 @@ typedef struct bio_accept_st
        BIO *bio_chain;
        } BIO_ACCEPT;
 
-static int acpt_write(BIO *h,char *buf,int num);
-static int acpt_read(BIO *h,char *buf,int size);
-static int acpt_puts(BIO *h,char *str);
-static long acpt_ctrl(BIO *h,int cmd,long arg1,char *arg2);
+static int acpt_write(BIO *h, const char *buf, int num);
+static int acpt_read(BIO *h, char *buf, int size);
+static int acpt_puts(BIO *h, const char *str);
+static long acpt_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int acpt_new(BIO *h);
 static int acpt_free(BIO *data);
 static int acpt_state(BIO *b, BIO_ACCEPT *c);
@@ -118,6 +118,7 @@ static BIO_METHOD methods_acceptp=
        acpt_ctrl,
        acpt_new,
        acpt_free,
+       NULL,
        };
 
 BIO_METHOD *BIO_s_accept(void)
@@ -144,7 +145,7 @@ BIO_ACCEPT *BIO_ACCEPT_new(void)
        {
        BIO_ACCEPT *ret;
 
-       if ((ret=(BIO_ACCEPT *)Malloc(sizeof(BIO_ACCEPT))) == NULL)
+       if ((ret=(BIO_ACCEPT *)OPENSSL_malloc(sizeof(BIO_ACCEPT))) == NULL)
                return(NULL);
 
        memset(ret,0,sizeof(BIO_ACCEPT));
@@ -158,10 +159,10 @@ void BIO_ACCEPT_free(BIO_ACCEPT *a)
        if(a == NULL)
            return;
 
-       if (a->param_addr != NULL) Free(a->param_addr);
-       if (a->addr != NULL) Free(a->addr);
+       if (a->param_addr != NULL) OPENSSL_free(a->param_addr);
+       if (a->addr != NULL) OPENSSL_free(a->addr);
        if (a->bio_chain != NULL) BIO_free(a->bio_chain);
-       Free(a);
+       OPENSSL_free(a);
        }
 
 static void acpt_close_socket(BIO *bio)
@@ -235,8 +236,20 @@ again:
                        c->state=ACPT_S_OK;
                        goto again;
                        }
+               BIO_clear_retry_flags(b);
+               b->retry_reason=0;
                i=BIO_accept(c->accept_sock,&(c->addr));
+
+               /* -2 return means we should retry */
+               if(i == -2)
+                       {
+                       BIO_set_retry_special(b);
+                       b->retry_reason=BIO_RR_ACCEPT;
+                       return -1;
+                       }
+
                if (i < 0) return(i);
+
                bio=BIO_new_socket(i,BIO_CLOSE);
                if (bio == NULL) goto err;
 
@@ -292,7 +305,7 @@ static int acpt_read(BIO *b, char *out, int outl)
        int ret=0;
        BIO_ACCEPT *data;
 
-        BIO_clear_retry_flags(b);
+       BIO_clear_retry_flags(b);
        data=(BIO_ACCEPT *)b->ptr;
 
        while (b->next_bio == NULL)
@@ -306,7 +319,7 @@ static int acpt_read(BIO *b, char *out, int outl)
        return(ret);
        }
 
-static int acpt_write(BIO *b, char *in, int inl)
+static int acpt_write(BIO *b, const char *in, int inl)
        {
        int ret;
        BIO_ACCEPT *data;
@@ -325,7 +338,7 @@ static int acpt_write(BIO *b, char *in, int inl)
        return(ret);
        }
 
-static long acpt_ctrl(BIO *b, int cmd, long num, char *ptr)
+static long acpt_ctrl(BIO *b, int cmd, long num, void *ptr)
        {
        BIO *dbio;
        int *ip;
@@ -354,7 +367,7 @@ static long acpt_ctrl(BIO *b, int cmd, long num, char *ptr)
                                {
                                b->init=1;
                                if (data->param_addr != NULL)
-                                       Free(data->param_addr);
+                                       OPENSSL_free(data->param_addr);
                                data->param_addr=BUF_strdup(ptr);
                                }
                        else if (num == 1)
@@ -439,7 +452,7 @@ static long acpt_ctrl(BIO *b, int cmd, long num, char *ptr)
        return(ret);
        }
 
-static int acpt_puts(BIO *bp, char *str)
+static int acpt_puts(BIO *bp, const char *str)
        {
        int n,ret;