Merge branch 'master' into yaz-744

[yaz-moved-to-github.git] / src / tcpip.c

diff --git a/src/tcpip.c b/src/tcpip.c
index 2cff050..c3e477d 100644 (file)
--- a/src/tcpip.c
+++ b/src/tcpip.c
@@ -221,6 +221,7 @@ COMSTACK tcpip_type(int s, int flags, int protocol, void *vp)
     sp->port = 0;
 #endif
     sp->ai = 0;
+    sp->ai_connect = 0;
 #endif
     sp->altbuf = 0;
     sp->altsize = sp->altlen = 0;
@@ -481,6 +482,8 @@ static struct addrinfo *wait_resolver_thread(COMSTACK h)
     return create_net_socket(h);
 }
 
+#endif
+
 void *tcpip_straddr(COMSTACK h, const char *str)
 {
     tcpip_state *sp = (tcpip_state *)h->cprivate;
@@ -496,7 +499,7 @@ void *tcpip_straddr(COMSTACK h, const char *str)
         else
             port = "80";
     }
-
+#if RESOLVER_THREAD
     if (sp->pipefd[0] != -1)
         return 0;
     if (pipe(sp->pipefd) == -1)
@@ -507,25 +510,7 @@ void *tcpip_straddr(COMSTACK h, const char *str)
     sp->hoststr = xstrdup(str);
     sp->thread_id = yaz_thread_create(resolver_thread, h);
     return sp->hoststr;
-}
-
 #else
-
-void *tcpip_straddr(COMSTACK h, const char *str)
-{
-    tcpip_state *sp = (tcpip_state *)h->cprivate;
-    const char *port = "210";
-    struct addrinfo *ai = 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, &sp->ipv6_only);
@@ -533,10 +518,9 @@ void *tcpip_straddr(COMSTACK h, const char *str)
     {
         return create_net_socket(h);
     }
-    return ai;
-}
-
+    return sp->ai;
 #endif
+}
 
 #else
 void *tcpip_straddr(COMSTACK h, const char *str)