X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=comstack%2Ftcpip.c;h=8649a3f764ba4e12bd0cfd587a5d10760d83baeb;hb=34203146338c5f6c89774bde4caad110345405bd;hp=22a8ae5227194ddefd6749b8ec232661770f2d6e;hpb=8af7fd342d3c905ddd1e6be521242d881510ba14;p=yaz-moved-to-github.git diff --git a/comstack/tcpip.c b/comstack/tcpip.c index 22a8ae5..8649a3f 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -1,8 +1,8 @@ /* - * Copyright (c) 1995-2001, Index Data + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Id: tcpip.c,v 1.44 2001-11-06 17:01:25 adam Exp $ + * $Id: tcpip.c,v 1.53 2003-01-06 08:20:27 adam Exp $ */ #include @@ -13,6 +13,7 @@ #endif #include #include +#include #if HAVE_OPENSSL_SSL_H #include #include @@ -25,26 +26,26 @@ /* Chas added the following, so we get the definition of completeBER */ #include -int tcpip_close(COMSTACK h); -int tcpip_put(COMSTACK h, char *buf, int size); -int tcpip_get(COMSTACK h, char **buf, int *bufsize); -int tcpip_connect(COMSTACK h, void *address); -int tcpip_more(COMSTACK h); -int tcpip_rcvconnect(COMSTACK h); -int tcpip_bind(COMSTACK h, void *address, int mode); -int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, +static int tcpip_close(COMSTACK h); +static int tcpip_put(COMSTACK h, char *buf, int size); +static int tcpip_get(COMSTACK h, char **buf, int *bufsize); +static int tcpip_connect(COMSTACK h, void *address); +static int tcpip_more(COMSTACK h); +static int tcpip_rcvconnect(COMSTACK h); +static int tcpip_bind(COMSTACK h, void *address, int mode); +static int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, int (*check_ip)(void *cd, const char *a, int len, int type), void *cd); -int static tcpip_set_blocking(COMSTACK p, int blocking); +static int tcpip_set_blocking(COMSTACK p, int blocking); #if HAVE_OPENSSL_SSL_H -int ssl_get(COMSTACK h, char **buf, int *bufsize); -int ssl_put(COMSTACK h, char *buf, int size); +static int ssl_get(COMSTACK h, char **buf, int *bufsize); +static int ssl_put(COMSTACK h, char *buf, int size); #endif -COMSTACK tcpip_accept(COMSTACK h); -char *tcpip_addrstr(COMSTACK h); -void *tcpip_straddr(COMSTACK h, const char *str); +static COMSTACK tcpip_accept(COMSTACK h); +static char *tcpip_addrstr(COMSTACK h); +static void *tcpip_straddr(COMSTACK h, const char *str); #if 0 #define TRC(x) x @@ -52,6 +53,10 @@ void *tcpip_straddr(COMSTACK h, const char *str); #define TRC(X) #endif +#ifndef YAZ_SOCKLEN_T +#define YAZ_SOCKLEN_T int +#endif + /* this state is used for both SSL and straight TCP/IP */ typedef struct tcpip_state { @@ -125,10 +130,17 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) #ifdef WIN32 if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0) + return 0; #else - if (!(p->blocking = blocking) && fcntl(s, F_SETFL, O_NONBLOCK) < 0) + if (!(p->blocking = blocking)) + { + if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) + return 0; +#ifndef MSG_NOSIGNAL + signal (SIGPIPE, SIG_IGN); +#endif + } #endif - return 0; p->io_pending = 0; p->iofile = s; @@ -275,40 +287,85 @@ int tcpip_connect(COMSTACK h, void *address) { struct sockaddr_in *add = (struct sockaddr_in *)address; #if HAVE_OPENSSL_SSL_H - tcpip_state *sp = (tcpip_state *)h->cprivate; + tcpip_state *sp = (tcpip_state *)h->cprivate; #endif int r; - +#ifdef __sun__ + int recbuflen; + socklen_t rbufsize = sizeof(recbuflen); +#endif TRC(fprintf(stderr, "tcpip_connect\n")); h->io_pending = 0; - if (h->state == CS_ST_UNBND) + if (h->state != CS_ST_UNBND) + { + h->cerrno = CSOUTSTATE; + return -1; + } +#ifdef __sun__ + /* On Suns, you must set a bigger Receive Buffer BEFORE a call to connect + * This gives the connect a chance to negotiate with the other side + * (see 'man tcp') + */ + if ( getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) < 0 ) + { + h->cerrno = CSYSERR; + return -1; + } + TRC(fprintf( stderr, "Current Size of TCP Receive Buffer= %d\n", + recbuflen )); + recbuflen *= 10; /* lets be optimistic */ + if ( setsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, rbufsize ) < 0 ) + { + h->cerrno = CSYSERR; + return -1; + } + if ( getsockopt(h->iofile, SOL_SOCKET, SO_RCVBUF, (void *)&recbuflen, &rbufsize ) ) + { + h->cerrno = CSYSERR; + return -1; + } + TRC(fprintf( stderr, "New Size of TCP Receive Buffer = %d\n", + recbuflen )); +#endif + r = connect(h->iofile, (struct sockaddr *) add, sizeof(*add)); + if (r < 0) { - r = connect(h->iofile, (struct sockaddr *) add, sizeof(*add)); - if (r < 0) - { #ifdef WIN32 - if (WSAGetLastError() == WSAEWOULDBLOCK) - { - h->event = CS_CONNECT; - h->state = CS_ST_CONNECTING; - h->io_pending = CS_WANT_WRITE; - return 1; - } + if (WSAGetLastError() == WSAEWOULDBLOCK) + { + h->event = CS_CONNECT; + h->state = CS_ST_CONNECTING; + h->io_pending = CS_WANT_WRITE; + return 1; + } #else - if (errno == EINPROGRESS) - { - h->event = CS_CONNECT; - h->state = CS_ST_CONNECTING; - h->io_pending = CS_WANT_WRITE|CS_WANT_READ; - return 1; - } + if (yaz_errno() == EINPROGRESS) + { + h->event = CS_CONNECT; + h->state = CS_ST_CONNECTING; + h->io_pending = CS_WANT_WRITE|CS_WANT_READ; + return 1; + } #endif - h->cerrno = CSYSERR; - return -1; - } - h->event = CS_CONNECT; - h->state = CS_ST_CONNECTING; + h->cerrno = CSYSERR; + return -1; } + h->event = CS_CONNECT; + h->state = CS_ST_CONNECTING; + + return tcpip_rcvconnect (h); +} + +/* + * nop + */ +int tcpip_rcvconnect(COMSTACK h) +{ + tcpip_state *sp = (tcpip_state *)h->cprivate; + TRC(fprintf(stderr, "tcpip_rcvconnect\n")); + + if (h->state == CS_ST_DATAXFER) + return 0; if (h->state != CS_ST_CONNECTING) { h->cerrno = CSOUTSTATE; @@ -330,13 +387,11 @@ int tcpip_connect(COMSTACK h, void *address) int err = SSL_get_error(sp->ssl, res); if (err == SSL_ERROR_WANT_READ) { - yaz_log (LOG_LOG, "SSL_connect. want_read"); h->io_pending = CS_WANT_READ; return 1; } if (err == SSL_ERROR_WANT_WRITE) { - yaz_log (LOG_LOG, "SSL_connect. want_write"); h->io_pending = CS_WANT_WRITE; return 1; } @@ -350,45 +405,6 @@ int tcpip_connect(COMSTACK h, void *address) return 0; } -/* - * nop - */ -int tcpip_rcvconnect(COMSTACK cs) -{ - TRC(fprintf(stderr, "tcpip_rcvconnect\n")); - - if (cs->event == CS_CONNECT) - { - int fd = cs->iofile; - fd_set input, output; - struct timeval tv; - int r; - - tv.tv_sec = 0; - tv.tv_usec = 1; - - FD_ZERO(&input); - FD_ZERO(&output); - FD_SET (fd, &input); - FD_SET (fd, &output); - - r = select (fd+1, &input, &output, 0, &tv); - if (r > 0) - { - if (FD_ISSET(cs->iofile, &output)) - { - cs->event = CS_DATA; - return 0; /* write OK, we're OK */ - } - else - return -1; /* an error, for sure */ - } - else if (r == 0) - return 0; /* timeout - incomplete */ - } - return -1; /* wrong state or bad select */ -} - #define CERTF "ztest.pem" #define KEYF "ztest.pem" @@ -466,11 +482,7 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, void *cd) { struct sockaddr_in addr; -#ifdef __cplusplus - socklen_t len = sizeof(addr); -#else - int len = sizeof(addr); -#endif + YAZ_SOCKLEN_T len = sizeof(addr); TRC(fprintf(stderr, "tcpip_listen pid=%d\n", getpid())); if (h->state != CS_ST_IDLE) @@ -485,10 +497,10 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, #ifdef WIN32 WSAGetLastError() == WSAEWOULDBLOCK #else - errno == EWOULDBLOCK + yaz_errno() == EWOULDBLOCK #ifdef EAGAIN #if EAGAIN != EWOULDBLOCK - || errno == EAGAIN + || yaz_errno() == EAGAIN #endif #endif #endif @@ -614,13 +626,11 @@ COMSTACK tcpip_accept(COMSTACK h) if (err == SSL_ERROR_WANT_READ) { h->io_pending = CS_WANT_READ; - yaz_log (LOG_LOG, "SSL_accept. want_read"); return h; } if (err == SSL_ERROR_WANT_WRITE) { h->io_pending = CS_WANT_WRITE; - yaz_log (LOG_LOG, "SSL_accept. want_write"); return h; } cs_close (h); @@ -678,10 +688,17 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK) if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2))) return -1; +#ifdef __sun__ + yaz_set_errno( 0 ); + // unfortunatly, sun sometimes forgets to set errno in recv + // when EWOULDBLOCK etc. would be required (res = -1) +#endif res = recv(h->iofile, *buf + hasread, CS_TCPIP_BUFCHUNK, 0); TRC(fprintf(stderr, " recv res=%d, hasread=%d\n", res, hasread)); if (res < 0) { + TRC(fprintf(stderr, " recv errno=%d, (%s)\n", yaz_errno(), + strerror(yaz_errno()))); #ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) { @@ -691,22 +708,25 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) else return -1; #else - if (errno == EWOULDBLOCK + if (yaz_errno() == EWOULDBLOCK #ifdef EAGAIN #if EAGAIN != EWOULDBLOCK - || errno == EAGAIN + || yaz_errno() == EAGAIN +#endif #endif + || yaz_errno() == EINPROGRESS +#ifdef __sun__ + || yaz_errno() == ENOENT /* Sun's sometimes set errno to this */ #endif - || errno == EINPROGRESS ) { h->io_pending = CS_WANT_READ; break; } - else if (errno == 0) + else if (yaz_errno() == 0) continue; else - return -1; + return -1; #endif } else if (!res) @@ -784,13 +804,11 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) if (ssl_err == SSL_ERROR_WANT_READ) { h->io_pending = CS_WANT_READ; - yaz_log (LOG_LOG, "SSL_read. want_read"); break; } if (ssl_err == SSL_ERROR_WANT_WRITE) { h->io_pending = CS_WANT_WRITE; - yaz_log (LOG_LOG, "SSL_read. want_write"); break; } if (res == 0) @@ -865,12 +883,16 @@ int tcpip_put(COMSTACK h, char *buf, int size) #ifdef WIN32 WSAGetLastError() == WSAEWOULDBLOCK #else - errno == EWOULDBLOCK + yaz_errno() == EWOULDBLOCK #ifdef EAGAIN #if EAGAIN != EWOULDBLOCK - || errno == EAGAIN + || yaz_errno() == EAGAIN +#endif #endif +#ifdef __sun__ + || yaz_errno() == ENOENT /* Sun's sometimes set errno to this value! */ #endif + || yaz_errno() == EINPROGRESS #endif ) { @@ -925,13 +947,11 @@ int ssl_put(COMSTACK h, char *buf, int size) if (ssl_err == SSL_ERROR_WANT_READ) { h->io_pending = CS_WANT_READ; - yaz_log (LOG_LOG, "SSL_write. want_read"); return 1; } if (ssl_err == SSL_ERROR_WANT_WRITE) { h->io_pending = CS_WANT_WRITE; - yaz_log (LOG_LOG, "SSL_write. want_write"); return 1; } h->cerrno = CSERRORSSL; @@ -988,7 +1008,7 @@ char *tcpip_addrstr(COMSTACK h) struct sockaddr_in addr; tcpip_state *sp = (struct tcpip_state *)h->cprivate; char *r, *buf = sp->buf; - size_t len; + YAZ_SOCKLEN_T len; struct hostent *host; len = sizeof(addr);