epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

allowUPnP is a bad name for automatic port forwards

Browse Source 
also check it by default if all those checks went well
This commit is contained in:
Matthias Mailänder
2013-04-10 12:45:16 +02:00
parent 6fb6aba9fc
commit 23ca044515
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
OpenRA.Game/Game.cs Executable file → Normal file
View File

@@ -281,13 +281,13 @@ namespace OpenRA
{
Log.Write("server", "Can't discover UPnP-enabled device: {0}", e);
Settings.Server.NatDeviceAvailable = false;
Settings.Server.AllowUPnP = false;
Settings.Server.AllowPortForward = false;
}
}
else
{
Settings.Server.NatDeviceAvailable = false;
Settings.Server.AllowUPnP = false;
Settings.Server.AllowPortForward = false;
}
FileSystem.Mount("."); // Needed to access shaders
@@ -315,14 +315,14 @@ namespace OpenRA
{
Log.Write("server", "Failed to stop NAT device discovery: {0}", e);
Settings.Server.NatDeviceAvailable = false;
Settings.Server.AllowUPnP = false;
Settings.Server.AllowPortForward = false;
}
if (natDevice == null)
{
Log.Write("server", "No NAT devices with UPnP enabled found within {0} ms deadline. Disabling automatic port forwarding.".F(Settings.Server.NatDiscoveryTimeout));
Settings.Server.NatDeviceAvailable = false;
Settings.Server.AllowUPnP = false;
Settings.Server.AllowPortForward = false;
}
});
}
@@ -336,7 +336,7 @@ namespace OpenRA
Log.Write("server", "NAT device discovered.");
Settings.Server.NatDeviceAvailable = true;
Settings.Server.AllowUPnP = true;
Settings.Server.AllowPortForward = true;
try
{
@@ -353,7 +353,7 @@ namespace OpenRA
Log.Write("server", "Can't fetch information from NAT device: {0}", e);
Settings.Server.NatDeviceAvailable = false;
Settings.Server.AllowUPnP = false;
Settings.Server.AllowPortForward = false;
}
}
@@ -375,7 +375,7 @@ namespace OpenRA
}
Settings.Server.NatDeviceAvailable = false;
Settings.Server.AllowUPnP = false;
Settings.Server.AllowPortForward = false;
}
public static void InitializeWithMods(string[] mods)
@@ -538,7 +538,7 @@ namespace OpenRA
// Work around a miscompile in mono 2.6.7:
// booleans that default to true cannot be set false by an initializer
settings.AdvertiseOnline = false;
settings.AllowUPnP = false;
settings.AllowPortForward = false;
server = new Server.Server(new IPEndPoint(IPAddress.Loopback, 0),
Game.Settings.Game.Mods, settings, modData, natDevice);