X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=8df4ac743569c366196dabafafbcaea483901f7c;hb=babdf4ba693f4a79037d8cf8cecc109e9355ec0d;hp=b5671144189da0f1b61e00a3e24530cac96976b3;hpb=8e1705c6c121846732b778143272019ce0b1be73;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index b567114..8df4ac7 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,5 +1,5 @@ /* This file is part of Pazpar2. - Copyright (C) 2006-2008 Index Data + Copyright (C) 2006-2009 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 @@ -34,31 +34,18 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #if HAVE_UNISTD_H #include #endif -#if HAVE_SYS_SOCKET_H -#include -#endif -#ifdef WIN32 -#include -typedef int socklen_t; -#endif -#if HAVE_NETDB_H -#include -#endif #include -#include #include #include #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 @@ -66,7 +53,6 @@ typedef int socklen_t; struct connection { IOCHAN iochan; ZOOM_connection link; - ZOOM_resultset resultset; struct host *host; struct client *client; char *ibuf; @@ -77,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 }; @@ -92,9 +80,10 @@ static int connection_is_idle(struct connection *co) if (co->state != Conn_Open || !link) return 0; + if (!ZOOM_connection_is_idle(link)) + return 0; event = ZOOM_connection_peek_event(link); - if (event == ZOOM_EVENT_NONE || - event == ZOOM_EVENT_END) + if (event == ZOOM_EVENT_NONE || event == ZOOM_EVENT_END) return 1; else return 0; @@ -105,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; @@ -133,12 +110,6 @@ static void remove_connection_from_host(struct connection *con) assert(*conp == 0); } -void connection_continue(struct connection *co) -{ - yaz_log(YLOG_LOG, "connection_continue"); - iochan_setevent(co->iochan, EVENT_OUTPUT); -} - // Close connection and recycle structure void connection_destroy(struct connection *co) { @@ -147,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); @@ -165,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); @@ -185,16 +155,18 @@ 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; } -static void non_block_events(struct connection *co, IOCHAN iochan) +static void non_block_events(struct connection *co) { struct client *cl = co->client; + IOCHAN iochan = co->iochan; ZOOM_connection link = co->link; while (1) { @@ -203,10 +175,24 @@ static void non_block_events(struct connection *co, IOCHAN iochan) if (!r) break; ev = ZOOM_connection_last_event(link); +#if 0 + yaz_log(YLOG_LOG, "ZOOM_EVENT_%s", ZOOM_get_event_str(ev)); +#endif switch (ev) { case ZOOM_EVENT_END: - client_set_state(co->client, Client_Idle); + { + const char *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; case ZOOM_EVENT_SEND_DATA: break; @@ -216,21 +202,18 @@ static void non_block_events(struct connection *co, IOCHAN iochan) 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; - client_set_state(co->client, Client_Connected); - iochan_settimeout(iochan, global_parameters.z3950_session_timeout); break; case ZOOM_EVENT_RECV_SEARCH: - yaz_log(YLOG_LOG, "Search response from %s", client_get_url(cl)); client_search_response(cl); break; case ZOOM_EVENT_RECV_RECORD: - yaz_log(YLOG_LOG, "Record from %s", client_get_url(cl)); client_record_response(cl); break; default: @@ -240,6 +223,11 @@ static void non_block_events(struct connection *co, IOCHAN iochan) } } +void connection_continue(struct connection *co) +{ + non_block_events(co); +} + static void connection_handler(IOCHAN iochan, int event) { struct connection *co = iochan_getdata(iochan); @@ -269,11 +257,11 @@ static void connection_handler(IOCHAN iochan, int event) } else { - non_block_events(co, iochan); + non_block_events(co); ZOOM_connection_fire_event_socket(co->link, event); - non_block_events(co, iochan); + non_block_events(co); } } @@ -360,7 +348,6 @@ static int connection_connect(struct connection *con) const char *auth; 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); @@ -370,10 +357,8 @@ 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 (zproxy && *zproxy) { con->zproxy = xstrdup(zproxy); @@ -398,24 +383,19 @@ static int connection_connect(struct connection *con) } if (sru && *sru) - strcpy(ipport, "http://"); - strcat(ipport, host->ipport); - /* deal with SRU path here because databaseName option is not read in - ZOOM in SRU mode */ - if (sru && *sru) { - if (*sdb->database->databases[0]) - { - strcat(ipport, "/"); - strcat(ipport, sdb->database->databases[0]); - } + char http_hostport[512]; + strcpy(http_hostport, "http://"); + strcat(http_hostport, host->hostport); + ZOOM_connection_connect(link, http_hostport, 0); } - ZOOM_connection_connect(link, ipport, 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); @@ -424,8 +404,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; } @@ -435,7 +413,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); @@ -446,6 +425,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)); @@ -471,9 +453,16 @@ 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); + } } if (co && co->link) @@ -485,7 +474,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 */ +