X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=crypto%2Fbio%2Fbss_sock.c;h=472dd75821c5e65d4b3cfd93fe777a489a7d449b;hb=4d6e1e4f29de455b5e644ea9cae5d5f5a2dbef33;hp=049606ee5df6596c1e2bf3dc2af6c3aa236787c5;hpb=6b691a5c85ddc4e407e32781841fee5c029506cd;p=oweals%2Fopenssl.git diff --git a/crypto/bio/bss_sock.c b/crypto/bio/bss_sock.c index 049606ee5d..472dd75821 100644 --- a/crypto/bio/bss_sock.c +++ b/crypto/bio/bss_sock.c @@ -56,55 +56,26 @@ * [including the GNU Public Licence.] */ -#if !defined(NO_SOCK) || defined(BIO_FD) - #include #include #define USE_SOCKETS #include "cryptlib.h" -#include "bio.h" +#include + +#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, @@ -116,54 +87,25 @@ static BIO_METHOD methods_sockp= sock_ctrl, sock_new, sock_free, + NULL, }; 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(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; @@ -172,24 +114,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 - shutdown(a->num,2); - closesocket(a->num); -#else /* BIO_FD */ - close(a->num); -#endif - + SHUTDOWN2(a->num); } a->init=0; a->flags=0; @@ -197,70 +129,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, char *in, int inl) -#else -static int fd_write(BIO *b, char *in, int inl) -#endif +static int sock_write(BIO *b, const char *in, int inl) { 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, char *ptr) -#else -static long fd_ctrl(BIO *b, int cmd, long num, char *ptr) -#endif +static long sock_ctrl(BIO *b, int cmd, long num, void *ptr) { long ret=1; int *ip; @@ -270,26 +172,14 @@ static long fd_ctrl(BIO *b, int cmd, long num, char *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; @@ -325,69 +215,38 @@ static long fd_ctrl(BIO *b, int cmd, long num, char *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, char *str) -#else -static int fd_puts(BIO *bp, char *str) -#endif +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(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 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(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(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_NETWARE) # if defined(WSAEWOULDBLOCK) case WSAEWOULDBLOCK: # endif @@ -418,7 +277,7 @@ int BIO_fd_non_fatal_error(int err) #endif #ifdef EAGAIN -#if EWOULDBLOCK != EAGAIN +# if EWOULDBLOCK != EAGAIN case EAGAIN: # endif #endif @@ -441,4 +300,3 @@ int BIO_fd_non_fatal_error(int err) } return(0); } -#endif