X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=rfc1006%2Frfct.c;h=4ff8e985a6b0185e4050a79b2914074a287a22a2;hb=7b3772b8fcf2cc486e079b3687b183f997374271;hp=996d87e59e70abc1867e244a2a9e458378087687;hpb=7148f4238bd2ea22c60008fc3062626b42456ae4;p=yaz-moved-to-github.git

diff --git a/rfc1006/rfct.c b/rfc1006/rfct.c
index 996d87e..4ff8e98 100644
--- a/rfc1006/rfct.c
+++ b/rfc1006/rfct.c
@@ -4,7 +4,19 @@
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: rfct.c,v $
- * Revision 1.2  1995-05-02 08:53:09  quinn
+ * 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
  * Trying in vain to fix comm with ISODE
  *
  * Revision 1.1  1995/03/30  14:03:17  quinn
@@ -66,11 +78,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.
  */
@@ -246,7 +258,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.
@@ -257,7 +269,7 @@ int t_open(char *name, int oflag, struct t_info *info)
     {
 	info->addr = TSEL_MAXLEN + sizeof(struct sockaddr_in) + 1;
 	info->options = 1024;
-	info->tsdu = 2041; /* trying to please the ISODE */
+	info->tsdu = -1; /* is this right? */
 	info->etsdu = 0;
 	info->connect = -2;
 	info->discon = -2;
@@ -596,7 +608,7 @@ int t_snd(int fd, char *buf, unsigned nbytes, int flags)
     return nbytes;
 }
 
-int _t_rcv(int fd, char *buf, unsigned nbytes, int *flags)
+int t_rcv(int fd, char *buf, unsigned nbytes, int *flags)
 {
     struct rfct_control *cnt = control[fd];
     struct tpdu_data_header dhead;
@@ -710,6 +722,8 @@ int _t_rcv(int fd, char *buf, unsigned nbytes, int *flags)
     return got;
 }
 
+#if 0
+
 int t_rcv(int fd, char *buf, unsigned nbytes, int *flags)
 {
     int res;
@@ -727,6 +741,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];
@@ -774,6 +790,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",