X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fconnection.c;h=dd61f1c1fb9845f99858a45da7c2e03c00066a63;hb=d24d65a3a42bbb6e8c8d0f919bf33510dd356a45;hp=5a28a75fd51e305efe5241359c573a9ebf763683;hpb=4bace2a54c44fa467f26cbfa2cc27159cb8fc268;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index 5a28a75..dd61f1c 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 @@ -63,14 +63,14 @@ struct connection { Conn_Connecting, Conn_Open } state; - int connect_timeout; + int operation_timeout; int session_timeout; struct connection *next; // next for same host or next in free list }; -static struct connection *connection_freelist = 0; +static struct connection *connection_freelist = 0; /* thread pr */ -static int connection_connect(struct connection *con); +static int connection_connect(struct connection *con, iochan_man_t iochan_man); static int connection_is_idle(struct connection *co) { @@ -134,8 +134,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, - int connect_timeout, - int session_timeout) + int operation_timeout, + int session_timeout, + iochan_man_t iochan_man) { struct connection *new; struct host *host = client_get_host(cl); @@ -156,10 +157,10 @@ static struct connection *connection_create(struct client *cl, client_set_connection(cl, new); new->link = 0; new->state = Conn_Resolving; - new->connect_timeout = connect_timeout; + new->operation_timeout = operation_timeout; new->session_timeout = session_timeout; if (host->ipport) - connection_connect(new); + connection_connect(new, iochan_man); return new; } @@ -183,11 +184,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; @@ -199,13 +203,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, co->session_timeout); break; case ZOOM_EVENT_RECV_SEARCH: client_search_response(cl); @@ -275,7 +279,7 @@ void connection_release(struct connection *co) co->client = 0; } -void connect_resolver_host(struct host *host) +void connect_resolver_host(struct host *host, iochan_man_t iochan_man) { struct connection *con = host->connections; while (con) @@ -298,7 +302,7 @@ void connect_resolver_host(struct host *host) } else { - connection_connect(con); + connection_connect(con, iochan_man); client_start_search(con->client); } } @@ -337,15 +341,15 @@ static int maskfun(IOCHAN c) return ZOOM_connection_get_mask(co->link); } -static int connection_connect(struct connection *con) +static int connection_connect(struct connection *con, iochan_man_t iochan_man) { ZOOM_connection link = 0; 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); @@ -357,6 +361,10 @@ static int connection_connect(struct connection *con) ZOOM_options_set(zoptions, "async", "1"); 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); @@ -381,25 +389,27 @@ 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, con->connect_timeout); + iochan_settimeout(con->iochan, con->operation_timeout); iochan_setdata(con->iochan, con); iochan_setsocketfun(con->iochan, socketfun); iochan_setmaskfun(con->iochan, maskfun); - pazpar2_add_channel(con->iochan); + iochan_add(iochan_man, con->iochan); /* 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; } @@ -410,7 +420,8 @@ const char *connection_get_url(struct connection *co) // Ensure that client has a connection associated int client_prep_connection(struct client *cl, - int connect_timeout, int session_timeout) + int operation_timeout, int session_timeout, + iochan_man_t iochan_man) { struct connection *co; struct session *se = client_get_session(cl); @@ -421,6 +432,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)); @@ -446,15 +460,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 */ - co->connect_timeout = connect_timeout; - co->session_timeout = session_timeout; ZOOM_connection_connect(co->link, 0, 0); } else { - co = connection_create(cl, connect_timeout, session_timeout); + co = connection_create(cl, operation_timeout, session_timeout, + iochan_man); } }