Tidy up the mess in bss_sock.c and bss_fd.c

by placing them socket/fd code in separate
files rather than trying to have them both
share the same one.

crypto/bio/bss_fd.c

@@ -56,7 +56,227 @@
  * [including the GNU Public Licence.]
  */
 
-#define BIO_FD
-#include "bss_sock.c"
-#undef BIO_FD
+#include <stdio.h>
+#include <errno.h>
+#define USE_SOCKETS
+#include "cryptlib.h"
+#include <openssl/bio.h>
 
+static int fd_write(BIO *h, const char *buf, int num);
+static int fd_read(BIO *h, char *buf, int size);
+static int fd_puts(BIO *h, const char *str);
+static long fd_ctrl(BIO *h, int cmd, long arg1, void *arg2);
+static int fd_new(BIO *h);
+static int fd_free(BIO *data);
+int BIO_fd_should_retry(int s);
+
+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,
+	NULL,
+	};
+
+BIO_METHOD *BIO_s_fd(void)
+	{
+	return(&methods_fdp);
+	}
+
+BIO *BIO_new_fd(int fd,int close_flag)
+	{
+	BIO *ret;
+	ret=BIO_new(BIO_s_fd());
+	if (ret == NULL) return(NULL);
+	BIO_set_fd(ret,fd,close_flag);
+	return(ret);
+	}
+
+static int fd_new(BIO *bi)
+	{
+	bi->init=0;
+	bi->num=0;
+	bi->ptr=NULL;
+	bi->flags=0;
+	return(1);
+	}
+
+static int fd_free(BIO *a)
+	{
+	if (a == NULL) return(0);
+	if (a->shutdown)
+		{
+		if (a->init)
+			{
+			close(a->num);
+			}
+		a->init=0;
+		a->flags=0;
+		}
+	return(1);
+	}
+	
+static int fd_read(BIO *b, char *out,int outl)
+	{
+	int ret=0;
+
+	if (out != NULL)
+		{
+		clear_sys_error();
+		ret=read(b->num,out,outl);
+		BIO_clear_retry_flags(b);
+		if (ret <= 0)
+			{
+			if (BIO_fd_should_retry(ret))
+				BIO_set_retry_read(b);
+			}
+		}
+	return(ret);
+	}
+
+static int fd_write(BIO *b, const char *in, int inl)
+	{
+	int ret;
+	clear_sys_error();
+	ret=write(b->num,in,inl);
+	BIO_clear_retry_flags(b);
+	if (ret <= 0)
+		{
+		if (BIO_fd_should_retry(ret))
+			BIO_set_retry_write(b);
+		}
+	return(ret);
+	}
+
+static long fd_ctrl(BIO *b, int cmd, long num, void *ptr)
+	{
+	long ret=1;
+	int *ip;
+
+	switch (cmd)
+		{
+	case BIO_CTRL_RESET:
+		num=0;
+	case BIO_C_FILE_SEEK:
+		ret=(long)lseek(b->num,num,0);
+		break;
+	case BIO_C_FILE_TELL:
+	case BIO_CTRL_INFO:
+		ret=(long)lseek(b->num,0,1);
+		break;
+	case BIO_C_SET_FD:
+		fd_free(b);
+		b->num= *((int *)ptr);
+		b->shutdown=(int)num;
+		b->init=1;
+		break;
+	case BIO_C_GET_FD:
+		if (b->init)
+			{
+			ip=(int *)ptr;
+			if (ip != NULL) *ip=b->num;
+			ret=b->num;
+			}
+		else
+			ret= -1;
+		break;
+	case BIO_CTRL_GET_CLOSE:
+		ret=b->shutdown;
+		break;
+	case BIO_CTRL_SET_CLOSE:
+		b->shutdown=(int)num;
+		break;
+	case BIO_CTRL_PENDING:
+	case BIO_CTRL_WPENDING:
+		ret=0;
+		break;
+	case BIO_CTRL_DUP:
+	case BIO_CTRL_FLUSH:
+		ret=1;
+		break;
+	default:
+		ret=0;
+		break;
+		}
+	return(ret);
+	}
+
+static int fd_puts(BIO *bp, const char *str)
+	{
+	int n,ret;
+
+	n=strlen(str);
+	ret=fd_write(bp,str,n);
+	return(ret);
+	}
+
+int BIO_fd_should_retry(int i)
+	{
+	int err;
+
+	if ((i == 0) || (i == -1))
+		{
+		err=get_last_sys_error();
+
+#if defined(WINDOWS) && 0 /* more microsoft stupidity? perhaps not? Ben 4/1/99 */
+		if ((i == -1) && (err == 0))
+			return(1);
+#endif
+
+		return(BIO_fd_non_fatal_error(err));
+		}
+	return(0);
+	}
+
+int BIO_fd_non_fatal_error(int err)
+	{
+	switch (err)
+		{
+
+#ifdef EWOULDBLOCK
+# ifdef WSAEWOULDBLOCK
+#  if WSAEWOULDBLOCK != EWOULDBLOCK
+	case EWOULDBLOCK:
+#  endif
+# else
+	case EWOULDBLOCK:
+# endif
+#endif
+
+#if defined(ENOTCONN)
+	case ENOTCONN:
+#endif
+
+#ifdef EINTR
+	case EINTR:
+#endif
+
+#ifdef EAGAIN
+#if EWOULDBLOCK != EAGAIN
+	case EAGAIN:
+# endif
+#endif
+
+#ifdef EPROTO
+	case EPROTO:
+#endif
+
+#ifdef EINPROGRESS
+	case EINPROGRESS:
+#endif
+
+#ifdef EALREADY
+	case EALREADY:
+#endif
+		return(1);
+		/* break; */
+	default:
+		break;
+		}
+	return(0);
+	}

crypto/bio/bss_sock.c

@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#if !defined(NO_SOCK) || defined(BIO_FD)
+#ifndef NO_SOCK
 
 #include <stdio.h>
 #include <errno.h>
@@ -64,7 +64,6 @@
 #include "cryptlib.h"
 #include <openssl/bio.h>
 
-#ifndef BIO_FD
 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);
@@ -72,18 +71,7 @@ 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 fd_write(BIO *h, const char *buf, int num);
-static int fd_read(BIO *h, char *buf, int size);
-static int fd_puts(BIO *h, const char *str);
-static long fd_ctrl(BIO *h, int cmd, long arg1, void *arg2);
-static int fd_new(BIO *h);
-static int fd_free(BIO *data);
-int BIO_fd_should_retry(int s);
-#endif
-
-#ifndef BIO_FD
 static BIO_METHOD methods_sockp=
 	{
 	BIO_TYPE_SOCKET,
@@ -102,49 +90,18 @@ 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,
-	NULL,
-	};
-
-BIO_METHOD *BIO_s_fd(void)
-	{
-	return(&methods_fdp);
-	}
-#endif
 
-#ifndef BIO_FD
 BIO *BIO_new_socket(int fd, int close_flag)
-#else
-BIO *BIO_new_fd(int fd,int close_flag)
-#endif
 	{
 	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(BIO *bi)
-#else
-static int fd_new(BIO *bi)
-#endif
 	{
 	bi->init=0;
 	bi->num=0;
@@ -153,23 +110,14 @@ static int fd_new(BIO *bi)
 	return(1);
 	}
 
-#ifndef BIO_FD
 static int sock_free(BIO *a)
-#else
-static int fd_free(BIO *a)
-#endif
 	{
 	if (a == NULL) return(0);
 	if (a->shutdown)
 		{
 		if (a->init)
 			{
-#ifndef BIO_FD
 			SHUTDOWN2(a->num);
-#else			/* BIO_FD */
-			close(a->num);
-#endif
-
 			}
 		a->init=0;
 		a->flags=0;
@@ -177,70 +125,40 @@ static int fd_free(BIO *a)
 	return(1);
 	}
 	
-#ifndef BIO_FD
 static int sock_read(BIO *b, char *out, int outl)
-#else
-static int fd_read(BIO *b, char *out,int outl)
-#endif
 	{
 	int ret=0;
 
 	if (out != NULL)
 		{
-#ifndef BIO_FD
 		clear_socket_error();
 		ret=readsocket(b->num,out,outl);
-#else
-		clear_sys_error();
-		ret=read(b->num,out,outl);
-#endif
 		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(BIO *b, const char *in, int inl)
-#else
-static int fd_write(BIO *b, const char *in, int inl)
-#endif
 	{
 	int ret;
 	
-#ifndef BIO_FD
 	clear_socket_error();
 	ret=writesocket(b->num,in,inl);
-#else
-	clear_sys_error();
-	ret=write(b->num,in,inl);
-#endif
 	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(BIO *b, int cmd, long num, void *ptr)
-#else
-static long fd_ctrl(BIO *b, int cmd, long num, void *ptr)
-#endif
 	{
 	long ret=1;
 	int *ip;
@@ -250,26 +168,14 @@ static long fd_ctrl(BIO *b, int cmd, long num, void *ptr)
 	case BIO_CTRL_RESET:
 		num=0;
 	case BIO_C_FILE_SEEK:
-#ifdef BIO_FD
-		ret=(long)lseek(b->num,num,0);
-#else
 		ret=0;
-#endif
 		break;
 	case BIO_C_FILE_TELL:
 	case BIO_CTRL_INFO:
-#ifdef BIO_FD
-		ret=(long)lseek(b->num,0,1);
-#else
 		ret=0;
-#endif
 		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;
@@ -305,69 +211,38 @@ static long fd_ctrl(BIO *b, int cmd, long num, void *ptr)
 	return(ret);
 	}
 
-#ifdef undef
-static int sock_gets(BIO *bp, char *buf,int size)
-	{
-	return(-1);
-	}
-#endif
-
-#ifndef BIO_FD
 static int sock_puts(BIO *bp, const char *str)
-#else
-static int fd_puts(BIO *bp, const char *str)
-#endif
 	{
 	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(int i)
-#else
-int BIO_fd_should_retry(int i)
-#endif
 	{
 	int err;
 
 	if ((i == 0) || (i == -1))
 		{
-#ifndef BIO_FD
 		err=get_last_socket_error();
-#else
-		err=get_last_sys_error();
-#endif
 
 #if defined(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(err));
-#else
-		return(BIO_fd_non_fatal_error(err));
-#endif
 		}
 	return(0);
 	}
 
-#ifndef BIO_FD
 int BIO_sock_non_fatal_error(int err)
-#else
-int BIO_fd_non_fatal_error(int err)
-#endif
 	{
 	switch (err)
 		{
-#if !defined(BIO_FD) && defined(WINDOWS)
+#if defined(WINDOWS)
 # if defined(WSAEWOULDBLOCK)
 	case WSAEWOULDBLOCK:
 # endif