X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=988eb918dad79383c5af760bcc4cb653a0afd3b8;hb=bd71f8812ca0f38438733efc89ecce1f49dae9e7;hp=e3954d170869aafb8d3de652144a321bd269b31a;hpb=804e399b3394762e87f54d8b1c6e0fe882f9e03b;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index e3954d1..988eb91 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,10 +1,32 @@
 /*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy.cpp,v $
- * Revision 1.16  2000-09-04 08:29:22  adam
+ * Revision 1.23  2001-03-26 14:43:49  adam
+ * New threaded PDU association.
+ *
+ * Revision 1.22  2000/11/20 11:27:33  adam
+ * Fixes for connect operation (timeout and notify fix).
+ *
+ * Revision 1.21  2000/11/01 14:22:59  adam
+ * Added fd parameter for method IYaz_PDU_Observer::clone.
+ *
+ * Revision 1.20  2000/10/24 12:29:57  adam
+ * Fixed bug in proxy where a Yaz_ProxyClient could be owned by
+ * two Yaz_Proxy's (fatal).
+ *
+ * Revision 1.19  2000/10/11 11:58:16  adam
+ * Moved header files to include/yaz++. Switched to libtool and automake.
+ * Configure script creates yaz++-config script.
+ *
+ * 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.
  *
@@ -65,7 +87,7 @@
 #include <time.h>
 
 #include <yaz/log.h>
-#include <yaz-proxy.h>
+#include <yaz++/yaz-proxy.h>
 
 Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
     Yaz_Z_Assoc(the_PDU_Observable)
@@ -94,12 +116,12 @@ void Yaz_Proxy::set_proxyTarget(const char *target)
 	m_proxyTarget = (char *) xstrdup (target);
 }
 
-IYaz_PDU_Observer *Yaz_Proxy::clone(IYaz_PDU_Observable
-				    *the_PDU_Observable)
+IYaz_PDU_Observer *Yaz_Proxy::sessionNotify(IYaz_PDU_Observable
+					    *the_PDU_Observable, int fd)
 {
     Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable);
     new_proxy->m_parent = this;
-    new_proxy->timeout(120);
+    new_proxy->timeout(500);
     new_proxy->set_proxyTarget(m_proxyTarget);
     new_proxy->set_APDU_log(get_APDU_log());
     return new_proxy;
@@ -158,7 +180,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
     if (!m_proxyTarget)
 	return 0;
 
-    if (cookie)
+    if (cookie && *cookie)
     {
 	logf (LOG_LOG, "lookup of clients cookie=%s target=%s",
 	      cookie, m_proxyTarget);
@@ -196,10 +218,15 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 		c->m_last_resultCount = 0;
 		c->m_sr_transform = 0;
 		c->m_waiting = 0;
-		c->timeout(600);
+		c->timeout(600); 
 	    }
 	    c->m_seqno = parent->m_seqno;
+	    if (c->m_server && c->m_server != this)
+		c->m_server->m_client = 0;
+	    c->m_server = this;
+	    c->m_seqno = parent->m_seqno;
 	    (parent->m_seqno)++;
+	    yaz_log (LOG_LOG, "get_client 1 %p %p", this, c);
 	    return c;
 	}
     }
@@ -232,7 +259,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    {
 		logf (LOG_LOG, "Yaz_Proxy::get_client re-init session %d",
 		      c->m_seqno);
-		if (c->m_server)
+		if (c->m_server && c->m_server != this)
 		    delete c->m_server;
 		c->m_server = 0;
 	    }
@@ -245,7 +272,13 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 		else
 		    c->m_cookie[0] = '\0';
 		c->m_seqno = parent->m_seqno;
+		if (c->m_server && c->m_server != this)
+		{
+		    c->m_server->m_client = 0;
+		    delete c->m_server;
+		}
 		(parent->m_seqno)++;
+		yaz_log (LOG_LOG, "get_client 2 %p %p", this, c);
 		return c;
 	    }
 	}
@@ -274,10 +307,11 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	c->m_last_resultCount = 0;
 	c->m_sr_transform = 0;
 	c->m_waiting = 0;
-	c->timeout(600);
+	c->timeout(10);
 
 	(parent->m_seqno)++;
     }
+    yaz_log (LOG_LOG, "get_client 3 %p %p", this, c);
     return c;
 }
 
@@ -391,11 +425,13 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
     // delete other info part from PDU before sending to target
     Z_OtherInformation **oi;
     get_otherInfoAPDU(apdu, &oi);
-    *oi = 0;
+    if (oi)
+        *oi = 0;
 
     if (m_client->send_Z_PDU(apdu) < 0)
     {
 	delete m_client;
+	m_client = 0;
 	delete this;
     }
     else
@@ -412,11 +448,16 @@ void Yaz_Proxy::shutdown()
     // only keep if keep_alive flag and cookie is set...
     if (m_keepalive && m_client && m_client->m_cookie[0])
     {
+	if (m_client->m_waiting == 2)
+	    abort();
 	// Tell client (if any) that no server connection is there..
 	m_client->m_server = 0;
     }
-    else
+    else if (m_client)
     {
+	yaz_log (LOG_LOG, "deleting %p %p", this, m_client);
+	if (m_client->m_waiting == 2)
+	    abort();
 	delete m_client;
     }
     delete this;
@@ -443,11 +484,13 @@ void Yaz_ProxyClient::failNotify()
 
 void Yaz_ProxyClient::connectNotify()
 {
-    logf (LOG_LOG, "Yaz_ProxyClient connection accept by %s", get_hostname());
+    logf (LOG_LOG, "Yaz_ProxyClient connection accepted by %s",
+	  get_hostname());
+    timeout(600);
 }
 
-IYaz_PDU_Observer *Yaz_ProxyClient::clone(IYaz_PDU_Observable
-					  *the_PDU_Observable)
+IYaz_PDU_Observer *Yaz_ProxyClient::sessionNotify(IYaz_PDU_Observable
+						  *the_PDU_Observable, int fd)
 {
     return new Yaz_ProxyClient(the_PDU_Observable);
 }
@@ -455,11 +498,10 @@ IYaz_PDU_Observer *Yaz_ProxyClient::clone(IYaz_PDU_Observable
 Yaz_ProxyClient::~Yaz_ProxyClient()
 {
     if (m_prev)
-    {
 	*m_prev = m_next;
-	if (m_next)
-	    m_next->m_prev = m_prev;
-    }
+    if (m_next)
+	m_next->m_prev = m_prev;
+    m_waiting = 2;     // for debugging purposes only.
     delete m_last_query;
 }