Import of old SSLeay release: SSLeay 0.9.1b (unreleased)

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

diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index d907a2867ba1fdeaccb778cac8050c480f2813e5..a664377d39a467e1931d18fba71f36c6e8b012d7 100644 (file)
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -189,11 +189,7 @@ BIO *a;
                        {
 #ifndef BIO_FD
                        shutdown(a->num,2);
                        {
 #ifndef BIO_FD
                        shutdown(a->num,2);

-# ifdef WINDOWS

                        closesocket(a->num);
                        closesocket(a->num);

-# else
-                       close(a->num);
-# endif

 #else                  /* BIO_FD */
                        close(a->num);
 #endif
 #else                  /* BIO_FD */
                        close(a->num);
 #endif


@@ -218,9 +214,9 @@ int outl;
 
        if (out != NULL)
                {
 
        if (out != NULL)
                {

-#if defined(WINDOWS) && !defined(BIO_FD)
+#ifndef BIO_FD

                clear_socket_error();
                clear_socket_error();

-               ret=recv(b->num,out,outl,0);
+               ret=readsocket(b->num,out,outl);

 #else
                clear_sys_error();
                ret=read(b->num,out,outl);
 #else
                clear_sys_error();
                ret=read(b->num,out,outl);


@@ -250,9 +246,9 @@ int inl;
        {
        int ret;
        
        {
        int ret;
        

-#if defined(WINDOWS) && !defined(BIO_FD)
+#ifndef BIO_FD

        clear_socket_error();
        clear_socket_error();

-       ret=send(b->num,in,inl,0);
+       ret=writesocket(b->num,in,inl);

 #else
        clear_sys_error();
        ret=write(b->num,in,inl);
 #else
        clear_sys_error();
        ret=write(b->num,in,inl);


@@ -286,14 +282,21 @@ char *ptr;
        switch (cmd)
                {
        case BIO_CTRL_RESET:
        switch (cmd)
                {
        case BIO_CTRL_RESET:

+               num=0;
+       case BIO_C_FILE_SEEK:

 #ifdef BIO_FD
 #ifdef BIO_FD

-               ret=(long)lseek(b->num,0,0);
+               ret=(long)lseek(b->num,num,0);

 #else
                ret=0;
 #endif
                break;
 #else
                ret=0;
 #endif
                break;

+       case BIO_C_FILE_TELL:

        case BIO_CTRL_INFO:
        case BIO_CTRL_INFO:

+#ifdef BIO_FD
+               ret=(long)lseek(b->num,0,1);
+#else

                ret=0;
                ret=0;

+#endif

                break;
        case BIO_C_SET_FD:
 #ifndef BIO_FD
                break;
        case BIO_C_SET_FD:
 #ifndef BIO_FD


@@ -329,7 +332,6 @@ char *ptr;
        case BIO_CTRL_FLUSH:
                ret=1;
                break;
        case BIO_CTRL_FLUSH:
                ret=1;
                break;

-               break;

        default:
                ret=0;
                break;
        default:
                ret=0;
                break;


@@ -377,7 +379,7 @@ int i;
 
        if ((i == 0) || (i == -1))
                {
 
        if ((i == 0) || (i == -1))
                {

-#if !defined(BIO_FD) && defined(WINDOWS)
+#ifndef BIO_FD

                err=get_last_socket_error();
 #else
                err=get_last_sys_error();
                err=get_last_socket_error();
 #else
                err=get_last_sys_error();


@@ -411,8 +413,10 @@ int err;
        case WSAEWOULDBLOCK:
 # endif
 
        case WSAEWOULDBLOCK:
 # endif
 

-# if defined(WSAENOTCONN)
+# if 0 /* This appears to always be an error */
+#  if defined(WSAENOTCONN)

        case WSAENOTCONN:
        case WSAENOTCONN:

+#  endif

 # endif
 #endif
 
 # endif
 #endif
 


@@ -452,7 +456,7 @@ int err;
        case EALREADY:
 #endif
                return(1);
        case EALREADY:
 #endif
                return(1);

-               break;
+               /* break; */

        default:
                break;
                }
        default:
                break;
                }