-/* $Id: getaddrinfo.c,v 1.1 2007-04-21 12:00:54 adam Exp $
+/* $Id: getaddrinfo.c,v 1.8 2007-07-25 13:20:46 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
#include <yaz/tcpip.h>
#include "pazpar2.h"
+#include "connection.h"
+#include "host.h"
struct work {
char *hostport; /* hostport to be resolved in separate thread */
{
int res = 0;
char *port;
+#if HAVE_GETADDRINFO
struct addrinfo *addrinfo, hints;
+#else
+ struct hostent *hp;
+#endif
char *hostport = xstrdup(w->hostport);
if ((port = strchr(hostport, ':')))
*(port++) = '\0';
else
port = "210";
-
+
+#if HAVE_GETADDRINFO
hints.ai_flags = 0;
hints.ai_family = PF_INET;
hints.ai_socktype = SOCK_STREAM;
addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
freeaddrinfo(addrinfo);
w->ipport = xstrdup(ipport);
- yaz_log(log_level, "%s -> %s", hostport, ipport);
+ yaz_log(log_level, "Resolved %s -> %s", hostport, ipport);
+ }
+#else
+ hp = gethostbyname(hostport);
+ if (!hp)
+ {
+ yaz_log(YLOG_WARN|YLOG_ERRNO, "Failed to resolve %s", hostport);
}
+ else
+ {
+ char ipport[128];
+ unsigned char addrbuf[4];
+
+ memcpy(addrbuf, *hp->h_addr_list, 4 * sizeof(unsigned char));
+ sprintf(ipport, "%u.%u.%u.%u:%s",
+ addrbuf[0], addrbuf[1], addrbuf[2], addrbuf[3], port);
+ w->ipport = xstrdup(ipport);
+ yaz_log(log_level, "Resolved %s -> %s", hostport, ipport);
+ }
+#endif
xfree(hostport);
}
if (event & EVENT_INPUT)
{
struct work *w = sel_thread_result(p);
- if (w->ipport)
- yaz_log(log_level, "resolved result %s", w->ipport);
- else
- yaz_log(log_level, "unresolved result");
w->host->ipport = w->ipport;
+ connect_resolver_host(w->host);
xfree(w);
}
}
static void getaddrinfo_start(void)
{
int fd;
- sel_thread_t p = resolver_thread = sel_thread_create(work_handler, &fd);
+ sel_thread_t p = resolver_thread =
+ sel_thread_create(work_handler, 0 /* work_destroy */, &fd,
+ 3 /* no of resolver threads */);
if (!p)
{
yaz_log(YLOG_FATAL|YLOG_ERRNO, "sel_create_create failed");
int host_getaddrinfo(struct host *host)
{
struct work *w = xmalloc(sizeof(*w));
- int use_thread = 1;
+ int use_thread = 1; /* =0 to disable threading entirely */
w->hostport = host->hostport;
w->ipport = 0;