X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=64c91ec5f1b4ddffe393c6d437dc8b74879394f9;hp=310fc8e495747a3952f3a397de97f3b71187997b;hb=718bedef3c688e26b434b25e2e77852ddda6181c;hpb=c4c36570d87ff977f214af637a2f7cb658888dd0 diff --git a/server/seshigh.c b/server/seshigh.c index 310fc8e..64c91ec 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,34 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.32 1995-06-06 08:41:44 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 @@ -147,7 +174,6 @@ #include #include #include -#include "../version.h" #include @@ -269,6 +295,14 @@ void ir_session(IOCHAN h, int event) 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); + return; + } if (event & EVENT_INPUT || event & EVENT_WORK) /* input */ { if (event & EVENT_INPUT) @@ -303,10 +337,13 @@ void ir_session(IOCHAN h, int event) req = request_get(); /* get a new request structure */ odr_reset(assoc->decode); odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); +odr_dumpBER(log_file(), assoc->input_buffer, res); if (!z_APDU(assoc->decode, &req->request, 0)) { - logf(LOG_WARN, "ODR error: %s", + logf(LOG_LOG, "ODR error on incoming PDU: %s", odr_errlist[odr_geterror(assoc->decode)]); + logf(LOG_LOG, "PDU dump:"); + odr_dumpBER(log_file(), assoc->input_buffer, res); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -576,8 +613,13 @@ 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; @@ -587,9 +629,16 @@ static Z_Records *diagrec(oid_proto proto, int error, char *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; } @@ -601,9 +650,14 @@ 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; @@ -613,9 +667,16 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname, 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; } @@ -626,9 +687,14 @@ 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; @@ -638,9 +704,16 @@ static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo) 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; } @@ -649,14 +722,13 @@ static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo) static Z_Records *pack_records(association *a, char *setname, int start, int *num, Z_ElementSetNames *esn, - int *next, int *pres) + 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; @@ -666,12 +738,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); @@ -689,6 +755,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, } freq.setname = setname; freq.number = recno; + freq.format = format; if (!(fres = bend_fetch(a->backend, &freq, 0))) { *pres = Z_PRES_FAILURE; @@ -746,18 +813,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.class = 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->format == VAL_SUTRS) /* SUTRS ios a single-ASN.1-type */ + { + Odr_oct sutrs_asn; + Odr_oct *sp = &sutrs_asn; + Odr_any *single = odr_malloc(a->encode, sizeof(*single)); + char *buf, *remember; + int len, s_remember; + + sutrs_asn.buf = (unsigned char*) fres->record; + sutrs_asn.len = sutrs_asn.size = fres->len; + /* + * we borrow the encoding stream for preparing the buffer. This + * is not the most elegant solution - a better way might have been + * to reserve a different stream, or to devise a better system + * for handling externals in general. + */ + remember = odr_getbuf(a->encode, &len, &s_remember); + buf = odr_malloc(a->encode, fres->len + 10); /* buf for encoding */ + odr_setbuf(a->encode, buf, fres->len + 10, 0); /* can_grow==0 */ + if (!z_SUTRS(a->encode, &sp, 0)) + { + logf(LOG_LOG, "ODR error encoding SUTRS: %s", + odr_errlist[odr_geterror(a->encode)]); + return 0; + } + thisext->which = ODR_EXTERNAL_single; + thisext->u.single_ASN1_type = single; + single->buf = (unsigned char*)odr_getbuf(a->encode, &single->len, + &single->size); + /* Now restore the encoding stream */ + odr_setbuf(a->encode, remember, s_remember, 1); + logf(LOG_DEBUG, " Format is SUTRS. len %d, encoded len %d", + fres->len, single->len); + } + else /* octet-aligned record. Easy as pie */ + { + 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; @@ -810,6 +919,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))) { @@ -829,9 +942,9 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, } else { - int toget; + static int toget; Z_ElementSetNames *setnames; - int presst = 0; + static int presst = 0; resp.records = 0; resp.resultCount = &bsrt->hits; @@ -854,8 +967,16 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, if (toget && !resp.records) { + oident *prefformat; + oid_value form; + + if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) || + prefformat->class != CLASS_RECSYN) + form = VAL_NONE; + else + form = prefformat->value; resp.records = pack_records(assoc, req->resultSetName, 1, - &toget, setnames, &next, &presst); + &toget, setnames, &next, &presst, form); if (!resp.records) return 0; resp.numberOfRecordsReturned = &toget; @@ -898,15 +1019,26 @@ 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->class != 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, 0, &next, &presst, form); if (!resp.records) return 0; resp.numberOfRecordsReturned = # @@ -945,6 +1077,9 @@ 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)) @@ -954,7 +1089,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) else { if (req->termListAndStartPoint->term->which == Z_Term_general) - logf(LOG_DEBUG, " term: %.*s", + logf(LOG_DEBUG, " term: '%.*s'", req->termListAndStartPoint->term->u.general->len, req->termListAndStartPoint->term->u.general->buf); srq.num_bases = req->num_databaseNames; @@ -963,10 +1098,6 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) 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)