cgame ABI: give all server info, not just selected fields

When the cgame calls trap_LAN_GetServerInfo, pass it the server's entire
info string, not just some hard-coded fields. That way we can start
using new fields in the server browser without an engine change.

Also separate info about the server which does not come from the
infostring into a trustedServerInfo_t struct, instead of mixing it into
the info string.

Author: slipher

src/engine/client/cg_api.h

@@ -26,6 +26,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #include "engine/qcommon/q_shared.h"
 
+#define MAX_FEATLABEL_CHARS 32
+
 #define CMD_BACKUP               64
 #define CMD_MASK                 ( CMD_BACKUP - 1 )
 // allow a lot of command backups for very fast systems
@@ -87,6 +89,15 @@ enum class serverResponseProtocol_t : uint8_t
 	IP6,
 };
 
+// "Trusted" as in we know it is correct and present, as opposed to the server's info string
+// which is self-reported data whose fields may be missing, false or not of the right format
+struct trustedServerInfo_t
+{
+	serverResponseProtocol_t responseProto;
+	char addr[ MAX_ADDR_CHARS ];
+	char featuredLabel[ MAX_FEATLABEL_CHARS ];
+};
+
 using markMsgInput_t = std::pair<
 	std::vector<std::array<float, 3>>, // points
 	std::array<float, 3> // projection

src/engine/client/cg_msgdef.h

@@ -434,8 +434,8 @@ namespace LAN {
 		IPC::Reply<int>
 	>;
 	using GetServerInfoMsg = IPC::SyncMessage<
-		IPC::Message<IPC::Id<VM::QVM, CG_LAN_GETSERVERINFO>, int, int, int>,
-		IPC::Reply<std::string>
+		IPC::Message<IPC::Id<VM::QVM, CG_LAN_GETSERVERINFO>, int, int>,
+		IPC::Reply<trustedServerInfo_t, std::string>
 	>;
 	using GetServerPingMsg = IPC::SyncMessage<
 		IPC::Message<IPC::Id<VM::QVM, CG_LAN_GETSERVERPING>, int, int>,

src/engine/client/cl_cgame.cpp

@@ -395,13 +395,10 @@ static int LAN_GetServerCount( int source )
  * LAN_GetServerInfo
  * ====================
  */
-static void LAN_GetServerInfo( int source, int n, char *buf, int buflen )
+static void LAN_GetServerInfo( int source, int n, trustedServerInfo_t &trustedInfo, std::string &info )
 {
-	char         info[ MAX_STRING_CHARS ];
 	serverInfo_t *server = nullptr;
 
-	info[ 0 ] = '\0';
-
 	switch ( source )
 	{
 		case AS_LOCAL:
@@ -421,32 +418,17 @@ static void LAN_GetServerInfo( int source, int n, char *buf, int buflen )
 			break;
 	}
 
-	if ( server && buf )
+	if ( server )
 	{
-		buf[ 0 ] = '\0';
-		Info_SetValueForKey( info, "hostname", server->hostName, false );
-		Info_SetValueForKey( info, "serverload", va( "%i", server->load ), false );
-		Info_SetValueForKey( info, "mapname", server->mapName, false );
-		Info_SetValueForKey( info, "label", server->label, false );
-		Info_SetValueForKey( info, "clients", va( "%i", server->clients ), false );
-		Info_SetValueForKey( info, "bots", va( "%i", server->bots ), false );
-		Info_SetValueForKey( info, "sv_maxclients", va( "%i", server->maxClients ), false );
-		Info_SetValueForKey( info, "ping", va( "%i", server->ping ), false );
-		Info_SetValueForKey( info, "minping", va( "%i", server->minPing ), false );
-		Info_SetValueForKey( info, "maxping", va( "%i", server->maxPing ), false );
-		Info_SetValueForKey( info, "game", server->game, false );
-		Info_SetValueForKey( info, "nettype", Util::enum_str( server->responseProto ), false );
-		Info_SetValueForKey( info, "addr", Net::AddressToString( server->adr, true ).c_str(), false );
-		Info_SetValueForKey( info, "needpass", va( "%i", server->needpass ), false );   // NERVE - SMF
-		Info_SetValueForKey( info, "gamename", server->gameName, false );  // Arnout
-		Q_strncpyz( buf, info, buflen );
+		trustedInfo.responseProto = server->responseProto;
+		Q_strncpyz( trustedInfo.addr, Net::AddressToString( server->adr, true ).c_str(), sizeof( trustedInfo.addr ) );
+		Q_strncpyz( trustedInfo.featuredLabel, server->label, sizeof( trustedInfo.featuredLabel ) );
+		info = server->infoString;
 	}
 	else
 	{
-		if ( buf )
-		{
-			buf[ 0 ] = '\0';
-		}
+		trustedInfo = {};
+		info.clear();
 	}
 }
 
@@ -1419,11 +1401,8 @@ void CGameVM::QVMSyscall(int syscallNum, Util::Reader& reader, IPC::Channel& cha
 			break;
 
 		case CG_LAN_GETSERVERINFO:
-			IPC::HandleMsg<LAN::GetServerInfoMsg>(channel, std::move(reader), [this] (int source, int n, int len, std::string& info) {
-				std::unique_ptr<char[]> buffer(new char[len]);
-				buffer[0] = '\0';
-				LAN_GetServerInfo(source, n, buffer.get(), len);
-				info.assign(buffer.get());
+			IPC::HandleMsg<LAN::GetServerInfoMsg>(channel, std::move(reader), [this] (int source, int n, trustedServerInfo_t& trustedInfo, std::string& info) {
+				LAN_GetServerInfo(source, n, trustedInfo, info);
 			});
 			break;
 

src/engine/client/cl_serverlist.cpp

@@ -82,17 +82,10 @@ CL_InitServerInfo
 static void CL_InitServerInfo( serverInfo_t *server, netadr_t *address )
 {
 	server->adr = *address;
-	server->clients = 0;
-	server->hostName[ 0 ] = '\0';
-	server->mapName[ 0 ] = '\0';
 	server->label[ 0 ] = '\0';
-	server->maxClients = 0;
-	server->maxPing = 0;
-	server->minPing = 0;
 	server->pingStatus = pingStatus_t::WAITING;
 	server->pingAttempts = 0;
 	server->ping = -1;
-	server->game[ 0 ] = '\0';
 	server->responseProto = serverResponseProtocol_t::UNKNOWN;
 }
 
@@ -492,17 +485,7 @@ static void CL_SetServerInfo(
 {
 	if ( info )
 	{
-		server->clients = atoi( Info_ValueForKey( info, "clients" ) );
-		server->bots = atoi( Info_ValueForKey( info, "bots" ) );
-		Q_strncpyz( server->hostName, Info_ValueForKey( info, "hostname" ), MAX_NAME_LENGTH );
-		server->load = atoi( Info_ValueForKey( info, "serverload" ) );
-		Q_strncpyz( server->mapName, Info_ValueForKey( info, "mapname" ), MAX_NAME_LENGTH );
-		server->maxClients = atoi( Info_ValueForKey( info, "sv_maxclients" ) );
-		Q_strncpyz( server->game, Info_ValueForKey( info, "game" ), MAX_NAME_LENGTH );
-		server->minPing = atoi( Info_ValueForKey( info, "minping" ) );
-		server->maxPing = atoi( Info_ValueForKey( info, "maxping" ) );
-		server->needpass = atoi( Info_ValueForKey( info, "g_needpass" ) );   // NERVE - SMF
-		Q_strncpyz( server->gameName, Info_ValueForKey( info, "gamename" ), MAX_NAME_LENGTH );   // Arnout
+		server->infoString = info;
 	}
 
 	server->responseProto = proto;
@@ -640,20 +623,11 @@ void CL_ServerInfoPacket( const netadr_t& from, msg_t *msg )
 	// add this to the list
 	cls.numlocalservers = i + 1;
 	cls.localServers[ i ].adr = from;
-	cls.localServers[ i ].clients = 0;
-	cls.localServers[ i ].hostName[ 0 ] = '\0';
-	cls.localServers[ i ].load = -1;
-	cls.localServers[ i ].mapName[ 0 ] = '\0';
-	cls.localServers[ i ].maxClients = 0;
-	cls.localServers[ i ].maxPing = 0;
-	cls.localServers[ i ].minPing = 0;
 	cls.localServers[ i ].ping = -1;
 	cls.localServers[ i ].pingStatus = pingStatus_t::WAITING;
 	cls.localServers[ i ].pingAttempts = 0;
-	cls.localServers[ i ].game[ 0 ] = '\0';
 	cls.localServers[ i ].responseProto = serverResponseProtocol_t::UNKNOWN;
-	cls.localServers[ i ].needpass = 0;
-	cls.localServers[ i ].gameName[ 0 ] = '\0'; // Arnout
+	cls.localServers[ i ].infoString.clear();
 
 	Q_strncpyz( info, MSG_ReadString( msg ), MAX_INFO_STRING );
 

src/engine/client/client.h

@@ -250,27 +250,16 @@ enum class pingStatus_t
 	TIMEOUT,
 };
 
-#define MAX_FEATLABEL_CHARS 32
 struct serverInfo_t
 {
 	netadr_t adr;
-	char     hostName[ MAX_NAME_LENGTH ];
-	int      load;
-	char     mapName[ MAX_NAME_LENGTH ];
-	char     game[ MAX_NAME_LENGTH ];
 	char     label[ MAX_FEATLABEL_CHARS ]; // for featured servers, nullptr otherwise
 	serverResponseProtocol_t responseProto;
-	int      clients;
-	int      bots;
-	int      maxClients;
-	int      minPing;
-	int      maxPing;
 	pingStatus_t pingStatus;
 	int      ping;
 	int      pingAttempts;
 	bool visible;
-	int      needpass;
-	char     gameName[ MAX_NAME_LENGTH ]; // Arnout
+	std::string infoString;
 };
 
 struct clientStatic_t

src/shared/client/cg_api.cpp

@@ -627,11 +627,9 @@ int trap_LAN_GetServerCount( int source )
 	return count;
 }
 
-void trap_LAN_GetServerInfo( int source, int n, char *buf, int buflen )
+void trap_LAN_GetServerInfo( int source, int n, trustedServerInfo_t &trustedInfo, std::string &info )
 {
-	std::string info;
-	VM::SendMsg<LAN::GetServerInfoMsg>(source, n, buflen, info);
-	Q_strncpyz(buf, info.c_str(), buflen);
+	VM::SendMsg<LAN::GetServerInfoMsg>(source, n, trustedInfo, info);
 }
 
 int trap_LAN_GetServerPing( int source, int n )

src/shared/client/cg_api.h

@@ -124,7 +124,7 @@ void            trap_SetColorGrading( int slot, qhandle_t hShader );
 void            trap_R_ScissorEnable( bool enable );
 void            trap_R_ScissorSet( int x, int y, int w, int h );
 int             trap_LAN_GetServerCount( int source );
-void            trap_LAN_GetServerInfo( int source, int n, char *buf, int buflen );
+void            trap_LAN_GetServerInfo( int source, int n, trustedServerInfo_t &trustedInfo, std::string &info );
 int             trap_LAN_GetServerPing( int source, int n );
 void            trap_LAN_MarkServerVisible( int source, int n, bool visible );
 int             trap_LAN_ServerIsVisible( int source, int n );