add a second master server, motd and gamestat server can be something…

… else
DaemonEngine · Jun 20, 2018 · 6e356a1 · 6e356a1
1 parent 3176f14
commit 6e356a1
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 11 deletions.
diff --git a/src/common/Defs.h b/src/common/Defs.h
@@ -46,7 +46,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 #define GAMENAME_STRING     "unv"
 #define GAMENAME_FOR_MASTER PRODUCT_NAME_UPPER
 
-#define MASTER_SERVER_NAME  "master.unvanquished.net"
+#define MASTER1_SERVER_NAME "master.unvanquished.net"
+#define MASTER2_SERVER_NAME "master2.unvanquished.net"
+#define MOTD_MASTER_SERVER_NAME     MASTER1_SERVER_NAME
+#define GAMESTAT_MASTER_SERVER_NAME MASTER1_SERVER_NAME
 
 #define IRC_SERVER          "irc.freenode.org"
 #define IRC_CHANNEL         "unv-lobby"

diff --git a/src/engine/client/cl_main.cpp b/src/engine/client/cl_main.cpp
@@ -1010,9 +1010,9 @@ void CL_RequestMotd()
 		return;
 	}
 
-	Log::Debug( "Resolving %s", MASTER_SERVER_NAME );
+	Log::Debug( "Resolving %s", MOTD_MASTER_SERVER_NAME );
 
-	switch ( NET_StringToAdr( MASTER_SERVER_NAME, &cls.updateServer,
+	switch ( NET_StringToAdr( MOTD_MASTER_SERVER_NAME, &cls.updateServer,
 	                          netadrtype_t::NA_UNSPEC ) )
 	{
 		case 0:
@@ -1026,7 +1026,7 @@ void CL_RequestMotd()
 			break;
 	}
 
-	Log::Debug( "%s resolved to %s", MASTER_SERVER_NAME,
+	Log::Debug( "%s resolved to %s", MOTD_MASTER_SERVER_NAME,
 	             NET_AdrToStringwPort( cls.updateServer ) );
 
 	info[ 0 ] = 0;

diff --git a/src/engine/server/sv_init.cpp b/src/engine/server/sv_init.cpp
@@ -672,8 +672,8 @@ void SV_Init()
 	Cvar_Get( "sv_nextmap", "", CVAR_TEMP );
 
 	sv_allowDownload = Cvar_Get( "sv_allowDownload", "1", 0 );
-	sv_master[ 0 ] = Cvar_Get( "sv_master1", MASTER_SERVER_NAME, 0 );
-	sv_master[ 1 ] = Cvar_Get( "sv_master2", "", 0 );
+	sv_master[ 0 ] = Cvar_Get( "sv_master1", MASTER1_SERVER_NAME, 0 );
+	sv_master[ 1 ] = Cvar_Get( "sv_master2", MASTER2_SERVER_NAME, 0 );
 	sv_master[ 2 ] = Cvar_Get( "sv_master3", "", 0 );
 	sv_master[ 3 ] = Cvar_Get( "sv_master4", "", 0 );
 	sv_master[ 4 ] = Cvar_Get( "sv_master5", "", 0 );

diff --git a/src/engine/server/sv_main.cpp b/src/engine/server/sv_main.cpp
@@ -484,12 +484,12 @@ void SV_MasterGameStat( const char *data )
 		return; // only dedicated servers send stats
 	}
 
-	Log::Notice( "Resolving %s", MASTER_SERVER_NAME );
+	Log::Notice( "Resolving %s", GAMESTAT_MASTER_SERVER_NAME );
 
-	switch ( NET_StringToAdr( MASTER_SERVER_NAME, &adr, netadrtype_t::NA_UNSPEC ) )
+	switch ( NET_StringToAdr( GAMESTAT_MASTER_SERVER_NAME, &adr, netadrtype_t::NA_UNSPEC ) )
 	{
 		case 0:
-			Log::Warn( "Couldn't resolve master address: %s", MASTER_SERVER_NAME );
+			Log::Warn( "Couldn't resolve master address: %s", GAMESTAT_MASTER_SERVER_NAME );
 			return;
 
 		case 2:
@@ -499,10 +499,10 @@ void SV_MasterGameStat( const char *data )
 			break;
 	}
 
-	Log::Notice( "%s resolved to %s", MASTER_SERVER_NAME,
+	Log::Notice( "%s resolved to %s", GAMESTAT_MASTER_SERVER_NAME,
 	            Net::AddressToString(adr, true) );
 
-	Log::Notice( "Sending gamestat to %s", MASTER_SERVER_NAME );
+	Log::Notice( "Sending gamestat to %s", GAMESTAT_MASTER_SERVER_NAME );
 	Net::OutOfBandPrint( netsrc_t::NS_SERVER, adr, "gamestat %s", data );
 }