[twilight-commits] r11251 - in trunk/dpmaster: . doc src

molivier at icculus.org molivier at icculus.org
Sat Jul 23 08:29:31 EDT 2011


Author: molivier
Date: 2011-07-23 08:29:31 -0400 (Sat, 23 Jul 2011)
New Revision: 11251

Modified:
   trunk/dpmaster/changelog.txt
   trunk/dpmaster/doc/manual.txt
   trunk/dpmaster/doc/techinfo.txt
   trunk/dpmaster/readme.txt
   trunk/dpmaster/src/dpmaster.c
Log:
I can no longer officially support Mac OS X since the release of version 10.7 (Lion) makes my mac system (10.5 - Leopard) obsolete. Minor editings in the documentation. Bumped version to 2.2

Modified: trunk/dpmaster/changelog.txt
===================================================================
--- trunk/dpmaster/changelog.txt	2011-07-23 06:08:50 UTC (rev 11250)
+++ trunk/dpmaster/changelog.txt	2011-07-23 12:29:31 UTC (rev 11251)
@@ -6,7 +6,7 @@
                                 ---------------
 
 
-* Version 2.2-dev:
+* Version 2.2:
   - Flood protection against abusive clients, by Timothee Besset
   - New system for managing game properties (see GAME PROPERTIES in manual.txt)
   - Support for RtCW and WoET, using the game properties

Modified: trunk/dpmaster/doc/manual.txt
===================================================================
--- trunk/dpmaster/doc/manual.txt	2011-07-23 06:08:50 UTC (rev 11250)
+++ trunk/dpmaster/doc/manual.txt	2011-07-23 12:29:31 UTC (rev 11251)
@@ -111,7 +111,7 @@
 5) GAME POLICY:
 
 If you run an instance of dpmaster, I strongly encourage you to let it open to
-any game or player. Dpmaster has been developed for this particular usage and is
+any game. Dpmaster has been developed for this particular usage and is
 well-suited for it.
 
 That said, if you want to restrict which games are allowed on your master, you
@@ -156,18 +156,18 @@
 
 Unfortunately, formerly closed-source games don't always send this information,
 or another information that allows dpmaster to guess the game name safely.
-That's why I call them "anonymous games" here. Up to version 2.1, the only
-anonymous game dpmaster supported was Q3A, so it was easy: if the game didn't
-send its name, it was Q3A. But starting from version 2.2, dpmaster also supports
-2 other anonymous games: RtCW and WoET. That's why a new mechanism had to be
-created to allow dpmaster to figure out which game sends it which message. This
-mechanism is called "game properties".
+That's why they are called "anonymous games" here. Up to version 2.1 included,
+the only anonymous game dpmaster supported was Q3A, so it was easy: if the game
+didn't send its name, it was Q3A. But now dpmaster also supports 2 other
+anonymous games: RtCW and WoET. That's why a new mechanism had to be created to
+allow dpmaster to figure out which game sends it which message. This mechanism
+is called "game properties".
 
 Game properties are controlled by the command line option "--game-properties"
 (short option: "-g"). A number of properties are built into dpmaster, so you
 shouldn't have to configure anything for a standard usage. You can make it print
 its current list of game properties by using the command line option without any
-parameter. Here's the current output you get at the time I write those lines:
+parameter. Here's the output you currently get:
 
         Game properties:
         * et:
@@ -199,10 +199,9 @@
 Protocol numbers are used to figure out the game name when clients don't send it
 with their "getservers" requests, and unfortunately this is the case for all the
 anonymous games currently supported. If the protocol declared by the client
-doesn't match any of the registered protocol numbers, dpmaster will use the
-first server of an anonymous game it will find, that uses this very protocol
-number, as the reference for the name. In other words, it will handle the query
-as if it has declared the same game name as this server.
+doesn't match any of the registered protocol numbers, dpmaster will search its
+server list for an anonymous game that uses the same protocol number. It will
+then use this server's game name as the request's game name.
 
 Options allows you to specify non-standard behaviours for a game. For example,
 the WoET's clients expect the master server to send them the complete list of

Modified: trunk/dpmaster/doc/techinfo.txt
===================================================================
--- trunk/dpmaster/doc/techinfo.txt	2011-07-23 06:08:50 UTC (rev 11250)
+++ trunk/dpmaster/doc/techinfo.txt	2011-07-23 12:29:31 UTC (rev 11251)
@@ -269,7 +269,8 @@
             get empty or full servers (except for WoET, which always expect a
             list of all servers). A client using the DP protocol also has to
             specify its game name, right before the protocol number. Anonymous
-            games such as Q3A or RtCW don't, obviously.
+            games such as Q3A or RtCW don't, obviously. Game names must not
+            contain whitespace characters.
 
             Starting from dpmaster version 2.0, you may also add in the option
             list at most one gametype filter "gametype=X", where X is the
@@ -337,7 +338,8 @@
             As you can see in this sample, since the game name is mandatory in
             an extended query, you'll have to use the game name "Quake3Arena"
             explicitly if you want to ask for Q3A servers. Likewise, you'll have
-            to specify "wolfmp" for RtCW servers, and "et" for WoET servers.
+            to specify "wolfmp" for RtCW servers, and "et" for WoET servers. As
+            usual, game names must not contain whitespace characters.
 
     7) getserversExtResponse:
 

Modified: trunk/dpmaster/readme.txt
===================================================================
--- trunk/dpmaster/readme.txt	2011-07-23 06:08:50 UTC (rev 11250)
+++ trunk/dpmaster/readme.txt	2011-07-23 12:29:31 UTC (rev 11251)
@@ -36,12 +36,13 @@
 if you can't have your own.
 
 Although dpmaster is being primarily developed on a Linux PC, it is regularly
-compiled and tested on Windows XP, OpenBSD, and Mac OS X. It has also been run
-successfully on FreeBSD, NetBSD and Windows 2000 in the past, but having no
-regular access to any of those systems, I cannot guarantee that it is still the
-case. In particular, building dpmaster on Windows 2000 may require some minor
-source code changes due to the addition of IPv6 support in dpmaster, Windows
-2000 having a limited support for this protocol.
+compiled and tested on Windows XP and OpenBSD, including on non-PC hardware when
+possible. It has also been run successfully on Mac OS X, FreeBSD, NetBSD and
+Windows 2000 in the past, but having no regular access to any of those systems,
+I cannot guarantee that it is still the case. In particular, building dpmaster
+on Windows 2000 may require some minor source code changes due to the addition
+of IPv6 support in dpmaster, Windows 2000 having a limited support for this
+protocol.
 
 Take a look at the "COMPILING DPMASTER" section in "doc/techinfo.txt" for more
 practical information on how to build it.
@@ -70,8 +71,8 @@
 of servers of 16 are equivalent:
 
    * dpmaster -n 16
+   * dpmaster -n16
    * dpmaster --max-servers 16
-   * dpmaster -n16
    * dpmaster --max-servers=16
 
 
@@ -89,7 +90,7 @@
 The most commonly used one is probably "-D" (or "--daemon"), a UNIX-specific
 option to make the program run in the background, as a daemon process.
 
-You can also use the classic verbose option "-v" to make dpmaster print extra
+You can also use the verbose option "-v" to make dpmaster print extra
 information (see "OUTPUT AND VERBOSITY LEVELS" in "doc/manual.txt").
 
 Finally, if you intent to run dpmaster for a long period of time, you may want

Modified: trunk/dpmaster/src/dpmaster.c
===================================================================
--- trunk/dpmaster/src/dpmaster.c	2011-07-23 06:08:50 UTC (rev 11250)
+++ trunk/dpmaster/src/dpmaster.c	2011-07-23 12:29:31 UTC (rev 11251)
@@ -4,7 +4,7 @@
 
 	An open master server
 
-	Copyright (C) 2002-2010  Mathieu Olivier
+	Copyright (C) 2002-2011  Mathieu Olivier
 
 	This program is free software; you can redistribute it and/or modify
 	it under the terms of the GNU General Public License as published by
@@ -34,7 +34,7 @@
 // ---------- Constants ---------- //
 
 // Version of dpmaster
-#define VERSION "2.2-dev"
+#define VERSION "2.2"
 
 
 // ---------- Private variables ---------- //



More information about the twilight-commits mailing list