Activated new binkp/1.1 driver

ChangeLog

@@ -3,9 +3,12 @@ $Id$
 v0.39.6		11-Jan-2004
 
 	mbcico:
-		New binkp/1.1 driver fixes for Sun NetBSD.
+		New binkp/1.1 driver. Remember to check your Irex links, see
-		Removed TCP ignore check in EOB state.
+		the warning with version 0.39.5. In case of troubles please
-		Transmiter file close now right after last block.
+		report these. In the mbcico directory are 2 files, binkpold.c
+		and binkpold.h if they are renamed to binkp.c and binkp.h you
+		get the old 1.0 driver back. After some weeks I hope to remove
+		these 2 old files.
 		Added support for T-Mail fileboxes, partly written and info
 		provided by Przemyslaw Kwiatkowski (2:480/127).
 

mbcico/Makefile

@@ -4,7 +4,7 @@
 
 include ../Makefile.global
 
-SRCS		= zmmisc.c zmrle.c zmrecv.c zmsend.c binkp.c binkpnew.c md5b.c \
+SRCS		= zmmisc.c zmrle.c zmrecv.c zmsend.c binkp.c md5b.c \
 		  xmsend.c xmrecv.c m7recv.c m7send.c hydra.c inbound.c \
 		  answer.c chat.c dial.c dietifna.c emsidat.c filelist.c \
 		  openfile.c openport.c opentcp.c rdoptions.c yoohoo.c \
@@ -13,7 +13,7 @@ SRCS		= zmmisc.c zmrle.c zmrecv.c zmsend.c binkp.c binkpnew.c md5b.c \
 		  ttyio.c lutil.c scanout.c emsi.c ulock.c \
 		  callstat.c session.c call.c mbcico.c \
 		  outstat.c nlinfo.c mbout.c mbtelind.c mbtelout.c
-HDRS		= zmodem.h binkp.h binkpnew.h config.h statetbl.h md5b.h \
+HDRS		= zmodem.h binkp.h config.h statetbl.h md5b.h \
 		  xmsend.h xmrecv.h m7recv.h m7send.h hydra.h inbound.h \
 		  answer.h chat.h dial.h dietifna.h emsidat.h filelist.h \
 		  openfile.h openport.h opentcp.h rdoptions.h yoohoo.h \
@@ -22,7 +22,7 @@ HDRS		= zmodem.h binkp.h binkpnew.h config.h statetbl.h md5b.h \
 		  ttyio.h lutil.h scanout.h emsi.h ulock.h \
 		  callstat.h session.h call.h mbcico.h \
 		  outstat.h nlinfo.h mbtelind.h mbtelout.h
-MBCICO_OBJS	= zmmisc.o zmrle.o zmrecv.o zmsend.o binkp.o binkpnew.o md5b.o \
+MBCICO_OBJS	= zmmisc.o zmrle.o zmrecv.o zmsend.o binkp.o md5b.o \
 		  xmsend.o xmrecv.o m7recv.o m7send.o hydra.o inbound.o \
 		  answer.o chat.o dial.o dietifna.o emsidat.o filelist.o \
 		  openfile.o openport.o opentcp.o rdoptions.o yoohoo.o \
@@ -100,7 +100,6 @@ zmrle.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/clcomm.h ../lib/commo
 zmrecv.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/clcomm.h ../lib/common.h ../lib/nodelist.h lutil.h ttyio.h session.h zmodem.h config.h emsi.h openfile.h filelist.h openport.h
 zmsend.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/clcomm.h ../lib/nodelist.h ttyio.h session.h zmodem.h lutil.h emsi.h filelist.h
 binkp.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/nodelist.h ../lib/dbnode.h ../lib/clcomm.h ../lib/mberrors.h ttyio.h session.h statetbl.h config.h emsi.h openfile.h respfreq.h filelist.h opentcp.h rdoptions.h lutil.h binkp.h config.h md5b.h inbound.h
-binkpnew.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/nodelist.h ../lib/dbnode.h ../lib/clcomm.h ../lib/mberrors.h ttyio.h session.h statetbl.h config.h emsi.h openfile.h respfreq.h filelist.h opentcp.h rdoptions.h lutil.h binkpnew.h config.h md5b.h inbound.h
 md5b.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/nodelist.h ../lib/clcomm.h lutil.h md5b.h
 xmsend.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/nodelist.h ../lib/clcomm.h session.h ttyio.h statetbl.h xmsend.h m7send.h filelist.h filetime.h
 xmrecv.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/common.h ../lib/nodelist.h ../lib/clcomm.h session.h ttyio.h statetbl.h config.h lutil.h openfile.h m7recv.h xmrecv.h filelist.h filetime.h
@@ -136,7 +135,7 @@ scanout.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/reco
 emsi.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/nodelist.h ../lib/dbnode.h ../lib/clcomm.h ../lib/mberrors.h ttyio.h session.h statetbl.h config.h emsi.h emsidat.h hydra.h rdoptions.h tcp.h wazoo.h inbound.h
 ulock.o: ../config.h ../lib/libs.h ../lib/clcomm.h
 callstat.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/clcomm.h ../lib/common.h callstat.h
-session.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/nodelist.h ../lib/mberrors.h ttyio.h statetbl.h emsi.h ftsc.h session.h yoohoo.h mbcico.h binkpnew.h binkp.h callstat.h inbound.h opentcp.h
+session.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/clcomm.h ../lib/nodelist.h ../lib/mberrors.h ttyio.h statetbl.h emsi.h ftsc.h session.h yoohoo.h mbcico.h binkp.h callstat.h inbound.h opentcp.h
 call.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/nodelist.h ../lib/clcomm.h ../lib/dbnode.h ../lib/mberrors.h session.h callstat.h call.h config.h dial.h lutil.h portsel.h openport.h opentcp.h rdoptions.h inbound.h
 mbcico.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/nodelist.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbftn.h ../lib/mberrors.h config.h answer.h call.h lutil.h mbcico.h session.h
 outstat.o: ../config.h ../lib/libs.h ../lib/structs.h ../lib/users.h ../lib/records.h ../lib/common.h ../lib/nodelist.h ../lib/clcomm.h ../lib/dbcfg.h ../lib/dbnode.h ../lib/dbftn.h ../lib/mberrors.h scanout.h callstat.h outstat.h

mbcico/binkp.h

@@ -1,7 +1,5 @@
-#ifndef USE_NEWBINKP
+#ifndef	_BINKPNEW_H
-
+#define	_BINKPNEW_H
-#ifndef	_BINKP_H
-#define	_BINKP_H
 
 
 /* $Id$ */
@@ -23,11 +21,8 @@
 
 /* protocol version */
 #define	PRTCLNAME "binkp"
-#ifdef USE_EXPERIMENT
+#define PRTCLVER "1.1"
-#define PRTCLVER "1.0"
+#define PRTCLOLD "1.0"
-#else
-#define PRTCLVER "1.0"
-#endif
 
 #define MAX_BLKSIZE 0x7fff	/* Don't change!				*/
 #define	BLK_HDR_SIZE 2		/* 2 bytes header				*/
@@ -64,8 +59,6 @@ typedef struct _binkp_frame {
 /*
  *  Linked list of files to send and responses from the receiver.
  */
-typedef enum {NoState, Sending, IsSent, Got, Skipped, Get} FileState;
-
 typedef struct _binkp_list {
 	struct _binkp_list	*next;
 	char			*remote;	/* Remote filename		*/
@@ -78,8 +71,18 @@ typedef struct _binkp_list {
 } binkp_list;
 
 
+
+/*
+ * Linked FIFO list of received commands to be processed by the transmitter.
+ */
+typedef struct _the_queue {
+    struct  _the_queue		*next;
+    int				cmd;		/* M_xxx command id		*/
+    char			*data;		/* Frame data in the queue	*/
+} the_queue;
+
+
+
 int binkp(int);
 
 #endif
-
-#endif

mbcico/binkpold.h

@@ -1,7 +1,5 @@
-#ifdef USE_NEWBINKP
+#ifndef	_BINKP_H
-
+#define	_BINKP_H
-#ifndef	_BINKPNEW_H
-#define	_BINKPNEW_H
 
 
 /* $Id$ */
@@ -23,8 +21,7 @@
 
 /* protocol version */
 #define	PRTCLNAME "binkp"
-#define PRTCLVER "1.1"
+#define PRTCLVER "1.0"
-#define PRTCLOLD "1.0"
 
 #define MAX_BLKSIZE 0x7fff	/* Don't change!				*/
 #define	BLK_HDR_SIZE 2		/* 2 bytes header				*/
@@ -61,6 +58,8 @@ typedef struct _binkp_frame {
 /*
  *  Linked list of files to send and responses from the receiver.
  */
+typedef enum {NoState, Sending, IsSent, Got, Skipped, Get} FileState;
+
 typedef struct _binkp_list {
 	struct _binkp_list	*next;
 	char			*remote;	/* Remote filename		*/
@@ -73,20 +72,6 @@ typedef struct _binkp_list {
 } binkp_list;
 
 
-
-/*
- * Linked FIFO list of received commands to be processed by the transmitter.
- */
-typedef struct _the_queue {
-    struct  _the_queue		*next;
-    int				cmd;		/* M_xxx command id		*/
-    char			*data;		/* Frame data in the queue	*/
-} the_queue;
-
-
-
 int binkp(int);
 
 #endif
-
-#endif

mbcico/session.c

@@ -44,11 +44,7 @@
 #include "session.h"
 #include "yoohoo.h"
 #include "mbcico.h"
-#ifdef USE_NEWBINKP
-#include "binkpnew.h"
-#else
 #include "binkp.h"
-#endif
 #include "callstat.h"
 #include "inbound.h"
 #include "opentcp.h"