Commit: 5fe883d4ca3c02d9d0b21a85cfd45b1fcf97b9a2 - zandronum-cluster (hg)

This is a fork of Zandronum used on servers hosted by The Sentinels Playground (TSPG), Euroboros (EB), and Down Under Doomers (DUD).

Commit MetaInfo

• Révision: 5fe883d4ca3c02d9d0b21a85cfd45b1fcf97b9a2 (tree)
• l'heure: 2015-08-21 01:50:12
• Auteur: Teemu Piippo <crimsondusk64@gmai...>
• Commiter: Teemu Piippo

Message de Log

Remove the legacy interface. Updated RCON utility for what it's worth.

Change Summary

• modified: masterserver/network.cpp
• modified: masterserver/network.h
• modified: rcon_utility/main.cpp
• modified: src/network.cpp
• modified: src/network.h
• modified: src/networkshared.cpp
• modified: src/networkshared.h

Modification

diff -r 22900c0cec22 -r 5fe883d4ca3c masterserver/network.cpp
--- a/masterserver/network.cpp	Thu Aug 20 19:31:53 2015 +0300
+++ b/masterserver/network.cpp	Thu Aug 20 19:50:12 2015 +0300
@@ -339,35 +339,6 @@
 
 //*****************************************************************************
 //
-char *NETWORK_AddressToString( NETADDRESS_s Address )
-{
-	static char	s_szAddress[64];
-
-	sprintf( s_szAddress, "%i.%i.%i.%i:%i", Address.abIP[0], Address.abIP[1], Address.abIP[2], Address.abIP[3], ntohs( Address.usPort ));
-
-	return ( s_szAddress );
-}
-
-//*****************************************************************************
-//
-char *NETWORK_AddressToStringIgnorePort( NETADDRESS_s Address )
-{
-	static char	s_szAddress[64];
-
-	sprintf( s_szAddress, "%i.%i.%i.%i", Address.abIP[0], Address.abIP[1], Address.abIP[2], Address.abIP[3] );
-
-	return ( s_szAddress );
-}
-
-//*****************************************************************************
-//
-void NETWORK_SetAddressPort( NETADDRESS_s &Address, USHORT usPort )
-{
-	Address.usPort = htons( usPort );
-}
-
-//*****************************************************************************
-//
 NETADDRESS_s NETWORK_GetLocalAddress( void )
 {
 	char				szBuffer[512];

diff -r 22900c0cec22 -r 5fe883d4ca3c masterserver/network.h
--- a/masterserver/network.h	Thu Aug 20 19:31:53 2015 +0300
+++ b/masterserver/network.h	Thu Aug 20 19:50:12 2015 +0300
@@ -73,9 +73,6 @@
 int				NETWORK_GetLANPackets( void );
 NETADDRESS_s	NETWORK_GetFromAddress( void );
 void			NETWORK_LaunchPacket( NETBUFFER_s *pBuffer, NETADDRESS_s Address );
-char			*NETWORK_AddressToString( NETADDRESS_s Address );
-char			*NETWORK_AddressToStringIgnorePort( NETADDRESS_s Address );
-void			NETWORK_SetAddressPort( NETADDRESS_s &Address, USHORT usPort );
 //AActor			*NETWORK_FindThingByNetID( LONG lID );
 NETADDRESS_s	NETWORK_GetLocalAddress( void );
 NETBUFFER_s		*NETWORK_GetNetworkMessageBuffer( void );

diff -r 22900c0cec22 -r 5fe883d4ca3c rcon_utility/main.cpp
--- a/rcon_utility/main.cpp	Thu Aug 20 19:31:53 2015 +0300
+++ b/rcon_utility/main.cpp	Thu Aug 20 19:50:12 2015 +0300
@@ -467,7 +467,7 @@
 
 				// Read in what the user gave us.
 				GetDlgItemText( hDlg, IDC_SERVERIP, szBuffer, 128 );
-				NETADDRESS_s::FromString( szBuffer, g_ServerAddress );
+				g_ServerAddress = NETADDRESS_s::FromString( szBuffer );
 				GetDlgItemText( hDlg, IDC_PASSWORD, g_szPassword, 128 );
 
 				// If the user didn't specify a port, use the default one.
@@ -582,7 +582,7 @@
 	SetDlgItemText( g_hDlg, IDC_PASSWORD, g_Favorites[iIndex].szPassword );
 
 	// Connect.
-	NETADDRESS_s::FromString( g_Favorites[iIndex].szAddress, g_ServerAddress );
+	g_ServerAddress = NETADDRESS_s::FromString( g_Favorites[iIndex].szAddress );
 	strncpy( g_szPassword, g_Favorites[iIndex].szPassword, 127 );
 	main_AttemptConnection( );
 }

diff -r 22900c0cec22 -r 5fe883d4ca3c src/network.cpp
--- a/src/network.cpp	Thu Aug 20 19:31:53 2015 +0300
+++ b/src/network.cpp	Thu Aug 20 19:50:12 2015 +0300
@@ -773,27 +773,6 @@
 
 //*****************************************************************************
 //
-const char *NETWORK_AddressToString( NETADDRESS_s Address )
-{
-	return Address.ToString();
-}
-
-//*****************************************************************************
-//
-const char *NETWORK_AddressToStringIgnorePort( NETADDRESS_s Address )
-{
-	return Address.ToStringNoPort();
-}
-
-//*****************************************************************************
-//
-void NETWORK_SetAddressPort( NETADDRESS_s &Address, USHORT usPort )
-{
-	Address.SetPort( usPort );
-}
-
-//*****************************************************************************
-//
 NETADDRESS_s NETWORK_GetLocalAddress( void )
 {
 	char				szBuffer[512];

diff -r 22900c0cec22 -r 5fe883d4ca3c src/network.h
--- a/src/network.h	Thu Aug 20 19:31:53 2015 +0300
+++ b/src/network.h	Thu Aug 20 19:50:12 2015 +0300
@@ -344,9 +344,6 @@
 int				NETWORK_GetLANPackets( void );
 NETADDRESS_s	NETWORK_GetFromAddress( void );
 void			NETWORK_LaunchPacket( NETBUFFER_s *pBuffer, NETADDRESS_s Address );
-const char		*NETWORK_AddressToString( NETADDRESS_s Address );
-const char		*NETWORK_AddressToStringIgnorePort( NETADDRESS_s Address );
-void			NETWORK_SetAddressPort( NETADDRESS_s &Address, USHORT usPort );
 NETADDRESS_s	NETWORK_GetLocalAddress( void );
 NETADDRESS_s	NETWORK_GetCachedLocalAddress( void );
 NETBUFFER_s		*NETWORK_GetNetworkMessageBuffer( void );

diff -r 22900c0cec22 -r 5fe883d4ca3c src/networkshared.cpp
--- a/src/networkshared.cpp	Thu Aug 20 19:31:53 2015 +0300
+++ b/src/networkshared.cpp	Thu Aug 20 19:50:12 2015 +0300
@@ -511,34 +511,6 @@
 
 //*****************************************************************************
 //
-bool NETWORK_CompareAddress( NETADDRESS_s Address1, NETADDRESS_s Address2, bool bIgnorePort )
-{
-	return Address1.Compare( Address2, bIgnorePort );
-}
-
-//*****************************************************************************
-//
-bool NETWORK_StringToAddress( const char *s, NETADDRESS_s *a )
-{
-	return a->LoadFromString( s );
-}
-
-//*****************************************************************************
-//
-void NETWORK_SocketAddressToNetAddress( struct sockaddr_in *s, NETADDRESS_s *a )
-{
-    *a = NETADDRESS_s::FromSocketAddress( *s );
-}
-
-//*****************************************************************************
-//
-void NETWORK_NetAddressToSocketAddress( NETADDRESS_s &Address, struct sockaddr_in &SocketAddress )
-{
-	SocketAddress = Address.ToSocketAddress();
-}
-
-//*****************************************************************************
-//
 bool NETWORK_StringToIP( const char *pszAddress, char *pszIP0, char *pszIP1, char *pszIP2, char *pszIP3 )
 {
 	char	szCopy[16];
@@ -630,20 +602,6 @@
     return ( true );
 }
 
-//*****************************************************************************
-//
-void NETWORK_AddressToIPStringArray( const NETADDRESS_s &Address, IPStringArray &szAddress )
-{
-	Address.ToIPStringArray( szAddress );
-}
-
-//*****************************************************************************
-//
-const char *NETWORK_GetHostByIPAddress( NETADDRESS_s Address )
-{
-	return Address.ToHostName();
-}
-
 //--------------------------------------------------------------------------------------------------------------------------------------------------
 //-- CLASSES ---------------------------------------------------------------------------------------------------------------------------------------
 //--------------------------------------------------------------------------------------------------------------------------------------------------

diff -r 22900c0cec22 -r 5fe883d4ca3c src/networkshared.h
--- a/src/networkshared.h	Thu Aug 20 19:31:53 2015 +0300
+++ b/src/networkshared.h	Thu Aug 20 19:50:12 2015 +0300
@@ -295,13 +295,7 @@
 void			NETWORK_WriteString( BYTESTREAM_s *pByteStream, const char *pszString );
 
 void			NETWORK_WriteHeader( BYTESTREAM_s *pByteStream, int Byte );
-bool			NETWORK_CompareAddress( NETADDRESS_s Address1, NETADDRESS_s Address2, bool bIgnorePort );
-bool			NETWORK_StringToAddress( const char *pszString, NETADDRESS_s *pAddress );
-void			NETWORK_SocketAddressToNetAddress( struct sockaddr_in *s, NETADDRESS_s *a );
-void			NETWORK_NetAddressToSocketAddress( NETADDRESS_s &Address, struct sockaddr_in &SocketAddress );
 bool			NETWORK_StringToIP( const char *pszAddress, char *pszIP0, char *pszIP1, char *pszIP2, char *pszIP3 );
-void			NETWORK_AddressToIPStringArray( const NETADDRESS_s &Address, IPStringArray &szAddress );
-const char		*NETWORK_GetHostByIPAddress( NETADDRESS_s Address );
 
 //--------------------------------------------------------------------------------------------------------------------------------------------------
 //-- CLASSES ---------------------------------------------------------------------------------------------------------------------------------------