/*
- * Copyright (c) 1998-1999, Index Data.
+ * Copyright (c) 1998-2001, Index Data.
* See the file LICENSE for details.
- * Sebastian Hammer, Adam Dickmeiss
*
- * $Log: yaz-pdu-assoc.cpp,v $
- * Revision 1.9 1999-12-06 13:52:45 adam
- * Modified for new location of YAZ header files. Experimental threaded
- * operation.
- *
- * Revision 1.8 1999/04/28 13:04:03 adam
- * Fixed setting of proxy otherInfo so that database(s) are removed.
- *
- * Revision 1.7 1999/04/21 12:09:01 adam
- * Many improvements. Modified to proxy server to work with "sessions"
- * based on cookies.
- *
- * Revision 1.6 1999/04/20 10:30:05 adam
- * Implemented various stuff for client and proxy. Updated calls
- * to ODR to reflect new name parameter.
- *
- * Revision 1.5 1999/04/09 11:46:57 adam
- * Added object Yaz_Z_Assoc. Much more functional client.
- *
- * Revision 1.4 1999/03/23 14:17:57 adam
- * More work on timeout handling. Work on yaz-client.
- *
- * Revision 1.3 1999/02/02 14:01:20 adam
- * First WIN32 port of YAZ++.
- *
- * Revision 1.2 1999/01/28 13:08:44 adam
- * Yaz_PDU_Assoc better encapsulated. Memory leak fix in
- * yaz-socket-manager.cc.
- *
- * Revision 1.1.1.1 1999/01/28 09:41:07 adam
- * First implementation of YAZ++.
- *
+ * $Id: yaz-pdu-assoc.cpp,v 1.28 2002-10-09 12:50:26 adam Exp $
*/
#include <assert.h>
-
-#include <yaz-pdu-assoc.h>
-
+#include <string.h>
#include <yaz/log.h>
#include <yaz/tcpip.h>
-Yaz_PDU_Assoc::Yaz_PDU_Assoc(IYazSocketObservable *socketObservable)
+#include <yaz++/pdu-assoc.h>
+
+
+void Yaz_PDU_Assoc::init(IYazSocketObservable *socketObservable)
{
m_state = Closed;
m_cs = 0;
m_log = LOG_DEBUG;
}
-IYaz_PDU_Observable *Yaz_PDU_Assoc::clone()
+Yaz_PDU_Assoc::Yaz_PDU_Assoc(IYazSocketObservable *socketObservable)
{
- Yaz_PDU_Assoc *copy = new Yaz_PDU_Assoc(m_socketObservable);
- return copy;
+ init (socketObservable);
}
-Yaz_PDU_Assoc::~Yaz_PDU_Assoc()
+Yaz_PDU_Assoc::Yaz_PDU_Assoc(IYazSocketObservable *socketObservable,
+ COMSTACK cs)
{
- destroy();
+ init(socketObservable);
+ m_cs = cs;
+ unsigned mask = 0;
+ if (cs->io_pending & CS_WANT_WRITE)
+ mask |= YAZ_SOCKET_OBSERVE_WRITE;
+ if (cs->io_pending & CS_WANT_READ)
+ mask |= YAZ_SOCKET_OBSERVE_READ;
+ m_socketObservable->addObserver(cs_fileno(cs), this);
+ if (!mask)
+ {
+ yaz_log (m_log, "new PDU_Assoc. Ready");
+ m_state = 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);
+ m_socketObservable->maskObserver(this,
+ mask |YAZ_SOCKET_OBSERVE_EXCEPT);
+ }
+}
+
+
+IYaz_PDU_Observable *Yaz_PDU_Assoc::clone()
+{
+ Yaz_PDU_Assoc *copy = new Yaz_PDU_Assoc(m_socketObservable);
+ return copy;
}
void Yaz_PDU_Assoc::socketNotify(int event)
{
- logf (m_log, "Yaz_PDU_Assoc::socketNotify p=%p event = %d", this, event);
- if (0 /* m_state == Connected */)
+ yaz_log (m_log, "Yaz_PDU_Assoc::socketNotify p=%p state=%d event = %d",
+ this, m_state, event);
+ if (event & YAZ_SOCKET_OBSERVE_EXCEPT)
{
- m_state = Ready;
- m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
- YAZ_SOCKET_OBSERVE_EXCEPT);
- m_PDU_Observer->connectNotify();
- flush_PDU();
+ close();
+ m_PDU_Observer->failNotify();
+ return;
}
- else if (m_state == Connecting)
+ else if (event & YAZ_SOCKET_OBSERVE_TIMEOUT)
{
- if (event & YAZ_SOCKET_OBSERVE_READ)
+ m_PDU_Observer->timeoutNotify();
+ return;
+ }
+ switch (m_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 if (event & YAZ_SOCKET_OBSERVE_TIMEOUT)
- {
- m_PDU_Observer->timeoutNotify();
- }
- else
+ else
{
- m_state = Ready;
- m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
- YAZ_SOCKET_OBSERVE_EXCEPT);
- m_PDU_Observer->connectNotify();
- flush_PDU();
+ 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.
+ m_socketObservable->maskObserver(this,
+ mask|YAZ_SOCKET_OBSERVE_EXCEPT);
+ }
}
- }
- else if (m_state == Listen)
- {
+ 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;
+ 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;
return;
if (res < 0)
{
- logf(LOG_FATAL, "cs_listen failed");
+ yaz_log(LOG_FATAL|LOG_ERRNO, "cs_listen failed");
return;
}
if (!(new_line = cs_accept(m_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
*/
- int fd = cs_fileno(new_line);
- cs_fileno(new_line) = -1;
- cs_close (new_line);
-#if 1
- childNotify(fd);
-#else
- Yaz_PDU_Assoc *assoc = new Yaz_PDU_Assoc (m_socketObservable);
- assoc->m_parent = this;
- assoc->m_next = m_children;
- m_children = assoc;
-
- assoc->m_PDU_Observer = m_PDU_Observer->clone(assoc);
- socket(fd);
-#endif
- }
- }
- else if (m_state == Ready)
- {
- if (event & YAZ_SOCKET_OBSERVE_WRITE)
- {
- flush_PDU();
+ yaz_log (m_log, "new session: parent fd=%d child fd=%d",
+ cs_fileno(m_cs), cs_fileno(new_line));
+ childNotify (new_line);
}
- if (event & YAZ_SOCKET_OBSERVE_READ)
+ break;
+ case Writing:
+ if (event & (YAZ_SOCKET_OBSERVE_READ|YAZ_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)
+ {
+ 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;
+ m_socketObservable->maskObserver(this, mask);
return;
+ }
else if (res <= 0)
{
- logf (m_log, "Connection closed by peer");
+ yaz_log (m_log, "Yaz_PDU_Assoc::Connection closed by peer");
close();
- m_PDU_Observer->failNotify();
+ 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_socketObservable->maskObserver(this,
+ YAZ_SOCKET_OBSERVE_EXCEPT|
+ YAZ_SOCKET_OBSERVE_READ);
}
- if (event & YAZ_SOCKET_OBSERVE_TIMEOUT)
- {
- m_PDU_Observer->timeoutNotify();
- }
+ break;
+ case Closed:
+ yaz_log (m_log, "CLOSING state=%d event was %d", m_state, event);
+ close();
+ m_PDU_Observer->failNotify();
+ break;
+ default:
+ yaz_log (m_log, "Unknown state=%d event was %d", m_state, event);
+ close();
+ m_PDU_Observer->failNotify();
}
}
void Yaz_PDU_Assoc::close()
{
+ Yaz_PDU_Assoc *ch;
+ for (ch = m_children; ch; ch = ch->m_next)
+ ch->close();
+
m_socketObservable->deleteObserver(this);
m_state = Closed;
if (m_cs)
{
- logf (m_log, "Yaz_PDU_Assoc::close fd=%d", cs_fileno(m_cs));
+ yaz_log (m_log, "Yaz_PDU_Assoc::close fd=%d", cs_fileno(m_cs));
cs_close (m_cs);
}
m_cs = 0;
m_queue_out = m_queue_out->m_next;
delete q_this;
}
-// free (m_input_buf);
+ xfree (m_input_buf);
m_input_buf = 0;
m_input_len = 0;
}
void Yaz_PDU_Assoc::destroy()
{
close();
+
if (m_destroyed)
*m_destroyed = 1;
Yaz_PDU_Assoc **c;
here->m_parent = 0;
delete here;
}
+ yaz_log (m_log, "Yaz_PDU_Assoc::destroy this=%p", this);
}
Yaz_PDU_Assoc::PDU_Queue::PDU_Queue(const char *buf, int len)
{
- m_buf = (char *) malloc (len);
+ m_buf = (char *) xmalloc (len);
memcpy (m_buf, buf, len);
m_len = len;
m_next = 0;
Yaz_PDU_Assoc::PDU_Queue::~PDU_Queue()
{
- free (m_buf);
+ xfree (m_buf);
}
int Yaz_PDU_Assoc::flush_PDU()
{
int r;
- logf (m_log, "Yaz_PDU_Assoc::flush_PDU");
- if (m_state != Ready)
+ if (m_state != Ready && m_state != Writing)
{
- logf (m_log, "YAZ_PDU_Assoc::flush_PDU, not ready");
+ yaz_log (m_log, "YAZ_PDU_Assoc::flush_PDU, not ready");
return 1;
}
PDU_Queue *q = m_queue_out;
if (!q)
{
+ m_state = Ready;
+ yaz_log (m_log, "YAZ_PDU_Assoc::flush_PDU queue empty");
m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
+ YAZ_SOCKET_OBSERVE_WRITE|
YAZ_SOCKET_OBSERVE_EXCEPT);
return 0;
}
r = cs_put (m_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();
return r;
}
if (r == 1)
{
- m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
- YAZ_SOCKET_OBSERVE_EXCEPT|
- YAZ_SOCKET_OBSERVE_WRITE);
- logf (m_log, "Yaz_PDU_Assoc::flush_PDU put %d bytes (incomplete)",
- q->m_len);
+ 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;
+
+ m_socketObservable->maskObserver(this, mask);
+ yaz_log (m_log, "Yaz_PDU_Assoc::flush_PDU cs_put %d bytes (incomp)",
+ q->m_len);
return r;
- }
- logf (m_log, "Yaz_PDU_Assoc::flush_PDU put %d bytes", q->m_len);
+ }
+ m_state = Ready;
+ yaz_log (m_log, "Yaz_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;
delete q;
int Yaz_PDU_Assoc::send_PDU(const char *buf, int len)
{
- logf (m_log, "Yaz_PDU_Assoc::send_PDU");
+ yaz_log (m_log, "Yaz_PDU_Assoc::send_PDU");
PDU_Queue **pq = &m_queue_out;
int is_idle = (*pq ? 0 : 1);
if (!m_cs)
{
- logf (m_log, "Yaz_PDU_Assoc::send_PDU failed, m_cs == 0");
+ yaz_log (m_log, "Yaz_PDU_Assoc::send_PDU failed, m_cs == 0");
return -1;
}
while (*pq)
if (is_idle)
return flush_PDU ();
else
- logf (m_log, "Yaz_PDU_Assoc::cannot send_PDU fd=%d",
- cs_fileno(m_cs));
+ yaz_log (m_log, "Yaz_PDU_Assoc::cannot send_PDU fd=%d",
+ cs_fileno(m_cs));
return 0;
}
-COMSTACK Yaz_PDU_Assoc::comstack()
+COMSTACK Yaz_PDU_Assoc::comstack(const char *type_and_host, void **vp)
{
- if (!m_cs)
- {
- CS_TYPE cs_type = tcpip_type;
- m_cs = cs_create (cs_type, 0, PROTO_Z3950);
- }
- return m_cs;
+ return cs_create_host(type_and_host, 0, vp);
}
void Yaz_PDU_Assoc::listen(IYaz_PDU_Observer *observer,
const char *addr)
{
close();
- void *ap;
- COMSTACK cs = comstack();
- logf (m_log, "Yaz_PDU_Assoc::listen %s", addr);
+ yaz_log (LOG_LOG, "Adding listener %s", addr);
+
m_PDU_Observer = observer;
- if (!cs)
- return;
- ap = cs_straddr (cs, addr);
- if (!ap)
+ void *ap;
+ m_cs = comstack(addr, &ap);
+
+ if (!m_cs)
return;
- if (cs_bind(cs, ap, CS_SERVER) < 0)
+ if (cs_bind(m_cs, ap, CS_SERVER) < 0)
return;
- m_socketObservable->addObserver(cs_fileno(cs), this);
+ m_socketObservable->addObserver(cs_fileno(m_cs), this);
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;
}
void Yaz_PDU_Assoc::idleTime(int idleTime)
{
m_idleTime = idleTime;
- logf (m_log, "Yaz_PDU_Assoc::idleTime(%d)", idleTime);
+ yaz_log (m_log, "Yaz_PDU_Assoc::idleTime(%d)", idleTime);
m_socketObservable->timeoutObserver(this, m_idleTime);
}
void Yaz_PDU_Assoc::connect(IYaz_PDU_Observer *observer,
const char *addr)
{
- logf (m_log, "Yaz_PDU_Assoc::connect %s", addr);
+ yaz_log (m_log, "Yaz_PDU_Assoc::connect %s", addr);
close();
m_PDU_Observer = observer;
- COMSTACK cs = comstack();
- void *ap = cs_straddr (cs, addr);
- if (!ap)
- {
- logf (m_log, "cs_straddr failed");
- return;
+ void *ap;
+ m_cs = comstack(addr, &ap);
+ 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
+ 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;
+ m_socketObservable->maskObserver(this, mask);
}
- int res = cs_connect (cs, ap);
- logf (m_log, "Yaz_PDU_Assoc::connect fd=%d res=%d", cs_fileno(cs), res);
- m_socketObservable->addObserver(cs_fileno(cs), this);
- m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_READ|
- YAZ_SOCKET_OBSERVE_EXCEPT|
- YAZ_SOCKET_OBSERVE_WRITE);
- m_state = Connecting;
-}
-
-void Yaz_PDU_Assoc::socket(IYaz_PDU_Observer *observer, int fd)
-{
- close();
- m_PDU_Observer = observer;
- if (fd >= 0)
- {
- CS_TYPE cs_type = tcpip_type;
- m_cs = cs_createbysocket(fd, cs_type, 0, PROTO_Z3950);
- m_state = Ready;
- m_socketObservable->addObserver(fd, this);
- m_socketObservable->maskObserver(this,
- YAZ_SOCKET_OBSERVE_READ|
+ else
+ { // Connect failed immediately
+ // Since m_state is Closed we can distinguish this case from
+ // normal connect in socketNotify handler
+ m_socketObservable->maskObserver(this, YAZ_SOCKET_OBSERVE_WRITE|
YAZ_SOCKET_OBSERVE_EXCEPT);
- m_socketObservable->timeoutObserver(this, m_idleTime);
}
}
-#if 1
-void Yaz_PDU_Assoc::childNotify(int fd)
+// Single-threaded... Only useful for non-blocking handlers
+void Yaz_PDU_Assoc::childNotify(COMSTACK cs)
{
- /// Clone PDU Observable (keep socket manager)
- IYaz_PDU_Observable *new_observable = clone();
-
- /// Clone PDU Observer
- IYaz_PDU_Observer *observer = m_PDU_Observer->clone(new_observable);
-
- /// Attach new socket to it
- new_observable->socket(observer, fd);
-}
-#else
-
-#include <yaz-socket-manager.h>
-#include <pthread.h>
-
-class thread_info {
- Yaz_SocketManager *socketManager;
- IYaz_PDU_Observable *
-
-};
-
-static void *events(void *p)
-{
- Yaz_SocketManager *s = (Yaz_SocketManager *) p;
+ Yaz_PDU_Assoc *new_observable =
+ new Yaz_PDU_Assoc (m_socketObservable, cs);
- while (s->processEvent() > 0)
- ;
- return 0;
-}
+ new_observable->m_next = m_children;
+ m_children = new_observable;
+ new_observable->m_parent = this;
-void Yaz_PDU_Assoc::childNotify(int fd)
-{
- Yaz_SocketManager *socket_observable = new Yaz_SocketManager;
- IYaz_PDU_Observable *new_observable = clone();
-
- m_socketObservable = socket_observable;
-
- /// Clone PDU Observer
- IYaz_PDU_Observer *observer = m_PDU_Observer->clone(new_observable);
-
- /// Attach new socket to it
- new_observable->socket(observer, fd);
-
- pthread_t type;
-
- int id = pthread_create (&type, 0, events, socket_observable);
- logf (LOG_LOG, "pthread_create returned id=%d", id);
+ // Clone PDU Observer
+ new_observable->m_PDU_Observer = m_PDU_Observer->sessionNotify
+ (new_observable, cs_fileno(cs));
}
-#endif
-