-/* $Id: connection.c,v 1.1 2007-04-23 21:05:23 adam Exp $
+/* $Id: connection.c,v 1.11 2007-08-28 21:11:21 quinn Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
#include "pazpar2.h"
#include "host.h"
#include "client.h"
+#include "settings.h"
#include "parameters.h"
-// Represents a physical, reusable connection to a remote Z39.50 host
+/** \brief Represents a physical, reusable connection to a remote Z39.50 host
+ */
struct connection {
IOCHAN iochan;
COMSTACK link;
struct client *client;
char *ibuf;
int ibufsize;
+ char *authentication; // Empty string or authentication string if set
+ char *zproxy;
enum {
Conn_Resolving,
Conn_Connecting,
Conn_Open,
Conn_Waiting,
} state;
- struct connection *next;
+ struct connection *next; // next for same host or next in free list
};
static struct connection *connection_freelist = 0;
-void host_remove_connection(struct host *h, struct connection *con)
+static void remove_connection_from_host(struct connection *con)
{
- struct connection **conp = &h->connections;
+ struct connection **conp = &con->host->connections;
assert(con);
while (*conp)
{
// Close connection and recycle structure
void connection_destroy(struct connection *co)
{
- struct host *h = co->host;
-
if (co->link)
{
cs_close(co->link);
yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
- host_remove_connection(h, co);
+ remove_connection_from_host(co);
if (co->client)
{
client_disconnect(co->client);
}
+ xfree(co->zproxy);
+ co->zproxy = 0;
co->next = connection_freelist;
connection_freelist = co;
}
new->next = new->host->connections;
new->host->connections = new;
new->client = cl;
+ new->authentication = "";
+ new->zproxy = 0;
client_set_connection(cl, new);
new->link = 0;
new->state = Conn_Resolving;
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, global_parameters.z3950_session_timeout);
}
}
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:
connection_destroy(con);
/* start all over .. at some point it will be NULL */
con = host->connections;
+ continue;
}
else if (!con->client)
{
- yaz_log(YLOG_WARN, "connect_unresolved_host : ophan client");
connection_destroy(con);
/* start all over .. at some point it will be NULL */
con = host->connections;
+ continue;
}
else
{
connection_connect(con);
- con = con->next;
}
}
+ else
+ {
+ yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
+ }
+ con = con->next;
}
}
else if (r == 1)
{
fprintf(stderr, "cs_put incomplete (ParaZ does not handle that)\n");
- exit(1);
+ return -1;;
}
odr_reset(global_parameters.odr_out); /* release the APDU structure */
co->state = Conn_Waiting;
void *addr;
int res;
+ struct session_database *sdb = client_get_database(con->client);
+ const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+
assert(host->ipport);
assert(con);
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create comstack");
return -1;
}
-
- if (0 == strlen(global_parameters.zproxy_override)){
+
+ if (zproxy && *zproxy)
+ con->zproxy = xstrdup(zproxy);
+
+ if (!con->zproxy)
+ {
/* no Z39.50 proxy needed - direct connect */
yaz_log(YLOG_DEBUG, "Connection create %s", connection_get_url(con));
} else {
/* Z39.50 proxy connect */
yaz_log(YLOG_DEBUG, "Connection create %s proxy %s",
- connection_get_url(con), global_parameters.zproxy_override);
+ connection_get_url(con), con->zproxy);
- if (!(addr = cs_straddr(link, global_parameters.zproxy_override)))
+ if (!(addr = cs_straddr(link, con->zproxy)))
{
yaz_log(YLOG_WARN|YLOG_ERRNO,
- "Lookup of IP address %s failed",
- global_parameters.zproxy_override);
+ "Lookup of ZProxy IP address %s failed",
+ con->zproxy);
return -1;
}
}
con->link = link;
con->state = Conn_Connecting;
con->iochan = iochan_create(cs_fileno(link), connection_handler, 0);
+ iochan_settimeout(con->iochan, global_parameters.z3950_connect_timeout);
iochan_setdata(con->iochan, con);
pazpar2_add_channel(con->iochan);
return client_get_url(co->client);
}
+void connection_set_authentication(struct connection *co, char *auth)
+{
+ co->authentication = auth;
+}
+
// Ensure that client has a connection associated
int client_prep_connection(struct client *cl)
{
struct connection *co;
struct session *se = client_get_session(cl);
struct host *host = client_get_host(cl);
+ struct session_database *sdb = client_get_database(cl);
+ const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY);
+
+ if (zproxy && zproxy[0] == '\0')
+ zproxy = 0;
co = client_get_connection(cl);
// See if someone else has an idle connection
// We should look at timestamps here to select the longest-idle connection
for (co = host->connections; co; co = co->next)
- if (co->state == Conn_Open && (!co->client || client_get_session(co->client) != se))
- break;
+ if (co->state == Conn_Open &&
+ (!co->client || client_get_session(co->client) != se) &&
+ !strcmp(co->authentication,
+ session_setting_oneval(client_get_database(cl),
+ PZ_AUTHENTICATION)))
+ {
+ if (zproxy == 0 && co->zproxy == 0)
+ break;
+ if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy))
+ break;
+ }
if (co)
{
connection_release(co);
projects / pazpar2-moved-to-github.git / blobdiff