X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=server%2Fseshigh.c;h=436de77d4b1fb843338c3c99d475c59bb6a28f6c;hp=e3149181f16fe23d2e42c772bda8249ed6c61c0f;hb=c7fa0e1f18e00b58b65b39b3c36cb68930e3838c;hpb=08d286ddede794e73ba8b3c85497de3e0c80312b diff --git a/server/seshigh.c b/server/seshigh.c index e314918..436de77 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,46 +4,54 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.3 1995-03-16 17:42:39 quinn - * Little changes + * Revision 1.16 1995-03-31 09:18:55 quinn + * Added logging. * - * Revision 1.2 1995/03/16 13:29:01 quinn - * Partitioned server. + * Revision 1.15 1995/03/30 14:03:23 quinn + * Added RFC1006 as separate library * - * Revision 1.1 1995/03/15 16:02:10 quinn - * Modded session.c seshigh.c + * Revision 1.14 1995/03/30 12:18:17 quinn + * Fixed bug. * - * Revision 1.10 1995/03/15 15:18:51 quinn - * Little changes to better support nonblocking I/O - * Added backend.h + * Revision 1.13 1995/03/30 09:09:24 quinn + * Added state-handle and some support for asynchronous activities. * - * Revision 1.9 1995/03/15 13:20:23 adam - * Yet another bug fix in very dummy_database... + * Revision 1.12 1995/03/29 15:40:16 quinn + * Ongoing work. Statserv is now dynamic by default * - * Revision 1.8 1995/03/15 11:18:17 quinn - * Smallish changes. + * Revision 1.11 1995/03/28 09:16:21 quinn + * Added record packing to the search request * - * Revision 1.7 1995/03/15 09:40:15 adam - * Bug fixes in dummy_database_... + * Revision 1.10 1995/03/27 08:34:24 quinn + * Added dynamic server functionality. + * Released bindings to session.c (is now redundant) * - * Revision 1.6 1995/03/15 09:08:30 adam - * Take care of preferredMessageSize. + * Revision 1.9 1995/03/22 15:01:26 quinn + * Adjusting record packing. * - * Revision 1.5 1995/03/15 08:37:44 quinn - * Now we're pretty much set for nonblocking I/O. + * Revision 1.8 1995/03/22 10:13:21 quinn + * Working on record packer * - * Revision 1.4 1995/03/15 08:27:20 adam - * PresentRequest changed to return MARC records from file 'dummy-records'. + * Revision 1.7 1995/03/21 15:53:31 quinn + * Little changes. * - * Revision 1.3 1995/03/14 16:59:48 quinn - * Bug-fixes + * Revision 1.6 1995/03/21 12:30:09 quinn + * Beginning to add support for record packing. * - * Revision 1.2 1995/03/14 11:30:14 quinn - * Works better now. + * Revision 1.5 1995/03/17 10:44:13 quinn + * Added catch of null-string in makediagrec * - * Revision 1.1 1995/03/14 10:28:01 quinn - * More work on demo server. + * Revision 1.4 1995/03/17 10:18:08 quinn + * Added memory management. * + * Revision 1.3 1995/03/16 17:42:39 quinn + * Little changes + * + * Revision 1.2 1995/03/16 13:29:01 quinn + * Partitioned server. + * + * Revision 1.1 1995/03/15 16:02:10 quinn + * Modded session.c to seshigh.c * */ @@ -54,11 +62,12 @@ #include #include #include +#include +#include +#include #include -#include - #define ENCODE_BUFFER_SIZE 10000 static int process_apdu(IOCHAN chan); @@ -83,6 +92,11 @@ association *create_association(IOCHAN channel, COMSTACK link) new->state = ASSOC_UNINIT; new->input_buffer = 0; new->input_buffer_len = 0; + new->backend = 0; + if (cs_getproto(link) == CS_Z3950) + new->proto = PROTO_Z3950; + else + new->proto = PROTO_SR; return new; } @@ -91,6 +105,10 @@ void destroy_association(association *h) odr_destroy(h->decode); odr_destroy(h->encode); free(h->encode_buffer); + if (h->input_buffer) + free(h->input_buffer); + if (h->backend) + bend_close(h->backend); free(h); } @@ -107,7 +125,7 @@ void ir_session(IOCHAN h, int event) switch (res) { case 0: case -1: /* connection closed by peer */ - fprintf(stderr, "Closed connection\n"); + logf(LOG_LOG, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -118,7 +136,6 @@ void ir_session(IOCHAN h, int event) assoc->input_apdu_len = res; if (process_apdu(h) < 0) { - fprintf(stderr, "Operation failed\n"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -132,7 +149,7 @@ void ir_session(IOCHAN h, int event) switch (res = cs_put(conn, assoc->encode_buffer, assoc->encoded_len)) { case -1: - fprintf(stderr, "Closed connection\n"); + logf(LOG_LOG, "Connection closed by client"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -145,7 +162,7 @@ void ir_session(IOCHAN h, int event) } else if (event == EVENT_EXCEPT) { - fprintf(stderr, "Exception on line\n"); + logf(LOG_LOG, "Exception on line"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -161,7 +178,8 @@ static int process_apdu(IOCHAN chan) odr_setbuf(assoc->decode, assoc->input_buffer, assoc->input_apdu_len); if (!z_APDU(assoc->decode, &apdu, 0)) { - odr_perror(assoc->decode, "Incoming APDU"); + logf(LOG_WARN, "ODR error: %s", + odr_errlist[odr_geterror(assoc->decode)]); return -1; } switch (apdu->which) @@ -173,9 +191,11 @@ static int process_apdu(IOCHAN chan) case Z_APDU_presentRequest: res = process_presentRequest(chan, apdu->u.presentRequest); break; default: - fprintf(stderr, "Bad APDU\n"); + logf(LOG_WARN, "Bad APDU"); return -1; } + odr_reset(assoc->decode); /* release incopming APDU */ + odr_reset(assoc->encode); /* release stuff alloced before encoding */ return res; } @@ -187,31 +207,51 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) association *assoc = iochan_getdata(client); bend_initrequest binitreq; bend_initresult *binitres; + Odr_bitmask options, protocolVersion; - fprintf(stderr, "Got initRequest.\n"); + logf(LOG_LOG, "Got initRequest"); if (req->implementationId) - fprintf(stderr, "Id: %s\n", req->implementationId); + logf(LOG_LOG, "Id: %s", req->implementationId); if (req->implementationName) - fprintf(stderr, "Name: %s\n", req->implementationName); + logf(LOG_LOG, "Name: %s", req->implementationName); if (req->implementationVersion) - fprintf(stderr, "Version: %s\n", req->implementationVersion); + logf(LOG_LOG, "Version: %s", req->implementationVersion); binitreq.configname = "default-config"; if (!(binitres = bend_init(&binitreq)) || binitres->errcode) { - fprintf(stderr, "Bad response from backend\n"); + logf(LOG_WARN, "Bad response from backend"); return -1; } + assoc->backend = binitres->handle; apdup = &apdu; apdu.which = Z_APDU_initResponse; apdu.u.initResponse = &resp; resp.referenceId = req->referenceId; - resp.options = req->options; /* should check these */ - resp.protocolVersion = req->protocolVersion; + ODR_MASK_ZERO(&options); + if (ODR_MASK_GET(req->options, Z_Options_search)) + ODR_MASK_SET(&options, Z_Options_search); + if (ODR_MASK_GET(req->options, Z_Options_present)) + ODR_MASK_SET(&options, Z_Options_present); + if (ODR_MASK_GET(req->options, Z_Options_delSet)) + ODR_MASK_SET(&options, Z_Options_delSet); + if (ODR_MASK_GET(req->options, Z_Options_namedResultSets)) + ODR_MASK_SET(&options, Z_Options_namedResultSets); + resp.options = &options; + ODR_MASK_ZERO(&protocolVersion); + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1)) + ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_1); + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2)) + ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_2); + resp.protocolVersion = &protocolVersion; assoc->maximumRecordSize = *req->maximumRecordSize; - if (assoc->maximumRecordSize > ENCODE_BUFFER_SIZE - 500) - assoc->maximumRecordSize = ENCODE_BUFFER_SIZE - 500; + /* + * This is not so hot. The big todo for ODR is dynamic memory allocation + * on encoding. + */ + if (assoc->maximumRecordSize > ENCODE_BUFFER_SIZE - 1000) + assoc->maximumRecordSize = ENCODE_BUFFER_SIZE - 1000; assoc->preferredMessageSize = *req->preferredMessageSize; if (assoc->preferredMessageSize > assoc->maximumRecordSize) assoc->preferredMessageSize = assoc->maximumRecordSize; @@ -219,36 +259,188 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) resp.maximumRecordSize = &assoc->maximumRecordSize; resp.result = &result; resp.implementationId = "YAZ"; - resp.implementationName = "YAZ/Simple asynchronous test server"; - resp.implementationVersion = "$Revision: 1.3 $"; + resp.implementationName = "Index Data/YAZ Generic Frontend Server"; + resp.implementationVersion = "$Revision: 1.16 $"; resp.userInformationField = 0; if (!z_APDU(assoc->encode, &apdup, 0)) { - odr_perror(assoc->encode, "Encode initres"); + logf(LOG_FATAL, "ODR error encoding initres: %s", + odr_errlist[odr_geterror(assoc->encode)]); return -1; } odr_getbuf(assoc->encode, &assoc->encoded_len); + odr_reset(assoc->encode); iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT); return 0; } -static Z_Records *diagrec(int error, char *addinfo) +static Z_Records *diagrec(oid_proto proto, int error, char *addinfo) { static Z_Records rec; - static Odr_oid bib1[] = { 1, 2, 3, 4, 5, -1 }; + oident bib1; static Z_DiagRec dr; static int err; - fprintf(stderr, "Diagnostic: %d -- %s\n", error, addinfo); + bib1.proto = proto; + bib1.class = CLASS_DIAGSET; + bib1.value = VAL_BIB1; + + logf(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo : + "NULL"); err = error; rec.which = Z_Records_NSD; rec.u.nonSurrogateDiagnostic = &dr; - dr.diagnosticSetId = bib1; + dr.diagnosticSetId = oid_getoidbyent(&bib1); + dr.condition = &err; + dr.addinfo = addinfo ? addinfo : ""; + return &rec; +} + +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; + + bib1.proto = proto; + bib1.class = CLASS_DIAGSET; + bib1.value = VAL_BIB1; + + logf(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); + err = error; + rec.databaseName = dbname; + rec.which = Z_NamePlusRecord_surrogateDiagnostic; + rec.u.surrogateDiagnostic = &dr; + dr.diagnosticSetId = oid_getoidbyent(&bib1); dr.condition = &err; - dr.addinfo = addinfo; + dr.addinfo = addinfo ? addinfo : ""; return &rec; } +#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 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; + 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++) + { + bend_fetchrequest freq; + bend_fetchresult *fres; + Z_NamePlusRecord *thisrec; + Z_DatabaseRecord *thisext; + + if (reclist.num_records == MAX_RECORDS - 1) + { + *pres = Z_PRES_PARTIAL_2; + break; + } + freq.setname = setname; + freq.number = recno; + if (!(fres = bend_fetch(a->backend, &freq, 0))) + { + *pres = Z_PRES_FAILURE; + return diagrec(a->proto, 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); + } + logf(LOG_DEBUG, " Got record, len=%d, total=%d", + fres->len, total_length); + if (fres->len + total_length > a->preferredMessageSize) + { + /* record is small enough, really */ + if (fres->len <= 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) + { + 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++; + *pres = Z_PRES_PARTIAL_2; + break; + } + } + else /* too big entirely */ + { + logf(LOG_DEBUG, "Record > maxrcdsz"); + reclist.records[reclist.num_records] = + surrogatediagrec(a->proto, fres->basename, 17, 0); + reclist.num_records++; + *pres = Z_PRES_PARTIAL_2; + break; + } + } + if (!(thisrec = odr_malloc(a->encode, sizeof(*thisrec)))) + return 0; + if (!(thisrec->databaseName = 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, + sizeof(Z_DatabaseRecord)))) + return 0; + thisext->direct_reference = oid; /* should be OID for current MARC */ + 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; + (*num)++; + *next = fres->last_in_set ? 0 : recno + 1; + } + return &records; +} + static int process_searchRequest(IOCHAN client, Z_SearchRequest *req) { Z_APDU apdu, *apdup; @@ -256,43 +448,113 @@ static int process_searchRequest(IOCHAN client, Z_SearchRequest *req) association *assoc = iochan_getdata(client); int nulint = 0; bool_t sr = 1; - int nrp; bend_searchrequest bsrq; bend_searchresult *bsrt; + oident *oent; + int next = 0; + static int none = Z_RES_NONE; - fprintf(stderr, "Got SearchRequest.\n"); + logf(LOG_LOG, "Got SearchRequest."); apdup = &apdu; apdu.which = Z_APDU_searchResponse; apdu.u.searchResponse = &resp; resp.referenceId = req->referenceId; - bsrq.setname = req->resultSetName; - bsrq.replace_set = *req->replaceIndicator; - bsrq.num_bases = req->num_databaseNames; - bsrq.basenames = req->databaseNames; - bsrq.query = req->query; + resp.records = 0; + if (req->query->which == Z_Query_type_1) + { + Z_RPNQuery *q = req->query->u.type_1; - if (!(bsrt = bend_search(&bsrq))) - return -1; - else if (bsrt->errcode) - resp.records = diagrec(bsrt->errcode, bsrt->errstring); - else - resp.records = 0; + if (!(oent = oid_getentbyoid(q->attributeSetId)) || + oent->class != CLASS_ATTSET || + oent->value != VAL_BIB1) + { + resp.records = diagrec(assoc->proto, 121, 0); + resp.resultCount = &nulint; + resp.numberOfRecordsReturned = &nulint; + resp.nextResultSetPosition = &nulint; + resp.searchStatus = &none; + resp.resultSetStatus = 0; + resp.presentStatus = 0; + } + } + if (!resp.records) + { + int toget; + Z_ElementSetNames *setnames; + int presst = 0; - resp.resultCount = &bsrt->hits; - resp.numberOfRecordsReturned = &nulint; - nrp = bsrt->hits ? 1 : 0; - resp.nextResultSetPosition = &nrp; - resp.searchStatus = &sr; - resp.resultSetStatus = &sr; - resp.presentStatus = 0; + 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, 0))) + return -1; + else if (bsrt->errcode) + { + + resp.records = diagrec(assoc->proto, bsrt->errcode, + bsrt->errstring); + resp.resultCount = &nulint; + resp.numberOfRecordsReturned = &nulint; + resp.nextResultSetPosition = &nulint; + resp.searchStatus = &nulint; + resp.resultSetStatus = &none; + resp.presentStatus = 0; + } + else + { + resp.records = 0; + + resp.resultCount = &bsrt->hits; + + /* how many records does the user agent want, then? */ + if (bsrt->hits <= *req->smallSetUpperBound) + { + toget = bsrt->hits; + setnames = req->smallSetElementSetNames; + } + else if (bsrt->hits < *req->largeSetLowerBound) + { + toget = *req->mediumSetPresentNumber; + setnames = req->mediumSetElementSetNames; + } + else + toget = 0; + + if (toget && !resp.records) + { + resp.records = pack_records(assoc, req->resultSetName, 1, + &toget, setnames, &next, &presst); + if (!resp.records) + return -1; + resp.numberOfRecordsReturned = &toget; + resp.nextResultSetPosition = &next; + resp.searchStatus = &sr; + resp.resultSetStatus = 0; + resp.presentStatus = &presst; + } + else + { + resp.numberOfRecordsReturned = &nulint; + resp.nextResultSetPosition = &next; + resp.searchStatus = &sr; + resp.resultSetStatus = 0; + resp.presentStatus = 0; + } + } + } if (!z_APDU(assoc->encode, &apdup, 0)) { - odr_perror(assoc->encode, "Encode searchres"); + logf(LOG_FATAL, "ODR error encoding searchres: %s", + odr_errlist[odr_geterror(assoc->encode)]); return -1; } odr_getbuf(assoc->encode, &assoc->encoded_len); + odr_reset(assoc->encode); iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT); return 0; } @@ -302,26 +564,31 @@ static int process_presentRequest(IOCHAN client, Z_PresentRequest *req) Z_APDU apdu, *apdup; Z_PresentResponse resp; association *assoc = iochan_getdata(client); - int nrr = 1; + int presst, next, num; - fprintf(stderr, "Got PresentRequest.\n"); + logf(LOG_LOG, "Got PresentRequest."); apdup = &apdu; apdu.which = Z_APDU_presentResponse; apdu.u.presentResponse = &resp; resp.referenceId = req->referenceId; - resp.numberOfRecordsReturned = &nrr; - resp.nextResultSetPosition = &nrr; - resp.presentStatus = &nrr; - - resp.records = diagrec(1, "No records yet."); + num = *req->numberOfRecordsRequested; + resp.records = pack_records(assoc, req->resultSetId, + *req->resultSetStartPoint, &num, req->elementSetNames, &next, &presst); + if (!resp.records) + return -1; + resp.numberOfRecordsReturned = # + resp.presentStatus = &presst; + resp.nextResultSetPosition = &next; if (!z_APDU(assoc->encode, &apdup, 0)) { - odr_perror(assoc->encode, "Encode presentres"); + logf(LOG_FATAL, "ODR error encoding initres: %s", + odr_errlist[odr_geterror(assoc->encode)]); return -1; } odr_getbuf(assoc->encode, &assoc->encoded_len); + odr_reset(assoc->encode); iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT); return 0; }