X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ftcpip.c;h=bc5c6adfc25727de417cf1c551a0652817e8443a;hp=57f15af2459dab06ca1da257b402282d695d6df6;hb=e33389ee14d909d3a1b9874a40aa1b53c3fe42be;hpb=b238b8e40486033974dfab1debe409c292bf81a1

diff --git a/src/tcpip.c b/src/tcpip.c
index 57f15af..bc5c6ad 100644
--- a/src/tcpip.c
+++ b/src/tcpip.c
@@ -26,6 +26,7 @@
 #if HAVE_UNISTD_H
 #include <unistd.h>
 #endif
+#include <yaz/thread_create.h>
 
 #ifdef WIN32
 /* VS 2003 or later has getaddrinfo; older versions do not */
@@ -60,13 +61,16 @@
 #if HAVE_GNUTLS_H
 #include <gnutls/x509.h>
 #include <gnutls/gnutls.h>
-#define ENABLE_SSL 1
 #endif
 
 #include <yaz/comstack.h>
 #include <yaz/tcpip.h>
 #include <yaz/errno.h>
 
+#ifndef WIN32
+#define RESOLVER_THREAD 1
+#endif
+
 static void tcpip_close(COMSTACK h);
 static int tcpip_put(COMSTACK h, char *buf, int size);
 static int tcpip_get(COMSTACK h, char **buf, int *bufsize);
@@ -81,7 +85,7 @@ static int tcpip_listen(COMSTACK h, char *raddr, int *addrlen,
                  void *cd);
 static int tcpip_set_blocking(COMSTACK p, int blocking);
 
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
 static int ssl_get(COMSTACK h, char **buf, int *bufsize);
 static int ssl_put(COMSTACK h, char *buf, int size);
 #endif
@@ -119,6 +123,7 @@ typedef struct tcpip_state
     int (*complete)(const char *buf, int len); /* length/complete. */
 #if HAVE_GETADDRINFO
     struct addrinfo *ai;
+    struct addrinfo *ai_connect;
 #else
     struct sockaddr_in addr;  /* returned by cs_straddr */
 #endif
@@ -132,6 +137,13 @@ typedef struct tcpip_state
     int connect_request_len;
     char *connect_response_buf;
     int connect_response_len;
+    int ipv6_only;
+#if RESOLVER_THREAD
+    int pipefd[2];
+    char *hoststr;
+    const char *port;
+    yaz_thread_t thread_id;
+#endif
 } tcpip_state;
 
 static int tcpip_init(void)
@@ -205,7 +217,13 @@ COMSTACK tcpip_type(int s, int flags, int protocol, void *vp)
 #endif
 
 #if HAVE_GETADDRINFO
+#if RESOLVER_THREAD
+    sp->hoststr = 0;
+    sp->pipefd[0] = sp->pipefd[1] = -1;
+    sp->port = 0;
+#endif
     sp->ai = 0;
+    sp->ai_connect = 0;
 #endif
     sp->altbuf = 0;
     sp->altsize = sp->altlen = 0;
@@ -255,9 +273,7 @@ static void tcpip_create_cred(COMSTACK cs)
 
 COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
 {
-#if !ENABLE_SSL
-    return 0;
-#else
+#if HAVE_GNUTLS_H
     tcpip_state *sp;
     COMSTACK p;
 
@@ -269,18 +285,17 @@ COMSTACK ssl_type(int s, int flags, int protocol, void *vp)
     p->type = ssl_type;
     sp = (tcpip_state *) p->cprivate;
 
-#if HAVE_GNUTLS_H
     sp->session = (gnutls_session_t) vp;
-#endif
     /* note: we don't handle already opened socket in SSL mode - yet */
     return p;
+#else
+    return 0;
 #endif
 }
 
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
 static int ssl_check_error(COMSTACK h, tcpip_state *sp, int res)
 {
-#if HAVE_GNUTLS_H
     TRC(fprintf(stderr, "ssl_check_error error=%d fatal=%d msg=%s\n",
                 res,
                 gnutls_error_is_fatal(res),
@@ -292,7 +307,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;
     }
-#endif
     h->cerrno = CSERRORSSL;
     return 0;
 }
@@ -401,28 +415,13 @@ int tcpip_strtoaddr_ex(const char *str, struct sockaddr_in *add,
 }
 
 #if HAVE_GETADDRINFO
-void *tcpip_straddr(COMSTACK h, const char *str)
+static struct addrinfo *create_net_socket(COMSTACK h)
 {
     tcpip_state *sp = (tcpip_state *)h->cprivate;
-    const char *port = "210";
+    int s = -1;
     struct addrinfo *ai = 0;
-    int ipv6_only = 0;
-    if (h->protocol == PROTO_HTTP)
-    {
-        if (h->type == ssl_type)
-            port = "443";
-        else
-            port = "80";
-    }
-    if (!tcpip_init())
-        return 0;
-
-    if (sp->ai)
-        freeaddrinfo(sp->ai);
-    sp->ai = tcpip_getaddrinfo(str, port, &ipv6_only);
-    if (sp->ai && h->state == CS_ST_UNBND)
+    if (sp->ipv6_only >= 0)
     {
-        int s = -1;
         for (ai = sp->ai; ai; ai = ai->ai_next)
         {
             if (ai->ai_family == AF_INET6)
@@ -432,29 +431,102 @@ void *tcpip_straddr(COMSTACK h, const char *str)
                     break;
             }
         }
-        if (s == -1)
+    }
+    if (s == -1)
+    {
+        for (ai = sp->ai; ai; ai = ai->ai_next)
         {
-            for (ai = sp->ai; ai; ai = ai->ai_next)
-            {
-                s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
-                if (s != -1)
-                     break;
-            }
+            s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+            if (s != -1)
+                break;
         }
-        if (s == -1)
+    }
+    if (s == -1)
+        return 0;
+    TRC(fprintf(stderr, "First socket fd=%d\n", s));
+    assert(ai);
+    h->iofile = s;
+    if (ai->ai_family == AF_INET6 && sp->ipv6_only >= 0 &&
+        setsockopt(h->iofile,
+                   IPPROTO_IPV6,
+                   IPV6_V6ONLY, &sp->ipv6_only, sizeof(sp->ipv6_only)))
+        return 0;
+    if (!tcpip_set_blocking(h, h->flags))
+        return 0;
+    return ai;
+}
+
+#if RESOLVER_THREAD
+
+void *resolver_thread(void *arg)
+{
+    COMSTACK h = (COMSTACK) arg;
+    tcpip_state *sp = (tcpip_state *)h->cprivate;
+
+    sp->ipv6_only = 0;
+    if (sp->ai)
+        freeaddrinfo(sp->ai);
+    sp->ai = tcpip_getaddrinfo(sp->hoststr, sp->port, &sp->ipv6_only);
+    write(sp->pipefd[1], "1", 1);
+    return 0;
+}
+
+static struct addrinfo *wait_resolver_thread(COMSTACK h)
+{
+    tcpip_state *sp = (tcpip_state *)h->cprivate;
+    char buf;
+
+    read(sp->pipefd[0], &buf, 1);
+    yaz_thread_join(&sp->thread_id, 0);
+    close(sp->pipefd[0]);
+    close(sp->pipefd[1]);
+    sp->pipefd[0] = -1;
+    h->iofile = -1;
+    return create_net_socket(h);
+}
+
+#endif
+
+void *tcpip_straddr(COMSTACK h, const char *str)
+{
+    tcpip_state *sp = (tcpip_state *)h->cprivate;
+    const char *port = "210";
+
+    if (!tcpip_init())
+        return 0;
+
+    if (h->protocol == PROTO_HTTP)
+    {
+        if (h->type == ssl_type)
+            port = "443";
+        else
+            port = "80";
+    }
+#if RESOLVER_THREAD
+    if (h->flags & CS_FLAGS_DNS_NO_BLOCK)
+    {
+        if (sp->pipefd[0] != -1)
             return 0;
-        assert(ai);
-        h->iofile = s;
-        if (ai->ai_family == AF_INET6 && ipv6_only >= 0 &&
-            setsockopt(h->iofile,
-                       IPPROTO_IPV6,
-                       IPV6_V6ONLY, &ipv6_only, sizeof(ipv6_only)))
-                return 0;
-        if (!tcpip_set_blocking(h, h->flags))
+        if (pipe(sp->pipefd) == -1)
             return 0;
+
+        sp->port = port;
+        xfree(sp->hoststr);
+        sp->hoststr = xstrdup(str);
+        sp->thread_id = yaz_thread_create(resolver_thread, h);
+        return sp->hoststr;
     }
-    return ai;
+#endif
+    if (sp->ai)
+        freeaddrinfo(sp->ai);
+    sp->ai = tcpip_getaddrinfo(str, port, &sp->ipv6_only);
+    if (sp->ai && h->state == CS_ST_UNBND)
+    {
+        return create_net_socket(h);
+    }
+    return sp->ai;
 }
+
 #else
 void *tcpip_straddr(COMSTACK h, const char *str)
 {
@@ -494,6 +566,43 @@ int tcpip_more(COMSTACK h)
     return sp->altlen && (*sp->complete)(sp->altbuf, sp->altlen);
 }
 
+static int cont_connect(COMSTACK h)
+{
+#if HAVE_GETADDRINFO
+    tcpip_state *sp = (tcpip_state *)h->cprivate;
+    struct addrinfo *ai = sp->ai_connect;
+    while (ai && (ai = ai->ai_next))
+    {
+        int s;
+        s = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
+        if (s != -1)
+        {
+#if HAVE_GNUTLS_H
+            if (h->type == ssl_type && sp->session)
+            {
+                gnutls_bye(sp->session, GNUTLS_SHUT_WR);
+                gnutls_deinit(sp->session);
+                sp->session = 0;
+            }
+#endif
+#ifdef WIN32
+            closesocket(h->iofile);
+#else
+            close(h->iofile);
+#endif
+            TRC(fprintf(stderr, "Other socket call fd=%d\n", s));
+            h->state = CS_ST_UNBND;
+            h->iofile = s;
+            tcpip_set_blocking(h, h->flags);
+            return tcpip_connect(h, ai);
+        }
+#endif
+    }
+    h->cerrno = CSYSERR;
+    return -1;
+}
+
+
 /*
  * connect(2) will block (sometimes) - nothing we can do short of doing
  * weird things like spawning subprocesses or threading or some weird junk
@@ -515,10 +624,28 @@ int tcpip_connect(COMSTACK h, void *address)
         h->cerrno = CSOUTSTATE;
         return -1;
     }
+#if RESOLVER_THREAD
+    if (sp->pipefd[0] != -1)
+    {
+        if (h->flags & CS_FLAGS_BLOCKING)
+        {
+            ai = wait_resolver_thread(h);
+            if (!ai)
+                return -1;
+        }
+        else
+        {
+            h->event = CS_CONNECT;
+            h->state = CS_ST_CONNECTING;
+            h->io_pending = CS_WANT_READ;
+            h->iofile = sp->pipefd[0];
+            return 1;
+        }
+    }
+#endif
 #if HAVE_GETADDRINFO
     r = connect(h->iofile, ai->ai_addr, ai->ai_addrlen);
-    freeaddrinfo(sp->ai);
-    sp->ai = 0;
+    sp->ai_connect = ai;
 #else
     r = connect(h->iofile, (struct sockaddr *) add, sizeof(*add));
 #endif
@@ -535,14 +662,14 @@ int tcpip_connect(COMSTACK h, void *address)
 #else
         if (yaz_errno() == EINPROGRESS)
         {
+            TRC(fprintf(stderr, "Pending fd=%d\n", h->iofile));
             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;
+        return cont_connect(h);
     }
     h->event = CS_CONNECT;
     h->state = CS_ST_CONNECTING;
@@ -555,13 +682,23 @@ int tcpip_connect(COMSTACK h, void *address)
  */
 int tcpip_rcvconnect(COMSTACK h)
 {
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
     tcpip_state *sp = (tcpip_state *)h->cprivate;
 #endif
     TRC(fprintf(stderr, "tcpip_rcvconnect\n"));
 
     if (h->state == CS_ST_DATAXFER)
         return 0;
+#if RESOLVER_THREAD
+    if (sp->pipefd[0] != -1)
+    {
+        struct addrinfo *ai = wait_resolver_thread(h);
+        if (!ai)
+            return -1;
+        h->state = CS_ST_UNBND;
+        return tcpip_connect(h, ai);
+    }
+#endif
     if (h->state != CS_ST_CONNECTING)
     {
         h->cerrno = CSOUTSTATE;
@@ -587,7 +724,7 @@ int tcpip_rcvconnect(COMSTACK h)
         {
             if (ssl_check_error(h, sp, res))
                 return 1;
-            return -1;
+            return cont_connect(h);
         }
     }
 #endif
@@ -614,20 +751,26 @@ static int tcpip_bind(COMSTACK h, void *address, int mode)
     int one = 1;
 #endif
 
+#if RESOLVER_THREAD
+    if (sp->pipefd[0] != -1)
+    {
+        ai = wait_resolver_thread(h);
+        if (!ai)
+            return -1;
+    }
+#endif
 #if HAVE_GNUTLS_H
     if (h->type == ssl_type && !sp->session)
     {
         int res;
-        gnutls_global_init();
-
         tcpip_create_cred(h);
-
         res = gnutls_certificate_set_x509_key_file(sp->cred_ptr->xcred,
                                                    sp->cert_fname,
                                                    sp->cert_fname,
                                                    GNUTLS_X509_FMT_PEM);
         if (res != GNUTLS_E_SUCCESS)
         {
+            fprintf(stderr, "Error 1\n");
             h->cerrno = CSERRORSSL;
             return -1;
         }
@@ -1014,7 +1157,7 @@ int tcpip_get(COMSTACK h, char **buf, int *bufsize)
 }
 
 
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
 /*
  * Return: -1 error, >1 good, len of buffer, ==1 incomplete buffer,
  * 0=connection closed.
@@ -1051,7 +1194,6 @@ 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 HAVE_GNUTLS_H
         res = gnutls_record_recv(sp->session, *buf + hasread,
                                  CS_TCPIP_BUFCHUNK);
         if (res == 0)
@@ -1065,16 +1207,6 @@ int ssl_get(COMSTACK h, char **buf, int *bufsize)
                 break;
             return -1;
         }
-#else
-        res = SSL_read(sp->ssl, *buf + hasread, CS_TCPIP_BUFCHUNK);
-        TRC(fprintf(stderr, "  SSL_read res=%d, hasread=%d\n", res, hasread));
-        if (res <= 0)
-        {
-            if (ssl_check_error(h, sp, res))
-                break;
-            return -1;
-        }
-#endif
         hasread += res;
     }
     TRC (fprintf (stderr, "  Out of read loop with hasread=%d, berlen=%d\n",
@@ -1159,8 +1291,7 @@ int tcpip_put(COMSTACK h, char *buf, int size)
                 h->io_pending = CS_WANT_WRITE;
                 return 1;
             }
-            h->cerrno = CSYSERR;
-            return -1;
+            return cont_connect(h);
         }
         state->written += res;
         TRC(fprintf(stderr, "  Wrote %d, written=%d, nbytes=%d\n",
@@ -1172,7 +1303,7 @@ int tcpip_put(COMSTACK h, char *buf, int size)
 }
 
 
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
 /*
  * Returns 1, 0 or -1
  * In nonblocking mode, you must call again with same buffer while
@@ -1198,7 +1329,6 @@ int ssl_put(COMSTACK h, char *buf, int size)
     }
     while (state->towrite > state->written)
     {
-#if HAVE_GNUTLS_H
         res = gnutls_record_send(state->session, buf + state->written,
                                  size - state->written);
         if (res <= 0)
@@ -1207,16 +1337,6 @@ int ssl_put(COMSTACK h, char *buf, int size)
                 return 1;
             return -1;
         }
-#else
-        res = SSL_write(state->ssl, buf + state->written,
-                        size - state->written);
-        if (res <= 0)
-        {
-            if (ssl_check_error(h, state, res))
-                return 1;
-            return -1;
-        }
-#endif
         state->written += res;
         TRC(fprintf(stderr, "  Wrote %d, written=%d, nbytes=%d\n",
                     res, state->written, size));
@@ -1232,6 +1352,17 @@ void tcpip_close(COMSTACK h)
     tcpip_state *sp = (struct tcpip_state *)h->cprivate;
 
     TRC(fprintf(stderr, "tcpip_close: h=%p pid=%d\n", h, getpid()));
+#if HAVE_GETADDRINFO
+#if RESOLVER_THREAD
+    if (sp->pipefd[0] != -1)
+    {
+        yaz_thread_join(&sp->thread_id, 0);
+        close(sp->pipefd[0]);
+        close(sp->pipefd[1]);
+        h->iofile = -1;
+    }
+#endif
+#endif
     if (h->iofile != -1)
     {
 #if HAVE_GNUTLS_H
@@ -1268,6 +1399,9 @@ void tcpip_close(COMSTACK h)
 #if HAVE_GETADDRINFO
     if (sp->ai)
         freeaddrinfo(sp->ai);
+#if RESOLVER_THREAD
+    xfree(sp->hoststr);
+#endif
 #endif
     xfree(sp->connect_request_buf);
     xfree(sp->connect_response_buf);
@@ -1481,7 +1615,7 @@ void *cs_get_ssl(COMSTACK cs)
 
 int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
 {
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
     if (cs && cs->type == ssl_type)
     {
         /* doesn't do anything for GNUTLS */
@@ -1493,7 +1627,7 @@ int cs_set_ssl_ctx(COMSTACK cs, void *ctx)
 
 int cs_set_ssl_certificate_file(COMSTACK cs, const char *fname)
 {
-#if ENABLE_SSL
+#if HAVE_GNUTLS_H
     if (cs && cs->type == ssl_type)
     {
         struct tcpip_state *sp = (struct tcpip_state *) cs->cprivate;