Smallish.

diff --git a/odr/odr_seq.c b/odr/odr_seq.c
index 38899f8..bb55971 100644 (file)
--- a/odr/odr_seq.c
+++ b/odr/odr_seq.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: odr_seq.c,v $

- * Revision 1.11  1995-05-17 08:41:54  quinn
+ * Revision 1.12  1995-05-18 13:06:32  quinn
+ * Smallish.
+ *
+ * Revision 1.11  1995/05/17  08:41:54  quinn

  * Small, hopefully insignificant change.
  *
  * Revision 1.10  1995/05/16  08:50:59  quinn
  * Small, hopefully insignificant change.
  *
  * Revision 1.10  1995/05/16  08:50:59  quinn

@@ -90,7 +93,6 @@ int odr_sequence_of(ODR o, Odr_fun type, void *p, int *num)
 {
     char ***pp = (char***) p;  /* for dereferencing */
     char **tmp;
 {
     char ***pp = (char***) p;  /* for dereferencing */
     char **tmp;

-    char *dummy = "Nothing";

     int size = 0, i;
 
     if (!odr_sequence_begin(o, p, 0))
     int size = 0, i;
 
     if (!odr_sequence_begin(o, p, 0))

diff --git a/rfc1006/rfct.c b/rfc1006/rfct.c
index 8bcda3c..3b2537e 100644 (file)
--- a/rfc1006/rfct.c
+++ b/rfc1006/rfct.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rfct.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rfct.c,v $

- * Revision 1.3  1995-05-16 09:37:18  quinn
+ * Revision 1.4  1995-05-18 13:02:07  quinn
+ * Smallish.
+ *
+ * Revision 1.3  1995/05/16  09:37:18  quinn

  * Fixed bug
  *
  * Revision 1.2  1995/05/02  08:53:09  quinn
  * Fixed bug
  *
  * Revision 1.2  1995/05/02  08:53:09  quinn

@@ -777,6 +780,12 @@ static int t_look_wait(int fd, int wait)
        return T_LISTEN; /* the only possible type of event */
     if ((res = read_n(fd, (char*) &head, 6)) < 0)
        return -1;
        return T_LISTEN; /* the only possible type of event */
     if ((res = read_n(fd, (char*) &head, 6)) < 0)
        return -1;

+    if (res == 0)
+    {
+       TRC(fprintf(stderr, "Network disconnect\n"));
+       return cnt->event = T_DISCONNECT;
+    }
+    TRC(fprintf(stderr, "t_look got %d bytes\n", res));

     if (head.version != RFC_VERSION)
     {
        TRC(fprintf(stderr, "Got bad RFC1006 version in t_look: %d.\n",
     if (head.version != RFC_VERSION)
     {
        TRC(fprintf(stderr, "Got bad RFC1006 version in t_look: %d.\n",

diff --git a/server/seshigh.c b/server/seshigh.c
index a0e3126..8b4edb8 100644 (file)
--- a/server/seshigh.c
+++ b/server/seshigh.c
@@ -4,7 +4,10 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: seshigh.c,v $

- * Revision 1.25  1995-05-17 08:42:26  quinn
+ * 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
  * Transfer auth info to backend. Allow backend to reject init gracefully.
  *
  * Revision 1.24  1995/05/16  08:51:04  quinn

@@ -451,7 +454,7 @@ static int process_response(association *assoc, request *req, Z_APDU *res)
     }
     req->response = odr_getbuf(assoc->encode, &req->len_response,
        &req->size_response);
     }
     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_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))
     {
     odr_reset(assoc->encode);
     if (assoc->print && !z_APDU(assoc->print, &res, 0))
     {

@@ -466,12 +469,18 @@ static int process_response(association *assoc, request *req, Z_APDU *res)
     request_enq(&assoc->outgoing, req);
     /* turn the work over to the ir_session handler */
     iochan_setflag(assoc->client_chan, EVENT_OUTPUT);
     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;
 }
 
     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 don't do anything that would
+ * break a naive client.
+ */

 static Z_APDU *process_initRequest(association *assoc, request *reqb)
 {
     Z_InitRequest *req = reqb->request->u.initRequest;
 static Z_APDU *process_initRequest(association *assoc, request *reqb)
 {
     Z_InitRequest *req = reqb->request->u.initRequest;

@@ -548,6 +557,13 @@ static Z_APDU *process_initRequest(association *assoc, request *reqb)
     return &apdu;
 }
 
     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;
 static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
 {
     static Z_Records rec;

@@ -570,6 +586,9 @@ static Z_Records *diagrec(oid_proto proto, int error, char *addinfo)
     return &rec;
 }
 
     return &rec;
 }
 

+/*
+ * surrogate diagnostic.
+ */

 static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
                                            int error, char *addinfo)
 {
 static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
                                            int error, char *addinfo)
 {

@@ -593,6 +612,9 @@ static Z_NamePlusRecord *surrogatediagrec(oid_proto proto, char *dbname,
     return &rec;
 }
 
     return &rec;
 }
 

+/*
+ * multiple nonsurrogate diagnostics.
+ */

 static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
 {
     static Z_DiagRecs recs;
 static Z_DiagRecs *diagrecs(oid_proto proto, int error, char *addinfo)
 {
     static Z_DiagRecs recs;