X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=7a49511b24def09712dac58647f88014bab62896;hb=71b6a2c41c24d62fb4b195893b63fc7e1e158adb;hp=df3615d1ad7e1c9b3f8e529bc756bb879a9114ed;hpb=6104ba97908b1292806a1242b65beb0edbf2314f;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index df3615d..7a49511 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,10 +1,23 @@
 /*
  * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy.cpp,v $
- * Revision 1.14  2000-08-10 08:42:42  adam
+ * Revision 1.18  2000-09-08 10:23:42  adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.17  2000/09/05 13:57:28  adam
+ * Fixed get_otherInfoAPDU to return otherInfo for extended services.
+ *
+ * Revision 1.16  2000/09/04 08:29:22  adam
+ * Fixed memory leak(s). Added re-use of associations, rather than
+ * re-init, when maximum number of targets are in use.
+ *
+ * Revision 1.15  2000/08/31 14:41:55  adam
+ * Proxy no longer generates cookies (it's up to the client). Proxy
+ * re-opens if target new op is started before previous operation finishes.
+ *
+ * Revision 1.14  2000/08/10 08:42:42  adam
  * Fixes for {set,get}_APDU_log.
  *
  * Revision 1.13  2000/08/07 14:19:59  adam
@@ -140,49 +153,77 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
     char *cookie = get_cookie(oi);
     logf (LOG_LOG, "Yaz_Proxy::get_client cookie=%s", cookie ? cookie :
 	  "null");
+
+    const char *proxy_host = get_proxy(oi);
+    if (proxy_host)
+	set_proxyTarget(proxy_host);
+    logf (LOG_LOG, "proxy_host = %s", m_proxyTarget ? m_proxyTarget:"none");
+    
+    // no target specified at all?
+    if (!m_proxyTarget)
+	return 0;
+
     if (cookie)
     {
+	logf (LOG_LOG, "lookup of clients cookie=%s target=%s",
+	      cookie, m_proxyTarget);
+	Yaz_ProxyClient *cc = 0;
+	
 	for (c = parent->m_clientPool; c; c = c->m_next)
 	{
+	    logf (LOG_LOG, " found client cookie = %s target=%s seqno=%d",
+		  c->m_cookie, c->get_hostname(), c->m_seqno);
 	    assert (c->m_prev);
 	    assert (*c->m_prev == c);
-	    if (!strcmp(cookie,c->m_cookie))
+	    if (!strcmp(cookie,c->m_cookie) &&
+		!strcmp(m_proxyTarget, c->get_hostname()))
 	    {
-		logf (LOG_LOG, "Yaz_Proxy::get_client cached %s",
-		      c->get_hostname());
-		c->m_seqno = parent->m_seqno;
-		return c;
+		logf (LOG_LOG, "found!");
+		cc = c;
 	    }
-	}	
+	}
+	if (cc)
+	{
+	    // found it in cache
+	    c = cc;
+	    // The following handles "cancel"
+	    // If connection is busy (waiting for PDU) and
+	    // we have an initRequest we can safely do re-open
+	    if (c->m_waiting && apdu->which == Z_APDU_initRequest)
+	    {
+		logf (LOG_LOG, "reopen target=%s", c->get_hostname());
+		c->close();
+		c->client(m_proxyTarget);
+		c->m_init_flag = 0;
+		
+		delete c->m_last_query;
+		c->m_last_query = 0;
+		c->m_last_resultCount = 0;
+		c->m_sr_transform = 0;
+		c->m_waiting = 0;
+		c->timeout(600);
+	    }
+	    c->m_seqno = parent->m_seqno;
+	    (parent->m_seqno)++;
+	    return c;
+	}
     }
     if (!m_client)
     {
-	if (apdu->which == Z_APDU_initRequest)
-	{
-	    logf (LOG_LOG, "got InitRequest");
-	    
-	    const char *proxy_host =
-		get_proxy(&apdu->u.initRequest->otherInfo);
-	    if (proxy_host)
-		set_proxyTarget(proxy_host);
-	    logf (LOG_LOG, "proxy_host = %s", m_proxyTarget ?
-		  m_proxyTarget:"none");
-	}
-	else
+	if (apdu->which != Z_APDU_initRequest)
 	{
 	    logf (LOG_LOG, "no first INIT!");
 	    return 0;
 	}
-	if (!m_proxyTarget)
-	    return 0;
-
+	logf (LOG_LOG, "got InitRequest");
+	    
+	// go through list of clients - and find the lowest/oldest one.
 	Yaz_ProxyClient *c_min = 0;
 	int min_seq = -1;
 	int no_of_clients = 0;
 	for (c = parent->m_clientPool; c; c = c->m_next)
 	{
 	    no_of_clients++;
-	    logf (LOG_LOG, "found seqno = %d", c->m_seqno);
 	    if (min_seq < 0 || c->m_seqno < min_seq)
 	    {
 		min_seq = c->m_seqno;
@@ -192,11 +233,26 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	if (no_of_clients >= parent->m_max_clients)
 	{
 	    c = c_min;
-	    logf (LOG_LOG, "Yaz_Proxy::get_client re-using session %d",
-		  c->m_seqno);
-	    if (c->m_server)
-		delete c->m_server;
-	    c->m_server = 0;
+	    if (c->m_waiting || strcmp(m_proxyTarget, c->get_hostname()))
+	    {
+		logf (LOG_LOG, "Yaz_Proxy::get_client re-init session %d",
+		      c->m_seqno);
+		if (c->m_server)
+		    delete c->m_server;
+		c->m_server = 0;
+	    }
+	    else
+	    {
+		logf (LOG_LOG, "Yaz_Proxy::get_client re-use session %d to %d",
+		      c->m_seqno, parent->m_seqno);
+		if (cookie)
+		    strcpy (c->m_cookie, cookie);
+		else
+		    c->m_cookie[0] = '\0';
+		c->m_seqno = parent->m_seqno;
+		(parent->m_seqno)++;
+		return c;
+	    }
 	}
 	else
 	{
@@ -209,7 +265,10 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    parent->m_clientPool = c;
 	    c->m_prev = &parent->m_clientPool;
 	}
-	sprintf (c->m_cookie, "%lx.%d", m_seed, parent->m_seqno);
+	if (cookie)
+	    strcpy (c->m_cookie, cookie);
+	else
+	    c->m_cookie[0] = '\0';
 	logf (LOG_LOG, "Yaz_Proxy::get_client connect to %s", m_proxyTarget);
 	c->m_seqno = parent->m_seqno;
 	c->client(m_proxyTarget);
@@ -219,7 +278,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	c->m_last_query = 0;
 	c->m_last_resultCount = 0;
 	c->m_sr_transform = 0;
-
+	c->m_waiting = 0;
 	c->timeout(600);
 
 	(parent->m_seqno)++;
@@ -315,12 +374,6 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
     }
     m_client->m_server = this;
 
-#if 0
-    Z_OtherInformation **oi;
-    get_otherInfoAPDU(apdu, &oi);
-    *oi = 0;
-#endif
-
     if (apdu->which == Z_APDU_initRequest)
     {
 	if (m_client->m_init_flag)
@@ -339,11 +392,20 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
 	return;
 
     logf (LOG_LOG, "Yaz_ProxyClient::send_Z_PDU %s", m_client->get_hostname());
+
+    // delete other info part from PDU before sending to target
+    Z_OtherInformation **oi;
+    get_otherInfoAPDU(apdu, &oi);
+    if (oi)
+        *oi = 0;
+
     if (m_client->send_Z_PDU(apdu) < 0)
     {
 	delete m_client;
 	delete this;
     }
+    else
+	m_client->m_waiting = 1;
 }
 
 void Yaz_Proxy::connectNotify()
@@ -353,11 +415,11 @@ void Yaz_Proxy::connectNotify()
 void Yaz_Proxy::shutdown()
 {
     logf (LOG_LOG, "shutdown (client to proxy)");
-    if (m_keepalive)
+    // only keep if keep_alive flag and cookie is set...
+    if (m_keepalive && m_client && m_client->m_cookie[0])
     {
 	// Tell client (if any) that no server connection is there..
-	if (m_client)
-	    m_client->m_server = 0;
+	m_client->m_server = 0;
     }
     else
     {
@@ -429,10 +491,12 @@ Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) :
     m_last_query = 0;
     m_last_resultCount = 0;
     m_sr_transform = 0;
+    m_waiting = 0;
 }
 
 void Yaz_ProxyClient::recv_Z_PDU(Z_APDU *apdu)
 {
+    m_waiting = 0;
     logf (LOG_LOG, "Yaz_ProxyClient::recv_Z_PDU %s", get_hostname());
     if (apdu->which == Z_APDU_searchResponse)
 	m_last_resultCount = *apdu->u.searchResponse->resultCount;