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
Reclists work.
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
979f739
..
7b0a027
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-42,12
+42,10
@@
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#include <yaz/comstack.h>
#include <yaz/tcpip.h>
#include "connection.h"
#include <yaz/comstack.h>
#include <yaz/tcpip.h>
#include "connection.h"
-#include "eventl.h"
#include "pazpar2.h"
#include "host.h"
#include "client.h"
#include "settings.h"
#include "pazpar2.h"
#include "host.h"
#include "client.h"
#include "settings.h"
-#include "parameters.h"
/** \brief Represents a physical, reusable connection to a remote Z39.50 host
/** \brief Represents a physical, reusable connection to a remote Z39.50 host
@@
-65,7
+63,7
@@
struct connection {
Conn_Connecting,
Conn_Open
} state;
Conn_Connecting,
Conn_Open
} state;
- int connect_timeout;
+ int operation_timeout;
int session_timeout;
struct connection *next; // next for same host or next in free list
};
int session_timeout;
struct connection *next; // next for same host or next in free list
};
@@
-136,7
+134,7
@@
void connection_destroy(struct connection *co)
// Creates a new connection for client, associated with the host of
// client's database
static struct connection *connection_create(struct client *cl,
// Creates a new connection for client, associated with the host of
// client's database
static struct connection *connection_create(struct client *cl,
- int connect_timeout,
+ int operation_timeout,
int session_timeout)
{
struct connection *new;
int session_timeout)
{
struct connection *new;
@@
-158,7
+156,7
@@
static struct connection *connection_create(struct client *cl,
client_set_connection(cl, new);
new->link = 0;
new->state = Conn_Resolving;
client_set_connection(cl, new);
new->link = 0;
new->state = Conn_Resolving;
- new->connect_timeout = connect_timeout;
+ new->operation_timeout = operation_timeout;
new->session_timeout = session_timeout;
if (host->ipport)
connection_connect(new);
new->session_timeout = session_timeout;
if (host->ipport)
connection_connect(new);
@@
-190,6
+188,7
@@
static void non_block_events(struct connection *co)
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_url(cl));
}
yaz_log(YLOG_LOG, "Error %s from %s",
error, client_get_url(cl));
}
+ iochan_settimeout(iochan, co->session_timeout);
client_set_state(cl, Client_Idle);
}
break;
client_set_state(cl, Client_Idle);
}
break;
@@
-201,13
+200,13
@@
static void non_block_events(struct connection *co)
break;
case ZOOM_EVENT_SEND_APDU:
client_set_state(co->client, Client_Working);
break;
case ZOOM_EVENT_SEND_APDU:
client_set_state(co->client, Client_Working);
+ iochan_settimeout(iochan, co->operation_timeout);
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;
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, co->session_timeout);
break;
case ZOOM_EVENT_RECV_SEARCH:
client_search_response(cl);
break;
case ZOOM_EVENT_RECV_SEARCH:
client_search_response(cl);
@@
-391,7
+390,7
@@
static int connection_connect(struct connection *con)
con->link = link;
con->iochan = iochan_create(0, connection_handler, 0);
con->state = Conn_Connecting;
con->link = link;
con->iochan = iochan_create(0, connection_handler, 0);
con->state = Conn_Connecting;
- iochan_settimeout(con->iochan, con->connect_timeout);
+ iochan_settimeout(con->iochan, con->operation_timeout);
iochan_setdata(con->iochan, con);
iochan_setsocketfun(con->iochan, socketfun);
iochan_setmaskfun(con->iochan, maskfun);
iochan_setdata(con->iochan, con);
iochan_setsocketfun(con->iochan, socketfun);
iochan_setmaskfun(con->iochan, maskfun);
@@
-400,8
+399,6
@@
static int connection_connect(struct connection *con)
/* this fragment is bad DRY: from client_prep_connection */
client_set_state(con->client, Client_Connecting);
ZOOM_options_destroy(zoptions);
/* this fragment is bad DRY: from client_prep_connection */
client_set_state(con->client, Client_Connecting);
ZOOM_options_destroy(zoptions);
- // This creates the connection
- ZOOM_connection_process(link);
return 0;
}
return 0;
}
@@
-412,7
+409,7
@@
const char *connection_get_url(struct connection *co)
// Ensure that client has a connection associated
int client_prep_connection(struct client *cl,
// Ensure that client has a connection associated
int client_prep_connection(struct client *cl,
- int connect_timeout, int session_timeout)
+ int operation_timeout, int session_timeout)
{
struct connection *co;
struct session *se = client_get_session(cl);
{
struct connection *co;
struct session *se = client_get_session(cl);
@@
-423,6
+420,9
@@
int client_prep_connection(struct client *cl,
if (zproxy && zproxy[0] == '\0')
zproxy = 0;
if (zproxy && zproxy[0] == '\0')
zproxy = 0;
+ if (!host)
+ return 0;
+
co = client_get_connection(cl);
yaz_log(YLOG_DEBUG, "Client prep %s", client_get_url(cl));
co = client_get_connection(cl);
yaz_log(YLOG_DEBUG, "Client prep %s", client_get_url(cl));
@@
-448,15
+448,15
@@
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;
+ co->operation_timeout = operation_timeout;
+ co->session_timeout = session_timeout;
/* tells ZOOM to reconnect if necessary. Disabled becuase
the ZOOM_connection_connect flushes the task queue */
/* tells ZOOM to reconnect if necessary. Disabled becuase
the ZOOM_connection_connect flushes the task queue */
- co->connect_timeout = connect_timeout;
- co->session_timeout = session_timeout;
ZOOM_connection_connect(co->link, 0, 0);
}
else
{
ZOOM_connection_connect(co->link, 0, 0);
}
else
{
- co = connection_create(cl, connect_timeout, session_timeout);
+ co = connection_create(cl, operation_timeout, session_timeout);
}
}
}
}