X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=109aa5819d6840d069f890ba6482b41637ec7e0d;hb=247113bc4211efc45bdff87daefa8796561c89b5;hp=2a12785ec11dac99c10d2b113e0f812454d72b94;hpb=e8df9cb14a5e59e8e5e94b944ef39a97ded152cf;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 2a12785..109aa58 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,4 +1,4 @@
-/* $Id: connection.c,v 1.3 2007-06-02 04:32:28 quinn Exp $
+/* $Id: connection.c,v 1.7 2007-07-12 08:01:06 adam Exp $
    Copyright (c) 2006-2007, Index Data.
 
 This file is part of Pazpar2.
@@ -145,11 +145,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;
@@ -167,6 +180,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);
 	}
     }
 
@@ -194,6 +208,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);
@@ -202,6 +218,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:
@@ -319,6 +346,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);
 
@@ -328,7 +358,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));
         
@@ -342,13 +372,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;
         }
     }
@@ -363,6 +393,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);