X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Fconnection.c;h=c330155ebdff37dc8f83d6c5df444327e94b3024;hb=3f46a4cb43b195b827e585b8806a9fcd3f23d466;hp=109aa5819d6840d069f890ba6482b41637ec7e0d;hpb=247113bc4211efc45bdff87daefa8796561c89b5;p=pazpar2-moved-to-github.git diff --git a/src/connection.c b/src/connection.c index 109aa58..c330155 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,5 @@ -/* $Id: connection.c,v 1.7 2007-07-12 08:01:06 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 @@ -60,6 +71,7 @@ struct connection { char *ibuf; int ibufsize; char *authentication; // Empty string or authentication string if set + char *zproxy; enum { Conn_Resolving, Conn_Connecting, @@ -103,6 +115,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,6 +141,7 @@ 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; @@ -168,7 +183,7 @@ static void connection_handler(IOCHAN i, int event) int errcode; socklen_t errlen = sizeof(errcode); - if (getsockopt(cs_fileno(co->link), SOL_SOCKET, SO_ERROR, &errcode, + if (getsockopt(cs_fileno(co->link), SOL_SOCKET, SO_ERROR, (char*) &errcode, &errlen) < 0 || errcode != 0) { client_fatal(cl); @@ -180,7 +195,7 @@ static void connection_handler(IOCHAN i, int event) co->state = Conn_Open; if (cl) client_set_state(cl, Client_Connected); - iochan_settimeout(i, 180); + iochan_settimeout(i, global_parameters.z3950_session_timeout); } } @@ -257,7 +272,7 @@ static void connection_handler(IOCHAN i, int event) 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); + client_set_state(cl, Client_Continue); } } /* if len==1 we do nothing but wait for more input */ @@ -289,20 +304,25 @@ 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; } } @@ -326,7 +346,7 @@ int connection_send_apdu(struct connection *co, Z_APDU *a) else if (r == 1) { fprintf(stderr, "cs_put incomplete (ParaZ does not handle that)\n"); - exit(1); + return -1;; } odr_reset(global_parameters.odr_out); /* release the APDU structure */ co->state = Conn_Waiting; @@ -347,7 +367,7 @@ int connection_connect(struct connection *con) int res; 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); @@ -357,8 +377,12 @@ int connection_connect(struct connection *con) yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create comstack"); return -1; } - - if (!zproxy || 0 == strlen(zproxy)){ + + if (zproxy && *zproxy) + con->zproxy = xstrdup(zproxy); + + if (!con->zproxy) + { /* no Z39.50 proxy needed - direct connect */ yaz_log(YLOG_DEBUG, "Connection create %s", connection_get_url(con)); @@ -372,13 +396,13 @@ int connection_connect(struct connection *con) } else { /* Z39.50 proxy connect */ yaz_log(YLOG_DEBUG, "Connection create %s proxy %s", - connection_get_url(con), zproxy); + connection_get_url(con), con->zproxy); - if (!(addr = cs_straddr(link, zproxy))) + if (!(addr = cs_straddr(link, con->zproxy))) { yaz_log(YLOG_WARN|YLOG_ERRNO, "Lookup of ZProxy IP address %s failed", - zproxy); + con->zproxy); return -1; } } @@ -393,7 +417,7 @@ int connection_connect(struct connection *con) con->link = link; con->state = Conn_Connecting; con->iochan = iochan_create(cs_fileno(link), connection_handler, 0); - iochan_settimeout(con->iochan, 30); + iochan_settimeout(con->iochan, global_parameters.z3950_connect_timeout); iochan_setdata(con->iochan, con); pazpar2_add_channel(con->iochan); @@ -419,6 +443,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); @@ -434,7 +463,12 @@ int client_prep_connection(struct client *cl) !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); @@ -454,8 +488,9 @@ int client_prep_connection(struct client *cl) 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); + || client_get_state(cl) == Client_Disconnected + || client_get_state(cl) == Client_Idle) + client_set_state(cl, Client_Continue); iochan_setflag(co->iochan, EVENT_OUTPUT); } return 1;