X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ftcpip.c;h=b992319ca2c12d4006206c6a260717ff8369cd79;hp=6d69d2f0dbf042b2d107d99de8b29820dcd60033;hb=1f41a1d415d2ab138050a96020ed39caa0c4e323;hpb=6b152d04e55e9d23fc2dd0c948929ad5e2bd4c05 diff --git a/src/tcpip.c b/src/tcpip.c index 6d69d2f..b992319 100644 --- a/src/tcpip.c +++ b/src/tcpip.c @@ -1,8 +1,6 @@ -/* - * Copyright (C) 1995-2005, Index Data ApS +/* This file is part of the YAZ toolkit. + * Copyright (C) 1995-2008 Index Data * See the file LICENSE for details. - * - * $Id: tcpip.c,v 1.22 2006-08-30 12:55:12 adam Exp $ */ /** * \file tcpip.c @@ -26,7 +24,16 @@ #endif #ifdef WIN32 -#include + +/* VS 2003 or later has getaddrinfo; older versions do not */ +#include +#if _MSC_VER >= 1300 +#include +#define HAVE_GETADDRINFO 1 +#else +#define HAVE_GETADDRINFO 0 +#endif + #else #include #include @@ -37,9 +44,6 @@ #if HAVE_SYS_SOCKET_H #include #endif -#if HAVE_SYS_SELECT_H -#include -#endif #if HAVE_SYS_WAIT_H #include #endif @@ -56,6 +60,8 @@ 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_put_connect(COMSTACK h, char *buf, int size); +static int tcpip_get_connect(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); @@ -93,8 +99,12 @@ typedef struct tcpip_state int written; /* -1 if we aren't writing */ int towrite; /* to verify against user input */ - int (*complete)(const unsigned char *buf, int len); /* length/comple. */ + int (*complete)(const char *buf, int len); /* length/complete. */ +#if HAVE_GETADDRINFO + struct addrinfo *ai; +#else struct sockaddr_in addr; /* returned by cs_straddr */ +#endif char buf[128]; /* returned by cs_addrstr */ #if HAVE_OPENSSL_SSL_H SSL_CTX *ctx; /* current CTX. */ @@ -102,6 +112,10 @@ typedef struct tcpip_state SSL *ssl; char cert_fname[256]; #endif + char *connect_request_buf; + int connect_request_len; + char *connect_response_buf; + int connect_response_len; } tcpip_state; #ifdef WIN32 @@ -131,44 +145,20 @@ static int tcpip_init (void) * This function is always called through the cs_create() macro. * s >= 0: socket has already been established for us. */ -COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) +COMSTACK tcpip_type(int s, int flags, int protocol, void *vp) { COMSTACK p; tcpip_state *sp; - int new_socket; -#ifdef WIN32 - unsigned long tru = 1; -#endif if (!tcpip_init ()) return 0; - if (s < 0) - { - if ((s = socket(AF_INET, SOCK_STREAM, 0)) < 0) - return 0; - new_socket = 1; - } - else - new_socket = 0; if (!(p = (struct comstack *)xmalloc(sizeof(struct comstack)))) return 0; if (!(sp = (struct tcpip_state *)(p->cprivate = xmalloc(sizeof(tcpip_state))))) return 0; - if (!((p->blocking = blocking)&1)) - { -#ifdef WIN32 - if (ioctlsocket(s, FIONBIO, &tru) < 0) - return 0; -#else - if (fcntl(s, F_SETFL, O_NONBLOCK) < 0) - return 0; -#ifndef MSG_NOSIGNAL - signal (SIGPIPE, SIG_IGN); -#endif -#endif - } + p->flags = flags; p->io_pending = 0; p->iofile = s; @@ -189,7 +179,7 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) p->f_set_blocking = tcpip_set_blocking; p->max_recv_bytes = 5000000; - p->state = new_socket ? CS_ST_UNBND : CS_ST_IDLE; /* state of line */ + p->state = s < 0 ? CS_ST_UNBND : CS_ST_IDLE; /* state of line */ p->event = CS_NONE; p->cerrno = 0; p->stackerr = 0; @@ -201,6 +191,9 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) strcpy(sp->cert_fname, "yaz.pem"); #endif +#if HAVE_GETADDRINFO + sp->ai = 0; +#endif sp->altbuf = 0; sp->altsize = sp->altlen = 0; sp->towrite = sp->written = -1; @@ -209,20 +202,46 @@ COMSTACK tcpip_type(int s, int blocking, int protocol, void *vp) else sp->complete = cs_complete_auto; + sp->connect_request_buf = 0; + sp->connect_request_len = 0; + sp->connect_response_buf = 0; + sp->connect_response_len = 0; + p->timeout = COMSTACK_DEFAULT_TIMEOUT; TRC(fprintf(stderr, "Created new TCPIP comstack\n")); return p; } +COMSTACK yaz_tcpip_create(int s, int flags, int protocol, + const char *connect_host) +{ + COMSTACK p = tcpip_type(s, flags, protocol, 0); + if (!p) + return 0; + if (connect_host) + { + tcpip_state *sp = (tcpip_state *) p->cprivate; + sp->connect_request_buf = (char *) xmalloc(strlen(connect_host) + 30); + sprintf(sp->connect_request_buf, "CONNECT %s HTTP/1.0\r\n\r\n", + connect_host); + sp->connect_request_len = strlen(sp->connect_request_buf); + p->f_put = tcpip_put_connect; + p->f_get = tcpip_get_connect; + sp->complete = cs_complete_auto_head; /* only want HTTP header */ + } + return p; +} + + #if HAVE_OPENSSL_SSL_H -COMSTACK ssl_type(int s, int blocking, int protocol, void *vp) +COMSTACK ssl_type(int s, int flags, int protocol, void *vp) { tcpip_state *sp; COMSTACK p; - p = tcpip_type (s, blocking, protocol, 0); + p = tcpip_type (s, flags, protocol, 0); if (!p) return 0; p->f_get = ssl_get; @@ -237,15 +256,53 @@ COMSTACK ssl_type(int s, int blocking, int protocol, void *vp) } #endif +#if HAVE_GETADDRINFO +/* resolve using getaddrinfo */ +struct addrinfo *tcpip_getaddrinfo(const char *str, const char *port) +{ + struct addrinfo hints, *res; + int error; + char host[512], *p; + + hints.ai_flags = 0; + hints.ai_family = AF_UNSPEC; + hints.ai_socktype = SOCK_STREAM; + hints.ai_protocol = 0; + hints.ai_addrlen = 0; + hints.ai_addr = NULL; + hints.ai_canonname = NULL; + hints.ai_next = NULL; + + strncpy(host, str, sizeof(host)-1); + host[sizeof(host)-1] = 0; + if ((p = strchr(host, '/'))) + *p = 0; + if ((p = strrchr(host, ':'))) + { + *p = '\0'; + port = p+1; + } + + if (!strcmp("@", host)) + { + hints.ai_flags = AI_PASSIVE; + error = getaddrinfo(0, port, &hints, &res); + } + else + { + error = getaddrinfo(host, port, &hints, &res); + } + if (error) + return 0; + return res; +} + +#endif +/* gethostbyname .. old systems */ int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add, int default_port) { struct hostent *hp; -#if HAVE_GETHOSTBYNAME_R - struct hostent h; - char hbuf[1024]; - int h_error; -#endif char *p, buf[512]; short int port = default_port; #ifdef WIN32 @@ -253,20 +310,13 @@ int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add, #else in_addr_t tmpadd; #endif - -#ifndef INADDR_NONE -#define INADDR_NONE -1 -#endif - - if (!tcpip_init ()) - return 0; TRC(fprintf(stderr, "tcpip_strtoaddress: %s\n", str ? str : "NULL")); add->sin_family = AF_INET; - strncpy(buf, str, 511); - buf[511] = 0; + strncpy(buf, str, sizeof(buf)-1); + buf[sizeof(buf)-1] = 0; if ((p = strchr(buf, '/'))) *p = 0; - if ((p = strchr(buf, ':'))) + if ((p = strrchr(buf, ':'))) { *p = 0; port = atoi(p + 1); @@ -276,56 +326,85 @@ int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add, { add->sin_addr.s_addr = INADDR_ANY; } - else if ((tmpadd = inet_addr(buf)) != INADDR_NONE) + else if ((tmpadd = inet_addr(buf)) != -1) { memcpy(&add->sin_addr.s_addr, &tmpadd, sizeof(struct in_addr)); } -#if HAVE_GETHOSTBYNAME_R - else if (gethostbyname_r(buf, &h, hbuf, sizeof(hbuf), &hp, &h_error) == 0) - { - memcpy(&add->sin_addr.s_addr, *hp->h_addr_list, - sizeof(struct in_addr)); - } -#else else if ((hp = gethostbyname(buf))) { memcpy(&add->sin_addr.s_addr, *hp->h_addr_list, sizeof(struct in_addr)); } -#endif else return 0; return 1; } + +#if HAVE_GETADDRINFO void *tcpip_straddr(COMSTACK h, const char *str) { tcpip_state *sp = (tcpip_state *)h->cprivate; - int port = 210; + const char *port = "210"; + if (h->protocol == PROTO_HTTP) + port = "80"; + if (!tcpip_init ()) + return 0; + if (sp->ai) + freeaddrinfo(sp->ai); + sp->ai = tcpip_getaddrinfo(str, port); + if (sp->ai && h->state == CS_ST_UNBND) + { + int s = -1; + struct addrinfo *ai = sp->ai; + for (; ai; ai = ai->ai_next) + { + s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (s != -1) + break; + } + if (s == -1) + return 0; + h->iofile = s; + + if (!tcpip_set_blocking(h, h->flags)) + return 0; + } + return sp->ai; +} +#else +void *tcpip_straddr(COMSTACK h, const char *str) +{ + tcpip_state *sp = (tcpip_state *)h->cprivate; + int port = 210; if (h->protocol == PROTO_HTTP) port = 80; + if (!tcpip_init ()) + return 0; if (!tcpip_strtoaddr_ex (str, &sp->addr, port)) return 0; - return &sp->addr; -} + if (h->state == CS_ST_UNBND) + { + int s; + s = socket(AF_INET, SOCK_STREAM, 0); + if (s < 0) + return 0; + h->iofile = s; -struct sockaddr_in *tcpip_strtoaddr(const char *str) -{ - static struct sockaddr_in add; - - if (!tcpip_strtoaddr_ex (str, &add, 210)) - return 0; - return &add; + if (!tcpip_set_blocking(h, h->flags)) + return 0; + } + return &sp->addr; } +#endif int tcpip_more(COMSTACK h) { tcpip_state *sp = (tcpip_state *)h->cprivate; - return sp->altlen && (*sp->complete)((unsigned char *) sp->altbuf, - sp->altlen); + return sp->altlen && (*sp->complete)(sp->altbuf, sp->altlen); } /* @@ -335,7 +414,11 @@ int tcpip_more(COMSTACK h) */ int tcpip_connect(COMSTACK h, void *address) { - struct sockaddr_in *add = (struct sockaddr_in *)address; +#if HAVE_GETADDRINFO + tcpip_state *sp = (tcpip_state *)h->cprivate; +#else + struct sockaddr_in *add = (struct sockaddr_in *) address; +#endif int r; #ifdef __sun__ int recbuflen; @@ -348,6 +431,13 @@ int tcpip_connect(COMSTACK h, void *address) h->cerrno = CSOUTSTATE; return -1; } +#if HAVE_GETADDRINFO + if (sp->ai != (struct addrinfo *) address) + { + h->cerrno = CSOUTSTATE; + return -1; + } +#endif #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 @@ -374,7 +464,14 @@ int tcpip_connect(COMSTACK h, void *address) TRC(fprintf( stderr, "New Size of TCP Receive Buffer = %d\n", recbuflen )); #endif + +#if HAVE_GETADDRINFO + r = connect(h->iofile, sp->ai->ai_addr, sp->ai->ai_addrlen); + freeaddrinfo(sp->ai); + sp->ai = 0; +#else r = connect(h->iofile, (struct sockaddr *) add, sizeof(*add)); +#endif if (r < 0) { #ifdef WIN32 @@ -423,8 +520,8 @@ int tcpip_rcvconnect(COMSTACK h) #if HAVE_OPENSSL_SSL_H if (h->type == ssl_type && !sp->ctx) { + SSL_library_init(); SSL_load_error_strings(); - SSLeay_add_all_algorithms(); sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method()); if (!sp->ctx) @@ -492,19 +589,31 @@ static void tcpip_setsockopt (int fd) static int tcpip_bind(COMSTACK h, void *address, int mode) { + int r; + tcpip_state *sp = (tcpip_state *)h->cprivate; +#if HAVE_GETADDRINFO +#else struct sockaddr *addr = (struct sockaddr *)address; +#endif #ifdef WIN32 BOOL one = 1; #else - unsigned long one = 1; + int one = 1; +#endif + +#if HAVE_GETADDRINFO + if (sp->ai != (struct addrinfo *) address) + { + h->cerrno = CSOUTSTATE; + return -1; + } #endif #if HAVE_OPENSSL_SSL_H - tcpip_state *sp = (tcpip_state *)h->cprivate; if (h->type == ssl_type && !sp->ctx) { + SSL_library_init(); SSL_load_error_strings(); - SSLeay_add_all_algorithms(); sp->ctx = sp->ctx_alloc = SSL_CTX_new (SSLv23_method()); if (!sp->ctx) @@ -556,7 +665,14 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) } #endif tcpip_setsockopt(h->iofile); - if (bind(h->iofile, addr, sizeof(struct sockaddr_in))) +#if HAVE_GETADDRINFO + r = bind(h->iofile, sp->ai->ai_addr, sp->ai->ai_addrlen); + freeaddrinfo(sp->ai); + sp->ai = 0; +#else + r = bind(h->iofile, addr, sizeof(struct sockaddr_in)); +#endif + if (r) { h->cerrno = CSYSERR; return -1; @@ -602,7 +718,15 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, ) h->cerrno = CSNODATA; else + { +#ifdef WIN32 + shutdown(h->iofile, SD_RECEIVE); +#else + shutdown(h->iofile, SHUT_RD); +#endif + listen(h->iofile, SOMAXCONN); h->cerrno = CSYSERR; + } return -1; } if (addrlen && (size_t) (*addrlen) >= sizeof(struct sockaddr_in)) @@ -666,13 +790,7 @@ COMSTACK tcpip_accept(COMSTACK h) } return 0; } - if (!(cnew->blocking&1) && -#ifdef WIN32 - (ioctlsocket(cnew->iofile, FIONBIO, &tru) < 0) -#else - (fcntl(cnew->iofile, F_SETFL, O_NONBLOCK) < 0) -#endif - ) + if (!tcpip_set_blocking(cnew, cnew->flags)) { h->cerrno = CSYSERR; if (h->newfd != -1) @@ -693,6 +811,9 @@ COMSTACK tcpip_accept(COMSTACK h) state->altsize = state->altlen = 0; state->towrite = state->written = -1; state->complete = st->complete; +#if HAVE_GETADDRINFO + state->ai = 0; +#endif cnew->state = CS_ST_ACCEPT; h->state = CS_ST_IDLE; @@ -706,6 +827,8 @@ COMSTACK tcpip_accept(COMSTACK h) SSL_set_fd (state->ssl, cnew->iofile); } #endif + state->connect_request_buf = 0; + state->connect_response_buf = 0; h = cnew; } if (h->state == CS_ST_ACCEPT) @@ -774,7 +897,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) sp->altsize = tmpi; } h->io_pending = 0; - while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread))) + while (!(berlen = (*sp->complete)(*buf, hasread))) { if (!*bufsize) { @@ -799,7 +922,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) TRC(fprintf(stderr, " recv res=%d, hasread=%d\n", res, hasread)); if (res < 0) { - TRC(fprintf(stderr, " recv errno=%d, (%s)\n", yaz_errno(), + TRC(fprintf(stderr, " recv errno=%d, (%s)\n", yaz_errno(), strerror(yaz_errno()))); #ifdef WIN32 if (WSAGetLastError() == WSAEWOULDBLOCK) @@ -808,7 +931,10 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) break; } else + { + h->cerrno = CSYSERR; return -1; + } #else if (yaz_errno() == EWOULDBLOCK #ifdef EAGAIN @@ -828,7 +954,10 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) else if (yaz_errno() == 0) continue; else + { + h->cerrno = CSYSERR; return -1; + } #endif } else if (!res) @@ -852,10 +981,16 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) if (!sp->altbuf) { if (!(sp->altbuf = (char *)xmalloc(sp->altsize = req))) + { + h->cerrno = CSYSERR; return -1; + } } else if (sp->altsize < req) if (!(sp->altbuf =(char *)xrealloc(sp->altbuf, sp->altsize = req))) + { + h->cerrno = CSYSERR; return -1; + } TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove, (unsigned) sp->altbuf)); memcpy(sp->altbuf, *buf + berlen, sp->altlen = tomove); @@ -893,7 +1028,7 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) sp->altsize = tmpi; } h->io_pending = 0; - while (!(berlen = (*sp->complete)((unsigned char *)*buf, hasread))) + while (!(berlen = (*sp->complete)(*buf, hasread))) { if (!*bufsize) { @@ -1105,6 +1240,12 @@ int tcpip_close(COMSTACK h) if (sp->ctx_alloc) SSL_CTX_free (sp->ctx_alloc); #endif +#if HAVE_GETADDRINFO + if (sp->ai) + freeaddrinfo(sp->ai); +#endif + xfree(sp->connect_request_buf); + xfree(sp->connect_response_buf); xfree(sp); xfree(h); return 0; @@ -1112,25 +1253,50 @@ int tcpip_close(COMSTACK h) char *tcpip_addrstr(COMSTACK h) { - struct sockaddr_in addr; tcpip_state *sp = (struct tcpip_state *)h->cprivate; char *r = 0, *buf = sp->buf; - YAZ_SOCKLEN_T len; + +#if HAVE_GETADDRINFO + char host[120]; + struct sockaddr_storage addr; + YAZ_SOCKLEN_T len = sizeof(addr); + + if (getpeername(h->iofile, (struct sockaddr *)&addr, &len) < 0) + { + h->cerrno = CSYSERR; + return 0; + } + if (getnameinfo((struct sockaddr *) &addr, len, host, sizeof(host)-1, + 0, 0, + (h->flags & CS_FLAGS_NUMERICHOST) ? NI_NUMERICHOST : 0)) + { + r = "unknown"; + } + else + r = host; + +#else + + struct sockaddr_in addr; + YAZ_SOCKLEN_T len = sizeof(addr); struct hostent *host; - len = sizeof(addr); if (getpeername(h->iofile, (struct sockaddr*) &addr, &len) < 0) { h->cerrno = CSYSERR; return 0; } - if (!(h->blocking&2)) { - if ((host = gethostbyaddr((char*)&addr.sin_addr, sizeof(addr.sin_addr), - AF_INET))) + if (!(h->flags & CS_FLAGS_NUMERICHOST)) + { + if ((host = gethostbyaddr((char*)&addr.sin_addr, + sizeof(addr.sin_addr), + AF_INET))) r = (char*) host->h_name; } if (!r) - r = inet_ntoa(addr.sin_addr); + r = inet_ntoa(addr.sin_addr); +#endif + if (h->protocol == PROTO_HTTP) sprintf(buf, "http:%s", r); else @@ -1147,26 +1313,27 @@ char *tcpip_addrstr(COMSTACK h) return buf; } -int static tcpip_set_blocking(COMSTACK p, int blocking) +int static tcpip_set_blocking(COMSTACK p, int flags) { unsigned long flag; - if (p->blocking == blocking) - return 1; #ifdef WIN32 - flag = 1; + flag = (flags & CS_FLAGS_BLOCKING) ? 0 : 1; if (ioctlsocket(p->iofile, FIONBIO, &flag) < 0) return 0; #else flag = fcntl(p->iofile, F_GETFL, 0); - if(!(blocking&1)) - flag = flag & ~O_NONBLOCK; + if (flags & CS_FLAGS_BLOCKING) + flag = flag & ~O_NONBLOCK; /* blocking */ else - flag = flag | O_NONBLOCK; + { + flag = flag | O_NONBLOCK; /* non-blocking */ + signal(SIGPIPE, SIG_IGN); + } if (fcntl(p->iofile, F_SETFL, flag) < 0) return 0; #endif - p->blocking = blocking; + p->flags = flags; return 1; } @@ -1246,6 +1413,38 @@ int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname) } #endif + +static int tcpip_put_connect(COMSTACK h, char *buf, int size) +{ + struct tcpip_state *state = (struct tcpip_state *)h->cprivate; + + int r = tcpip_put(h, state->connect_request_buf, + state->connect_request_len); + if (r == 0) + { + /* it's sent */ + h->f_put = tcpip_put; /* switch to normal tcpip put */ + r = tcpip_put(h, buf, size); + } + return r; +} + +static int tcpip_get_connect(COMSTACK h, char **buf, int *bufsize) +{ + struct tcpip_state *state = (struct tcpip_state *)h->cprivate; + int r; + + r = tcpip_get(h, &state->connect_response_buf, + &state->connect_response_len); + if (r < 1) + return r; + /* got the connect response completely */ + state->complete = cs_complete_auto; /* switch to normal tcpip get */ + h->f_get = tcpip_get; + return tcpip_get(h, buf, bufsize); +} + + /* * Local variables: * c-basic-offset: 4