/*
- * Copyright (C) 1994, Index Data I/S
- * All rights reserved.
+ * Copyright (c) 1995, Index Data
+ * See the file LICENSE for details.
* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.22 1995-05-15 11:56:39 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
char filename[256];
FILE *f;
+ strcpy(filename, control_block->apdufile);
if (!(new->print = odr_createmem(ODR_PRINT)))
return 0;
if (*control_block->apdufile != '-')
new->input_buffer = 0;
new->input_buffer_len = 0;
new->backend = 0;
+ new->rejected = 0;
request_initq(&new->incoming);
request_initq(&new->outgoing);
- if (cs_getproto(link) == CS_Z3950)
- new->proto = PROTO_Z3950;
- else
- new->proto = PROTO_SR;
+ new->proto = cs_getproto(link);
return new;
}
request *req;
assert(h && conn && assoc);
+ if (event == EVENT_TIMEOUT)
+ {
+ logf(LOG_LOG, "Timeout - closing connection.");
+ cs_close(conn);
+ destroy_association(assoc);
+ iochan_destroy(h);
+ return;
+ }
if (event & EVENT_INPUT || event & EVENT_WORK) /* input */
{
if (event & EVENT_INPUT)
{
logf(LOG_DEBUG, "ir_session (input)");
assert(assoc && conn);
+ /* We aren't speaking to this fellow */
+ if (assoc->rejected)
+ {
+ logf(LOG_LOG, "Closed connection after reject");
+ cs_close(conn);
+ destroy_association(assoc);
+ iochan_destroy(h);
+ return;
+ }
if ((res = cs_get(conn, &assoc->input_buffer,
&assoc->input_buffer_len)) <= 0)
{
iochan_setevent(h, EVENT_INPUT);
/* we got a complete PDU. Let's decode it */
+ logf(LOG_DEBUG, "Got PDU, %d bytes", res);
req = request_get(); /* get a new request structure */
odr_reset(assoc->decode);
- odr_setbuf(assoc->decode, assoc->input_buffer,
- assoc->input_apdu_len, 0);
+ odr_setbuf(assoc->decode, assoc->input_buffer, res, 0);
+odr_dumpBER(log_file(), assoc->input_buffer, res);
if (!z_APDU(assoc->decode, &req->request, 0))
{
- logf(LOG_WARN, "ODR error: %s",
+ logf(LOG_LOG, "ODR error on incoming PDU: %s",
odr_errlist[odr_geterror(assoc->decode)]);
+ logf(LOG_LOG, "PDU dump:");
+ odr_dumpBER(log_file(), assoc->input_buffer, res);
cs_close(conn);
destroy_association(assoc);
iochan_destroy(h);
iochan_destroy(h);
break;
case 0: /* all sent - release the request structure */
+ logf(LOG_DEBUG, "Wrote PDU, %d bytes", req->len_response);
odr_release_mem(req->request_mem);
request_deq(&assoc->outgoing);
request_release(req);
case Z_APDU_scanRequest:
res = process_scanRequest(assoc, req, &fd); break;
default:
- logf(LOG_WARN, "Bad APDU");
+ logf(LOG_WARN, "Bad APDU received");
return -1;
}
if (res)
}
req->response = odr_getbuf(assoc->encode, &req->len_response,
&req->size_response);
+ odr_setbuf(assoc->encode, 0, 0, 0); /* don't free if we abort later */
odr_reset(assoc->encode);
+ if (assoc->print && !z_APDU(assoc->print, &res, 0))
+ {
+ logf(LOG_WARN, "ODR print error: %s",
+ odr_errlist[odr_geterror(assoc->print)]);
+ odr_reset(assoc->print);
+ }
/* change this when we make the backend reentrant */
assert(req == request_head(&assoc->incoming));
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);
- /* Is there more work to be done? */
+ /* Is there more work to be done? give that to the input handler too */
if (request_head(&assoc->incoming))
iochan_setevent(assoc->client_chan, EVENT_WORK);
return 0;
}
+/*
+ * Handle init request.
+ * At the moment, we don't check the protocol version or the options
+ * anywhere else in the code - we just try not to do anything that would
+ * break a naive client. We'll toss 'em into the association block when
+ * we need them there.
+ */
static Z_APDU *process_initRequest(association *assoc, request *reqb)
{
Z_InitRequest *req = reqb->request->u.initRequest;
- static Z_APDU apdu;
- static Z_InitResponse resp;
- static bool_t result = 1;
- static Odr_bitmask options, protocolVersion;
+ Z_APDU *apdu = zget_APDU(assoc->encode, Z_APDU_initResponse);
+ Z_InitResponse *resp = apdu->u.initResponse;
bend_initrequest binitreq;
bend_initresult *binitres;
logf(LOG_LOG, "Version: %s", req->implementationVersion);
binitreq.configname = "default-config";
- if (!(binitres = bend_init(&binitreq)) || binitres->errcode)
+ binitreq.auth = req->idAuthentication;
+ if (!(binitres = bend_init(&binitreq)))
{
- logf(LOG_WARN, "Negative response from backend");
+ logf(LOG_WARN, "Bad response from backend.");
return 0;
}
assoc->backend = binitres->handle;
- apdu.which = Z_APDU_initResponse;
- apdu.u.initResponse = &resp;
- resp.referenceId = req->referenceId;
+ resp->referenceId = req->referenceId;
/* let's tell the client what we can do */
- ODR_MASK_ZERO(&options);
if (ODR_MASK_GET(req->options, Z_Options_search))
- ODR_MASK_SET(&options, Z_Options_search);
+ ODR_MASK_SET(resp->options, Z_Options_search);
if (ODR_MASK_GET(req->options, Z_Options_present))
- ODR_MASK_SET(&options, Z_Options_present);
+ ODR_MASK_SET(resp->options, Z_Options_present);
#if 0
if (ODR_MASK_GET(req->options, Z_Options_delSet))
ODR_MASK_SET(&options, Z_Options_delSet);
#endif
if (ODR_MASK_GET(req->options, Z_Options_namedResultSets))
- ODR_MASK_SET(&options, Z_Options_namedResultSets);
+ ODR_MASK_SET(resp->options, Z_Options_namedResultSets);
if (ODR_MASK_GET(req->options, Z_Options_scan))
- ODR_MASK_SET(&options, Z_Options_scan);
+ ODR_MASK_SET(resp->options, Z_Options_scan);
if (ODR_MASK_GET(req->options, Z_Options_concurrentOperations))
- ODR_MASK_SET(&options, Z_Options_concurrentOperations);
- resp.options = &options;
+ ODR_MASK_SET(resp->options, Z_Options_concurrentOperations);
- ODR_MASK_ZERO(&protocolVersion);
if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1))
- ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_1);
+ ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1);
if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2))
- ODR_MASK_SET(&protocolVersion, Z_ProtocolVersion_2);
- resp.protocolVersion = &protocolVersion;
+ ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2);
assoc->maximumRecordSize = *req->maximumRecordSize;
if (assoc->maximumRecordSize > control_block->maxrecordsize)
assoc->maximumRecordSize = control_block->maxrecordsize;
assoc->preferredMessageSize = *req->preferredMessageSize;
if (assoc->preferredMessageSize > assoc->maximumRecordSize)
assoc->preferredMessageSize = assoc->maximumRecordSize;
- resp.preferredMessageSize = &assoc->preferredMessageSize;
- resp.maximumRecordSize = &assoc->maximumRecordSize;
- resp.result = &result;
- resp.implementationId = "YAZ";
- resp.implementationName = "Index Data/YAZ Generic Frontend Server";
- resp.implementationVersion = "$Revision: 1.22 $";
- resp.userInformationField = 0;
- return &apdu;
+ resp->preferredMessageSize = &assoc->preferredMessageSize;
+ resp->maximumRecordSize = &assoc->maximumRecordSize;
+ resp->implementationName = "Index Data/YAZ Generic Frontend Server";
+ if (binitres->errcode)
+ {
+ logf(LOG_LOG, "Connection rejected by backend.");
+ *resp->result = 0;
+ assoc->rejected = 1;
+ }
+ return apdu;
}
+/*
+ * These functions should be merged.
+ */
+
+/*
+ * nonsurrogate diagnostic record.
+ */
static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
{
static Z_Records rec;
oident bib1;
- static Z_DiagRec dr;
static int err;
+#ifdef Z_95
+ static Z_DiagRec drec;
+ static Z_DefaultDiagFormat dr;
+#else
+ static Z_DiagRec dr;
+#endif
bib1.proto = proto;
bib1.class = CLASS_DIAGSET;
"NULL");
err = error;
rec.which = Z_Records_NSD;
+#ifdef Z_95
+ rec.u.nonSurrogateDiagnostic = &drec;
+ drec.which = Z_DiagRec_defaultFormat;
+ drec.u.defaultFormat = &dr;
+#else
rec.u.nonSurrogateDiagnostic = &dr;
+#endif
dr.diagnosticSetId = oid_getoidbyent(&bib1);
dr.condition = &err;
+ dr.which = Z_DiagForm_v2AddInfo;
dr.addinfo = addinfo ? addinfo : "";
return &rec;
}
+/*
+ * surrogate diagnostic.
+ */
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;
+#ifdef Z_95
+ static Z_DiagRec drec;
+ static Z_DefaultDiagFormat dr;
+#else
+ static Z_DiagRec dr;
+#endif
bib1.proto = proto;
bib1.class = CLASS_DIAGSET;
err = error;
rec.databaseName = dbname;
rec.which = Z_NamePlusRecord_surrogateDiagnostic;
+#ifdef Z_95
+ rec.u.surrogateDiagnostic = &drec;
+ drec.which = Z_DiagRec_defaultFormat;
+ drec.u.defaultFormat = &dr;
+#else
rec.u.surrogateDiagnostic = &dr;
+#endif
dr.diagnosticSetId = oid_getoidbyent(&bib1);
dr.condition = &err;
+ dr.which = Z_DiagForm_v2AddInfo;
dr.addinfo = addinfo ? addinfo : "";
return &rec;
}
+/*
+ * multiple nonsurrogate diagnostics.
+ */
static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
{
static Z_DiagRecs recs;
- static Z_DiagRec *recp[1], rec;
static int err;
oident bib1;
+#ifdef Z_95
+ static Z_DiagRec *recp[1], drec;
+ static Z_DefaultDiagFormat rec;
+#else
+ static Z_DiagRec *recp[1], rec;
+#endif
logf(LOG_DEBUG, "DiagRecs: %d -- %s", error, addinfo);
bib1.proto = proto;
err = error;
recs.num_diagRecs = 1;
recs.diagRecs = recp;
+#ifdef Z_95
+ recp[0] = &drec;
+ drec.which = Z_DiagRec_defaultFormat;
+ drec.u.defaultFormat = &rec;
+#else
recp[0] = &rec;
+#endif
rec.diagnosticSetId = oid_getoidbyent(&bib1);
rec.condition = &err;
+ rec.which = Z_DiagForm_v2AddInfo;
rec.addinfo = addinfo ? addinfo : "";
return &recs;
}
static Z_Records *pack_records(association *a, char *setname, int start,
int *num, Z_ElementSetNames *esn,
- int *next, int *pres)
+ int *next, int *pres, oid_value format)
{
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;
*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);
}
freq.setname = setname;
freq.number = recno;
+ freq.format = format;
if (!(fres = bend_fetch(a->backend, &freq, 0)))
{
*pres = Z_PRES_FAILURE;
reclist.records[reclist.num_records] =
surrogatediagrec(a->proto, fres->basename, 16, 0);
reclist.num_records++;
- *pres = Z_PRES_PARTIAL_2;
- break;
+ total_length += 10; /* totally arbitrary */
+ continue;
}
}
else /* too big entirely */
reclist.records[reclist.num_records] =
surrogatediagrec(a->proto, fres->basename, 17, 0);
reclist.num_records++;
- *pres = Z_PRES_PARTIAL_2;
- break;
+ total_length += 10; /* totally arbitrary */
+ continue;
}
}
if (!(thisrec = odr_malloc(a->encode, sizeof(*thisrec))))
if (!(thisrec->u.databaseRecord = thisext = odr_malloc(a->encode,
sizeof(Z_DatabaseRecord))))
return 0;
- thisext->direct_reference = oid; /* should be OID for current MARC */
+ recform.proto = a->proto;
+ recform.class = CLASS_RECSYN;
+ recform.value = fres->format;
+ thisext->direct_reference = odr_oiddup(a->encode,
+ oid_getoidbyent(&recform));
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;
+ if (fres->format == VAL_SUTRS) /* SUTRS ios a single-ASN.1-type */
+ {
+ Odr_oct sutrs_asn;
+ Odr_oct *sp = &sutrs_asn;
+ Odr_any *single = odr_malloc(a->encode, sizeof(*single));
+ char *buf, *remember;
+ int len, s_remember;
+
+ sutrs_asn.buf = (unsigned char*) fres->record;
+ sutrs_asn.len = sutrs_asn.size = fres->len;
+ /*
+ * we borrow the encoding stream for preparing the buffer. This
+ * is not the most elegant solution - a better way might have been
+ * to reserve a different stream, or to devise a better system
+ * for handling externals in general.
+ */
+ remember = odr_getbuf(a->encode, &len, &s_remember);
+ buf = odr_malloc(a->encode, fres->len + 10); /* buf for encoding */
+ odr_setbuf(a->encode, buf, fres->len + 10, 0); /* can_grow==0 */
+ if (!z_SUTRS(a->encode, &sp, 0))
+ {
+ logf(LOG_LOG, "ODR error encoding SUTRS: %s",
+ odr_errlist[odr_geterror(a->encode)]);
+ return 0;
+ }
+ thisext->which = ODR_EXTERNAL_single;
+ thisext->u.single_ASN1_type = single;
+ single->buf = (unsigned char*)odr_getbuf(a->encode, &single->len,
+ &single->size);
+ /* Now restore the encoding stream */
+ odr_setbuf(a->encode, remember, s_remember, 1);
+ logf(LOG_DEBUG, " Format is SUTRS. len %d, encoded len %d",
+ fres->len, single->len);
+ }
+ else /* octet-aligned record. Easy as pie */
+ {
+ 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;
}
+ *num = reclist.num_records;
return &records;
}
apdu.which = Z_APDU_searchResponse;
apdu.u.searchResponse = &resp;
resp.referenceId = req->referenceId;
+#ifdef Z_95
+ resp.additionalSearchInfo = 0;
+ resp.otherInfo = 0;
+#endif
*fd = -1;
if (!bsrt && !(bsrt = bend_searchresponse(assoc->backend)))
{
}
else
{
- int toget;
+ static int toget;
Z_ElementSetNames *setnames;
- int presst = 0;
+ static int presst = 0;
resp.records = 0;
resp.resultCount = &bsrt->hits;
if (toget && !resp.records)
{
+ oident *prefformat;
+ oid_value form;
+
+ if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
+ prefformat->class != CLASS_RECSYN)
+ form = VAL_NONE;
+ else
+ form = prefformat->value;
resp.records = pack_records(assoc, req->resultSetName, 1,
- &toget, setnames, &next, &presst);
+ &toget, setnames, &next, &presst, form);
if (!resp.records)
return 0;
resp.numberOfRecordsReturned = &toget;
static Z_APDU apdu;
static Z_PresentResponse resp;
static int presst, next, num;
+ oident *prefformat;
+ oid_value form;
+
logf(LOG_LOG, "Got PresentRequest.");
apdu.which = Z_APDU_presentResponse;
apdu.u.presentResponse = &resp;
resp.referenceId = req->referenceId;
+#ifdef Z_95
+ resp.otherInfo = 0;
+#endif
+ if (!(prefformat = oid_getentbyoid(req->preferredRecordSyntax)) ||
+ prefformat->class != CLASS_RECSYN)
+ form = VAL_NONE;
+ else
+ form = prefformat->value;
num = *req->numberOfRecordsRequested;
resp.records = pack_records(assoc, req->resultSetId,
- *req->resultSetStartPoint, &num, req->elementSetNames, &next, &presst);
+ *req->resultSetStartPoint, &num, 0, &next, &presst, form);
if (!resp.records)
return 0;
resp.numberOfRecordsReturned = #
bend_scanrequest srq;
bend_scanresult *srs;
+ logf(LOG_LOG, "Got scanrequest");
apdu.which = Z_APDU_scanResponse;
apdu.u.scanResponse = &res;
res.referenceId = req->referenceId;
res.entries = &ents;
ents.which = Z_ListEntries_nonSurrogateDiagnostics;
res.attributeSet = 0;
+#ifdef Z_95
+ res.otherInfo = 0;
+#endif
if (req->attributeSet && (!(attent = oid_getentbyoid(req->attributeSet)) ||
attent->class != CLASS_ATTSET || attent->value != VAL_BIB1))
ents.u.nonSurrogateDiagnostics = diagrecs(assoc->proto, 205, 0);
else
{
+ if (req->termListAndStartPoint->term->which == Z_Term_general)
+ logf(LOG_DEBUG, " term: '%.*s'",
+ req->termListAndStartPoint->term->u.general->len,
+ req->termListAndStartPoint->term->u.general->buf);
srq.num_bases = req->num_databaseNames;
srq.basenames = req->databaseNames;
srq.num_entries = *req->numberOfTermsRequested;
o->buf = odr_malloc(assoc->encode, o->len = o->size =
strlen(srs->entries[i].term));
memcpy(o->buf, srs->entries[i].term, o->len);
+ logf(LOG_DEBUG, " term #%d: '%s' (%d)", i,
+ srs->entries[i].term, srs->entries[i].occurrences);
}
list.num_entries = i;
res.numberOfEntriesReturned = &list.num_entries;
projects / yaz-moved-to-github.git / blobdiff