X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fbio%2Fbss_sock.c;h=472dd75821c5e65d4b3cfd93fe777a489a7d449b;hb=cec2af75102df52c2f270b3751e3487f47fccb6c;hp=ac96027051ecdcff3a659497b38ba3be7af673b2;hpb=b7896b3cb86d80206af14a14d69b0717786f2729;p=oweals%2Fopenssl.git

diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c
index ac96027051..472dd75821 100644
--- a/crypto/bio/bss_sock.c
+++ b/crypto/bio/bss_sock.c
@@ -1,5 +1,5 @@
 /* crypto/bio/bss_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
@@ -56,58 +56,30 @@
  * [including the GNU Public Licence.]
  */
 
-#if !defined(NO_SOCK) || defined(BIO_FD)
-
 #include <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
+
+#ifdef WATT32
+#define sock_write SockWrite  /* Watt-32 uses same names */
+#define sock_read  SockRead
+#define sock_puts  SockPuts
+#endif
 
-#ifndef BIO_FD
-#ifndef NOPROTO
-static int sock_write(BIO *h,char *buf,int num);
-static int sock_read(BIO *h,char *buf,int size);
-static int sock_puts(BIO *h,char *str);
-static long sock_ctrl(BIO *h,int cmd,long arg1,char *arg2);
+static int sock_write(BIO *h, const char *buf, int num);
+static int sock_read(BIO *h, char *buf, int size);
+static int sock_puts(BIO *h, const char *str);
+static long sock_ctrl(BIO *h, int cmd, long arg1, void *arg2);
 static int sock_new(BIO *h);
 static int sock_free(BIO *data);
 int BIO_sock_should_retry(int s);
-#else
-static int sock_write();
-static int sock_read();
-static int sock_puts();
-static long sock_ctrl();
-static int sock_new();
-static int sock_free();
-int BIO_sock_should_retry();
-#endif
 
-#else
-
-#ifndef NOPROTO
-static int fd_write(BIO *h,char *buf,int num);
-static int fd_read(BIO *h,char *buf,int size);
-static int fd_puts(BIO *h,char *str);
-static long fd_ctrl(BIO *h,int cmd,long arg1,char *arg2);
-static int fd_new(BIO *h);
-static int fd_free(BIO *data);
-int BIO_fd_should_retry(int s);
-#else
-static int fd_write();
-static int fd_read();
-static int fd_puts();
-static long fd_ctrl();
-static int fd_new();
-static int fd_free();
-int BIO_fd_should_retry();
-#endif
-#endif
-
-#ifndef BIO_FD
 static BIO_METHOD methods_sockp=
 	{
-	BIO_TYPE_SOCKET,"socket",
+	BIO_TYPE_SOCKET,
+	"socket",
 	sock_write,
 	sock_read,
 	sock_puts,
@@ -115,57 +87,25 @@ static BIO_METHOD methods_sockp=
 	sock_ctrl,
 	sock_new,
 	sock_free,
+	NULL,
 	};
 
-BIO_METHOD *BIO_s_socket()
+BIO_METHOD *BIO_s_socket(void)
 	{
 	return(&methods_sockp);
 	}
-#else
-static BIO_METHOD methods_fdp=
-	{
-	BIO_TYPE_FD,"file descriptor",
-	fd_write,
-	fd_read,
-	fd_puts,
-	NULL, /* fd_gets, */
-	fd_ctrl,
-	fd_new,
-	fd_free,
-	};
 
-BIO_METHOD *BIO_s_fd()
-	{
-	return(&methods_fdp);
-	}
-#endif
-
-#ifndef BIO_FD
-BIO *BIO_new_socket(fd,close_flag)
-#else
-BIO *BIO_new_fd(fd,close_flag)
-#endif
-int fd;
-int close_flag;
+BIO *BIO_new_socket(int fd, int close_flag)
 	{
 	BIO *ret;
 
-#ifndef BIO_FD
 	ret=BIO_new(BIO_s_socket());
-#else
-	ret=BIO_new(BIO_s_fd());
-#endif
 	if (ret == NULL) return(NULL);
 	BIO_set_fd(ret,fd,close_flag);
 	return(ret);
 	}
 
-#ifndef BIO_FD
-static int sock_new(bi)
-#else
-static int fd_new(bi)
-#endif
-BIO *bi;
+static int sock_new(BIO *bi)
 	{
 	bi->init=0;
 	bi->num=0;
@@ -174,29 +114,14 @@ BIO *bi;
 	return(1);
 	}
 
-#ifndef BIO_FD
-static int sock_free(a)
-#else
-static int fd_free(a)
-#endif
-BIO *a;
+static int sock_free(BIO *a)
 	{
 	if (a == NULL) return(0);
 	if (a->shutdown)
 		{
 		if (a->init)
 			{
-#ifndef BIO_FD
-			shutdown(a->num,2);
-# ifdef WINDOWS
-			closesocket(a->num);
-# else
-			close(a->num);
-# endif
-#else			/* BIO_FD */
-			close(a->num);
-#endif
-
+			SHUTDOWN2(a->num);
 			}
 		a->init=0;
 		a->flags=0;
@@ -204,78 +129,40 @@ BIO *a;
 	return(1);
 	}
 	
-#ifndef BIO_FD
-static int sock_read(b,out,outl)
-#else
-static int fd_read(b,out,outl)
-#endif
-BIO *b;
-char *out;
-int outl;
+static int sock_read(BIO *b, char *out, int outl)
 	{
 	int ret=0;
 
 	if (out != NULL)
 		{
-		errno=0;
-#if defined(WINDOWS) && !defined(BIO_FD)
-		ret=recv(b->num,out,outl,0);
-#else
-		ret=read(b->num,out,outl);
-#endif
+		clear_socket_error();
+		ret=readsocket(b->num,out,outl);
 		BIO_clear_retry_flags(b);
 		if (ret <= 0)
 			{
-#ifndef BIO_FD
 			if (BIO_sock_should_retry(ret))
-#else
-			if (BIO_fd_should_retry(ret))
-#endif
 				BIO_set_retry_read(b);
 			}
 		}
 	return(ret);
 	}
 
-#ifndef BIO_FD
-static int sock_write(b,in,inl)
-#else
-static int fd_write(b,in,inl)
-#endif
-BIO *b;
-char *in;
-int inl;
+static int sock_write(BIO *b, const char *in, int inl)
 	{
 	int ret;
 	
-	errno=0;
-#if defined(WINDOWS) && !defined(BIO_FD)
-	ret=send(b->num,in,inl,0);
-#else
-	ret=write(b->num,in,inl);
-#endif
+	clear_socket_error();
+	ret=writesocket(b->num,in,inl);
 	BIO_clear_retry_flags(b);
 	if (ret <= 0)
 		{
-#ifndef BIO_FD
 		if (BIO_sock_should_retry(ret))
-#else
-		if (BIO_fd_should_retry(ret))
-#endif
 			BIO_set_retry_write(b);
 		}
 	return(ret);
 	}
 
-#ifndef BIO_FD
-static long sock_ctrl(b,cmd,num,ptr)
-#else
-static long fd_ctrl(b,cmd,num,ptr)
-#endif
-BIO *b;
-int cmd;
-long num;
-char *ptr;
+static long sock_ctrl(BIO *b, int cmd, long num, void *ptr)
 	{
 	long ret=1;
 	int *ip;
@@ -283,21 +170,16 @@ char *ptr;
 	switch (cmd)
 		{
 	case BIO_CTRL_RESET:
-#ifdef BIO_FD
-		ret=(long)lseek(b->num,0,0);
-#else
+		num=0;
+	case BIO_C_FILE_SEEK:
 		ret=0;
-#endif
 		break;
+	case BIO_C_FILE_TELL:
 	case BIO_CTRL_INFO:
 		ret=0;
 		break;
 	case BIO_C_SET_FD:
-#ifndef BIO_FD
 		sock_free(b);
-#else
-		fd_free(b);
-#endif
 		b->num= *((int *)ptr);
 		b->shutdown=(int)num;
 		b->init=1;
@@ -326,7 +208,6 @@ char *ptr;
 	case BIO_CTRL_FLUSH:
 		ret=1;
 		break;
-		break;
 	default:
 		ret=0;
 		break;
@@ -334,77 +215,46 @@ char *ptr;
 	return(ret);
 	}
 
-#ifdef undef
-static int sock_gets(bp,buf,size)
-BIO *bp;
-char *buf;
-int size;
-	{
-	return(-1);
-	}
-#endif
-
-#ifndef BIO_FD
-static int sock_puts(bp,str)
-#else
-static int fd_puts(bp,str)
-#endif
-BIO *bp;
-char *str;
+static int sock_puts(BIO *bp, const char *str)
 	{
 	int n,ret;
 
 	n=strlen(str);
-#ifndef BIO_FD
 	ret=sock_write(bp,str,n);
-#else
-	ret=fd_write(bp,str,n);
-#endif
 	return(ret);
 	}
 
-#ifndef BIO_FD
-int BIO_sock_should_retry(i)
-#else
-int BIO_fd_should_retry(i)
-#endif
-int i;
+int BIO_sock_should_retry(int i)
 	{
+	int err;
+
 	if ((i == 0) || (i == -1))
 		{
-#if !defined(BIO_FD) && defined(WINDOWS)
-		errno=WSAGetLastError();
-#endif
+		err=get_last_socket_error();
 
-#if defined(WINDOWS) /* more microsoft stupidity */
-		if ((i == -1) && (errno == 0))
+#if defined(OPENSSL_SYS_WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
+		if ((i == -1) && (err == 0))
 			return(1);
 #endif
-#ifndef BIO_FD
-		return(BIO_sock_non_fatal_error(errno));
-#else
-		return(BIO_fd_non_fatal_error(errno));
-#endif
+
+		return(BIO_sock_non_fatal_error(err));
 		}
 	return(0);
 	}
 
-#ifndef BIO_FD
-int BIO_sock_non_fatal_error(err)
-#else
-int BIO_fd_non_fatal_error(err)
-#endif
-int err;
+int BIO_sock_non_fatal_error(int err)
 	{
 	switch (err)
 		{
-#if !defined(BIO_FD) && defined(WINDOWS)
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_NETWARE)
 # if defined(WSAEWOULDBLOCK)
 	case WSAEWOULDBLOCK:
 # endif
 
-# if defined(WSAENOTCONN)
+# if 0 /* This appears to always be an error */
+#  if defined(WSAENOTCONN)
 	case WSAENOTCONN:
+#  endif
 # endif
 #endif
 
@@ -418,12 +268,16 @@ int err;
 # endif
 #endif
 
+#if defined(ENOTCONN)
+	case ENOTCONN:
+#endif
+
 #ifdef EINTR
 	case EINTR:
 #endif
 
 #ifdef EAGAIN
-#if EWOULDBLOCK != EAGAIN
+# if EWOULDBLOCK != EAGAIN
 	case EAGAIN:
 # endif
 #endif
@@ -440,10 +294,9 @@ int err;
 	case EALREADY:
 #endif
 		return(1);
-		break;
+		/* break; */
 	default:
 		break;
 		}
 	return(0);
 	}
-#endif