projects
/
pazpar2-moved-to-github.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Lower _connect_ timeout to 15 seconds.
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
a75066e
..
a8c9f20
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,4
+1,4
@@
-/* $Id: connection.c,v 1.6 2007-07-03 11:21:48 adam Exp $
+/* $Id: connection.c,v 1.12 2007-09-20 08:13:27 adam Exp $
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
Copyright (c) 2006-2007, Index Data.
This file is part of Pazpar2.
@@
-60,6
+60,7
@@
struct connection {
char *ibuf;
int ibufsize;
char *authentication; // Empty string or authentication string if set
char *ibuf;
int ibufsize;
char *authentication; // Empty string or authentication string if set
+ char *zproxy;
enum {
Conn_Resolving,
Conn_Connecting,
enum {
Conn_Resolving,
Conn_Connecting,
@@
-103,6
+104,8
@@
void connection_destroy(struct connection *co)
{
client_disconnect(co->client);
}
{
client_disconnect(co->client);
}
+ xfree(co->zproxy);
+ co->zproxy = 0;
co->next = connection_freelist;
connection_freelist = co;
}
co->next = connection_freelist;
connection_freelist = co;
}
@@
-127,6
+130,7
@@
struct connection *connection_create(struct client *cl)
new->host->connections = new;
new->client = cl;
new->authentication = "";
new->host->connections = new;
new->client = cl;
new->authentication = "";
+ new->zproxy = 0;
client_set_connection(cl, new);
new->link = 0;
new->state = Conn_Resolving;
client_set_connection(cl, new);
new->link = 0;
new->state = Conn_Resolving;
@@
-145,7
+149,6
@@
static void connection_handler(IOCHAN i, int event)
se = client_get_session(cl);
else
{
se = client_get_session(cl);
else
{
- yaz_log(YLOG_WARN, "Destroying orphan connection");
connection_destroy(co);
return;
}
connection_destroy(co);
return;
}
@@
-181,7
+184,7
@@
static void connection_handler(IOCHAN i, int event)
co->state = Conn_Open;
if (cl)
client_set_state(cl, Client_Connected);
co->state = Conn_Open;
if (cl)
client_set_state(cl, Client_Connected);
- iochan_settimeout(i, 180);
+ iochan_settimeout(i, global_parameters.z3950_session_timeout);
}
}
}
}
@@
-258,7
+261,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");
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 */
}
}
/* if len==1 we do nothing but wait for more input */
@@
-290,20
+293,25
@@
void connect_resolver_host(struct host *host)
connection_destroy(con);
/* start all over .. at some point it will be NULL */
con = host->connections;
connection_destroy(con);
/* start all over .. at some point it will be NULL */
con = host->connections;
+ continue;
}
else if (!con->client)
{
}
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;
connection_destroy(con);
/* start all over .. at some point it will be NULL */
con = host->connections;
+ continue;
}
else
{
connection_connect(con);
}
else
{
connection_connect(con);
- con = con->next;
}
}
}
}
+ else
+ {
+ yaz_log(YLOG_LOG, "connect_resolver_host: state=%d", con->state);
+ }
+ con = con->next;
}
}
}
}
@@
-327,7
+335,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");
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;
}
odr_reset(global_parameters.odr_out); /* release the APDU structure */
co->state = Conn_Waiting;
@@
-348,7
+356,7
@@
int connection_connect(struct connection *con)
int res;
struct session_database *sdb = client_get_database(con->client);
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);
assert(host->ipport);
assert(con);
@@
-358,8
+366,12
@@
int connection_connect(struct connection *con)
yaz_log(YLOG_FATAL|YLOG_ERRNO, "Failed to create comstack");
return -1;
}
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));
/* no Z39.50 proxy needed - direct connect */
yaz_log(YLOG_DEBUG, "Connection create %s", connection_get_url(con));
@@
-373,13
+385,13
@@
int connection_connect(struct connection *con)
} else {
/* Z39.50 proxy connect */
yaz_log(YLOG_DEBUG, "Connection create %s proxy %s",
} 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",
{
yaz_log(YLOG_WARN|YLOG_ERRNO,
"Lookup of ZProxy IP address %s failed",
- zproxy);
+ con->zproxy);
return -1;
}
}
return -1;
}
}
@@
-394,7
+406,7
@@
int connection_connect(struct connection *con)
con->link = link;
con->state = Conn_Connecting;
con->iochan = iochan_create(cs_fileno(link), connection_handler, 0);
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);
iochan_setdata(con->iochan, con);
pazpar2_add_channel(con->iochan);
@@
-420,6
+432,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 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);
co = client_get_connection(cl);
@@
-435,7
+452,12
@@
int client_prep_connection(struct client *cl)
!strcmp(co->authentication,
session_setting_oneval(client_get_database(cl),
PZ_AUTHENTICATION)))
!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);
if (co)
{
connection_release(co);
@@
-455,8
+477,9
@@
int client_prep_connection(struct client *cl)
else if (co->state == Conn_Open)
{
if (client_get_state(cl) == Client_Error
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;
iochan_setflag(co->iochan, EVENT_OUTPUT);
}
return 1;