X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=109aa5819d6840d069f890ba6482b41637ec7e0d;hb=247113bc4211efc45bdff87daefa8796561c89b5;hp=fc7bf9fadc04a6e6bca2e988a94da71be33028ae;hpb=dbcf2c3410ed74d919efdc62ffbd00e716284d8e;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index fc7bf9f..109aa58 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,4 +1,4 @@ -/* $Id: connection.c,v 1.1 2007-04-23 21:05:23 adam 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. @@ -46,10 +46,12 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA #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; @@ -57,20 +59,21 @@ struct connection { struct client *client; char *ibuf; int ibufsize; + char *authentication; // Empty string or authentication string if set 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) { @@ -87,8 +90,6 @@ void host_remove_connection(struct host *h, struct connection *con) // Close connection and recycle structure void connection_destroy(struct connection *co) { - struct host *h = co->host; - if (co->link) { cs_close(co->link); @@ -97,7 +98,7 @@ void connection_destroy(struct connection *co) 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); @@ -125,6 +126,7 @@ struct connection *connection_create(struct client *cl) new->next = new->host->connections; new->host->connections = new; new->client = cl; + new->authentication = ""; client_set_connection(cl, new); new->link = 0; new->state = Conn_Resolving; @@ -143,11 +145,24 @@ static void connection_handler(IOCHAN i, int event) 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; @@ -165,6 +180,7 @@ static void connection_handler(IOCHAN i, int event) co->state = Conn_Open; if (cl) client_set_state(cl, Client_Connected); + iochan_settimeout(i, 180); } } @@ -192,6 +208,8 @@ static void connection_handler(IOCHAN i, int event) 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); @@ -200,6 +218,17 @@ static void connection_handler(IOCHAN i, int event) 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: @@ -317,6 +346,9 @@ int connection_connect(struct connection *con) void *addr; int res; + struct session_database *sdb = client_get_database(con->client); + char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); + assert(host->ipport); assert(con); @@ -326,7 +358,7 @@ int connection_connect(struct connection *con) return -1; } - if (0 == strlen(global_parameters.zproxy_override)){ + if (!zproxy || 0 == strlen(zproxy)){ /* no Z39.50 proxy needed - direct connect */ yaz_log(YLOG_DEBUG, "Connection create %s", connection_get_url(con)); @@ -340,13 +372,13 @@ int connection_connect(struct connection *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), zproxy); - if (!(addr = cs_straddr(link, global_parameters.zproxy_override))) + if (!(addr = cs_straddr(link, zproxy))) { yaz_log(YLOG_WARN|YLOG_ERRNO, - "Lookup of IP address %s failed", - global_parameters.zproxy_override); + "Lookup of ZProxy IP address %s failed", + zproxy); return -1; } } @@ -361,6 +393,7 @@ int connection_connect(struct connection *con) 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); @@ -375,6 +408,11 @@ const char *connection_get_url(struct connection *co) 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) { @@ -391,7 +429,11 @@ int client_prep_connection(struct client *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)) + 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))) break; if (co) {