X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=fbdaf797b19a0795677b5bb7b0acc485bea80f5f;hb=24ad8ea356d71c764af19897e2719670a94a3a05;hp=710d436e0a84a3eadd48c23f8539831956a4000b;hpb=1034064601914be4fd6de1b8fdad1ce13eab1c1d;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 710d436..fbdaf79 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,5 +1,5 @@
 /* This file is part of Pazpar2.
-   Copyright (C) 2006-2013 Index Data
+   Copyright (C) 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
@@ -43,7 +43,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/tcpip.h>
 #include "connection.h"
 #include "session.h"
-#include "host.h"
 #include "client.h"
 #include "settings.h"
 
@@ -89,7 +88,6 @@ int connections_count(void)
 struct connection {
     IOCHAN iochan;
     ZOOM_connection link;
-    struct host *host;
     struct client *client;
     char *zproxy;
     char *url;
@@ -105,42 +103,14 @@ struct connection {
 
 static int connection_connect(struct connection *con, iochan_man_t iochan_man);
 
-static int connection_is_idle(struct connection *co)
-{
-    ZOOM_connection link = co->link;
-    int event;
-
-    if (co->state != Conn_Open || !link)
-        return 0;
-
-    if (!ZOOM_connection_is_idle(link))
-        return 0;
-    event = ZOOM_connection_peek_event(link);
-    if (event == ZOOM_EVENT_NONE)
-        return 1;
-    else
-        return 0;
-}
-
 ZOOM_connection connection_get_link(struct connection *co)
 {
     return co->link;
 }
 
-static void remove_connection_from_host(struct connection *con)
-{
-    struct connection **conp = &con->host->connections;
-    assert(con);
-    while (*conp)
-    {
-        if (*conp == con)
-        {
-            *conp = (*conp)->next;
-            break;
-        }
-        conp = &(*conp)->next;
-    }
-    yaz_cond_broadcast(con->host->cond_ready);
+void connection_mark_dead(struct connection *co)
+{ 
+    iochan_settimeout(co->iochan, 1);
 }
 
 // Close connection and recycle structure
@@ -168,34 +138,35 @@ static void connection_destroy(struct connection *co)
 // client's database
 static struct connection *connection_create(struct client *cl,
                                             const char *url,
-                                            struct host *host,
+                                            const char *zproxy,
                                             int operation_timeout,
                                             int session_timeout,
                                             iochan_man_t iochan_man)
 {
     struct connection *co;
+    int ret;
 
     co = xmalloc(sizeof(*co));
-    co->host = host;
 
     co->client = cl;
     co->url = xstrdup(url);
     co->zproxy = 0;
+    if (zproxy)
+        co->zproxy = xstrdup(zproxy);
+
     client_set_connection(cl, co);
     co->link = 0;
     co->state = Conn_Closed;
     co->operation_timeout = operation_timeout;
     co->session_timeout = session_timeout;
 
-    if (host->ipport)
-        connection_connect(co, iochan_man);
-
-    yaz_mutex_enter(host->mutex);
-    co->next = co->host->connections;
-    co->host->connections = co;
-    yaz_mutex_leave(host->mutex);
-
+    ret = connection_connect(co, iochan_man);
     connection_use(1);
+    if (ret)
+    {   /* error */
+        connection_destroy(co);
+        co = 0;
+    }
     return co;
 }
 
@@ -228,8 +199,10 @@ static void non_block_events(struct connection *co)
                 int err;
                 if ((err = ZOOM_connection_error(link, &error, &addinfo)))
                 {
-                    yaz_log(YLOG_LOG, "Error %s from %s",
-                            error, client_get_id(cl));
+                    struct session *se = client_get_session(cl);
+
+                    session_log(se, YLOG_WARN, "%s: Error %s (%s)",
+                                client_get_id(cl), error, addinfo);
                     client_set_diagnostic(cl, err, error, addinfo);
                     client_set_state(cl, Client_Error);
                 }
@@ -238,7 +211,6 @@ static void non_block_events(struct connection *co)
                     iochan_settimeout(iochan, co->session_timeout);
                     client_set_state(cl, Client_Idle);
                 }
-                yaz_cond_broadcast(co->host->cond_ready);
             }
             break;
         case ZOOM_EVENT_SEND_DATA:
@@ -254,7 +226,6 @@ static void non_block_events(struct connection *co)
         case ZOOM_EVENT_RECV_APDU:
             break;
         case ZOOM_EVENT_CONNECT:
-            yaz_log(YLOG_LOG, "Connected to %s", client_get_id(cl));
             co->state = Conn_Open;
             break;
         case ZOOM_EVENT_RECV_SEARCH:
@@ -263,6 +234,8 @@ static void non_block_events(struct connection *co)
         case ZOOM_EVENT_RECV_RECORD:
             client_record_response(cl, &got_records);
             break;
+        case ZOOM_EVENT_NONE:
+            break;
         default:
             yaz_log(YLOG_LOG, "Unhandled event (%d) from %s",
                     ev, client_get_id(cl));
@@ -273,10 +246,20 @@ static void non_block_events(struct connection *co)
     {
         struct client *cl = co->client;
         if (cl)
-        {
-            client_check_preferred_watch(cl);
             client_got_records(cl);
-        }
+    }
+}
+
+static void iochan_update(struct connection *co)
+{
+    if (co->link)
+    {
+        int m = ZOOM_connection_get_mask(co->link);
+
+        if (m == 0)
+            m = ZOOM_SELECT_READ;
+        iochan_setflags(co->iochan, m);
+        iochan_setfd(co->iochan, ZOOM_connection_get_socket(co->link));
     }
 }
 
@@ -284,21 +267,22 @@ void connection_continue(struct connection *co)
 {
     int r = ZOOM_connection_exec_task(co->link);
     if (!r)
-        non_block_events(co);
-    else
     {
-        iochan_setflags(co->iochan, ZOOM_connection_get_mask(co->link));
-        iochan_setfd(co->iochan, ZOOM_connection_get_socket(co->link));
+        struct client *cl = co->client;
+
+        client_lock(cl);
+        non_block_events(co);
+        client_unlock(cl);
     }
+    else
+        iochan_update(co);
 }
 
 static void connection_handler(IOCHAN iochan, int event)
 {
     struct connection *co = iochan_getdata(iochan);
     struct client *cl;
-    struct host *host = co->host;
 
-    yaz_mutex_enter(host->mutex);
     cl = co->client;
     if (!cl)
     {
@@ -306,8 +290,6 @@ static void connection_handler(IOCHAN iochan, int event)
            a closed connection from the target.. Or, perhaps, an unexpected
            package.. We will just close the connection */
         yaz_log(YLOG_LOG, "timeout connection %p event=%d", co, event);
-        remove_connection_from_host(co);
-        yaz_mutex_leave(host->mutex);
         connection_destroy(co);
     }
     else if (event & EVENT_TIMEOUT)
@@ -317,14 +299,15 @@ static void connection_handler(IOCHAN iochan, int event)
         non_block_events(co);
         client_unlock(cl);
 
-        remove_connection_from_host(co);
-        yaz_mutex_leave(host->mutex);
         connection_destroy(co);
     }
     else
     {
-        yaz_mutex_leave(host->mutex);
-
+        if (ZOOM_connection_is_idle(co->link))
+        {
+            connection_destroy(co);
+            return;
+        }
         client_lock(cl);
         non_block_events(co);
 
@@ -333,88 +316,30 @@ static void connection_handler(IOCHAN iochan, int event)
         non_block_events(co);
         client_unlock(cl);
 
-        if (co->link)
-        {
-            iochan_setflags(iochan, ZOOM_connection_get_mask(co->link));
-            iochan_setfd(iochan, ZOOM_connection_get_socket(co->link));
-        }
+        iochan_update(co);
     }
 }
 
-
-// Disassociate connection from client
-static void connection_release(struct connection *co)
+void connection_release2(struct connection *co)
 {
-    struct client *cl = co->client;
-
-    if (!cl)
-        return;
-    client_set_connection(cl, 0);
     co->client = 0;
 }
 
-void connect_resolver_host(struct host *host, iochan_man_t iochan_man)
-{
-    struct connection *con;
-
-    yaz_mutex_enter(host->mutex);
-    con = host->connections;
-    while (con)
-    {
-        if (con->state == Conn_Closed)
-        {
-            if (!host->ipport || !con->client) /* unresolved or no client */
-            {
-                remove_connection_from_host(con);
-                yaz_mutex_leave(host->mutex);
-                connection_destroy(con);
-            }
-            else
-            {
-                struct session_database *sdb = client_get_database(con->client);
-                if (sdb)
-                {
-                    yaz_mutex_leave(host->mutex);
-                    connection_connect(con, iochan_man);
-                    client_start_search(con->client);
-                }
-                else
-                {
-                    remove_connection_from_host(con);
-                    yaz_mutex_leave(host->mutex);
-                    connection_destroy(con);
-                }
-            }
-            /* start all over .. at some point it will be NULL */
-            yaz_mutex_enter(host->mutex);
-            con = host->connections;
-        }
-        else
-        {
-            yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
-            con = con->next;
-        }
-    }
-    yaz_mutex_leave(host->mutex);
-}
-
-static struct host *connection_get_host(struct connection *con)
-{
-    return con->host;
-}
-
 static int connection_connect(struct connection *con, iochan_man_t iochan_man)
 {
-    struct host *host = connection_get_host(con);
     ZOOM_options zoptions = ZOOM_options_create();
     const char *auth;
     const char *charset;
     const char *sru;
     const char *sru_version = 0;
+    const char *value;
+    int r = 0;
     WRBUF w;
 
     struct session_database *sdb = client_get_database(con->client);
     const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
+    const char *memcached = session_setting_oneval(sdb, PZ_MEMCACHED);
+    const char *redis = session_setting_oneval(sdb, PZ_REDIS);
 
     assert(con);
 
@@ -424,30 +349,40 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
 
     if ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET)))
         ZOOM_options_set(zoptions, "charset", charset);
+    if (memcached && *memcached)
+        ZOOM_options_set(zoptions, "memcached", memcached);
+    if (redis && *redis)
+        ZOOM_options_set(zoptions, "redis", redis);
 
-    assert(host->ipport);
-    if (host->proxy)
-    {
-        yaz_log(YLOG_LOG, "proxy=%s", host->ipport);
-        ZOOM_options_set(zoptions, "proxy", host->ipport);
-    }
-    else
+    if (con->zproxy)
     {
-        assert(host->tproxy);
-        yaz_log(YLOG_LOG, "tproxy=%s", host->ipport);
-        ZOOM_options_set(zoptions, "tproxy", host->ipport);
+        yaz_log(YLOG_LOG, "proxy=%s", con->zproxy);
+        ZOOM_options_set(zoptions, "proxy", con->zproxy);
     }
-
     if (apdulog && *apdulog)
         ZOOM_options_set(zoptions, "apdulog", apdulog);
 
+
+    if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
+        ZOOM_options_set(zoptions, "sru", sru);
+    if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
+        && *sru_version)
+        ZOOM_options_set(zoptions, "sru_version", sru_version);
+
     if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION)))
     {
+        /* allow splitting user and reset with a blank always */
         const char *cp1 = strchr(auth, ' ');
+        if (!cp1 && sru && *sru)
+            cp1 =  strchr(auth, '/');
         if (!cp1)
+        {
+            /* Z39.50 user/password style, or no password for SRU */
             ZOOM_options_set(zoptions, "user", auth);
+        }
         else
         {
+            /* now consider group as well */
             const char *cp2 = strchr(cp1 + 1, ' ');
 
             ZOOM_options_setl(zoptions, "user", auth, cp1 - auth);
@@ -460,11 +395,11 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
             }
         }
     }
-    if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
-        ZOOM_options_set(zoptions, "sru", sru);
-    if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
-        && *sru_version)
-        ZOOM_options_set(zoptions, "sru_version", sru_version);
+
+    value = session_setting_oneval(sdb, PZ_AUTHENTICATION_MODE);
+    if (value && *value)
+        ZOOM_options_set(zoptions, "authenticationMode", value);
+
     if (!(con->link = ZOOM_connection_create(zoptions)))
     {
         yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection");
@@ -489,12 +424,22 @@ static int connection_connect(struct connection *con, iochan_man_t iochan_man)
     con->state = Conn_Connecting;
     iochan_settimeout(con->iochan, con->operation_timeout);
     iochan_setdata(con->iochan, con);
-    iochan_add(iochan_man, con->iochan);
-
-    client_set_state(con->client, Client_Connecting);
+    if (iochan_add(iochan_man, con->iochan))
+    {
+        yaz_log(YLOG_FATAL, "Out of connections");
+        iochan_destroy(con->iochan);
+        con->iochan = 0;
+        ZOOM_connection_destroy(con->link);
+        con->link = 0;
+        r = -1;
+    }
+    else
+    {
+        client_set_state(con->client, Client_Connecting);
+    }
     ZOOM_options_destroy(zoptions);
     wrbuf_destroy(w);
-    return 0;
+    return r;
 }
 
 // Ensure that client has a connection associated
@@ -507,9 +452,6 @@ int client_prep_connection(struct client *cl,
     struct session_database *sdb = client_get_database(cl);
     const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
     const char *url = session_setting_oneval(sdb, PZ_URL);
-    const char *sru = session_setting_oneval(sdb, PZ_SRU);
-    struct host *host = 0;
-    int default_port = *sru ? 80 : 210;
 
     if (zproxy && zproxy[0] == '\0')
         zproxy = 0;
@@ -517,110 +459,17 @@ int client_prep_connection(struct client *cl,
     if (!url || !*url)
         url = sdb->database->id;
 
-    host = find_host(client_get_session(cl)->service->server->database_hosts,
-                     url, zproxy, default_port, iochan_man);
-
     yaz_log(YLOG_DEBUG, "client_prep_connection: target=%s url=%s",
             client_get_id(cl), url);
-    if (!host)
-        return 0;
 
     co = client_get_connection(cl);
     if (co)
-    {
-        assert(co->host);
-        if (co->host == host && client_get_state(cl) == Client_Idle)
-        {
-            return 2;
-        }
-        connection_release(co);
-        co = 0;
-    }
+        return 2;
     if (!co)
     {
-        int max_connections = 0;
-        int reuse_connections = 1;
-        const char *v = session_setting_oneval(client_get_database(cl),
-                                               PZ_MAX_CONNECTIONS);
-        if (v && *v)
-            max_connections = atoi(v);
-
-        v = session_setting_oneval(client_get_database(cl),
-                PZ_REUSE_CONNECTIONS);
-        if (v && *v)
-            reuse_connections = atoi(v);
-
-        // See if someone else has an idle connection
-        // We should look at timestamps here to select the longest-idle connection
-        yaz_mutex_enter(host->mutex);
-        while (1)
-        {
-            int num_connections = 0;
-            for (co = host->connections; co; co = co->next)
-                num_connections++;
-            if (reuse_connections)
-            {
-                for (co = host->connections; co; co = co->next)
-                {
-                    if (connection_is_idle(co) &&
-                        !strcmp(url, co->url) &&
-                        (!co->client || client_get_state(co->client) == Client_Idle) &&
-                        !strcmp(ZOOM_connection_option_get(co->link, "user"),
-                                session_setting_oneval(client_get_database(cl),
-                                                       PZ_AUTHENTICATION)))
-                    {
-                        if (zproxy == 0 && co->zproxy == 0)
-                            break;
-                        if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy))
-                            break;
-                    }
-                }
-                if (co)
-                {
-                    yaz_log(YLOG_LOG, "num_connections = %d (reusing)", num_connections);
-                    break;
-                }
-            }
-            if (max_connections <= 0 || num_connections < max_connections)
-            {
-                yaz_log(YLOG_LOG, "num_connections = %d (new); max = %d",
-                        num_connections, max_connections);
-                break;
-            }
-            yaz_log(YLOG_LOG, "num_connections = %d (waiting) max = %d",
-                    num_connections, max_connections);
-            if (yaz_cond_wait(host->cond_ready, host->mutex, abstime))
-            {
-                yaz_log(YLOG_LOG, "out of connections %s", client_get_id(cl));
-                client_set_state(cl, Client_Error);
-                yaz_mutex_leave(host->mutex);
-                return 0;
-            }
-        }
-        if (co)
-        {
-            yaz_log(YLOG_LOG,  "%p Connection reuse. state: %d", co, co->state);
-            connection_release(co);
-            client_set_connection(cl, co);
-            co->client = cl;
-            /* ensure that connection is only assigned to this client
-               by marking the client non Idle */
-            client_set_state(cl, Client_Working);
-            yaz_mutex_leave(host->mutex);
-            co->operation_timeout = operation_timeout;
-            co->session_timeout = session_timeout;
-            /* tells ZOOM to reconnect if necessary. Disabled becuase
-               the ZOOM_connection_connect flushes the task queue */
-            ZOOM_connection_connect(co->link, 0, 0);
-        }
-        else
-        {
-            yaz_mutex_leave(host->mutex);
-            co = connection_create(cl, url, host,
-                                   operation_timeout, session_timeout,
-                                   iochan_man);
-        }
-        assert(co->host);
+        co = connection_create(cl, url, zproxy,
+                               operation_timeout, session_timeout,
+                               iochan_man);
     }
 
     if (co && co->link)