X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=2b1c3d37bd92a5e24983b2e1c2852ff1e97f903d;hb=035fffc6a58e65cdb99ee41cdd843345c7700f67;hp=197dbcb2e888aee68bc4774a3385dcb95f1044b2;hpb=0176e85ab8c3383a65e26e9dc7a67cb086a83750;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index 197dbcb..2b1c3d3 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,19 +34,8 @@ 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 @@ -71,7 +60,6 @@ struct connection { struct client *client; char *ibuf; int ibufsize; - char *authentication; // Empty string or authentication string if set char *zproxy; enum { Conn_Resolving, @@ -83,18 +71,20 @@ struct connection { static struct connection *connection_freelist = 0; +static int connection_connect(struct connection *con); + static int connection_is_idle(struct connection *co) { ZOOM_connection link = co->link; - int event = ZOOM_connection_peek_event(link); + int event; - if (co->state != Conn_Open) + if (co->state != Conn_Open || !link) return 0; - link = co->link; + 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; @@ -133,14 +123,6 @@ static void remove_connection_from_host(struct connection *con) assert(*conp == 0); } -void connection_continue(struct connection *co) -{ -#if 1 - yaz_log(YLOG_LOG, "connection_continue"); - iochan_setevent(co->iochan, EVENT_OUTPUT); -#endif -} - // Close connection and recycle structure void connection_destroy(struct connection *co) { @@ -167,7 +149,7 @@ void connection_destroy(struct connection *co) // Creates a new connection for client, associated with the host of // client's database -struct connection *connection_create(struct client *cl) +static struct connection *connection_create(struct client *cl) { struct connection *new; struct host *host = client_get_host(cl); @@ -184,20 +166,81 @@ struct connection *connection_create(struct client *cl) 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->resultset = 0; - new->state = Conn_Connecting; + new->state = Conn_Resolving; if (host->ipport) connection_connect(new); return new; } -static void connection_handler(IOCHAN i, int event) +static void non_block_events(struct connection *co) { - struct connection *co = iochan_getdata(i); + struct client *cl = co->client; + IOCHAN iochan = co->iochan; + ZOOM_connection link = co->link; + while (1) + { + int ev; + int r = ZOOM_event_nonblock(1, &link); + 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: + { + const char *error, *addinfo; + if (ZOOM_connection_error(link, &error, &addinfo)) + { + yaz_log(YLOG_LOG, "Error %s from %s", + error, client_get_url(cl)); + } + client_set_state(cl, Client_Idle); + } + break; + case ZOOM_EVENT_SEND_DATA: + break; + case ZOOM_EVENT_RECV_DATA: + break; + case ZOOM_EVENT_UNKNOWN: + break; + case ZOOM_EVENT_SEND_APDU: + client_set_state(co->client, Client_Working); + 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); + break; + case ZOOM_EVENT_RECV_RECORD: + client_record_response(cl); + break; + default: + yaz_log(YLOG_LOG, "Unhandled event (%d) from %s", + ev, client_get_url(cl)); + } + } +} + +void connection_continue(struct connection *co) +{ + non_block_events(co); +} + +static void connection_handler(IOCHAN iochan, int event) +{ + struct connection *co = iochan_getdata(iochan); struct client *cl = co->client; struct session *se = 0; @@ -221,54 +264,14 @@ static void connection_handler(IOCHAN i, int event) yaz_log(YLOG_LOG, "idle timeout %s", client_get_url(cl)); connection_destroy(co); } - return; } else { - ZOOM_connection link = co->link; + non_block_events(co); - if (ZOOM_event(1, &link)) - { - do - { - int event = ZOOM_connection_last_event(link); - switch (event) - { - case ZOOM_EVENT_END: - break; - case ZOOM_EVENT_SEND_DATA: - break; - case ZOOM_EVENT_RECV_DATA: - break; - case ZOOM_EVENT_UNKNOWN: - break; - case ZOOM_EVENT_SEND_APDU: - client_set_state(co->client, Client_Working); - break; - case ZOOM_EVENT_RECV_APDU: - client_set_state(co->client, Client_Idle); - 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(i, 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: - yaz_log(YLOG_LOG, "Unhandled event (%d) from %s", - event, client_get_url(cl)); - } - } - while (ZOOM_event_nonblock(1, &link)); - } + ZOOM_connection_fire_event_socket(co->link, event); + + non_block_events(co); } } @@ -309,6 +312,7 @@ void connect_resolver_host(struct host *host) else { connection_connect(con); + client_start_search(con->client); } } else @@ -319,7 +323,7 @@ void connect_resolver_host(struct host *host) } } -struct host *connection_get_host(struct connection *con) +static struct host *connection_get_host(struct connection *con) { return con->host; } @@ -346,12 +350,15 @@ static int maskfun(IOCHAN c) return ZOOM_connection_get_mask(co->link); } -int connection_connect(struct connection *con) +static int connection_connect(struct connection *con) { ZOOM_connection link = 0; struct host *host = connection_get_host(con); ZOOM_options zoptions = ZOOM_options_create(); - char *auth; + 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); @@ -373,8 +380,13 @@ int connection_connect(struct connection *con) if (apdulog && *apdulog) ZOOM_options_set(zoptions, "apdulog", apdulog); - if ((auth = (char*) session_setting_oneval(sdb, PZ_AUTHENTICATION))) + if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION))) ZOOM_options_set(zoptions, "user", auth); + if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru) + ZOOM_options_set(zoptions, "sru", sru); + if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION)) + && *sru_version) + ZOOM_options_set(zoptions, "sru_version", sru_version); if (!(link = ZOOM_connection_create(zoptions))) { @@ -382,7 +394,12 @@ int connection_connect(struct connection *con) ZOOM_options_destroy(zoptions); return -1; } - ZOOM_connection_connect(link, host->ipport, 0); + + if (sru && *sru) + strcpy(ipport, "http://"); + strcat(ipport, host->ipport); + + ZOOM_connection_connect(link, ipport, 0); con->link = link; con->iochan = iochan_create(0, connection_handler, 0); @@ -406,11 +423,6 @@ 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) { @@ -434,9 +446,9 @@ int client_prep_connection(struct client *cl) for (co = host->connections; co; co = co->next) if (connection_is_idle(co) && (!co->client || client_get_session(co->client) != se) && - !strcmp(co->authentication, - session_setting_oneval(client_get_database(cl), - PZ_AUTHENTICATION))) + !strcmp(ZOOM_connection_option_get(co->link, "user"), + session_setting_oneval(client_get_database(cl), + PZ_AUTHENTICATION))) { if (zproxy == 0 && co->zproxy == 0) break; @@ -448,28 +460,28 @@ int client_prep_connection(struct client *cl) connection_release(co); client_set_connection(cl, co); co->client = cl; + /* 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); + } } - if (co) + if (co && co->link) return 1; else return 0; } -// DELETEME - - -int connection_send_apdu(struct connection *co, Z_APDU *a){return 10;} - - - /* * Local variables: * c-basic-offset: 4 + * c-file-style: "Stroustrup" * indent-tabs-mode: nil * End: * vim: shiftwidth=4 tabstop=8 expandtab */ +