Allow unix sockets.. Not well tested yet!

[pazpar2-moved-to-github.git] / src / host.c

diff --git a/src/host.c b/src/host.c
index 7af0c07..75a7d04 100644 (file)
--- a/src/host.c
+++ b/src/host.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2012 Index Data
+   Copyright (C) 2006-2013 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
@@ -26,6 +26,8 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <sys/stat.h>
 #include <yaz/log.h>
 #include <yaz/nmem.h>
+#include <yaz/matchstr.h>
+#include <yaz/unix.h>
 
 #include "ppmutex.h"
 #include "session.h"
@@ -39,50 +41,39 @@ struct database_hosts {
 };
 
 // Create a new host structure for hostport
-static struct host *create_host(const char *url, const char *proxy,
-                                int default_port,
+static struct host *create_host(const char *proxy,
+                                const char *tproxy,
+                                CS_TYPE cs_type,
                                 iochan_man_t iochan_man)
 {
     struct host *host;
-    char *db_comment;
 
     host = xmalloc(sizeof(struct host));
-    host->url = xstrdup(url);
     host->proxy = 0;
     host->tproxy = 0;
     if (proxy && *proxy)
         host->proxy = xstrdup(proxy);
     else
     {
-        char *cp;
-        
-        host->tproxy = xmalloc (strlen(url) + 10); /* so we can add :port */
-        strcpy(host->tproxy, url);
-        for (cp = host->tproxy; *cp; cp++)
-            if (strchr("/?#~", *cp))
-            {
-                *cp = '\0';
-                break;
-            }
-        if (!strchr(host->tproxy, ':'))
-            sprintf(cp, ":%d", default_port); /* no port given, add it */
+        assert(tproxy);
+        host->tproxy = xstrdup(tproxy);
     }
-
-    db_comment = strchr(host->url, '#');
-    if (db_comment)
-        *db_comment = '\0';
     host->connections = 0;
     host->ipport = 0;
     host->mutex = 0;
 
-    if (host_getaddrinfo(host, iochan_man))
+    if (cs_type == unix_type)
+        host->ipport = xstrdup(host->tproxy);
+    else
     {
-        xfree(host->ipport);
-        xfree(host->tproxy);
-        xfree(host->proxy);
-        xfree(host->url);
-        xfree(host);
-        return 0;
+        if (host_getaddrinfo(host, iochan_man))
+        {
+            xfree(host->ipport);
+            xfree(host->tproxy);
+            xfree(host->proxy);
+            xfree(host);
+            return 0;
+        }
     }
     pazpar2_mutex_create(&host->mutex, "host");
 
@@ -92,22 +83,59 @@ static struct host *create_host(const char *url, const char *proxy,
 }
 
 struct host *find_host(database_hosts_t hosts, const char *url,
-                       const char *proxy, int port,
-                       iochan_man_t iochan_man)
+                       const char *proxy, iochan_man_t iochan_man)
 {
     struct host *p;
+    char *tproxy = 0;
+    const char *host = 0;
+    CS_TYPE t;
+    enum oid_proto proto;
+    char *connect_host = 0;
+    if (!cs_parse_host(url, &host, &t, &proto, &connect_host))
+        return 0;
+    else
+    {
+        if (t == unix_type)
+            tproxy = xstrdup(url);
+        else
+        {
+            if (proxy && *proxy)
+            {
+                /* plain proxy host already given, but we get CS_TYPE t  */
+                xfree(connect_host);
+            }
+            else
+            {
+                if (connect_host)
+                {
+                    tproxy = connect_host;
+                }
+                else
+                {
+                    char *cp;
+                    tproxy = xstrdup(host);
+                    for (cp = tproxy; *cp; cp++)
+                        if (strchr("/?#~", *cp))
+                        {
+                            *cp = '\0';
+                            break;
+                        }
+                }
+            }
+        }
+    }
     yaz_mutex_enter(hosts->mutex);
     for (p = hosts->hosts; p; p = p->next)
-        if (!strcmp(p->url, url))
+    {
+        if (!yaz_strcmp_null(p->tproxy, tproxy) &&
+            !yaz_strcmp_null(p->proxy, proxy))
         {
-            if (p->proxy && proxy && !strcmp(p->proxy, proxy))
-                break;
-            if (!p->proxy && !proxy)
-                break;
+            break;
         }
+    }
     if (!p)
     {
-        p = create_host(url, proxy, port, iochan_man);
+        p = create_host(proxy, tproxy, t, iochan_man);
         if (p)
         {
             p->next = hosts->hosts;
@@ -115,6 +143,7 @@ struct host *find_host(database_hosts_t hosts, const char *url,
         }
     }
     yaz_mutex_leave(hosts->mutex);
+    xfree(tproxy);
     return p;
 }
 
@@ -137,7 +166,6 @@ void database_hosts_destroy(database_hosts_t *pp)
             struct host *p_next = p->next;
             yaz_mutex_destroy(&p->mutex);
             yaz_cond_destroy(&p->cond_ready);
-            xfree(p->url);
             xfree(p->ipport);
             xfree(p);
             p = p_next;