X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rfc1006%2Frfct.c;h=b1222ec11763abdbaa40249b7274c624259e2654;hb=7826e2c92b1a07182ba5bfb94c304f1fa7d27387;hp=8bcda3c1d61dd9345ac8789135070793804a5721;hpb=225a451c3b6a46e0034060affad7df94b18ba3aa;p=yaz-moved-to-github.git

diff --git a/rfc1006/rfct.c b/rfc1006/rfct.c
index 8bcda3c..b1222ec 100644
--- a/rfc1006/rfct.c
+++ b/rfc1006/rfct.c
@@ -4,7 +4,22 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rfct.c,v $
- * Revision 1.3  1995-05-16 09:37:18  quinn
+ * Revision 1.8  1995-11-01 13:54:52  quinn
+ * Minor adjustments
+ *
+ * Revision 1.7  1995/06/16  10:46:48  quinn
+ * *** empty log message ***
+ *
+ * Revision 1.6  1995/06/15  07:45:11  quinn
+ * Moving to v3.
+ *
+ * Revision 1.5  1995/05/31  08:29:35  quinn
+ * Nothing significant.
+ *
+ * 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
@@ -69,11 +84,11 @@
 
 /*
  * Simple implementation of XTI/TP0/RFC1006/Sockets.
- * Note: This is neither complete nor robust. It just has to tick us over
- * until mr. Furniss finishes his own implementation.
+ * Note: There is still some work to do in here, but basically it works.
  *
  * TODO: Asynchronous mode needs a lot of little adjustments to various
- * return values and error codes, etc.
+ * return values and error codes, etc. Formally, we should probably hold
+ * this up against the protocol state tables, and see if it's correct.
  *
  * Check if addressing info is returned correctly by all calls.
  */
@@ -99,7 +114,6 @@
 #ifdef __linux__
 #include <linux/limits.h>
 #endif
-#include <dmalloc.h>  /* project memory debugging - delete if you don't have it */
 
 #ifdef TRACE_TRANSPORT
 #define TRC(x) x
@@ -249,7 +263,7 @@ int t_open(char *name, int oflag, struct t_info *info)
     	cnt->oci[i] = -1;
 
     /*
-     * RFC1006 sets a higher than standard default max TPDU size, but the
+     * RFC1006 sets a higher than standard (TP) default max TPDU size, but the
      * Isode seems to like to negotiate it down. We'll keep it here to be
      * safe. Note that there's no harm in jumping it up. If it's higher
      * than 2048, t_connect won't try to negotiate.
@@ -713,6 +727,8 @@ int _t_rcv(int fd, char *buf, unsigned nbytes, int *flags)
     return got;
 }
 
+#if 1
+
 int t_rcv(int fd, char *buf, unsigned nbytes, int *flags)
 {
     int res;
@@ -730,6 +746,8 @@ int t_rcv(int fd, char *buf, unsigned nbytes, int *flags)
     return total;
 }
 
+#endif
+
 int t_close(int fd)
 {
     struct rfct_control *cnt = control[fd];
@@ -777,6 +795,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;
+    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",