From d09e17f371431d3397588e6b749219608d37766a Mon Sep 17 00:00:00 2001 From: Sebastian Hammer Date: Tue, 29 Aug 1995 11:17:28 +0000 Subject: [PATCH] Added code to receive close --- client/client.c | 34 ++++++++++++++-- server/eventl.c | 7 +++- server/seshigh.c | 111 ++++++++++++++++++++++++++++++++++++++++++----------- server/session.h | 13 ++++++- server/statserv.c | 8 +++- 5 files changed, 142 insertions(+), 31 deletions(-) diff --git a/client/client.c b/client/client.c index d82a8ff..ef7292b 100644 --- a/client/client.c +++ b/client/client.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: client.c,v $ - * Revision 1.18 1995-08-28 12:21:27 quinn + * Revision 1.19 1995-08-29 11:17:28 quinn + * Added code to receive close + * + * Revision 1.18 1995/08/28 12:21:27 quinn * Client can now ask for simple element set names. * * Revision 1.17 1995/08/17 12:45:02 quinn @@ -150,6 +153,7 @@ static void send_initRequest() ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_1); ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_2); + ODR_MASK_SET(req->protocolVersion, Z_ProtocolVersion_3); req->idAuthentication = auth; @@ -182,7 +186,7 @@ static int process_initResponse(Z_InitResponse *res) odr_perror(print, "Printing userinfo\n"); odr_reset(print); } - if (res->userInformationField->which == ODR_EXTERNAL_octet) + if (res->userInformationField->which == Z_External_octet) { printf("Guessing visiblestring:\n"); printf("'%s'\n", res->userInformationField->u. octet_aligned->buf); @@ -323,7 +327,7 @@ void display_record(Z_DatabaseRecord *p) odr_reset(print); } } - if (r->which == ODR_EXTERNAL_octet && p->u.octet_aligned->len) + if (r->which == Z_External_octet && p->u.octet_aligned->len) marc_display ((char*)p->u.octet_aligned->buf, stdout); else if (ent->value == VAL_SUTRS) { @@ -636,6 +640,26 @@ static int send_presentRequest(char *arg) return 2; } +void process_close(Z_Close *req) +{ + static char *reasons[] = + { + "finished", + "shutdown", + "systemProblem", + "costLimit", + "resources", + "securityViolation", + "protocolError", + "lackOfActivity", + "peerAbort", + "unspecified" + }; + + printf("Reason: %s, message: %s\n", reasons[*req->closeReason], + req->diagnosticInformation ? req->diagnosticInformation : "NULL"); +} + static int cmd_show(char *arg) { if (!send_presentRequest(arg)) @@ -970,6 +994,10 @@ static int client(void) else printf("No records.\n"); break; + case Z_APDU_close: + printf("Target has closed the association.\n"); + process_close(apdu->u.close); + break; default: printf("Received unknown APDU type (%d).\n", apdu->which); diff --git a/server/eventl.c b/server/eventl.c index cda3127..8eb2958 100644 --- a/server/eventl.c +++ b/server/eventl.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: eventl.c,v $ - * Revision 1.12 1995-08-29 10:41:18 quinn + * Revision 1.13 1995-08-29 11:17:56 quinn + * Added code to receive close + * + * Revision 1.12 1995/08/29 10:41:18 quinn * Small. * * Revision 1.11 1995/06/19 12:39:09 quinn @@ -96,7 +99,7 @@ int event_loop() FD_ZERO(&out); FD_ZERO(&except); timeout = &to; /* hang on select */ - to.tv_sec = 5*60; + to.tv_sec = 10/*5*60*/; to.tv_usec = 0; max = 0; for (p = iochans; p; p = p->next) diff --git a/server/seshigh.c b/server/seshigh.c index 0fd64e9..a062b3d 100644 --- a/server/seshigh.c +++ b/server/seshigh.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: seshigh.c,v $ - * Revision 1.45 1995-08-21 09:11:00 quinn + * Revision 1.46 1995-08-29 11:17:58 quinn + * Added code to receive close + * + * Revision 1.45 1995/08/21 09:11:00 quinn * Smallish fixes to suppport new formats. * * Revision 1.44 1995/08/17 12:45:25 quinn @@ -178,6 +181,7 @@ #include #include #include +#include #include #include @@ -266,7 +270,7 @@ association *create_association(IOCHAN channel, COMSTACK link) new->input_buffer = 0; new->input_buffer_len = 0; new->backend = 0; - new->rejected = 0; + new->state = ASSOC_NEW; request_initq(&new->incoming); request_initq(&new->outgoing); new->proto = cs_getproto(link); @@ -291,6 +295,33 @@ void destroy_association(association *h) free(h); } +static void do_close(association *a, int reason, char *message) +{ + Z_APDU apdu; + Z_Close *cls = zget_Close(a->encode); + request *req = request_get(); + + /* Purge request queue */ + while (request_deq(&a->incoming)); + while (request_deq(&a->outgoing)); + if (a->version >= 3) + { + logf(LOG_DEBUG, "Generating Close PDU"); + apdu.which = Z_APDU_close; + apdu.u.close = cls; + *cls->closeReason = reason; + cls->diagnosticInformation = message; + process_response(a, req, &apdu); + iochan_settimeout(a->client_chan, 60); + } + else + { + logf(LOG_DEBUG, "v2 client. No Close PDU"); + iochan_setevent(a->client_chan, EVENT_TIMEOUT); /* force imm close */ + } + a->state = ASSOC_DEAD; +} + /* * This is where PDUs from the client are read and the further * processing is initiated. Flow of control moves down through the @@ -310,10 +341,18 @@ void ir_session(IOCHAN h, int event) assert(h && conn && assoc); if (event == EVENT_TIMEOUT) { - logf(LOG_LOG, "Timeout - closing connection."); - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); + if (assoc->state != ASSOC_UP) + { + logf(LOG_LOG, "Final timeout - closing connection."); + cs_close(conn); + destroy_association(assoc); + iochan_destroy(h); + } + else + { + logf(LOG_LOG, "Session idle too long. Sending close."); + do_close(assoc, Z_Close_lackOfActivity, 0); + } return; } if (event & EVENT_INPUT || event & EVENT_WORK) /* input */ @@ -323,7 +362,7 @@ void ir_session(IOCHAN h, int event) logf(LOG_DEBUG, "ir_session (input)"); assert(assoc && conn); /* We aren't speaking to this fellow */ - if (assoc->rejected) + if (assoc->state == ASSOC_DEAD) { logf(LOG_LOG, "Closed connection after reject"); cs_close(conn); @@ -356,9 +395,7 @@ void ir_session(IOCHAN h, int event) 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); + do_close(assoc, Z_Close_protocolError, "Malformed package"); return; } req->request_mem = odr_extract_mem(assoc->decode); @@ -375,11 +412,7 @@ void ir_session(IOCHAN h, int event) req = request_head(&assoc->incoming); if (req->state == REQUEST_IDLE) if (process_request(assoc) < 0) - { - cs_close(conn); - destroy_association(assoc); - iochan_destroy(h); - } + do_close(assoc, Z_Close_systemProblem, "Unknown error"); } if (event & EVENT_OUTPUT) { @@ -495,9 +528,7 @@ void backend_response(IOCHAN i, int event) if ((res && process_response(assoc, req, res) < 0) || fd < 0) { logf(LOG_LOG, "Fatal error when talking to backend"); - cs_close(assoc->client_link); - destroy_association(assoc); - iochan_destroy(assoc->client_chan); + do_close(assoc, Z_Close_systemProblem, 0); iochan_destroy(i); return; } @@ -531,9 +562,11 @@ static int process_response(association *assoc, request *req, Z_APDU *res) odr_reset(assoc->print); } /* change this when we make the backend reentrant */ - assert(req == request_head(&assoc->incoming)); - req->state = REQUEST_IDLE; - request_deq(&assoc->incoming); + if (req == request_head(&assoc->incoming)) + { + req->state = REQUEST_IDLE; + request_deq(&assoc->incoming); + } request_enq(&assoc->outgoing, req); /* turn the work over to the ir_session handler */ iochan_setflag(assoc->client_chan, EVENT_OUTPUT); @@ -557,6 +590,7 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) Z_InitResponse *resp = apdu->u.initResponse; bend_initrequest binitreq; bend_initresult *binitres; + char options[100]; logf(LOG_LOG, "Got initRequest"); if (req->implementationId) @@ -576,26 +610,57 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) assoc->backend = binitres->handle; resp->referenceId = req->referenceId; + *options = '\0'; /* let's tell the client what we can do */ if (ODR_MASK_GET(req->options, Z_Options_search)) + { ODR_MASK_SET(resp->options, Z_Options_search); + strcat(options, "srch"); + } if (ODR_MASK_GET(req->options, Z_Options_present)) + { ODR_MASK_SET(resp->options, Z_Options_present); + strcat(options, " prst"); + } #if 0 if (ODR_MASK_GET(req->options, Z_Options_delSet)) + { ODR_MASK_SET(&options, Z_Options_delSet); + strcat(options, " del"); + } #endif if (ODR_MASK_GET(req->options, Z_Options_namedResultSets)) + { ODR_MASK_SET(resp->options, Z_Options_namedResultSets); + strcat(options, " namedresults"); + } if (ODR_MASK_GET(req->options, Z_Options_scan)) + { ODR_MASK_SET(resp->options, Z_Options_scan); + strcat(options, " scan"); + } if (ODR_MASK_GET(req->options, Z_Options_concurrentOperations)) + { ODR_MASK_SET(resp->options, Z_Options_concurrentOperations); + strcat(options, " concurop"); + } if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_1)) + { ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_1); + assoc->version = 2; /* 1 & 2 are equivalent */ + } if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_2)) + { ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_2); + assoc->version = 2; + } + if (ODR_MASK_GET(req->protocolVersion, Z_ProtocolVersion_3)) + { + ODR_MASK_SET(resp->protocolVersion, Z_ProtocolVersion_3); + assoc->version = 3; + } + logf(LOG_LOG, "Negotiated to v%d: %s", assoc->version, options); assoc->maximumRecordSize = *req->maximumRecordSize; if (assoc->maximumRecordSize > control_block->maxrecordsize) assoc->maximumRecordSize = control_block->maxrecordsize; @@ -609,8 +674,10 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb) { logf(LOG_LOG, "Connection rejected by backend."); *resp->result = 0; - assoc->rejected = 1; + assoc->state = ASSOC_DEAD; } + else + assoc->state = ASSOC_UP; return apdu; } diff --git a/server/session.h b/server/session.h index 83f0dd9..48129f9 100644 --- a/server/session.h +++ b/server/session.h @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: session.h,v $ - * Revision 1.9 1995-06-16 10:31:38 quinn + * Revision 1.10 1995-08-29 11:18:01 quinn + * Added code to receive close + * + * Revision 1.9 1995/06/16 10:31:38 quinn * Added session timeout. * * Revision 1.8 1995/05/17 08:42:28 quinn @@ -91,11 +94,17 @@ typedef struct association void *backend; /* backend handle */ request_q incoming; /* Q of incoming PDUs */ request_q outgoing; /* Q of outgoing data buffers (enc. PDUs) */ - int rejected; /* session rejected */ + enum + { + ASSOC_NEW, /* not initialized yet */ + ASSOC_UP, /* normal operation */ + ASSOC_DEAD /* dead. Close if input arrives */ + } state; /* session parameters */ int preferredMessageSize; int maximumRecordSize; + int version; /* highest version-bit set (2 or 3) */ } association; association *create_association(IOCHAN channel, COMSTACK link); diff --git a/server/statserv.c b/server/statserv.c index 5edcc2e..d99916b 100644 --- a/server/statserv.c +++ b/server/statserv.c @@ -4,7 +4,10 @@ * Sebastian Hammer, Adam Dickmeiss * * $Log: statserv.c,v $ - * Revision 1.24 1995-06-16 10:31:39 quinn + * Revision 1.25 1995-08-29 11:18:02 quinn + * Added code to receive close + * + * Revision 1.24 1995/06/16 10:31:39 quinn * Added session timeout. * * Revision 1.23 1995/06/15 12:30:48 quinn @@ -93,6 +96,7 @@ #include #include #include +#include #include #include @@ -118,7 +122,7 @@ static statserv_options_block control_block = { "", /* diagnostic output to stderr */ "tcp:@:9999", /* default listener port */ PROTO_Z3950, /* default application protocol */ - 2*60, /* idle timeout (minutes) */ + 1, /*2*60,*/ /* idle timeout (minutes) */ 1024*1024, /* maximum PDU size (approx.) to allow */ "default-config", /* configuration name to pass to backend */ "" /* set user id */ -- 1.7.10.4