X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=528fef4e6b30d4166bd06b64cd41e6c7da34022d;hb=142c8c510a7b23c633272c656e45277e4ec35d30;hp=e1cf29ed265a7e751d32e30eacc79b1a7765aff3;hpb=243d08d6bd2ebf27ebcd93ac69a74ae5173654c8;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index e1cf29e..528fef4 100644 --- a/src/connection.c +++ b/src/connection.c @@ -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 @@ -92,9 +81,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; @@ -133,12 +123,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) { @@ -192,9 +176,71 @@ static struct connection *connection_create(struct client *cl) return new; } -static void connection_handler(IOCHAN i, int event) +static void non_block_events(struct connection *co) +{ + 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(i); + struct connection *co = iochan_getdata(iochan); struct client *cl = co->client; struct session *se = 0; @@ -218,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: - client_set_state(co->client, 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; - 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); } } @@ -392,16 +398,7 @@ 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]); - } - } + ZOOM_connection_connect(link, ipport, 0); con->link = link; @@ -463,9 +460,14 @@ 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 && co->link)