X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=f318378c67dd6878fb239c4a01ca541755562b30;hb=85294d71794f1849fc3575f1b2a1f1ab94753207;hp=d1e1b87a2e541fc6841fff315622f4b03e308870;hpb=2819110732a5e3cdc6de71333977ff39d7cf8bf3;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index d1e1b87..f318378 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2009 Index Data + Copyright (C) 2006-2010 Index Data Pazpar2 is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free @@ -42,12 +42,10 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #include #include #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 @@ -55,7 +53,6 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA struct connection { IOCHAN iochan; ZOOM_connection link; - ZOOM_resultset resultset; struct host *host; struct client *client; char *ibuf; @@ -66,6 +63,8 @@ struct connection { Conn_Connecting, Conn_Open } state; + int operation_timeout; + int session_timeout; struct connection *next; // next for same host or next in free list }; @@ -95,18 +94,6 @@ ZOOM_connection connection_get_link(struct connection *co) 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; @@ -131,9 +118,6 @@ void connection_destroy(struct connection *co) 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); @@ -149,7 +133,9 @@ void connection_destroy(struct connection *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); @@ -169,8 +155,9 @@ static struct connection *connection_create(struct client *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; @@ -196,11 +183,14 @@ static void non_block_events(struct connection *co) case ZOOM_EVENT_END: { const char *error, *addinfo; - if (ZOOM_connection_error(link, &error, &addinfo)) + int err; + if ((err = ZOOM_connection_error(link, &error, &addinfo))) { yaz_log(YLOG_LOG, "Error %s from %s", error, client_get_url(cl)); } + iochan_settimeout(iochan, co->session_timeout); + client_set_diagnostic(cl, err); client_set_state(cl, Client_Idle); } break; @@ -212,13 +202,13 @@ static void non_block_events(struct connection *co) 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); @@ -356,9 +346,9 @@ static int connection_connect(struct connection *con) struct host *host = connection_get_host(con); ZOOM_options zoptions = ZOOM_options_create(); const char *auth; + const char *charset; const char *sru; const char *sru_version = 0; - char ipport[512] = ""; struct session_database *sdb = client_get_database(con->client); const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); @@ -368,10 +358,12 @@ static int connection_connect(struct connection *con) 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 ((charset = session_setting_oneval(sdb, PZ_NEGOTIATION_CHARSET))) + ZOOM_options_set(zoptions, "charset", charset); + if (zproxy && *zproxy) { con->zproxy = xstrdup(zproxy); @@ -396,15 +388,19 @@ static int connection_connect(struct connection *con) } if (sru && *sru) - strcpy(ipport, "http://"); - strcat(ipport, host->ipport); - - ZOOM_connection_connect(link, ipport, 0); + { + char http_hostport[512]; + strcpy(http_hostport, "http://"); + strcat(http_hostport, host->hostport); + ZOOM_connection_connect(link, http_hostport, 0); + } + else + ZOOM_connection_connect(link, host->ipport, 0); 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); @@ -413,8 +409,6 @@ static int connection_connect(struct connection *con) /* 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; } @@ -424,7 +418,8 @@ const char *connection_get_url(struct connection *co) } // 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); @@ -435,6 +430,9 @@ int client_prep_connection(struct client *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)); @@ -460,13 +458,15 @@ int client_prep_connection(struct client *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); } } @@ -479,7 +479,9 @@ int client_prep_connection(struct client *cl) /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +