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
Add check of configuration (-t).
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
b567114
..
8d8d48f
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,5
+1,5
@@
/* This file is part of Pazpar2.
/* This file is part of Pazpar2.
- Copyright (C) 2006-2008 Index Data
+ Copyright (C) 2006-2009 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
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
@@
-34,19
+34,8
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
#if HAVE_UNISTD_H
#include <unistd.h>
#endif
-#if HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-#ifdef WIN32
-#include <winsock.h>
-typedef int socklen_t;
-#endif
-#if HAVE_NETDB_H
-#include <netdb.h>
-#endif
#include <signal.h>
#include <signal.h>
-#include <ctype.h>
#include <assert.h>
#include <yaz/log.h>
#include <assert.h>
#include <yaz/log.h>
@@
-66,7
+55,6
@@
typedef int socklen_t;
struct connection {
IOCHAN iochan;
ZOOM_connection link;
struct connection {
IOCHAN iochan;
ZOOM_connection link;
- ZOOM_resultset resultset;
struct host *host;
struct client *client;
char *ibuf;
struct host *host;
struct client *client;
char *ibuf;
@@
-92,9
+80,10
@@
static int connection_is_idle(struct connection *co)
if (co->state != Conn_Open || !link)
return 0;
if (co->state != Conn_Open || !link)
return 0;
+ if (!ZOOM_connection_is_idle(link))
+ return 0;
event = ZOOM_connection_peek_event(link);
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;
return 1;
else
return 0;
@@
-105,18
+94,6
@@
ZOOM_connection connection_get_link(struct connection *co)
return co->link;
}
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;
static void remove_connection_from_host(struct connection *con)
{
struct connection **conp = &con->host->connections;
@@
-133,12
+110,6
@@
static void remove_connection_from_host(struct connection *con)
assert(*conp == 0);
}
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)
{
// Close connection and recycle structure
void connection_destroy(struct connection *co)
{
@@
-147,9
+118,6
@@
void connection_destroy(struct connection *co)
ZOOM_connection_destroy(co->link);
iochan_destroy(co->iochan);
}
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);
remove_connection_from_host(co);
yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
remove_connection_from_host(co);
@@
-185,16
+153,16
@@
static struct connection *connection_create(struct client *cl)
new->zproxy = 0;
client_set_connection(cl, new);
new->link = 0;
new->zproxy = 0;
client_set_connection(cl, new);
new->link = 0;
- new->resultset = 0;
new->state = Conn_Resolving;
if (host->ipport)
connection_connect(new);
return new;
}
new->state = Conn_Resolving;
if (host->ipport)
connection_connect(new);
return new;
}
-static void non_block_events(struct connection *co, IOCHAN iochan)
+static void non_block_events(struct connection *co)
{
struct client *cl = co->client;
{
struct client *cl = co->client;
+ IOCHAN iochan = co->iochan;
ZOOM_connection link = co->link;
while (1)
{
ZOOM_connection link = co->link;
while (1)
{
@@
-203,10
+171,21
@@
static void non_block_events(struct connection *co, IOCHAN iochan)
if (!r)
break;
ev = ZOOM_connection_last_event(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:
switch (ev)
{
case ZOOM_EVENT_END:
- client_set_state(co->client, Client_Idle);
+ {
+ 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;
break;
case ZOOM_EVENT_SEND_DATA:
break;
@@
-222,15
+201,12
@@
static void non_block_events(struct connection *co, IOCHAN iochan)
case ZOOM_EVENT_CONNECT:
yaz_log(YLOG_LOG, "Connected to %s", client_get_url(cl));
co->state = Conn_Open;
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(iochan, global_parameters.z3950_session_timeout);
break;
case ZOOM_EVENT_RECV_SEARCH:
iochan_settimeout(iochan, 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:
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:
client_record_response(cl);
break;
default:
@@
-240,6
+216,11
@@
static void non_block_events(struct connection *co, IOCHAN iochan)
}
}
}
}
+void connection_continue(struct connection *co)
+{
+ non_block_events(co);
+}
+
static void connection_handler(IOCHAN iochan, int event)
{
struct connection *co = iochan_getdata(iochan);
static void connection_handler(IOCHAN iochan, int event)
{
struct connection *co = iochan_getdata(iochan);
@@
-269,11
+250,11
@@
static void connection_handler(IOCHAN iochan, int event)
}
else
{
}
else
{
- non_block_events(co, iochan);
+ non_block_events(co);
ZOOM_connection_fire_event_socket(co->link, event);
ZOOM_connection_fire_event_socket(co->link, event);
- non_block_events(co, iochan);
+ non_block_events(co);
}
}
}
}
@@
-370,10
+351,8
@@
static int connection_connect(struct connection *con)
assert(con);
ZOOM_options_set(zoptions, "async", "1");
assert(con);
ZOOM_options_set(zoptions, "async", "1");
- ZOOM_options_set(zoptions, "implementationName",
- global_parameters.implementationName);
- ZOOM_options_set(zoptions, "implementationVersion",
- global_parameters.implementationVersion);
+ ZOOM_options_set(zoptions, "implementationName", PACKAGE_NAME);
+ ZOOM_options_set(zoptions, "implementationVersion", VERSION);
if (zproxy && *zproxy)
{
con->zproxy = xstrdup(zproxy);
if (zproxy && *zproxy)
{
con->zproxy = xstrdup(zproxy);
@@
-400,16
+379,7
@@
static int connection_connect(struct connection *con)
if (sru && *sru)
strcpy(ipport, "http://");
strcat(ipport, host->ipport);
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;
ZOOM_connection_connect(link, ipport, 0);
con->link = link;
@@
-471,9
+441,14
@@
int client_prep_connection(struct client *cl)
connection_release(co);
client_set_connection(cl, co);
co->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
}
else
+ {
co = connection_create(cl);
co = connection_create(cl);
+ }
}
if (co && co->link)
}
if (co && co->link)
@@
-485,7
+460,9
@@
int client_prep_connection(struct client *cl)
/*
* Local variables:
* c-basic-offset: 4
/*
* Local variables:
* c-basic-offset: 4
+ * c-file-style: "Stroustrup"
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
* indent-tabs-mode: nil
* End:
* vim: shiftwidth=4 tabstop=8 expandtab
*/
+