X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftcpip.c;h=50c0622cde5973244f54bca7f7e46e7cda725b5d;hb=1cc0965c730ec9e2a9c9ccf45bb0d31cea8c1329;hp=563326411a04d831c0ae76eb2dbf32f48f363724;hpb=be49802a35b13fc0de847f5db05bfc4e6072ed06;p=yaz-moved-to-github.git diff --git a/src/tcpip.c b/src/tcpip.c index 5633264..50c0622 100644 --- a/src/tcpip.c +++ b/src/tcpip.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2008 Index Data + * Copyright (C) 1995-2009 Index Data * See the file LICENSE for details. */ /** @@ -25,7 +25,6 @@ #endif #ifdef WIN32 - /* VS 2003 or later has getaddrinfo; older versions do not */ #include #if _MSC_VER >= 1300 @@ -34,14 +33,20 @@ #else #define HAVE_GETADDRINFO 0 #endif +#endif -#else +#if HAVE_NETINET_IN_H #include +#endif +#if HAVE_NETDB_H #include +#endif +#if HAVE_ARPA_INET_H #include +#endif +#if HAVE_NETINET_TCP_H #include #endif - #if HAVE_SYS_SOCKET_H #include #endif @@ -52,12 +57,7 @@ #if HAVE_GNUTLS_H #include #include -#define ENABLE_SSL 2 - -#if ENABLE_SSL == 1 -#include -#endif - +#define ENABLE_SSL 1 #endif #if HAVE_OPENSSL_SSL_H @@ -68,7 +68,7 @@ #include #include -#include +#include static int tcpip_close(COMSTACK h); static int tcpip_put(COMSTACK h, char *buf, int size); @@ -103,7 +103,7 @@ static void *tcpip_straddr(COMSTACK h, const char *str); #define YAZ_SOCKLEN_T int #endif -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H struct tcpip_cred_ptr { gnutls_certificate_credentials_t xcred; int ref; @@ -126,11 +126,11 @@ typedef struct tcpip_state struct sockaddr_in addr; /* returned by cs_straddr */ #endif char buf[128]; /* returned by cs_addrstr */ -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H struct tcpip_cred_ptr *cred_ptr; gnutls_session_t session; char cert_fname[256]; -#elif ENABLE_SSL == 1 +#elif HAVE_OPENSSL_SSL_H SSL_CTX *ctx; /* current CTX. */ SSL_CTX *ctx_alloc; /* If =ctx it is owned by CS. If 0 it is not owned */ SSL *ssl; @@ -209,11 +209,11 @@ COMSTACK tcpip_type(int s, int flags, int protocol, void *vp) p->stackerr = 0; p->user = 0; -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H sp->cred_ptr = 0; sp->session = 0; strcpy(sp->cert_fname, "yaz.pem"); -#elif ENABLE_SSL == 1 +#elif HAVE_OPENSSL_SSL_H sp->ctx = sp->ctx_alloc = 0; sp->ssl = 0; strcpy(sp->cert_fname, "yaz.pem"); @@ -261,11 +261,11 @@ COMSTACK yaz_tcpip_create(int s, int flags, int protocol, return p; } -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H static void tcpip_create_cred(COMSTACK cs) { tcpip_state *sp = (tcpip_state *) cs->cprivate; - sp->cred_ptr = xmalloc(sizeof(*sp->cred_ptr)); + sp->cred_ptr = (struct tcpip_cred_ptr *) xmalloc(sizeof(*sp->cred_ptr)); sp->cred_ptr->ref = 1; gnutls_certificate_allocate_credentials(&sp->cred_ptr->xcred); } @@ -288,9 +288,9 @@ COMSTACK ssl_type(int s, int flags, int protocol, void *vp) p->type = ssl_type; sp = (tcpip_state *) p->cprivate; -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H sp->session = (gnutls_session_t) vp; -#else +#elif HAVE_OPENSSL_SSL_H sp->ctx = (SSL_CTX *) vp; /* may be NULL */ #endif /* note: we don't handle already opened socket in SSL mode - yet */ @@ -316,8 +316,7 @@ static int ssl_check_error(COMSTACK h, tcpip_state *sp, int res) h->io_pending = CS_WANT_WRITE; return 1; } -#else -#if ENABLE_SSL == 2 +#elif HAVE_GNUTLS_H TRC(fprintf(stderr, "ssl_check_error error=%d fatal=%d msg=%s\n", res, gnutls_error_is_fatal(res), @@ -329,20 +328,6 @@ static int ssl_check_error(COMSTACK h, tcpip_state *sp, int res) h->io_pending = dir ? CS_WANT_WRITE : CS_WANT_READ; return 1; } -#else - int tls_error = sp->ssl->last_error; - TRC(fprintf(stderr, "ssl_check_error error=%d fatal=%d msg=%s\n", - sp->ssl->last_error, - gnutls_error_is_fatal(tls_error), - gnutls_strerror(tls_error))); - if (tls_error == GNUTLS_E_AGAIN || tls_error == GNUTLS_E_INTERRUPTED) - { - int dir = gnutls_record_get_direction(sp->ssl->gnutls_state); - TRC(fprintf(stderr, " -> incomplete dir=%d\n", dir)); - h->io_pending = dir ? CS_WANT_WRITE : CS_WANT_READ; - return 1; - } -#endif #endif h->cerrno = CSERRORSSL; return 0; @@ -433,12 +418,12 @@ int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add, return 1; } - #if HAVE_GETADDRINFO void *tcpip_straddr(COMSTACK h, const char *str) { tcpip_state *sp = (tcpip_state *)h->cprivate; const char *port = "210"; + struct addrinfo *ai; if (h->protocol == PROTO_HTTP) port = "80"; if (!tcpip_init()) @@ -450,21 +435,35 @@ void *tcpip_straddr(COMSTACK h, const char *str) if (sp->ai && h->state == CS_ST_UNBND) { int s = -1; - struct addrinfo *ai = sp->ai; - for (; ai; ai = ai->ai_next) + /* try to make IPV6 socket first */ + for (ai = sp->ai; ai; ai = ai->ai_next) { - s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); - if (s != -1) - break; + if (ai->ai_family == AF_INET6) + { + s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol); + if (s != -1) + break; + } + } + if (s == -1) + { + /* no IPV6 could be made.. Try them all */ + for (ai = sp->ai; 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; + assert(ai); h->iofile = s; if (!tcpip_set_blocking(h, h->flags)) return 0; } - return sp->ai; + return ai; } #else void *tcpip_straddr(COMSTACK h, const char *str) @@ -508,15 +507,12 @@ int tcpip_more(COMSTACK h) int tcpip_connect(COMSTACK h, void *address) { #if HAVE_GETADDRINFO + struct addrinfo *ai = (struct addrinfo *) address; tcpip_state *sp = (tcpip_state *)h->cprivate; #else struct sockaddr_in *add = (struct sockaddr_in *) address; #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_ST_UNBND) @@ -525,41 +521,7 @@ int tcpip_connect(COMSTACK h, void *address) 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 - * (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 - -#if HAVE_GETADDRINFO - r = connect(h->iofile, sp->ai->ai_addr, sp->ai->ai_addrlen); + r = connect(h->iofile, ai->ai_addr, ai->ai_addrlen); freeaddrinfo(sp->ai); sp->ai = 0; #else @@ -610,7 +572,7 @@ int tcpip_rcvconnect(COMSTACK h) h->cerrno = CSOUTSTATE; return -1; } -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H if (h->type == ssl_type && !sp->session) { int res; @@ -619,12 +581,14 @@ int tcpip_rcvconnect(COMSTACK h) tcpip_create_cred(h); gnutls_init(&sp->session, GNUTLS_CLIENT); - gnutls_priority_set_direct(sp->session, "PERFORMANCE", NULL); + gnutls_set_default_priority(sp->session); gnutls_credentials_set (sp->session, GNUTLS_CRD_CERTIFICATE, sp->cred_ptr->xcred); - gnutls_transport_set_ptr(sp->session, (gnutls_transport_ptr_t) h->iofile); - + /* cast to intermediate size_t to avoid GCC warning. */ + gnutls_transport_set_ptr(sp->session, + (gnutls_transport_ptr_t) + (size_t) h->iofile); res = gnutls_handshake(sp->session); if (res < 0) { @@ -633,7 +597,7 @@ int tcpip_rcvconnect(COMSTACK h) return -1; } } -#elif ENABLE_SSL == 1 +#elif HAVE_OPENSSL_SSL_H if (h->type == ssl_type && !sp->ctx) { SSL_library_init(); @@ -697,7 +661,8 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) { int r; tcpip_state *sp = (tcpip_state *)h->cprivate; -#if HAVE_GETADDRINFO +#if HAVE_GETADDRINFO + struct addrinfo *ai = (struct addrinfo *) address; #else struct sockaddr *addr = (struct sockaddr *)address; #endif @@ -707,15 +672,7 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) int one = 1; #endif -#if HAVE_GETADDRINFO - if (sp->ai != (struct addrinfo *) address) - { - h->cerrno = CSOUTSTATE; - return -1; - } -#endif - -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H if (h->type == ssl_type && !sp->session) { int res; @@ -733,7 +690,7 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) return -1; } } -#elif ENABLE_SSL == 1 +#elif HAVE_OPENSSL_SSL_H if (h->type == ssl_type && !sp->ctx) { SSL_library_init(); @@ -755,34 +712,22 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) SSL_FILETYPE_PEM); if (res <= 0) { -#if HAVE_OPENSSL_SSL_H ERR_print_errors_fp(stderr); -#else - fprintf(stderr, " SSL_CTX_use_certificate_file %s failed\n", - sp->cert_fname); -#endif exit(2); } res = SSL_CTX_use_PrivateKey_file(sp->ctx, sp->cert_fname, SSL_FILETYPE_PEM); if (res <= 0) { -#if HAVE_OPENSSL_SSL_H ERR_print_errors_fp(stderr); -#else - fprintf(stderr, " SSL_CTX_use_certificate_file %s failed\n", - sp->cert_fname); -#endif exit(3); } -#if HAVE_OPENSSL_SSL_H res = SSL_CTX_check_private_key(sp->ctx); if (res <= 0) { ERR_print_errors_fp(stderr); exit(5); } -#endif } TRC(fprintf(stderr, "ssl_bind\n")); } @@ -803,7 +748,7 @@ static int tcpip_bind(COMSTACK h, void *address, int mode) #endif tcpip_setsockopt(h->iofile); #if HAVE_GETADDRINFO - r = bind(h->iofile, sp->ai->ai_addr, sp->ai->ai_addrlen); + r = bind(h->iofile, ai->ai_addr, ai->ai_addrlen); freeaddrinfo(sp->ai); sp->ai = 0; #else @@ -838,7 +783,11 @@ int tcpip_listen(COMSTACK h, char *raddr, int *addrlen, h->cerrno = CSOUTSTATE; return -1; } +#ifdef WIN32 + h->newfd = accept(h->iofile, 0, 0); +#else h->newfd = accept(h->iofile, (struct sockaddr*)&addr, &len); +#endif if (h->newfd < 0) { if ( @@ -955,7 +904,7 @@ COMSTACK tcpip_accept(COMSTACK h) cnew->state = CS_ST_ACCEPT; h->state = CS_ST_IDLE; -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H state->cred_ptr = st->cred_ptr; state->session = 0; if (st->cred_ptr) @@ -970,8 +919,7 @@ COMSTACK tcpip_accept(COMSTACK h) xfree(state); return 0; } - res = gnutls_priority_set_direct(state->session, - "PERFORMANCE", NULL); + res = gnutls_set_default_priority(state->session); if (res != GNUTLS_E_SUCCESS) { xfree(cnew); @@ -987,10 +935,12 @@ COMSTACK tcpip_accept(COMSTACK h) xfree(state); return 0; } + /* cast to intermediate size_t to avoid GCC warning. */ gnutls_transport_set_ptr(state->session, - (gnutls_transport_ptr_t) cnew->iofile); + (gnutls_transport_ptr_t) + (size_t) cnew->iofile); } -#elif ENABLE_SSL == 1 +#elif HAVE_OPENSSL_SSL_H state->ctx = st->ctx; state->ctx_alloc = 0; state->ssl = st->ssl; @@ -1006,7 +956,7 @@ COMSTACK tcpip_accept(COMSTACK h) } if (h->state == CS_ST_ACCEPT) { -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H tcpip_state *state = (tcpip_state *)h->cprivate; if (state->session) { @@ -1024,7 +974,7 @@ COMSTACK tcpip_accept(COMSTACK h) } TRC(fprintf(stderr, "SSL_accept complete. gnutls\n")); } -#elif ENABLE_SSL == 1 +#elif HAVE_OPENSSL_SSL_H tcpip_state *state = (tcpip_state *)h->cprivate; if (state->ctx) { @@ -1072,8 +1022,8 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) TRC(fprintf(stderr, "tcpip_get: bufsize=%d\n", *bufsize)); if (sp->altlen) /* switch buffers */ { - TRC(fprintf(stderr, " %d bytes in altbuf (0x%x)\n", sp->altlen, - (unsigned) sp->altbuf)); + TRC(fprintf(stderr, " %d bytes in altbuf (%p)\n", sp->altlen, + sp->altbuf)); tmpc = *buf; tmpi = *bufsize; *buf = sp->altbuf; @@ -1178,8 +1128,8 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize) h->cerrno = CSYSERR; return -1; } - TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove, - (unsigned) sp->altbuf)); + TRC(fprintf(stderr, " Moving %d bytes to altbuf(%p)\n", tomove, + sp->altbuf)); memcpy(sp->altbuf, *buf + berlen, sp->altlen = tomove); } if (berlen < CS_TCPIP_BUFCHUNK - 1) @@ -1203,8 +1153,8 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) TRC(fprintf(stderr, "ssl_get: bufsize=%d\n", *bufsize)); if (sp->altlen) /* switch buffers */ { - TRC(fprintf(stderr, " %d bytes in altbuf (0x%x)\n", sp->altlen, - (unsigned) sp->altbuf)); + TRC(fprintf(stderr, " %d bytes in altbuf (%p)\n", sp->altlen, + sp->altbuf)); tmpc = *buf; tmpi = *bufsize; *buf = sp->altbuf; @@ -1225,7 +1175,7 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) else if (*bufsize - hasread < CS_TCPIP_BUFCHUNK) if (!(*buf =(char *)xrealloc(*buf, *bufsize *= 2))) return -1; -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H res = gnutls_record_recv(sp->session, *buf + hasread, CS_TCPIP_BUFCHUNK); if (res < 0) @@ -1262,8 +1212,8 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize) } else if (sp->altsize < req) if (!(sp->altbuf =(char *)xrealloc(sp->altbuf, sp->altsize = req))) return -1; - TRC(fprintf(stderr, " Moving %d bytes to altbuf(0x%x)\n", tomove, - (unsigned) sp->altbuf)); + TRC(fprintf(stderr, " Moving %d bytes to altbuf(%p)\n", tomove, + sp->altbuf)); memcpy(sp->altbuf, *buf + berlen, sp->altlen = tomove); } if (berlen < CS_TCPIP_BUFCHUNK - 1) @@ -1367,7 +1317,7 @@ int ssl_put(COMSTACK h, char *buf, int size) } while (state->towrite > state->written) { -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H res = gnutls_record_send(state->session, buf + state->written, size - state->written); if (res <= 0) @@ -1376,7 +1326,7 @@ int ssl_put(COMSTACK h, char *buf, int size) return 1; return -1; } -#elif ENABLE_SSL == 1 +#else res = SSL_write(state->ssl, buf + state->written, size - state->written); if (res <= 0) @@ -1403,10 +1353,10 @@ int tcpip_close(COMSTACK h) TRC(fprintf(stderr, "tcpip_close h=%p pid=%d\n", h, getpid())); if (h->iofile != -1) { -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H if (sp->session) gnutls_bye(sp->session, GNUTLS_SHUT_RDWR); -#elif ENABLE_SSL == 2 +#elif HAVE_OPENSSL_SSL_H if (sp->ssl) { SSL_shutdown(sp->ssl); @@ -1420,7 +1370,7 @@ int tcpip_close(COMSTACK h) } if (sp->altbuf) xfree(sp->altbuf); -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H if (sp->session) { gnutls_deinit(sp->session); @@ -1438,7 +1388,7 @@ int tcpip_close(COMSTACK h) } sp->cred_ptr = 0; } -#elif ENABLE_SSL == 1 +#elif HAVE_OPENSSL_SSL_H if (sp->ssl) { TRC(fprintf(stderr, "SSL_free\n")); @@ -1509,7 +1459,7 @@ char *tcpip_addrstr(COMSTACK h) sprintf(buf, "http:%s", r); else sprintf(buf, "tcp:%s", r); -#if ENABLE_SSL == 2 +#if HAVE_GNUTLS_H if (sp->session) { if (h->protocol == PROTO_HTTP) @@ -1517,7 +1467,7 @@ char *tcpip_addrstr(COMSTACK h) else sprintf(buf, "ssl:%s", r); } -#elif ENABLE_SSL == 1 +#elif HAVE_OPENSSL_SSL_H if (sp->ctx) { if (h->protocol == PROTO_HTTP) @@ -1529,7 +1479,7 @@ char *tcpip_addrstr(COMSTACK h) return buf; } -int static tcpip_set_blocking(COMSTACK p, int flags) +static int tcpip_set_blocking(COMSTACK p, int flags) { unsigned long flag; @@ -1556,7 +1506,6 @@ int static tcpip_set_blocking(COMSTACK p, int flags) void cs_print_session_info(COMSTACK cs) { #if HAVE_GNUTLS_H -#if ENABLE_SSL == 2 struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate; if (sp->session) { @@ -1564,19 +1513,7 @@ void cs_print_session_info(COMSTACK cs) return; printf("X509 certificate\n"); } -#else - struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate; - SSL *ssl = (SSL *) sp->ssl; - if (ssl) - { - gnutls_session_t session = ssl->gnutls_state; - if (gnutls_certificate_type_get(session) != GNUTLS_CRT_X509) - return; - printf("X509 certificate\n"); - } -#endif -#endif -#if HAVE_OPENSSL_SSL_H +#elif HAVE_OPENSSL_SSL_H struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate; SSL *ssl = (SSL *) sp->ssl; if (ssl) @@ -1617,23 +1554,27 @@ void *cs_get_ssl(COMSTACK cs) #endif } -#if ENABLE_SSL int cs_set_ssl_ctx(COMSTACK cs, void *ctx) { +#if ENABLE_SSL struct tcpip_state *sp; if (!cs || cs->type != ssl_type) return 0; sp = (struct tcpip_state *) cs->cprivate; -#if ENABLE_SSL == 1 +#if HAVE_OPENSSL_SSL_H if (sp->ctx_alloc) return 0; sp->ctx = (SSL_CTX *) ctx; #endif return 1; +#else + return 0; +#endif } int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname) { +#if ENABLE_SSL struct tcpip_state *sp; if (!cs || cs->type != ssl_type) return 0; @@ -1641,6 +1582,9 @@ int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname) strncpy(sp->cert_fname, fname, sizeof(sp->cert_fname)-1); sp->cert_fname[sizeof(sp->cert_fname)-1] = '\0'; return 1; +#else + return 0; +#endif } int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len) @@ -1666,23 +1610,6 @@ int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len) #endif return 0; } -#else -int cs_set_ssl_ctx(COMSTACK cs, void *ctx) -{ - return 0; -} - -int cs_get_peer_certificate_x509(COMSTACK cs, char **buf, int *len) -{ - return 0; -} - -int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname) -{ - return 0; -} -#endif - static int tcpip_put_connect(COMSTACK h, char *buf, int size) { @@ -1718,6 +1645,7 @@ static int tcpip_get_connect(COMSTACK h, char **buf, int *bufsize) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab