Migrate 3 network rate server cvars

Also make negative rate limit behave the same as 0 (i.e. unlimited)

Author: slipher

src/engine/server/server.h

@@ -306,14 +306,14 @@ extern cvar_t         *sv_killserver;
 extern cvar_t         *sv_mapname;
 extern cvar_t         *sv_mapChecksum;
 extern cvar_t         *sv_serverid;
-extern cvar_t         *sv_maxRate;
+extern Cvar::Cvar<int> sv_maxRate;
 
-extern cvar_t *sv_lanForceRate;
+extern Cvar::Cvar<bool> sv_lanForceRate;
 
 extern cvar_t *sv_showAverageBPS; // NERVE - SMF - net debugging
 
 // TTimo - autodl
-extern cvar_t *sv_dl_maxRate;
+extern Cvar::Cvar<int> sv_dl_maxRate;
 
 //fretn
 extern cvar_t *sv_fullmsg;

src/engine/server/sv_client.cpp

@@ -907,13 +907,13 @@ void SV_WriteDownloadToClient( client_t *cl, msg_t *msg )
 	// show_bug.cgi?id=509
 	// for autodownload, we use a separate max rate value
 	// we do this every time because the client might change its rate during the download
-	if ( sv_dl_maxRate->integer < rate )
+	if ( sv_dl_maxRate.Get() < rate )
 	{
-		rate = sv_dl_maxRate->integer;
+		rate = sv_dl_maxRate.Get();
 
 		if ( bTellRate )
 		{
-			Log::Notice( "'%s' downloading at sv_dl_maxrate (%d)", cl->name, sv_dl_maxRate->integer );
+			Log::Notice( "'%s' downloading at sv_dl_maxrate (%d)", cl->name, sv_dl_maxRate.Get() );
 		}
 	}
 	else if ( bTellRate )
@@ -1025,7 +1025,7 @@ void SV_UserinfoChanged( client_t *cl )
 	// Internet server, assume that they don't need a rate choke
 	if ( Sys_IsLANAddress( cl->netchan.remoteAddress )
 		&& sv_networkScope.Get() <= 1
-		&& sv_lanForceRate->integer == 1 )
+		&& sv_lanForceRate.Get() )
 	{
 		cl->rate = NETWORK_LAN_RATE; // lans should not rate limit (though sv_maxRate still applies?)
 	}

src/engine/server/sv_init.cpp

@@ -607,7 +607,6 @@ void SV_Init()
 	// serverinfo vars
 	sv_mapname = Cvar_Get( "mapname", "nomap", CVAR_SERVERINFO | CVAR_ROM );
 	Cvar::Latch( sv_maxClients );
-	sv_maxRate = Cvar_Get( "sv_maxRate", "0",  CVAR_SERVERINFO );
 	Cvar::SetValue( "layout", "" ); // TODO: declare in sgame
 	Cvar::AddFlags( "layout", Cvar::SERVERINFO );
 
@@ -619,13 +618,8 @@ void SV_Init()
 
 	sv_killserver = Cvar_Get( "sv_killserver", "0", 0 );
 
-	sv_lanForceRate = Cvar_Get( "sv_lanForceRate", "1", 0 );
-
 	sv_showAverageBPS = Cvar_Get( "sv_showAverageBPS", "0", 0 );  // NERVE - SMF - net debugging
 
-	// the download netcode tops at 18/20 kb/s, no need to make you think you can go above
-	sv_dl_maxRate = Cvar_Get( "sv_dl_maxRate", "42000", 0 );
-
 	// fretn - note: redirecting of clients to other servers relies on this,
 	// ET://someserver.com
 	sv_fullmsg = Cvar_Get( "sv_fullmsg", "Server is full.", 0 );

src/engine/server/sv_main.cpp

@@ -74,11 +74,11 @@ Cvar::Cvar<int> sv_padPackets("sv_padPackets", "(debugging) add n NOP bytes to e
 cvar_t         *sv_killserver; // menu system can set to 1 to shut server down
 cvar_t         *sv_mapname;
 cvar_t         *sv_serverid;
-cvar_t         *sv_maxRate;
+Cvar::Cvar<int> sv_maxRate("sv_maxRate", "max bytes/sec to send to a client (0 = unlimited)", Cvar::SERVERINFO, 0);
 
-cvar_t         *sv_lanForceRate; // TTimo - dedicated 1 (LAN) server forces local client rates to 99999 (bug #491)
+Cvar::Cvar<bool> sv_lanForceRate("sv_lanForceRate", "make LAN clients use max network rate", Cvar::NONE, true);
 
-cvar_t         *sv_dl_maxRate;
+Cvar::Cvar<int> sv_dl_maxRate("sv_dl_maxRate", "max bytes/sec for UDP pak download", Cvar::NONE, 42000);
 
 cvar_t *sv_showAverageBPS; // NERVE - SMF - net debugging
 

src/engine/server/sv_snapshot.cpp

@@ -780,29 +780,27 @@ static int SV_RateMsec( client_t *client, int messageSize )
 	}
 
 	// low watermark for sv_maxRate, never 0 < sv_maxRate < 1000 (0 is no limitation)
-	if ( sv_maxRate->integer && sv_maxRate->integer < NETWORK_MIN_RATE )
+	if ( sv_maxRate.Get() > 0 && sv_maxRate.Get() < NETWORK_MIN_RATE )
 	{
-		Cvar_Set( "sv_MaxRate", XSTRING(NETWORK_MIN_RATE) );
+		Log::Warn( "sv_maxRate too low, increasing to %d", NETWORK_MIN_RATE );
+		sv_maxRate.Set( NETWORK_MIN_RATE );
 	}
 
 	rate = client->rate;
 
 	// work on the appropriate max rate (client or download)
 	if ( !*client->downloadName )
 	{
-		maxRate = sv_maxRate->integer;
+		maxRate = sv_maxRate.Get();
 	}
 	else
 	{
-		maxRate = sv_dl_maxRate->integer;
+		maxRate = sv_dl_maxRate.Get();
 	}
 
-	if ( maxRate )
+	if ( maxRate > 0 )
 	{
-		if ( maxRate < rate )
-		{
-			rate = maxRate;
-		}
+		rate = std::min( rate, maxRate );
 	}
 
 	rateMsec = ( messageSize + HEADER_RATE_BYTES ) * 1000 / rate;
@@ -835,7 +833,7 @@ void SV_SendMessageToClient( msg_t *msg, client_t *client )
 	// TTimo - show_bug.cgi?id=491
 	// added sv_lanForceRate check
 	if ( client->netchan.remoteAddress.type == netadrtype_t::NA_LOOPBACK ||
-	     ( sv_lanForceRate->integer && Sys_IsLANAddress( client->netchan.remoteAddress ) ) )
+	     ( sv_lanForceRate.Get() && Sys_IsLANAddress( client->netchan.remoteAddress ) ) )
 	{
 		client->nextSnapshotTime = svs.time - 1;
 		return;