X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=comstack%2Ftcpip.c;h=ab08873e7921043b0ccfe2a762d09c351bbfc7b8;hp=d3ddb3fc53321a579c17864fe5163e23cdd90fcf;hb=c71d717ada2a9ef730d527f161eb5ba9aa641a9f;hpb=4e687307f10bd595d8af05c022871d1875c8c463 diff --git a/comstack/tcpip.c b/comstack/tcpip.c index d3ddb3f..ab08873 100644 --- a/comstack/tcpip.c +++ b/comstack/tcpip.c @@ -1,215 +1,22 @@ /* - * Copyright (c) 1995-2001, Index Data + * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Log: tcpip.c,v $ - * Revision 1.42 2001-10-22 13:57:24 adam - * Implemented cs_rcvconnect and cs_look as described in the documentation. - * - * Revision 1.41 2001/10/12 21:49:26 adam - * For accept/recv/send check for EAGAIN if it's differs from EWOULDBLOCK. - * - * Revision 1.40 2001/08/23 09:02:46 adam - * WIN32 fixes: Socket not re-used for bind. yaz_log logs WIN32 error - * message. - * - * Revision 1.39 2001/07/19 19:49:40 adam - * Fixed bug in tcpip_set_blocking. - * - * Revision 1.38 2001/03/21 12:43:36 adam - * Implemented cs_create_host. Better error reporting for SSL comstack. - * - * Revision 1.37 2001/03/08 20:18:55 adam - * Added cs_set_blocking. Patch from Matthew Carey. - * - * Revision 1.36 2001/02/21 13:46:53 adam - * C++ fixes. - * - * Revision 1.35 2000/11/27 15:17:40 adam - * Using SSLeay_add_all_algorithms instead of OpenSSL_add_all_algorithms. - * - * Revision 1.34 2000/11/23 10:58:32 adam - * SSL comstack support. Separate POSIX thread support library. - * - * Revision 1.33 2000/09/04 08:27:11 adam - * Work on error handling for tcpip_accept. - * - * Revision 1.32 1999/11/30 13:47:11 adam - * Improved installation. Moved header files to include/yaz. - * - * Revision 1.31 1999/04/29 07:31:23 adam - * Changed tcpip_strtoaddr_ex so that only part 'till '/' is considered - * part of hostname. - * - * Revision 1.30 1999/04/20 09:56:48 adam - * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun). - * Modified all encoders/decoders to reflect this change. - * - * Revision 1.29 1999/04/16 14:45:55 adam - * Added interface for tcpd wrapper for access control. - * - * Revision 1.28 1999/03/31 11:11:14 adam - * Function getprotobyname only called once. Minor change in tcpip_get - * to handle multi-threaded conditions. - * - * Revision 1.27 1999/02/02 13:57:31 adam - * Uses preprocessor define WIN32 instead of WINDOWS to build code - * for Microsoft WIN32. - * - * Revision 1.26 1999/01/08 11:23:14 adam - * Added const modifier to some of the BER/ODR encoding routines. - * - * Revision 1.25 1998/07/07 15:49:23 adam - * Added braces to avoid warning. - * - * Revision 1.24 1998/06/29 07:59:17 adam - * Minor fix. - * - * Revision 1.23 1998/06/23 15:37:50 adam - * Added type cast to prevent warning. - * - * Revision 1.22 1998/06/22 11:32:36 adam - * Added 'conditional cs_listen' feature. - * - * Revision 1.21 1998/05/20 09:55:32 adam - * Function tcpip_get treats EINPROGRESS error in the same way as - * EWOULDBLOCK. EINPROGRESS shouldn't be returned - but it is on - * Solaris in some cases. - * - * Revision 1.20 1998/05/18 10:10:40 adam - * Minor change to avoid C++ warning. - * - * Revision 1.19 1998/02/11 11:53:33 adam - * Changed code so that it compiles as C++. - * - * Revision 1.18 1997/09/29 07:15:25 adam - * Changed use of setsockopt to avoid warnings on MSVC. - * - * Revision 1.17 1997/09/17 12:10:30 adam - * YAZ version 1.4. - * - * Revision 1.16 1997/09/01 08:49:14 adam - * New windows NT/95 port using MSV5.0. Minor changes only. - * - * Revision 1.15 1997/05/14 06:53:33 adam - * C++ support. - * - * Revision 1.14 1997/05/01 15:06:32 adam - * Moved WINSOCK init. code to tcpip_init routine. - * - * Revision 1.13 1996/11/01 08:45:18 adam - * Bug fix: used close on MS-Windows. Fixed to closesocket. - * - * Revision 1.12 1996/07/06 19:58:30 quinn - * System headerfiles gathered in yconfig - * - * Revision 1.11 1996/02/23 10:00:39 quinn - * WAIS Work - * - * Revision 1.10 1996/02/20 12:52:11 quinn - * WAIS protocol support. - * - * Revision 1.9 1996/02/10 12:23:11 quinn - * Enablie inetd operations fro TCP/IP stack - * - * Revision 1.8 1995/11/01 13:54:27 quinn - * Minor adjustments - * - * Revision 1.7 1995/10/30 12:41:16 quinn - * Added hostname lookup for server. - * - * Revision 1.6 1995/09/29 17:12:00 quinn - * Smallish - * - * Revision 1.5 1995/09/29 17:01:48 quinn - * More Windows work - * - * Revision 1.4 1995/09/28 10:12:26 quinn - * Windows-support changes - * - * Revision 1.3 1995/09/27 15:02:45 quinn - * Modified function heads & prototypes. - * - * Revision 1.2 1995/06/15 12:30:06 quinn - * Added @ as hostname alias for INADDR ANY. - * - * Revision 1.1 1995/06/14 09:58:20 quinn - * Renamed yazlib to comstack. - * - * Revision 1.20 1995/05/16 08:51:16 quinn - * License, documentation, and memory fixes - * - * Revision 1.19 1995/04/10 10:24:08 quinn - * Some bug-fixes. - * - * Revision 1.18 1995/03/30 13:29:27 quinn - * Added REUSEADDR in tcpip_bind - * - * Revision 1.17 1995/03/27 08:36:10 quinn - * Some work on nonblocking operation in xmosi.c and rfct.c. - * Added protocol parameter to cs_create() - * - * Revision 1.16 1995/03/21 15:53:41 quinn - * Added rcvconnect - * - * Revision 1.15 1995/03/21 12:31:27 quinn - * Added check for EINPROGRESS on connect. - * - * Revision 1.14 1995/03/20 09:47:21 quinn - * Added server-side support to xmosi.c - * Fixed possible problems in rfct - * Other little mods - * - * Revision 1.13 1995/03/15 16:15:13 adam - * Removed p_write. - * - * Revision 1.12 1995/03/15 15:36:27 quinn - * Mods to support nonblocking I/O - * - * Revision 1.11 1995/03/15 08:37:57 quinn - * Now we're pretty much set for nonblocking I/O. - * - * Revision 1.10 1995/03/14 17:00:07 quinn - * Bug-fixes - added tracing info to tcpip.c - * - * Revision 1.9 1995/03/14 10:28:42 quinn - * Adding server-side support to tcpip.c and fixing bugs in nonblocking I/O - * - * Revision 1.8 1995/03/10 14:22:50 quinn - * Removed debug output. - * - * Revision 1.7 1995/03/10 11:44:59 quinn - * Fixes and debugging - * - * Revision 1.6 1995/03/07 10:26:55 quinn - * Initialized type field in the comstacks. - * - * Revision 1.5 1995/02/14 20:40:07 quinn - * Various stuff. - * - * Revision 1.4 1995/02/14 11:54:49 quinn - * Beginning to add full CCL. - * - * Revision 1.3 1995/02/10 18:58:10 quinn - * Fixed tcpip_get (formerly tcpip_read). - * Turned tst (cli) into a proper, event-driven thingy. - * - * Revision 1.2 1995/02/10 15:55:47 quinn - * Small things. - * - * Revision 1.1 1995/02/09 15:51:52 quinn - * Works better now. - * + * $Id: tcpip.c,v 1.59 2003-10-08 21:47:15 adam Exp $ */ #include #include #include -#ifndef WIN32 + +#ifdef WIN32 +#else #include #endif + #include #include +#include #if HAVE_OPENSSL_SSL_H #include #include @@ -218,30 +25,33 @@ #include #include #include +#include -/* Chas added the following, so we get the definition of completeBER */ -#include +#ifdef WIN32 +#else +#include +#endif -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 @@ -249,6 +59,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 { @@ -285,15 +99,8 @@ static int tcpip_init (void) return 1; } #else -static int proto_number = 0; - static int tcpip_init (void) { - struct protoent *proto; - /* only call getprotobyname once, in case it allocates memory */ - if (!(proto = getprotobyname("tcp"))) - return 0; - proto_number = proto->p_proto; return 1; } #endif @@ -315,13 +122,8 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) return 0; if (s < 0) { -#ifdef WIN32 if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) return 0; -#else - if ((s = socket(AF_INET, SOCK_STREAM, proto_number)) < 0) - return 0; -#endif new_socket = 1; } else @@ -332,12 +134,19 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) xmalloc(sizeof(tcpip_state))))) return 0; + if (!((p->blocking = blocking)&1)) + { #ifdef WIN32 - if (!(p->blocking = blocking) && ioctlsocket(s, FIONBIO, &tru) < 0) + if (ioctlsocket(s, FIONBIO, &tru) < 0) + return 0; #else - if (!(p->blocking = blocking) && fcntl(s, F_SETFL, O_NONBLOCK) < 0) + if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) + return 0; +#ifndef MSG_NOSIGNAL + signal (SIGPIPE, SIG_IGN); #endif - return 0; +#endif + } p->io_pending = 0; p->iofile = s; @@ -357,7 +166,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) p->f_straddr = tcpip_straddr; p->f_set_blocking = tcpip_set_blocking; - p->state = new_socket ? CS_UNBND : CS_IDLE; /* state of line */ + p->state = new_socket ? CS_ST_UNBND : CS_ST_IDLE; /* state of line */ p->event = CS_NONE; p->cerrno = 0; p->stackerr = 0; @@ -373,7 +182,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) if (protocol == PROTO_WAIS) state->complete = completeWAIS; else - state->complete = completeBER; + state->complete = cs_complete_auto; p->timeout = COMSTACK_DEFAULT_TIMEOUT; TRC(fprintf(stderr, "Created new TCPIP comstack\n")); @@ -416,11 +225,12 @@ COMSTACK ssl_type(int s, int blocking, int protocol, void *vp) } #endif -int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add) +int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add, + int default_port) { struct hostent *hp; char *p, buf[512]; - short int port = 210; + short int port = default_port; unsigned tmpadd; if (!tcpip_init ()) @@ -452,8 +262,12 @@ int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add) void *tcpip_straddr(COMSTACK h, const char *str) { tcpip_state *sp = (tcpip_state *)h->cprivate; + int port = 210; - if (!tcpip_strtoaddr_ex (str, &sp->addr)) + if (h->protocol == PROTO_HTTP) + port = 80; + + if (!tcpip_strtoaddr_ex (str, &sp->addr, port)) return 0; return &sp->addr; } @@ -462,7 +276,7 @@ struct sockaddr_in *tcpip_strtoaddr(const char *str) { static struct sockaddr_in add; - if (!tcpip_strtoaddr_ex (str, &add)) + if (!tcpip_strtoaddr_ex (str, &add, 210)) return 0; return &add; } @@ -484,41 +298,88 @@ 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; + YAZ_SOCKLEN_T rbufsize = sizeof(recbuflen); +#endif TRC(fprintf(stderr, "tcpip_connect\n")); h->io_pending = 0; - if (h->state == CS_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_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_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_CONNECTING; + h->cerrno = CSYSERR; + return -1; } - if (h->state != CS_CONNECTING) + h->event = CS_CONNECT; + h->state = CS_ST_CONNECTING; + + return tcpip_rcvconnect (h); +} + +/* + * nop + */ +int tcpip_rcvconnect(COMSTACK h) +{ +#if HAVE_OPENSSL_SSL_H + tcpip_state *sp = (tcpip_state *)h->cprivate; +#endif + TRC(fprintf(stderr, "tcpip_rcvconnect\n")); + + if (h->state == CS_ST_DATAXFER) + return 0; + if (h->state != CS_ST_CONNECTING) { h->cerrno = CSOUTSTATE; return -1; @@ -539,13 +400,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; } @@ -555,52 +414,35 @@ int tcpip_connect(COMSTACK h, void *address) } #endif h->event = CS_DATA; - h->state = CS_DATAXFER; + h->state = CS_ST_DATAXFER; return 0; } -/* - * nop - */ -int tcpip_rcvconnect(COMSTACK cs) -{ - TRC(fprintf(stderr, "tcpip_rcvconnect\n")); +#define CERTF "ztest.pem" +#define KEYF "ztest.pem" - if (cs->event == CS_CONNECT) +static void tcpip_setsockopt (int fd) +{ +#if 0 + int len = 4096; + int set = 1; + + if (setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (char*)&set, sizeof(int))) { - 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->state = CS_DATA; - return 0; /* write OK, we're OK */ - } - else - return -1; /* an error, for sure */ - } - return 0; /* timeout - incomplete */ + yaz_log(LOG_WARN|LOG_ERRNO, "setsockopt TCP_NODELAY"); + } + if (setsockopt(fd, SOL_SOCKET, SO_SNDBUF, (char*)&len, sizeof(int))) + { + yaz_log(LOG_WARN|LOG_ERRNO, "setsockopt SNDBUF"); + } + if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, (char*)&len, sizeof(int))) + { + yaz_log(LOG_WARN|LOG_ERRNO, "setsockopt RCVBUF"); } - return -1; /* wrong state */ +#endif } -#define CERTF "ztest.pem" -#define KEYF "ztest.pem" - -int tcpip_bind(COMSTACK h, void *address, int mode) +static int tcpip_bind(COMSTACK h, void *address, int mode) { struct sockaddr *addr = (struct sockaddr *)address; #ifdef WIN32 @@ -654,6 +496,7 @@ int tcpip_bind(COMSTACK h, void *address, int mode) return -1; } #endif + tcpip_setsockopt(h->iofile); if (bind(h->iofile, addr, sizeof(struct sockaddr_in))) { h->cerrno = CSYSERR; @@ -664,7 +507,7 @@ int tcpip_bind(COMSTACK h, void *address, int mode) h->cerrno = CSYSERR; return -1; } - h->state = CS_IDLE; + h->state = CS_ST_IDLE; h->event = CS_LISTEN; return 0; } @@ -674,14 +517,10 @@ 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_IDLE) + if (h->state != CS_ST_IDLE) { h->cerrno = CSOUTSTATE; return -1; @@ -693,10 +532,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 @@ -722,7 +561,8 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, h->newfd = -1; return -1; } - h->state = CS_INCON; + h->state = CS_ST_INCON; + tcpip_setsockopt (h->newfd); return 0; } @@ -735,7 +575,7 @@ COMSTACK tcpip_accept(COMSTACK h) #endif TRC(fprintf(stderr, "tcpip_accept\n")); - if (h->state == CS_INCON) + if (h->state == CS_ST_INCON) { if (!(cnew = (COMSTACK)xmalloc(sizeof(*cnew)))) { @@ -766,11 +606,11 @@ COMSTACK tcpip_accept(COMSTACK h) } return 0; } - if (!cnew->blocking && + if (!(cnew->blocking&1) && #ifdef WIN32 (ioctlsocket(cnew->iofile, FIONBIO, &tru) < 0) #else - (!cnew->blocking && fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0) + (fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0) #endif ) { @@ -793,8 +633,8 @@ COMSTACK tcpip_accept(COMSTACK h) state->altsize = state->altlen = 0; state->towrite = state->written = -1; state->complete = st->complete; - cnew->state = CS_ACCEPT; - h->state = CS_IDLE; + cnew->state = CS_ST_ACCEPT; + h->state = CS_ST_IDLE; #if HAVE_OPENSSL_SSL_H state->ctx = st->ctx; @@ -808,7 +648,7 @@ COMSTACK tcpip_accept(COMSTACK h) #endif h = cnew; } - if (h->state == CS_ACCEPT) + if (h->state == CS_ST_ACCEPT) { #if HAVE_OPENSSL_SSL_H tcpip_state *state = (tcpip_state *)h->cprivate; @@ -822,13 +662,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); @@ -843,7 +681,7 @@ COMSTACK tcpip_accept(COMSTACK h) return 0; } h->io_pending = 0; - h->state = CS_DATAXFER; + h->state = CS_ST_DATAXFER; h->event = CS_DATA; return h; } @@ -886,10 +724,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) { @@ -899,22 +744,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) @@ -992,13 +840,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) @@ -1073,12 +919,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 ) { @@ -1133,13 +983,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; @@ -1195,8 +1043,8 @@ 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; + char *r = 0, *buf = sp->buf; + YAZ_SOCKLEN_T len; struct hostent *host; len = sizeof(addr); @@ -1205,15 +1053,25 @@ char *tcpip_addrstr(COMSTACK h) h->cerrno = CSYSERR; return 0; } - if ((host = gethostbyaddr((char*)&addr.sin_addr, sizeof(addr.sin_addr), + if (!(h->blocking&2)) { + if ((host = gethostbyaddr((char*)&addr.sin_addr, sizeof(addr.sin_addr), AF_INET))) - r = (char*) host->h_name; - else + r = (char*) host->h_name; + } + if (!r) r = inet_ntoa(addr.sin_addr); - sprintf(buf, "tcp:%s", r); + if (h->protocol == PROTO_HTTP) + sprintf(buf, "http:%s", r); + else + sprintf(buf, "tcp:%s", r); #if HAVE_OPENSSL_SSL_H if (sp->ctx) - sprintf(buf, "ssl:%s", r); + { + if (h->protocol == PROTO_HTTP) + sprintf(buf, "https:%s", r); + else + sprintf(buf, "ssl:%s", r); + } #endif return buf; } @@ -1230,7 +1088,7 @@ int static tcpip_set_blocking(COMSTACK p, int blocking) return 0; #else flag = fcntl(p->iofile, F_GETFL, 0); - if(!blocking) + if(!(blocking&1)) flag = flag & ~O_NONBLOCK; else flag = flag | O_NONBLOCK;