Modified for new location of YAZ header files. Experimental threaded

[yazpp-moved-to-github.git] / src / yaz-proxy.cpp

diff --git a/src/yaz-proxy.cpp b/src/yaz-proxy.cpp
index 3ab7c52..b985cd1 100644 (file)
--- a/src/yaz-proxy.cpp
+++ b/src/yaz-proxy.cpp
@@ -4,7 +4,21 @@
  * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-proxy.cpp,v $
- * Revision 1.7  1999-04-28 13:31:17  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.
+ *
+ * Revision 1.8  1999/05/04 10:53:00  adam
+ * Changed the way the PROXY behaves when lost cookie is received.
+ *
+ * Revision 1.7  1999/04/28 13:31:17  adam
  * Better result set optimisation for proxy.
  *
  * Revision 1.6  1999/04/27 07:52:13  adam
@@ -32,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) :
@@ -45,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
@@ -56,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;
 }
 
@@ -71,7 +96,7 @@ char *Yaz_Proxy::get_cookie(Z_OtherInformation **otherInfo)
     assert (oid_ent_to_oid (&ent, oid));
 
     if (oid_ent_to_oid (&ent, oid) && 
-       (oi = update_otherInformation(otherInfo, 0, oid, 1)) &&
+       (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) &&
        oi->which == Z_OtherInfo_characterInfo)
        return oi->information.characterInfo;
     return 0;
@@ -86,7 +111,7 @@ char *Yaz_Proxy::get_proxy(Z_OtherInformation **otherInfo)
     ent.oclass = CLASS_USERINFO;
     ent.value = (oid_value) VAL_PROXY;
     if (oid_ent_to_oid (&ent, oid) &&
-       (oi = update_otherInformation(otherInfo, 0, oid, 1)) &&
+       (oi = update_otherInformation(otherInfo, 0, oid, 1, 1)) &&
        oi->which == Z_OtherInfo_characterInfo)
        return oi->information.characterInfo;
     return 0;
@@ -102,7 +127,7 @@ Yaz_ProxyClient *Yaz_Proxy::get_client(Z_APDU *apdu)
     get_otherInfoAPDU(apdu, &oi);
     char *cookie = get_cookie(oi);
     logf (LOG_LOG, "Yaz_Proxy::get_client cookie=%s", cookie ? cookie :
-         "<null>");
+         "null");
     if (cookie)
     {
        for (c = parent->m_clientPool; c; c = c->m_next)
@@ -111,13 +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");
-               break;
+               logf (LOG_LOG, "Yaz_Proxy::get_client found cached target");
+               return c;
            }
-       }
+       }       
     }
-    else if (!m_client)
+    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;
@@ -129,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;
@@ -229,9 +263,12 @@ 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)
@@ -257,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..
@@ -273,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)
 {
@@ -299,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) :