Upgraded to 0.37.2 and prepared for FTSC code

ChangeLog

@@ -5,7 +5,15 @@ $Id$
 	All other users on Intel machines (99,9% I think) can use this version.
 
 
-v0.37.01	14-Jan-2003.
+v0.37.2		23-Feb-2003.
+
+	general:
+		System prepared for setting the official FTSC product code,
+		this will be 0x11FF. The code is not yet activated.
+
+
+
+v0.37.1		14-Jan-2003 - 23-Feb-2003
 
 	upgrade:
 		After installing the binaries, start mbsetup, enter menu 1 and
@@ -65,6 +73,10 @@ v0.37.01	14-Jan-2003.
 		Modified this code, didn't work, the toss was always started
 		at once.
 
+	mbcico:
+		YooHoo transmitter prepared for transmitting 16 bits product
+		codes.
+
 	mbfile:
 		In the import function several bugfixes for reading files.bbs.
 		Fixed upper/lowercase filenames bug with import.

Makefile.global.in

@@ -1,7 +1,10 @@
 # Compile-time configuration for MBSE FidoNet/Internet BBS
 # $Id$
 
-VERSION		= @VERSION@
+MAJOR		= @MAJOR@
+MINOR		= @MINOR@
+REVISION	= @REVISION@
+VERSION		= @MAJOR@.@MINOR@.@REVISION@
 PACKAGE		= @PACKAGE@
 
 # for make install, where to put binaries and what owner to set

config.h.in

@@ -3,6 +3,9 @@
 
 #undef SHORTRIGHT
 #undef COPYRIGHT
+#undef VERSION_MAJOR
+#undef VERSION_MINOR
+#undef VERSION_REVISION
 #undef VERSION
 
 /* Memory debugging  */

configure

@@ -1196,7 +1196,10 @@ SUBDIRS="lib mbcico mbfido mbmon mbsebbs mbtask mbsetup unix lang examples html
 
 
 PACKAGE="mbsebbs"
-VERSION="0.37.01"
+MAJOR="0"
+MINOR="37"
+REVISION="2"
+VERSION="$MAJOR.$MINOR.$REVISION"
 COPYRIGHT="Copyright (C) 1997-2003 Michiel Broek, All Rights Reserved"
 SHORTRIGHT="Copyright (C) 1997-2003 M. Broek"
 GROUP="bbs"
@@ -1207,10 +1210,24 @@ OWNER="mbse"
 
 
 
+
+
 cat >>confdefs.h <<_ACEOF
 #define VERSION "$VERSION"
 _ACEOF
 
+cat >>confdefs.h <<_ACEOF
+#define VERSION_MAJOR $MAJOR
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION_MINOR $MINOR
+_ACEOF
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION_REVISION $REVISION
+_ACEOF
+
 cat >>confdefs.h <<_ACEOF
 #define COPYRIGHT "$COPYRIGHT"
 _ACEOF
@@ -8748,7 +8765,9 @@ s,@ECHO_T@,$ECHO_T,;t t
 s,@LIBS@,$LIBS,;t t
 s,@SUBDIRS@,$SUBDIRS,;t t
 s,@PACKAGE@,$PACKAGE,;t t
-s,@VERSION@,$VERSION,;t t
+s,@MAJOR@,$MAJOR,;t t
+s,@MINOR@,$MINOR,;t t
+s,@REVISION@,$REVISION,;t t
 s,@COPYRIGHT@,$COPYRIGHT,;t t
 s,@GROUP@,$GROUP,;t t
 s,@OWNER@,$OWNER,;t t

configure.in

@@ -9,18 +9,26 @@ AC_SUBST(SUBDIRS)
 dnl General settings for MBSE BBS
 dnl After changeing the version number, run autoconf!
 PACKAGE="mbsebbs"
-VERSION="0.37.01"
+MAJOR="0"
+MINOR="37"
+REVISION="2"
+VERSION="$MAJOR.$MINOR.$REVISION"
 COPYRIGHT="Copyright (C) 1997-2003 Michiel Broek, All Rights Reserved"
 SHORTRIGHT="Copyright (C) 1997-2003 M. Broek"
 GROUP="bbs"
 OWNER="mbse"
 AC_SUBST(PACKAGE)
-AC_SUBST(VERSION)
+AC_SUBST(MAJOR)
+AC_SUBST(MINOR)
+AC_SUBST(REVISION)
 AC_SUBST(COPYRIGHT)
 AC_SUBST(GROUP)
 AC_SUBST(OWNER)
 AC_PREFIX_DEFAULT(/opt/mbse)
 AC_DEFINE_UNQUOTED(VERSION, "$VERSION")
+AC_DEFINE_UNQUOTED(VERSION_MAJOR, $MAJOR)
+AC_DEFINE_UNQUOTED(VERSION_MINOR, $MINOR)
+AC_DEFINE_UNQUOTED(VERSION_REVISION, $REVISION)
 AC_DEFINE_UNQUOTED(COPYRIGHT, "$COPYRIGHT")
 AC_DEFINE_UNQUOTED(SHORTRIGHT, "$SHORTRIGHT")
 TARGET="$target"

lib/common.h

@@ -7,6 +7,9 @@
 
 #pragma pack(1)
 
+#define	PRODCODE    0x00fe		    /* Unasigned 16 bits product code	*/
+// #define	PRODCODE    0x11ff	    /* Official MBSE FTSC product code	*/
+
 #define	LEAVE	0
 #define	KFS	1
 #define	TFS	2

lib/ftscprod.006

@@ -287,3 +287,7 @@
 0DFF,Nice_Tosser,DOS/OS2/Win32,Tosser,Robert_Agababyan,2:5020/234.1,19990518
 0EFF,LuckyGate,DOS/OS2/Linux,Packer,Pavel_Gulchouck,2:463/68,19990709
 0FFF,McMail,DOS,Mailer,Simon_Slater,2:443/777,20000102
+10FF,HPT,DOS/OS2/Win32/Unix/BeOS,Packer,Dmitry_Sergienko,2:464/910,20030215
+11FF,MBSEBBS,Linux/FreeBSD/NetBSD,Mailer/Packer,Michiel_Broek,2:280/2802,20030215
+12FF,SBBSecho,DOS/OS2/Win32/Linux/FreeBSD/OpenBSD/Solaris,Packer,Rob_Swindell,1:103/705,20030215
+13FF,binkd,DOS/OS2/Win32/Unix,Mailer,Pavel_Gulchouck,2:463/68,20030215

mbcico/emsi.h

@@ -1,8 +1,8 @@
-#define PRODCODE 0xfe	/* product code for ifcico */
-
 #ifndef EMSI_H
 #define EMSI_H
 
+/* $Id$ */
+
 #define LCODE_PUA 0x0001
 #define LCODE_PUP 0x0002
 #define LCODE_NPU 0x0004

mbcico/yoohoo.c

@@ -487,13 +487,14 @@ void fillhello(unsigned short capabilities, char *password)
 
 	sscanf(VERSION,"%hd.%hd", &majver, &minver);
 	memset(&hello, 0, sizeof(hello));
-	hello.data[0] = 'o';		/* signal         */
+	hello.data[0] = 'o';				/* signal         */
-	hello.data[2] = 1;		/* hello-version  */
+	hello.data[2] = 1;				/* hello-version  */
-	hello.data[4] = PRODCODE;	/* product        */
+	hello.data[4] = (PRODCODE & 0x00ff);		/* product code   */
-	hello.data[6] = majver&0xff;	/* prod-ver-major */
+	hello.data[5] = (PRODCODE & 0xff00) >> 8;	/* product code	  */
-	hello.data[7] = majver>>8;	/* prod-ver-major */
+	hello.data[6] = (VERSION_MAJOR & 0x00ff);	/* prod-ver-major */
-	hello.data[8] = minver&0xff;	/* prod-ver-minor */
+	hello.data[7] = (VERSION_MAJOR & 0xff00) >> 8;	/* prod-ver-major */
-	hello.data[9] = minver>>8;	/* prod-ver-minor */
+	hello.data[8] = (VERSION_MINOR & 0x00ff);	/* prod-ver-minor */
+	hello.data[9] = (VERSION_MINOR & 0xff00) >> 8;	/* prod-ver-minor */
 	strncpy((char*)hello.data+10, name?name:"Unavailable",59); /* name */
 	if (name) {
 		hello.data[10+strlen(name)] = '\0';

mbfido/addpkt.c

@@ -139,7 +139,8 @@ FILE *CreatePkt(char *Queue, fidoaddr Orig, fidoaddr Dest, char *Extension)
     buffer[0x15] = (Orig.net & 0xff00) >> 8;
     buffer[0x16] = (Dest.net & 0x00ff);
     buffer[0x17] = (Dest.net & 0xff00) >> 8;
-    buffer[0x18] = 0xfe;
+    buffer[0x18] = (PRODCODE & 0x00ff);
+    buffer[0x19] = (VERSION_MAJOR & 0x00ff);
 
     memset(&str, 0, 8);		/* Packet password	*/
     if (SearchNode(Dest)) {
@@ -149,13 +150,15 @@ FILE *CreatePkt(char *Queue, fidoaddr Orig, fidoaddr Dest, char *Extension)
     }
 
     for (i = 0; i < 8; i++)
-	buffer[0x1a + i] = str[i];
+	buffer[0x1a + i] = toupper(str[i]);	/* FSC-0039 only talks about A-Z, 0-9, so force uppercase */
 
     buffer[0x22] = (Orig.zone & 0x00ff);
     buffer[0x23] = (Orig.zone & 0xff00) >> 8;
     buffer[0x24] = (Dest.zone & 0x00ff);
     buffer[0x25] = (Dest.zone & 0xff00) >> 8;
     buffer[0x29] = 1;
+    buffer[0x2a] = (PRODCODE & 0xff00) >> 8;
+    buffer[0x2b] = (VERSION_MINOR & 0x00ff);
     buffer[0x2c] = 1;
     buffer[0x2e] = buffer[0x22];
     buffer[0x2f] = buffer[0x23];