X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=server%2Fseshigh.c;h=9371662723296f794b7a992db700651556be2b99;hb=d21f71aa7f9d30fdf457c58e7403723415506c1e;hp=a6a9a132cbe8f264dbc3cf7a9065da8336928491;hpb=ac286ae76051058c8e340bf84eb98391340b7d22;p=yaz-moved-to-github.git diff --git a/server/seshigh.c b/server/seshigh.c index a6a9a13..9371662 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -2,7 +2,7 @@ * Copyright (c) 1995-2003, Index Data * See the file LICENSE for details. * - * $Id: seshigh.c,v 1.135 2003-02-14 18:49:24 adam Exp $ + * $Id: seshigh.c,v 1.150 2003-03-20 21:15:00 adam Exp $ */ /* @@ -33,11 +33,13 @@ #include #define S_ISREG(x) (x & _S_IFREG) #include +#include #else #include #include #endif #include +#include #include #include @@ -53,6 +55,7 @@ #include #include #include +#include #include #include @@ -97,6 +100,7 @@ association *create_association(IOCHAN channel, COMSTACK link) if (!(anew = (association *)xmalloc(sizeof(*anew)))) return 0; anew->init = 0; + anew->version = 0; anew->client_chan = channel; anew->client_link = link; anew->cs_get_mask = 0; @@ -181,7 +185,9 @@ void destroy_association(association *h) xfree(h); xmalloc_trav("session closed"); if (control_block && control_block->one_shot) + { exit (0); + } } static void do_close_req(association *a, int reason, char *message, @@ -202,7 +208,7 @@ static void do_close_req(association *a, int reason, char *message, *cls->closeReason = reason; cls->diagnosticInformation = message; process_z_response(a, req, &apdu); - iochan_settimeout(a->client_chan, 60); + iochan_settimeout(a->client_chan, 20); } else { @@ -284,7 +290,7 @@ void ir_session(IOCHAN h, int event) /* We aren't speaking to this fellow */ if (assoc->state == ASSOC_DEAD) { - yaz_log(LOG_LOG, "Closed connection after reject"); + yaz_log(LOG_LOG, "Connection closed - end of session"); cs_close(conn); destroy_association(assoc); iochan_destroy(h); @@ -315,7 +321,7 @@ void ir_session(IOCHAN h, int event) assoc->input_buffer[0] & 0xff, assoc->input_buffer[1] & 0xff, assoc->input_buffer[2] & 0xff); - req = request_get(&assoc->incoming); /* get a new request structure */ + req = request_get(&assoc->incoming); /* get a new request */ odr_reset(assoc->decode); odr_setbuf(assoc->decode, assoc->input_buffer, res, 0); if (!z_GDU(assoc->decode, &req->gdu_request, 0, 0)) @@ -383,14 +389,12 @@ void ir_session(IOCHAN h, int event) { /* restore mask for cs_get operation ... */ iochan_clearflag(h, EVENT_OUTPUT|EVENT_INPUT); iochan_setflag(h, assoc->cs_get_mask); - yaz_log(LOG_LOG, "queue empty mask=%d", assoc->cs_get_mask); if (assoc->state == ASSOC_DEAD) iochan_setevent(assoc->client_chan, EVENT_TIMEOUT); } else { assoc->cs_put_mask = EVENT_OUTPUT; - yaz_log(LOG_LOG, "queue not empty"); } break; default: @@ -412,11 +416,9 @@ void ir_session(IOCHAN h, int event) static int process_z_request(association *assoc, request *req, char **msg); -static int srw_bend_init(association *assoc) +static void assoc_init_reset(association *assoc) { - bend_initresult *binitres; - statserv_options_block *cb = statserv_getcontrol(); - + xfree (assoc->init); assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init)); assoc->init->stream = assoc->encode; @@ -437,9 +439,25 @@ static int srw_bend_init(association *assoc) assoc->init->charneg_request = NULL; assoc->init->charneg_response = NULL; assoc->init->decode = assoc->decode; + assoc->init->peer_name = + odr_strdup (assoc->encode, cs_addrstr(assoc->client_link)); +} - assoc->init->peer_name = - odr_strdup (assoc->encode, cs_addrstr(assoc->client_link)); +static int srw_bend_init(association *assoc) +{ + const char *encoding = "UTF-8"; + Z_External *ce; + bend_initresult *binitres; + statserv_options_block *cb = statserv_getcontrol(); + + assoc_init_reset(assoc); + + assoc->maximumRecordSize = 3000000; + assoc->preferredMessageSize = 3000000; +#if 1 + ce = yaz_set_proposal_charneg(assoc->decode, &encoding, 1, 0, 0, 1); + assoc->init->charneg_request = ce->u.charNeg3; +#endif if (!(binitres = (*cb->bend_init)(assoc->init))) { yaz_log(LOG_WARN, "Bad response from backend."); @@ -449,9 +467,9 @@ static int srw_bend_init(association *assoc) return 1; } -static void srw_bend_fetch(association *assoc, int pos, - Z_SRW_searchRetrieveRequest *srw_req, - Z_SRW_record *record) +static int srw_bend_fetch(association *assoc, int pos, + Z_SRW_searchRetrieveRequest *srw_req, + Z_SRW_record *record) { bend_fetch_rr rr; ODR o = assoc->encode; @@ -478,8 +496,8 @@ static void srw_bend_fetch(association *assoc, int pos, rr.comp->u.complex->generic = (Z_Specification *) odr_malloc(assoc->decode, sizeof(Z_Specification)); - rr.comp->u.complex->generic->which = Z_Specification_uri; - rr.comp->u.complex->generic->u.uri = srw_req->recordSchema; + rr.comp->u.complex->generic->which = Z_Schema_uri; + rr.comp->u.complex->generic->schema.uri = srw_req->recordSchema; rr.comp->u.complex->generic->elementSpec = 0; rr.stream = assoc->encode; @@ -494,7 +512,10 @@ static void srw_bend_fetch(association *assoc, int pos, rr.errcode = 0; rr.errstring = 0; rr.surrogate_flag = 0; - + + if (!assoc->init->bend_fetch) + return 1; + (*assoc->init->bend_fetch)(assoc->backend, &rr); if (rr.len >= 0) @@ -502,41 +523,106 @@ static void srw_bend_fetch(association *assoc, int pos, record->recordData_buf = rr.record; record->recordData_len = rr.len; record->recordPosition = odr_intdup(o, pos); - record->recordSchema = odr_strdup(o, srw_req->recordSchema); + record->recordSchema = 0; + if (srw_req->recordSchema) + record->recordSchema = odr_strdup(o, srw_req->recordSchema); } + return rr.errcode; } static void srw_bend_search(association *assoc, request *req, Z_SRW_searchRetrieveRequest *srw_req, Z_SRW_searchRetrieveResponse *srw_res) { - char *base = "Default"; + int srw_error = 0; bend_search_rr rr; Z_External *ext; - + + yaz_log(LOG_LOG, "Got SRW SearchRetrieveRequest"); + yaz_log(LOG_DEBUG, "srw_bend_search"); if (!assoc->init) - srw_bend_init(assoc); - + { + yaz_log(LOG_DEBUG, "srw_bend_init"); + if (!srw_bend_init(assoc)) + { + srw_error = 3; /* assume Authentication error */ + + srw_res->num_diagnostics = 1; + srw_res->diagnostics = (Z_SRW_diagnostic *) + odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); + srw_res->diagnostics[0].code = + odr_intdup(assoc->encode, srw_error); + srw_res->diagnostics[0].details = 0; + return; + } + } + rr.setname = "default"; rr.replace_set = 1; rr.num_bases = 1; - rr.basenames = &base; + rr.basenames = &srw_req->database; rr.referenceId = 0; - ext = (Z_External *) odr_malloc(assoc->decode, sizeof(*ext)); - ext->direct_reference = odr_getoidbystr(assoc->decode, - "1.2.840.10003.16.2"); - ext->indirect_reference = 0; - ext->descriptor = 0; - ext->which = Z_External_CQL; - if (srw_req->query) - ext->u.cql = srw_req->query; - else - ext->u.cql = "noterm"; - rr.query = (Z_Query *) odr_malloc (assoc->decode, sizeof(*rr.query)); - rr.query->which = Z_Query_type_104; - rr.query->u.type_104 = ext; + + if (srw_req->query_type == Z_SRW_query_type_cql) + { + ext = (Z_External *) odr_malloc(assoc->decode, sizeof(*ext)); + ext->direct_reference = odr_getoidbystr(assoc->decode, + "1.2.840.10003.16.2"); + ext->indirect_reference = 0; + ext->descriptor = 0; + ext->which = Z_External_CQL; + ext->u.cql = srw_req->query.cql; + + rr.query->which = Z_Query_type_104; + rr.query->u.type_104 = ext; + } + else if (srw_req->query_type == Z_SRW_query_type_pqf) + { + Z_RPNQuery *RPNquery; + YAZ_PQF_Parser pqf_parser; + + pqf_parser = yaz_pqf_create (); + + RPNquery = yaz_pqf_parse (pqf_parser, assoc->decode, + srw_req->query.pqf); + if (!RPNquery) + { + const char *pqf_msg; + size_t off; + int code = yaz_pqf_error (pqf_parser, &pqf_msg, &off); + yaz_log(LOG_LOG, "%*s^\n", off+4, ""); + yaz_log(LOG_LOG, "Bad PQF: %s (code %d)\n", pqf_msg, code); + + srw_error = 10; + } + + rr.query->which = Z_Query_type_1; + rr.query->u.type_1 = RPNquery; + + yaz_pqf_destroy (pqf_parser); + } + else + srw_error = 11; + + if (!srw_error && srw_req->sort_type != Z_SRW_sort_type_none) + srw_error = 80; + + if (!srw_error && !assoc->init->bend_search) + srw_error = 1; + + if (srw_error) + { + yaz_log(LOG_DEBUG, "srw_bend_search returned SRW error %d", srw_error); + srw_res->num_diagnostics = 1; + srw_res->diagnostics = (Z_SRW_diagnostic *) + odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); + srw_res->diagnostics[0].code = + odr_intdup(assoc->encode, srw_error); + srw_res->diagnostics[0].details = 0; + return; + } rr.stream = assoc->encode; rr.decode = assoc->decode; @@ -548,15 +634,22 @@ static void srw_bend_search(association *assoc, request *req, rr.errcode = 0; rr.errstring = 0; rr.search_info = 0; + yaz_log_zquery(rr.query); (assoc->init->bend_search)(assoc->backend, &rr); srw_res->numberOfRecords = odr_intdup(assoc->encode, rr.hits); if (rr.errcode) { + yaz_log(LOG_DEBUG, "bend_search returned Bib-1 code %d", rr.errcode); srw_res->num_diagnostics = 1; srw_res->diagnostics = (Z_SRW_diagnostic *) odr_malloc(assoc->encode, sizeof(*srw_res->diagnostics)); srw_res->diagnostics[0].code = - odr_intdup(assoc->encode, rr.errcode); + odr_intdup(assoc->encode, + yaz_diag_bib1_to_srw (rr.errcode)); + srw_res->diagnostics[0].details = rr.errstring; + yaz_log(LOG_DEBUG, "srw_bend_search returned SRW error %d", + srw_res->diagnostics[0].code); + } else { @@ -566,33 +659,121 @@ static void srw_bend_search(association *assoc, request *req, int number = *srw_req->maximumRecords; int start = 1; int i; + if (srw_req->startRecord) start = *srw_req->startRecord; + + yaz_log(LOG_DEBUG, "srw_bend_search. start=%d max=%d", + start, *srw_req->maximumRecords); + if (start <= rr.hits) { int j = 0; + int packing = Z_SRW_recordPacking_string; if (start + number > rr.hits) number = rr.hits - start + 1; + if (srw_req->recordPacking && + !strcmp(srw_req->recordPacking, "xml")) + packing = Z_SRW_recordPacking_XML; srw_res->records = (Z_SRW_record *) odr_malloc(assoc->encode, number * sizeof(*srw_res->records)); for (i = 0; irecords[j].recordPacking = packing; srw_res->records[j].recordData_buf = 0; - srw_bend_fetch(assoc, i+start, srw_req, - srw_res->records + j); + yaz_log(LOG_DEBUG, "srw_bend_fetch %d", i+start); + errcode = srw_bend_fetch(assoc, i+start, srw_req, + srw_res->records + j); + if (errcode) + { + srw_res->num_diagnostics = 1; + srw_res->diagnostics = (Z_SRW_diagnostic *) + odr_malloc(assoc->encode, + sizeof(*srw_res->diagnostics)); + srw_res->diagnostics[0].code = + odr_intdup(assoc->encode, + yaz_diag_bib1_to_srw (errcode)); + srw_res->diagnostics[0].details = rr.errstring; + break; + } if (srw_res->records[j].recordData_buf) j++; } srw_res->num_records = j; if (!j) srw_res->records = 0; - yaz_log(LOG_LOG, "got %d records", j); } } } } +static int hex_digit (int ch) +{ + if (ch >= '0' && ch <= '9') + return ch - '0'; + else if (ch >= 'a' && ch <= 'f') + return ch - 'a'+10; + else if (ch >= 'A' && ch <= 'F') + return ch - 'A'+10; + return 0; +} + +static char *uri_val(const char *path, const char *name, ODR o) +{ + size_t nlen = strlen(name); + if (*path != '?') + return 0; + path++; + while (path && *path) + { + const char *p1 = strchr(path, '='); + if (!p1) + break; + if (p1 - path == nlen && !memcmp(path, name, nlen)) + { + size_t i = 0; + char *ret; + + path = p1 + 1; + p1 = strchr(path, '&'); + if (!p1) + p1 = strlen(path) + path; + ret = odr_malloc(o, p1 - path + 1); + while (*path && *path != '&') + { + if (*path == '+') + { + ret[i++] = ' '; + path++; + } + else if (*path == '%' && path[1] && path[2]) + { + ret[i++] = hex_digit (path[1])*16 + hex_digit (path[2]); + path = path + 3; + } + else + ret[i++] = *path++; + } + ret[i] = '\0'; + return ret; + } + path = strchr(p1, '&'); + if (path) + path++; + } + return 0; +} + +void uri_val_int(const char *path, const char *name, ODR o, int **intp) +{ + const char *v = uri_val(path, name, o); + if (v) + *intp = odr_intdup(o, atoi(v)); +} + static void process_http_request(association *assoc, request *req) { Z_HTTP_Request *hreq = req->gdu_request->u.HTTP_Request; @@ -603,6 +784,95 @@ static void process_http_request(association *assoc, request *req) if (!strcmp(hreq->method, "GET")) { + char *charset = 0; + int ret = -1; + Z_SOAP *soap_package = 0; + char *db = "Default"; + const char *p0 = hreq->path, *p1; + static Z_SOAP_Handler soap_handlers[2] = { +#if HAVE_XML2 + {"http://www.loc.gov/zing/srw/v1.0/", 0, + (Z_SOAP_fun) yaz_srw_codec}, +#endif + {0, 0, 0} + }; + + if (*p0 == '/') + p0++; + p1 = strchr(p0, '?'); + if (!p1) + p1 = p0 + strlen(p0); + if (p1 != p0) + { + db = odr_malloc(assoc->decode, p1 - p0 + 1); + memcpy (db, p0, p1 - p0); + db[p1 - p0] = '\0'; + } + + if (p1 && *p1 == '?' && p1[1]) + { + Z_SRW_PDU *res = yaz_srw_get(o, Z_SRW_searchRetrieve_response); + Z_SRW_PDU *sr = yaz_srw_get(o, Z_SRW_searchRetrieve_request); + char *query = uri_val(p1, "query", o); + char *pQuery = uri_val(p1, "pQuery", o); + char *sortKeys = uri_val(p1, "sortKeys", o); + + if (query) + { + sr->u.request->query_type = Z_SRW_query_type_cql; + sr->u.request->query.cql = query; + } + if (pQuery) + { + sr->u.request->query_type = Z_SRW_query_type_pqf; + sr->u.request->query.pqf = pQuery; + } + if (sortKeys) + { + sr->u.request->sort_type = Z_SRW_sort_type_sort; + sr->u.request->sort.sortKeys = sortKeys; + } + sr->u.request->recordSchema = uri_val(p1, "recordSchema", o); + sr->u.request->recordPacking = uri_val(p1, "recordPacking", o); + uri_val_int(p1, "maximumRecords", o, + &sr->u.request->maximumRecords); + uri_val_int(p1, "startRecord", o, + &sr->u.request->startRecord); + if (sr->u.request->startRecord) + yaz_log(LOG_LOG, "startRecord=%d", *sr->u.request->startRecord); + sr->u.request->database = db; + srw_bend_search(assoc, req, sr->u.request, + res->u.response); + + soap_package = odr_malloc(o, sizeof(*soap_package)); + soap_package->which = Z_SOAP_generic; + + soap_package->u.generic = + odr_malloc(o, sizeof(*soap_package->u.generic)); + + soap_package->u.generic->p = res; + soap_package->u.generic->ns = soap_handlers[0].ns; + soap_package->u.generic->no = 0; + + soap_package->ns = "SRU"; + + p = z_get_HTTP_Response(o, 200); + hres = p->u.HTTP_Response; + + ret = z_soap_codec_enc(assoc->encode, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers, charset); + if (!charset) + z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/xml"); + else + { + char ctype[60]; + strcpy(ctype, "text/xml; charset="); + strcat(ctype, charset); + z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); + } + + } #ifdef DOCDIR if (strlen(hreq->path) >= 5 && strlen(hreq->path) < 80 && !memcmp(hreq->path, "/doc/", 5)) @@ -649,7 +919,6 @@ static void process_http_request(association *assoc, request *req) ctype = "text/html"; } z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); - yaz_log(LOG_LOG, "OK send page %s size=%ld", fpath, sz); } fclose(f); } @@ -657,7 +926,9 @@ static void process_http_request(association *assoc, request *req) #endif if (!strcmp(hreq->path, "/")) { +#ifdef DOCDIR struct stat sbuf; +#endif const char *doclink = ""; p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; @@ -688,7 +959,6 @@ static void process_http_request(association *assoc, request *req) } else if (!strcmp(hreq->method, "POST")) { -#if HAVE_XSLT const char *content_type = z_HTTP_header_lookup(hreq->headers, "Content-Type"); const char *soap_action = z_HTTP_header_lookup(hreq->headers, @@ -697,46 +967,89 @@ static void process_http_request(association *assoc, request *req) !yaz_strcmp_del("text/xml", content_type, "; ")) { Z_SOAP *soap_package = 0; - int ret; + int ret = -1; int http_code = 500; + const char *charset_p = 0; + char *charset = 0; static Z_SOAP_Handler soap_handlers[2] = { +#if HAVE_XML2 {"http://www.loc.gov/zing/srw/v1.0/", 0, (Z_SOAP_fun) yaz_srw_codec}, +#endif {0, 0, 0} }; - + if ((charset_p = strstr(content_type, "; charset="))) + { + int i = 0; + charset_p += 10; + while (i < 20 && charset_p[i] && + !strchr("; \n\r", charset_p[i])) + i++; + charset = odr_malloc(assoc->encode, i+1); + memcpy(charset, charset_p, i); + charset[i] = '\0'; + yaz_log(LOG_LOG, "SOAP encoding %s", charset); + } ret = z_soap_codec(assoc->decode, &soap_package, &hreq->content_buf, &hreq->content_len, soap_handlers); +#if HAVE_XML2 if (!ret && soap_package->which == Z_SOAP_generic && soap_package->u.generic->no == 0) { /* SRW package */ - Z_SRW_searchRetrieve *sr = soap_package->u.generic->p; + Z_SRW_PDU *sr = soap_package->u.generic->p; if (sr->which == Z_SRW_searchRetrieve_request) { - Z_SRW_searchRetrieve *res = + Z_SRW_PDU *res = yaz_srw_get(assoc->encode, Z_SRW_searchRetrieve_response); - - srw_bend_search(assoc, req, sr->u.request, res->u.response); + + if (!sr->u.request->database) + { + const char *p0 = hreq->path, *p1; + if (*p0 == '/') + p0++; + p1 = strchr(p0, '?'); + if (!p1) + p1 = p0 + strlen(p0); + if (p1 != p0) + { + sr->u.request->database = + odr_malloc(assoc->decode, p1 - p0 + 1); + memcpy (sr->u.request->database, p0, p1 - p0); + sr->u.request->database[p1 - p0] = '\0'; + } + else + sr->u.request->database = "Default"; + } + srw_bend_search(assoc, req, sr->u.request, + res->u.response); soap_package->u.generic->p = res; http_code = 200; } } - +#endif p = z_get_HTTP_Response(o, 200); hres = p->u.HTTP_Response; - ret = z_soap_codec(assoc->encode, &soap_package, - &hres->content_buf, &hres->content_len, - soap_handlers); + ret = z_soap_codec_enc(assoc->encode, &soap_package, + &hres->content_buf, &hres->content_len, + soap_handlers, charset); hres->code = http_code; + if (!charset) + z_HTTP_header_add(o, &hres->headers, "Content-Type", "text/xml"); + else + { + char ctype[60]; + strcpy(ctype, "text/xml; charset="); + strcat(ctype, charset); + z_HTTP_header_add(o, &hres->headers, "Content-Type", ctype); + } } -#endif if (!p) /* still no response ? */ p = z_get_HTTP_Response(o, 500); } @@ -773,6 +1086,16 @@ static void process_http_request(association *assoc, request *req) } else { + int t; + const char *alive = z_HTTP_header_lookup(hreq->headers, "Keep-Alive"); + + if (alive && isdigit(*alive)) + t = atoi(alive); + else + t = 15; + if (t < 0 || t > 3600) + t = 3600; + iochan_settimeout(assoc->client_chan,t); z_HTTP_header_add(o, &hres->headers, "Connection", "Keep-Alive"); } process_gdu_response(assoc, req, p); @@ -814,6 +1137,8 @@ static int process_z_request(association *assoc, request *req, char **msg) switch (req->apdu_request->which) { case Z_APDU_initRequest: + iochan_settimeout(assoc->client_chan, + statserv_getcontrol()->idle_timeout * 60); res = process_initRequest(assoc, req); break; case Z_APDU_searchRequest: res = process_searchRequest(assoc, req, &fd); break; @@ -984,40 +1309,14 @@ static int process_gdu_response(association *assoc, request *req, Z_GDU *res) */ static int process_z_response(association *assoc, request *req, Z_APDU *res) { - odr_setbuf(assoc->encode, req->response, req->size_response, 1); + Z_GDU *gres = (Z_GDU *) odr_malloc(assoc->encode, sizeof(*res)); + gres->which = Z_GDU_Z3950; + gres->u.z3950 = res; - if (assoc->print && !z_APDU(assoc->print, &res, 0, 0)) - { - yaz_log(LOG_WARN, "ODR print error: %s", - odr_errmsg(odr_geterror(assoc->print))); - odr_reset(assoc->print); - } - if (!z_APDU(assoc->encode, &res, 0, 0)) - { - yaz_log(LOG_WARN, "ODR error when encoding response: %s", - odr_errmsg(odr_geterror(assoc->decode))); - return -1; - } - 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 */ - odr_reset(assoc->encode); - req->state = REQUEST_IDLE; - request_enq(&assoc->outgoing, req); - /* turn the work over to the ir_session handler */ - iochan_setflag(assoc->client_chan, EVENT_OUTPUT); - assoc->cs_put_mask = EVENT_OUTPUT; - /* Is there more work to be done? give that to the input handler too */ -#if 1 - if (request_head(&assoc->incoming)) - { - yaz_log (LOG_DEBUG, "more work to be done"); - iochan_setevent(assoc->client_chan, EVENT_WORK); - } -#endif - return 0; + return process_gdu_response(assoc, req, gres); } + /* * Handle init request. * At the moment, we don't check the options @@ -1035,9 +1334,6 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) char options[140]; - xfree (assoc->init); - assoc->init = (bend_initrequest *) xmalloc (sizeof(*assoc->init)); - yaz_log(LOG_LOG, "Got initRequest"); if (req->implementationId) yaz_log(LOG_LOG, "Id: %s", req->implementationId); @@ -1046,24 +1342,10 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (req->implementationVersion) yaz_log(LOG_LOG, "Version: %s", req->implementationVersion); - assoc->init->stream = assoc->encode; - assoc->init->print = assoc->print; + assoc_init_reset(assoc); + assoc->init->auth = req->idAuthentication; assoc->init->referenceId = req->referenceId; - assoc->init->implementation_version = 0; - assoc->init->implementation_id = 0; - assoc->init->implementation_name = 0; - assoc->init->bend_sort = NULL; - assoc->init->bend_search = NULL; - assoc->init->bend_present = NULL; - assoc->init->bend_esrequest = NULL; - assoc->init->bend_delete = NULL; - assoc->init->bend_scan = NULL; - assoc->init->bend_segment = NULL; - assoc->init->bend_fetch = NULL; - assoc->init->charneg_request = NULL; - assoc->init->charneg_response = NULL; - assoc->init->decode = assoc->decode; if (ODR_MASK_GET(req->options, Z_Options_negotiationModel)) { @@ -1073,8 +1355,6 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->init->charneg_request = negotiation; } - assoc->init->peer_name = - odr_strdup (assoc->encode, cs_addrstr(assoc->client_link)); if (!(binitres = (*cb->bend_init)(assoc->init))) { yaz_log(LOG_WARN, "Bad response from backend."); @@ -1186,11 +1466,6 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) if (assoc->preferredMessageSize > assoc->maximumRecordSize) assoc->preferredMessageSize = assoc->maximumRecordSize; -#if 0 - assoc->maximumRecordSize = 3000000; - assoc->preferredMessageSize = 3000000; -#endif - resp->preferredMessageSize = &assoc->preferredMessageSize; resp->maximumRecordSize = &assoc->maximumRecordSize;