From c519afe9dc6cfb2a913873fd6969dfd8e77e6303 Mon Sep 17 00:00:00 2001
From: Michiel Broek <mbse@mbse.eu>
Date: Sat, 23 Aug 2003 19:02:25 +0000
Subject: [PATCH] Session setup handshake changes

---
 ChangeLog        |  5 +++--
 TODO             |  4 ++--
 mbcico/session.c | 38 +++++++++++++++-----------------------
 3 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 01eda06f..98acf5b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,8 +7,8 @@ $Id$
 
 	WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !! WARNING !!
 
-	WARNING, users of Sparc and HP-PA systems should be carefull, some
-	menus do not work.
+	WARNING, users of Sparc and HP-PA systems should be carefull, some bbs
+	menus do not work. All other programs do work on all platforms.
 	All other users on Intel machines (99,9% I think) can use this version.
 
 v0.37.6		10-Aug-2003
@@ -28,6 +28,7 @@ v0.37.6		10-Aug-2003
 		The other goodie is that this is more safe on busy multiline
 		systems.
 		Fixed the binkp escape sequence which is wrong in the FSP.
+		A light improvement in session handshake setup timers.
 
 
 v0.37.5		12-Jul-2003 - 10-Aug-2003
diff --git a/TODO b/TODO
index af4ea188..2c18329e 100644
--- a/TODO
+++ b/TODO
@@ -106,7 +106,7 @@ mbfido:
 
 mbcico:
 	N: See if it is possible with binkp protocol to resume aborted
-	   transfers. -- ND option ??
+	   transfers. Changes are under test now. Feedback needed!
 
 	N: Implement binkp resync when getting files. Transmit works.
 
@@ -136,7 +136,7 @@ mbindex:
 	X: Add usernames index.
 
 mbnewusr:
-	N: On NetBSD, supress error message from mbpasswd.
+	L: On NetBSD, supress error message from mbpasswd.
 	   -- Currently no access to my old Sun Sparcstation.
 
 mbsetup:
diff --git a/mbcico/session.c b/mbcico/session.c
index 3ab2148c..cd38c675 100644
--- a/mbcico/session.c
+++ b/mbcico/session.c
@@ -262,7 +262,6 @@ SM_STATE(wake)
 
 SM_STATE(waitchar)
 
-    Syslog('s', "tx_define_type WAITCHAR");
     if ((c = GETCHAR(2)) == TIMEOUT) {
 	standby = 0;
 	ep = ebuf;
@@ -349,7 +348,6 @@ SM_STATE(nextchar)
 
 SM_STATE(checkintro)
 
-    Syslog('s', "tx_define_type CHECKINTRO");
     Syslog('i', "Check \"%s\" for being EMSI request",ebuf);
 
     if (((localoptions & NOEMSI) == 0) && (strncasecmp(ebuf,"EMSI_REQA77E",12) == 0)) {
@@ -415,13 +413,12 @@ SM_EDECL
     ep=ebuf;
     RESETTIMERS();
     SETTIMER(0, 60);
-    Syslog('s', "rxdefine_type INIT");
 
 SM_START(sendintro)
 
 SM_STATE(sendintro)
 
-    Syslog('s', "rxdefine_type SENDINTRO");
+    Syslog('s', "rxdefine_type SENDINTRO count=%d", count);
     if (count++ > 6) {
 	Syslog('+', "Too many tries to get anything from the caller");
 	SM_ERROR;
@@ -434,18 +431,18 @@ SM_STATE(sendintro)
     if ((localoptions & NOEMSI) == 0) {
 	PUTSTR((char *)"**EMSI_REQA77E\r\021");
     }
-    PUTSTR((char *)"\r\rAddress: ");
-    PUTSTR(aka2str(CFG.aka[0]));
-    PUTSTR((char *)" using mbcico ");
-    PUTSTR((char *)VERSION);
-    switch (tcp_mode) {
-	case TCPMODE_IFC:   PUTSTR((char *)"; IFC");
-			    break;
-	case TCPMODE_ITN:   PUTSTR((char *)"; ITN");
-			    break;
-	case TCPMODE_IBN:   PUTSTR((char *)"; IBN");
-			    break;
-    }
+//    PUTSTR((char *)"\r\rAddress: ");
+//    PUTSTR(aka2str(CFG.aka[0]));
+//    PUTSTR((char *)" using mbcico ");
+//    PUTSTR((char *)VERSION);
+//    switch (tcp_mode) {
+//	case TCPMODE_IFC:   PUTSTR((char *)"; IFC");
+//			    break;
+//	case TCPMODE_ITN:   PUTSTR((char *)"; ITN");
+//			    break;
+//	case TCPMODE_IBN:   PUTSTR((char *)"; IBN");
+//			    break;
+//  }
     PUTCHAR('\r');
     if (STATUS) {
 	SM_ERROR;
@@ -455,17 +452,15 @@ SM_STATE(sendintro)
 
 SM_STATE(waitchar)
 
-    Syslog('s', "rxdefine_type WAITCHAR");
-
     if (EXPIRED(0)) {
-        Syslog('+', "Timeout session handshake with the caller");
+        Syslog('+', "Session setup timeout");
         SM_ERROR;
     }
 
     if ((c = GETCHAR(20)) == TIMEOUT) {
 	SM_PROCEED(sendintro);
     } else if (c < 0) {
-	Syslog('+', "EMSI error while getting from caller");
+	Syslog('+', "Session setup error");
 	SM_ERROR;
     } else {
 	SM_PROCEED(nextchar);
@@ -473,7 +468,6 @@ SM_STATE(waitchar)
 
 SM_STATE(nextchar)
 
-    Syslog('s', "rxdefine_type NEXTCHAR");
     if ((c >= ' ') && (c <= 'z')) {
 	if (c == '*') {
 	    standby = 1;
@@ -535,7 +529,6 @@ SM_STATE(nextchar)
 
 SM_STATE(checkemsi)
 
-    Syslog('s', "rxdefine_type CHECKEMSI");
     Syslog('i', "check \"%s\" for being EMSI inquery or data",ebuf);
 
     if (localoptions & NOEMSI) {
@@ -559,7 +552,6 @@ SM_STATE(checkemsi)
 
 SM_STATE(getdat)
 
-    Syslog('s', "rxdefine_type GETDAT");
     Syslog('i', "Try get emsi_dat packet starting with \"%s\"",ebuf);
 
     if (sscanf(ebuf+8, "%04x", &datasize) != 1) {