Fixed bug in proxy where a Yaz_ProxyClient could be owned by

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

diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp
index 289a52b..6986733 100644 (file)
--- a/src/yaz-pdu-assoc.cpp
+++ b/src/yaz-pdu-assoc.cpp
@@ -1,10 +1,29 @@
 /*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2000, Index Data.
  * See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
  * 
  * $Log: yaz-pdu-assoc.cpp,v $
- * Revision 1.12  2000-09-06 14:23:45  adam
+ * Revision 1.18  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.17  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.16  2000/09/22 09:54:11  heikki
+ * minor
+ *
+ * Revision 1.15  2000/09/21 21:43:20  adam
+ * Better high-level server API.
+ *
+ * Revision 1.14  2000/09/12 12:09:53  adam
+ * More work on high-level server.
+ *
+ * Revision 1.13  2000/09/08 10:23:42  adam
+ * Added skeleton of yaz-z-server.
+ *
+ * Revision 1.12  2000/09/06 14:23:45  adam
  * WIN32 updates.
  *
  * Revision 1.11  2000/09/04 08:29:22  adam
@@ -28,7 +47,7 @@
  * Revision 1.6  1999/04/20 10:30:05  adam
  * Implemented various stuff for client and proxy. Updated calls
  * to ODR to reflect new name parameter.
- *
+ *g
  * Revision 1.5  1999/04/09 11:46:57  adam
  * Added object Yaz_Z_Assoc. Much more functional client.
  *
@@ -49,7 +68,7 @@
 
 #include <assert.h>
 
-#include <yaz-pdu-assoc.h>
+#include <yaz++/yaz-pdu-assoc.h>
 
 #include <yaz/log.h>
 #include <yaz/tcpip.h>
@@ -77,11 +96,6 @@ IYaz_PDU_Observable *Yaz_PDU_Assoc::clone()
     return copy;
 }
 
-Yaz_PDU_Assoc::~Yaz_PDU_Assoc()
-{
-    destroy();
-}
-
 void Yaz_PDU_Assoc::socketNotify(int event)
 {
     logf (m_log, "Yaz_PDU_Assoc::socketNotify p=%p event = %d", this, event);
@@ -129,7 +143,6 @@ void Yaz_PDU_Assoc::socketNotify(int event)
            }
            if (!(new_line = cs_accept(m_cs)))
                return;
-           
            /* 1. create socket-manager 
                2. create pdu-assoc
                3. create top-level object
@@ -137,19 +150,10 @@ void Yaz_PDU_Assoc::socketNotify(int event)
                4. start thread
            */
            int fd = cs_fileno(new_line);
+           logf (m_log, "accept ok fd = %d", fd);
            cs_fileno(new_line) = -1;  
-           cs_close (new_line);        /* potential problem ... */
-#if 1
+           cs_close (new_line);
            childNotify(fd);
-#else
-           Yaz_PDU_Assoc *assoc = new Yaz_PDU_Assoc (m_socketObservable);
-           assoc->m_parent = this;
-           assoc->m_next = m_children;
-           m_children = assoc;
- 
-           assoc->m_PDU_Observer = m_PDU_Observer->clone(assoc);
-           socket(fd);
-#endif
        }
     }
     else if (m_state == Ready)
@@ -169,7 +173,7 @@ void Yaz_PDU_Assoc::socketNotify(int event)
                {
                    logf (m_log, "Connection closed by peer");
                    close();
-                   m_PDU_Observer->failNotify();
+                   m_PDU_Observer->failNotify(); // problem here..
                    return;
                }
                // lock it, so we know if recv_PDU deletes it.
@@ -347,6 +351,7 @@ void Yaz_PDU_Assoc::listen(IYaz_PDU_Observer *observer,
     m_socketObservable->addObserver(cs_fileno(cs), this);
     m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
                                     YAZ_SOCKET_OBSERVE_EXCEPT);
+    logf (m_log, "Yaz_PDU_Assoc::listen ok fd=%d", cs_fileno(cs));
     m_state = Listen;
 }
 
@@ -397,22 +402,24 @@ void Yaz_PDU_Assoc::socket(IYaz_PDU_Observer *observer, int fd)
 }
 
 #if 1
+ // 1 = single-threaded
+ // 0 = multi-threaded
 
 // Single-threaded... Only useful for non-blocking handlers
 void Yaz_PDU_Assoc::childNotify(int fd)
 {
-    /// Clone PDU Observable (keep socket manager)
+    // Clone PDU Observable (keep socket manager)
     IYaz_PDU_Observable *new_observable = clone();
 
-    /// Clone PDU Observer
+    // Clone PDU Observer
     IYaz_PDU_Observer *observer = m_PDU_Observer->clone(new_observable);
 
-    /// Attach new socket to it
+    // Attach new socket to it
     new_observable->socket(observer, fd);
 }
 #else
 
-#include <yaz-socket-manager.h>
+#include <yaz++/yaz-socket-manager.h>
 
 #ifdef WIN32
 #include <process.h>
@@ -420,9 +427,10 @@ void Yaz_PDU_Assoc::childNotify(int fd)
 #include <pthread.h>
 #endif
 
-void
 #ifdef WIN32
-__cdecl
+void __cdecl
+#else
+void *
 #endif 
     events(void *p)
 {