X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=44d69f7a8d6be75974a16c948bfda649dd8092c9;hp=c74de0ce3511ac4222899e01ee7d5846d25c4883;hb=f69d4aa4609ff3daa71733da1ea0fcd8322ab954;hpb=8fcf022b257ac4321f13dd1b9045a01d1535992b diff --git a/server/seshigh.c b/server/seshigh.c index c74de0c..44d69f7 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -1,10 +1,60 @@ /* - * 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.66 1997-09-05 15:26:44 adam + * 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++. * @@ -256,22 +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. @@ -280,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 = xmalloc(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) { @@ -297,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 != '-') { @@ -325,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->state = ASSOC_NEW; - 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; } /* @@ -360,12 +418,12 @@ void destroy_association(association *h) xfree(h); } -static void do_close(association *a, int reason, char *message) +static void do_close_req(association *a, int reason, char *message, + request *req) { Z_APDU apdu; Z_Close *cls = zget_Close(a->encode); - request *req = request_get(&a->outgoing); - + /* Purge request queue */ while (request_deq(&a->incoming)); while (request_deq(&a->outgoing)); @@ -388,6 +446,11 @@ static void do_close(association *a, int reason, char *message) a->state = ASSOC_DEAD; } +static void do_close(association *a, int reason, char *message) +{ + do_close_req (a, reason, message, request_get(&a->outgoing)); +} + /* * This is where PDUs from the client are read and the further * processing is initiated. Flow of control moves down through the @@ -400,7 +463,7 @@ static void do_close(association *a, int reason, char *message) 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; @@ -478,8 +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) - do_close(assoc, Z_Close_systemProblem, "Unknown error"); + { + request_deq(&assoc->incoming); + if (process_request(assoc, req) < 0) + do_close_req(assoc, Z_Close_systemProblem, "Unknown error", + req); + } } if (event & EVENT_OUTPUT) { @@ -518,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) { @@ -536,8 +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; @@ -545,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 */ { @@ -563,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; } /* @@ -572,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; @@ -624,25 +718,25 @@ static int process_response(association *assoc, request *req, Z_APDU *res) 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_errmsg(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->encode); + req->state = REQUEST_IDLE; 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; } @@ -670,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."); @@ -679,6 +779,17 @@ 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 */ @@ -692,13 +803,17 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) ODR_MASK_SET(resp->options, Z_Options_present); strcat(options, " prst"); } -#if 0 - if (ODR_MASK_GET(req->options, Z_Options_delSet)) + if (ODR_MASK_GET(req->options, Z_Options_delSet) && binitreq.bend_delete) { - ODR_MASK_SET(&options, Z_Options_delSet); + ODR_MASK_SET(resp->options, Z_Options_delSet); strcat(options, " del"); } -#endif + 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); @@ -714,7 +829,11 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) 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); @@ -755,16 +874,32 @@ 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(association *assoc, int error, char *addinfo) { - Z_Records *rec = odr_malloc (assoc->encode, sizeof(*rec)); + int oid[OID_SIZE]; + Z_Records *rec = (Z_Records *) + odr_malloc (assoc->encode, sizeof(*rec)); oident bib1; - int *err = odr_malloc (assoc->encode, sizeof(*err)); - Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec)); - Z_DefaultDiagFormat *dr = odr_malloc (assoc->encode, sizeof(*dr)); + 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 = assoc->proto; bib1.oclass = CLASS_DIAGSET; @@ -774,6 +909,9 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) "NULL"); *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; @@ -781,10 +919,11 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) #else rec->u.nonSurrogateDiagnostic = dr; #endif - dr->diagnosticSetId = oid_getoidbyent(&bib1); +#endif + dr->diagnosticSetId = odr_oiddup (assoc->encode, + oid_ent_to_oid(&bib1, oid)); dr->condition = err; - dr->which = Z_DiagForm_v2AddInfo; - dr->addinfo = addinfo ? addinfo : ""; + set_addinfo (dr, addinfo); return rec; } @@ -792,13 +931,14 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) * surrogate diagnostic. */ static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, - int error, char *addinfo) + int error, char *addinfo) { - Z_NamePlusRecord *rec = odr_malloc (assoc->encode, sizeof(*rec)); - int *err = odr_malloc (assoc->encode, sizeof(*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; - Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec)); - Z_DefaultDiagFormat *dr = odr_malloc (assoc->encode, sizeof(*dr)); + Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec)); + Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*dr)); bib1.proto = assoc->proto; bib1.oclass = CLASS_DIAGSET; @@ -811,10 +951,11 @@ static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, rec->u.surrogateDiagnostic = drec; drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = dr; - dr->diagnosticSetId = oid_getoidbyent(&bib1); + dr->diagnosticSetId = odr_oiddup (assoc->encode, + oid_ent_to_oid(&bib1, oid)); dr->condition = err; - dr->which = Z_DiagForm_v2AddInfo; - dr->addinfo = addinfo ? addinfo : ""; + set_addinfo (dr, addinfo); + return rec; } @@ -823,12 +964,13 @@ static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, */ static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) { - Z_DiagRecs *recs = odr_malloc (assoc->encode, sizeof(*recs)); - int *err = odr_malloc (assoc->encode, sizeof(*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; - Z_DiagRec **recp = odr_malloc (assoc->encode, sizeof(*recp)); - Z_DiagRec *drec = odr_malloc (assoc->encode, sizeof(*drec)); - Z_DefaultDiagFormat *rec = odr_malloc (assoc->encode, sizeof(*rec)); + 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 = assoc->proto; @@ -842,10 +984,17 @@ static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = rec; - rec->diagnosticSetId = oid_getoidbyent(&bib1); + 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 rec->which = Z_DiagForm_v2AddInfo; rec->addinfo = addinfo ? addinfo : ""; +#endif return recs; } @@ -853,10 +1002,11 @@ static Z_Records *pack_records(association *a, char *setname, int start, int *num, Z_RecordComposition *comp, int *next, int *pres, oid_value format) { + int oid[OID_SIZE]; int recno, total_length = 0, toget = *num, dumped_records = 0; - Z_Records *records = odr_malloc (a->encode, sizeof(*records)); - Z_NamePlusRecordList *reclist = odr_malloc (a->encode, sizeof(*reclist)); - Z_NamePlusRecord **list = odr_malloc (a->encode, sizeof(*list) * toget); + 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; records->which = Z_Records_DBOSD; @@ -876,7 +1026,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, bend_fetchresult *fres; Z_NamePlusRecord *thisrec; Z_DatabaseRecord *thisext; - int this_length; + int this_length = 0; /* * we get the number of bytes allocated on the stream before any @@ -889,6 +1039,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, 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; @@ -898,8 +1049,17 @@ static Z_Records *pack_records(association *a, char *setname, int start, or only pertaining to current record */ if (fres->errcode) { - *pres = Z_PRES_FAILURE; - return diagrec(a, 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; @@ -942,21 +1102,22 @@ static Z_Records *pack_records(association *a, char *setname, int start, 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; recform.proto = a->proto; recform.oclass = CLASS_RECSYN; recform.value = fres->format; thisext->direct_reference = odr_oiddup(a->encode, - oid_getoidbyent(&recform)); + oid_ent_to_oid(&recform, oid)); thisext->indirect_reference = 0; thisext->descriptor = 0; if (fres->len < 0) /* Structured data */ @@ -985,21 +1146,28 @@ static Z_Records *pack_records(association *a, char *setname, int start, } else if (fres->format == VAL_SUTRS) /* SUTRS is a single-ASN.1-type */ { - Odr_oct *sutrs = odr_malloc(a->encode, sizeof(*sutrs)); +#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 = odr_malloc(a->encode, fres->len); + 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_malloc(a->encode, + if (!(thisext->u.octet_aligned = (Odr_oct *)odr_malloc(a->encode, sizeof(Odr_oct)))) return 0; - if (!(thisext->u.octet_aligned->buf = odr_malloc(a->encode, + 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); @@ -1018,24 +1186,52 @@ 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."); - - 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; - - if (!(bsrt = bend_search(assoc->backend, &bsrq, fd))) - return 0; - return response_searchRequest(assoc, reqb, bsrt, fd); + 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; + 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 @@ -1045,15 +1241,15 @@ 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; - Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu)); - Z_SearchResponse *resp = odr_malloc (assoc->encode, sizeof(*resp)); - int *nulint = odr_malloc (assoc->encode, sizeof(*nulint)); - bool_t *sr = odr_malloc (assoc->encode, sizeof(*sr)); - int *next = odr_malloc (assoc->encode, sizeof(*next)); - int *none = odr_malloc (assoc->encode, sizeof(*none)); + 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; @@ -1066,7 +1262,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, 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; @@ -1083,8 +1279,8 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, } else { - int *toget = odr_malloc (assoc->encode, sizeof(*toget)); - int *presst = odr_malloc (assoc->encode, sizeof(*presst)); + int *toget = (int *)odr_malloc (assoc->encode, sizeof(*toget)); + int *presst = (int *)odr_malloc (assoc->encode, sizeof(*presst)); Z_RecordComposition comp, *compp = 0; *toget = 0; @@ -1164,39 +1360,62 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, int *fd) { Z_PresentRequest *req = reqb->request->u.presentRequest; - Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu)); - Z_PresentResponse *resp = odr_malloc (assoc->encode, sizeof(*resp)); - int *presst = odr_malloc (assoc->encode, sizeof(*presst)); - int *next = odr_malloc (assoc->encode, sizeof(*next)); - int *num = odr_malloc (assoc->encode, sizeof(*num)); oident *prefformat; oid_value form; + Z_APDU *apdu; + Z_PresentResponse *resp; + int *presst; + int *next; + int *num; logf(LOG_LOG, "Got PresentRequest."); - *presst = 0; - *next = 0; - *num = 0; - - apdu->which = Z_APDU_presentResponse; - apdu->u.presentResponse = resp; - resp->referenceId = req->referenceId; - resp->otherInfo = 0; 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); + + 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; - resp->records = pack_records(assoc, req->resultSetId, - *req->resultSetStartPoint, num, req->recordComposition, next, - presst, form); + + 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; + return 0; resp->numberOfRecordsReturned = num; resp->presentStatus = presst; resp->nextResultSetPosition = next; - + return apdu; } @@ -1207,18 +1426,19 @@ 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; - Z_APDU *apdu = odr_malloc (assoc->encode, sizeof(*apdu)); - Z_ScanResponse *res = odr_malloc (assoc->encode, sizeof(*res)); - int *scanStatus = odr_malloc (assoc->encode, sizeof(*scanStatus)); + 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 = - odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned)); - Z_ListEntries *ents = odr_malloc (assoc->encode, sizeof(*ents)); + (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; bend_scanrequest srq; bend_scanresult *srs; oident *attset; - logf(LOG_LOG, "Got scanrequest"); + logf(LOG_LOG, "Got ScanRequest"); *scanStatus = Z_Scan_failure; *numberOfEntriesReturned = 0; @@ -1230,21 +1450,25 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) res->numberOfEntriesReturned = numberOfEntriesReturned; res->positionOfTerm = 0; res->entries = ents; - ents->which = Z_ListEntries_nonSurrogateDiagnostics; + 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->oclass != CLASS_ATTSET || attent->value != VAL_BIB1)) - ents->u.nonSurrogateDiagnostics = diagrecs(assoc, 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, 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; @@ -1258,55 +1482,168 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) srq.term_position = req->preferredPositionInResponse ? *req->preferredPositionInResponse : 1; if (!(srs = bend_scan(assoc->backend, &srq, 0))) - ents->u.nonSurrogateDiagnostics = diagrecs(assoc, 2, 0); + diagrecs_p = diagrecs(assoc, 2, 0); else if (srs->errcode) - ents->u.nonSurrogateDiagnostics = diagrecs(assoc, - srs->errcode, srs->errstring); + diagrecs_p = diagrecs(assoc, srs->errcode, srs->errstring); else { int i; - Z_Entries *list = odr_malloc (assoc->encode, sizeof(*list)); - Z_Entry **tab = odr_malloc (assoc->encode, - sizeof(*tab) * srs->num_entries); - + 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; else *scanStatus = Z_Scan_success; - ents->which = Z_ListEntries_entries; - ents->u.entries = list; - list->entries = tab; + 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; - - 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->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; - 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); + + tab[i] = e = (Z_Entry *)odr_malloc(assoc->encode, sizeof(*e)); + if (srs->entries[i].occurrences >= 0) + { + 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->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; + + ((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; } @@ -1327,10 +1664,121 @@ static void process_close(association *assoc, request *reqb) "unspecified" }; - logf(LOG_LOG, "Got close, reason %s, message %s", + 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"); + 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 */