X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Fseshigh.c;h=92627c26a0e5c9fd716f5bc7748ef255446f4e7b;hp=594b21c06dcda9928668c6c1ce6bd34b77067f7d;hb=2715f6522ca62ab5dbc886c21ed18945743216f0;hpb=ff9ef529da0b40f6aa6ff73954933beb93c08186 diff --git a/src/seshigh.c b/src/seshigh.c index 594b21c..92627c2 100644 --- a/src/seshigh.c +++ b/src/seshigh.c @@ -1,5 +1,5 @@ /* This file is part of the YAZ toolkit. - * Copyright (C) 1995-2010 Index Data + * Copyright (C) 1995-2011 Index Data * See the file LICENSE for details. */ /** @@ -25,11 +25,14 @@ * minimize memory allocation/deallocation during normal operation. * */ +#if HAVE_CONFIG_H +#include +#endif +#include #include #include #include -#include #if HAVE_SYS_TYPES_H #include @@ -53,7 +56,6 @@ #include #endif -#include #include #include #include "eventl.h" @@ -126,6 +128,16 @@ static void wr_diag(WRBUF w, int error, const char *addinfo) wrbuf_puts(w, " "); } +static int odr_int_to_int(Odr_int v) +{ + if (v >= INT_MAX) + return INT_MAX; + else if (v <= INT_MIN) + return INT_MIN; + else + return (int) v; +} + /* * Create and initialize a new association-handle. * channel : iochannel for the current line. @@ -213,10 +225,6 @@ void destroy_association(association *h) request_delq(&h->outgoing); xfree(h); xmalloc_trav("session closed"); - if (cb && cb->one_shot) - { - exit(0); - } } static void do_close_req(association *a, int reason, char *message, @@ -290,7 +298,9 @@ int ir_read(IOCHAN h, int event) else if (res <= 0) { yaz_log(log_session, "Connection closed by client"); - assoc->state = ASSOC_DEAD; + cs_close(conn); + destroy_association(assoc); + iochan_destroy(h); return 0; } else if (res == 1) /* incomplete read - wait for more */ @@ -530,6 +540,9 @@ static int srw_bend_init(association *assoc, Z_SRW_diagnostic **d, int *num, Z_S len = strlen(sr->username) + 1; if (sr->password) len += strlen(sr->password) + 2; + yaz_log(log_requestdetail, "username=%s password-len=%ld", + sr->username, (long) + (sr->password ? strlen(sr->password) : 0)); auth->which = Z_IdAuthentication_open; auth->u.open = (char *) odr_malloc(assoc->decode, len); strcpy(auth->u.open, sr->username); @@ -744,7 +757,7 @@ static int srw_bend_fetch(association *assoc, int pos, } static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, - Z_Query *query_result) + Z_Query *query_result, char **sortkeys_p) { /* have a CQL query and CQL to PQF transform .. */ CQL_parser cp = cql_parser_create(); @@ -752,7 +765,8 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, int srw_errcode = 0; const char *add = 0; char rpn_buf[5120]; - + + *sortkeys_p = 0; r = cql_parser_string(cp, cql); if (r) { @@ -760,12 +774,29 @@ static int cql2pqf(ODR odr, const char *cql, cql_transform_t ct, } if (!r) { + struct cql_node *cn = cql_parser_result(cp); + /* Syntax OK */ - r = cql_transform_buf(ct, - cql_parser_result(cp), - rpn_buf, sizeof(rpn_buf)-1); + r = cql_transform_buf(ct, cn, rpn_buf, sizeof(rpn_buf)-1); if (r) srw_errcode = cql_transform_error(ct, &add); + else + { + char out[100]; + int r = cql_sortby_to_sortkeys_buf(cn, out, sizeof(out)-1); + + if (r == 0) + { + if (*out) + yaz_log(log_requestdetail, "srw_sortKeys '%s'", out); + *sortkeys_p = odr_strdup(odr, out); + } + else + { + yaz_log(log_requestdetail, "failed to create srw_sortKeys"); + srw_errcode = YAZ_SRW_UNSUPP_SORT_TYPE; + } + } } if (!r) { @@ -798,7 +829,8 @@ static int cql2pqf_scan(ODR odr, const char *cql, cql_transform_t ct, { Z_Query query; Z_RPNQuery *rpn; - int srw_error = cql2pqf(odr, cql, ct, &query); + char *sortkeys = 0; + int srw_error = cql2pqf(odr, cql, ct, &query, &sortkeys); if (srw_error) return srw_error; if (query.which != Z_Query_type_1 && query.which != Z_Query_type_101) @@ -835,8 +867,7 @@ static int ccl2pqf(ODR odr, const Odr_oct *ccl, CCL_bibset bibset, return 0; } - -static void srw_bend_search(association *assoc, request *req, +static void srw_bend_search(association *assoc, Z_SRW_PDU *sr, Z_SRW_PDU *res, int *http_code) @@ -873,7 +904,9 @@ static void srw_bend_search(association *assoc, request *req, { int srw_errcode = cql2pqf(assoc->encode, srw_req->query.cql, assoc->server->cql_transform, - rr.query); + rr.query, + &rr.srw_sortKeys); + if (srw_errcode) { yaz_add_srw_diagnostic(assoc->encode, @@ -932,14 +965,15 @@ static void srw_bend_search(association *assoc, request *req, rr.stream = assoc->encode; rr.decode = assoc->decode; rr.print = assoc->print; - if ( srw_req->sort.sortKeys ) + if (srw_req->sort.sortKeys) rr.srw_sortKeys = odr_strdup(assoc->encode, - srw_req->sort.sortKeys ); + srw_req->sort.sortKeys); rr.association = assoc; rr.hits = 0; rr.errcode = 0; rr.errstring = 0; rr.search_info = 0; + rr.search_input = 0; yaz_log_zquery_level(log_requestdetail,rr.query); (assoc->init->bend_search)(assoc->backend, &rr); @@ -960,8 +994,10 @@ static void srw_bend_search(association *assoc, request *req, } else { - int number = srw_req->maximumRecords ? *srw_req->maximumRecords : 0; - int start = srw_req->startRecord ? *srw_req->startRecord : 1; + int number = srw_req->maximumRecords ? + odr_int_to_int(*srw_req->maximumRecords) : 0; + int start = srw_req->startRecord ? + odr_int_to_int(*srw_req->startRecord) : 1; yaz_log(log_requestdetail, "Request to pack %d+%d out of " ODR_INT_PRINTF, @@ -990,7 +1026,7 @@ static void srw_bend_search(association *assoc, request *req, int i; int ok = 1; if (start + number > rr.hits) - number = rr.hits - start + 1; + number = odr_int_to_int(rr.hits) - start + 1; /* Call bend_present if defined */ if (assoc->init->bend_present) @@ -1127,7 +1163,7 @@ static void srw_bend_search(association *assoc, request *req, (srw_res->numberOfRecords ? *srw_res->numberOfRecords : 0)); } - wrbuf_printf(wr, " %s " ODR_INT_PRINTF " +%d", + wrbuf_printf(wr, " %s " ODR_INT_PRINTF "+%d", (srw_res->resultSetId ? srw_res->resultSetId : "-"), (srw_req->startRecord ? *srw_req->startRecord : 1), @@ -1137,7 +1173,7 @@ static void srw_bend_search(association *assoc, request *req, } } -static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr) +static char *srw_bend_explain_default(bend_explain_rr *rr) { #if YAZ_HAVE_XML2 xmlNodePtr ptr = (xmlNode *) rr->server_node_ptr; @@ -1173,7 +1209,7 @@ static char *srw_bend_explain_default(void *handle, bend_explain_rr *rr) return 0; } -static void srw_bend_explain(association *assoc, request *req, +static void srw_bend_explain(association *assoc, Z_SRW_PDU *sr, Z_SRW_explainResponse *srw_res, int *http_code) @@ -1199,7 +1235,7 @@ static void srw_bend_explain(association *assoc, request *req, if (assoc->init->bend_explain) (*assoc->init->bend_explain)(assoc->backend, &rr); else - srw_bend_explain_default(assoc->backend, &rr); + srw_bend_explain_default(&rr); if (rr.explain_buf) { @@ -1221,7 +1257,7 @@ static void srw_bend_explain(association *assoc, request *req, } } -static void srw_bend_scan(association *assoc, request *req, +static void srw_bend_scan(association *assoc, Z_SRW_PDU *sr, Z_SRW_scanResponse *srw_res, int *http_code) @@ -1233,6 +1269,7 @@ static void srw_bend_scan(association *assoc, request *req, srw_bend_init(assoc, &srw_res->diagnostics, &srw_res->num_diagnostics, sr); if (srw_res->num_diagnostics == 0 && assoc->init) { + int step_size = 0; struct scan_entry *save_entries; bend_scan_rr *bsrr = (bend_scan_rr *) @@ -1241,16 +1278,16 @@ static void srw_bend_scan(association *assoc, request *req, bsrr->basenames = &srw_req->database; bsrr->num_entries = srw_req->maximumTerms ? - *srw_req->maximumTerms : 10; + odr_int_to_int(*srw_req->maximumTerms) : 10; bsrr->term_position = srw_req->responsePosition ? - *srw_req->responsePosition : 1; + odr_int_to_int(*srw_req->responsePosition) : 1; bsrr->errcode = 0; bsrr->errstring = 0; bsrr->referenceId = 0; bsrr->stream = assoc->encode; bsrr->print = assoc->print; - bsrr->step_size = odr_intdup(assoc->decode, 0); + bsrr->step_size = &step_size; bsrr->entries = 0; bsrr->setname = 0; @@ -1408,7 +1445,7 @@ static void srw_bend_scan(association *assoc, request *req, } -static void srw_bend_update(association *assoc, request *req, +static void srw_bend_update(association *assoc, Z_SRW_PDU *sr, Z_SRW_updateResponse *srw_res, int *http_code) @@ -1777,7 +1814,7 @@ static void process_http_request(association *assoc, request *req) } else { - srw_bend_search(assoc, req, sr, res, &http_code); + srw_bend_search(assoc, sr, res, &http_code); } if (http_code == 200) soap_package->u.generic->p = res; @@ -1792,8 +1829,7 @@ static void process_http_request(association *assoc, request *req) res->u.explain_response->diagnostics = diagnostic; res->u.explain_response->num_diagnostics = num_diagnostic; } - srw_bend_explain(assoc, req, sr, - res->u.explain_response, &http_code); + srw_bend_explain(assoc, sr, res->u.explain_response, &http_code); if (http_code == 200) soap_package->u.generic->p = res; } @@ -1807,8 +1843,7 @@ static void process_http_request(association *assoc, request *req) res->u.scan_response->diagnostics = diagnostic; res->u.scan_response->num_diagnostics = num_diagnostic; } - srw_bend_scan(assoc, req, sr, - res->u.scan_response, &http_code); + srw_bend_scan(assoc, sr, res->u.scan_response, &http_code); if (http_code == 200) soap_package->u.generic->p = res; } @@ -1823,8 +1858,7 @@ static void process_http_request(association *assoc, request *req) res->u.update_response->num_diagnostics = num_diagnostic; } yaz_log(YLOG_DEBUG, "num_diag = %d", res->u.update_response->num_diagnostics ); - srw_bend_update(assoc, req, sr, - res->u.update_response, &http_code); + srw_bend_update(assoc, sr, res->u.update_response, &http_code); if (http_code == 200) soap_package->u.generic->p = res; } @@ -1847,7 +1881,6 @@ static void process_http_request(association *assoc, request *req) {0, 0, 0} }; char ctype[80]; - int ret; p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; @@ -1858,9 +1891,9 @@ static void process_http_request(association *assoc, request *req) if (stylesheet && *stylesheet == '\0') stylesheet = 0; - ret = z_soap_codec_enc_xsl(assoc->encode, &soap_package, - &hres->content_buf, &hres->content_len, - soap_handlers, charset, stylesheet); + z_soap_codec_enc_xsl(assoc->encode, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers, charset, stylesheet); hres->code = http_code; strcpy(ctype, "text/xml"); @@ -1896,7 +1929,7 @@ static void process_http_request(association *assoc, request *req) keepalive = 1; hres->version = "1.1"; } - if (!keepalive) + if (!keepalive || !assoc->last_control->keepalive) { z_HTTP_header_add(o, &hres->headers, "Connection", "close"); assoc->state = ASSOC_DEAD; @@ -1907,7 +1940,7 @@ static void process_http_request(association *assoc, request *req) int t; const char *alive = z_HTTP_header_lookup(hreq->headers, "Keep-Alive"); - if (alive && isdigit(*(const unsigned char *) alive)) + if (alive && yaz_isdigit(*(const unsigned char *) alive)) t = atoi(alive); else t = 15; @@ -2022,7 +2055,7 @@ static int process_z_request(association *assoc, request *req, char **msg) } else { - yaz_log(YLOG_DEBUG, " result unavailble"); + yaz_log(YLOG_DEBUG, " result unavailable"); retval = -1; } return retval; @@ -2078,7 +2111,7 @@ static int process_gdu_response(association *assoc, request *req, Z_GDU *res) */ static int process_z_response(association *assoc, request *req, Z_APDU *res) { - Z_GDU *gres = (Z_GDU *) odr_malloc(assoc->encode, sizeof(*res)); + Z_GDU *gres = (Z_GDU *) odr_malloc(assoc->encode, sizeof(*gres)); gres->which = Z_GDU_Z3950; gres->u.z3950 = res; @@ -2148,7 +2181,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) yaz_log(log_requestdetail, "Config: %s", cb->configname); - iochan_settimeout(assoc->client_chan, cb->idle_timeout * 60); + iochan_settimeout(assoc->client_chan, cb->idle_timeout); /* we have a backend control block, so call that init function */ if (!(binitres = (*cb->bend_init)(assoc->init))) @@ -2278,13 +2311,15 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) yaz_log(log_requestdetail, "Negotiated to v%d: %s", assoc->version, options); if (*req->maximumRecordSize < assoc->maximumRecordSize) - assoc->maximumRecordSize = *req->maximumRecordSize; + assoc->maximumRecordSize = odr_int_to_int(*req->maximumRecordSize); if (*req->preferredMessageSize < assoc->preferredMessageSize) - assoc->preferredMessageSize = *req->preferredMessageSize; + assoc->preferredMessageSize = odr_int_to_int(*req->preferredMessageSize); - resp->preferredMessageSize = &assoc->preferredMessageSize; - resp->maximumRecordSize = &assoc->maximumRecordSize; + resp->preferredMessageSize = + odr_intdup(assoc->encode, assoc->preferredMessageSize); + resp->maximumRecordSize = + odr_intdup(assoc->encode, assoc->maximumRecordSize); resp->implementationId = odr_prepend(assoc->encode, assoc->init->implementation_id, @@ -2405,27 +2440,33 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start, Z_ReferenceId *referenceId, Odr_oid *oid, int *errcode) { - int recno, total_length = 0, toget = *num, dumped_records = 0; + int recno, total_length = 0, dumped_records = 0; + int toget = odr_int_to_int(*num); 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); records->which = Z_Records_DBOSD; records->u.databaseOrSurDiagnostics = reclist; reclist->num_records = 0; - reclist->records = list; + + if (toget < 0) + return diagrec(a, YAZ_BIB1_PRESENT_REQUEST_OUT_OF_RANGE, 0); + else if (toget == 0) + reclist->records = odr_nullval(); + else + reclist->records = (Z_NamePlusRecord **) + odr_malloc(a->encode, sizeof(*reclist->records) * toget); + *pres = Z_PresentStatus_success; *num = 0; *next = 0; yaz_log(log_requestdetail, "Request to pack " ODR_INT_PRINTF "+%d %s", start, toget, setname); - yaz_log(log_requestdetail, "pms=" ODR_INT_PRINTF - ", mrs=" ODR_INT_PRINTF, a->preferredMessageSize, + yaz_log(log_requestdetail, "pms=%d, mrs=%d", a->preferredMessageSize, a->maximumRecordSize); - for (recno = start; reclist->num_records < toget; recno++) + for (recno = odr_int_to_int(start); reclist->num_records < toget; recno++) { bend_fetch_rr freq; Z_NamePlusRecord *thisrec; @@ -2483,6 +2524,7 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start, } if (freq.record == 0) /* no error and no record ? */ { + *pres = Z_PresentStatus_partial_4; *next = 0; /* signal end-of-set and stop */ break; } @@ -2500,6 +2542,8 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start, { yaz_log(log_requestdetail, " Dropped last normal-sized record"); *pres = Z_PresentStatus_partial_2; + if (*next > 0) + (*next)--; break; } /* record can only be fetched by itself */ @@ -2510,7 +2554,9 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start, { yaz_log(YLOG_DEBUG, " Dropped it"); reclist->records[reclist->num_records] = - surrogatediagrec(a, freq.basename, 16, 0); + surrogatediagrec( + a, freq.basename, + YAZ_BIB1_RECORD_EXCEEDS_PREFERRED_MESSAGE_SIZE, 0); reclist->num_records++; dumped_records += this_length; continue; @@ -2519,10 +2565,12 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start, else /* too big entirely */ { yaz_log(log_requestdetail, "Record > maxrcdsz " - "this=%d max=" ODR_INT_PRINTF, + "this=%d max=%d", this_length, a->maximumRecordSize); reclist->records[reclist->num_records] = - surrogatediagrec(a, freq.basename, 17, 0); + surrogatediagrec( + a, freq.basename, + YAZ_BIB1_RECORD_EXCEEDS_MAXIMUM_RECORD_SIZE, 0); reclist->num_records++; dumped_records += this_length; continue; @@ -2536,7 +2584,10 @@ static Z_Records *pack_records(association *a, char *setname, Odr_int start, thisrec->which = Z_NamePlusRecord_databaseRecord; if (!freq.output_format) - freq.output_format = freq.request_format; + { + yaz_log(YLOG_WARN, "bend_fetch output_format not set"); + return 0; + } thisrec->u.databaseRecord = z_ext_record_oid( a->encode, freq.output_format, freq.record, freq.len); if (!thisrec->u.databaseRecord) @@ -2565,7 +2616,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb) bsrr->extra_args = 0; bsrr->extra_response_data = 0; - yaz_log (log_requestdetail, "ResultSet '%s'", req->resultSetName); + yaz_log(log_requestdetail, "ResultSet '%s'", req->resultSetName); if (req->databaseNames) { int i; @@ -2590,6 +2641,7 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb) bsrr->errcode = 0; bsrr->errstring = NULL; bsrr->search_info = NULL; + bsrr->search_input = req->otherInfo; if (assoc->server && assoc->server->cql_transform && req->query->which == Z_Query_type_104 @@ -2598,7 +2650,8 @@ static Z_APDU *process_searchRequest(association *assoc, request *reqb) /* have a CQL query and a CQL to PQF transform .. */ int srw_errcode = cql2pqf(bsrr->stream, req->query->u.type_104->u.cql, - assoc->server->cql_transform, bsrr->query); + assoc->server->cql_transform, bsrr->query, + &bsrr->srw_sortKeys); if (srw_errcode) bsrr->errcode = yaz_diag_srw_to_bib1(srw_errcode); } @@ -2642,7 +2695,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, Odr_int *nulint = odr_intdup(assoc->encode, 0); Odr_int *next = odr_intdup(assoc->encode, 0); Odr_int *none = odr_intdup(assoc->encode, Z_SearchResponse_none); - int returnedrecs = 0; + Odr_int returnedrecs = 0; apdu->which = Z_APDU_searchResponse; apdu->u.searchResponse = resp; @@ -2706,7 +2759,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, nmem_malloc(reqb->request_mem, sizeof(*bprr)); bprr->setname = req->resultSetName; bprr->start = 1; - bprr->number = *toget; + bprr->number = odr_int_to_int(*toget); bprr->format = req->preferredRecordSyntax; bprr->comp = compp; bprr->referenceId = req->referenceId; @@ -2775,7 +2828,7 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, wrbuf_printf(wr, "ERROR %d", bsrt->errcode); else wrbuf_printf(wr, "OK " ODR_INT_PRINTF, bsrt->hits); - wrbuf_printf(wr, " %s 1+%d ", + wrbuf_printf(wr, " %s 1+" ODR_INT_PRINTF " ", req->resultSetName, returnedrecs); yaz_query_to_wrbuf(wr, req->query); @@ -2808,7 +2861,6 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb) Odr_int *next; Odr_int *num; int errcode = 0; - const char *errstring = 0; yaz_log(log_requestdetail, "Got PresentRequest."); @@ -2820,8 +2872,8 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb) 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->start = odr_int_to_int(*req->resultSetStartPoint); + bprr->number = odr_int_to_int(*req->numberOfRecordsRequested); bprr->format = req->preferredRecordSyntax; bprr->comp = req->recordComposition; bprr->referenceId = req->referenceId; @@ -2837,7 +2889,6 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb) resp->records = diagrec(assoc, bprr->errcode, bprr->errstring); *resp->presentStatus = Z_PresentStatus_failure; errcode = bprr->errcode; - errstring = bprr->errstring; } } apdu = (Z_APDU *)odr_malloc(assoc->encode, sizeof(*apdu)); @@ -2904,6 +2955,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) bend_scan_rr *bsrr = (bend_scan_rr *) odr_malloc(assoc->encode, sizeof(*bsrr)); struct scan_entry *save_entries; + int step_size = 0; yaz_log(log_requestdetail, "Got ScanRequest"); @@ -2912,10 +2964,10 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) res->referenceId = req->referenceId; /* if step is absent, set it to 0 */ - res->stepSize = odr_intdup(assoc->encode, 0); if (req->stepSize) - *res->stepSize = *req->stepSize; + step_size = odr_int_to_int(*req->stepSize); + res->stepSize = 0; res->scanStatus = scanStatus; res->numberOfEntriesReturned = numberOfEntriesReturned; res->positionOfTerm = 0; @@ -2938,12 +2990,12 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) bsrr->errstring = 0; bsrr->num_bases = req->num_databaseNames; bsrr->basenames = req->databaseNames; - bsrr->num_entries = *req->numberOfTermsRequested; + bsrr->num_entries = odr_int_to_int(*req->numberOfTermsRequested); bsrr->term = req->termListAndStartPoint; bsrr->referenceId = req->referenceId; bsrr->stream = assoc->encode; bsrr->print = assoc->print; - bsrr->step_size = res->stepSize; + bsrr->step_size = &step_size; bsrr->setname = yaz_oi_get_string_oid(&req->otherInfo, yaz_oid_userinfo_scan_set, 1, 0); bsrr->entries = 0; @@ -2975,7 +3027,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) log_scan_term_level(log_requestdetail, req->termListAndStartPoint, bsrr->attributeset); bsrr->term_position = req->preferredPositionInResponse ? - *req->preferredPositionInResponse : 1; + odr_int_to_int(*req->preferredPositionInResponse) : 1; ((int (*)(void *, bend_scan_rr *)) (*assoc->init->bend_scan))(assoc->backend, bsrr); @@ -2993,11 +3045,12 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb) *scanStatus = Z_Scan_partial_5; else *scanStatus = Z_Scan_success; + res->stepSize = odr_intdup(assoc->encode, step_size); ents->entries = tab; ents->num_entries = bsrr->num_entries; res->numberOfEntriesReturned = odr_intdup(assoc->encode, ents->num_entries); - res->positionOfTerm = &bsrr->term_position; + res->positionOfTerm = odr_intdup(assoc->encode, bsrr->term_position); for (i = 0; i < bsrr->num_entries; i++) { Z_Entry *e; @@ -3191,12 +3244,12 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb) req->resultSetList[i]); bdrr->stream = assoc->encode; bdrr->print = assoc->print; - bdrr->function = *req->deleteFunction; + bdrr->function = odr_int_to_int(*req->deleteFunction); bdrr->referenceId = req->referenceId; bdrr->statuses = 0; if (bdrr->num_setnames > 0) { - bdrr->statuses = (Odr_int*) + bdrr->statuses = (int*) odr_malloc(assoc->encode, sizeof(*bdrr->statuses) * bdrr->num_setnames); for (i = 0; i < bdrr->num_setnames; i++) @@ -3226,7 +3279,8 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb) (Z_ListStatus *) odr_malloc(assoc->encode, sizeof(**res->deleteListStatuses->elements)); - res->deleteListStatuses->elements[i]->status = bdrr->statuses+i; + res->deleteListStatuses->elements[i]->status = + odr_intdup(assoc->encode, bdrr->statuses[i]); res->deleteListStatuses->elements[i]->id = odr_strdup(assoc->encode, bdrr->setnames[i]); }