Server|libshell: Only include crucial information in a server broadcast

The Beacon advertisement of a server must fit in a UDP packet, so
only include the most important information about it.

doomsday/apps/server/src/serversystem.cpp

@@ -148,7 +148,7 @@ DENG2_PIMPL(ServerSystem)
             if (serverSock && App_World().hasMap())
             {
                 Block msg;
-                de::Writer(msg).withHeader() << ServerApp::currentServerInfo();
+                de::Writer(msg).withHeader() << ServerApp::currentServerInfo().strippedForBroadcast();
                 beacon.setMessage(msg);
             }
         }

doomsday/sdk/libcore/src/net/listensocket.cpp

@@ -14,7 +14,7 @@
  * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser
  * General Public License for more details. You should have received a copy of
  * the GNU Lesser General Public License along with this program; if not, see:
- * http://www.gnu.org/licenses</small> 
+ * http://www.gnu.org/licenses</small>
  */
 
 #include "de/ListenSocket"

doomsday/sdk/libshell/include/de/shell/serverinfo.h

@@ -48,10 +48,10 @@ class LIBSHELL_PUBLIC ServerInfo : public Record
     ServerInfo &operator = (ServerInfo &&moved);
 
     Version version() const;
-    ProtocolVersion protocolVersion() const;
     int compatibilityVersion() const;
 
     Address address() const;
+    duint16 port() const;
     String name() const;
     String description() const;
     String pluginDescription() const;
@@ -66,6 +66,7 @@ class LIBSHELL_PUBLIC ServerInfo : public Record
 
     String asStyledText() const;
     Block asJSON() const;
+    Record strippedForBroadcast() const;
 
     ServerInfo &setCompatibilityVersion(int compatVersion);
     ServerInfo &setAddress(Address const &address);

doomsday/sdk/libshell/src/serverinfo.cpp

@@ -25,39 +25,45 @@
 namespace de {
 namespace shell {
 
-static String const VAR_VERSION                 ("version");
-static String const VAR_PROTOCOL_VERSION        ("proto");
-static String const VAR_COMPATIBILITY_VERSION   ("compat");
+static String const VAR_VERSION                 ("ver");
+static String const VAR_COMPATIBILITY_VERSION   ("cver");
 static String const VAR_HOST                    ("host");
+static String const VAR_PORT                    ("port");
 static String const VAR_NAME                    ("name");
 static String const VAR_DESCRIPTION             ("desc");
 static String const VAR_PLUGIN                  ("plugin");
 static String const VAR_PACKAGES                ("pkgs");
 static String const VAR_GAME_ID                 ("game");
-static String const VAR_GAME_CONFIG             ("conf");
+static String const VAR_GAME_CONFIG             ("cfg");
 static String const VAR_MAP                     ("map");
-static String const VAR_PLAYERS                 ("players");
-static String const VAR_MAX_PLAYERS             ("plmax");
+static String const VAR_PLAYERS                 ("plrs");
+static String const VAR_PLAYER_COUNT            ("pnum");
+static String const VAR_MAX_PLAYERS             ("pmax");
 static String const VAR_FLAGS                   ("flags");
 
 ServerInfo::ServerInfo()
 {
-    set(VAR_VERSION, Version::currentBuild().asText());
-    set(VAR_PROTOCOL_VERSION, DENG2_PROTOCOL_LATEST);
+    set(VAR_VERSION, Version::currentBuild().baseNumber());
     addArray(VAR_PLAYERS);
 }
 
 ServerInfo::ServerInfo(ServerInfo const &other)
     : Record(other)
-{}
+{
+    if (!has(VAR_PLAYERS)) addArray(VAR_PLAYERS);
+}
 
 ServerInfo::ServerInfo(Record const &rec)
     : Record(rec)
-{}
+{
+    if (!has(VAR_PLAYERS)) addArray(VAR_PLAYERS);
+}
 
 ServerInfo::ServerInfo(ServerInfo &&moved)
     : Record(std::move(moved))
-{}
+{
+    if (!has(VAR_PLAYERS)) addArray(VAR_PLAYERS);
+}
 
 ServerInfo &ServerInfo::operator = (ServerInfo const &other)
 {
@@ -76,11 +82,6 @@ Version ServerInfo::version() const
     return Version(gets(VAR_VERSION));
 }
 
-ProtocolVersion ServerInfo::protocolVersion() const
-{
-    return ProtocolVersion(geti(VAR_PROTOCOL_VERSION));
-}
-
 int ServerInfo::compatibilityVersion() const
 {
     return geti(VAR_COMPATIBILITY_VERSION);
@@ -100,9 +101,15 @@ Address ServerInfo::address() const
 ServerInfo &ServerInfo::setAddress(Address const &address)
 {
     set(VAR_HOST, address.asText());
+    set(VAR_PORT, address.port());
     return *this;
 }
 
+duint16 ServerInfo::port() const
+{
+    return duint16(geti(VAR_PORT, shell::DEFAULT_PORT));
+}
+
 String ServerInfo::name() const
 {
     return gets(VAR_NAME);
@@ -191,13 +198,14 @@ StringList ServerInfo::players() const
 
 int ServerInfo::playerCount() const
 {
-    return int(geta(VAR_PLAYERS).size());
+    return geti(VAR_PLAYER_COUNT, 0);
 }
 
 ServerInfo &ServerInfo::addPlayer(String const &playerName)
 {
     ArrayValue &players = member(VAR_PLAYERS).value<ArrayValue>();
     players.add(playerName);
+    set(VAR_PLAYER_COUNT, players.size());
     return *this;
 }
 
@@ -209,6 +217,7 @@ ServerInfo &ServerInfo::removePlayer(String const &playerName)
         if (players.at(i).asText() == playerName)
         {
             players.remove(i);
+            set(VAR_PLAYER_COUNT, players.size());
             break;
         }
     }
@@ -266,6 +275,16 @@ Block ServerInfo::asJSON() const
     return composeJSON(*this);
 }
 
+Record ServerInfo::strippedForBroadcast() const
+{
+    Record stripped(*this);
+    if (stripped.has(VAR_HOST))     stripped.remove(VAR_HOST);     // address in network msg
+    if (stripped.has(VAR_PLUGIN))   stripped.remove(VAR_PLUGIN);   // gameId+version is enough
+    if (stripped.has(VAR_PLAYERS))  stripped.remove(VAR_PLAYERS);  // count is enough
+    if (stripped.has(VAR_PACKAGES)) stripped.remove(VAR_PACKAGES); // queried before connecting
+    return stripped;
+}
+
 ServerInfo &ServerInfo::setFlags(Flags const &flags)
 {
     set(VAR_FLAGS, duint32(flags));