Added debug option to disable automatic LAN connection.

src/main.cpp

@@ -578,6 +578,7 @@ void cmdLineHelp()
     "       --password=s       Automatically log in (set the password).\n"
     "       --port=n           Port number to use.\n"
     "       --my-address=1.1.1.1:1  Own IP address (can replace stun protocol)\n"
+    "       --disable-lan      Disable LAN detection (connect using WAN).\n"
     "       --max-players=n    Maximum number of clients (server only).\n"
     "       --no-console       Does not write messages in the console but to\n"
     "                          stdout.log.\n"
@@ -1016,6 +1017,11 @@ int handleCmdLine()
     if (CommandLine::has("--my-address", &s))
         GetPublicAddress::setMyIPAddress(s);
 
+    /** Disable detection of LAN connection when connecting via WAN. This is
+     *  mostly a debugging feature to force using WAN connection. */
+    if (CommandLine::has("--disable-lan"))
+        NetworkConfig::m_disable_lan = true;
+
     // Race parameters
     if(CommandLine::has("--kartsize-debug"))
     {

src/network/network_config.cpp

@@ -19,6 +19,7 @@
 #include "network/network_config.hpp"
 
 NetworkConfig *NetworkConfig::m_network_config = NULL;
+bool           NetworkConfig::m_disable_lan    = false;
 
 /** \class NetworkConfig
  *  This class is the interface between STK and the online code, particularly

src/network/network_config.hpp

@@ -72,6 +72,10 @@ private:
     NetworkConfig();
 
 public:
+    /** Stores the command line flag to disable lan detection (i.e. force
+     *  WAN code to be used when connection client and server). */
+    static bool m_disable_lan;
+
     /** Singleton get, which creates this object if necessary. */
     static NetworkConfig *get()
     {

src/network/protocols/connect_to_peer.cpp

@@ -125,9 +125,10 @@ void ConnectToPeer::asynchronousUpdate()
             // the Ping protocol to keep the port available. We can't rely on
             // STKHost::isLAN(), since we might get a LAN connection even if
             // the server itself accepts connections from anywhere.
-            if (!m_is_lan &&
-                m_peer_address.getIP() != NetworkConfig::get()
-                ->getMyAddress().getIP())
+            if ( (!m_is_lan &&
+                  m_peer_address.getIP() !=
+                      NetworkConfig::get()->getMyAddress().getIP() ) || 
+                  NetworkConfig::m_disable_lan                            )
             {
                 m_current_protocol = new PingProtocol(m_peer_address,
                                                       /*time-between-ping*/2.0);

src/network/protocols/connect_to_server.cpp

@@ -175,9 +175,10 @@ void ConnectToServer::asynchronousUpdate()
                     m_current_protocol->requestStart();
                     return;
                 }
-                if (m_server_address.getIP() 
-                      == NetworkConfig::get()->getMyAddress().getIP() ||
-                      NetworkConfig::get()->isLAN())
+                if( ( !NetworkConfig::m_disable_lan && 
+                       m_server_address.getIP() 
+                         == NetworkConfig::get()->getMyAddress().getIP() )  ||
+                      NetworkConfig::get()->isLAN()                            )
                 {
                     // We're in the same lan (same public ip address).
                     // The state will change to CONNECTING