X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;ds=inline;f=src%2Fyaz-proxy.cpp;h=988eb918dad79383c5af760bcc4cb653a0afd3b8;hb=5238ea544d4a2b414592f1d503f5ed83f305b21b;hp=72969d3f60315148bcbb0c443e6cd257b3285f12;hpb=3b58e2f8d81f47c9c9cc86dbd2cdebf8621d8559;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 72969d3..988eb91 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -1,9 +1,15 @@
 /*
- * Copyright (c) 1998-2000, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
  * See the file LICENSE for details.
  * 
  * $Log: yaz-proxy.cpp,v $
- * Revision 1.21  2000-11-01 14:22:59  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
@@ -110,8 +116,8 @@ 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, int fd)
+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;
@@ -301,7 +307,7 @@ 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)++;
     }
@@ -478,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, int fd)
+IYaz_PDU_Observer *Yaz_ProxyClient::sessionNotify(IYaz_PDU_Observable
+						  *the_PDU_Observable, int fd)
 {
     return new Yaz_ProxyClient(the_PDU_Observable);
 }