[netrek-cvs] metaserver ChangeLog, NONE, 1.1 PROJECTS, 1.1, 1.2 disp_info.c, 1.1, 1.2 scan.c, 1.1, 1.2

[James Cameron]

Update of /cvsroot/netrek/metaserver
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8687

Modified Files:
	PROJECTS disp_info.c scan.c 
Added Files:
	ChangeLog 
Log Message:
merged metaserver.us.netrek.org current code base

Index: scan.c
===================================================================
RCS file: /cvsroot/netrek/metaserver/scan.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scan.c	14 Feb 2006 06:43:11 -0000	1.1
+++ scan.c	14 Feb 2006 07:21:31 -0000	1.2
@@ -1031,6 +1031,13 @@
   srvbuf.player_count = atoi(p);
   if (srvbuf.player_count == 0) srvbuf.status = SS_EMPTY;
 
+  /* anti-spam */
+  if (srvbuf.player_count > 1) {
+    if (!strcmp(srvbuf.hostname, "godfather.mob.net")) srvbuf.player_count = 1;
+    if (!strcmp(srvbuf.hostname, "netrek.kilohm.net")) srvbuf.player_count = 1;
+    if (!strcmp(srvbuf.hostname, "203.200.79.130")) return;
+  }
+
   /* number of free slots */
   p = strtok(NULL, "\n");
   if (p == NULL) goto truncated;

Index: disp_info.c
===================================================================
RCS file: /cvsroot/netrek/metaserver/disp_info.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- disp_info.c	14 Feb 2006 06:43:11 -0000	1.1
+++ disp_info.c	14 Feb 2006 07:21:31 -0000	1.2
@@ -13,6 +13,7 @@
 #include <errno.h>
 #include "meta.h"
 
+static int send_info(int idx, char *file);
 
 /*
  * display the info file

Index: PROJECTS
===================================================================
RCS file: /cvsroot/netrek/metaserver/PROJECTS,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- PROJECTS	14 Feb 2006 06:43:11 -0000	1.1
+++ PROJECTS	14 Feb 2006 07:21:31 -0000	1.2
@@ -1,6 +1,6 @@
 List of things to be done.
 
-- port 1080 web display is blank for most browsers unless they are a long
-way from the metaserver.  [rec.games.netrek, "Server List", May 1999]
-[fixed by forking off a different process to handle web requests -c.v]
+- add a blacklist of servers that are either not to be listed, or
+where the player count provided should be ignored or minimised.
 
+- implement server keys for public listing.

--- NEW FILE: ChangeLog ---
Tue Feb 14 18:18:10 2006  James Cameron  <quozl at us.netrek.org>

	* disp_info.c: add forward declaration to fix compiler error.

Tue Feb 14 18:07:08 2006  James Cameron  <quozl at us.netrek.org>

	* scan.c (uread): block godfather.mob.net, netrek.kilohm.net and
	203.200.79.130 due to misreporting player count.