X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=blobdiff_plain;f=src%2Fconnection.c;h=c53b64f950e8c31aab4f4e6d8956d76cb583643c;hb=dc9f59ce5f4bedc6cd1cc68e0309b74d241f434d;hp=d3180338c8907c40d1f1f62c21cc3992033e27c6;hpb=75027807cf88b7c47320c0ec051084c0a0188da6;p=pazpar2-moved-to-github.git

diff --git a/src/connection.c b/src/connection.c
index d318033..c53b64f 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.4 2007-06-06 11:49:48 marc 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;
@@ -316,6 +319,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 +331,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 +345,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;
         }
     }
@@ -374,6 +380,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 +401,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)
         {