#include <yaz/comstack.h>
#include <yaz/tcpip.h>
#include "connection.h"
-#include "eventl.h"
#include "pazpar2.h"
#include "host.h"
#include "client.h"
#include "settings.h"
-#include "parameters.h"
/** \brief Represents a physical, reusable connection to a remote Z39.50 host
struct connection {
IOCHAN iochan;
ZOOM_connection link;
- ZOOM_resultset resultset;
struct host *host;
struct client *client;
char *ibuf;
Conn_Connecting,
Conn_Open
} state;
+ int operation_timeout;
+ int session_timeout;
struct connection *next; // next for same host or next in free list
};
return co->link;
}
-ZOOM_resultset connection_get_resultset(struct connection *co)
-{
- return co->resultset;
-}
-
-void connection_set_resultset(struct connection *co, ZOOM_resultset rs)
-{
- if (co->resultset)
- ZOOM_resultset_destroy(co->resultset);
- co->resultset = rs;
-}
-
static void remove_connection_from_host(struct connection *con)
{
struct connection **conp = &con->host->connections;
ZOOM_connection_destroy(co->link);
iochan_destroy(co->iochan);
}
- if (co->resultset)
- ZOOM_resultset_destroy(co->resultset);
-
yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
remove_connection_from_host(co);
// Creates a new connection for client, associated with the host of
// client's database
-static struct connection *connection_create(struct client *cl)
+static struct connection *connection_create(struct client *cl,
+ int operation_timeout,
+ int session_timeout)
{
struct connection *new;
struct host *host = client_get_host(cl);
new->zproxy = 0;
client_set_connection(cl, new);
new->link = 0;
- new->resultset = 0;
new->state = Conn_Resolving;
+ new->operation_timeout = operation_timeout;
+ new->session_timeout = session_timeout;
if (host->ipport)
connection_connect(new);
return new;
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_url(cl));
}
+ iochan_settimeout(iochan, co->session_timeout);
client_set_state(cl, Client_Idle);
}
break;
break;
case ZOOM_EVENT_SEND_APDU:
client_set_state(co->client, Client_Working);
+ iochan_settimeout(iochan, co->operation_timeout);
break;
case ZOOM_EVENT_RECV_APDU:
break;
case ZOOM_EVENT_CONNECT:
yaz_log(YLOG_LOG, "Connected to %s", client_get_url(cl));
co->state = Conn_Open;
- iochan_settimeout(iochan, global_parameters.z3950_session_timeout);
break;
case ZOOM_EVENT_RECV_SEARCH:
client_search_response(cl);
assert(con);
ZOOM_options_set(zoptions, "async", "1");
- ZOOM_options_set(zoptions, "implementationName",
- global_parameters.implementationName);
- ZOOM_options_set(zoptions, "implementationVersion",
- global_parameters.implementationVersion);
+ ZOOM_options_set(zoptions, "implementationName", PACKAGE_NAME);
+ ZOOM_options_set(zoptions, "implementationVersion", VERSION);
if (zproxy && *zproxy)
{
con->zproxy = xstrdup(zproxy);
con->link = link;
con->iochan = iochan_create(0, connection_handler, 0);
con->state = Conn_Connecting;
- iochan_settimeout(con->iochan, global_parameters.z3950_connect_timeout);
+ iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);
iochan_setsocketfun(con->iochan, socketfun);
iochan_setmaskfun(con->iochan, maskfun);
/* this fragment is bad DRY: from client_prep_connection */
client_set_state(con->client, Client_Connecting);
ZOOM_options_destroy(zoptions);
- // This creates the connection
- ZOOM_connection_process(link);
return 0;
}
}
// Ensure that client has a connection associated
-int client_prep_connection(struct client *cl)
+int client_prep_connection(struct client *cl,
+ int operation_timeout, int session_timeout)
{
struct connection *co;
struct session *se = client_get_session(cl);
if (zproxy && zproxy[0] == '\0')
zproxy = 0;
+ if (!host)
+ return 0;
+
co = client_get_connection(cl);
yaz_log(YLOG_DEBUG, "Client prep %s", client_get_url(cl));
connection_release(co);
client_set_connection(cl, co);
co->client = cl;
+ co->operation_timeout = operation_timeout;
+ co->session_timeout = session_timeout;
/* tells ZOOM to reconnect if necessary. Disabled becuase
the ZOOM_connection_connect flushes the task queue */
ZOOM_connection_connect(co->link, 0, 0);
}
else
{
- co = connection_create(cl);
+ co = connection_create(cl, operation_timeout, session_timeout);
}
}
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+