X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=8df4ac743569c366196dabafafbcaea483901f7c;hb=c3834c9541d7896e59ef79222e499b1ba628ba2c;hp=8d8d48fd44f90f01a33af30aa31394444ed8580e;hpb=6755b9a05f1a95ce8fa468bcfb9458e158e9f5a8;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index 8d8d48f..8df4ac7 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -42,12 +42,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #include <yaz/comstack.h>
 #include <yaz/tcpip.h>
 #include "connection.h"
-#include "eventl.h"
 #include "pazpar2.h"
 #include "host.h"
 #include "client.h"
 #include "settings.h"
-#include "parameters.h"
 
 
 /** \brief Represents a physical, reusable  connection to a remote Z39.50 host
@@ -65,6 +63,8 @@ struct connection {
         Conn_Connecting,
         Conn_Open
     } state;
+    int operation_timeout;
+    int session_timeout;
     struct connection *next; // next for same host or next in free list
 };
 
@@ -133,7 +133,9 @@ void connection_destroy(struct connection *co)
 
 // Creates a new connection for client, associated with the host of 
 // client's database
-static struct connection *connection_create(struct client *cl)
+static struct connection *connection_create(struct client *cl,
+                                            int operation_timeout,
+                                            int session_timeout)
 {
     struct connection *new;
     struct host *host = client_get_host(cl);
@@ -154,6 +156,8 @@ static struct connection *connection_create(struct client *cl)
     client_set_connection(cl, new);
     new->link = 0;
     new->state = Conn_Resolving;
+    new->operation_timeout = operation_timeout;
+    new->session_timeout = session_timeout;
     if (host->ipport)
         connection_connect(new);
     return new;
@@ -179,11 +183,14 @@ static void non_block_events(struct connection *co)
         case ZOOM_EVENT_END:
             {
                 const char *error, *addinfo;
-                if (ZOOM_connection_error(link, &error, &addinfo))
+		int err;
+                if ((err = ZOOM_connection_error(link, &error, &addinfo)))
                 {
                     yaz_log(YLOG_LOG, "Error %s from %s",
                             error, client_get_url(cl));
                 }
+                iochan_settimeout(iochan, co->session_timeout);
+		client_set_diagnostic(cl, err);
                 client_set_state(cl, Client_Idle);
             }
             break;
@@ -195,13 +202,13 @@ static void non_block_events(struct connection *co)
             break;
         case ZOOM_EVENT_SEND_APDU:
             client_set_state(co->client, Client_Working);
+            iochan_settimeout(iochan, co->operation_timeout);
             break;
         case ZOOM_EVENT_RECV_APDU:
             break;
         case ZOOM_EVENT_CONNECT:
             yaz_log(YLOG_LOG, "Connected to %s", client_get_url(cl));
             co->state = Conn_Open;
-            iochan_settimeout(iochan, global_parameters.z3950_session_timeout);
             break;
         case ZOOM_EVENT_RECV_SEARCH:
             client_search_response(cl);
@@ -341,7 +348,6 @@ static int connection_connect(struct connection *con)
     const char *auth;
     const char *sru;
     const char *sru_version = 0;
-    char ipport[512] = "";
 
     struct session_database *sdb = client_get_database(con->client);
     const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
@@ -377,15 +383,19 @@ static int connection_connect(struct connection *con)
     }
 
     if (sru && *sru)
-        strcpy(ipport, "http://");
-    strcat(ipport, host->ipport);
-
-    ZOOM_connection_connect(link, ipport, 0);
+    {
+        char http_hostport[512];
+        strcpy(http_hostport, "http://");
+        strcat(http_hostport, host->hostport);
+        ZOOM_connection_connect(link, http_hostport, 0);
+    }
+    else
+        ZOOM_connection_connect(link, host->ipport, 0);
     
     con->link = link;
     con->iochan = iochan_create(0, connection_handler, 0);
     con->state = Conn_Connecting;
-    iochan_settimeout(con->iochan, global_parameters.z3950_connect_timeout);
+    iochan_settimeout(con->iochan, con->operation_timeout);
     iochan_setdata(con->iochan, con);
     iochan_setsocketfun(con->iochan, socketfun);
     iochan_setmaskfun(con->iochan, maskfun);
@@ -394,8 +404,6 @@ static int connection_connect(struct connection *con)
     /* this fragment is bad DRY: from client_prep_connection */
     client_set_state(con->client, Client_Connecting);
     ZOOM_options_destroy(zoptions);
-    // This creates the connection
-    ZOOM_connection_process(link);
     return 0;
 }
 
@@ -405,7 +413,8 @@ const char *connection_get_url(struct connection *co)
 }
 
 // Ensure that client has a connection associated
-int client_prep_connection(struct client *cl)
+int client_prep_connection(struct client *cl,
+                           int operation_timeout, int session_timeout)
 {
     struct connection *co;
     struct session *se = client_get_session(cl);
@@ -416,6 +425,9 @@ int client_prep_connection(struct client *cl)
     if (zproxy && zproxy[0] == '\0')
         zproxy = 0;
 
+    if (!host)
+        return 0;
+
     co = client_get_connection(cl);
 
     yaz_log(YLOG_DEBUG, "Client prep %s", client_get_url(cl));
@@ -441,13 +453,15 @@ int client_prep_connection(struct client *cl)
             connection_release(co);
             client_set_connection(cl, co);
             co->client = cl;
+            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
         {
-            co = connection_create(cl);
+            co = connection_create(cl, operation_timeout, session_timeout);
         }
     }