X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Fconnection.c;h=11de6b2c5c214210145cf8e4623be2cad072e801;hb=8a78bbf3382e2061c68c866a37904e8e14770cf8;hp=e079eae58f5753e6d492e03ef5c7f1f2c99eb525;hpb=4a61cdbbd827ee9ccb50aa84611fa262432da084;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index e079eae..11de6b2 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,5 @@ -/* $Id: connection.c,v 1.8 2007-07-25 11:41:32 adam Exp $ - Copyright (c) 2006-2007, Index Data. - -This file is part of Pazpar2. +/* This file is part of Pazpar2. + Copyright (C) 2006-2008 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 @@ -14,30 +12,43 @@ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License -along with Pazpar2; see the file LICENSE. If not, write to the -Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. - */ +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +*/ /** \file connection.c \brief Z39.50 connection (low-level client) */ +#if HAVE_CONFIG_H +#include +#endif + #include #include #include +#if HAVE_SYS_TIME_H #include +#endif +#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 -#if HAVE_CONFIG_H -#include "cconfig.h" -#endif - #include #include #include @@ -54,23 +65,58 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA */ struct connection { IOCHAN iochan; - COMSTACK link; + ZOOM_connection link; + ZOOM_resultset resultset; struct host *host; struct client *client; char *ibuf; int ibufsize; char *authentication; // Empty string or authentication string if set + char *zproxy; enum { Conn_Resolving, Conn_Connecting, - Conn_Open, - Conn_Waiting, + Conn_Open } state; struct connection *next; // next for same host or next in free list }; static struct connection *connection_freelist = 0; +static int connection_is_idle(struct connection *co) +{ + ZOOM_connection link = co->link; + int event = ZOOM_connection_peek_event(link); + + if (co->state != Conn_Open) + return 0; + + link = co->link; + event = ZOOM_connection_peek_event(link); + if (event == ZOOM_EVENT_NONE || + event == ZOOM_EVENT_END) + return 1; + else + return 0; +} + +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; @@ -92,9 +138,11 @@ void connection_destroy(struct connection *co) { if (co->link) { - cs_close(co->link); + 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); @@ -103,6 +151,8 @@ void connection_destroy(struct connection *co) { client_disconnect(co->client); } + xfree(co->zproxy); + co->zproxy = 0; co->next = connection_freelist; connection_freelist = co; } @@ -127,9 +177,11 @@ struct connection *connection_create(struct client *cl) new->host->connections = new; new->client = cl; new->authentication = ""; + new->zproxy = 0; client_set_connection(cl, new); new->link = 0; - new->state = Conn_Resolving; + new->resultset = 0; + new->state = Conn_Connecting; if (host->ipport) connection_connect(new); return new; @@ -163,108 +215,55 @@ static void connection_handler(IOCHAN i, int event) } return; } - if (co->state == Conn_Connecting && event & EVENT_OUTPUT) - { - int errcode; - socklen_t errlen = sizeof(errcode); - - if (getsockopt(cs_fileno(co->link), SOL_SOCKET, SO_ERROR, &errcode, - &errlen) < 0 || errcode != 0) - { - client_fatal(cl); - return; - } - else - { - yaz_log(YLOG_DEBUG, "Connect OK"); - co->state = Conn_Open; - if (cl) - client_set_state(cl, Client_Connected); - iochan_settimeout(i, global_parameters.z3950_session_timeout); - } - } - - else if (event & EVENT_INPUT) + else { - int len = cs_get(co->link, &co->ibuf, &co->ibufsize); - - if (len < 0) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, "Error reading from %s", - client_get_url(cl)); - connection_destroy(co); - return; - } - else if (len == 0) - { - yaz_log(YLOG_WARN, "EOF reading from %s", client_get_url(cl)); - connection_destroy(co); - return; - } - else if (len > 1) // We discard input if we have no connection - { - co->state = Conn_Open; + ZOOM_connection link = co->link; - if (client_is_our_response(cl)) - { - Z_APDU *a; - struct session_database *sdb = client_get_database(cl); - const char *apdulog = session_setting_oneval(sdb, PZ_APDULOG); - - odr_reset(global_parameters.odr_in); - odr_setbuf(global_parameters.odr_in, co->ibuf, len, 0); - if (!z_APDU(global_parameters.odr_in, &a, 0, 0)) - { - client_fatal(cl); - return; - } - - if (apdulog && *apdulog && *apdulog != '0') - { - ODR p = odr_createmem(ODR_PRINT); - yaz_log(YLOG_LOG, "recv APDU %s", client_get_url(cl)); - - odr_setprint(p, yaz_log_file()); - z_APDU(p, &a, 0, 0); - odr_setprint(p, stderr); - odr_destroy(p); - } - switch (a->which) + if (ZOOM_event(1, &link)) + { + do { + int event = ZOOM_connection_last_event(link); + switch (event) { - case Z_APDU_initResponse: - client_init_response(cl, a); + case ZOOM_EVENT_END: + break; + case ZOOM_EVENT_SEND_DATA: break; - case Z_APDU_searchResponse: - client_search_response(cl, a); + case ZOOM_EVENT_RECV_DATA: break; - case Z_APDU_presentResponse: - client_present_response(cl, a); + case ZOOM_EVENT_UNKNOWN: break; - case Z_APDU_close: - client_close_response(cl, a); + 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_WARN, - "Unexpected Z39.50 response from %s", - client_get_url(cl)); - client_fatal(cl); - return; + yaz_log(YLOG_LOG, "Unhandled event (%d) from %s", + event, client_get_url(cl)); } - // We aren't expecting staggered output from target - // if (cs_more(t->link)) - // iochan_setevent(i, EVENT_INPUT); } - else // we throw away response and go to idle mode - { - yaz_log(YLOG_DEBUG, "Ignoring result of expired operation"); - client_set_state(cl, Client_Idle); - } - } - /* if len==1 we do nothing but wait for more input */ + while(ZOOM_event_nonblock(1, &link)); + } } - client_continue(cl); } + // Disassociate connection from client void connection_release(struct connection *co) { @@ -289,117 +288,105 @@ void connect_resolver_host(struct host *host) connection_destroy(con); /* start all over .. at some point it will be NULL */ con = host->connections; + continue; } else if (!con->client) { - yaz_log(YLOG_WARN, "connect_unresolved_host : ophan client"); connection_destroy(con); /* start all over .. at some point it will be NULL */ con = host->connections; + continue; } else { connection_connect(con); - con = con->next; } } + else + { + yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state); + } + con = con->next; } } -int connection_send_apdu(struct connection *co, Z_APDU *a) +struct host *connection_get_host(struct connection *con) { - char *buf; - int len, r; + return con->host; +} - if (!z_APDU(global_parameters.odr_out, &a, 0, 0)) - { - odr_perror(global_parameters.odr_out, "Encoding APDU"); - abort(); - } - buf = odr_getbuf(global_parameters.odr_out, &len, 0); - r = cs_put(co->link, buf, len); - if (r < 0) - { - yaz_log(YLOG_WARN, "cs_put: %s", cs_errmsg(cs_errno(co->link))); +// Callback for use by event loop +// We do this because ZOOM connections don't always have (the same) sockets +static int socketfun(IOCHAN c) +{ + struct connection *co = iochan_getdata(c); + if (!co->link) return -1; - } - else if (r == 1) - { - fprintf(stderr, "cs_put incomplete (ParaZ does not handle that)\n"); - exit(1); - } - odr_reset(global_parameters.odr_out); /* release the APDU structure */ - co->state = Conn_Waiting; - iochan_setflags(co->iochan, EVENT_INPUT); - return 0; + return ZOOM_connection_get_socket(co->link); } -struct host *connection_get_host(struct connection *con) +// Because ZOOM always knows what events it is interested in; we may not +static int maskfun(IOCHAN c) { - return con->host; + struct connection *co = iochan_getdata(c); + if (!co->link) + return 0; + + // This is cheating a little, and assuming that eventl mask IDs are always + // the same as ZOOM-C's. + return ZOOM_connection_get_mask(co->link); } int connection_connect(struct connection *con) { - COMSTACK link = 0; + ZOOM_connection link = 0; struct host *host = connection_get_host(con); - void *addr; - int res; + ZOOM_options zoptions = ZOOM_options_create(); + char *auth; struct session_database *sdb = client_get_database(con->client); - char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); + const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); assert(host->ipport); assert(con); - if (!(link = cs_create(tcpip_type, 0, PROTO_Z3950))) + ZOOM_options_set(zoptions, "async", "1"); + ZOOM_options_set(zoptions, "implementationName", + global_parameters.implementationName); + ZOOM_options_set(zoptions, "implementationVersion", + global_parameters.implementationVersion); + + if (zproxy && *zproxy) { - yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create comstack"); - return -1; + con->zproxy = xstrdup(zproxy); + ZOOM_options_set(zoptions, "proxy", zproxy); } - - if (!zproxy || 0 == strlen(zproxy)){ - /* no Z39.50 proxy needed - direct connect */ - yaz_log(YLOG_DEBUG, "Connection create %s", connection_get_url(con)); - - if (!(addr = cs_straddr(link, host->ipport))) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, - "Lookup of IP address %s failed", host->ipport); - return -1; - } - - } else { - /* Z39.50 proxy connect */ - yaz_log(YLOG_DEBUG, "Connection create %s proxy %s", - connection_get_url(con), zproxy); - - if (!(addr = cs_straddr(link, zproxy))) - { - yaz_log(YLOG_WARN|YLOG_ERRNO, - "Lookup of ZProxy IP address %s failed", - zproxy); - return -1; - } - } - - res = cs_connect(link, addr); - if (res < 0) + + if ((auth = (char*) session_setting_oneval(sdb, PZ_AUTHENTICATION))) + ZOOM_options_set(zoptions, "user", auth); + + if (!(link = ZOOM_connection_create(zoptions))) { - yaz_log(YLOG_WARN|YLOG_ERRNO, "cs_connect %s", - connection_get_url(con)); + yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create ZOOM Connection"); + ZOOM_options_destroy(zoptions); return -1; } + ZOOM_connection_connect(link, host->ipport, 0); + con->link = link; + con->iochan = iochan_create(0, connection_handler, 0); con->state = Conn_Connecting; - con->iochan = iochan_create(cs_fileno(link), connection_handler, 0); iochan_settimeout(con->iochan, global_parameters.z3950_connect_timeout); iochan_setdata(con->iochan, con); + iochan_setsocketfun(con->iochan, socketfun); + iochan_setmaskfun(con->iochan, maskfun); pazpar2_add_channel(con->iochan); /* this fragment is bad DRY: from client_prep_connection */ client_set_state(con->client, Client_Connecting); - iochan_setflag(con->iochan, EVENT_OUTPUT); + ZOOM_options_destroy(zoptions); + // This creates the connection + ZOOM_connection_process(link); return 0; } @@ -419,6 +406,11 @@ int client_prep_connection(struct client *cl) struct connection *co; struct session *se = client_get_session(cl); struct host *host = client_get_host(cl); + struct session_database *sdb = client_get_database(cl); + const char *zproxy = session_setting_oneval(sdb, PZ_ZPROXY); + + if (zproxy && zproxy[0] == '\0') + zproxy = 0; co = client_get_connection(cl); @@ -429,12 +421,17 @@ int client_prep_connection(struct client *cl) // See if someone else has an idle connection // We should look at timestamps here to select the longest-idle connection for (co = host->connections; co; co = co->next) - if (co->state == Conn_Open && + 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))) - break; + { + if (zproxy == 0 && co->zproxy == 0) + break; + if (zproxy && co->zproxy && !strcmp(zproxy, co->zproxy)) + break; + } if (co) { connection_release(co); @@ -444,26 +441,18 @@ int client_prep_connection(struct client *cl) else co = connection_create(cl); } + if (co) - { - if (co->state == Conn_Connecting) - { - client_set_state(cl, Client_Connecting); - iochan_setflag(co->iochan, EVENT_OUTPUT); - } - else if (co->state == Conn_Open) - { - if (client_get_state(cl) == Client_Error - || client_get_state(cl) == Client_Disconnected) - client_set_state(cl, Client_Idle); - iochan_setflag(co->iochan, EVENT_OUTPUT); - } return 1; - } else return 0; } +// DELETEME + + +int connection_send_apdu(struct connection *co, Z_APDU *a){return 10;} + /*