X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=4cb1d35fcd3eb8115c54731d8bb4a98380fad33f;hb=2c8ec8c2d1dd7dd698e406ff99e1b7b439c4fa9b;hp=7b8ac3779320f44b875e54b8eab3df0c2c323b05;hpb=5e88d5b6fc2de30f032179e182c742de279f493e;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index 7b8ac37..4cb1d35 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -2,363 +2,7 @@ * Copyright (c) 1995-2001, Index Data * See the file LICENSE for details. * - * $Log: seshigh.c,v $ - * Revision 1.116 2001-05-16 07:21:36 adam - * Accept any OID for record syntax. - * - * Revision 1.115 2001/03/25 21:55:12 adam - * Added odr_intdup. Ztest server returns TaskPackage for ItemUpdate. - * - * Revision 1.114 2001/02/21 13:46:53 adam - * C++ fixes. - * - * Revision 1.113 2001/01/30 21:34:17 adam - * Added step-size for Scan backend interface. - * - * Revision 1.112 2001/01/29 09:38:22 adam - * Fixed bug that made the frontend server crash when no attribute set - * was specified for scan. - * - * Revision 1.111 2000/11/23 10:58:32 adam - * SSL comstack support. Separate POSIX thread support library. - * - * Revision 1.110 2000/10/02 13:05:32 adam - * Fixed bug introduced by previous commit. - * - * Revision 1.109 2000/10/02 11:07:44 adam - * Added peer_name member for bend_init handler. Changed the YAZ - * client so that tcp: can be avoided in target spec. - * - * Revision 1.108 2000/09/04 08:58:15 adam - * Added prefix yaz_ for most logging utility functions. - * - * Revision 1.107 2000/08/31 10:20:12 adam - * Added member request_format and output_format for backend fetch method. - * - * Revision 1.106 2000/08/31 09:51:25 adam - * Added record_syntax member for fetch method (raw OID). - * - * Revision 1.105 2000/07/06 10:38:47 adam - * Enhanced option --enable-tcpd. - * - * Revision 1.104 2000/04/05 07:39:55 adam - * Added shared library support (libtool). - * - * Revision 1.103 2000/03/20 19:06:25 adam - * Added Segment request for fronend server. Work on admin for client. - * - * Revision 1.102 2000/03/15 12:59:49 adam - * Added handle member to statserv_control. - * - * Revision 1.101 2000/01/12 14:36:07 adam - * Added printing stream (ODR) for backend functions. - * - * Revision 1.100 1999/12/16 23:36:19 adam - * Implemented ILL protocol. Minor updates ASN.1 compiler. - * - * Revision 1.99 1999/11/30 13:47:12 adam - * Improved installation. Moved header files to include/yaz. - * - * Revision 1.98 1999/11/29 15:12:27 adam - * Changed the way implementationName - and version is set. - * - * Revision 1.96 1999/11/04 14:58:44 adam - * Added status elements for backend delete result set handler. - * Updated delete result result set command for client. - * - * Revision 1.95 1999/10/11 10:01:24 adam - * Implemented bend_sort_rr handler for frontend server. - * - * Revision 1.94 1999/08/27 09:40:32 adam - * Renamed logf function to yaz_log. Removed VC++ project files. - * - * Revision 1.93 1999/07/06 12:17:15 adam - * Added option -1 that runs server once (for profiling purposes). - * - * Revision 1.92 1999/06/17 10:54:45 adam - * Added facility to specify implementation version - and name - * for server. - * - * Revision 1.91 1999/06/01 14:29:12 adam - * Work on Extended Services. - * - * Revision 1.90 1999/05/27 13:02:20 adam - * Assigned OID for old DB Update (VAL_DBUPDATE0). - * - * Revision 1.89 1999/05/26 15:24:26 adam - * Fixed minor bugs regarding DB Update (introduced by previous commit). - * - * 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. - * - * Revision 1.83 1998/11/03 10:09:36 adam - * Fixed bug regarding YC. - * - * Revision 1.82 1998/10/20 14:00:30 quinn - * Fixed Scan - * - * Revision 1.81 1998/10/13 16:12:24 adam - * Added support for Surrogate Diagnostics for Scan Term entries. - * - * Revision 1.80 1998/09/02 12:41:53 adam - * Added decode stream in bend search structures. - * - * Revision 1.79 1998/08/19 16:10:08 adam - * Changed som member names of DeleteResultSetRequest/Response. - * - * Revision 1.78 1998/08/03 10:23:55 adam - * Fixed bug regarding Options for Sort. - * - * Revision 1.77 1998/07/20 12:38:42 adam - * Implemented delete result set service to server API. - * - * Revision 1.76 1998/05/27 16:57:07 adam - * Support for surrogate diagnostic records added for bend_fetch. - * - * Revision 1.75 1998/05/18 10:13:07 adam - * Fixed call to es_request handler - extra argument was passed. - * - * Revision 1.74 1998/03/31 15:13:20 adam - * Development towards compiled ASN.1. - * - * Revision 1.73 1998/03/31 11:07:45 adam - * Furhter work on UNIverse resource report. - * Added Extended Services handling in frontend server. - * - * Revision 1.72 1998/02/11 11:53:35 adam - * Changed code so that it compiles as C++. - * - * Revision 1.71 1998/02/10 11:03:57 adam - * Added support for extended handlers in backend server interface. - * - * Revision 1.70 1998/01/29 13:15:35 adam - * Implemented sort for the backend interface. - * - * Revision 1.69 1997/09/30 11:48:12 adam - * Fixed bug introduced by previous commit. - * - * Revision 1.68 1997/09/29 13:18:59 adam - * Added function, oid_ent_to_oid, to replace the function - * oid_getoidbyent, which is not thread safe. - * - * Revision 1.67 1997/09/17 12:10:40 adam - * YAZ version 1.4. - * - * Revision 1.66 1997/09/05 15:26:44 adam - * Added ODR encode in search and scen bend request structures. - * Fixed a few enums that caused trouble with C++. - * - * Revision 1.65 1997/09/01 08:53:01 adam - * New windows NT/95 port using MSV5.0. The test server 'ztest' was - * moved a separate directory. MSV5.0 project server.dsp created. - * As an option, the server can now operate as an NT service. - * - * Revision 1.64 1997/04/30 08:52:11 quinn - * Null - * - * Revision 1.63 1996/10/11 11:57:26 quinn - * Smallish - * - * Revision 1.62 1996/07/06 19:58:35 quinn - * System headerfiles gathered in yconfig - * - * Revision 1.61 1996/06/10 08:56:16 quinn - * Work on Summary. - * - * Revision 1.60 1996/05/30 11:03:10 quinn - * Fixed NextresultSetPosition bug fixed. - * - * Revision 1.59 1996/05/14 09:26:46 quinn - * Added attribute set to scan backend - * - * 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 - * Added a better SCAN. - * - * Revision 1.29 1995/06/01 11:25:03 quinn - * Smallish. - * - * Revision 1.28 1995/06/01 11:21:01 quinn - * Attempting to fix a bug in pack-records. replaced break with continue - * for large records, according to standard. - * - * Revision 1.27 1995/05/29 08:12:06 quinn - * Moved oid to util - * - * Revision 1.26 1995/05/18 13:02:12 quinn - * Smallish. - * - * Revision 1.25 1995/05/17 08:42:26 quinn - * Transfer auth info to backend. Allow backend to reject init gracefully. - * - * Revision 1.24 1995/05/16 08:51:04 quinn - * License, documentation, and memory fixes - * - * Revision 1.23 1995/05/15 13:25:10 quinn - * Fixed memory bug. - * - * Revision 1.22 1995/05/15 11:56:39 quinn - * Asynchronous facilities. Restructuring of seshigh code. - * - * Revision 1.21 1995/05/02 08:53:19 quinn - * Trying in vain to fix comm with ISODE - * - * Revision 1.20 1995/04/20 15:13:00 quinn - * Cosmetic - * - * Revision 1.19 1995/04/18 08:15:34 quinn - * Added dynamic memory allocation on encoding (whew). Code is now somewhat - * neater. We'll make the same change for decoding one day. - * - * Revision 1.18 1995/04/17 11:28:25 quinn - * Smallish - * - * Revision 1.17 1995/04/10 10:23:36 quinn - * Some work to add scan and other things. - * - * Revision 1.16 1995/03/31 09:18:55 quinn - * Added logging. - * - * Revision 1.15 1995/03/30 14:03:23 quinn - * Added RFC1006 as separate library - * - * Revision 1.14 1995/03/30 12:18:17 quinn - * Fixed bug. - * - * Revision 1.13 1995/03/30 09:09:24 quinn - * Added state-handle and some support for asynchronous activities. - * - * Revision 1.12 1995/03/29 15:40:16 quinn - * Ongoing work. Statserv is now dynamic by default - * - * Revision 1.11 1995/03/28 09:16:21 quinn - * Added record packing to the search request - * - * Revision 1.10 1995/03/27 08:34:24 quinn - * Added dynamic server functionality. - * Released bindings to session.c (is now redundant) - * - * Revision 1.9 1995/03/22 15:01:26 quinn - * Adjusting record packing. - * - * Revision 1.8 1995/03/22 10:13:21 quinn - * Working on record packer - * - * Revision 1.7 1995/03/21 15:53:31 quinn - * Little changes. - * - * Revision 1.6 1995/03/21 12:30:09 quinn - * Beginning to add support for record packing. - * - * Revision 1.5 1995/03/17 10:44:13 quinn - * Added catch of null-string in makediagrec - * - * 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 - * + * $Id: seshigh.c,v 1.120 2001-10-05 14:43:22 adam Exp $ */ /* @@ -380,14 +24,6 @@ * will maintain a pool of buffers for encoding and decoding, trying to * minimize memory allocation/deallocation during normal operation. * - * TODOs include (and will be done in order of public interest): - * - * Support for EXPLAIN - provide simple meta-database system. - * Support for access control. - * Support for resource control. - * Support for extended services - primarily Item Order. - * Rest of Z39.50-1994 - * */ #include @@ -665,7 +301,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, 0)) + if (!z_APDU(assoc->decode, &req->apdu_request, 0, 0)) { yaz_log(LOG_LOG, "ODR error on incoming PDU: %s [near byte %d] ", odr_errmsg(odr_geterror(assoc->decode)), @@ -676,7 +312,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, 0)) + if (assoc->print && !z_APDU(assoc->print, &req->apdu_request, 0, 0)) { yaz_log(LOG_WARN, "ODR print error: %s", odr_errmsg(odr_geterror(assoc->print))); @@ -749,12 +385,12 @@ static int process_request(association *assoc, request *req, char **msg) *msg = "Unknown Error"; assert(req && req->state == REQUEST_IDLE); - if (req->request->which != Z_APDU_initRequest && !assoc->init) + if (req->apdu_request->which != Z_APDU_initRequest && !assoc->init) { *msg = "Missing InitRequest"; return -1; } - switch (req->request->which) + switch (req->apdu_request->which) { case Z_APDU_initRequest: res = process_initRequest(assoc, req); break; @@ -855,7 +491,7 @@ void backend_response(IOCHAN i, int event) yaz_log(LOG_DEBUG, "backend_response"); assert(assoc && req && req->state != REQUEST_IDLE); /* determine what it is we're waiting for */ - switch (req->request->which) + switch (req->apdu_request->which) { case Z_APDU_searchRequest: res = response_searchRequest(assoc, req, 0, &fd); break; @@ -932,7 +568,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res) static Z_APDU *process_initRequest(association *assoc, request *reqb) { statserv_options_block *cb = statserv_getcontrol(); - Z_InitRequest *req = reqb->request->u.initRequest; + Z_InitRequest *req = reqb->apdu_request->u.initRequest; Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_initResponse); Z_InitResponse *resp = apdu->u.initResponse; bend_initresult *binitres; @@ -1064,7 +700,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) resp->preferredMessageSize = &assoc->preferredMessageSize; resp->maximumRecordSize = &assoc->maximumRecordSize; - resp->implementationName = "GFS"; + resp->implementationName = "GFS/YAZ"; if (assoc->init->implementation_name) { @@ -1119,20 +755,14 @@ static void set_addinfo (Z_DefaultDiagFormat *dr, char *addinfo, ODR odr) */ static Z_Records *diagrec(association *assoc, int error, char *addinfo) { - int oid[OID_SIZE]; Z_Records *rec = (Z_Records *) odr_malloc (assoc->encode, sizeof(*rec)); - oident bib1; int *err = odr_intdup(assoc->encode, error); Z_DiagRec *drec = (Z_DiagRec *) odr_malloc (assoc->encode, sizeof(*drec)); Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) odr_malloc (assoc->encode, sizeof(*dr)); - bib1.proto = assoc->proto; - bib1.oclass = CLASS_DIAGSET; - bib1.value = VAL_BIB1; - yaz_log(LOG_DEBUG, "Diagnostic: %d -- %s", error, addinfo ? addinfo : "NULL"); rec->which = Z_Records_NSD; @@ -1144,7 +774,7 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) drec->u.defaultFormat = dr; #endif dr->diagnosticSetId = - odr_oiddup (assoc->encode, oid_ent_to_oid(&bib1, oid)); + yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1); dr->condition = err; set_addinfo (dr, addinfo, assoc->encode); return rec; @@ -1156,27 +786,21 @@ static Z_Records *diagrec(association *assoc, int error, char *addinfo) 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)); int *err = odr_intdup(assoc->encode, error); - oident bib1; Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec)); Z_DefaultDiagFormat *dr = (Z_DefaultDiagFormat *) odr_malloc (assoc->encode, sizeof(*dr)); - bib1.proto = assoc->proto; - bib1.oclass = CLASS_DIAGSET; - bib1.value = VAL_BIB1; - yaz_log(LOG_DEBUG, "SurrogateDiagnotic: %d -- %s", error, addinfo); rec->databaseName = dbname; rec->which = Z_NamePlusRecord_surrogateDiagnostic; rec->u.surrogateDiagnostic = drec; drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = dr; - dr->diagnosticSetId = odr_oiddup (assoc->encode, - oid_ent_to_oid(&bib1, oid)); + dr->diagnosticSetId = + yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1); dr->condition = err; set_addinfo (dr, addinfo, assoc->encode); @@ -1188,18 +812,14 @@ static Z_NamePlusRecord *surrogatediagrec(association *assoc, char *dbname, */ static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) { - int oid[OID_SIZE]; Z_DiagRecs *recs = (Z_DiagRecs *)odr_malloc (assoc->encode, sizeof(*recs)); int *err = odr_intdup(assoc->encode, error); - oident bib1; Z_DiagRec **recp = (Z_DiagRec **)odr_malloc (assoc->encode, sizeof(*recp)); Z_DiagRec *drec = (Z_DiagRec *)odr_malloc (assoc->encode, sizeof(*drec)); - Z_DefaultDiagFormat *rec = (Z_DefaultDiagFormat *)odr_malloc (assoc->encode, sizeof(*rec)); + Z_DefaultDiagFormat *rec = (Z_DefaultDiagFormat *) + odr_malloc (assoc->encode, sizeof(*rec)); yaz_log(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo ? addinfo : ""); - bib1.proto = assoc->proto; - bib1.oclass = CLASS_DIAGSET; - bib1.value = VAL_BIB1; recs->num_diagRecs = 1; recs->diagRecs = recp; @@ -1207,8 +827,8 @@ static Z_DiagRecs *diagrecs(association *assoc, int error, char *addinfo) drec->which = Z_DiagRec_defaultFormat; drec->u.defaultFormat = rec; - rec->diagnosticSetId = odr_oiddup (assoc->encode, - oid_ent_to_oid(&bib1, oid)); + rec->diagnosticSetId = + yaz_oidval_to_z3950oid (assoc->encode, CLASS_DIAGSET, VAL_BIB1); rec->condition = err; #ifdef ASN_COMPILED @@ -1363,7 +983,7 @@ static Z_Records *pack_records(association *a, char *setname, int start, static Z_APDU *process_searchRequest(association *assoc, request *reqb, int *fd) { - Z_SearchRequest *req = reqb->request->u.searchRequest; + Z_SearchRequest *req = reqb->apdu_request->u.searchRequest; bend_search_rr *bsrr = (bend_search_rr *)nmem_malloc (reqb->request_mem, sizeof(*bsrr)); @@ -1440,7 +1060,7 @@ int bend_searchresponse(void *handle, bend_search_rr *bsrr) {return 0;} static Z_APDU *response_searchRequest(association *assoc, request *reqb, bend_search_rr *bsrt, int *fd) { - Z_SearchRequest *req = reqb->request->u.searchRequest; + Z_SearchRequest *req = reqb->apdu_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)); @@ -1550,12 +1170,11 @@ static Z_APDU *response_searchRequest(association *assoc, request *reqb, static Z_APDU *process_presentRequest(association *assoc, request *reqb, int *fd) { - Z_PresentRequest *req = reqb->request->u.presentRequest; + Z_PresentRequest *req = reqb->apdu_request->u.presentRequest; oident *prefformat; oid_value form; Z_APDU *apdu; Z_PresentResponse *resp; - int *presst; int *next; int *num; @@ -1565,6 +1184,9 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, form = VAL_NONE; else form = prefformat->value; + resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp)); + resp->records = 0; + resp->presentStatus = odr_intdup(assoc->encode, 0); if (assoc->init->bend_present) { bend_present_rr *bprr = (bend_present_rr *) @@ -1585,26 +1207,32 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, if (!bprr->request) return 0; + if (bprr->errcode) + { + resp->records = diagrec(assoc, bprr->errcode, bprr->errstring); + *resp->presentStatus = Z_PRES_FAILURE; + } } apdu = (Z_APDU *)odr_malloc (assoc->encode, sizeof(*apdu)); - resp = (Z_PresentResponse *)odr_malloc (assoc->encode, sizeof(*resp)); - presst = odr_intdup(assoc->encode, 0); next = odr_intdup(assoc->encode, 0); - num = odr_intdup(assoc->encode, *req->numberOfRecordsRequested); + num = odr_intdup(assoc->encode, 0); apdu->which = Z_APDU_presentResponse; apdu->u.presentResponse = resp; resp->referenceId = req->referenceId; resp->otherInfo = 0; - resp->records = - pack_records(assoc, req->resultSetId, *req->resultSetStartPoint, - num, req->recordComposition, next, presst, form, - req->referenceId, req->preferredRecordSyntax); + if (!resp->records) + { + *num = *req->numberOfRecordsRequested; + resp->records = + pack_records(assoc, req->resultSetId, *req->resultSetStartPoint, + num, req->recordComposition, next, resp->presentStatus, + form, req->referenceId, req->preferredRecordSyntax); + } if (!resp->records) return 0; resp->numberOfRecordsReturned = num; - resp->presentStatus = presst; resp->nextResultSetPosition = next; return apdu; @@ -1616,7 +1244,7 @@ static Z_APDU *process_presentRequest(association *assoc, request *reqb, */ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) { - Z_ScanRequest *req = reqb->request->u.scanRequest; + Z_ScanRequest *req = reqb->apdu_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)); @@ -1752,7 +1380,7 @@ static Z_APDU *process_scanRequest(association *assoc, request *reqb, int *fd) static Z_APDU *process_sortRequest(association *assoc, request *reqb, int *fd) { - Z_SortRequest *req = reqb->request->u.sortRequest; + Z_SortRequest *req = reqb->apdu_request->u.sortRequest; Z_SortResponse *res = (Z_SortResponse *) odr_malloc (assoc->encode, sizeof(*res)); bend_sort_rr *bsrr = (bend_sort_rr *) @@ -1811,7 +1439,8 @@ static Z_APDU *process_sortRequest(association *assoc, request *reqb, static Z_APDU *process_deleteRequest(association *assoc, request *reqb, int *fd) { - Z_DeleteResultSetRequest *req = reqb->request->u.deleteResultSetRequest; + Z_DeleteResultSetRequest *req = + reqb->apdu_request->u.deleteResultSetRequest; Z_DeleteResultSetResponse *res = (Z_DeleteResultSetResponse *) odr_malloc (assoc->encode, sizeof(*res)); bend_delete_rr *bdrr = (bend_delete_rr *) @@ -1878,7 +1507,7 @@ static Z_APDU *process_deleteRequest(association *assoc, request *reqb, static void process_close(association *assoc, request *reqb) { - Z_Close *req = reqb->request->u.close; + Z_Close *req = reqb->apdu_request->u.close; static char *reasons[] = { "finished", @@ -1972,7 +1601,7 @@ static Z_APDU *process_segmentRequest (association *assoc, request *reqb) { bend_segment_rr request; - request.segment = reqb->request->u.segmentRequest; + request.segment = reqb->apdu_request->u.segmentRequest; request.stream = assoc->encode; request.decode = assoc->decode; request.print = assoc->print; @@ -1987,14 +1616,14 @@ static Z_APDU *process_ESRequest(association *assoc, request *reqb, int *fd) { bend_esrequest_rr esrequest; - Z_ExtendedServicesRequest *req = reqb->request->u.extendedServicesRequest; + Z_ExtendedServicesRequest *req = reqb->apdu_request->u.extendedServicesRequest; Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_extendedServicesResponse); Z_ExtendedServicesResponse *resp = apdu->u.extendedServicesResponse; yaz_log(LOG_DEBUG,"inside Process esRequest"); - esrequest.esr = reqb->request->u.extendedServicesRequest; + esrequest.esr = reqb->apdu_request->u.extendedServicesRequest; esrequest.stream = assoc->encode; esrequest.decode = assoc->decode; esrequest.print = assoc->print;