-/* $Id: connection.c,v 1.4 2007-06-06 11:49:48 marc Exp $
+/* $Id: connection.c,v 1.7 2007-07-12 08:01:06 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
se = client_get_session(cl);
else
{
- yaz_log(YLOG_WARN, "Destroying orphan connection");
connection_destroy(co);
return;
}
+ if (event & EVENT_TIMEOUT)
+ {
+ if (co->state == Conn_Connecting)
+ {
+ yaz_log(YLOG_WARN, "connect timeout %s", client_get_url(cl));
+ client_fatal(cl);
+ }
+ else
+ {
+ yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl));
+ connection_destroy(co);
+ }
+ return;
+ }
if (co->state == Conn_Connecting && event & EVENT_OUTPUT)
{
int errcode;
co->state = Conn_Open;
if (cl)
client_set_state(cl, Client_Connected);
+ iochan_settimeout(i, 180);
}
}
if (client_is_our_response(cl))
{
Z_APDU *a;
+ struct session_database *sdb = client_get_database(cl);
+ const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG);
odr_reset(global_parameters.odr_in);
odr_setbuf(global_parameters.odr_in, co->ibuf, len, 0);
client_fatal(cl);
return;
}
+
+ if (apdulog && *apdulog && *apdulog != '0')
+ {
+ ODR p = odr_createmem(ODR_PRINT);
+ yaz_log(YLOG_LOG, "recv APDU %s", client_get_url(cl));
+
+ odr_setprint(p, yaz_log_file());
+ z_APDU(p, &a, 0, 0);
+ odr_setprint(p, stderr);
+ odr_destroy(p);
+ }
switch (a->which)
{
case Z_APDU_initResponse:
con->link = link;
con->state = Conn_Connecting;
con->iochan = iochan_create(cs_fileno(link), connection_handler, 0);
+ iochan_settimeout(con->iochan, 30);
iochan_setdata(con->iochan, con);
pazpar2_add_channel(con->iochan);