* Sebastian Hammer, Adam Dickmeiss
*
* $Log: seshigh.c,v $
- * Revision 1.27 1995-05-29 08:12:06 quinn
+ * 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
#include <oid.h>
#include <log.h>
#include <statserv.h>
-#include "../version.h"
#include <backend.h>
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");
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, res, 0);
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)
/*
* Handle init request.
* At the moment, we don't check the protocol version or the options
- * anywhere else in the code - we just don't do anything that would
- * break a naive client.
+ * 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;
}
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 = YAZ_VERSION;
- resp.userInformationField = 0;
+ 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.");
- result = 0;
+ *resp->result = 0;
assoc->rejected = 1;
}
- return &apdu;
+ return apdu;
}
/*
{
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;
}
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;
}
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;
}
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))))
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)))
{
apdu.which = Z_APDU_presentResponse;
apdu.u.presentResponse = &resp;
resp.referenceId = req->referenceId;
+#ifdef Z_95
+ resp.otherInfo = 0;
+#endif
num = *req->numberOfRecordsRequested;
resp.records = pack_records(assoc, req->resultSetId,
- *req->resultSetStartPoint, &num, req->elementSetNames, &next, &presst);
+ *req->resultSetStartPoint, &num, 0, &next, &presst);
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;