-/* $Id: getaddrinfo.c,v 1.1 2007-04-21 12:00:54 adam Exp $
- Copyright (c) 2006-2007, Index Data.
-
-This file is part of Pazpar2.
+/* This file is part of Pazpar2.
+ Copyright (C) 2006-2010 Index Data
Pazpar2 is free software; you can redistribute it and/or modify it under
the terms of the GNU General Public License as published by the Free
for more details.
You should have received a copy of the GNU General Public License
-along with Pazpar2; see the file LICENSE. If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+*/
#if HAVE_CONFIG_H
-#include "cconfig.h"
+#include <config.h>
#endif
#include "sel_thread.h"
+#if HAVE_UNISTD_H
#include <unistd.h>
+#endif
#include <stdlib.h>
-#include <pthread.h>
+
#include <assert.h>
#include <sys/types.h>
+#if HAVE_SYS_SOCKET_H
#include <sys/socket.h>
+#endif
+#ifdef WIN32
+#include <winsock.h>
+#endif
+#if HAVE_NETDB_H
#include <netdb.h>
+#endif
+#if HAVE_NETINET_IN_H
#include <netinet/in.h>
+#endif
#include <yaz/log.h>
#include <yaz/nmem.h>
#include <yaz/tcpip.h>
-#include "pazpar2.h"
+#include "session.h"
+#include "connection.h"
+#include "host.h"
+
+/* Only use a threaded resolver on Unix that offers getaddrinfo.
+ gethostbyname is NOT reentrant.
+ */
+#if HAVE_GETADDRINFO
+#ifndef WIN32
+#define USE_THREADED_RESOLVER 1
+#endif
+#endif
struct work {
char *hostport; /* hostport to be resolved in separate thread */
char *ipport; /* result or NULL if it could not be resolved */
struct host *host; /* host that we're dealing with - mother thread */
+ iochan_man_t iochan_man; /* iochan manager */
};
static int log_level = YLOG_LOG;
{
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 (sec)
{
yaz_log(log_level, "waiting %d seconds", sec);
+#if HAVE_UNISTD_H
sleep(sec);
+#endif
}
perform_getaddrinfo(w);
}
+#if USE_THREADED_RESOLVER
void iochan_handler(struct iochan *i, int event)
{
sel_thread_t p = iochan_getdata(i);
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, w->iochan_man);
xfree(w);
}
}
static sel_thread_t resolver_thread = 0;
-static void getaddrinfo_start(void)
+static void getaddrinfo_start(iochan_man_t iochan_man)
{
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");
}
else
{
- IOCHAN chan = iochan_create(fd, iochan_handler, EVENT_INPUT);
+ IOCHAN chan = iochan_create(fd, iochan_handler, EVENT_INPUT,
+ "getaddrinfo_socket");
iochan_setdata(chan, p);
- pazpar2_add_channel(chan);
+ iochan_add(iochan_man, chan);
}
yaz_log(log_level, "resolver start");
resolver_thread = p;
}
+#endif
-int host_getaddrinfo(struct host *host)
+int host_getaddrinfo(struct host *host, iochan_man_t iochan_man)
{
struct work *w = xmalloc(sizeof(*w));
- int use_thread = 1;
+ int use_thread = 0; /* =0 to disable threading entirely */
w->hostport = host->hostport;
w->ipport = 0;
w->host = host;
+ w->iochan_man = iochan_man;
+#if USE_THREADED_RESOLVER
if (use_thread)
{
if (resolver_thread == 0)
- getaddrinfo_start();
+ getaddrinfo_start(iochan_man);
assert(resolver_thread);
sel_thread_add(resolver_thread, w);
+ return 0;
}
- else
- {
- perform_getaddrinfo(w);
- host->ipport = w->ipport;
- xfree(w);
- if (!host->ipport)
- return -1;
- }
+#endif
+ perform_getaddrinfo(w);
+ host->ipport = w->ipport;
+ xfree(w);
+ if (!host->ipport)
+ return -1;
return 0;
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+
projects / pazpar2-moved-to-github.git / blobdiff