X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fgetaddrinfo.c;h=6632b90479c7371457892a48c97aaef4cb4b5f24;hb=3fe6e057c6fbe85ead57eae7f378c755cbf2e6e2;hp=c400e07d34109edbaa9dedc75c0f8f63cf70bd89;hpb=dbcf2c3410ed74d919efdc62ffbd00e716284d8e;p=pazpar2-moved-to-github.git

diff --git a/src/getaddrinfo.c b/src/getaddrinfo.c
index c400e07..6632b90 100644
--- a/src/getaddrinfo.c
+++ b/src/getaddrinfo.c
@@ -1,7 +1,5 @@
-/* $Id: getaddrinfo.c,v 1.5 2007-04-23 21:05:23 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
@@ -14,38 +12,59 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 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;
@@ -54,14 +73,19 @@ void perform_getaddrinfo(struct work *w)
 {
     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;
@@ -90,6 +114,24 @@ void perform_getaddrinfo(struct work *w)
         w->ipport = xstrdup(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);
 }
 
@@ -101,11 +143,14 @@ static void work_handler(void *vp)
     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);
@@ -114,14 +159,14 @@ void iochan_handler(struct iochan *i, int event)
     {
         struct work *w = sel_thread_result(p);
         w->host->ipport = w->ipport;
-        connect_resolver_host(w->host);
+        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 = 
@@ -134,44 +179,49 @@ static void getaddrinfo_start(void)
     }
     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; /* =0 to disable threading entirely */
+    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
  */
+