/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.20 1995-04-20 15:13:00 quinn
+ * Revision 1.60 1996-05-30 11:03:10 quinn
+ * Fixed NextresultSetPosition bug fixed.
+ *
+ * Revision 1.59 1996/05/14 09:26:46 quinn
+ * Added attribute set to scan backend
+ *
+ * Revision 1.58 1996/02/20 12:53:04 quinn
+ * Chanes to SCAN
+ *
+ * Revision 1.57 1996/01/02 08:57:47 quinn
+ * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass
+ *
+ * Revision 1.56 1995/12/14 11:09:57 quinn
+ * Work on Explain
+ *
+ * Revision 1.55 1995/11/08 17:41:37 quinn
+ * Smallish.
+ *
+ * Revision 1.54 1995/11/08 15:11:29 quinn
+ * Log of close transmit.
+ *
+ * Revision 1.53 1995/11/01 13:54:58 quinn
+ * Minor adjustments
+ *
+ * Revision 1.52 1995/11/01 12:19:13 quinn
+ * Second attempt to fix same bug.
+ *
+ * Revision 1.50 1995/10/25 16:58:32 quinn
+ * Simple.
+ *
+ * Revision 1.49 1995/10/16 13:51:53 quinn
+ * Changes to provide Especs to the backend.
+ *
+ * Revision 1.48 1995/10/06 08:51:20 quinn
+ * Added Write-buffer.
+ *
+ * Revision 1.47 1995/08/29 14:24:16 quinn
+ * Added second half of close-handshake
+ *
+ * Revision 1.46 1995/08/29 11:17:58 quinn
+ * Added code to receive close
+ *
+ * Revision 1.45 1995/08/21 09:11:00 quinn
+ * Smallish fixes to suppport new formats.
+ *
+ * Revision 1.44 1995/08/17 12:45:25 quinn
+ * Fixed minor problems with GRS-1. Added support in c&s.
+ *
+ * Revision 1.43 1995/08/15 12:00:31 quinn
+ * Updated External
+ *
+ * Revision 1.42 1995/08/15 11:16:50 quinn
+ *
+ * Revision 1.41 1995/08/02 10:23:06 quinn
+ * Smallish
+ *
+ * Revision 1.40 1995/07/31 14:34:26 quinn
+ * Fixed bug in process_searchResponse (numberOfRecordsReturned).
+ *
+ * Revision 1.39 1995/06/27 13:21:00 quinn
+ * SUTRS support
+ *
+ * Revision 1.38 1995/06/19 12:39:11 quinn
+ * Fixed bug in timeout code. Added BER dumper.
+ *
+ * Revision 1.37 1995/06/16 13:16:14 quinn
+ * Fixed Defaultdiagformat.
+ *
+ * Revision 1.36 1995/06/16 10:31:36 quinn
+ * Added session timeout.
+ *
+ * Revision 1.35 1995/06/15 07:45:14 quinn
+ * Moving to v3.
+ *
+ * Revision 1.34 1995/06/14 15:26:46 quinn
+ * *** empty log message ***
+ *
+ * Revision 1.33 1995/06/06 14:57:05 quinn
+ * Better diagnostics.
+ *
+ * Revision 1.32 1995/06/06 08:41:44 quinn
+ * Better diagnostics.
+ *
+ * Revision 1.31 1995/06/06 08:15:37 quinn
+ * Cosmetic.
+ *
+ * Revision 1.30 1995/06/05 10:53:32 quinn
+ * Added a better SCAN.
+ *
+ * Revision 1.29 1995/06/01 11:25:03 quinn
+ * Smallish.
+ *
+ * Revision 1.28 1995/06/01 11:21:01 quinn
+ * Attempting to fix a bug in pack-records. replaced break with continue
+ * for large records, according to standard.
+ *
+ * Revision 1.27 1995/05/29 08:12:06 quinn
+ * Moved oid to util
+ *
+ * Revision 1.26 1995/05/18 13:02:12 quinn
+ * Smallish.
+ *
+ * Revision 1.25 1995/05/17 08:42:26 quinn
+ * Transfer auth info to backend. Allow backend to reject init gracefully.
+ *
+ * Revision 1.24 1995/05/16 08:51:04 quinn
+ * License, documentation, and memory fixes
+ *
+ * Revision 1.23 1995/05/15 13:25:10 quinn
+ * Fixed memory bug.
+ *
+ * Revision 1.22 1995/05/15 11:56:39 quinn
+ * Asynchronous facilities. Restructuring of seshigh code.
+ *
+ * Revision 1.21 1995/05/02 08:53:19 quinn
+ * Trying in vain to fix comm with ISODE
+ *
+ * Revision 1.20 1995/04/20 15:13:00 quinn
* Cosmetic
*
* Revision 1.19 1995/04/18 08:15:34 quinn
*
*/
+/*
+ * Frontend server logic.
+ *
+ * This code receives incoming APDUs, and handles client requests by means
+ * of the backend API.
+ *
+ * Some of the code is getting quite involved, compared to simpler servers -
+ * primarily because it is asynchronous both in the communication with
+ * the user and the backend. We think the complexity will pay off in
+ * the form of greater flexibility when more asynchronous facilities
+ * are implemented.
+ *
+ * Memory management has become somewhat involved. In the simple case, where
+ * only one PDU is pending at a time, it will simply reuse the same memory,
+ * once it has found its working size. When we enable multiple concurrent
+ * operations, perhaps even with multiple parallel calls to the backend, it
+ * will maintain a pool of buffers for encoding and decoding, trying to
+ * minimize memory allocation/deallocation during normal operation.
+ *
+ * TODOs include (and will be done in order of public interest):
+ *
+ * Support for EXPLAIN - provide simple meta-database system.
+ * Support for access control.
+ * Support for resource control.
+ * Support for extended services - primarily Item Order.
+ * Rest of Z39.50-1994
+ *
+ */
+
#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <assert.h>
+#include <sys/time.h>
+#include <xmalloc.h>
#include <comstack.h>
#include <eventl.h>
#include <session.h>
#include <proto.h>
#include <oid.h>
#include <log.h>
+#include <statserv.h>
#include <backend.h>
-#define MAXRECORDSIZE 1024*1024*5 /* should be configurable, of course */
-
-static int process_apdu(IOCHAN chan);
-static int process_initRequest(IOCHAN client, Z_InitRequest *req);
-static int process_searchRequest(IOCHAN client, Z_SearchRequest *req);
-static int process_presentRequest(IOCHAN client, Z_PresentRequest *req);
-static int process_scanRequest(IOCHAN client, Z_ScanRequest *req);
-
-extern int dynamic;
-extern char *apdufile;
+static int process_request(association *assoc);
+void backend_response(IOCHAN i, int event);
+static int process_response(association *assoc, request *req, Z_APDU *res);
+static Z_APDU *process_initRequest(association *assoc, request *reqb);
+static Z_APDU *process_searchRequest(association *assoc, request *reqb,
+ int *fd);
+static Z_APDU *response_searchRequest(association *assoc, request *reqb,
+ bend_searchresult *bsrt, int *fd);
+static Z_APDU *process_presentRequest(association *assoc, request *reqb,
+ int *fd);
+static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd);
+static void process_close(association *assoc, request *reqb);
static FILE *apduf = 0; /* for use in static mode */
+static statserv_options_block *control_block = 0;
/*
- * Create a new association-handle.
+ * Create and initialize a new association-handle.
* channel : iochannel for the current line.
* link : communications channel.
* Returns: 0 or a new association handle.
{
association *new;
- if (!(new = malloc(sizeof(*new))))
+ if (!control_block)
+ control_block = statserv_getcontrol();
+ if (!(new = xmalloc(sizeof(*new))))
return 0;
new->client_chan = channel;
new->client_link = link;
if (!(new->decode = odr_createmem(ODR_DECODE)) ||
!(new->encode = odr_createmem(ODR_ENCODE)))
return 0;
- if (apdufile)
+ if (*control_block->apdufile)
{
char filename[256];
FILE *f;
+ strcpy(filename, control_block->apdufile);
if (!(new->print = odr_createmem(ODR_PRINT)))
return 0;
- if (*apdufile)
+ if (*control_block->apdufile != '-')
{
- strcpy(filename, apdufile);
- if (!dynamic)
+ strcpy(filename, control_block->apdufile);
+ if (!control_block->dynamic)
{
if (!apduf)
{
new->input_buffer = 0;
new->input_buffer_len = 0;
new->backend = 0;
- if (cs_getproto(link) == CS_Z3950)
- new->proto = PROTO_Z3950;
- else
- new->proto = PROTO_SR;
+ new->state = ASSOC_NEW;
+ request_initq(&new->incoming);
+ request_initq(&new->outgoing);
+ new->proto = cs_getproto(link);
return new;
}
if (h->print)
odr_destroy(h->print);
if (h->input_buffer)
- free(h->input_buffer);
+ xfree(h->input_buffer);
if (h->backend)
bend_close(h->backend);
- free(h);
+ while (request_deq(&h->incoming));
+ while (request_deq(&h->outgoing));
+ xfree(h);
+}
+
+static void do_close(association *a, int reason, char *message)
+{
+ Z_APDU apdu;
+ Z_Close *cls = zget_Close(a->encode);
+ request *req = request_get();
+
+ /* Purge request queue */
+ while (request_deq(&a->incoming));
+ while (request_deq(&a->outgoing));
+ if (a->version >= 3)
+ {
+ logf(LOG_LOG, "Sending Close PDU, reason=%d, message=%s",
+ reason, message ? message : "none");
+ apdu.which = Z_APDU_close;
+ apdu.u.close = cls;
+ *cls->closeReason = reason;
+ cls->diagnosticInformation = message;
+ process_response(a, req, &apdu);
+ iochan_settimeout(a->client_chan, 60);
+ }
+ else
+ {
+ logf(LOG_DEBUG, "v2 client. No Close PDU");
+ iochan_setevent(a->client_chan, EVENT_TIMEOUT); /* force imm close */
+ }
+ a->state = ASSOC_DEAD;
}
/*
- * process events on the association. Called when the event loop detects an
- * event.
- * h : the I/O channel that has an outstanding event.
+ * This is where PDUs from the client are read and the further
+ * processing is initiated. Flow of control moves down through the
+ * various process_* functions below, until the encoded result comes back up
+ * to the output handler in here.
+ *
+ * h : the I/O channel that has an outstanding event.
* event : the current outstanding event.
*/
void ir_session(IOCHAN h, int event)
int res;
association *assoc = iochan_getdata(h);
COMSTACK conn = assoc->client_link;
+ request *req;
- if (event == EVENT_INPUT)
+ assert(h && conn && assoc);
+ if (event == EVENT_TIMEOUT)
{
- assert(assoc && conn);
- res = cs_get(conn, &assoc->input_buffer, &assoc->input_buffer_len);
- switch (res)
+ if (assoc->state != ASSOC_UP)
{
- case 0: case -1: /* connection closed by peer */
- logf(LOG_LOG, "Connection closed by client");
+ logf(LOG_LOG, "Final timeout - closing connection.");
+ cs_close(conn);
+ destroy_association(assoc);
+ iochan_destroy(h);
+ }
+ else
+ {
+ logf(LOG_LOG, "Session idle too long. Sending close.");
+ do_close(assoc, Z_Close_lackOfActivity, 0);
+ }
+ return;
+ }
+ if (event & EVENT_INPUT || event & EVENT_WORK) /* input */
+ {
+ if (event & EVENT_INPUT)
+ {
+ logf(LOG_DEBUG, "ir_session (input)");
+ assert(assoc && conn);
+ /* We aren't speaking to this fellow */
+ if (assoc->state == ASSOC_DEAD)
+ {
+ logf(LOG_LOG, "Closed connection after reject");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
return;
- case 1: /* incomplete read */
+ }
+ if ((res = cs_get(conn, &assoc->input_buffer,
+ &assoc->input_buffer_len)) <= 0)
+ {
+ logf(LOG_LOG, "Connection closed by client");
+ cs_close(conn);
+ destroy_association(assoc);
+ iochan_destroy(h);
return;
- default: /* data! */
- assoc->input_apdu_len = res;
- if (process_apdu(h) < 0)
- {
- cs_close(conn);
- destroy_association(assoc);
- iochan_destroy(h);
- }
- else if (cs_more(conn)) /* arrange to be called again */
- iochan_setevent(h, EVENT_INPUT);
+ }
+ else if (res == 1) /* incomplete read - wait for more */
+ return;
+ if (cs_more(conn)) /* more stuff - call us again later, please */
+ iochan_setevent(h, EVENT_INPUT);
+
+ /* we got a complete PDU. Let's decode it */
+ logf(LOG_DEBUG, "Got PDU, %d bytes", res);
+ req = request_get(); /* get a new request structure */
+ odr_reset(assoc->decode);
+ odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
+ if (!z_APDU(assoc->decode, &req->request, 0))
+ {
+ logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ",
+ odr_errlist[odr_geterror(assoc->decode)],
+ odr_offset(assoc->decode));
+ logf(LOG_LOG, "PDU dump:");
+ odr_dumpBER(log_file(), assoc->input_buffer, res);
+ do_close(assoc, Z_Close_protocolError, "Malformed package");
+ return;
+ }
+ req->request_mem = odr_extract_mem(assoc->decode);
+ if (assoc->print && !z_APDU(assoc->print, &req->request, 0))
+ {
+ logf(LOG_WARN, "ODR print error: %s",
+ odr_errlist[odr_geterror(assoc->print)]);
+ odr_reset(assoc->print);
+ }
+ request_enq(&assoc->incoming, req);
}
+
+ /* can we do something yet? */
+ req = request_head(&assoc->incoming);
+ if (req->state == REQUEST_IDLE)
+ if (process_request(assoc) < 0)
+ do_close(assoc, Z_Close_systemProblem, "Unknown error");
}
- else if (event == EVENT_OUTPUT)
+ if (event & EVENT_OUTPUT)
{
- switch (res = cs_put(conn, assoc->encode_buffer, assoc->encoded_len))
+ request *req = request_head(&assoc->outgoing);
+
+ logf(LOG_DEBUG, "ir_session (output)");
+ req->state = REQUEST_PENDING;
+ switch (res = cs_put(conn, req->response, req->len_response))
{
case -1:
logf(LOG_LOG, "Connection closed by client");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
- case 0: /* all sent */
- iochan_setflags(h, EVENT_INPUT | EVENT_EXCEPT); /* reset */
break;
- case 1: /* partial send */
- break; /* we'll get called again */
+ case 0: /* all sent - release the request structure */
+ logf(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response);
+ nmem_destroy(req->request_mem);
+ request_deq(&assoc->outgoing);
+ request_release(req);
+ if (!request_head(&assoc->outgoing))
+ iochan_clearflag(h, EVENT_OUTPUT);
+ break;
+ /* value of 1 -- partial send -- is simply ignored */
}
}
- else if (event == EVENT_EXCEPT)
+ if (event & EVENT_EXCEPT)
{
- logf(LOG_LOG, "Exception on line");
+ logf(LOG_DEBUG, "ir_session (exception)");
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
}
/*
- * Process the current outstanding APDU.
+ * Initiate request processing.
*/
-static int process_apdu(IOCHAN chan)
+static int process_request(association *assoc)
{
- Z_APDU *apdu;
- int res;
- association *assoc = iochan_getdata(chan);
+ request *req = request_head(&assoc->incoming);
+ int fd = -1;
+ Z_APDU *res;
- odr_setbuf(assoc->decode, assoc->input_buffer, assoc->input_apdu_len);
- if (!z_APDU(assoc->decode, &apdu, 0))
+ logf(LOG_DEBUG, "process_request");
+ assert(req && req->state == REQUEST_IDLE);
+ switch (req->request->which)
{
- logf(LOG_WARN, "ODR error: %s",
- odr_errlist[odr_geterror(assoc->decode)]);
- return -1;
+ case Z_APDU_initRequest:
+ res = process_initRequest(assoc, req); break;
+ case Z_APDU_searchRequest:
+ res = process_searchRequest(assoc, req, &fd); break;
+ case Z_APDU_presentRequest:
+ res = process_presentRequest(assoc, req, &fd); break;
+ case Z_APDU_scanRequest:
+ res = process_scanRequest(assoc, req, &fd); break;
+ case Z_APDU_close:
+ process_close(assoc, req); return 0;
+ default:
+ logf(LOG_WARN, "Bad APDU received");
+ return -1;
}
- if (assoc->print && !z_APDU(assoc->print, &apdu, 0))
+ if (res)
{
- logf(LOG_WARN, "ODR print error: %s",
- odr_errlist[odr_geterror(assoc->print)]);
- return -1;
+ logf(LOG_DEBUG, " result immediately available");
+ return process_response(assoc, req, res);
}
- switch (apdu->which)
+ else if (fd < 0)
+ {
+ logf(LOG_WARN, " bad result");
+ return -1;
+ }
+ else /* no result yet - one will be provided later */
+ {
+ IOCHAN chan;
+
+ /* Set up an I/O handler for the fd supplied by the backend */
+
+ logf(LOG_DEBUG, " establishing handler for result");
+ req->state = REQUEST_PENDING;
+ if (!(chan = iochan_create(fd, backend_response, EVENT_INPUT)))
+ abort();
+ iochan_setdata(chan, assoc);
+ return 0;
+ }
+}
+
+/*
+ * Handle message from the backend.
+ */
+void backend_response(IOCHAN i, int event)
+{
+ association *assoc = iochan_getdata(i);
+ request *req = request_head(&assoc->incoming);
+ Z_APDU *res;
+ int fd;
+
+ logf(LOG_DEBUG, "backend_response");
+ assert(assoc && req && req->state != REQUEST_IDLE);
+ /* determine what it is we're waiting for */
+ switch (req->request->which)
{
- case Z_APDU_initRequest:
- res = process_initRequest(chan, apdu->u.initRequest); break;
case Z_APDU_searchRequest:
- res = process_searchRequest(chan, apdu->u.searchRequest); break;
+ res = response_searchRequest(assoc, req, 0, &fd); break;
+#if 0
case Z_APDU_presentRequest:
- res = process_presentRequest(chan, apdu->u.presentRequest); break;
+ res = response_presentRequest(assoc, req, 0, &fd); break;
case Z_APDU_scanRequest:
- res = process_scanRequest(chan, apdu->u.scanRequest); break;
+ res = response_scanRequest(assoc, req, 0, &fd); break;
+#endif
default:
- logf(LOG_WARN, "Bad APDU");
- return -1;
+ logf(LOG_WARN, "Serious programmer's lapse or bug");
+ abort();
+ }
+ if ((res && process_response(assoc, req, res) < 0) || fd < 0)
+ {
+ logf(LOG_LOG, "Fatal error when talking to backend");
+ do_close(assoc, Z_Close_systemProblem, 0);
+ iochan_destroy(i);
+ return;
+ }
+ else if (!res) /* no result yet - try again later */
+ {
+ logf(LOG_DEBUG, " no result yet");
+ iochan_setfd(i, fd); /* in case fd has changed */
+ }
+}
+
+/*
+ * Encode response, and transfer the request structure to the outgoing queue.
+ */
+static int process_response(association *assoc, request *req, Z_APDU *res)
+{
+ odr_setbuf(assoc->encode, req->response, req->size_response, 1);
+ if (!z_APDU(assoc->encode, &res, 0))
+ {
+ logf(LOG_WARN, "ODR error when encoding response: %s",
+ odr_errlist[odr_geterror(assoc->decode)]);
+ odr_reset(assoc->encode);
+ return -1;
+ }
+ req->response = odr_getbuf(assoc->encode, &req->len_response,
+ &req->size_response);
+ odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */
+ odr_reset(assoc->encode);
+ if (assoc->print && !z_APDU(assoc->print, &res, 0))
+ {
+ logf(LOG_WARN, "ODR print error: %s",
+ odr_errlist[odr_geterror(assoc->print)]);
+ odr_reset(assoc->print);
+ }
+ /* change this when we make the backend reentrant */
+ if (req == request_head(&assoc->incoming))
+ {
+ req->state = REQUEST_IDLE;
+ request_deq(&assoc->incoming);
}
- odr_reset(assoc->decode); /* release incoming APDU */
- odr_reset(assoc->encode); /* release stuff alloced before encoding */
- return res;
+ request_enq(&assoc->outgoing, req);
+ /* turn the work over to the ir_session handler */
+ iochan_setflag(assoc->client_chan, EVENT_OUTPUT);
+ /* Is there more work to be done? give that to the input handler too */
+ if (request_head(&assoc->incoming))
+ iochan_setevent(assoc->client_chan, EVENT_WORK);
+ return 0;
}
-static int process_initRequest(IOCHAN client, Z_InitRequest *req)
+/*
+ * Handle init request.
+ * At the moment, we don't check the options
+ * anywhere else in the code - we just try not to do anything that would
+ * break a naive client. We'll toss 'em into the association block when
+ * we need them there.
+ */
+static Z_APDU *process_initRequest(association *assoc, request *reqb)
{
- Z_APDU apdu, *apdup;
- Z_InitResponse resp;
- bool_t result = 1;
- association *assoc = iochan_getdata(client);
+ Z_InitRequest *req = reqb->request->u.initRequest;
+ Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_initResponse);
+ Z_InitResponse *resp = apdu->u.initResponse;
bend_initrequest binitreq;
bend_initresult *binitres;
- Odr_bitmask options, protocolVersion;
+ char options[100];
logf(LOG_LOG, "Got initRequest");
if (req->implementationId)
logf(LOG_LOG, "Version: %s", req->implementationVersion);
binitreq.configname = "default-config";
- if (!(binitres = bend_init(&binitreq)) || binitres->errcode)
+ binitreq.auth = req->idAuthentication;
+ if (!(binitres = bend_init(&binitreq)))
{
- logf(LOG_WARN, "Negative response from backend");
- return -1;
+ logf(LOG_WARN, "Bad response from backend.");
+ return 0;
}
assoc->backend = binitres->handle;
- apdup = &apdu;
- apdu.which = Z_APDU_initResponse;
- apdu.u.initResponse = &resp;
- resp.referenceId = req->referenceId;
- ODR_MASK_ZERO(&options);
+ resp->referenceId = req->referenceId;
+ *options = '\0';
+ /* let's tell the client what we can do */
if (ODR_MASK_GET(req->options, Z_Options_search))
- ODR_MASK_SET(&options, Z_Options_search);
+ {
+ ODR_MASK_SET(resp->options, Z_Options_search);
+ strcat(options, "srch");
+ }
if (ODR_MASK_GET(req->options, Z_Options_present))
- ODR_MASK_SET(&options, Z_Options_present);
+ {
+ ODR_MASK_SET(resp->options, Z_Options_present);
+ strcat(options, " prst");
+ }
#if 0
if (ODR_MASK_GET(req->options, Z_Options_delSet))
+ {
ODR_MASK_SET(&options, Z_Options_delSet);
+ strcat(options, " del");
+ }
#endif
if (ODR_MASK_GET(req->options, Z_Options_namedResultSets))
- ODR_MASK_SET(&options, Z_Options_namedResultSets);
+ {
+ ODR_MASK_SET(resp->options, Z_Options_namedResultSets);
+ strcat(options, " namedresults");
+ }
if (ODR_MASK_GET(req->options, Z_Options_scan))
- ODR_MASK_SET(&options, Z_Options_scan);
- resp.options = &options;
- ODR_MASK_ZERO(&protocolVersion);
+ {
+ ODR_MASK_SET(resp->options, Z_Options_scan);
+ strcat(options, " scan");
+ }
+ if (ODR_MASK_GET(req->options, Z_Options_concurrentOperations))
+ {
+ ODR_MASK_SET(resp->options, Z_Options_concurrentOperations);
+ strcat(options, " concurop");
+ }
+
if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
- ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_1);
+ {
+ ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1);
+ assoc->version = 2; /* 1 & 2 are equivalent */
+ }
if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2))
- ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_2);
- resp.protocolVersion = &protocolVersion;
+ {
+ ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2);
+ assoc->version = 2;
+ }
+ if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_3))
+ {
+ ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3);
+ assoc->version = 3;
+ }
+ logf(LOG_LOG, "Negotiated to v%d: %s", assoc->version, options);
assoc->maximumRecordSize = *req->maximumRecordSize;
- if (assoc->maximumRecordSize > MAXRECORDSIZE)
- assoc->maximumRecordSize = MAXRECORDSIZE;
+ if (assoc->maximumRecordSize > control_block->maxrecordsize)
+ assoc->maximumRecordSize = control_block->maxrecordsize;
assoc->preferredMessageSize = *req->preferredMessageSize;
if (assoc->preferredMessageSize > assoc->maximumRecordSize)
assoc->preferredMessageSize = assoc->maximumRecordSize;
- resp.preferredMessageSize = &assoc->preferredMessageSize;
- resp.maximumRecordSize = &assoc->maximumRecordSize;
- resp.result = &result;
- resp.implementationId = "YAZ";
- resp.implementationName = "Index Data/YAZ Generic Frontend Server";
- resp.implementationVersion = "$Revision: 1.20 $";
- resp.userInformationField = 0;
- if (!z_APDU(assoc->encode, &apdup, 0))
- {
- logf(LOG_FATAL, "ODR error encoding initres: %s",
- odr_errlist[odr_geterror(assoc->encode)]);
- return -1;
+ resp->preferredMessageSize = &assoc->preferredMessageSize;
+ resp->maximumRecordSize = &assoc->maximumRecordSize;
+ resp->implementationName = "Index Data/YAZ Generic Frontend Server";
+ if (binitres->errcode)
+ {
+ logf(LOG_LOG, "Connection rejected by backend.");
+ *resp->result = 0;
+ assoc->state = ASSOC_DEAD;
}
- assoc->encode_buffer = odr_getbuf(assoc->encode, &assoc->encoded_len);
- odr_reset(assoc->encode);
- iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
- return 0;
+ else
+ assoc->state = ASSOC_UP;
+ return apdu;
}
+/*
+ * These functions should be merged.
+ */
+
+/*
+ * nonsurrogate diagnostic record.
+ */
static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
{
static Z_Records rec;
oident bib1;
- static Z_DiagRec dr;
static int err;
+#ifdef Z_95
+ static Z_DiagRec drec;
+ static Z_DefaultDiagFormat dr;
+#else
+ static Z_DiagRec dr;
+#endif
bib1.proto = proto;
- bib1.class = CLASS_DIAGSET;
+ bib1.oclass = CLASS_DIAGSET;
bib1.value = VAL_BIB1;
logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo :
"NULL");
err = error;
rec.which = Z_Records_NSD;
+#ifdef Z_95
+ rec.u.nonSurrogateDiagnostic = &drec;
+ drec.which = Z_DiagRec_defaultFormat;
+ drec.u.defaultFormat = &dr;
+#else
rec.u.nonSurrogateDiagnostic = &dr;
+#endif
dr.diagnosticSetId = oid_getoidbyent(&bib1);
dr.condition = &err;
+ dr.which = Z_DiagForm_v2AddInfo;
dr.addinfo = addinfo ? addinfo : "";
return &rec;
}
+/*
+ * surrogate diagnostic.
+ */
static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
int error, char *addinfo)
{
static Z_NamePlusRecord rec;
- static Z_DiagRec dr;
static int err;
oident bib1;
+#ifdef Z_95
+ static Z_DiagRec drec;
+ static Z_DefaultDiagFormat dr;
+#else
+ static Z_DiagRec dr;
+#endif
bib1.proto = proto;
- bib1.class = CLASS_DIAGSET;
+ bib1.oclass = CLASS_DIAGSET;
bib1.value = VAL_BIB1;
logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo);
err = error;
rec.databaseName = dbname;
rec.which = Z_NamePlusRecord_surrogateDiagnostic;
+#ifdef Z_95
+ rec.u.surrogateDiagnostic = &drec;
+ drec.which = Z_DiagRec_defaultFormat;
+ drec.u.defaultFormat = &dr;
+#else
rec.u.surrogateDiagnostic = &dr;
+#endif
dr.diagnosticSetId = oid_getoidbyent(&bib1);
dr.condition = &err;
+ dr.which = Z_DiagForm_v2AddInfo;
dr.addinfo = addinfo ? addinfo : "";
return &rec;
}
+/*
+ * multiple nonsurrogate diagnostics.
+ */
static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
{
static Z_DiagRecs recs;
- static Z_DiagRec *recp[1], rec;
static int err;
oident bib1;
+#ifdef Z_95
+ static Z_DiagRec *recp[1], drec;
+ static Z_DefaultDiagFormat rec;
+#else
+ static Z_DiagRec *recp[1], rec;
+#endif
logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo);
bib1.proto = proto;
- bib1.class = CLASS_DIAGSET;
+ bib1.oclass = CLASS_DIAGSET;
bib1.value = VAL_BIB1;
err = error;
recs.num_diagRecs = 1;
recs.diagRecs = recp;
+#ifdef Z_95
+ recp[0] = &drec;
+ drec.which = Z_DiagRec_defaultFormat;
+ drec.u.defaultFormat = &rec;
+#else
recp[0] = &rec;
+#endif
rec.diagnosticSetId = oid_getoidbyent(&bib1);
rec.condition = &err;
+ rec.which = Z_DiagForm_v2AddInfo;
rec.addinfo = addinfo ? addinfo : "";
return &recs;
}
#define MAX_RECORDS 256
static Z_Records *pack_records(association *a, char *setname, int start,
- int *num, Z_ElementSetNames *esn,
- int *next, int *pres)
+ int *num, Z_RecordComposition *comp,
+ int *next, int *pres, oid_value format)
{
int recno, total_length = 0, toget = *num;
static Z_Records records;
static Z_NamePlusRecordList reclist;
static Z_NamePlusRecord *list[MAX_RECORDS];
oident recform;
- Odr_oid *oid;
records.which = Z_Records_DBOSD;
records.u.databaseOrSurDiagnostics = &reclist;
*num = 0;
*next = 0;
- recform.proto = a->proto;
- recform.class = CLASS_RECSYN;
- recform.value = VAL_USMARC;
- if (!(oid = odr_oiddup(a->encode, oid_getoidbyent(&recform))))
- return 0;
-
logf(LOG_DEBUG, "Request to pack %d+%d", start, toget);
logf(LOG_DEBUG, "pms=%d, mrs=%d", a->preferredMessageSize,
a->maximumRecordSize);
bend_fetchresult *fres;
Z_NamePlusRecord *thisrec;
Z_DatabaseRecord *thisext;
+ int this_length;
+ /*
+ * we get the number of bytes allocated on the stream before any
+ * allocation done by the backend - this should give us a reasonable
+ * idea of the total size of the data so far.
+ */
+ total_length = odr_total(a->encode);
if (reclist.num_records == MAX_RECORDS - 1)
{
*pres = Z_PRES_PARTIAL_2;
}
freq.setname = setname;
freq.number = recno;
+ freq.comp = comp;
+ freq.format = format;
+ freq.stream = a->encode;
if (!(fres = bend_fetch(a->backend, &freq, 0)))
{
*pres = Z_PRES_FAILURE;
*pres = Z_PRES_FAILURE;
return diagrec(a->proto, fres->errcode, fres->errstring);
}
+ if (fres->len >= 0)
+ this_length = fres->len;
+ else
+ this_length = odr_total(a->encode) - total_length;
logf(LOG_DEBUG, " fetched record, len=%d, total=%d",
- fres->len, total_length);
- if (fres->len + total_length > a->preferredMessageSize)
+ this_length, total_length);
+ if (this_length + total_length > a->preferredMessageSize)
{
/* record is small enough, really */
- if (fres->len <= a->preferredMessageSize)
+ if (this_length <= a->preferredMessageSize)
{
logf(LOG_DEBUG, " Dropped last normal-sized record");
*pres = Z_PRES_PARTIAL_2;
break;
}
/* record can only be fetched by itself */
- if (fres->len < a->maximumRecordSize)
+ if (this_length < a->maximumRecordSize)
{
logf(LOG_DEBUG, " Record > prefmsgsz");
if (toget > 1)
reclist.records[reclist.num_records] =
surrogatediagrec(a->proto, fres->basename, 16, 0);
reclist.num_records++;
- *pres = Z_PRES_PARTIAL_2;
- break;
+ *next = fres->last_in_set ? 0 : recno + 1;
+ continue;
}
}
else /* too big entirely */
reclist.records[reclist.num_records] =
surrogatediagrec(a->proto, fres->basename, 17, 0);
reclist.num_records++;
- *pres = Z_PRES_PARTIAL_2;
- break;
+ *next = fres->last_in_set ? 0 : recno + 1;
+ continue;
}
}
if (!(thisrec = odr_malloc(a->encode, sizeof(*thisrec))))
return 0;
strcpy(thisrec->databaseName, fres->basename);
thisrec->which = Z_NamePlusRecord_databaseRecord;
- if (!(thisrec->u.databaseRecord = thisext = odr_malloc(a->encode,
+ if (!(thisrec->u.databaseRecord = thisext = odr_malloc(a->encode,
sizeof(Z_DatabaseRecord))))
return 0;
- thisext->direct_reference = oid; /* should be OID for current MARC */
+ recform.proto = a->proto;
+ recform.oclass = CLASS_RECSYN;
+ recform.value = fres->format;
+ thisext->direct_reference = odr_oiddup(a->encode,
+ oid_getoidbyent(&recform));
thisext->indirect_reference = 0;
thisext->descriptor = 0;
- thisext->which = ODR_EXTERNAL_octet;
- if (!(thisext->u.octet_aligned = odr_malloc(a->encode,
- sizeof(Odr_oct))))
- return 0;
- if (!(thisext->u.octet_aligned->buf = odr_malloc(a->encode, fres->len)))
- return 0;
- memcpy(thisext->u.octet_aligned->buf, fres->record, fres->len);
- thisext->u.octet_aligned->len = thisext->u.octet_aligned->size =
- fres->len;
+ if (fres->len < 0) /* Structured data */
+ {
+ switch (fres->format)
+ {
+ case VAL_SUTRS: thisext->which = Z_External_sutrs; break;
+ case VAL_GRS1: thisext->which = Z_External_grs1; break;
+ case VAL_EXPLAIN: thisext->which = Z_External_explainRecord;
+ break;
+
+ default:
+ logf(LOG_FATAL, "Unknown structured format from backend.");
+ return 0;
+ }
+
+ /*
+ * We cheat on the pointers here. Obviously, the record field
+ * of the backend-fetch structure should have been a union for
+ * correctness, but we're stuck with this for backwards
+ * compatibility.
+ */
+ thisext->u.grs1 = (Z_GenericRecord*) fres->record;
+ }
+ else if (fres->format == VAL_SUTRS) /* SUTRS is a single-ASN.1-type */
+ {
+ Odr_oct *sutrs = odr_malloc(a->encode, sizeof(*sutrs));
+
+ thisext->which = Z_External_sutrs;
+ thisext->u.sutrs = sutrs;
+ sutrs->buf = odr_malloc(a->encode, fres->len);
+ sutrs->len = sutrs->size = fres->len;
+ memcpy(sutrs->buf, fres->record, fres->len);
+ }
+ else /* octet-aligned record. */
+ {
+ thisext->which = Z_External_octet;
+ if (!(thisext->u.octet_aligned = odr_malloc(a->encode,
+ sizeof(Odr_oct))))
+ return 0;
+ if (!(thisext->u.octet_aligned->buf = odr_malloc(a->encode,
+ fres->len)))
+ return 0;
+ memcpy(thisext->u.octet_aligned->buf, fres->record, fres->len);
+ thisext->u.octet_aligned->len = thisext->u.octet_aligned->size =
+ fres->len;
+ }
reclist.records[reclist.num_records] = thisrec;
reclist.num_records++;
- total_length += fres->len;
- (*num)++;
*next = fres->last_in_set ? 0 : recno + 1;
}
+ *num = reclist.num_records;
return &records;
}
-static int process_searchRequest(IOCHAN client, Z_SearchRequest *req)
+static Z_APDU *process_searchRequest(association *assoc, request *reqb,
+ int *fd)
{
- Z_APDU apdu, *apdup;
- Z_SearchResponse resp;
- association *assoc = iochan_getdata(client);
- int nulint = 0;
- bool_t sr = 1;
+ Z_SearchRequest *req = reqb->request->u.searchRequest;
bend_searchrequest bsrq;
bend_searchresult *bsrt;
- oident *oent;
- int next = 0;
- static int none = Z_RES_NONE;
logf(LOG_LOG, "Got SearchRequest.");
- apdup = &apdu;
+
+ bsrq.setname = req->resultSetName;
+ bsrq.replace_set = *req->replaceIndicator;
+ bsrq.num_bases = req->num_databaseNames;
+ bsrq.basenames = req->databaseNames;
+ bsrq.query = req->query;
+
+ if (!(bsrt = bend_search(assoc->backend, &bsrq, fd)))
+ return 0;
+ return response_searchRequest(assoc, reqb, bsrt, fd);
+}
+
+bend_searchresult *bend_searchresponse(void *handle) {return 0;}
+
+/*
+ * Prepare a searchresponse based on the backend results. We probably want
+ * to look at making the fetching of records nonblocking as well, but
+ * so far, we'll keep things simple.
+ * If bsrt is null, that means we're called in response to a communications
+ * event, and we'll have to get the response for ourselves.
+ */
+static Z_APDU *response_searchRequest(association *assoc, request *reqb,
+ bend_searchresult *bsrt, int *fd)
+{
+ Z_SearchRequest *req = reqb->request->u.searchRequest;
+ static Z_APDU apdu;
+ static Z_SearchResponse resp;
+ static int nulint = 0;
+ static bool_t sr = 1;
+ static int next = 0;
+ static int none = Z_RES_NONE;
+
apdu.which = Z_APDU_searchResponse;
apdu.u.searchResponse = &resp;
resp.referenceId = req->referenceId;
-
- resp.records = 0;
- if (req->query->which == Z_Query_type_1)
+#ifdef Z_95
+ resp.additionalSearchInfo = 0;
+ resp.otherInfo = 0;
+#endif
+ *fd = -1;
+ if (!bsrt && !(bsrt = bend_searchresponse(assoc->backend)))
{
- Z_RPNQuery *q = req->query->u.type_1;
-
- if (!(oent = oid_getentbyoid(q->attributeSetId)) ||
- oent->class != CLASS_ATTSET ||
- oent->value != VAL_BIB1)
- {
- resp.records = diagrec(assoc->proto, 121, 0);
- resp.resultCount = &nulint;
- resp.numberOfRecordsReturned = &nulint;
- resp.nextResultSetPosition = &nulint;
- resp.searchStatus = &none;
- resp.resultSetStatus = 0;
- resp.presentStatus = 0;
- }
+ logf(LOG_FATAL, "Bad result from backend");
+ return 0;
}
- if (!resp.records)
+ else if (bsrt->errcode)
+ {
+ resp.records = diagrec(assoc->proto, bsrt->errcode,
+ bsrt->errstring);
+ resp.resultCount = &nulint;
+ resp.numberOfRecordsReturned = &nulint;
+ resp.nextResultSetPosition = &nulint;
+ resp.searchStatus = &nulint;
+ resp.resultSetStatus = &none;
+ resp.presentStatus = 0;
+ }
+ else
{
- int toget;
- Z_ElementSetNames *setnames;
- int presst = 0;
+ static int toget;
+ Z_RecordComposition comp, *compp = 0;
+ static int presst = 0;
- bsrq.setname = req->resultSetName;
- bsrq.replace_set = *req->replaceIndicator;
- bsrq.num_bases = req->num_databaseNames;
- bsrq.basenames = req->databaseNames;
- bsrq.query = req->query;
+ resp.records = 0;
+ resp.resultCount = &bsrt->hits;
- if (!(bsrt = bend_search(assoc->backend, &bsrq, 0)))
- return -1;
- else if (bsrt->errcode)
+ comp.which = Z_RecordComp_simple;
+ /* how many records does the user agent want, then? */
+ if (bsrt->hits <= *req->smallSetUpperBound)
{
-
- resp.records = diagrec(assoc->proto, bsrt->errcode,
- bsrt->errstring);
- resp.resultCount = &nulint;
- resp.numberOfRecordsReturned = &nulint;
- resp.nextResultSetPosition = &nulint;
- resp.searchStatus = &nulint;
- resp.resultSetStatus = &none;
- resp.presentStatus = 0;
+ toget = bsrt->hits;
+ if ((comp.u.simple = req->smallSetElementSetNames))
+ compp = ∁
}
- else
+ else if (bsrt->hits < *req->largeSetLowerBound)
{
- resp.records = 0;
-
- resp.resultCount = &bsrt->hits;
-
- /* how many records does the user agent want, then? */
- if (bsrt->hits <= *req->smallSetUpperBound)
- {
+ toget = *req->mediumSetPresentNumber;
+ if (toget > bsrt->hits)
toget = bsrt->hits;
- setnames = req->smallSetElementSetNames;
- }
- else if (bsrt->hits < *req->largeSetLowerBound)
- {
- toget = *req->mediumSetPresentNumber;
- if (toget > bsrt->hits)
- toget = bsrt->hits;
- setnames = req->mediumSetElementSetNames;
- }
- else
- toget = 0;
+ if ((comp.u.simple = req->mediumSetElementSetNames))
+ compp = ∁
+ }
+ else
+ toget = 0;
- if (toget && !resp.records)
- {
- resp.records = pack_records(assoc, req->resultSetName, 1,
- &toget, setnames, &next, &presst);
- if (!resp.records)
- return -1;
- resp.numberOfRecordsReturned = &toget;
- resp.nextResultSetPosition = &next;
- resp.searchStatus = &sr;
- resp.resultSetStatus = 0;
- resp.presentStatus = &presst;
- }
+ if (toget && !resp.records)
+ {
+ oident *prefformat;
+ oid_value form;
+
+ if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
+ prefformat->oclass != CLASS_RECSYN)
+ form = VAL_NONE;
else
- {
- resp.numberOfRecordsReturned = &nulint;
- resp.nextResultSetPosition = &next;
- resp.searchStatus = &sr;
- resp.resultSetStatus = 0;
- resp.presentStatus = 0;
- }
+ form = prefformat->value;
+ resp.records = pack_records(assoc, req->resultSetName, 1,
+ &toget, compp, &next, &presst, form);
+ if (!resp.records)
+ return 0;
+ resp.numberOfRecordsReturned = &toget;
+ resp.nextResultSetPosition = &next;
+ resp.searchStatus = &sr;
+ resp.resultSetStatus = 0;
+ resp.presentStatus = &presst;
+ }
+ else
+ {
+ if (*resp.resultCount)
+ next = 1;
+ resp.numberOfRecordsReturned = &nulint;
+ resp.nextResultSetPosition = &next;
+ resp.searchStatus = &sr;
+ resp.resultSetStatus = 0;
+ resp.presentStatus = 0;
}
}
-
- if (!z_APDU(assoc->encode, &apdup, 0))
- {
- logf(LOG_FATAL, "ODR error encoding searchres: %s",
- odr_errlist[odr_geterror(assoc->encode)]);
- return -1;
- }
- assoc->encode_buffer = odr_getbuf(assoc->encode, &assoc->encoded_len);
- odr_reset(assoc->encode);
- iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
- return 0;
+ return &apdu;
}
-static int process_presentRequest(IOCHAN client, Z_PresentRequest *req)
+/*
+ * Maybe we got a little over-friendly when we designed bend_fetch to
+ * get only one record at a time. Some backends can optimise multiple-record
+ * fetches, and at any rate, there is some overhead involved in
+ * all that selecting and hopping around. Problem is, of course, that the
+ * frontend can't know ahead of time how many records it'll need to
+ * fill the negotiated PDU size. Annoying. Segmentation or not, Z/SR
+ * is downright lousy as a bulk data transfer protocol.
+ *
+ * To start with, we'll do the fetching of records from the backend
+ * in one operation: To save some trips in and out of the event-handler,
+ * and to simplify the interface to pack_records. At any rate, asynch
+ * operation is more fun in operations that have an unpredictable execution
+ * speed - which is normally more true for search than for present.
+ */
+static Z_APDU *process_presentRequest(association *assoc, request *reqb,
+ int *fd)
{
- Z_APDU apdu, *apdup;
- Z_PresentResponse resp;
- association *assoc = iochan_getdata(client);
- int presst, next, num;
+ Z_PresentRequest *req = reqb->request->u.presentRequest;
+ static Z_APDU apdu;
+ static Z_PresentResponse resp;
+ static int presst, next, num;
+ oident *prefformat;
+ oid_value form;
+
logf(LOG_LOG, "Got PresentRequest.");
- apdup = &apdu;
apdu.which = Z_APDU_presentResponse;
apdu.u.presentResponse = &resp;
resp.referenceId = req->referenceId;
+#ifdef Z_95
+ resp.otherInfo = 0;
+#endif
+ if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
+ prefformat->oclass != CLASS_RECSYN)
+ form = VAL_NONE;
+ else
+ form = prefformat->value;
num = *req->numberOfRecordsRequested;
resp.records = pack_records(assoc, req->resultSetId,
- *req->resultSetStartPoint, &num, req->elementSetNames, &next, &presst);
+ *req->resultSetStartPoint, &num, req->recordComposition, &next,
+ &presst, form);
if (!resp.records)
- return -1;
+ return 0;
resp.numberOfRecordsReturned = #
resp.presentStatus = &presst;
resp.nextResultSetPosition = &next;
- if (!z_APDU(assoc->encode, &apdup, 0))
- {
- logf(LOG_FATAL, "ODR error encoding initres: %s",
- odr_errlist[odr_geterror(assoc->encode)]);
- return -1;
- }
- assoc->encode_buffer = odr_getbuf(assoc->encode, &assoc->encoded_len);
- odr_reset(assoc->encode);
- iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
- return 0;
+ return &apdu;
}
-static int process_scanRequest(IOCHAN client, Z_ScanRequest *req)
+/*
+ * Scan was implemented rather in a hurry, and with support for only the basic
+ * elements of the service in the backend API. Suggestions are welcome.
+ */
+static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd)
{
- association *assoc = iochan_getdata(client);
- Z_APDU apdu, *apdup;
- Z_ScanResponse res;
- bend_scanrequest srq;
- bend_scanresult *srs;
- int scanStatus = Z_Scan_failure;
- int numberOfEntriesReturned = 0;
+ Z_ScanRequest *req = reqb->request->u.scanRequest;
+ static Z_APDU apdu;
+ static Z_ScanResponse res;
+ static int scanStatus = Z_Scan_failure;
+ static int numberOfEntriesReturned = 0;
oident *attent;
- Z_ListEntries ents;
+ static Z_ListEntries ents;
#define SCAN_MAX_ENTRIES 200
- Z_Entry *tab[SCAN_MAX_ENTRIES];
+ static Z_Entry *tab[SCAN_MAX_ENTRIES];
+ bend_scanrequest srq;
+ bend_scanresult *srs;
+ oident *attset;
- apdup = &apdu;
+ logf(LOG_LOG, "Got scanrequest");
apdu.which = Z_APDU_scanResponse;
apdu.u.scanResponse = &res;
res.referenceId = req->referenceId;
res.entries = &ents;
ents.which = Z_ListEntries_nonSurrogateDiagnostics;
res.attributeSet = 0;
+#ifdef Z_95
+ res.otherInfo = 0;
+#endif
if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) ||
- attent->class != CLASS_ATTSET || attent->value != VAL_BIB1))
+ attent->oclass != CLASS_ATTSET || attent->value != VAL_BIB1))
ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 121, 0);
else if (req->stepSize && *req->stepSize > 0)
ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0);
else
{
+ if (req->termListAndStartPoint->term->which == Z_Term_general)
+ logf(LOG_DEBUG, " term: '%.*s'",
+ req->termListAndStartPoint->term->u.general->len,
+ req->termListAndStartPoint->term->u.general->buf);
srq.num_bases = req->num_databaseNames;
srq.basenames = req->databaseNames;
srq.num_entries = *req->numberOfTermsRequested;
srq.term = req->termListAndStartPoint;
+ if (!(attset = oid_getentbyoid(req->attributeSet)) ||
+ attset->oclass != CLASS_RECSYN)
+ srq.attributeset = VAL_NONE;
+ else
+ srq.attributeset = attset->value;
srq.term_position = req->preferredPositionInResponse ?
*req->preferredPositionInResponse : 1;
if (!(srs = bend_scan(assoc->backend, &srq, 0)))
e->which = Z_Entry_termInfo;
e->u.termInfo = t = odr_malloc(assoc->encode, sizeof(*t));
t->suggestedAttributes = 0;
+ t->displayTerm = 0;
t->alternativeTerm = 0;
t->byAttributes = 0;
+ t->otherTermInfo = 0;
t->globalOccurrences = &srs->entries[i].occurrences;
t->term = odr_malloc(assoc->encode, sizeof(*t->term));
t->term->which = Z_Term_general;
o->buf = odr_malloc(assoc->encode, o->len = o->size =
strlen(srs->entries[i].term));
memcpy(o->buf, srs->entries[i].term, o->len);
+ logf(LOG_DEBUG, " term #%d: '%s' (%d)", i,
+ srs->entries[i].term, srs->entries[i].occurrences);
}
list.num_entries = i;
res.numberOfEntriesReturned = &list.num_entries;
res.positionOfTerm = &srs->term_position;
}
}
- if (!z_APDU(assoc->encode, &apdup, 0))
+
+ return &apdu;
+}
+
+static void process_close(association *assoc, request *reqb)
+{
+ Z_Close *req = reqb->request->u.close;
+ static char *reasons[] =
{
- logf(LOG_FATAL, "ODR error encoding initres: %s",
- odr_errlist[odr_geterror(assoc->encode)]);
- return -1;
- }
- assoc->encode_buffer = odr_getbuf(assoc->encode, &assoc->encoded_len);
- odr_reset(assoc->encode);
- iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT);
- return 0;
+ "finished",
+ "shutdown",
+ "systemProblem",
+ "costLimit",
+ "resources",
+ "securityViolation",
+ "protocolError",
+ "lackOfActivity",
+ "peerAbort",
+ "unspecified"
+ };
+
+ logf(LOG_LOG, "Got close, reason %s, message %s",
+ reasons[*req->closeReason], req->diagnosticInformation ?
+ req->diagnosticInformation : "NULL");
+ if (assoc->version < 3) /* to make do_force respond with close */
+ assoc->version = 3;
+ do_close(assoc, Z_Close_finished, "Association terminated by client");
}