X-Git-Url: http://git.indexdata.com/?p=yazpp-moved-to-github.git;a=blobdiff_plain;f=src%2Fyaz-pdu-assoc.cpp;h=d69768eed42138396d236c3b2fe304df9076aa3c;hp=50ebbe717086716c567c15a010a9fb03c94abdb5;hb=217e153abe5e9c5aae6ef74a839bf01d30e295d3;hpb=7fc0fddcb85cd64461c7b3dd3e68791eb88b40be

diff --git a/src/yaz-pdu-assoc.cpp b/src/yaz-pdu-assoc.cpp
index 50ebbe7..d69768e 100644
--- a/src/yaz-pdu-assoc.cpp
+++ b/src/yaz-pdu-assoc.cpp
@@ -1,487 +1,618 @@
-/*
- * Copyright (c) 1998-2001, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2013 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-pdu-assoc.cpp,v 1.33 2003-10-10 12:37:26 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 #include <string.h>
 #include <yaz/log.h>
 #include <yaz/tcpip.h>
 
-#include <yaz++/pdu-assoc.h>
-
+#include <yazpp/pdu-assoc.h>
+
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
+using namespace yazpp_1;
+
+namespace yazpp_1 {
+    class PDU_Assoc_priv {
+        friend class PDU_Assoc;
+    private:
+        enum {
+            Connecting,
+            Listen,
+            Ready,
+            Closed,
+            Writing,
+            Accepting
+        } state;
+        class PDU_Queue {
+        public:
+            PDU_Queue(const char *buf, int len);
+            ~PDU_Queue();
+            char *m_buf;
+            int m_len;
+            PDU_Queue *m_next;
+        };
+        PDU_Assoc *pdu_parent;
+        PDU_Assoc *pdu_children;
+        PDU_Assoc *pdu_next;
+        COMSTACK cs;
+        yazpp_1::ISocketObservable *m_socketObservable;
+        char *input_buf;
+        int input_len;
+        PDU_Queue *queue_out;
+        PDU_Queue *queue_in;
+        int *destroyed;
+        int idleTime;
+        int log;
+        void init(yazpp_1::ISocketObservable *socketObservable);
+        COMSTACK comstack(const char *type_and_host, void **vp);
+        bool m_session_is_dead;
+    };
+}
 
-void Yaz_PDU_Assoc::init(IYazSocketObservable *socketObservable)
+void PDU_Assoc_priv::init(ISocketObservable *socketObservable)
 {
-    m_state = Closed;
-    m_cs = 0;
+    state = Closed;
+    cs = 0;
     m_socketObservable = socketObservable;
-    m_PDU_Observer = 0;
-    m_queue_out = 0;
-    m_input_buf = 0;
-    m_input_len = 0;
-    m_children = 0;
-    m_parent = 0;
-    m_next = 0;
-    m_destroyed = 0;
-    m_idleTime = 0;
-    m_log = LOG_DEBUG;
+    queue_out = 0;
+    queue_in = 0;
+    input_buf = 0;
+    input_len = 0;
+    pdu_children = 0;
+    pdu_parent = 0;
+    pdu_next = 0;
+    destroyed = 0;
+    idleTime = 0;
+    log = YLOG_DEBUG;
+    m_session_is_dead = false;
+}
+
+PDU_Assoc::~PDU_Assoc()
+{
+    delete m_p;
 }
 
-Yaz_PDU_Assoc::Yaz_PDU_Assoc(IYazSocketObservable *socketObservable)
+PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable)
 {
-    init (socketObservable);
+    m_PDU_Observer = 0;
+    m_p = new PDU_Assoc_priv;
+    m_p->init(socketObservable);
 }
 
-Yaz_PDU_Assoc::Yaz_PDU_Assoc(IYazSocketObservable *socketObservable,
-			     COMSTACK cs)
+PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable,
+                     COMSTACK cs)
 {
-    init(socketObservable);
-    m_cs = cs;
+    m_PDU_Observer = 0;
+    m_p = new PDU_Assoc_priv;
+    m_p->init(socketObservable);
+    m_p->cs = cs;
     unsigned mask = 0;
     if (cs->io_pending & CS_WANT_WRITE)
-	mask |= YAZ_SOCKET_OBSERVE_WRITE;
+        mask |= SOCKET_OBSERVE_WRITE;
     if (cs->io_pending & CS_WANT_READ)
-	mask |= YAZ_SOCKET_OBSERVE_READ;
-    m_socketObservable->addObserver(cs_fileno(cs), this);
+        mask |= SOCKET_OBSERVE_READ;
+    m_p->m_socketObservable->addObserver(cs_fileno(cs), this);
     if (!mask)
     {
-	yaz_log (m_log, "new PDU_Assoc. Ready");
-	m_state = Ready;
-	flush_PDU();
+        yaz_log(m_p->log, "new PDU_Assoc. Ready");
+        m_p->state = PDU_Assoc_priv::Ready;
+        flush_PDU();
     }
     else
     {
-	yaz_log (m_log, "new PDU_Assoc. Accepting");
-	// assume comstack is accepting...
-	m_state = Accepting;
-	m_socketObservable->addObserver(cs_fileno(cs), this);
-	yaz_log(m_log, "maskObserver 1");
-	m_socketObservable->maskObserver(this,
-					 mask |YAZ_SOCKET_OBSERVE_EXCEPT);
+        yaz_log(m_p->log, "new PDU_Assoc. Accepting");
+        // assume comstack is accepting...
+        m_p->state = PDU_Assoc_priv::Accepting;
+        m_p->m_socketObservable->addObserver(cs_fileno(cs), this);
+        yaz_log(m_p->log, "maskObserver 1");
+        m_p->m_socketObservable->maskObserver(this,
+                                              mask|SOCKET_OBSERVE_EXCEPT);
     }
 }
 
 
-IYaz_PDU_Observable *Yaz_PDU_Assoc::clone()
+IPDU_Observable *PDU_Assoc::clone()
 {
-    Yaz_PDU_Assoc *copy = new Yaz_PDU_Assoc(m_socketObservable);
+    PDU_Assoc *copy = new PDU_Assoc(m_p->m_socketObservable);
     return copy;
 }
 
-void Yaz_PDU_Assoc::socketNotify(int event)
+void PDU_Assoc::socketNotify(int event)
 {
-    yaz_log (m_log, "Yaz_PDU_Assoc::socketNotify p=%p state=%d event = %d",
-	  this, m_state, event);
-    if (event & YAZ_SOCKET_OBSERVE_EXCEPT)
+    yaz_log(m_p->log, "PDU_Assoc::socketNotify p=%p state=%d event = %d",
+            this, m_p->state, event);
+    if (event & SOCKET_OBSERVE_EXCEPT)
     {
-        close();
+        shutdown();
         m_PDU_Observer->failNotify();
         return;
     }
-    else if (event & YAZ_SOCKET_OBSERVE_TIMEOUT)
+    else if (event & SOCKET_OBSERVE_TIMEOUT)
     {
         m_PDU_Observer->timeoutNotify();
         return;
     }
-    switch (m_state)
+    switch (m_p->state)
     {
-    case Accepting:
-	if (!cs_accept (m_cs))
-	{
-	    yaz_log (m_log, "Yaz_PDU_Assoc::cs_accept failed");
-	    m_cs = 0;
-	    close();
-	    m_PDU_Observer->failNotify();
-	}
-	else
-	{
-	    unsigned mask = 0;
-	    if (m_cs->io_pending & CS_WANT_WRITE)
-		mask |= YAZ_SOCKET_OBSERVE_WRITE;
-	    if (m_cs->io_pending & CS_WANT_READ)
-		mask |= YAZ_SOCKET_OBSERVE_READ;
-	    if (!mask)
-	    {   // accept is complete. turn to ready state and write if needed
-		m_state = Ready;
-		flush_PDU();
-	    }
-	    else  
-	    {   // accept still incomplete.
-	        yaz_log(m_log, "maskObserver 2");
-		m_socketObservable->maskObserver(this,
-					     mask|YAZ_SOCKET_OBSERVE_EXCEPT);
-	    }
-	}
-	break;
-    case Connecting:
-	if (event & YAZ_SOCKET_OBSERVE_READ && 
-	    event & YAZ_SOCKET_OBSERVE_WRITE)
-	{
-	    // For Unix: if both read and write is set, then connect failed.
-	    close();
-	    m_PDU_Observer->failNotify();
-	}
-	else
-	{
-	    yaz_log (m_log, "cs_rcvconnect");
-	    int res = cs_rcvconnect (m_cs);
-	    if (res == 1)
-	    {
-		unsigned mask = YAZ_SOCKET_OBSERVE_EXCEPT;
-		if (m_cs->io_pending & CS_WANT_WRITE)
-		    mask |= YAZ_SOCKET_OBSERVE_WRITE;
-		if (m_cs->io_pending & CS_WANT_READ)
-		    mask |= YAZ_SOCKET_OBSERVE_READ;
-	        yaz_log(m_log, "maskObserver 3");
-		m_socketObservable->maskObserver(this, mask);
-	    }
-	    else
-	    {
-		m_state = Ready;
-		if (m_PDU_Observer)
-		    m_PDU_Observer->connectNotify();
-		flush_PDU();
-	    }
-	}
-	break;
-    case Listen:
-	if (event & YAZ_SOCKET_OBSERVE_READ)
-	{
-	    int res;
-	    COMSTACK new_line;
-	    
-	    if ((res = cs_listen(m_cs, 0, 0)) == 1)
-		return;
-	    if (res < 0)
-	    {
-		yaz_log(LOG_FATAL|LOG_ERRNO, "cs_listen failed");
-		return;
-	    }
-	    if (!(new_line = cs_accept(m_cs)))
-		return;
-	    /* 1. create socket-manager 
+    case PDU_Assoc_priv::Accepting:
+        if (!cs_accept(m_p->cs))
+        {
+            yaz_log(m_p->log, "PDU_Assoc::cs_accept failed");
+            m_p->cs = 0;
+            shutdown();
+            m_PDU_Observer->failNotify();
+        }
+        else
+        {
+            unsigned mask = 0;
+            if (m_p->cs->io_pending & CS_WANT_WRITE)
+                mask |= SOCKET_OBSERVE_WRITE;
+            if (m_p->cs->io_pending & CS_WANT_READ)
+                mask |= SOCKET_OBSERVE_READ;
+            if (!mask)
+            {   // accept is complete. turn to ready state and write if needed
+                m_p->state = PDU_Assoc_priv::Ready;
+                flush_PDU();
+            }
+            else
+            {   // accept still incomplete.
+                yaz_log(m_p->log, "maskObserver 2");
+                m_p->m_socketObservable->maskObserver(this,
+                                             mask|SOCKET_OBSERVE_EXCEPT);
+            }
+        }
+        break;
+    case PDU_Assoc_priv::Connecting:
+        if (event & SOCKET_OBSERVE_READ &&
+            event & SOCKET_OBSERVE_WRITE)
+        {
+            // For Unix: if both read and write is set, then connect failed.
+            shutdown();
+            m_PDU_Observer->failNotify();
+        }
+        else
+        {
+            yaz_log(m_p->log, "cs_rcvconnect");
+            int res = cs_rcvconnect(m_p->cs);
+            if (res == 1)
+            {
+                unsigned mask = SOCKET_OBSERVE_EXCEPT;
+                if (m_p->cs->io_pending & CS_WANT_WRITE)
+                    mask |= SOCKET_OBSERVE_WRITE;
+                if (m_p->cs->io_pending & CS_WANT_READ)
+                    mask |= SOCKET_OBSERVE_READ;
+                yaz_log(m_p->log, "maskObserver 3");
+                m_p->m_socketObservable->maskObserver(this, mask);
+            }
+            else
+            {
+                m_p->state = PDU_Assoc_priv::Ready;
+                if (m_PDU_Observer)
+                    m_PDU_Observer->connectNotify();
+                flush_PDU();
+            }
+        }
+        break;
+    case PDU_Assoc_priv::Listen:
+        if (event & SOCKET_OBSERVE_READ)
+        {
+            int res;
+            COMSTACK new_line;
+
+            if ((res = cs_listen(m_p->cs, 0, 0)) == 1)
+                return;
+            if (res < 0)
+            {
+                yaz_log(YLOG_FATAL|YLOG_ERRNO, "cs_listen failed");
+                return;
+            }
+            if (!(new_line = cs_accept(m_p->cs)))
+                return;
+            /* 1. create socket-manager
                2. create pdu-assoc
                3. create top-level object
                     setup observer for child fileid in pdu-assoc
                4. start thread
-	    */
-	    yaz_log (m_log, "new session: parent fd=%d child fd=%d",
-		     cs_fileno(m_cs), cs_fileno(new_line));
-	    childNotify (new_line);
-	}
-	break;
-    case Writing:
-        if (event & (YAZ_SOCKET_OBSERVE_READ|YAZ_SOCKET_OBSERVE_WRITE))
+            */
+            yaz_log(m_p->log, "new session: parent fd=%d child fd=%d",
+                    cs_fileno(m_p->cs), cs_fileno(new_line));
+            childNotify(new_line);
+        }
+        break;
+    case PDU_Assoc_priv::Writing:
+        if (event & (SOCKET_OBSERVE_READ|SOCKET_OBSERVE_WRITE))
             flush_PDU();
         break;
-    case Ready:
-	if (event & (YAZ_SOCKET_OBSERVE_READ|YAZ_SOCKET_OBSERVE_WRITE))
-	{
-	    do
-	    {
-		int res = cs_get (m_cs, &m_input_buf, &m_input_len);
-		if (res == 1)
+    case PDU_Assoc_priv::Ready:
+        if (event & (SOCKET_OBSERVE_READ|SOCKET_OBSERVE_WRITE))
+        {
+            do
+            {
+                int res = cs_get(m_p->cs, &m_p->input_buf, &m_p->input_len);
+                if (res == 1)
                 {
-                    unsigned mask = YAZ_SOCKET_OBSERVE_EXCEPT;
-                    if (m_cs->io_pending & CS_WANT_WRITE)
-                        mask |= YAZ_SOCKET_OBSERVE_WRITE;
-                    if (m_cs->io_pending & CS_WANT_READ)
-                        mask |= YAZ_SOCKET_OBSERVE_READ;
-	            yaz_log(m_log, "maskObserver 4");
-		    m_socketObservable->maskObserver(this, mask);
-		    return;
+                    unsigned mask = SOCKET_OBSERVE_EXCEPT;
+                    if (m_p->cs->io_pending & CS_WANT_WRITE)
+                        mask |= SOCKET_OBSERVE_WRITE;
+                    if (m_p->cs->io_pending & CS_WANT_READ)
+                        mask |= SOCKET_OBSERVE_READ;
+                    yaz_log(m_p->log, "maskObserver 4");
+                    m_p->m_socketObservable->maskObserver(this, mask);
+                    return;
                 }
-		else if (res <= 0)
-		{
-		    yaz_log (m_log, "Yaz_PDU_Assoc::Connection closed by peer");
-		    close();
-		    if (m_PDU_Observer)
-			m_PDU_Observer->failNotify(); // problem here..
-		    return;
-		}
-		// lock it, so we know if recv_PDU deletes it.
-		int destroyed = 0;
-		m_destroyed = &destroyed;
-
-		if (!m_PDU_Observer)
-		    return;
-
-		m_PDU_Observer->recv_PDU(m_input_buf, res);
-                m_destroyed = 0;
-		if (destroyed)   // it really was destroyed, return now.
-		    return;
-	    } while (m_cs && cs_more (m_cs));
-	    if (m_cs && m_state == Ready)
+                else if (res <= 0)
+                {
+                    yaz_log(m_p->log, "PDU_Assoc::Connection closed by peer");
+                    shutdown();
+                    if (m_PDU_Observer)
+                        m_PDU_Observer->failNotify(); // problem here..
+                    return;
+                }
+                // lock it, so we know if recv_PDU deletes it.
+                int destroyed = 0;
+                m_p->destroyed = &destroyed;
+
+                if (!m_PDU_Observer)
+                    return;
+#if 0
+                PDU_Assoc_priv::PDU_Queue **pq = &m_p->m_queue_in;
+                while (*pq)
+                    pq = &(*pq)->m_next;
+
+                *pq = new PDU_Assoc_priv::PDU_Queue(m_p->m_input_buf, res);
+#else
+                m_PDU_Observer->recv_PDU(m_p->input_buf, res);
+#endif
+                if (destroyed)   // it really was destroyed, return now.
+                    return;
+                m_p->destroyed = 0;
+            } while (m_p->cs && cs_more(m_p->cs));
+            if (m_p->cs && m_p->state == PDU_Assoc_priv::Ready)
             {
-	        yaz_log(m_log, "maskObserver 5");
-		m_socketObservable->maskObserver(this,
-						 YAZ_SOCKET_OBSERVE_EXCEPT|
-						 YAZ_SOCKET_OBSERVE_READ);
-	    }
-	}
-	break;
-    case Closed:
-	yaz_log (m_log, "CLOSING state=%d event was %d", m_state, event);
-	close();
-	m_PDU_Observer->failNotify();
-	break;
+                yaz_log(m_p->log, "maskObserver 5");
+                m_p->m_socketObservable->maskObserver(this,
+                                                      SOCKET_OBSERVE_EXCEPT|
+                                                      SOCKET_OBSERVE_READ);
+            }
+        }
+        break;
+    case PDU_Assoc_priv::Closed:
+        yaz_log(m_p->log, "CLOSING state=%d event was %d", m_p->state,
+                event);
+        shutdown();
+        m_PDU_Observer->failNotify();
+        break;
     default:
-	yaz_log (m_log, "Unknown state=%d event was %d", m_state, event);
-	close();
-	m_PDU_Observer->failNotify();
+        yaz_log(m_p->log, "Unknown state=%d event was %d", m_p->state, event);
+        shutdown();
+        m_PDU_Observer->failNotify();
+    }
+}
+
+void PDU_Assoc::close_session()
+{
+    m_p->m_session_is_dead = true;
+    if (!m_p->queue_out)
+    {
+        shutdown();
+        m_PDU_Observer->failNotify();
     }
 }
 
-void Yaz_PDU_Assoc::close()
+void PDU_Assoc::shutdown()
 {
-    Yaz_PDU_Assoc *ch;
-    for (ch = m_children; ch; ch = ch->m_next)
-	ch->close();
+    PDU_Assoc *ch;
+    for (ch = m_p->pdu_children; ch; ch = ch->m_p->pdu_next)
+        ch->shutdown();
 
-    m_socketObservable->deleteObserver(this);
-    m_state = Closed;
-    if (m_cs)
+    m_p->m_socketObservable->deleteObserver(this);
+    m_p->state = PDU_Assoc_priv::Closed;
+    if (m_p->cs)
     {
-	yaz_log (m_log, "Yaz_PDU_Assoc::close fd=%d", cs_fileno(m_cs));
-	cs_close (m_cs);
+        yaz_log(m_p->log, "PDU_Assoc::close fd=%d", cs_fileno(m_p->cs));
+        cs_close(m_p->cs);
     }
-    m_cs = 0;
-    while (m_queue_out)
+    m_p->cs = 0;
+    while (m_p->queue_out)
     {
-	PDU_Queue *q_this = m_queue_out;
-	m_queue_out = m_queue_out->m_next;
-	delete q_this;
+        PDU_Assoc_priv::PDU_Queue *q_this = m_p->queue_out;
+        m_p->queue_out = m_p->queue_out->m_next;
+        delete q_this;
     }
-    xfree (m_input_buf);
-    m_input_buf = 0;
-    m_input_len = 0;
+    xfree(m_p->input_buf);
+    m_p->input_buf = 0;
+    m_p->input_len = 0;
 }
 
-void Yaz_PDU_Assoc::destroy()
+void PDU_Assoc::destroy()
 {
-    close();
+    shutdown();
 
-    if (m_destroyed)
-	*m_destroyed = 1;
-    Yaz_PDU_Assoc **c;
+    if (m_p->destroyed)
+        *m_p->destroyed = 1;
+    PDU_Assoc **c;
 
     // delete from parent's child list (if any)
-    if (m_parent)
+    if (m_p->pdu_parent)
     {
-	c = &m_parent->m_children;
-	while (*c != this)
-	{
-	    assert (*c);
-	    c = &(*c)->m_next;
-	}
-	*c = (*c)->m_next;
+        c = &m_p->pdu_parent->m_p->pdu_children;
+        while (*c != this)
+        {
+            assert (*c);
+            c = &(*c)->m_p->pdu_next;
+        }
+        *c = (*c)->m_p->pdu_next;
     }
     // delete all children ...
-    c = &m_children;
+    c = &m_p->pdu_children;
     while (*c)
     {
-	Yaz_PDU_Assoc *here = *c;
-	*c = (*c)->m_next;
-	here->m_parent = 0;
-	delete here;
+        PDU_Assoc *here = *c;
+        *c = (*c)->m_p->pdu_next;
+        here->m_p->pdu_parent = 0;
+        delete here;
     }
-    yaz_log (m_log, "Yaz_PDU_Assoc::destroy this=%p", this);
+    yaz_log(m_p->log, "PDU_Assoc::destroy this=%p", this);
 }
 
-Yaz_PDU_Assoc::PDU_Queue::PDU_Queue(const char *buf, int len)
+PDU_Assoc_priv::PDU_Queue::PDU_Queue(const char *buf, int len)
 {
-    m_buf = (char *) xmalloc (len);
-    memcpy (m_buf, buf, len);
+    m_buf = (char *) xmalloc(len);
+    memcpy(m_buf, buf, len);
     m_len = len;
     m_next = 0;
 }
 
-Yaz_PDU_Assoc::PDU_Queue::~PDU_Queue()
+PDU_Assoc_priv::PDU_Queue::~PDU_Queue()
 {
-    xfree (m_buf);
+    xfree(m_buf);
 }
 
-int Yaz_PDU_Assoc::flush_PDU()
+int PDU_Assoc::flush_PDU()
 {
     int r;
-    
-    if (m_state != Ready && m_state != Writing)
+
+    if (m_p->state != PDU_Assoc_priv::Ready && m_p->state != PDU_Assoc_priv::Writing)
     {
-        yaz_log (m_log, "YAZ_PDU_Assoc::flush_PDU, not ready");
-	return 1;
+        yaz_log(m_p->log, "YAZ_PDU_Assoc::flush_PDU, not ready");
+        return 1;
     }
-    PDU_Queue *q = m_queue_out;
+    PDU_Assoc_priv::PDU_Queue *q = m_p->queue_out;
     if (!q)
     {
-	m_state = Ready;
-	yaz_log (m_log, "YAZ_PDU_Assoc::flush_PDU queue empty");
-	yaz_log(m_log, "maskObserver 6");
-	m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
-					 YAZ_SOCKET_OBSERVE_WRITE|
-					 YAZ_SOCKET_OBSERVE_EXCEPT);
+        m_p->state = PDU_Assoc_priv::Ready;
+        yaz_log(m_p->log, "YAZ_PDU_Assoc::flush_PDU queue empty");
+        yaz_log(m_p->log, "maskObserver 6");
+        m_p->m_socketObservable->maskObserver(this, SOCKET_OBSERVE_READ|
+                                              SOCKET_OBSERVE_WRITE|
+                                              SOCKET_OBSERVE_EXCEPT);
+        if (m_p->m_session_is_dead)
+        {
+            shutdown();
+            m_PDU_Observer->failNotify();
+        }
         return 0;
     }
-    r = cs_put (m_cs, q->m_buf, q->m_len);
+    r = cs_put(m_p->cs, q->m_buf, q->m_len);
     if (r < 0)
     {
-        yaz_log (m_log, "Yaz_PDU_Assoc::flush_PDU cs_put failed");
-        close();
-	m_PDU_Observer->failNotify();
+        yaz_log(m_p->log, "PDU_Assoc::flush_PDU cs_put failed");
+        shutdown();
+        m_PDU_Observer->failNotify();
         return r;
     }
     if (r == 1)
     {
-        unsigned mask = YAZ_SOCKET_OBSERVE_EXCEPT;
-        m_state = Writing;
-        if (m_cs->io_pending & CS_WANT_WRITE)
-            mask |= YAZ_SOCKET_OBSERVE_WRITE;
-        if (m_cs->io_pending & CS_WANT_READ)
-            mask |= YAZ_SOCKET_OBSERVE_READ;
-
-	mask |= YAZ_SOCKET_OBSERVE_WRITE;
-	yaz_log(m_log, "maskObserver 7");
-	m_socketObservable->maskObserver(this, mask);
-        yaz_log (m_log, "Yaz_PDU_Assoc::flush_PDU cs_put %d bytes fd=%d (inc)",
-		 q->m_len, cs_fileno(m_cs));
+        unsigned mask = SOCKET_OBSERVE_EXCEPT;
+        m_p->state = PDU_Assoc_priv::Writing;
+        if (m_p->cs->io_pending & CS_WANT_WRITE)
+            mask |= SOCKET_OBSERVE_WRITE;
+        if (m_p->cs->io_pending & CS_WANT_READ)
+            mask |= SOCKET_OBSERVE_READ;
+
+        mask |= SOCKET_OBSERVE_WRITE;
+        yaz_log(m_p->log, "maskObserver 7");
+        m_p->m_socketObservable->maskObserver(this, mask);
+        yaz_log(m_p->log, "PDU_Assoc::flush_PDU cs_put %d bytes fd=%d (inc)",
+                q->m_len, cs_fileno(m_p->cs));
         return r;
-    } 
-    yaz_log (m_log, "Yaz_PDU_Assoc::flush_PDU cs_put %d bytes", q->m_len);
+    }
+    yaz_log(m_p->log, "PDU_Assoc::flush_PDU cs_put %d bytes", q->m_len);
     // whole packet sent... delete this and proceed to next ...
-    m_queue_out = q->m_next;
+    m_p->queue_out = q->m_next;
     delete q;
     // don't select on write if queue is empty ...
-    if (!m_queue_out)
+    if (!m_p->queue_out)
     {
-        m_state = Ready;
-	yaz_log(m_log, "maskObserver 8");
-	m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
-					 YAZ_SOCKET_OBSERVE_EXCEPT);
+        m_p->state = PDU_Assoc_priv::Ready;
+        yaz_log(m_p->log, "maskObserver 8");
+        m_p->m_socketObservable->maskObserver(this, SOCKET_OBSERVE_READ|
+                                              SOCKET_OBSERVE_EXCEPT);
+        if (m_p->m_session_is_dead)
+            shutdown();
     }
     return r;
 }
 
-int Yaz_PDU_Assoc::send_PDU(const char *buf, int len)
+int PDU_Assoc::send_PDU(const char *buf, int len)
 {
-    yaz_log (m_log, "Yaz_PDU_Assoc::send_PDU");
-    PDU_Queue **pq = &m_queue_out;
+    yaz_log(m_p->log, "PDU_Assoc::send_PDU");
+    PDU_Assoc_priv::PDU_Queue **pq = &m_p->queue_out;
     int is_idle = (*pq ? 0 : 1);
-    
-    if (!m_cs)
+
+    if (!m_p->cs)
     {
-	yaz_log (m_log, "Yaz_PDU_Assoc::send_PDU failed, m_cs == 0");
+        yaz_log(m_p->log, "PDU_Assoc::send_PDU failed, cs == 0");
         return -1;
     }
     while (*pq)
         pq = &(*pq)->m_next;
-    *pq = new PDU_Queue(buf, len);
+    *pq = new PDU_Assoc_priv::PDU_Queue(buf, len);
     if (is_idle)
-        return flush_PDU ();
+        return flush_PDU();
     else
-	yaz_log (m_log, "Yaz_PDU_Assoc::cannot send_PDU fd=%d",
-		 cs_fileno(m_cs));
+        yaz_log(m_p->log, "PDU_Assoc::cannot send_PDU fd=%d",
+                cs_fileno(m_p->cs));
     return 0;
 }
 
-COMSTACK Yaz_PDU_Assoc::comstack(const char *type_and_host, void **vp)
+COMSTACK PDU_Assoc_priv::comstack(const char *type_and_host, void **vp)
 {
     return cs_create_host(type_and_host, 2, vp);
 }
 
-void Yaz_PDU_Assoc::listen(IYaz_PDU_Observer *observer,
-			   const char *addr)
+int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
 {
-    close();
+    if (*addr == '\0')
+    {
+        m_p->m_socketObservable->deleteObserver(this);
+        m_p->state = PDU_Assoc_priv::Closed;
+        if (m_p->cs)
+        {
+            yaz_log(m_p->log, "PDU_Assoc::close fd=%d", cs_fileno(m_p->cs));
+            cs_close(m_p->cs);
+        }
+        m_p->cs = 0;
+        while (m_p->queue_out)
+        {
+            PDU_Assoc_priv::PDU_Queue *q_this = m_p->queue_out;
+            m_p->queue_out = m_p->queue_out->m_next;
+            delete q_this;
+        }
+        xfree(m_p->input_buf);
+        m_p->input_buf = 0;
+        m_p->input_len = 0;
+
+        return 0;
+    }
 
-    yaz_log (LOG_LOG, "Adding listener %s", addr);
+    shutdown();
 
     m_PDU_Observer = observer;
     void *ap;
-    m_cs = comstack(addr, &ap);
+    m_p->cs = m_p->comstack(addr, &ap);
 
-    if (!m_cs)
-        return;
-    if (cs_bind(m_cs, ap, CS_SERVER) < 0)
-        return;
-    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;
+    if (!m_p->cs)
+        return -1;
+    if (cs_bind(m_p->cs, ap, CS_SERVER) < 0)
+        return -2;
+
+    int fd = cs_fileno(m_p->cs);
+#if HAVE_FCNTL_H
+    int oldflags = fcntl(fd, F_GETFD, 0);
+    if (oldflags >= 0)
+    {
+        oldflags |= FD_CLOEXEC;
+        fcntl(fd, F_SETFD, oldflags);
+    }
+#endif
+    m_p->m_socketObservable->addObserver(fd, this);
+    yaz_log(m_p->log, "maskObserver 9");
+    m_p->m_socketObservable->maskObserver(this, SOCKET_OBSERVE_READ|
+                                          SOCKET_OBSERVE_EXCEPT);
+    yaz_log(m_p->log, "PDU_Assoc::listen ok fd=%d", fd);
+    m_p->state = PDU_Assoc_priv::Listen;
+    return 0;
 }
 
-void Yaz_PDU_Assoc::idleTime(int idleTime)
+COMSTACK PDU_Assoc::get_comstack()
 {
-    m_idleTime = idleTime;
-    yaz_log (m_log, "Yaz_PDU_Assoc::idleTime(%d)", idleTime);
-    m_socketObservable->timeoutObserver(this, m_idleTime);
+    return m_p->cs;
 }
 
-int Yaz_PDU_Assoc::connect(IYaz_PDU_Observer *observer,
-			    const char *addr)
+void PDU_Assoc::idleTime(int idleTime)
 {
-    yaz_log (m_log, "Yaz_PDU_Assoc::connect %s", addr);
-    close();
+    m_p->idleTime = idleTime;
+    yaz_log(m_p->log, "PDU_Assoc::idleTime(%d)", idleTime);
+    m_p->m_socketObservable->timeoutObserver(this, m_p->idleTime);
+}
+
+int PDU_Assoc::connect(IPDU_Observer *observer, const char *addr)
+{
+    yaz_log(m_p->log, "PDU_Assoc::connect %s", addr);
+    shutdown();
     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);
+    m_p->cs = m_p->comstack(addr, &ap);
+    if (!m_p->cs)
+        return -1;
+    int res = cs_connect(m_p->cs, ap);
+    yaz_log(m_p->log, "PDU_Assoc::connect fd=%d res=%d", cs_fileno(m_p->cs),
+            res);
+    m_p->m_socketObservable->addObserver(cs_fileno(m_p->cs), this);
 
     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);
+        m_p->state = PDU_Assoc_priv::Connecting;
+        unsigned mask = SOCKET_OBSERVE_EXCEPT;
+        mask |= SOCKET_OBSERVE_WRITE;
+        mask |= SOCKET_OBSERVE_READ;
+        yaz_log(m_p->log, "maskObserver 11");
+        m_p->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)
-	    mask |= YAZ_SOCKET_OBSERVE_WRITE;
-	if (m_cs->io_pending & CS_WANT_READ)
-	    mask |= YAZ_SOCKET_OBSERVE_READ;
-	yaz_log(m_log, "maskObserver 11");
-	m_socketObservable->maskObserver(this, mask);
+        m_p->state = PDU_Assoc_priv::Connecting;
+        unsigned mask = SOCKET_OBSERVE_EXCEPT;
+        if (m_p->cs->io_pending & CS_WANT_WRITE)
+            mask |= SOCKET_OBSERVE_WRITE;
+        if (m_p->cs->io_pending & CS_WANT_READ)
+            mask |= SOCKET_OBSERVE_READ;
+        yaz_log(m_p->log, "maskObserver 11");
+        m_p->m_socketObservable->maskObserver(this, mask);
     }
     else
     {   // Connect failed immediately
-	// Since m_state is Closed we can distinguish this case from
+        // Since m_state is Closed we can distinguish this case from
         // normal connect in socketNotify handler
-	yaz_log(m_log, "maskObserver 12");
-	m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_WRITE|
-					 YAZ_SOCKET_OBSERVE_EXCEPT);
+        yaz_log(m_p->log, "maskObserver 12");
+        m_p->m_socketObservable->maskObserver(this, SOCKET_OBSERVE_WRITE|
+                                              SOCKET_OBSERVE_EXCEPT);
     }
     return 0;
 }
 
 // Single-threaded... Only useful for non-blocking handlers
-void Yaz_PDU_Assoc::childNotify(COMSTACK cs)
+void PDU_Assoc::childNotify(COMSTACK cs)
 {
-    Yaz_PDU_Assoc *new_observable =
-	new Yaz_PDU_Assoc (m_socketObservable, cs);
-    
-    new_observable->m_next = m_children;
-    m_children = new_observable;
-    new_observable->m_parent = this;
+    PDU_Assoc *new_observable =
+        new PDU_Assoc(m_p->m_socketObservable, cs);
 
     // Clone PDU Observer
     new_observable->m_PDU_Observer = m_PDU_Observer->sessionNotify
-	(new_observable, cs_fileno(cs));
+        (new_observable, cs_fileno(cs));
+
+    if (!new_observable->m_PDU_Observer)
+    {
+        new_observable->shutdown();
+        delete new_observable;
+        return;
+    }
+    new_observable->m_p->pdu_next = m_p->pdu_children;
+    m_p->pdu_children = new_observable;
+    new_observable->m_p->pdu_parent = this;
 }
 
-const char*Yaz_PDU_Assoc::getpeername()
+const char*PDU_Assoc::getpeername()
 {
-    return cs_addrstr(m_cs);
+    if (!m_p->cs)
+        return 0;
+    return cs_addrstr(m_p->cs);
 }
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
+ * indent-tabs-mode: nil
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */
+