Update of /cvsroot/netrek/client/netrekxp/src
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv21097/src
Modified Files:
bccnetrek.rc defaults.c getname.c netrek.rc parsemeta.c
socket.c vccnetrek.rc
Log Message:
Add improved reporting on fragmented packet (from COW).
Change name/version to Netrek XP 2010 v1.0.
Add metaBroncoOnly netrekrc option to only list bronco
servers on the metaserver,
Index: bccnetrek.rc
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/bccnetrek.rc,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- bccnetrek.rc 15 Mar 2009 12:31:26 -0000 1.10
+++ bccnetrek.rc 6 Jun 2009 03:29:08 -0000 1.11
@@ -1,20 +1,20 @@
#include "resource.h"
1 VERSIONINFO
-FILEVERSION 1, 1, 0, 0
-PRODUCTVERSION 1, 1, 0, 0
+FILEVERSION 1, 0, 0, 0
+PRODUCTVERSION 1, 0, 0, 0
FILEOS VOS_DOS_WINDOWS32
FILETYPE VFT_APP
{ BLOCK "StringFileInfo"
{ BLOCK "040904E4"
{
VALUE "CompanyName", "Netrek\000"
- VALUE "FileDescription", "Netrek XP 2009 Client\000"
+ VALUE "FileDescription", "Netrek XP 2010 Client\000"
VALUE "FileVersion", "123456789012345678901234567890\000"
- VALUE "InternalName", "Netrek XP 2009\000"
+ VALUE "InternalName", "Netrek XP 2010\000"
VALUE "LegalCopyright", "Copyright © 1986-2009\000"
VALUE "OriginalFilename", "netrek.rc\000"
- VALUE "ProductName", "Netrek XP 2009 Client\000"
+ VALUE "ProductName", "Netrek XP 2010 Client\000"
VALUE "ProductVersion", "123456789012345678901234567890\000"
}
}
Index: vccnetrek.rc
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/vccnetrek.rc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- vccnetrek.rc 15 Mar 2009 12:31:26 -0000 1.8
+++ vccnetrek.rc 6 Jun 2009 03:29:08 -0000 1.9
@@ -3,18 +3,18 @@
MAIN ICON DISCARDABLE "main.ico"
1 VERSIONINFO
-FILEVERSION 1, 1, 0, 0
-PRODUCTVERSION 1, 1, 0, 0
+FILEVERSION 1, 0, 0, 0
+PRODUCTVERSION 1, 0, 0, 0
{ BLOCK "StringFileInfo"
{ BLOCK "040904E4"
{
VALUE "CompanyName", "Netrek\000"
- VALUE "FileDescription", "Netrek XP 2009 Client\000"
+ VALUE "FileDescription", "Netrek XP 2010 Client\000"
VALUE "FileVersion", "123456789012345678901234567890\000"
- VALUE "InternalName", "Netrek XP 2009\000"
+ VALUE "InternalName", "Netrek XP 2010\000"
VALUE "LegalCopyright", "Copyright © 1986-2009\000"
VALUE "OriginalFilename", "vccnetrek.rc\000"
- VALUE "ProductName", "Netrek XP 2009 Client\000"
+ VALUE "ProductName", "Netrek XP 2010 Client\000"
VALUE "ProductVersion", "123456789012345678901234567890\000"
}
}
Index: getname.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/getname.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- getname.c 19 Apr 2008 16:22:59 -0000 1.12
+++ getname.c 6 Jun 2009 03:29:08 -0000 1.13
@@ -75,7 +75,7 @@
static char *README[] = {
"",
- "Netrek XP 2009 - the better netrek eXPerience!",
+ "Netrek XP 2010 - the better netrek eXPerience!",
"",
"",
"",
Index: netrek.rc
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/netrek.rc,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- netrek.rc 15 Mar 2009 12:31:26 -0000 1.8
+++ netrek.rc 6 Jun 2009 03:29:08 -0000 1.9
@@ -28,8 +28,8 @@
//
VS_VERSION_INFO VERSIONINFO
- FILEVERSION 1,1,0,0
- PRODUCTVERSION 1,1,0,0
+ FILEVERSION 1,0,0,0
+ PRODUCTVERSION 1,0,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x3L
@@ -46,15 +46,15 @@
BEGIN
VALUE "Comments", "\0"
VALUE "CompanyName", "Netrek\0"
- VALUE "FileDescription", "Netrek XP 2009 Client\0"
- VALUE "FileVersion", "1, 3, 0, 0\0"
- VALUE "InternalName", "Netrek XP 2009\0"
+ VALUE "FileDescription", "Netrek XP 2010 Client\0"
+ VALUE "FileVersion", "1, 0, 0, 0\0"
+ VALUE "InternalName", "Netrek XP 2010\0"
VALUE "LegalCopyright", "Copyright © 1986-2009\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "netrek.rc\0"
VALUE "PrivateBuild", "\0"
- VALUE "ProductName", "Netrek XP 2009 Client\0"
- VALUE "ProductVersion", "1, 3, 0, 0\0"
+ VALUE "ProductName", "Netrek XP 2010 Client\0"
+ VALUE "ProductVersion", "1, 0, 0, 0\0"
VALUE "SpecialBuild", "\0"
END
END
Index: parsemeta.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/parsemeta.c,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- parsemeta.c 21 May 2009 00:15:03 -0000 1.49
+++ parsemeta.c 6 Jun 2009 03:29:08 -0000 1.50
@@ -145,7 +145,7 @@
};
int metaStatusLevel = statusNobody;
-
+int metaBroncoOnly = 0;
/* Functions */
extern void terminate (int error);
@@ -447,7 +447,7 @@
token = strtok(NULL,",");
} /* while (token != NULL) */
- metaWindowName = "Netrek XP 2009 Server List";
+ metaWindowName = "Netrek XP 2010 Server List";
return sent;
}
@@ -572,8 +572,8 @@
throwaway++;
- /* ignore paradise servers */
- // if (type == 'P') throwaway++;
+ /* Ignore non-Bronco servers? INL server counts as Bronco... */
+ if (metaBroncoOnly && type != 'B' && type != 'I') throwaway++;
/* if it's to be thrown away, do not add this server, skip to next */
if (throwaway) continue;
@@ -1175,7 +1175,7 @@
}
free (sockbuf);
- metaWindowName = "Netrek XP 2009 Server List";
+ metaWindowName = "Netrek XP 2010 Server List";
return 1;
}
@@ -1299,6 +1299,9 @@
/* whether to report everything that happens */
metaVerbose = booleanDefault("metaVerbose", metaVerbose);
+ /* whether to list only Bronco servers */
+ metaBroncoOnly = booleanDefault("metaBroncoOnly", metaBroncoOnly);
+
/* status cutoff for listing servers */
metaStatusLevel = intDefault ("metaStatusLevel", metaStatusLevel);
Index: socket.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/socket.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- socket.c 4 Jun 2009 02:02:29 -0000 1.69
+++ socket.c 6 Jun 2009 03:29:08 -0000 1.70
@@ -1122,21 +1122,20 @@
if (*bufptr < 1 || *bufptr > NUM_PACKETS
|| handlers[*bufptr].size == 0)
{
-#ifndef CORRUPTED_PACKETS
int i;
-#endif
- LineToConsole ("Unknown packet type: %d\n", *bufptr);
-
-#ifndef CORRUPTED_PACKETS
- LineToConsole ("count: %d, bufptr at %d, Content:\n", count,
- bufptr - buf);
+ LineToConsole ("netrek protocol stream alignment failure, "
+ "next byte %d (0x%02x)\n", *bufptr, *bufptr);
+ LineToConsole ("protocol buffer dump, bytes %d, [bufptr] at %d :\n",
+ count, bufptr - buf);
for (i = 0; i < count; i++)
{
- LineToConsole ("0x%x, ", (unsigned int) buf[i]);
+ if (i == (bufptr - buf))
+ LineToConsole ("[%02x]", (unsigned int) buf[i] & 0xff);
+ else
+ LineToConsole (" %02x ", (unsigned int) buf[i] & 0xff);
}
-#endif
-
+ LineToConsole("\n");
return (0);
}
size = handlers[*bufptr].size;
Index: defaults.c
===================================================================
RCS file: /cvsroot/netrek/client/netrekxp/src/defaults.c,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- defaults.c 23 May 2009 13:23:39 -0000 1.99
+++ defaults.c 6 Jun 2009 03:29:08 -0000 1.100
@@ -314,6 +314,12 @@
},
#endif
#ifdef META
+ {"metaBroncoOnly", &metaBroncoOnly, RC_BOOL,
+ {
+ "Only list Bronco/INL servers on the metaserver",
+ NULL
+ }
+ },
{"metaPort", &metaPort, RC_INT,
{
"Metaserver port",
@@ -1713,7 +1719,7 @@
char *pek;
if (strlen (pigcall) == 0)
- sprintf (pigcall, "Netrek XP 2009 (%s) - the smarter netrek eXPerience!", mvers);
+ sprintf (pigcall, "Netrek XP 2010 (%s) - the smarter netrek eXPerience!", mvers);
timerType = intDefault ("timerType", timerType);
if (timerType < T_NONE || timerType >= T_TOTAL)