X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=44d69f7a8d6be75974a16c948bfda649dd8092c9;hp=174c73abb47bdffbb2dd950ce59eb441b6019b55;hb=f69d4aa4609ff3daa71733da1ea0fcd8322ab954;hpb=d6a0e5ff2f35326b9cd2e1260c56fd5dabafd3eb diff --git a/server/seshigh.c b/server/seshigh.c index 174c73a..44d69f7 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -1,10 +1,143 @@ /* - * Copyright (c) 1995, Index Data + * Copyright (c) 1995-1998, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.38 1995-06-19 12:39:11 quinn + * Revision 1.82 1998-10-20 14:00:30 quinn + * Fixed Scan + * + * Revision 1.81 1998/10/13 16:12:24 adam + * Added support for Surrogate Diagnostics for Scan Term entries. + * + * Revision 1.80 1998/09/02 12:41:53 adam + * Added decode stream in bend search structures. + * + * Revision 1.79 1998/08/19 16:10:08 adam + * Changed som member names of DeleteResultSetRequest/Response. + * + * Revision 1.78 1998/08/03 10:23:55 adam + * Fixed bug regarding Options for Sort. + * + * Revision 1.77 1998/07/20 12:38:42 adam + * Implemented delete result set service to server API. + * + * Revision 1.76 1998/05/27 16:57:07 adam + * Support for surrogate diagnostic records added for bend_fetch. + * + * Revision 1.75 1998/05/18 10:13:07 adam + * Fixed call to es_request handler - extra argument was passed. + * + * Revision 1.74 1998/03/31 15:13:20 adam + * Development towards compiled ASN.1. + * + * Revision 1.73 1998/03/31 11:07:45 adam + * Furhter work on UNIverse resource report. + * Added Extended Services handling in frontend server. + * + * Revision 1.72 1998/02/11 11:53:35 adam + * Changed code so that it compiles as C++. + * + * Revision 1.71 1998/02/10 11:03:57 adam + * Added support for extended handlers in backend server interface. + * + * Revision 1.70 1998/01/29 13:15:35 adam + * Implemented sort for the backend interface. + * + * Revision 1.69 1997/09/30 11:48:12 adam + * Fixed bug introduced by previous commit. + * + * Revision 1.68 1997/09/29 13:18:59 adam + * Added function, oid_ent_to_oid, to replace the function + * oid_getoidbyent, which is not thread safe. + * + * Revision 1.67 1997/09/17 12:10:40 adam + * YAZ version 1.4. + * + * Revision 1.66 1997/09/05 15:26:44 adam + * Added ODR encode in search and scen bend request structures. + * Fixed a few enums that caused trouble with C++. + * + * Revision 1.65 1997/09/01 08:53:01 adam + * New windows NT/95 port using MSV5.0. The test server 'ztest' was + * moved a separate directory. MSV5.0 project server.dsp created. + * As an option, the server can now operate as an NT service. + * + * Revision 1.64 1997/04/30 08:52:11 quinn + * Null + * + * Revision 1.63 1996/10/11 11:57:26 quinn + * Smallish + * + * Revision 1.62 1996/07/06 19:58:35 quinn + * System headerfiles gathered in yconfig + * + * Revision 1.61 1996/06/10 08:56:16 quinn + * Work on Summary. + * + * 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 @@ -152,15 +285,20 @@ * */ +#include #include #include +#ifdef WINDOWS +#include +#else #include +#endif #include -#include +#include #include -#include -#include +#include "eventl.h" +#include "session.h" #include #include #include @@ -168,21 +306,30 @@ #include -static int process_request(association *assoc); +static int process_request(association *assoc, request *req); 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); + bend_search_rr *bsrr, 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 Z_APDU *process_sortRequest(association *assoc, request *reqb, int *fd); +static void process_close(association *assoc, request *reqb); +void save_referenceId (request *reqb, Z_ReferenceId *refid); +static Z_APDU *process_deleteRequest(association *assoc, request *reqb, + int *fd); static FILE *apduf = 0; /* for use in static mode */ static statserv_options_block *control_block = 0; +/* Chas: Added in from DALI */ +static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd); +/* Chas: End of addition from DALI */ + /* * Create and initialize a new association-handle. * channel : iochannel for the current line. @@ -191,16 +338,16 @@ static statserv_options_block *control_block = 0; */ association *create_association(IOCHAN channel, COMSTACK link) { - association *new; + association *anew; if (!control_block) control_block = statserv_getcontrol(); - if (!(new = malloc(sizeof(*new)))) + if (!(anew = (association *)xmalloc(sizeof(*anew)))) return 0; - new->client_chan = channel; - new->client_link = link; - if (!(new->decode = odr_createmem(ODR_DECODE)) || - !(new->encode = odr_createmem(ODR_ENCODE))) + anew->client_chan = channel; + anew->client_link = link; + if (!(anew->decode = odr_createmem(ODR_DECODE)) || + !(anew->encode = odr_createmem(ODR_ENCODE))) return 0; if (*control_block->apdufile) { @@ -208,7 +355,7 @@ association *create_association(IOCHAN channel, COMSTACK link) FILE *f; strcpy(filename, control_block->apdufile); - if (!(new->print = odr_createmem(ODR_PRINT))) + if (!(anew->print = odr_createmem(ODR_PRINT))) return 0; if (*control_block->apdufile != '-') { @@ -236,19 +383,19 @@ association *create_association(IOCHAN channel, COMSTACK link) } setvbuf(f, 0, _IONBF, 0); } - odr_setprint(new->print, f); + odr_setprint(anew->print, f); } } else - new->print = 0; - new->input_buffer = 0; - new->input_buffer_len = 0; - new->backend = 0; - new->rejected = 0; - request_initq(&new->incoming); - request_initq(&new->outgoing); - new->proto = cs_getproto(link); - return new; + anew->print = 0; + anew->input_buffer = 0; + anew->input_buffer_len = 0; + anew->backend = 0; + anew->state = ASSOC_NEW; + request_initq(&anew->incoming); + request_initq(&anew->outgoing); + anew->proto = cs_getproto(link); + return anew; } /* @@ -261,12 +408,47 @@ void destroy_association(association *h) 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); while (request_deq(&h->incoming)); while (request_deq(&h->outgoing)); - free(h); + request_delq(&h->incoming); + request_delq(&h->outgoing); + xfree(h); +} + +static void do_close_req(association *a, int reason, char *message, + request *req) +{ + Z_APDU apdu; + Z_Close *cls = zget_Close(a->encode); + + /* 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; +} + +static void do_close(association *a, int reason, char *message) +{ + do_close_req (a, reason, message, request_get(&a->outgoing)); } /* @@ -281,17 +463,25 @@ void destroy_association(association *h) void ir_session(IOCHAN h, int event) { int res; - association *assoc = iochan_getdata(h); + association *assoc = (association *)iochan_getdata(h); COMSTACK conn = assoc->client_link; request *req; assert(h && conn && assoc); if (event == EVENT_TIMEOUT) { - logf(LOG_LOG, "Timeout - closing connection."); - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); + if (assoc->state != ASSOC_UP) + { + 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 */ @@ -301,7 +491,7 @@ void ir_session(IOCHAN h, int event) logf(LOG_DEBUG, "ir_session (input)"); assert(assoc && conn); /* We aren't speaking to this fellow */ - if (assoc->rejected) + if (assoc->state == ASSOC_DEAD) { logf(LOG_LOG, "Closed connection after reject"); cs_close(conn); @@ -325,25 +515,24 @@ void ir_session(IOCHAN h, int event) /* 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 */ + req = request_get(&assoc->incoming); /* 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", - odr_errlist[odr_geterror(assoc->decode)]); + logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", + odr_errmsg(odr_geterror(assoc->decode)), + odr_offset(assoc->decode)); logf(LOG_LOG, "PDU dump:"); odr_dumpBER(log_file(), assoc->input_buffer, res); - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); + 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_errmsg(odr_geterror(assoc->print))); odr_reset(assoc->print); } request_enq(&assoc->incoming, req); @@ -352,12 +541,12 @@ void ir_session(IOCHAN h, int event) /* can we do something yet? */ req = request_head(&assoc->incoming); if (req->state == REQUEST_IDLE) - if (process_request(assoc) < 0) - { - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); - } + { + request_deq(&assoc->incoming); + if (process_request(assoc, req) < 0) + do_close_req(assoc, Z_Close_systemProblem, "Unknown error", + req); + } } if (event & EVENT_OUTPUT) { @@ -375,7 +564,7 @@ void ir_session(IOCHAN h, int event) break; case 0: /* all sent - release the request structure */ logf(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response); - odr_release_mem(req->request_mem); + nmem_destroy(req->request_mem); request_deq(&assoc->outgoing); request_release(req); if (!request_head(&assoc->outgoing)) @@ -396,13 +585,12 @@ void ir_session(IOCHAN h, int event) /* * Initiate request processing. */ -static int process_request(association *assoc) +static int process_request(association *assoc, request *req) { - request *req = request_head(&assoc->incoming); int fd = -1; Z_APDU *res; + int retval; - logf(LOG_DEBUG, "process_request"); assert(req && req->state == REQUEST_IDLE); switch (req->request->which) { @@ -414,6 +602,35 @@ static int process_request(association *assoc) res = process_presentRequest(assoc, req, &fd); break; case Z_APDU_scanRequest: res = process_scanRequest(assoc, req, &fd); break; + case Z_APDU_extendedServicesRequest: + if (assoc->bend_esrequest) + res = process_ESRequest(assoc, req, &fd); + else + { + logf(LOG_WARN, "Cannot handle EXTENDED SERVICES APDU"); + return -1; + } + break; + case Z_APDU_sortRequest: + if (assoc->bend_sort) + res = process_sortRequest(assoc, req, &fd); + else + { + logf(LOG_WARN, "Cannot handle SORT APDU"); + return -1; + } + break; + case Z_APDU_close: + process_close(assoc, req); return 0; + case Z_APDU_deleteResultSetRequest: + if (assoc->bend_delete) + res = process_deleteRequest(assoc, req, &fd); + else + { + logf (LOG_WARN, "Cannot handle Delete APDU"); + return -1; + } + break; default: logf(LOG_WARN, "Bad APDU received"); return -1; @@ -421,12 +638,12 @@ static int process_request(association *assoc) if (res) { logf(LOG_DEBUG, " result immediately available"); - return process_response(assoc, req, res); + retval = process_response(assoc, req, res); } else if (fd < 0) { - logf(LOG_WARN, " bad result"); - return -1; + logf(LOG_DEBUG, " result unavailble"); + retval = 0; } else /* no result yet - one will be provided later */ { @@ -439,8 +656,9 @@ static int process_request(association *assoc) if (!(chan = iochan_create(fd, backend_response, EVENT_INPUT))) abort(); iochan_setdata(chan, assoc); - return 0; + retval = 0; } + return retval; } /* @@ -448,7 +666,7 @@ static int process_request(association *assoc) */ void backend_response(IOCHAN i, int event) { - association *assoc = iochan_getdata(i); + association *assoc = (association *)iochan_getdata(i); request *req = request_head(&assoc->incoming); Z_APDU *res; int fd; @@ -473,9 +691,7 @@ void backend_response(IOCHAN i, int event) if ((res && process_response(assoc, req, res) < 0) || fd < 0) { logf(LOG_LOG, "Fatal error when talking to backend"); - cs_close(assoc->client_link); - destroy_association(assoc); - iochan_destroy(assoc->client_chan); + do_close(assoc, Z_Close_systemProblem, 0); iochan_destroy(i); return; } @@ -495,35 +711,38 @@ static int process_response(association *assoc, request *req, Z_APDU *res) if (!z_APDU(assoc->encode, &res, 0)) { logf(LOG_WARN, "ODR error when encoding response: %s", - odr_errlist[odr_geterror(assoc->decode)]); + odr_errmsg(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't free if we abort later */ - odr_reset(assoc->encode); + odr_setbuf(assoc->encode, 0, 0, 0); /* don'txfree if we abort later */ if (assoc->print && !z_APDU(assoc->print, &res, 0)) { logf(LOG_WARN, "ODR print error: %s", - odr_errlist[odr_geterror(assoc->print)]); + odr_errmsg(odr_geterror(assoc->print))); odr_reset(assoc->print); } - /* change this when we make the backend reentrant */ - assert(req == request_head(&assoc->incoming)); + odr_reset(assoc->encode); req->state = REQUEST_IDLE; - request_deq(&assoc->incoming); 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 1 if (request_head(&assoc->incoming)) + { + logf (LOG_DEBUG, "more work to be done"); iochan_setevent(assoc->client_chan, EVENT_WORK); + } +#endif return 0; } /* * Handle init request. - * At the moment, we don't check the protocol version or the options + * 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. @@ -535,6 +754,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) Z_InitResponse *resp = apdu->u.initResponse; bend_initrequest binitreq; bend_initresult *binitres; + char options[100]; logf(LOG_LOG, "Got initRequest"); if (req->implementationId) @@ -544,8 +764,14 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (req->implementationVersion) logf(LOG_LOG, "Version: %s", req->implementationVersion); + binitreq.stream = assoc->encode; binitreq.configname = "default-config"; binitreq.auth = req->idAuthentication; + binitreq.bend_sort = NULL; + binitreq.bend_search = NULL; + binitreq.bend_present = NULL; + binitreq.bend_esrequest = NULL; + binitreq.bend_delete = NULL; if (!(binitres = bend_init(&binitreq))) { logf(LOG_WARN, "Bad response from backend."); @@ -553,27 +779,77 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) } assoc->backend = binitres->handle; + if ((assoc->bend_sort = (int (*)())binitreq.bend_sort)) + logf (LOG_DEBUG, "Sort handler installed"); + if ((assoc->bend_search = (int (*)())binitreq.bend_search)) + logf (LOG_DEBUG, "Search handler installed"); + if ((assoc->bend_present = (int (*)())binitreq.bend_present)) + logf (LOG_DEBUG, "Present handler installed"); + if ((assoc->bend_esrequest = (int (*)())binitreq.bend_esrequest)) + logf (LOG_DEBUG, "ESRequest handler installed"); + if ((assoc->bend_delete = (int (*)())binitreq.bend_delete)) + logf (LOG_DEBUG, "Delete handler installed"); + 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(resp->options, Z_Options_search); + strcat(options, "srch"); + } if (ODR_MASK_GET(req->options, Z_Options_present)) + { ODR_MASK_SET(resp->options, Z_Options_present); -#if 0 - if (ODR_MASK_GET(req->options, Z_Options_delSet)) - ODR_MASK_SET(&options, Z_Options_delSet); -#endif + strcat(options, " prst"); + } + if (ODR_MASK_GET(req->options, Z_Options_delSet) && binitreq.bend_delete) + { + ODR_MASK_SET(resp->options, Z_Options_delSet); + strcat(options, " del"); + } + if (ODR_MASK_GET(req->options, Z_Options_extendedServices) && + binitreq.bend_esrequest) + { + ODR_MASK_SET(resp->options, Z_Options_extendedServices); + strcat (options, " extendedServices"); + } if (ODR_MASK_GET(req->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(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->options, Z_Options_sort) && binitreq.bend_sort) + { + ODR_MASK_SET(resp->options, Z_Options_sort); + strcat(options, " sort"); + } if (ODR_MASK_GET(req->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(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 > control_block->maxrecordsize) assoc->maximumRecordSize = control_block->maxrecordsize; @@ -587,8 +863,10 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) { logf(LOG_LOG, "Connection rejected by backend."); *resp->result = 0; - assoc->rejected = 1; + assoc->state = ASSOC_DEAD; } + else + assoc->state = ASSOC_UP; return apdu; } @@ -596,261 +874,364 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) * These functions should be merged. */ +static void set_addinfo (Z_DefaultDiagFormat *dr, char *addinfo) +{ +#if ASN_COMPILED + dr->which = Z_DefaultDiagFormat_v2Addinfo; + dr->u.v2Addinfo = addinfo ? addinfo : ""; +#else + dr->which = Z_DiagForm_v2AddInfo; + dr->addinfo = addinfo ? addinfo : ""; +#endif +} + /* * nonsurrogate diagnostic record. */ -static Z_Records *diagrec(oid_proto proto, int error, char *addinfo) +static Z_Records *diagrec(association *assoc, int error, char *addinfo) { - static Z_Records rec; + int oid[OID_SIZE]; + Z_Records *rec = (Z_Records *) + odr_malloc (assoc->encode, sizeof(*rec)); oident bib1; - static int err; -#ifdef Z_95 - static Z_DiagRec drec; - static Z_DefaultDiagFormat dr; -#else - static Z_DiagRec dr; -#endif + int *err = (int *) + odr_malloc (assoc->encode, sizeof(*err)); + Z_DiagRec *drec = (Z_DiagRec *) + odr_malloc (assoc->encode, sizeof(*drec)); + Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) + odr_malloc (assoc->encode, sizeof(*dr)); - bib1.proto = proto; - bib1.class = CLASS_DIAGSET; + bib1.proto = assoc->proto; + 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; + *err = error; + rec->which = Z_Records_NSD; +#if ASN_COMPILED + rec->u.nonSurrogateDiagnostic = dr; +#else #ifdef Z_95 - rec.u.nonSurrogateDiagnostic = &drec; - drec.which = Z_DiagRec_defaultFormat; - drec.u.defaultFormat = &dr; + rec->u.nonSurrogateDiagnostic = drec; + drec->which = Z_DiagRec_defaultFormat; + drec->u.defaultFormat = dr; #else - rec.u.nonSurrogateDiagnostic = &dr; + rec->u.nonSurrogateDiagnostic = dr; #endif - dr.diagnosticSetId = oid_getoidbyent(&bib1); - dr.condition = &err; - dr.which = Z_DiagForm_v2AddInfo; - dr.addinfo = addinfo ? addinfo : ""; - return &rec; +#endif + dr->diagnosticSetId = odr_oiddup (assoc->encode, + oid_ent_to_oid(&bib1, oid)); + dr->condition = err; + set_addinfo (dr, addinfo); + return rec; } /* * surrogate diagnostic. */ -static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname, - int error, char *addinfo) +static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, + int error, char *addinfo) { - static Z_NamePlusRecord rec; - static int err; + int oid[OID_SIZE]; + Z_NamePlusRecord *rec = (Z_NamePlusRecord *)odr_malloc (assoc->encode, sizeof(*rec)); + int *err = (int *)odr_malloc (assoc->encode, sizeof(*err)); oident bib1; -#ifdef Z_95 - static Z_DiagRec drec; - static Z_DefaultDiagFormat dr; -#else - static Z_DiagRec dr; -#endif + Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec)); + Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*dr)); - bib1.proto = proto; - bib1.class = CLASS_DIAGSET; + bib1.proto = assoc->proto; + 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; + *err = error; + rec->databaseName = dbname; + rec->which = Z_NamePlusRecord_surrogateDiagnostic; + rec->u.surrogateDiagnostic = drec; + drec->which = Z_DiagRec_defaultFormat; + drec->u.defaultFormat = dr; + dr->diagnosticSetId = odr_oiddup (assoc->encode, + oid_ent_to_oid(&bib1, oid)); + dr->condition = err; + set_addinfo (dr, addinfo); + + return rec; } /* * multiple nonsurrogate diagnostics. */ -static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo) +static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) { - static Z_DiagRecs recs; - static int err; + int oid[OID_SIZE]; + Z_DiagRecs *recs = (Z_DiagRecs *)odr_malloc (assoc->encode, sizeof(*recs)); + int *err = (int *)odr_malloc (assoc->encode, sizeof(*err)); oident bib1; -#ifdef Z_95 - static Z_DiagRec *recp[1], drec; - static Z_DefaultDiagFormat rec; -#else - static Z_DiagRec *recp[1], rec; -#endif + Z_DiagRec **recp = (Z_DiagRec **)odr_malloc (assoc->encode, sizeof(*recp)); + Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec)); + Z_DefaultDiagFormat *rec = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*rec)); logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo); - bib1.proto = proto; - bib1.class = CLASS_DIAGSET; + bib1.proto = assoc->proto; + 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; + *err = error; + recs->num_diagRecs = 1; + recs->diagRecs = recp; + recp[0] = drec; + drec->which = Z_DiagRec_defaultFormat; + drec->u.defaultFormat = rec; + + rec->diagnosticSetId = odr_oiddup (assoc->encode, + oid_ent_to_oid(&bib1, oid)); + rec->condition = err; + +#ifdef ASN_COMPILED + rec->which = Z_DefaultDiagFormat_v2Addinfo; + rec->u.v2Addinfo = addinfo ? addinfo : ""; #else - recp[0] = &rec; + rec->which = Z_DiagForm_v2AddInfo; + rec->addinfo = addinfo ? addinfo : ""; #endif - rec.diagnosticSetId = oid_getoidbyent(&bib1); - rec.condition = &err; - rec.which = Z_DiagForm_v2AddInfo; - rec.addinfo = addinfo ? addinfo : ""; - return &recs; + 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]; + int oid[OID_SIZE]; + int recno, total_length = 0, toget = *num, dumped_records = 0; + Z_Records *records = (Z_Records *)odr_malloc (a->encode, sizeof(*records)); + Z_NamePlusRecordList *reclist = (Z_NamePlusRecordList *)odr_malloc (a->encode, sizeof(*reclist)); + Z_NamePlusRecord **list = (Z_NamePlusRecord **)odr_malloc (a->encode, sizeof(*list) * toget); oident recform; - Odr_oid *oid; - records.which = Z_Records_DBOSD; - records.u.databaseOrSurDiagnostics = &reclist; - reclist.num_records = 0; - reclist.records = list; + records->which = Z_Records_DBOSD; + records->u.databaseOrSurDiagnostics = reclist; + reclist->num_records = 0; + reclist->records = list; *pres = Z_PRES_SUCCESS; *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); - for (recno = start; reclist.num_records < toget; recno++) + for (recno = start; reclist->num_records < toget; recno++) { bend_fetchrequest freq; bend_fetchresult *fres; Z_NamePlusRecord *thisrec; Z_DatabaseRecord *thisext; + int this_length = 0; - if (reclist.num_records == MAX_RECORDS - 1) - { - *pres = Z_PRES_PARTIAL_2; - break; - } + /* + * 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) - dumped_records; freq.setname = setname; freq.number = recno; + freq.comp = comp; + freq.format = format; + freq.stream = a->encode; + freq.surrogate_flag = 0; if (!(fres = bend_fetch(a->backend, &freq, 0))) { *pres = Z_PRES_FAILURE; - return diagrec(a->proto, 2, "Backend interface problem"); + return diagrec(a, 2, "Backend interface problem"); } /* backend should be able to signal whether error is system-wide or only pertaining to current record */ if (fres->errcode) { - *pres = Z_PRES_FAILURE; - return diagrec(a->proto, fres->errcode, fres->errstring); + if (!freq.surrogate_flag) + { + *pres = Z_PRES_FAILURE; + return diagrec(a, fres->errcode, fres->errstring); + } + reclist->records[reclist->num_records] = + surrogatediagrec(a, fres->basename, fres->errcode, + fres->errstring); + reclist->num_records++; + *next = fres->last_in_set ? 0 : recno + 1; + continue; } + 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) { logf(LOG_DEBUG, " Dropped it"); - reclist.records[reclist.num_records] = - surrogatediagrec(a->proto, fres->basename, 16, 0); - reclist.num_records++; - total_length += 10; /* totally arbitrary */ + reclist->records[reclist->num_records] = + surrogatediagrec(a, fres->basename, 16, 0); + reclist->num_records++; + *next = fres->last_in_set ? 0 : recno + 1; + dumped_records += this_length; continue; } } else /* too big entirely */ { logf(LOG_DEBUG, "Record > maxrcdsz"); - reclist.records[reclist.num_records] = - surrogatediagrec(a->proto, fres->basename, 17, 0); - reclist.num_records++; - total_length += 10; /* totally arbitrary */ + reclist->records[reclist->num_records] = + surrogatediagrec(a, fres->basename, 17, 0); + reclist->num_records++; + *next = fres->last_in_set ? 0 : recno + 1; + dumped_records += this_length; continue; } } - if (!(thisrec = odr_malloc(a->encode, sizeof(*thisrec)))) + + if (!(thisrec = (Z_NamePlusRecord *)odr_malloc(a->encode, sizeof(*thisrec)))) return 0; - if (!(thisrec->databaseName = odr_malloc(a->encode, + if (!(thisrec->databaseName = (char *)odr_malloc(a->encode, strlen(fres->basename) + 1))) 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 = (Z_External *)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_ent_to_oid(&recform, oid)); 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; - reclist.records[reclist.num_records] = thisrec; - reclist.num_records++; - total_length += 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; + case VAL_SUMMARY: thisext->which = Z_External_summary; break; + case VAL_OPAC: thisext->which = Z_External_OPAC; 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 */ + { +#if 0 + Z_SUTRS *sutrs = (Z_SUTRS *)odr_malloc(a->encode, 1+fres->len); + + memcpy(sutrs, fres->record, fres->len); + sutrs[fres->len] = '\0'; +#else + Odr_oct *sutrs = (Odr_oct *)odr_malloc(a->encode, sizeof(*sutrs)); + + thisext->which = Z_External_sutrs; + thisext->u.sutrs = sutrs; + sutrs->buf = (unsigned char *)odr_malloc(a->encode, fres->len); + sutrs->len = sutrs->size = fres->len; + memcpy(sutrs->buf, fres->record, fres->len); +#endif + } + else /* octet-aligned record. */ + { + thisext->which = Z_External_octet; + if (!(thisext->u.octet_aligned = (Odr_oct *)odr_malloc(a->encode, + sizeof(Odr_oct)))) + return 0; + if (!(thisext->u.octet_aligned->buf = (unsigned char *)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++; *next = fres->last_in_set ? 0 : recno + 1; } - *num = reclist.num_records; - return &records; + *num = reclist->num_records; + return records; } static Z_APDU *process_searchRequest(association *assoc, request *reqb, int *fd) { Z_SearchRequest *req = reqb->request->u.searchRequest; - bend_searchrequest bsrq; - bend_searchresult *bsrt; + bend_search_rr *bsrr = (bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr)); logf(LOG_LOG, "Got SearchRequest."); + save_referenceId (reqb, req->referenceId); + /* store ref id in request */ + bsrr->fd = fd; + bsrr->request = reqb; + bsrr->association = assoc; + if (assoc->bend_search) + { + bsrr->setname = req->resultSetName; + bsrr->replace_set = *req->replaceIndicator; + bsrr->num_bases = req->num_databaseNames; + bsrr->basenames = req->databaseNames; + bsrr->query = req->query; + bsrr->stream = assoc->encode; + bsrr->decode = assoc->decode; + bsrr->errcode = 0; + bsrr->hits = 0; + bsrr->errstring = NULL; + ((int (*)(void *, bend_search_rr *))(assoc->bend_search))(assoc->backend, bsrr); + if (!bsrr->request) + return 0; + } + else + { + bend_searchrequest bsrq; + bend_searchresult *bsrt; - 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); + bsrq.setname = req->resultSetName; + bsrq.replace_set = *req->replaceIndicator; + bsrq.num_bases = req->num_databaseNames; + bsrq.basenames = req->databaseNames; + bsrq.query = req->query; + bsrq.stream = assoc->encode; + bsrq.decode = assoc->decode; + if (!(bsrt = bend_search(assoc->backend, &bsrq, fd))) + return 0; + bsrr->hits = bsrt->hits; + bsrr->errcode = bsrt->errcode; + bsrr->errstring = bsrt->errstring; + } + return response_searchRequest(assoc, reqb, bsrr, fd); } -bend_searchresult *bend_searchresponse(void *handle) {return 0;} +int bend_searchresponse(void *handle, bend_search_rr *bsrr) {return 0;} /* * Prepare a searchresponse based on the backend results. We probably want @@ -860,87 +1241,104 @@ bend_searchresult *bend_searchresponse(void *handle) {return 0;} * 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) + bend_search_rr *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; -#ifdef Z_95 - resp.additionalSearchInfo = 0; - resp.otherInfo = 0; -#endif + Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + Z_SearchResponse *resp = (Z_SearchResponse *)odr_malloc (assoc->encode, sizeof(*resp)); + int *nulint = (int *)odr_malloc (assoc->encode, sizeof(*nulint)); + bool_t *sr = (bool_t *)odr_malloc (assoc->encode, sizeof(*sr)); + int *next = (int *)odr_malloc (assoc->encode, sizeof(*next)); + int *none = (int *)odr_malloc (assoc->encode, sizeof(*none)); + + *nulint = 0; + *sr = 1; + *next = 0; + *none = Z_RES_NONE; + + apdu->which = Z_APDU_searchResponse; + apdu->u.searchResponse = resp; + resp->referenceId = req->referenceId; + resp->additionalSearchInfo = 0; + resp->otherInfo = 0; *fd = -1; - if (!bsrt && !(bsrt = bend_searchresponse(assoc->backend))) + if (!bsrt && !bend_searchresponse(assoc->backend, bsrt)) { logf(LOG_FATAL, "Bad result from backend"); return 0; } 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; + resp->records = diagrec(assoc, 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; + int *toget = (int *)odr_malloc (assoc->encode, sizeof(*toget)); + int *presst = (int *)odr_malloc (assoc->encode, sizeof(*presst)); + Z_RecordComposition comp, *compp = 0; - resp.records = 0; - resp.resultCount = &bsrt->hits; + *toget = 0; + *presst = 0; + resp->records = 0; + resp->resultCount = &bsrt->hits; + comp.which = Z_RecordComp_simple; /* how many records does the user agent want, then? */ if (bsrt->hits <= *req->smallSetUpperBound) { - toget = bsrt->hits; - setnames = req->smallSetElementSetNames; + *toget = bsrt->hits; + if ((comp.u.simple = req->smallSetElementSetNames)) + compp = ∁ } else if (bsrt->hits < *req->largeSetLowerBound) { - toget = *req->mediumSetPresentNumber; - if (toget > bsrt->hits) - toget = bsrt->hits; - setnames = req->mediumSetElementSetNames; + *toget = *req->mediumSetPresentNumber; + if (*toget > bsrt->hits) + *toget = bsrt->hits; + if ((comp.u.simple = req->mediumSetElementSetNames)) + compp = ∁ } else - toget = 0; + *toget = 0; - if (toget && !resp.records) + if (*toget && !resp->records) { - resp.records = pack_records(assoc, req->resultSetName, 1, - &toget, setnames, &next, &presst); - if (!resp.records) + oident *prefformat; + oid_value form; + + if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) || + prefformat->oclass != CLASS_RECSYN) + form = VAL_NONE; + else + 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; + resp->numberOfRecordsReturned = toget; + resp->nextResultSetPosition = next; + resp->searchStatus = sr; + resp->resultSetStatus = 0; + resp->presentStatus = presst; } else { - resp.numberOfRecordsReturned = &nulint; - resp.nextResultSetPosition = &next; - resp.searchStatus = &sr; - resp.resultSetStatus = 0; - resp.presentStatus = 0; + if (*resp->resultCount) + *next = 1; + resp->numberOfRecordsReturned = nulint; + resp->nextResultSetPosition = next; + resp->searchStatus = sr; + resp->resultSetStatus = 0; + resp->presentStatus = 0; } } - return &apdu; + return apdu; } /* @@ -962,28 +1360,63 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, int *fd) { 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; + Z_APDU *apdu; + Z_PresentResponse *resp; + int *presst; + int *next; + int *num; logf(LOG_LOG, "Got PresentRequest."); - apdu.which = Z_APDU_presentResponse; - apdu.u.presentResponse = &resp; - resp.referenceId = req->referenceId; -#ifdef Z_95 - resp.otherInfo = 0; -#endif - num = *req->numberOfRecordsRequested; - resp.records = pack_records(assoc, req->resultSetId, - *req->resultSetStartPoint, &num, 0, &next, &presst); - if (!resp.records) - return 0; - resp.numberOfRecordsReturned = # - resp.presentStatus = &presst; - resp.nextResultSetPosition = &next; + if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) || + prefformat->oclass != CLASS_RECSYN) + form = VAL_NONE; + else + form = prefformat->value; + if (assoc->bend_present) + { + bend_present_rr *bprr = (bend_present_rr *)nmem_malloc (reqb->request_mem, sizeof(*bprr)); + bprr->setname = req->resultSetId; + bprr->start = *req->resultSetStartPoint; + bprr->number = *req->numberOfRecordsRequested; + bprr->format = form; + bprr->comp = req->recordComposition; + bprr->stream = assoc->encode; + bprr->request = reqb; + bprr->association = assoc; + bprr->errcode = 0; + bprr->errstring = NULL; + ((int (*)(void *, bend_present_rr *))(*assoc->bend_present))(assoc->backend, bprr); - return &apdu; + if (!bprr->request) + return 0; + } + apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp)); + presst = (int *)odr_malloc (assoc->encode, sizeof(*presst)); + next = (int *)odr_malloc (assoc->encode, sizeof(*next)); + num = (int *)odr_malloc (assoc->encode, sizeof(*num)); + *presst = 0; + *next = 0; + *num = *req->numberOfRecordsRequested; + + apdu->which = Z_APDU_presentResponse; + apdu->u.presentResponse = resp; + resp->referenceId = req->referenceId; + resp->otherInfo = 0; + + resp->records = + pack_records(assoc, req->resultSetId, *req->resultSetStartPoint, + num, req->recordComposition, next, presst, form); + if (!resp->records) + return 0; + resp->numberOfRecordsReturned = num; + resp->presentStatus = presst; + resp->nextResultSetPosition = next; + + return apdu; } /* @@ -993,99 +1426,359 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { 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; + Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + Z_ScanResponse *res = (Z_ScanResponse *)odr_malloc (assoc->encode, sizeof(*res)); + int *scanStatus = (int *)odr_malloc (assoc->encode, sizeof(*scanStatus)); + int *numberOfEntriesReturned = + (int *)odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned)); + Z_ListEntries *ents = (Z_ListEntries *)odr_malloc (assoc->encode, sizeof(*ents)); + Z_DiagRecs *diagrecs_p = NULL; oident *attent; - static Z_ListEntries ents; -#define SCAN_MAX_ENTRIES 200 - static Z_Entry *tab[SCAN_MAX_ENTRIES]; bend_scanrequest srq; bend_scanresult *srs; + oident *attset; - logf(LOG_LOG, "Got scanrequest"); - apdu.which = Z_APDU_scanResponse; - apdu.u.scanResponse = &res; - res.referenceId = req->referenceId; - res.stepSize = 0; - res.scanStatus = &scanStatus; - res.numberOfEntriesReturned = &numberOfEntriesReturned; - res.positionOfTerm = 0; - res.entries = &ents; - ents.which = Z_ListEntries_nonSurrogateDiagnostics; - res.attributeSet = 0; -#ifdef Z_95 - res.otherInfo = 0; -#endif + logf(LOG_LOG, "Got ScanRequest"); + *scanStatus = Z_Scan_failure; + *numberOfEntriesReturned = 0; + + apdu->which = Z_APDU_scanResponse; + apdu->u.scanResponse = res; + res->referenceId = req->referenceId; + res->stepSize = 0; + res->scanStatus = scanStatus; + res->numberOfEntriesReturned = numberOfEntriesReturned; + res->positionOfTerm = 0; + res->entries = ents; + ents->num_entries = 0; + ents->entries = NULL; + ents->num_nonsurrogateDiagnostics = 0; + ents->nonsurrogateDiagnostics = NULL; + res->attributeSet = 0; + res->otherInfo = 0; if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) || - attent->class != CLASS_ATTSET || attent->value != VAL_BIB1)) - ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 121, 0); + attent->oclass != CLASS_ATTSET + || attent->value != VAL_BIB1)) + diagrecs_p = diagrecs(assoc, 121, 0); else if (req->stepSize && *req->stepSize > 0) - ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0); + diagrecs_p = diagrecs(assoc, 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); + 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; + srq.stream = assoc->encode; + 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))) - ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 2, 0); + diagrecs_p = diagrecs(assoc, 2, 0); else if (srs->errcode) - ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, - srs->errcode, srs->errstring); + diagrecs_p = diagrecs(assoc, srs->errcode, srs->errstring); else { int i; - static Z_Entries list; - + Z_Entry **tab = (Z_Entry **) + odr_malloc (assoc->encode, sizeof(*tab) * srs->num_entries); + if (srs->status == BEND_SCAN_PARTIAL) - scanStatus = Z_Scan_partial_5; + *scanStatus = Z_Scan_partial_5; else - scanStatus = Z_Scan_success; - ents.which = Z_ListEntries_entries; - ents.u.entries = &list; - list.entries = tab; + *scanStatus = Z_Scan_success; + ents->entries = tab; + ents->num_entries = srs->num_entries; + res->numberOfEntriesReturned = &ents->num_entries; + res->positionOfTerm = &srs->term_position; for (i = 0; i < srs->num_entries; i++) { Z_Entry *e; Z_TermInfo *t; Odr_oct *o; - - if (i >= SCAN_MAX_ENTRIES) + + tab[i] = e = (Z_Entry *)odr_malloc(assoc->encode, sizeof(*e)); + if (srs->entries[i].occurrences >= 0) { - scanStatus = Z_Scan_partial_4; - break; + e->which = Z_Entry_termInfo; + e->u.termInfo = t = (Z_TermInfo *) + 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 = (Z_Term *) + odr_malloc(assoc->encode, sizeof(*t->term)); + t->term->which = Z_Term_general; + t->term->u.general = o = + (Odr_oct *)odr_malloc(assoc->encode, sizeof(Odr_oct)); + o->buf = (unsigned char *) + 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); + } + else + { + Z_Records *zrecords = diagrec (assoc, + srs->entries[i].errcode, + srs->entries[i].errstring); + logf(LOG_DEBUG, " term sd code=%d addinfo=%s", + srs->entries[i].errcode, + (srs->entries[i].errstring?srs->entries[i].errstring : + "")); + assert (zrecords->which == Z_Records_NSD); + e->which = Z_Entry_surrogateDiagnostic; + e->u.surrogateDiagnostic = + zrecords->u.nonSurrogateDiagnostic; } - list.entries[i] = e = odr_malloc(assoc->encode, sizeof(*e)); - e->which = Z_Entry_termInfo; - e->u.termInfo = t = odr_malloc(assoc->encode, sizeof(*t)); - t->suggestedAttributes = 0; - t->alternativeTerm = 0; - t->byAttributes = 0; - t->globalOccurrences = &srs->entries[i].occurrences; - t->term = odr_malloc(assoc->encode, sizeof(*t->term)); - t->term->which = Z_Term_general; - t->term->u.general = o = odr_malloc(assoc->encode, - sizeof(Odr_oct)); - 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 (diagrecs_p) + { + ents->num_nonsurrogateDiagnostics = diagrecs_p->num_diagRecs; + ents->nonsurrogateDiagnostics = diagrecs_p->diagRecs; + } + return apdu; +} + +static Z_APDU *process_sortRequest(association *assoc, request *reqb, + int *fd) +{ + Z_SortRequest *req = reqb->request->u.sortRequest; + Z_SortResponse *res = (Z_SortResponse *)odr_malloc (assoc->encode, sizeof(*res)); + bend_sort_rr *bsrr = (bend_sort_rr *)odr_malloc (assoc->encode, sizeof(*bsrr)); + + Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + + logf(LOG_LOG, "Got SortRequest."); + +#ifdef ASN_COMPILED + bsrr->num_input_setnames = req->num_inputResultSetNames; + bsrr->input_setnames = req->inputResultSetNames; +#else + bsrr->num_input_setnames = req->inputResultSetNames->num_strings; + bsrr->input_setnames = req->inputResultSetNames->strings; +#endif + bsrr->output_setname = req->sortedResultSetName; + bsrr->sort_sequence = req->sortSequence; + bsrr->stream = assoc->encode; + + bsrr->sort_status = Z_SortStatus_failure; + bsrr->errcode = 0; + bsrr->errstring = 0; - return &apdu; + ((int (*)(void *, bend_sort_rr *))(*assoc->bend_sort))(assoc->backend, bsrr); + + res->referenceId = req->referenceId; + res->sortStatus = (int *)odr_malloc (assoc->encode, sizeof(*res->sortStatus)); + *res->sortStatus = bsrr->sort_status; + res->resultSetStatus = 0; + if (bsrr->errcode) + { + Z_DiagRecs *dr = diagrecs (assoc, bsrr->errcode, bsrr->errstring); +#ifdef ASN_COMPILED + res->diagnostics = dr->diagRecs; + res->num_diagnostics = dr->num_diagRecs; +#else + res->diagnostics = dr; +#endif + } + else + { +#ifdef ASN_COMPILED + res->num_diagnostics = 0; +#endif + res->diagnostics = 0; + } + res->otherInfo = 0; + + apdu->which = Z_APDU_sortResponse; + apdu->u.sortResponse = res; + return apdu; +} + +static Z_APDU *process_deleteRequest(association *assoc, request *reqb, + int *fd) +{ + Z_DeleteResultSetRequest *req = reqb->request->u.deleteResultSetRequest; + Z_DeleteResultSetResponse *res = (Z_DeleteResultSetResponse *) + odr_malloc (assoc->encode, sizeof(*res)); + bend_delete_rr *bdrr = (bend_delete_rr *) + odr_malloc (assoc->encode, sizeof(*bdrr)); + Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); + + logf(LOG_LOG, "Got DeleteRequest."); + + bdrr->num_setnames = req->num_resultSetList; + bdrr->setnames = req->resultSetList; + bdrr->stream = assoc->encode; + bdrr->function = *req->deleteFunction; + + ((int (*)(void *, bend_delete_rr *)) + (*assoc->bend_delete))(assoc->backend, bdrr); + + res->referenceId = req->referenceId; + + res->deleteOperationStatus = (int *) + odr_malloc (assoc->encode, sizeof(*res->deleteOperationStatus)); + *res->deleteOperationStatus = bdrr->delete_status; + + res->deleteListStatuses = 0; + res->numberNotDeleted = 0; + res->bulkStatuses = 0; + res->deleteMessage = 0; + res->otherInfo = 0; + + apdu->which = Z_APDU_deleteResultSetResponse; + apdu->u.deleteResultSetResponse = res; + return apdu; +} + +static void process_close(association *assoc, request *reqb) +{ + Z_Close *req = reqb->request->u.close; + static char *reasons[] = + { + "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_req(assoc, Z_Close_finished, "Association terminated by client", + reqb); +} + +void save_referenceId (request *reqb, Z_ReferenceId *refid) +{ + if (refid) + { + reqb->len_refid = refid->len; + reqb->refid = (char *)nmem_malloc (reqb->request_mem, refid->len); + memcpy (reqb->refid, refid->buf, refid->len); + } + else + { + reqb->len_refid = 0; + reqb->refid = NULL; + } +} + +void bend_request_send (bend_association a, bend_request req, Z_APDU *res) +{ + process_response (a, req, res); } + +bend_request bend_request_mk (bend_association a) +{ + request *nreq = request_get (&a->outgoing); + nreq->request_mem = nmem_create (); + return nreq; +} + +Z_ReferenceId *bend_request_getid (ODR odr, bend_request req) +{ + Z_ReferenceId *id; + if (!req->refid) + return 0; + id = (Odr_oct *)odr_malloc (odr, sizeof(*odr)); + id->buf = (unsigned char *)odr_malloc (odr, req->len_refid); + id->len = id->size = req->len_refid; + memcpy (id->buf, req->refid, req->len_refid); + return id; +} + +void bend_request_destroy (bend_request *req) +{ + nmem_destroy((*req)->request_mem); + request_release(*req); + *req = NULL; +} + +int bend_backend_respond (bend_association a, bend_request req) +{ + return process_request (a, req); +} + +void bend_request_setdata(bend_request r, void *p) +{ + r->clientData = p; +} + +void *bend_request_getdata(bend_request r) +{ + return r->clientData; +} + +/* Chas: Added in from DALI */ +static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) +{ + bend_esrequest_rr esrequest; + + Z_ExtendedServicesRequest *req = reqb->request->u.extendedServicesRequest; + Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_extendedServicesResponse); + + Z_ExtendedServicesResponse *resp = apdu->u.extendedServicesResponse; + + logf(LOG_DEBUG,"inside Process esRequest"); + + esrequest.esr = reqb->request->u.extendedServicesRequest; + esrequest.stream = assoc->encode; + esrequest.errcode = 0; + esrequest.errstring = NULL; + esrequest.request = reqb; + esrequest.association = assoc; + + ((int (*)(void *, bend_esrequest_rr *))(*assoc->bend_esrequest))(assoc->backend, + &esrequest); + + /* If the response is being delayed, return NULL */ + if (esrequest.request == NULL) + return(NULL); + + resp->referenceId = req->referenceId; + + if ( esrequest.errcode == 0 ) + { + /* Backend service indicates request will be processed */ + logf(LOG_DEBUG,"Request will be processed...Good !"); + *resp->operationStatus = Z_ExtendedServicesResponse_done; + } + else + { + /* Backend indicates error, request will not be processed */ + logf(LOG_DEBUG,"Request will not be processed...BAD !"); + *resp->operationStatus = Z_ExtendedServicesResponse_failure; + } + /* Do something with the members of bend_extendedservice */ + + logf(LOG_DEBUG,"Send the result apdu"); + + return apdu; +} + +/* Chas: End of addition from DALI */