Upstream

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

diff --git a/src/connection.c b/src/connection.c
index d318033..a75066e 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,4 +1,4 @@
-/* $Id: connection.c,v 1.2 2007-04-24 08:03:03 adam Exp $
+/* $Id: connection.c,v 1.6 2007-07-03 11:21:48 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -46,6 +46,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "pazpar2.h"
 #include "host.h"
 #include "client.h"
+#include "settings.h"
 #include "parameters.h"
 
 
@@ -58,6 +59,7 @@ struct connection {
     struct client *client;
     char *ibuf;
     int ibufsize;
+    char *authentication; // Empty string or authentication string if set
     enum {
         Conn_Resolving,
         Conn_Connecting,
@@ -124,6 +126,7 @@ struct connection *connection_create(struct client *cl)
     new->next = new->host->connections;
     new->host->connections = new;
     new->client = cl;
+    new->authentication = "";
     client_set_connection(cl, new);
     new->link = 0;
     new->state = Conn_Resolving;
@@ -147,6 +150,20 @@ static void connection_handler(IOCHAN i, int event)
         return;
     }
 
+    if (event & EVENT_TIMEOUT)
+    {
+        if (co->state == Conn_Connecting)
+        {
+            yaz_log(YLOG_WARN,  "connect timeout %s", client_get_url(cl));
+            client_fatal(cl);
+        }
+        else
+        {
+            yaz_log(YLOG_LOG,  "idle timeout %s", client_get_url(cl));
+            connection_destroy(co);
+        }
+        return;
+    }
     if (co->state == Conn_Connecting && event & EVENT_OUTPUT)
     {
        int errcode;
@@ -164,6 +181,7 @@ static void connection_handler(IOCHAN i, int event)
            co->state = Conn_Open;
             if (cl)
                 client_set_state(cl, Client_Connected);
+            iochan_settimeout(i, 180);
        }
     }
 
@@ -191,6 +209,8 @@ static void connection_handler(IOCHAN i, int event)
             if (client_is_our_response(cl))
             {
                 Z_APDU *a;
+                struct session_database *sdb = client_get_database(cl);
+                const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
 
                 odr_reset(global_parameters.odr_in);
                 odr_setbuf(global_parameters.odr_in, co->ibuf, len, 0);
@@ -199,6 +219,17 @@ static void connection_handler(IOCHAN i, int event)
                     client_fatal(cl);
                     return;
                 }
+
+                if (apdulog && *apdulog && *apdulog != '0')
+                {
+                    ODR p = odr_createmem(ODR_PRINT);
+                    yaz_log(YLOG_LOG, "recv APDU %s", client_get_url(cl));
+                    
+                    odr_setprint(p, yaz_log_file());
+                    z_APDU(p, &a, 0, 0);
+                    odr_setprint(p, stderr);
+                    odr_destroy(p);
+                }
                 switch (a->which)
                 {
                     case Z_APDU_initResponse:
@@ -316,6 +347,9 @@ int connection_connect(struct connection *con)
     void *addr;
     int res;
 
+    struct session_database *sdb = client_get_database(con->client);
+    char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+
     assert(host->ipport);
     assert(con);
 
@@ -325,7 +359,7 @@ int connection_connect(struct connection *con)
         return -1;
     }
     
-    if (0 == strlen(global_parameters.zproxy_override)){
+    if (!zproxy || 0 == strlen(zproxy)){
         /* no Z39.50 proxy needed - direct connect */
         yaz_log(YLOG_DEBUG, "Connection create %s", connection_get_url(con));
         
@@ -339,13 +373,13 @@ int connection_connect(struct connection *con)
     } else {
         /* Z39.50 proxy connect */
         yaz_log(YLOG_DEBUG, "Connection create %s proxy %s", 
-                connection_get_url(con), global_parameters.zproxy_override);
+                connection_get_url(con), zproxy);
         
-        if (!(addr = cs_straddr(link, global_parameters.zproxy_override)))
+        if (!(addr = cs_straddr(link, zproxy)))
         {
             yaz_log(YLOG_WARN|YLOG_ERRNO, 
-                    "Lookup of IP address %s failed", 
-                    global_parameters.zproxy_override);
+                    "Lookup of ZProxy IP address %s failed", 
+                    zproxy);
             return -1;
         }
     }
@@ -360,6 +394,7 @@ int connection_connect(struct connection *con)
     con->link = link;
     con->state = Conn_Connecting;
     con->iochan = iochan_create(cs_fileno(link), connection_handler, 0);
+    iochan_settimeout(con->iochan, 30);
     iochan_setdata(con->iochan, con);
     pazpar2_add_channel(con->iochan);
 
@@ -374,6 +409,11 @@ const char *connection_get_url(struct connection *co)
     return client_get_url(co->client);
 }
 
+void connection_set_authentication(struct connection *co, char *auth)
+{
+    co->authentication = auth;
+}
+
 // Ensure that client has a connection associated
 int client_prep_connection(struct client *cl)
 {
@@ -390,7 +430,11 @@ int client_prep_connection(struct client *cl)
         // See if someone else has an idle connection
         // We should look at timestamps here to select the longest-idle connection
         for (co = host->connections; co; co = co->next)
-            if (co->state == Conn_Open && (!co->client || client_get_session(co->client) != se))
+            if (co->state == Conn_Open &&
+                (!co->client || client_get_session(co->client) != se) &&
+                !strcmp(co->authentication,
+                    session_setting_oneval(client_get_database(cl),
+                    PZ_AUTHENTICATION)))
                 break;
         if (co)
         {