From eb3d051cc7f37388b872d30eae031566d7e575ca Mon Sep 17 00:00:00 2001
From: fanyx <fanyx@posteo.net>
Date: Wed, 26 Jun 2024 12:22:56 +0200
Subject: [PATCH] Try to determine WAN IP via ipify.org

---
 tmserver/GameData/Config/config.xml | 22 +++++++++++-----------
 tmserver/bin/eval_env.sh            |  4 +++-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/tmserver/GameData/Config/config.xml b/tmserver/GameData/Config/config.xml
index 9f656a8..560069e 100644
--- a/tmserver/GameData/Config/config.xml
+++ b/tmserver/GameData/Config/config.xml
@@ -15,13 +15,13 @@
 			<password>User</password>
 		</level>
 	</authorization_levels>
-	
+
  	<masterserver_account>
 		<login>@SERVER_LOGIN@</login>
 		<password>@SERVER_LOGIN_PASSWORD@</password>
 		<validation_key>@VALIDATION_KEY@</validation_key>
 	</masterserver_account>
-	
+
 	<server_options>
 		<name>@SERVER_NAME@</name>
 		<comment>@SERVER_COMMENT@</comment>
@@ -29,17 +29,17 @@
 
 		<max_players>@MAX_PLAYERS@</max_players>
 		<password>@SERVER_PASSWORD@</password>
-		
+
 		<max_spectators>32</max_spectators>
 		<password_spectator></password_spectator>
-		
+
 		<ladder_mode>forced</ladder_mode>				<!-- value between 'inactive', 'forced' (or '0', '1') -->
 		<ladder_serverlimit_min>0</ladder_serverlimit_min>		<!-- Those values will be clamped to the limits authorized on http://official.trackmania.com/tmf-ladderserver/ -->
-		<ladder_serverlimit_max>50000</ladder_serverlimit_max>		
+		<ladder_serverlimit_max>50000</ladder_serverlimit_max>
 
 		<enable_p2p_upload>True</enable_p2p_upload>
 		<enable_p2p_download>True</enable_p2p_download>
-		
+
 		<callvote_timeout>60000</callvote_timeout>
 		<callvote_ratio>0.5</callvote_ratio>				<!-- default ratio. value in [0..1], or -1 to forbid. -->
 		<callvote_ratios>
@@ -56,27 +56,27 @@
 
 		<use_changing_validation_seed>False</use_changing_validation_seed>
 	</server_options>
-	
+
 	<system_config>
 		<connection_uploadrate>512</connection_uploadrate>		<!-- Kbps (kilo bits per second) -->
 		<connection_downloadrate>8192</connection_downloadrate>		<!-- Kbps -->
 
-		<force_ip_address></force_ip_address>
+		<force_ip_address>@FORCE_IP_ADDRESS@</force_ip_address>
 		<server_port>@SERVER_PORT@</server_port>
 		<server_p2p_port>@SERVER_P2P_PORT@</server_p2p_port>
 		<client_port>0</client_port>
 		<bind_ip_address></bind_ip_address>
 		<use_nat_upnp></use_nat_upnp>
-		
+
 		<p2p_cache_size>600</p2p_cache_size>
 
 		<xmlrpc_port>5000</xmlrpc_port>
 		<xmlrpc_allowremote>True</xmlrpc_allowremote>			<!-- If you specify an ip adress here, it'll be the only accepted adress. this will improve security. -->
-		
+
 		<blacklist_url></blacklist_url>
 		<guestlist_filename></guestlist_filename>
 		<blacklist_filename></blacklist_filename>
-		
+
 		<packmask>@PACKMASK@</packmask>
 
 		<allow_spectator_relays>False</allow_spectator_relays>
diff --git a/tmserver/bin/eval_env.sh b/tmserver/bin/eval_env.sh
index 990daaf..907a0ad 100755
--- a/tmserver/bin/eval_env.sh
+++ b/tmserver/bin/eval_env.sh
@@ -18,6 +18,8 @@ SERVER_PORT=${SERVER_PORT:-2350} && config+=( "SERVER_PORT" )
 echo "INFO | SERVER_PORT: ${SERVER_PORT}"
 SERVER_P2P_PORT=${SERVER_P2P_PORT:-3450} && config+=( "SERVER_P2P_PORT" )
 echo "INFO | SERVER_P2P_PORT: ${SERVER_P2P_PORT}"
+FORCE_IP_ADDRESS=${FORCE_IP_ADDRESS:-${curl https://api.ipify.org}} && config += ( "FORCE_IP_ADDRESS" )
+echo "INFO | FORCE_IP_ADDRESS: ${FORCE_IP_ADDRESS}"
 SERVER_NAME=${SERVER_NAME:-Trackmania Server} && config+=( "SERVER_NAME" )
 echo "INFO | SERVER_NAME: ${SERVER_NAME}"
 SERVER_COMMENT=${SERVER_COMMENT:-This is a Trackmania Server} && config+=( "SERVER_COMMENT" )
@@ -71,4 +73,4 @@ done
 for idx in "${!playlist[@]}"; do
     arg=${playlist[$idx]}
     sed -i -e "s/@$arg@/${!arg}/g" GameData/Tracks/MatchSettings/playlist.xml
-done
\ No newline at end of file
+done