projects
/
yazpp-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
5a41980
..
2d17f11
100644
(file)
--- a/
src/yaz-pdu-assoc.cpp
+++ b/
src/yaz-pdu-assoc.cpp
@@
-1,8
+1,6
@@
-/*
- * Copyright (c) 1998-2004, Index Data.
+/* This file is part of the yazpp toolkit.
+ * Copyright (C) 1998-2011 Index Data and Mike Taylor
* See the file LICENSE for details.
* See the file LICENSE for details.
- *
- * $Id: yaz-pdu-assoc.cpp,v 1.43 2005-06-25 15:53:19 adam Exp $
*/
#include <assert.h>
*/
#include <assert.h>
@@
-10,7
+8,11
@@
#include <yaz/log.h>
#include <yaz/tcpip.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;
using namespace yazpp_1;
@@
-30,6
+32,7
@@
void PDU_Assoc::init(ISocketObservable *socketObservable)
m_destroyed = 0;
m_idleTime = 0;
m_log = YLOG_DEBUG;
m_destroyed = 0;
m_idleTime = 0;
m_log = YLOG_DEBUG;
+ m_session_is_dead = false;
}
PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable)
}
PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable)
@@
-38,7
+41,7
@@
PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable)
}
PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable,
}
PDU_Assoc::PDU_Assoc(ISocketObservable *socketObservable,
- COMSTACK cs)
+ COMSTACK cs)
{
init(socketObservable);
m_cs = cs;
{
init(socketObservable);
m_cs = cs;
@@
-79,7
+82,7
@@
void PDU_Assoc::socketNotify(int event)
this, m_state, event);
if (event & SOCKET_OBSERVE_EXCEPT)
{
this, m_state, event);
if (event & SOCKET_OBSERVE_EXCEPT)
{
- close();
+ shutdown();
m_PDU_Observer->failNotify();
return;
}
m_PDU_Observer->failNotify();
return;
}
@@
-95,7
+98,7
@@
void PDU_Assoc::socketNotify(int event)
{
yaz_log (m_log, "PDU_Assoc::cs_accept failed");
m_cs = 0;
{
yaz_log (m_log, "PDU_Assoc::cs_accept failed");
m_cs = 0;
- close();
+ shutdown();
m_PDU_Observer->failNotify();
}
else
m_PDU_Observer->failNotify();
}
else
@@
-123,7
+126,7
@@
void PDU_Assoc::socketNotify(int event)
event & SOCKET_OBSERVE_WRITE)
{
// For Unix: if both read and write is set, then connect failed.
event & SOCKET_OBSERVE_WRITE)
{
// For Unix: if both read and write is set, then connect failed.
- close();
+ shutdown();
m_PDU_Observer->failNotify();
}
else
m_PDU_Observer->failNotify();
}
else
@@
-199,7
+202,7
@@
void PDU_Assoc::socketNotify(int event)
else if (res <= 0)
{
yaz_log (m_log, "PDU_Assoc::Connection closed by peer");
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;
if (m_PDU_Observer)
m_PDU_Observer->failNotify(); // problem here..
return;
@@
-234,21
+237,31
@@
void PDU_Assoc::socketNotify(int event)
break;
case Closed:
yaz_log (m_log, "CLOSING state=%d event was %d", m_state, event);
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);
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();
}
}
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)
{
PDU_Assoc *ch;
for (ch = m_children; ch; ch = ch->m_next)
- ch->close();
+ ch->shutdown();
m_socketObservable->deleteObserver(this);
m_state = Closed;
m_socketObservable->deleteObserver(this);
m_state = Closed;
@@
-271,7
+284,7
@@
void PDU_Assoc::close()
void PDU_Assoc::destroy()
{
void PDU_Assoc::destroy()
{
- close();
+ shutdown();
if (m_destroyed)
*m_destroyed = 1;
if (m_destroyed)
*m_destroyed = 1;
@@
-331,13
+344,18
@@
int PDU_Assoc::flush_PDU()
m_socketObservable->maskObserver(this, SOCKET_OBSERVE_READ|
SOCKET_OBSERVE_WRITE|
SOCKET_OBSERVE_EXCEPT);
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");
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;
}
m_PDU_Observer->failNotify();
return r;
}
@@
-401,7
+419,7
@@
COMSTACK PDU_Assoc::comstack(const char *type_and_host, void **vp)
int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
{
int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
{
- close();
+ shutdown();
m_PDU_Observer = observer;
void *ap;
m_PDU_Observer = observer;
void *ap;
@@
-411,11
+429,21
@@
int PDU_Assoc::listen(IPDU_Observer *observer, const char *addr)
return -1;
if (cs_bind(m_cs, ap, CS_SERVER) < 0)
return -2;
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, "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;
}
m_state = Listen;
return 0;
}
@@
-430,7
+458,7
@@
void PDU_Assoc::idleTime(int idleTime)
int PDU_Assoc::connect(IPDU_Observer *observer, const char *addr)
{
yaz_log (m_log, "PDU_Assoc::connect %s", addr);
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);
m_PDU_Observer = observer;
void *ap;
m_cs = comstack(addr, &ap);
@@
-478,13
+506,19
@@
void PDU_Assoc::childNotify(COMSTACK cs)
PDU_Assoc *new_observable =
new PDU_Assoc (m_socketObservable, cs);
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));
// 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()
}
const char*PDU_Assoc::getpeername()
@@
-496,6
+530,7
@@
const char*PDU_Assoc::getpeername()
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab