struct host *host;
struct client *client;
char *zproxy;
+ char *url;
enum {
Conn_Closed,
Conn_Connecting,
ZOOM_connection_destroy(co->link);
iochan_destroy(co->iochan);
}
- yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->host->url);
+ yaz_log(YLOG_DEBUG, "%p Connection destroy %s", co, co->url);
if (co->client)
{
}
xfree(co->zproxy);
+ xfree(co->url);
xfree(co);
connection_use(-1);
}
// Creates a new connection for client, associated with the host of
// client's database
static struct connection *connection_create(struct client *cl,
+ const char *url,
struct host *host,
int operation_timeout,
int session_timeout,
co->host = host;
co->client = cl;
+ co->url = xstrdup(url);
co->zproxy = 0;
client_set_connection(cl, co);
co->link = 0;
{
struct connection *con;
-start:
yaz_mutex_enter(host->mutex);
con = host->connections;
while (con)
{
if (con->state == Conn_Closed)
{
- if (!host->ipport) /* unresolved */
+ if (!host->ipport || !con->client) /* unresolved or no client */
{
remove_connection_from_host(con);
yaz_mutex_leave(host->mutex);
connection_destroy(con);
- goto start;
- /* start all over .. at some point it will be NULL */
- }
- else if (!con->client)
- {
- remove_connection_from_host(con);
- yaz_mutex_leave(host->mutex);
- connection_destroy(con);
- /* start all over .. at some point it will be NULL */
- goto start;
}
else
{
- yaz_mutex_leave(host->mutex);
- connection_connect(con, iochan_man);
- client_start_search(con->client);
- goto start;
+ struct session_database *sdb = client_get_database(con->client);
+ if (sdb)
+ {
+ yaz_mutex_leave(host->mutex);
+ connection_connect(con, iochan_man);
+ client_start_search(con->client);
+ }
+ else
+ {
+ remove_connection_from_host(con);
+ yaz_mutex_leave(host->mutex);
+ connection_destroy(con);
+ }
}
+ /* start all over .. at some point it will be NULL */
+ yaz_mutex_enter(host->mutex);
+ con = host->connections;
}
else
{
ZOOM_options_set(zoptions, "apdulog", apdulog);
if ((auth = session_setting_oneval(sdb, PZ_AUTHENTICATION)))
- ZOOM_options_set(zoptions, "user", auth);
+ {
+ const char *cp1 = strchr(auth, ' ');
+ if (!cp1)
+ ZOOM_options_set(zoptions, "user", auth);
+ else
+ {
+ const char *cp2 = strchr(cp1 + 1, ' ');
+
+ ZOOM_options_setl(zoptions, "user", auth, cp1 - auth);
+ if (!cp2)
+ ZOOM_options_set(zoptions, "password", cp1 + 1);
+ else
+ {
+ ZOOM_options_setl(zoptions, "group", cp1 + 1, cp2 - cp1 - 1);
+ ZOOM_options_set(zoptions, "password", cp2 + 1);
+ }
+ }
+ }
if ((sru = session_setting_oneval(sdb, PZ_SRU)) && *sru)
ZOOM_options_set(zoptions, "sru", sru);
if ((sru_version = session_setting_oneval(sdb, PZ_SRU_VERSION))
return -1;
}
- if (sru && *sru && !strstr(host->url, "://"))
+ if (sru && *sru && !strstr(con->url, "://"))
{
WRBUF w = wrbuf_alloc();
wrbuf_puts(w, "http://");
- wrbuf_puts(w, host->url);
+ wrbuf_puts(w, con->url);
+ ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
+ wrbuf_destroy(w);
+ }
+ else if (strchr(con->url, '#'))
+ {
+ const char *cp = strchr(con->url, '#');
+ WRBUF w = wrbuf_alloc();
+ wrbuf_write(w, con->url, cp - con->url);
ZOOM_connection_connect(con->link, wrbuf_cstr(w), 0);
wrbuf_destroy(w);
}
else
{
- ZOOM_connection_connect(con->link, host->url, 0);
+ ZOOM_connection_connect(con->link, con->url, 0);
}
con->iochan = iochan_create(-1, connection_handler, 0, "connection_socket");
con->state = Conn_Connecting;
return 0;
co = client_get_connection(cl);
-
if (co)
{
assert(co->host);
{
return 2;
}
- client_incref(cl);
connection_release(co);
co = 0;
}
for (co = host->connections; co; co = co->next)
{
if (connection_is_idle(co) &&
+ !strcmp(url, co->url) &&
(!co->client || client_get_state(co->client) == Client_Idle) &&
!strcmp(ZOOM_connection_option_get(co->link, "user"),
session_setting_oneval(client_get_database(cl),
else
{
yaz_mutex_leave(host->mutex);
- co = connection_create(cl, host, operation_timeout, session_timeout,
+ co = connection_create(cl, url, host,
+ operation_timeout, session_timeout,
iochan_man);
}
assert(co->host);