X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=ab54a948013e4981edd1e516402e68f124ed52f5;hp=252caa58b9352680520ca8bf5d95264cefb9d8cc;hb=dee13aeae17005ba0ef3adf7bf99958160e393d9;hpb=5f2823e584b4b138886c985bc1490b35aa6cdd4c diff --git a/server/seshigh.c b/server/seshigh.c index 252caa5..ab54a94 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,84 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.31 1995-06-06 08:15:37 quinn + * Revision 1.58 1996-02-20 12:53:04 quinn + * Chanes to SCAN + * + * Revision 1.57 1996/01/02 08:57:47 quinn + * Changed enums in the ASN.1 .h files to #defines. Changed oident.class to oclass + * + * Revision 1.56 1995/12/14 11:09:57 quinn + * Work on Explain + * + * Revision 1.55 1995/11/08 17:41:37 quinn + * Smallish. + * + * Revision 1.54 1995/11/08 15:11:29 quinn + * Log of close transmit. + * + * Revision 1.53 1995/11/01 13:54:58 quinn + * Minor adjustments + * + * Revision 1.52 1995/11/01 12:19:13 quinn + * Second attempt to fix same bug. + * + * Revision 1.50 1995/10/25 16:58:32 quinn + * Simple. + * + * Revision 1.49 1995/10/16 13:51:53 quinn + * Changes to provide Especs to the backend. + * + * Revision 1.48 1995/10/06 08:51:20 quinn + * Added Write-buffer. + * + * Revision 1.47 1995/08/29 14:24:16 quinn + * Added second half of close-handshake + * + * Revision 1.46 1995/08/29 11:17:58 quinn + * Added code to receive close + * + * Revision 1.45 1995/08/21 09:11:00 quinn + * Smallish fixes to suppport new formats. + * + * Revision 1.44 1995/08/17 12:45:25 quinn + * Fixed minor problems with GRS-1. Added support in c&s. + * + * Revision 1.43 1995/08/15 12:00:31 quinn + * Updated External + * + * Revision 1.42 1995/08/15 11:16:50 quinn + * + * Revision 1.41 1995/08/02 10:23:06 quinn + * Smallish + * + * Revision 1.40 1995/07/31 14:34:26 quinn + * Fixed bug in process_searchResponse (numberOfRecordsReturned). + * + * Revision 1.39 1995/06/27 13:21:00 quinn + * SUTRS support + * + * Revision 1.38 1995/06/19 12:39:11 quinn + * Fixed bug in timeout code. Added BER dumper. + * + * Revision 1.37 1995/06/16 13:16:14 quinn + * Fixed Defaultdiagformat. + * + * Revision 1.36 1995/06/16 10:31:36 quinn + * Added session timeout. + * + * Revision 1.35 1995/06/15 07:45:14 quinn + * Moving to v3. + * + * Revision 1.34 1995/06/14 15:26:46 quinn + * *** empty log message *** + * + * Revision 1.33 1995/06/06 14:57:05 quinn + * Better diagnostics. + * + * Revision 1.32 1995/06/06 08:41:44 quinn + * Better diagnostics. + * + * Revision 1.31 1995/06/06 08:15:37 quinn * Cosmetic. * * Revision 1.30 1995/06/05 10:53:32 quinn @@ -135,8 +212,9 @@ #include #include #include +#include -#include +#include #include #include #include @@ -144,7 +222,6 @@ #include #include #include -#include "../version.h" #include @@ -159,6 +236,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, static Z_APDU *process_presentRequest(association *assoc, request *reqb, int *fd); static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd); +static void process_close(association *assoc, request *reqb); static FILE *apduf = 0; /* for use in static mode */ static statserv_options_block *control_block = 0; @@ -175,7 +253,7 @@ association *create_association(IOCHAN channel, COMSTACK link) if (!control_block) control_block = statserv_getcontrol(); - if (!(new = malloc(sizeof(*new)))) + if (!(new = xmalloc(sizeof(*new)))) return 0; new->client_chan = channel; new->client_link = link; @@ -224,7 +302,7 @@ association *create_association(IOCHAN channel, COMSTACK link) new->input_buffer = 0; new->input_buffer_len = 0; new->backend = 0; - new->rejected = 0; + new->state = ASSOC_NEW; request_initq(&new->incoming); request_initq(&new->outgoing); new->proto = cs_getproto(link); @@ -241,12 +319,40 @@ 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); + xfree(h); +} + +static void do_close(association *a, int reason, char *message) +{ + Z_APDU apdu; + Z_Close *cls = zget_Close(a->encode); + request *req = request_get(); + + /* Purge request queue */ + while (request_deq(&a->incoming)); + while (request_deq(&a->outgoing)); + if (a->version >= 3) + { + logf(LOG_LOG, "Sending Close PDU, reason=%d, message=%s", + reason, message ? message : "none"); + apdu.which = Z_APDU_close; + apdu.u.close = cls; + *cls->closeReason = reason; + cls->diagnosticInformation = message; + process_response(a, req, &apdu); + iochan_settimeout(a->client_chan, 60); + } + else + { + logf(LOG_DEBUG, "v2 client. No Close PDU"); + iochan_setevent(a->client_chan, EVENT_TIMEOUT); /* force imm close */ + } + a->state = ASSOC_DEAD; } /* @@ -266,6 +372,22 @@ void ir_session(IOCHAN h, int event) request *req; assert(h && conn && assoc); + if (event == EVENT_TIMEOUT) + { + 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 */ { if (event & EVENT_INPUT) @@ -273,7 +395,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); @@ -302,11 +424,12 @@ void ir_session(IOCHAN h, int event) odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); if (!z_APDU(assoc->decode, &req->request, 0)) { - logf(LOG_WARN, "ODR error: %s", - odr_errlist[odr_geterror(assoc->decode)]); - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); + logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", + odr_errlist[odr_geterror(assoc->decode)], + odr_offset(assoc->decode)); + logf(LOG_LOG, "PDU dump:"); + odr_dumpBER(log_file(), assoc->input_buffer, res); + do_close(assoc, Z_Close_protocolError, "Malformed package"); return; } req->request_mem = odr_extract_mem(assoc->decode); @@ -323,11 +446,7 @@ void ir_session(IOCHAN h, int event) req = request_head(&assoc->incoming); if (req->state == REQUEST_IDLE) if (process_request(assoc) < 0) - { - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); - } + do_close(assoc, Z_Close_systemProblem, "Unknown error"); } if (event & EVENT_OUTPUT) { @@ -345,7 +464,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)) @@ -384,6 +503,8 @@ 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_close: + process_close(assoc, req); return 0; default: logf(LOG_WARN, "Bad APDU received"); return -1; @@ -443,9 +564,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; } @@ -466,11 +585,12 @@ static int process_response(association *assoc, request *req, Z_APDU *res) { logf(LOG_WARN, "ODR error when encoding response: %s", odr_errlist[odr_geterror(assoc->decode)]); + odr_reset(assoc->encode); return -1; } req->response = odr_getbuf(assoc->encode, &req->len_response, &req->size_response); - odr_setbuf(assoc->encode, 0, 0, 0); /* don't free if we abort later */ + 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)) { @@ -479,9 +599,11 @@ static int process_response(association *assoc, request *req, Z_APDU *res) odr_reset(assoc->print); } /* change this when we make the backend reentrant */ - assert(req == request_head(&assoc->incoming)); - req->state = REQUEST_IDLE; - request_deq(&assoc->incoming); + if (req == request_head(&assoc->incoming)) + { + 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); @@ -493,7 +615,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res) /* * 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. @@ -505,6 +627,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) @@ -524,26 +647,57 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->backend = binitres->handle; 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); + strcat(options, " prst"); + } #if 0 if (ODR_MASK_GET(req->options, Z_Options_delSet)) + { ODR_MASK_SET(&options, Z_Options_delSet); + strcat(options, " del"); + } #endif if (ODR_MASK_GET(req->options, Z_Options_namedResultSets)) + { ODR_MASK_SET(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->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; @@ -557,8 +711,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; } @@ -573,20 +729,32 @@ static Z_Records *diagrec(oid_proto proto, int error, char *addinfo) { static Z_Records rec; oident bib1; - static Z_DiagRec dr; static int err; +#ifdef Z_95 + static Z_DiagRec drec; + static Z_DefaultDiagFormat dr; +#else + static Z_DiagRec dr; +#endif bib1.proto = proto; - bib1.class = CLASS_DIAGSET; + bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo : "NULL"); err = error; rec.which = Z_Records_NSD; +#ifdef Z_95 + rec.u.nonSurrogateDiagnostic = &drec; + drec.which = Z_DiagRec_defaultFormat; + drec.u.defaultFormat = &dr; +#else rec.u.nonSurrogateDiagnostic = &dr; +#endif dr.diagnosticSetId = oid_getoidbyent(&bib1); dr.condition = &err; + dr.which = Z_DiagForm_v2AddInfo; dr.addinfo = addinfo ? addinfo : ""; return &rec; } @@ -598,21 +766,33 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname, int error, char *addinfo) { static Z_NamePlusRecord rec; - static Z_DiagRec dr; static int err; oident bib1; +#ifdef Z_95 + static Z_DiagRec drec; + static Z_DefaultDiagFormat dr; +#else + static Z_DiagRec dr; +#endif bib1.proto = proto; - bib1.class = CLASS_DIAGSET; + bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); err = error; rec.databaseName = dbname; rec.which = Z_NamePlusRecord_surrogateDiagnostic; +#ifdef Z_95 + rec.u.surrogateDiagnostic = &drec; + drec.which = Z_DiagRec_defaultFormat; + drec.u.defaultFormat = &dr; +#else rec.u.surrogateDiagnostic = &dr; +#endif dr.diagnosticSetId = oid_getoidbyent(&bib1); dr.condition = &err; + dr.which = Z_DiagForm_v2AddInfo; dr.addinfo = addinfo ? addinfo : ""; return &rec; } @@ -623,21 +803,33 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname, static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo) { static Z_DiagRecs recs; - static Z_DiagRec *recp[1], rec; static int err; oident bib1; +#ifdef Z_95 + static Z_DiagRec *recp[1], drec; + static Z_DefaultDiagFormat rec; +#else + static Z_DiagRec *recp[1], rec; +#endif logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo); bib1.proto = proto; - bib1.class = CLASS_DIAGSET; + bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; err = error; recs.num_diagRecs = 1; recs.diagRecs = recp; +#ifdef Z_95 + recp[0] = &drec; + drec.which = Z_DiagRec_defaultFormat; + drec.u.defaultFormat = &rec; +#else recp[0] = &rec; +#endif rec.diagnosticSetId = oid_getoidbyent(&bib1); rec.condition = &err; + rec.which = Z_DiagForm_v2AddInfo; rec.addinfo = addinfo ? addinfo : ""; return &recs; } @@ -645,15 +837,14 @@ static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo) #define MAX_RECORDS 256 static Z_Records *pack_records(association *a, char *setname, int start, - int *num, Z_ElementSetNames *esn, - int *next, int *pres) + int *num, Z_RecordComposition *comp, + int *next, int *pres, oid_value format) { int recno, total_length = 0, toget = *num; static Z_Records records; static Z_NamePlusRecordList reclist; static Z_NamePlusRecord *list[MAX_RECORDS]; oident recform; - Odr_oid *oid; records.which = Z_Records_DBOSD; records.u.databaseOrSurDiagnostics = &reclist; @@ -663,12 +854,6 @@ static Z_Records *pack_records(association *a, char *setname, int start, *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); @@ -678,7 +863,14 @@ static Z_Records *pack_records(association *a, char *setname, int start, bend_fetchresult *fres; Z_NamePlusRecord *thisrec; Z_DatabaseRecord *thisext; + int this_length; + /* + * we get the number of bytes allocated on the stream before any + * allocation done by the backend - this should give us a reasonable + * idea of the total size of the data so far. + */ + total_length = odr_total(a->encode); if (reclist.num_records == MAX_RECORDS - 1) { *pres = Z_PRES_PARTIAL_2; @@ -686,6 +878,9 @@ static Z_Records *pack_records(association *a, char *setname, int start, } freq.setname = setname; freq.number = recno; + freq.comp = comp; + freq.format = format; + freq.stream = a->encode; if (!(fres = bend_fetch(a->backend, &freq, 0))) { *pres = Z_PRES_FAILURE; @@ -698,19 +893,23 @@ static Z_Records *pack_records(association *a, char *setname, int start, *pres = Z_PRES_FAILURE; return diagrec(a->proto, fres->errcode, fres->errstring); } + if (fres->len >= 0) + this_length = fres->len; + else + this_length = odr_total(a->encode) - total_length; logf(LOG_DEBUG, " fetched record, len=%d, total=%d", - fres->len, total_length); - if (fres->len + total_length > a->preferredMessageSize) + this_length, total_length); + if (this_length + total_length > a->preferredMessageSize) { /* record is small enough, really */ - if (fres->len <= a->preferredMessageSize) + if (this_length <= a->preferredMessageSize) { logf(LOG_DEBUG, " Dropped last normal-sized record"); *pres = Z_PRES_PARTIAL_2; break; } /* record can only be fetched by itself */ - if (fres->len < a->maximumRecordSize) + if (this_length < a->maximumRecordSize) { logf(LOG_DEBUG, " Record > prefmsgsz"); if (toget > 1) @@ -719,7 +918,6 @@ static Z_Records *pack_records(association *a, char *setname, int start, reclist.records[reclist.num_records] = surrogatediagrec(a->proto, fres->basename, 16, 0); reclist.num_records++; - total_length += 10; /* totally arbitrary */ continue; } } @@ -729,7 +927,6 @@ static Z_Records *pack_records(association *a, char *setname, int start, reclist.records[reclist.num_records] = surrogatediagrec(a->proto, fres->basename, 17, 0); reclist.num_records++; - total_length += 10; /* totally arbitrary */ continue; } } @@ -743,21 +940,60 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!(thisrec->u.databaseRecord = thisext = odr_malloc(a->encode, sizeof(Z_DatabaseRecord)))) return 0; - thisext->direct_reference = oid; /* should be OID for current MARC */ + recform.proto = a->proto; + recform.oclass = CLASS_RECSYN; + recform.value = fres->format; + thisext->direct_reference = odr_oiddup(a->encode, + oid_getoidbyent(&recform)); thisext->indirect_reference = 0; thisext->descriptor = 0; - thisext->which = ODR_EXTERNAL_octet; - if (!(thisext->u.octet_aligned = odr_malloc(a->encode, - sizeof(Odr_oct)))) - return 0; - if (!(thisext->u.octet_aligned->buf = odr_malloc(a->encode, fres->len))) - return 0; - memcpy(thisext->u.octet_aligned->buf, fres->record, fres->len); - thisext->u.octet_aligned->len = thisext->u.octet_aligned->size = - fres->len; + if (fres->len < 0) /* Structured data */ + { + switch (fres->format) + { + case VAL_SUTRS: thisext->which = Z_External_sutrs; break; + case VAL_GRS1: thisext->which = Z_External_grs1; break; + case VAL_EXPLAIN: thisext->which = Z_External_explainRecord; + break; + + default: + logf(LOG_FATAL, "Unknown structured format from backend."); + return 0; + } + + /* + * We cheat on the pointers here. Obviously, the record field + * of the backend-fetch structure should have been a union for + * correctness, but we're stuck with this for backwards + * compatibility. + */ + thisext->u.grs1 = (Z_GenericRecord*) fres->record; + } + else if (fres->format == VAL_SUTRS) /* SUTRS is a single-ASN.1-type */ + { + Odr_oct *sutrs = odr_malloc(a->encode, sizeof(*sutrs)); + + thisext->which = Z_External_sutrs; + thisext->u.sutrs = sutrs; + sutrs->buf = odr_malloc(a->encode, fres->len); + sutrs->len = sutrs->size = fres->len; + memcpy(sutrs->buf, fres->record, fres->len); + } + else /* octet-aligned record. */ + { + thisext->which = Z_External_octet; + if (!(thisext->u.octet_aligned = odr_malloc(a->encode, + sizeof(Odr_oct)))) + return 0; + if (!(thisext->u.octet_aligned->buf = odr_malloc(a->encode, + fres->len))) + return 0; + memcpy(thisext->u.octet_aligned->buf, fres->record, fres->len); + thisext->u.octet_aligned->len = thisext->u.octet_aligned->size = + fres->len; + } reclist.records[reclist.num_records] = thisrec; reclist.num_records++; - total_length += fres->len; *next = fres->last_in_set ? 0 : recno + 1; } *num = reclist.num_records; @@ -807,6 +1043,10 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, apdu.which = Z_APDU_searchResponse; apdu.u.searchResponse = &resp; resp.referenceId = req->referenceId; +#ifdef Z_95 + resp.additionalSearchInfo = 0; + resp.otherInfo = 0; +#endif *fd = -1; if (!bsrt && !(bsrt = bend_searchresponse(assoc->backend))) { @@ -826,33 +1066,44 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, } else { - int toget; - Z_ElementSetNames *setnames; - int presst = 0; + static int toget; + Z_RecordComposition comp, *compp = 0; + static int 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; + 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; + if ((comp.u.simple = req->mediumSetElementSetNames)) + compp = ∁ } else toget = 0; if (toget && !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, setnames, &next, &presst); + &toget, compp, &next, &presst, form); if (!resp.records) return 0; resp.numberOfRecordsReturned = &toget; @@ -863,6 +1114,8 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, } else { + if (*resp.resultCount) + next = 1; resp.numberOfRecordsReturned = &nulint; resp.nextResultSetPosition = &next; resp.searchStatus = &sr; @@ -895,15 +1148,27 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, static Z_APDU apdu; static Z_PresentResponse resp; static int presst, next, num; + oident *prefformat; + oid_value form; + 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 + if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) || + prefformat->oclass != CLASS_RECSYN) + form = VAL_NONE; + else + form = prefformat->value; num = *req->numberOfRecordsRequested; resp.records = pack_records(assoc, req->resultSetId, - *req->resultSetStartPoint, &num, req->elementSetNames, &next, &presst); + *req->resultSetStartPoint, &num, req->recordComposition, &next, + &presst, form); if (!resp.records) return 0; resp.numberOfRecordsReturned = # @@ -942,24 +1207,27 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) res.entries = &ents; ents.which = Z_ListEntries_nonSurrogateDiagnostics; res.attributeSet = 0; +#ifdef Z_95 + res.otherInfo = 0; +#endif if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) || - attent->class != CLASS_ATTSET || attent->value != VAL_BIB1)) + attent->oclass != CLASS_ATTSET || attent->value != VAL_BIB1)) ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 121, 0); else if (req->stepSize && *req->stepSize > 0) ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0); else { + if (req->termListAndStartPoint->term->which == Z_Term_general) + logf(LOG_DEBUG, " term: '%.*s'", + req->termListAndStartPoint->term->u.general->len, + req->termListAndStartPoint->term->u.general->buf); srq.num_bases = req->num_databaseNames; srq.basenames = req->databaseNames; srq.num_entries = *req->numberOfTermsRequested; srq.term = req->termListAndStartPoint; srq.term_position = req->preferredPositionInResponse ? *req->preferredPositionInResponse : 1; - 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); if (!(srs = bend_scan(assoc->backend, &srq, 0))) ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 2, 0); else if (srs->errcode) @@ -992,8 +1260,10 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) 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; @@ -1002,6 +1272,8 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) 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; @@ -1011,3 +1283,28 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) 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(assoc, Z_Close_finished, "Association terminated by client"); +}