* Copyright (c) 1998-2004, Index Data.
* See the file LICENSE for details.
*
- * $Id: yaz-pdu-assoc.cpp,v 1.44 2005-09-23 13:11:04 adam Exp $
+ * $Id: yaz-pdu-assoc.cpp,v 1.47 2008-01-21 15:57:27 adam Exp $
*/
#include <assert.h>
#include <yaz/log.h>
#include <yaz/tcpip.h>
-#include <yaz++/pdu-assoc.h>
+#include <yazpp/pdu-assoc.h>
using namespace yazpp_1;
m_destroyed = 0;
m_idleTime = 0;
m_log = YLOG_DEBUG;
+ m_session_is_dead = false;
}
PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable)
this, m_state, event);
if (event & SOCKET_OBSERVE_EXCEPT)
{
- close();
+ shutdown();
m_PDU_Observer->failNotify();
return;
}
{
yaz_log (m_log, "PDU_Assoc::cs_accept failed");
m_cs = 0;
- close();
+ shutdown();
m_PDU_Observer->failNotify();
}
else
event & SOCKET_OBSERVE_WRITE)
{
// For Unix: if both read and write is set, then connect failed.
- close();
+ shutdown();
m_PDU_Observer->failNotify();
}
else
else if (res <= 0)
{
yaz_log (m_log, "PDU_Assoc::Connection closed by peer");
- close();
+ shutdown();
if (m_PDU_Observer)
m_PDU_Observer->failNotify(); // problem here..
return;
break;
case Closed:
yaz_log (m_log, "CLOSING state=%d event was %d", m_state, event);
- close();
+ shutdown();
m_PDU_Observer->failNotify();
break;
default:
yaz_log (m_log, "Unknown state=%d event was %d", m_state, event);
- close();
+ shutdown();
m_PDU_Observer->failNotify();
}
}
-void PDU_Assoc::close()
+void PDU_Assoc::close_session()
+{
+ m_session_is_dead = true;
+ if (!m_queue_out)
+ {
+ shutdown();
+ m_PDU_Observer->failNotify();
+ }
+}
+
+void PDU_Assoc::shutdown()
{
PDU_Assoc *ch;
for (ch = m_children; ch; ch = ch->m_next)
- ch->close();
+ ch->shutdown();
m_socketObservable->deleteObserver(this);
m_state = Closed;
void PDU_Assoc::destroy()
{
- close();
+ shutdown();
if (m_destroyed)
*m_destroyed = 1;
m_socketObservable->maskObserver(this, SOCKET_OBSERVE_READ|
SOCKET_OBSERVE_WRITE|
SOCKET_OBSERVE_EXCEPT);
+ if (m_session_is_dead)
+ {
+ shutdown();
+ m_PDU_Observer->failNotify();
+ }
return 0;
}
r = cs_put (m_cs, q->m_buf, q->m_len);
if (r < 0)
{
yaz_log (m_log, "PDU_Assoc::flush_PDU cs_put failed");
- close();
+ shutdown();
m_PDU_Observer->failNotify();
return r;
}
int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
{
- close();
+ shutdown();
m_PDU_Observer = observer;
void *ap;
int PDU_Assoc::connect(IPDU_Observer *observer, const char *addr)
{
yaz_log (m_log, "PDU_Assoc::connect %s", addr);
- close();
+ shutdown();
m_PDU_Observer = observer;
void *ap;
m_cs = comstack(addr, &ap);
PDU_Assoc *new_observable =
new PDU_Assoc (m_socketObservable, cs);
- new_observable->m_next = m_children;
- m_children = new_observable;
- new_observable->m_parent = this;
-
// Clone PDU Observer
new_observable->m_PDU_Observer = m_PDU_Observer->sessionNotify
(new_observable, cs_fileno(cs));
+
+ if (!new_observable->m_PDU_Observer)
+ {
+ new_observable->shutdown();
+ delete new_observable;
+ return;
+ }
+ new_observable->m_next = m_children;
+ m_children = new_observable;
+ new_observable->m_parent = this;
}
const char*PDU_Assoc::getpeername()