X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-proxy.cpp;h=b985cd1369d77b20b4a5ed596d64d75e55ef2d38;hb=26b3f7f15abcb69aaf00fb6bdaf410ff3e7de14c;hp=a61233e57d007a6ab7b6d57724b574b479d61392;hpb=66767801433aba6cd2ac9fc744a1057867df7fa9;p=yazpp-moved-to-github.git

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index a61233e..b985cd1 100644
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -4,7 +4,14 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy.cpp,v $
- * Revision 1.9  1999-09-13 12:53:44  adam
+ * Revision 1.11  1999-12-06 13:52:45  adam
+ * Modified for new location of YAZ header files. Experimental threaded
+ * operation.
+ *
+ * Revision 1.10  1999/11/10 10:02:34  adam
+ * Work on proxy.
+ *
+ * Revision 1.9  1999/09/13 12:53:44  adam
  * Proxy removes OtherInfo Proxy Address and Session ID. Other
  * Otherinfo remains untouched.
  *
@@ -39,8 +46,7 @@
 
 #include <assert.h>
 
-#include <log.h>
-
+#include <yaz/log.h>
 #include <yaz-proxy.h>
 
 Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
@@ -52,10 +58,21 @@ Yaz_Proxy::Yaz_Proxy(IYaz_PDU_Observable *the_PDU_Observable) :
     m_clientPool = 0;
     m_seqno = 1;
     m_keepalive = 1;
+    m_proxyTarget = 0;
 }
 
 Yaz_Proxy::~Yaz_Proxy()
 {
+    xfree (m_proxyTarget);
+}
+
+
+void Yaz_Proxy::set_proxyTarget(const char *target)
+{
+    xfree (m_proxyTarget);
+    m_proxyTarget = 0;
+    if (target)
+	m_proxyTarget = (char *) xstrdup (target);
 }
 
 IYaz_PDU_Observer *Yaz_Proxy::clone(IYaz_PDU_Observable
@@ -63,7 +80,8 @@ IYaz_PDU_Observer *Yaz_Proxy::clone(IYaz_PDU_Observable
 {
     Yaz_Proxy *new_proxy = new Yaz_Proxy(the_PDU_Observable);
     new_proxy->m_parent = this;
-    new_proxy->timeout(120);
+    new_proxy->timeout(20);
+    new_proxy->set_proxyTarget(m_proxyTarget);
     return new_proxy;
 }
 
@@ -118,14 +136,31 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	    assert (*c->m_prev == c);
 	    if (!strcmp(cookie,c->m_cookie))
 	    {
-		logf (LOG_LOG, "Yaz_Proxy::get_client cached");
+		logf (LOG_LOG, "Yaz_Proxy::get_client found cached target");
 		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
+	{
+	    logf (LOG_LOG, "no first INIT!");
+	    return 0;
+	}
+	if (!m_proxyTarget)
+	    return 0;
 	logf (LOG_LOG, "Yaz_Proxy::get_client creating new");
 	c = new Yaz_ProxyClient(m_PDU_Observable->clone());
 	c->m_next = parent->m_clientPool;
@@ -137,16 +172,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
 	sprintf (c->m_cookie, "%d", parent->m_seqno);
 	(parent->m_seqno)++;
 
-	if (apdu->which == Z_APDU_initRequest)
-	{
-	    logf (LOG_LOG, "got InitRequest");
-	    
-	    char *proxy_host = get_proxy(&apdu->u.initRequest->otherInfo);
-	    if (proxy_host)
-		c->client(proxy_host);
-	    else
-		c->client("localhost:9999");
-	}
+	c->client(m_proxyTarget);
 	c->timeout(600);
     }
     return c;
@@ -268,9 +294,13 @@ void Yaz_Proxy::recv_Z_PDU(Z_APDU *apdu)
     }
 }
 
-void Yaz_Proxy::failNotify()
+void Yaz_Proxy::connectNotify()
 {
-    logf (LOG_LOG, "failNotity server");
+}
+
+void Yaz_Proxy::shutdown()
+{
+    logf (LOG_LOG, "shutdown (client to proxy)");
     if (m_keepalive)
     {
 	// Tell client (if any) that no server connection is there..
@@ -284,13 +314,30 @@ void Yaz_Proxy::failNotify()
     delete this;
 }
 
-void Yaz_ProxyClient::failNotify()
+void Yaz_ProxyClient::shutdown()
 {
-    logf (LOG_LOG, "failNotity client");
+    logf (LOG_LOG, "shutdown (proxy to server)");
     delete m_server;
     delete this;
 }
 
+void Yaz_Proxy::failNotify()
+{
+    logf (LOG_LOG, "connection closed by client");
+    shutdown();
+}
+
+void Yaz_ProxyClient::failNotify()
+{
+    logf (LOG_LOG, "connection closed by server");
+    shutdown();
+}
+
+void Yaz_ProxyClient::connectNotify()
+{
+    logf (LOG_LOG, "connection accepted by target");
+}
+
 IYaz_PDU_Observer *Yaz_ProxyClient::clone(IYaz_PDU_Observable
 					  *the_PDU_Observable)
 {
@@ -310,12 +357,14 @@ Yaz_ProxyClient::~Yaz_ProxyClient()
 
 void Yaz_Proxy::timeoutNotify()
 {
-    failNotify();
+    logf (LOG_LOG, "timeout (client to proxy)");
+    shutdown();
 }
 
 void Yaz_ProxyClient::timeoutNotify()
 {
-    failNotify();
+    logf (LOG_LOG, "timeout (proxy to target)");
+    shutdown();
 }
 
 Yaz_ProxyClient::Yaz_ProxyClient(IYaz_PDU_Observable *the_PDU_Observable) :