Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/yazpp

[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 73bd0a8..ded89bd 100644 (file)
--- a/src/yaz-pdu-assoc.cpp
+++ b/src/yaz-pdu-assoc.cpp
@@ -1,10 +1,11 @@
-/*
- * Copyright (c) 1998-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2012 Index Data and Mike Taylor
  * See the file LICENSE for details.
- * 
- * $Id: yaz-pdu-assoc.cpp,v 1.47 2008-01-21 15:57:27 adam Exp $
  */
 
+#if HAVE_CONFIG_H
+#include <config.h>
+#endif
 #include <assert.h>
 #include <string.h>
 #include <yaz/log.h>
@@ -12,6 +13,10 @@
 
 #include <yazpp/pdu-assoc.h>
 
+#if HAVE_FCNTL_H
+#include <fcntl.h>
+#endif
+
 using namespace yazpp_1;
 
 void PDU_Assoc::init(ISocketObservable *socketObservable)
@@ -384,6 +389,8 @@ int PDU_Assoc::flush_PDU()
         yaz_log(m_log, "maskObserver 8");
         m_socketObservable->maskObserver(this, SOCKET_OBSERVE_READ|
                                          SOCKET_OBSERVE_EXCEPT);
+        if (m_session_is_dead)
+            shutdown();
     }
     return r;
 }
@@ -417,6 +424,29 @@ COMSTACK PDU_Assoc::comstack(const char *type_and_host, void **vp)
 
 int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
 {
+    if (*addr == '\0')
+    {
+        m_socketObservable->deleteObserver(this);
+        m_state = Closed;
+        if (m_cs)
+        {
+            yaz_log (m_log, "PDU_Assoc::close fd=%d", cs_fileno(m_cs));
+            cs_close (m_cs);
+        }
+        m_cs = 0;
+        while (m_queue_out)
+        {
+            PDU_Queue *q_this = m_queue_out;
+            m_queue_out = m_queue_out->m_next;
+            delete q_this;
+        }
+        xfree (m_input_buf);
+        m_input_buf = 0;
+        m_input_len = 0;
+        
+        return 0;
+    }
+
     shutdown();
 
     m_PDU_Observer = observer;
@@ -427,11 +457,21 @@ int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
         return -1;
     if (cs_bind(m_cs, ap, CS_SERVER) < 0)
         return -2;
-    m_socketObservable->addObserver(cs_fileno(m_cs), this);
+
+    int fd = cs_fileno(m_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_socketObservable->addObserver(fd, this);
     yaz_log(m_log, "maskObserver 9");
     m_socketObservable->maskObserver(this, SOCKET_OBSERVE_READ|
                                      SOCKET_OBSERVE_EXCEPT);
-    yaz_log (m_log, "PDU_Assoc::listen ok fd=%d", cs_fileno(m_cs));
+    yaz_log (m_log, "PDU_Assoc::listen ok fd=%d", fd);
     m_state = Listen;
     return 0;
 }
@@ -518,6 +558,7 @@ const char*PDU_Assoc::getpeername()
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab