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
Work on bug #1162.. PP2 right now always dump the payload text/xml
[pazpar2-moved-to-github.git]
/
src
/
connection.c
diff --git
a/src/connection.c
b/src/connection.c
index
fc7bf9f
..
2a12785
100644
(file)
--- a/
src/connection.c
+++ b/
src/connection.c
@@
-1,4
+1,4
@@
-/* $Id: connection.c,v 1.1 2007-04-23 21:05:23 adam Exp $
+/* $Id: connection.c,v 1.3 2007-06-02 04:32:28 quinn 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.
@@
-46,10
+46,12
@@
Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
#include "pazpar2.h"
#include "host.h"
#include "client.h"
#include "pazpar2.h"
#include "host.h"
#include "client.h"
+#include "settings.h"
#include "parameters.h"
#include "parameters.h"
-// Represents a physical, reusable connection to a remote Z39.50 host
+/** \brief Represents a physical, reusable connection to a remote Z39.50 host
+ */
struct connection {
IOCHAN iochan;
COMSTACK link;
struct connection {
IOCHAN iochan;
COMSTACK link;
@@
-57,20
+59,21
@@
struct connection {
struct client *client;
char *ibuf;
int ibufsize;
struct client *client;
char *ibuf;
int ibufsize;
+ char *authentication; // Empty string or authentication string if set
enum {
Conn_Resolving,
Conn_Connecting,
Conn_Open,
Conn_Waiting,
} state;
enum {
Conn_Resolving,
Conn_Connecting,
Conn_Open,
Conn_Waiting,
} state;
- struct connection *next;
+ struct connection *next; // next for same host or next in free list
};
static struct connection *connection_freelist = 0;
};
static struct connection *connection_freelist = 0;
-void host_remove_connection(struct host *h, struct connection *con)
+static void remove_connection_from_host(struct connection *con)
{
{
- struct connection **conp = &h->connections;
+ struct connection **conp = &con->host->connections;
assert(con);
while (*conp)
{
assert(con);
while (*conp)
{
@@
-87,8
+90,6
@@
void host_remove_connection(struct host *h, struct connection *con)
// Close connection and recycle structure
void connection_destroy(struct connection *co)
{
// Close connection and recycle structure
void connection_destroy(struct connection *co)
{
- struct host *h = co->host;
-
if (co->link)
{
cs_close(co->link);
if (co->link)
{
cs_close(co->link);
@@
-97,7
+98,7
@@
void connection_destroy(struct connection *co)
yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
yaz_log(YLOG_DEBUG, "Connection destroy %s", co->host->hostport);
- host_remove_connection(h, co);
+ remove_connection_from_host(co);
if (co->client)
{
client_disconnect(co->client);
if (co->client)
{
client_disconnect(co->client);
@@
-125,6
+126,7
@@
struct connection *connection_create(struct client *cl)
new->next = new->host->connections;
new->host->connections = new;
new->client = cl;
new->next = new->host->connections;
new->host->connections = new;
new->client = cl;
+ new->authentication = "";
client_set_connection(cl, new);
new->link = 0;
new->state = Conn_Resolving;
client_set_connection(cl, new);
new->link = 0;
new->state = Conn_Resolving;
@@
-375,6
+377,11
@@
const char *connection_get_url(struct connection *co)
return client_get_url(co->client);
}
return client_get_url(co->client);
}
+void connection_set_authentication(struct connection *co, char *auth)
+{
+ co->authentication = auth;
+}
+
// 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)
{
@@
-391,7
+398,11
@@
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)
// 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 && (!co->client || client_get_session(co->client) != se))
+ if (co->state == Conn_Open &&
+ (!co->client || client_get_session(co->client) != se) &&
+ !strcmp(co->authentication,
+ session_setting_oneval(client_get_database(cl),
+ PZ_AUTHENTICATION)))
break;
if (co)
{
break;
if (co)
{