#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 */
#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);
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
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)
#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;
}
#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)
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)
{
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
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
#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;
*/
int tcpip_rcvconnect(COMSTACK h)
{
-#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;
{
if (ssl_check_error(h, sp, res))
return 1;
- return -1;
+ return cont_connect(h);
}
}
#endif
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,
state->complete = st->complete;
#if HAVE_GETADDRINFO
state->ai = 0;
+#if RESOLVER_THREAD
+ state->hoststr = 0;
+ state->pipefd[0] = state->pipefd[1] = -1;
+ state->port = 0;
+#endif
#endif
cnew->state = CS_ST_ACCEPT;
h->state = CS_ST_IDLE;
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",
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
#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);
projects / yaz-moved-to-github.git / blobdiff