From 7148f4238bd2ea22c60008fc3062626b42456ae4 Mon Sep 17 00:00:00 2001 From: Sebastian Hammer Date: Tue, 2 May 1995 08:53:07 +0000 Subject: [PATCH] Trying in vain to fix comm with ISODE --- rfc1006/Makefile | 4 ++-- rfc1006/rfct.c | 13 ++++++++----- server/seshigh.c | 21 ++++++++++++++++++--- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/rfc1006/Makefile b/rfc1006/Makefile index d9bc770..7e93ce6 100644 --- a/rfc1006/Makefile +++ b/rfc1006/Makefile @@ -1,14 +1,14 @@ # Copyright (C) 1994, Index Data I/S # All rights reserved. # Sebastian Hammer, Adam Dickmeiss -# $Id: Makefile,v 1.2 1995-04-10 10:23:17 quinn Exp $ +# $Id: Makefile,v 1.3 1995-05-02 08:53:07 quinn Exp $ SHELL=/bin/sh INCLUDE=-I../include -I. -I../../xtimosi/src LIBDIR=../lib LIBINCLUDE=-L$(LIBDIR) CFLAGS= -g -Wall -pedantic -ansi -DEFS=$(INCLUDE) +DEFS=$(INCLUDE) -DTRACE_TRANSPORT LIB=$(LIBDIR)/librfc.a LIBS=-lodr PO = rfct.o makensap.o diff --git a/rfc1006/rfct.c b/rfc1006/rfct.c index b857cd2..996d87e 100644 --- a/rfc1006/rfct.c +++ b/rfc1006/rfct.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: rfct.c,v $ - * Revision 1.1 1995-03-30 14:03:17 quinn + * Revision 1.2 1995-05-02 08:53:09 quinn + * Trying in vain to fix comm with ISODE + * + * Revision 1.1 1995/03/30 14:03:17 quinn * Added RFC1006 as separate library * * Revision 1.15 1995/03/30 10:54:43 quinn @@ -245,16 +248,16 @@ int t_open(char *name, int oflag, struct t_info *info) /* * RFC1006 sets a higher than standard default max TPDU size, but the * Isode seems to like to negotiate it down. We'll keep it here to be - * safe. Not that there's no harm in jumping it up. If it's higher + * safe. Note that there's no harm in jumping it up. If it's higher * than 2048, t_connect won't try to negotiate. */ - cnt->tsize = 128; + cnt->tsize = 2048; if (info) { info->addr = TSEL_MAXLEN + sizeof(struct sockaddr_in) + 1; info->options = 1024; - info->tsdu = -1; + info->tsdu = 2041; /* trying to please the ISODE */ info->etsdu = 0; info->connect = -2; info->discon = -2; @@ -1356,7 +1359,7 @@ int t_accept(int fd, int resfd, struct t_call *call) for (i = 7; i <= 11 && (1 << i) < res->tsize; i++) ; /* encode TPDU size */ parm[2] = i; /* give our TSEL. ## Must we echo theirs, if given? check spec */ - /* I think it was ok to give an empty TSEL. Does it have semantic sig? */ + /* I thought it was ok to give an empty TSEL. Does it have semantic sig? */ parm[3] = TPDU_PARM_CLDID; parm[4] = res->ltsel_len; if (res->ltsel_len) diff --git a/server/seshigh.c b/server/seshigh.c index b28469f..e355558 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.20 1995-04-20 15:13:00 quinn + * 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 @@ -340,8 +343,11 @@ static int process_initRequest(IOCHAN client, Z_InitRequest *req) resp.maximumRecordSize = &assoc->maximumRecordSize; resp.result = &result; resp.implementationId = "YAZ"; +#if 0 resp.implementationName = "Index Data/YAZ Generic Frontend Server"; - resp.implementationVersion = "$Revision: 1.20 $"; +#endif + resp.implementationName = "High Level API Server aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbdddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddddduuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa"; + resp.implementationVersion = "$Revision: 1.21 $"; resp.userInformationField = 0; if (!z_APDU(assoc->encode, &apdup, 0)) { @@ -787,10 +793,19 @@ static int process_scanRequest(IOCHAN client, Z_ScanRequest *req) } if (!z_APDU(assoc->encode, &apdup, 0)) { - logf(LOG_FATAL, "ODR error encoding initres: %s", + logf(LOG_FATAL, "ODR error encoding scanres: %s", + odr_errlist[odr_geterror(assoc->encode)]); + return -1; + } +#if 0 + odr_reset(assoc->print); + if (!z_APDU(assoc->print, &apdup, 0)) + { + logf(LOG_FATAL, "ODR error priniting scanres: %s", odr_errlist[odr_geterror(assoc->encode)]); return -1; } +#endif assoc->encode_buffer = odr_getbuf(assoc->encode, &assoc->encoded_len); odr_reset(assoc->encode); iochan_setflags(client, EVENT_OUTPUT | EVENT_EXCEPT); -- 1.7.10.4