X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=e4f3d8e6db29072d800944c1fae9a2c35c87ec56;hb=b33db4435e63a69fc8aafa1e3a163743b79b6990;hp=892f867de8293742e1f2447c8d6085f67513575b;hpb=36c93223e190a516fc624082e1c41b3d9b3b6396;p=yazproxy-moved-to-github.git

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 892f867..e4f3d8e 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,4 +1,4 @@
-/* $Id: yaz-proxy.cpp,v 1.8 2004-10-19 18:34:15 adam Exp $
+/* $Id: yaz-proxy.cpp,v 1.11 2004-10-28 22:29:43 adam Exp $
    Copyright (c) 1998-2004, Index Data.
 
 This file is part of the yaz-proxy.
@@ -395,6 +395,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
 	proxy_host = m_default_target;
 	int client_idletime = -1;
 	const char *cql2rpn_fname = 0;
+	const char *authentication = 0;
 	url[0] = m_default_target;
 	url[1] = 0;
 	if (cfg)
@@ -407,7 +408,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
 				 &m_keepalive_limit_bw,
 				 &m_keepalive_limit_pdu,
 				 &pre_init,
-				 &cql2rpn_fname);
+				 &cql2rpn_fname,
+				 &authentication);
 	}
 	if (client_idletime != -1)
 	{
@@ -416,6 +418,8 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
 	}
 	if (cql2rpn_fname)
 	    m_cql2rpn.set_pqf_file(cql2rpn_fname);
+	if (authentication)
+	    set_proxy_authentication(authentication);
 	if (!url[0])
 	{
 	    yaz_log(LOG_LOG, "%sNo default target", m_session_str);
@@ -473,15 +477,17 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
 	    }
 	}
     }
-    else if (!c)
+    else if (!c && apdu->which == Z_APDU_initRequest
+	     && apdu->u.initRequest->idAuthentication == 0)
     {
-	// don't have a client session yet. Search in session w/o cookie
+	// anonymous sessions without cookie.
+	// if authentication is set it is NOT anonymous se we can't share them.
 	for (c = parent->m_clientPool; c; c = c->m_next)
 	{
-	    assert (c->m_prev);
-	    assert (*c->m_prev == c);
+	    assert(c->m_prev);
+	    assert(*c->m_prev == c);
 	    if (c->m_server == 0 && c->m_cookie == 0 && 
-		c->m_waiting == 0 &&
+		c->m_waiting == 0 && 
 		!strcmp(m_proxyTarget, c->get_hostname()))
 	    {
 		// found it in cache
@@ -528,6 +534,12 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu, const char *cookie,
                     odr_strdup (odr_encode(), m_proxy_authentication);
             }
         }
+	else
+	{
+	    // the client use authentication. We set the keepalive PDU
+	    // to 0 so we don't cache it in releaseClient
+	    m_keepalive_limit_pdu = 0;
+	}
 	// go through list of clients - and find the lowest/oldest one.
 	Yaz_ProxyClient *c_min = 0;
 	int min_seq = -1;
@@ -762,7 +774,7 @@ void Yaz_Proxy::convert_to_marcxml(Z_NamePlusRecordList *p,
 
     if (!backend_charset)
 	backend_charset = "MARC-8";
-    yaz_iconv_t cd = yaz_iconv_open("UTF-8", "MARC-8");
+    yaz_iconv_t cd = yaz_iconv_open("UTF-8", backend_charset);
     yaz_marc_t mt = yaz_marc_create();
     yaz_marc_xml(mt, YAZ_MARC_MARCXML);
     yaz_marc_iconv(mt, cd);
@@ -2242,9 +2254,9 @@ void Yaz_Proxy::handle_incoming_Z_PDU(Z_APDU *apdu)
 	return;
     }
 
-    // delete other info part from PDU before sending to target
+    // delete other info construct completely if 0 elements
     get_otherInfoAPDU(apdu, &oi);
-    if (oi)
+    if (*oi && (*oi)->num_elements == 0)
         *oi = 0;
 
     if (apdu->which == Z_APDU_presentRequest &&
@@ -2291,7 +2303,6 @@ void Yaz_Proxy::releaseClient()
         assert (m_client->m_waiting != 2);
 	// Tell client (if any) that no server connection is there..
 	m_client->m_server = 0;
-	m_invalid_session = 0;
 	m_client = 0;
     }
     else if (m_client)
@@ -2423,6 +2434,7 @@ void Yaz_Proxy::pre_init()
     int keepalive_limit_bw, keepalive_limit_pdu;
     int pre_init;
     const char *cql2rpn = 0;
+    const char *authentication = 0;
 
     Yaz_ProxyConfig *cfg = check_reconfigure();
 
@@ -2440,7 +2452,8 @@ void Yaz_Proxy::pre_init()
 					  &keepalive_limit_bw,
 					  &keepalive_limit_pdu,
 					  &pre_init,
-					  &cql2rpn) ; i++)
+					  &cql2rpn,
+					  &authentication) ; i++)
     {
 	if (pre_init)
 	{