X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=121f212de99a601ede7b850a56f8d10d716c420c;hb=891f66faece5ac308dc9a9ed021021841fbb712b;hp=76830439712477cdc961a06338e01e02a54892de;hpb=e207755675f8dbf552f1e0696077594e7fa68190;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index 7683043..121f212 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -1,10 +1,24 @@ /* - * Copyright (c) 1995-1998, Index Data + * Copyright (c) 1995-1999, Index Data * See the file LICENSE for details. * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.84 1998-11-16 16:02:32 adam + * Revision 1.88 1999-04-20 09:56:48 adam + * Added 'name' paramter to encoder/decoder routines (typedef Odr_fun). + * Modified all encoders/decoders to reflect this change. + * + * Revision 1.87 1999/03/31 11:18:25 adam + * Implemented odr_strdup. Added Reference ID to backend server API. + * + * Revision 1.86 1999/02/02 13:57:38 adam + * Uses preprocessor define WIN32 instead of WINDOWS to build code + * for Microsoft WIN32. + * + * Revision 1.85 1998/11/17 09:52:59 adam + * Fixed minor bug (introduced by previous commit). + * + * Revision 1.84 1998/11/16 16:02:32 adam * Added loggin utilies, log_rpn_query and log_scan_term. These used * to be part of Zebra. * @@ -295,7 +309,7 @@ #include #include #include -#ifdef WINDOWS +#ifdef WIN32 #include #else #include @@ -526,7 +540,7 @@ void ir_session(IOCHAN h, int event) req = request_get(&assoc->incoming); /* get a new request structure */ odr_reset(assoc->decode); odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); - if (!z_APDU(assoc->decode, &req->request, 0)) + if (!z_APDU(assoc->decode, &req->request, 0, 0)) { logf(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", odr_errmsg(odr_geterror(assoc->decode)), @@ -537,7 +551,7 @@ void ir_session(IOCHAN h, int event) return; } req->request_mem = odr_extract_mem(assoc->decode); - if (assoc->print && !z_APDU(assoc->print, &req->request, 0)) + if (assoc->print && !z_APDU(assoc->print, &req->request, 0, 0)) { logf(LOG_WARN, "ODR print error: %s", odr_errmsg(odr_geterror(assoc->print))); @@ -716,7 +730,7 @@ void backend_response(IOCHAN i, int event) static int process_response(association *assoc, request *req, Z_APDU *res) { odr_setbuf(assoc->encode, req->response, req->size_response, 1); - if (!z_APDU(assoc->encode, &res, 0)) + if (!z_APDU(assoc->encode, &res, 0, 0)) { logf(LOG_WARN, "ODR error when encoding response: %s", odr_errmsg(odr_geterror(assoc->decode))); @@ -726,7 +740,7 @@ 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 */ - if (assoc->print && !z_APDU(assoc->print, &res, 0)) + if (assoc->print && !z_APDU(assoc->print, &res, 0, 0)) { logf(LOG_WARN, "ODR print error: %s", odr_errmsg(odr_geterror(assoc->print))); @@ -775,6 +789,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) binitreq.stream = assoc->encode; binitreq.configname = "default-config"; binitreq.auth = req->idAuthentication; + binitreq.referenceId = req->referenceId; binitreq.bend_sort = NULL; binitreq.bend_search = NULL; binitreq.bend_present = NULL; @@ -920,16 +935,12 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) #if ASN_COMPILED rec->u.nonSurrogateDiagnostic = dr; #else -#ifdef Z_95 rec->u.nonSurrogateDiagnostic = drec; drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = dr; -#else - rec->u.nonSurrogateDiagnostic = dr; -#endif #endif - dr->diagnosticSetId = odr_oiddup (assoc->encode, - oid_ent_to_oid(&bib1, oid)); + dr->diagnosticSetId = + odr_oiddup (assoc->encode, oid_ent_to_oid(&bib1, oid)); dr->condition = err; set_addinfo (dr, addinfo); return rec; @@ -942,12 +953,14 @@ static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, int error, char *addinfo) { int oid[OID_SIZE]; - Z_NamePlusRecord *rec = (Z_NamePlusRecord *)odr_malloc (assoc->encode, sizeof(*rec)); + 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 = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec)); - Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*dr)); - + Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) + odr_malloc (assoc->encode, sizeof(*dr)); + bib1.proto = assoc->proto; bib1.oclass = CLASS_DIAGSET; bib1.value = VAL_BIB1; @@ -1008,7 +1021,8 @@ static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) static Z_Records *pack_records(association *a, char *setname, int start, int *num, Z_RecordComposition *comp, - int *next, int *pres, oid_value format) + int *next, int *pres, oid_value format, + Z_ReferenceId *referenceId) { int oid[OID_SIZE]; int recno, total_length = 0, toget = *num, dumped_records = 0; @@ -1051,6 +1065,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, freq.format = format; freq.stream = a->encode; freq.surrogate_flag = 0; + freq.referenceId = referenceId; if (!(fres = bend_fetch(a->backend, &freq, 0))) { *pres = Z_PRES_FAILURE; @@ -1114,21 +1129,22 @@ static Z_Records *pack_records(association *a, char *setname, int start, } } - if (!(thisrec = (Z_NamePlusRecord *)odr_malloc(a->encode, sizeof(*thisrec)))) + if (!(thisrec = (Z_NamePlusRecord *) + odr_malloc(a->encode, sizeof(*thisrec)))) return 0; 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 = (Z_External *)odr_malloc(a->encode, - sizeof(Z_DatabaseRecord)))) + 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_ent_to_oid(&recform, oid)); + thisext->direct_reference = + odr_oiddup(a->encode, oid_ent_to_oid(&recform, oid)); thisext->indirect_reference = 0; thisext->descriptor = 0; if (fres->len < 0) /* Structured data */ @@ -1178,8 +1194,8 @@ static Z_Records *pack_records(association *a, char *setname, int start, if (!(thisext->u.octet_aligned = (Odr_oct *)odr_malloc(a->encode, sizeof(Odr_oct)))) return 0; - if (!(thisext->u.octet_aligned->buf = (unsigned char *)odr_malloc(a->encode, - fres->len))) + if (!(thisext->u.octet_aligned->buf = (unsigned char *) + odr_malloc(a->encode, fres->len))) return 0; memcpy(thisext->u.octet_aligned->buf, fres->record, fres->len); thisext->u.octet_aligned->len = thisext->u.octet_aligned->size = @@ -1201,11 +1217,11 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, (bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr)); logf(LOG_LOG, "Got SearchRequest."); - save_referenceId (reqb, req->referenceId); - /* store ref id in request */ bsrr->fd = fd; bsrr->request = reqb; bsrr->association = assoc; + bsrr->referenceId = req->referenceId; + save_referenceId (reqb, bsrr->referenceId); logf (LOG_LOG, "ResultSet '%s'", req->resultSetName); if (req->databaseNames) @@ -1246,9 +1262,10 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb, bsrq.num_bases = req->num_databaseNames; bsrq.basenames = req->databaseNames; bsrq.query = req->query; + bsrq.referenceId = req->referenceId; bsrq.stream = assoc->encode; bsrq.decode = assoc->decode; - if (!(bsrt = bend_search(assoc->backend, &bsrq, fd))) + if (!(bsrt = bend_search (assoc->backend, &bsrq, fd))) return 0; bsrr->hits = bsrt->hits; bsrr->errcode = bsrt->errcode; @@ -1271,7 +1288,8 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, { Z_SearchRequest *req = reqb->request->u.searchRequest; Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); - Z_SearchResponse *resp = (Z_SearchResponse *)odr_malloc (assoc->encode, sizeof(*resp)); + 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)); @@ -1344,7 +1362,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, else form = prefformat->value; resp->records = pack_records(assoc, req->resultSetName, 1, - toget, compp, next, presst, form); + toget, compp, next, presst, form, req->referenceId); if (!resp->records) return 0; resp->numberOfRecordsReturned = toget; @@ -1403,19 +1421,22 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, form = prefformat->value; if (assoc->bend_present) { - bend_present_rr *bprr = (bend_present_rr *)nmem_malloc (reqb->request_mem, sizeof(*bprr)); + 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->referenceId = req->referenceId; 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); - + ((int (*)(void *, bend_present_rr *))(*assoc->bend_present))( + assoc->backend, bprr); + if (!bprr->request) return 0; } @@ -1435,7 +1456,8 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, resp->records = pack_records(assoc, req->resultSetId, *req->resultSetStartPoint, - num, req->recordComposition, next, presst, form); + num, req->recordComposition, next, presst, form, + req->referenceId); if (!resp->records) return 0; resp->numberOfRecordsReturned = num; @@ -1453,11 +1475,14 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { Z_ScanRequest *req = reqb->request->u.scanRequest; Z_APDU *apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); - Z_ScanResponse *res = (Z_ScanResponse *)odr_malloc (assoc->encode, sizeof(*res)); - int *scanStatus = (int *)odr_malloc (assoc->encode, sizeof(*scanStatus)); - int *numberOfEntriesReturned = - (int *)odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned)); - Z_ListEntries *ents = (Z_ListEntries *)odr_malloc (assoc->encode, sizeof(*ents)); + Z_ScanResponse *res = (Z_ScanResponse *) + odr_malloc (assoc->encode, sizeof(*res)); + int *scanStatus = (int *) + odr_malloc (assoc->encode, sizeof(*scanStatus)); + int *numberOfEntriesReturned = (int *) + odr_malloc (assoc->encode, sizeof(*numberOfEntriesReturned)); + Z_ListEntries *ents = (Z_ListEntries *) + odr_malloc (assoc->encode, sizeof(*ents)); Z_DiagRecs *diagrecs_p = NULL; oident *attent; bend_scanrequest srq; @@ -1497,17 +1522,18 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) for (i = 0; i < req->num_databaseNames; i++) logf (LOG_LOG, "Database '%s'", req->databaseNames[i]); } - log_scan_term (req->termListAndStartPoint, attset->value); srq.num_bases = req->num_databaseNames; srq.basenames = req->databaseNames; srq.num_entries = *req->numberOfTermsRequested; srq.term = req->termListAndStartPoint; + srq.referenceId = req->referenceId; srq.stream = assoc->encode; if (!(attset = oid_getentbyoid(req->attributeSet)) || attset->oclass != CLASS_RECSYN) srq.attributeset = VAL_NONE; else srq.attributeset = attset->value; + log_scan_term (req->termListAndStartPoint, attset->value); srq.term_position = req->preferredPositionInResponse ? *req->preferredPositionInResponse : 1; if (!(srs = bend_scan(assoc->backend, &srq, 0))) @@ -1583,8 +1609,10 @@ 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_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)); @@ -1597,6 +1625,7 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, bsrr->num_input_setnames = req->inputResultSetNames->num_strings; bsrr->input_setnames = req->inputResultSetNames->strings; #endif + bsrr->referenceId = req->referenceId; bsrr->output_setname = req->sortedResultSetName; bsrr->sort_sequence = req->sortSequence; bsrr->stream = assoc->encode; @@ -1604,11 +1633,13 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, 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)); + + ((int (*)(void *, bend_sort_rr *))(*assoc->bend_sort))(assoc->backend, + bsrr); + + res->referenceId = bsrr->referenceId; + res->sortStatus = (int *) + odr_malloc (assoc->encode, sizeof(*res->sortStatus)); *res->sortStatus = bsrr->sort_status; res->resultSetStatus = 0; if (bsrr->errcode) @@ -1651,6 +1682,7 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, bdrr->setnames = req->resultSetList; bdrr->stream = assoc->encode; bdrr->function = *req->deleteFunction; + bdrr->referenceId = req->referenceId; ((int (*)(void *, bend_delete_rr *)) (*assoc->bend_delete))(assoc->backend, bdrr); @@ -1694,8 +1726,8 @@ static void process_close(association *assoc, request *reqb) req->diagnosticInformation : "NULL"); if (assoc->version < 3) /* to make do_force respond with close */ assoc->version = 3; - do_close_req(assoc, Z_Close_finished, "Association terminated by client", - reqb); + do_close_req(assoc, Z_Close_finished, + "Association terminated by client", reqb); } void save_referenceId (request *reqb, Z_ReferenceId *refid) @@ -1759,7 +1791,6 @@ 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; @@ -1777,9 +1808,10 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) esrequest.errstring = NULL; esrequest.request = reqb; esrequest.association = assoc; + esrequest.referenceId = req->referenceId; - ((int (*)(void *, bend_esrequest_rr *))(*assoc->bend_esrequest))(assoc->backend, - &esrequest); + ((int (*)(void *, bend_esrequest_rr *))(*assoc->bend_esrequest)) + (assoc->backend, &esrequest); /* If the response is being delayed, return NULL */ if (esrequest.request == NULL) @@ -1805,5 +1837,3 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) return apdu; } - -/* Chas: End of addition from DALI */