X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Fyaz-pdu-assoc.cpp;h=a816d4881427144a1e4a092445e68833fd6d080e;hb=933909a6cfd5dcacc446f45e7217849b917abefd;hp=084c4e9ab92e1fafee1c262a1be890f497719966;hpb=35cfa3b3d2c9b8adb8c4bfd4c95620929e35466b;p=yazpp-moved-to-github.git

diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp
index 084c4e9..a816d48 100644
--- a/src/yaz-pdu-assoc.cpp
+++ b/src/yaz-pdu-assoc.cpp
@@ -3,7 +3,27 @@
  * See the file LICENSE for details.
  * 
  * $Log: yaz-pdu-assoc.cpp,v $
- * Revision 1.14  2000-09-12 12:09:53  adam
+ * Revision 1.20  2000-11-20 11:27:33  adam
+ * Fixes for connect operation (timeout and notify fix).
+ *
+ * Revision 1.19  2000/11/01 14:22:59  adam
+ * Added fd parameter for method IYaz_PDU_Observer::clone.
+ *
+ * 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
@@ -54,7 +74,7 @@
 
 #include <assert.h>
 
-#include <yaz-pdu-assoc.h>
+#include <yaz++/yaz-pdu-assoc.h>
 
 #include <yaz/log.h>
 #include <yaz/tcpip.h>
@@ -85,16 +105,9 @@ IYaz_PDU_Observable *Yaz_PDU_Assoc::clone()
 void Yaz_PDU_Assoc::socketNotify(int event)
 {
     logf (m_log, "Yaz_PDU_Assoc::socketNotify p=%p event = %d", this, event);
-    if (0 /* m_state == Connected */)
-    {
-	m_state = Ready;
-	m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
-					 YAZ_SOCKET_OBSERVE_EXCEPT);
-	m_PDU_Observer->connectNotify();
-	flush_PDU();
-    }
-    else if (m_state == Connecting)
+    switch (m_state)
     {
+    case Connecting:
 	if (event & YAZ_SOCKET_OBSERVE_READ)
 	{
 	    close();
@@ -112,9 +125,8 @@ void Yaz_PDU_Assoc::socketNotify(int event)
 	    m_PDU_Observer->connectNotify();
 	    flush_PDU();
 	}
-    }
-    else if (m_state == Listen)
-    {
+	break;
+    case Listen:
 	if (event & YAZ_SOCKET_OBSERVE_READ)
 	{
 	    int res;
@@ -138,22 +150,11 @@ void Yaz_PDU_Assoc::socketNotify(int event)
 	    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)
-    {
+	break;
+    case Ready:
 	if (event & YAZ_SOCKET_OBSERVE_WRITE)
 	{
 	    flush_PDU();
@@ -169,7 +170,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.
@@ -186,6 +187,16 @@ void Yaz_PDU_Assoc::socketNotify(int event)
 	{
 	    m_PDU_Observer->timeoutNotify();
 	}
+	break;
+    case Closed:
+	logf (m_log, "CLOSING state=%d event was %d", m_state, event);
+	close();
+	m_PDU_Observer->failNotify();
+	break;
+    default:
+	logf (m_log, "Unknown state=%d event was %d", m_state, event);
+	close();
+	m_PDU_Observer->failNotify();
     }
 }
 
@@ -375,9 +386,11 @@ void Yaz_PDU_Assoc::connect(IYaz_PDU_Observer *observer,
     logf (m_log, "Yaz_PDU_Assoc::connect fd=%d res=%d", cs_fileno(cs), res);
     m_socketObservable->addObserver(cs_fileno(cs), this);
     m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
-					   YAZ_SOCKET_OBSERVE_EXCEPT|
-					   YAZ_SOCKET_OBSERVE_WRITE);
-    m_state = Connecting;
+				     YAZ_SOCKET_OBSERVE_EXCEPT|
+				     YAZ_SOCKET_OBSERVE_WRITE);
+    if (res >= 0)
+	m_state = Connecting;
+    // if res < 0, then cs_connect failed immediately. state is Closed..
 }
 
 void Yaz_PDU_Assoc::socket(IYaz_PDU_Observer *observer, int fd)
@@ -398,22 +411,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
-    IYaz_PDU_Observer *observer = m_PDU_Observer->clone(new_observable);
+    // Clone PDU Observer
+    IYaz_PDU_Observer *observer = m_PDU_Observer->clone(new_observable, fd);
 
-    /// 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>
@@ -446,7 +461,7 @@ void Yaz_PDU_Assoc::childNotify(int fd)
     Yaz_PDU_Assoc *new_observable = new Yaz_PDU_Assoc (socket_observable);
     
     /// Clone PDU Observer
-    IYaz_PDU_Observer *observer = m_PDU_Observer->clone(new_observable);
+    IYaz_PDU_Observer *observer = m_PDU_Observer->clone(new_observable, fd);
     
     /// Attach new socket to it
     new_observable->socket(observer, fd);