/*
- * 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.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
#include <oid.h>
#include <log.h>
#include <statserv.h>
+#include "../version.h"
#include <backend.h>
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)
{
logf(LOG_DEBUG, "ir_session (input)");
assert(assoc && conn);
+ 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)
{
/* we got a complete PDU. Let's decode it */
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);
if (!z_APDU(assoc->decode, &req->request, 0))
{
logf(LOG_WARN, "ODR error: %s",
}
req->response = odr_getbuf(assoc->encode, &req->len_response,
&req->size_response);
+ odr_setbuf(assoc->encode, 0, 0, 0); /* don't free if we have to quit */
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;
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;
}
resp.result = &result;
resp.implementationId = "YAZ";
resp.implementationName = "Index Data/YAZ Generic Frontend Server";
- resp.implementationVersion = "$Revision: 1.22 $";
+ resp.implementationVersion = YAZ_VERSION;
resp.userInformationField = 0;
+ if (binitres->errcode)
+ {
+ logf(LOG_LOG, "Connection rejected by backend.");
+ result = 0;
+ assoc->rejected = 1;
+ }
return &apdu;
}