Commit: db61057d8c7976cd979f7b4e5d41aff8288bba75 - zandronum-tspg (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG).

Commit MetaInfo

• Revision: db61057d8c7976cd979f7b4e5d41aff8288bba75 (tree)
• Time: 2008-02-25 00:35:44
• Author: Benjamin Berkels <torr.samaho@quan...>
• Commiter: Benjamin Berkels

Log Message

Fixed: Every LAN broadcast called gethostname() to get the local IP. This could lead to serious lag on servers.

SVN r1214 (trunk)

Change Summary

• modified: docs/Skulltag Version History.txt
• modified: src/network.cpp
• modified: src/sv_master.cpp

Incremental Difference

diff -r 7e48a662b8ea -r db61057d8c79 docs/Skulltag Version History.txt
--- a/docs/Skulltag Version History.txt	Sun Feb 24 10:20:24 2008 +0000
+++ b/docs/Skulltag Version History.txt	Sun Feb 24 15:35:44 2008 +0000
@@ -281,6 +281,7 @@
 -	- Fixed: When trying to refresh the server list in the internal server browser more than once within 10 seconds, you got a "Unknown command from master server: 4" message instead of a proper warning. [Torr Samaho]
 -	- Fixed: When selecting a powered weapon with "weapnext" or "weapprev" the name of the non-powered version of the weapon was displayed (in case cl_showweapnameoncycle is set to true). [Torr Samaho]
 -	- Fixed: Using addbot on a map with no appropriate player starts for the selected game mode leads to a crash. [Torr Samaho]
+-	- Fixed: Every LAN broadcast called gethostname() to get the local IP. This could lead to serious lag on servers. [Torr Samaho]
 !	- Survival co-op is now disabled in hubs. [Carnevil]
 !	- Skulltag's invasion spawners are now defined in skulltag.pk3. [Carnevil]
 !	- Skulltag.wad is now loaded before doom2.wad. This should fix certain texture errors. [Carnevil]

diff -r 7e48a662b8ea -r db61057d8c79 src/network.cpp
--- a/src/network.cpp	Sun Feb 24 10:20:24 2008 +0000
+++ b/src/network.cpp	Sun Feb 24 15:35:44 2008 +0000
@@ -143,6 +143,9 @@
 // Buffer for the Huffman encoding.
 static	UCHAR			g_ucHuffmanBuffer[131072];
 
+// Our local address;
+NETADDRESS_s	g_LocalAddress;
+
 //*****************************************************************************
 //	PROTOTYPES
 
@@ -158,7 +161,6 @@
 	char			szString[128];
 	ULONG			ulArg;
 	USHORT			usNewPort;
-	NETADDRESS_s	LocalAddress;
 	bool			bSuccess;
 
 	// Initialize the Huffman buffer.
@@ -226,12 +228,12 @@
 	NETWORK_ClearBuffer( &g_NetworkMessage );
 
 	// Print out our local IP address.
-	LocalAddress = NETWORK_GetLocalAddress( );
-	Printf( "IP address %s\n", NETWORK_AddressToString( LocalAddress ));
+	g_LocalAddress = NETWORK_GetLocalAddress( );
+	Printf( "IP address %s\n", NETWORK_AddressToString( g_LocalAddress ));
 
 	// If hosting, update the server GUI.
 	if( NETWORK_GetState() == NETSTATE_SERVER )
-		SERVERCONSOLE_UpdateIP( LocalAddress );
+		SERVERCONSOLE_UpdateIP( g_LocalAddress );
 
 	// Call NETWORK_Destruct() when Skulltag closes.
 	atterm( NETWORK_Destruct );

diff -r 7e48a662b8ea -r db61057d8c79 src/sv_master.cpp
--- a/src/sv_master.cpp	Sun Feb 24 10:20:24 2008 +0000
+++ b/src/sv_master.cpp	Sun Feb 24 15:35:44 2008 +0000
@@ -84,6 +84,8 @@
 static	LONG				g_lStoredQueryIPHead;
 static	LONG				g_lStoredQueryIPTail;
 
+extern	NETADDRESS_s		g_LocalAddress;
+
 //*****************************************************************************
 //	FUNCTIONS
 
@@ -206,11 +208,9 @@
 	// Class B contains networks 128.0.0.0 through 191.255.0.0; the network number is in the first two octets.
 	// Class C networks range from 192.0.0.0 through 223.255.255.0, with the network number contained in the first three octets.
 
-
-	NETADDRESS_s LocalAddress = NETWORK_GetLocalAddress( );
 	int classIndex = 0;
 
-	const int locIP0 = LocalAddress.abIP[0];
+	const int locIP0 = g_LocalAddress.abIP[0];
 	if ( (locIP0 >= 1) && (locIP0 <= 127) )
 		classIndex = 1;
 	else if ( (locIP0 >= 128 ) && (locIP0 <= 191) )
@@ -219,7 +219,7 @@
 		classIndex = 3;
 
 	for( int i = 0; i < classIndex; i++ )
-		AddressBroadcast.abIP[i] = LocalAddress.abIP[i];
+		AddressBroadcast.abIP[i] = g_LocalAddress.abIP[i];
 
 	// Broadcast our packet.
 	SERVER_MASTER_SendServerInfo( AddressBroadcast, SQF_ALL, 0, true );