X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=a8c9f207202080ce6362805f0768e50141144080;hb=d5ffc2f6e667c1d849bf7579add8435664e678c5;hp=d3180338c8907c40d1f1f62c21cc3992033e27c6;hpb=75027807cf88b7c47320c0ec051084c0a0188da6;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index d318033..a8c9f20 100644
--- 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.12 2007-09-20 08:13:27 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,8 @@ struct connection {
     struct client *client;
     char *ibuf;
     int ibufsize;
+    char *authentication; // Empty string or authentication string if set
+    char *zproxy;
     enum {
         Conn_Resolving,
         Conn_Connecting,
@@ -101,6 +104,8 @@ void connection_destroy(struct connection *co)
     {
         client_disconnect(co->client);
     }
+    xfree(co->zproxy);
+    co->zproxy = 0;
     co->next = connection_freelist;
     connection_freelist = co;
 }
@@ -124,6 +129,8 @@ struct connection *connection_create(struct client *cl)
     new->next = new->host->connections;
     new->host->connections = new;
     new->client = cl;
+    new->authentication = "";
+    new->zproxy = 0;
     client_set_connection(cl, new);
     new->link = 0;
     new->state = Conn_Resolving;
@@ -142,11 +149,24 @@ static void connection_handler(IOCHAN i, int event)
         se = client_get_session(cl);
     else
     {
-        yaz_log(YLOG_WARN, "Destroying orphan connection");
         connection_destroy(co);
         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 +184,7 @@ static void connection_handler(IOCHAN i, int event)
 	    co->state = Conn_Open;
             if (cl)
                 client_set_state(cl, Client_Connected);
+            iochan_settimeout(i, global_parameters.z3950_session_timeout);
 	}
     }
 
@@ -191,6 +212,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 +222,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:
@@ -227,7 +261,7 @@ static void connection_handler(IOCHAN i, int event)
             else  // we throw away response and go to idle mode
             {
                 yaz_log(YLOG_DEBUG, "Ignoring result of expired operation");
-                client_set_state(cl, Client_Idle);
+                client_set_state(cl, Client_Continue);
             }
 	}
 	/* if len==1 we do nothing but wait for more input */
@@ -259,20 +293,25 @@ void connect_resolver_host(struct host *host)
                 connection_destroy(con);
                 /* start all over .. at some point it will be NULL */
                 con = host->connections;
+                continue;
             }
             else if (!con->client)
             {
-                yaz_log(YLOG_WARN, "connect_unresolved_host : ophan client");
                 connection_destroy(con);
                 /* start all over .. at some point it will be NULL */
                 con = host->connections;
+                continue;
             }
             else
             {
                 connection_connect(con);
-                con = con->next;
             }
         }
+        else
+        {
+            yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
+        }
+        con = con->next;
     }
 }
 
@@ -296,7 +335,7 @@ int connection_send_apdu(struct connection *co, Z_APDU *a)
     else if (r == 1)
     {
         fprintf(stderr, "cs_put incomplete (ParaZ does not handle that)\n");
-        exit(1);
+        return -1;;
     }
     odr_reset(global_parameters.odr_out); /* release the APDU structure  */
     co->state = Conn_Waiting;
@@ -316,6 +355,9 @@ int connection_connect(struct connection *con)
     void *addr;
     int res;
 
+    struct session_database *sdb = client_get_database(con->client);
+    const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+
     assert(host->ipport);
     assert(con);
 
@@ -324,8 +366,12 @@ int connection_connect(struct connection *con)
         yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create comstack");
         return -1;
     }
-    
-    if (0 == strlen(global_parameters.zproxy_override)){
+
+    if (zproxy && *zproxy)
+        con->zproxy = xstrdup(zproxy);
+
+    if (!con->zproxy)
+    {
         /* no Z39.50 proxy needed - direct connect */
         yaz_log(YLOG_DEBUG, "Connection create %s", connection_get_url(con));
         
@@ -339,13 +385,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), con->zproxy);
         
-        if (!(addr = cs_straddr(link, global_parameters.zproxy_override)))
+        if (!(addr = cs_straddr(link, con->zproxy)))
         {
             yaz_log(YLOG_WARN|YLOG_ERRNO, 
-                    "Lookup of IP address %s failed", 
-                    global_parameters.zproxy_override);
+                    "Lookup of ZProxy IP address %s failed", 
+                    con->zproxy);
             return -1;
         }
     }
@@ -360,6 +406,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, global_parameters.z3950_connect_timeout);
     iochan_setdata(con->iochan, con);
     pazpar2_add_channel(con->iochan);
 
@@ -374,12 +421,22 @@ 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)
 {
     struct connection *co;
     struct session *se = client_get_session(cl);
     struct host *host = client_get_host(cl);
+    struct session_database *sdb = client_get_database(cl);
+    const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+
+    if (zproxy && zproxy[0] == '\0')
+        zproxy = 0;
 
     co = client_get_connection(cl);
 
@@ -390,8 +447,17 @@ 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))
-                break;
+            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)))
+            {
+                if (zproxy == 0 && co->zproxy == 0)
+                    break;
+                if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy))
+                    break;
+            }
         if (co)
         {
             connection_release(co);
@@ -411,8 +477,9 @@ int client_prep_connection(struct client *cl)
         else if (co->state == Conn_Open)
         {
             if (client_get_state(cl) == Client_Error 
-                || client_get_state(cl) == Client_Disconnected)
-                client_set_state(cl, Client_Idle);
+                || client_get_state(cl) == Client_Disconnected
+                || client_get_state(cl) == Client_Idle)
+                client_set_state(cl, Client_Continue);
             iochan_setflag(co->iochan, EVENT_OUTPUT);
         }
         return 1;