Updates for yaz/ylog.h

[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 bcdeded..d888cef 100644 (file)
--- a/src/yaz-pdu-assoc.cpp
+++ b/src/yaz-pdu-assoc.cpp
@@ -1,13 +1,13 @@
 /*
- * Copyright (c) 1998-2001, Index Data.
+ * Copyright (c) 1998-2003, Index Data.
  * See the file LICENSE for details.
  * 
- * $Id: yaz-pdu-assoc.cpp,v 1.29 2003-07-25 19:27:36 adam Exp $
+ * $Id: yaz-pdu-assoc.cpp,v 1.38 2004-11-30 21:10:31 adam Exp $
  */
 
 #include <assert.h>
 #include <string.h>
-#include <yaz/log.h>
+#include <yaz/ylog.h>
 #include <yaz/tcpip.h>
 
 #include <yaz++/pdu-assoc.h>
@@ -20,6 +20,7 @@ void Yaz_PDU_Assoc::init(IYazSocketObservable *socketObservable)
     m_socketObservable = socketObservable;
     m_PDU_Observer = 0;
     m_queue_out = 0;
+    m_queue_in = 0;
     m_input_buf = 0;
     m_input_len = 0;
     m_children = 0;
@@ -27,7 +28,7 @@ void Yaz_PDU_Assoc::init(IYazSocketObservable *socketObservable)
     m_next = 0;
     m_destroyed = 0;
     m_idleTime = 0;
-    m_log = LOG_DEBUG;
+    m_log = YLOG_DEBUG;
 }
 
 Yaz_PDU_Assoc::Yaz_PDU_Assoc(IYazSocketObservable *socketObservable)
@@ -157,7 +158,7 @@ void Yaz_PDU_Assoc::socketNotify(int event)
                return;
            if (res < 0)
            {
-               yaz_log(LOG_FATAL|LOG_ERRNO, "cs_listen failed");
+               yaz_log(YLOG_FATAL|YLOG_ERRNO, "cs_listen failed");
                return;
            }
            if (!(new_line = cs_accept(m_cs)))
@@ -208,11 +209,18 @@ void Yaz_PDU_Assoc::socketNotify(int event)
 
                if (!m_PDU_Observer)
                    return;
-
+#if 0
+               PDU_Queue **pq = &m_queue_in;
+               while (*pq)
+                   pq = &(*pq)->m_next;
+               
+               *pq = new PDU_Queue(m_input_buf, res);
+#else
                m_PDU_Observer->recv_PDU(m_input_buf, res);
-                m_destroyed = 0;
+#endif
                if (destroyed)   // it really was destroyed, return now.
                    return;
+                m_destroyed = 0;
            } while (m_cs && cs_more (m_cs));
            if (m_cs && m_state == Ready)
             {
@@ -387,30 +395,29 @@ int Yaz_PDU_Assoc::send_PDU(const char *buf, int len)
 
 COMSTACK Yaz_PDU_Assoc::comstack(const char *type_and_host, void **vp)
 {
-    return cs_create_host(type_and_host, 0, vp);
+    return cs_create_host(type_and_host, 2, vp);
 }
 
-void Yaz_PDU_Assoc::listen(IYaz_PDU_Observer *observer,
-                          const char *addr)
+int Yaz_PDU_Assoc::listen(IYaz_PDU_Observer *observer,
+                         const char *addr)
 {
     close();
 
-    yaz_log (LOG_LOG, "Adding listener %s", addr);
-
     m_PDU_Observer = observer;
     void *ap;
     m_cs = comstack(addr, &ap);
 
     if (!m_cs)
-        return;
+        return -1;
     if (cs_bind(m_cs, ap, CS_SERVER) < 0)
-        return;
+        return -2;
     m_socketObservable->addObserver(cs_fileno(m_cs), this);
     yaz_log(m_log, "maskObserver 9");
     m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
                                     YAZ_SOCKET_OBSERVE_EXCEPT);
     yaz_log (m_log, "Yaz_PDU_Assoc::listen ok fd=%d", cs_fileno(m_cs));
     m_state = Listen;
+    return 0;
 }
 
 void Yaz_PDU_Assoc::idleTime(int idleTime)
@@ -420,7 +427,7 @@ void Yaz_PDU_Assoc::idleTime(int idleTime)
     m_socketObservable->timeoutObserver(this, m_idleTime);
 }
 
-void Yaz_PDU_Assoc::connect(IYaz_PDU_Observer *observer,
+int Yaz_PDU_Assoc::connect(IYaz_PDU_Observer *observer,
                            const char *addr)
 {
     yaz_log (m_log, "Yaz_PDU_Assoc::connect %s", addr);
@@ -428,13 +435,24 @@ void Yaz_PDU_Assoc::connect(IYaz_PDU_Observer *observer,
     m_PDU_Observer = observer;
     void *ap;
     m_cs = comstack(addr, &ap);
+    if (!m_cs)
+       return -1;
     int res = cs_connect (m_cs, ap);
     yaz_log (m_log, "Yaz_PDU_Assoc::connect fd=%d res=%d", cs_fileno(m_cs),
             res);
     m_socketObservable->addObserver(cs_fileno(m_cs), this);
 
-    if (res >= 0)
-    {   // Connect pending or complete
+    if (res == 0)
+    {   // Connect complete
+       m_state = Connecting;
+       unsigned mask = YAZ_SOCKET_OBSERVE_EXCEPT;
+       mask |= YAZ_SOCKET_OBSERVE_WRITE;
+       mask |= YAZ_SOCKET_OBSERVE_READ;
+       yaz_log(m_log, "maskObserver 11");
+       m_socketObservable->maskObserver(this, mask);
+    }
+    else if (res > 0)
+    {   // Connect pending
        m_state = Connecting;
        unsigned mask = YAZ_SOCKET_OBSERVE_EXCEPT;
        if (m_cs->io_pending & CS_WANT_WRITE)
@@ -452,6 +470,7 @@ void Yaz_PDU_Assoc::connect(IYaz_PDU_Observer *observer,
        m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_WRITE|
                                         YAZ_SOCKET_OBSERVE_EXCEPT);
     }
+    return 0;
 }
 
 // Single-threaded... Only useful for non-blocking handlers
@@ -468,3 +487,8 @@ void Yaz_PDU_Assoc::childNotify(COMSTACK cs)
     new_observable->m_PDU_Observer = m_PDU_Observer->sessionNotify
        (new_observable, cs_fileno(cs));
 }
+
+const char*Yaz_PDU_Assoc::getpeername()
+{
+    return cs_addrstr(m_cs);
+}