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

catch everything NatUtility does so it does not crash anymore

Browse Source
This commit is contained in:
Matthias Mailänder
2013-04-09 12:34:42 +02:00
parent 66eff85aa4
commit 1603485b33
1 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
OpenRA.Game/Game.cs
View File

@@ -295,8 +295,19 @@ namespace OpenRA
RunAfterDelay(Settings.Server.NatDiscoveryTimeout, () => RunAfterDelay(Settings.Server.NatDiscoveryTimeout, () =>
{ {
NatUtility.StopDiscovery(); Log.Write("server", "Stopping NAT discovery.");
Log.Write("server", "NAT discovery stopped.");
try
{
NatUtility.StopDiscovery();
}
catch (Exception e)
{
Log.Write("server", "Failed to stop NAT device discovery: {0}", e);
Settings.Server.NatDeviceAvailable = false;
Settings.Server.AllowUPnP = false;
}
if (natDevice == null) 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)); Log.Write("server", "No NAT devices with UPnP enabled found within {0} ms deadline. Disabling automatic port forwarding.".F(Settings.Server.NatDiscoveryTimeout));
@@ -308,8 +319,6 @@ namespace OpenRA
public static void DeviceFound(object sender, DeviceEventArgs args) public static void DeviceFound(object sender, DeviceEventArgs args)
{ {
natDevice = args.Device;
Log.Write("server", "NAT device discovered."); Log.Write("server", "NAT device discovered.");
Settings.Server.NatDeviceAvailable = true; Settings.Server.NatDeviceAvailable = true;
@@ -317,6 +326,7 @@ namespace OpenRA
try try
{ {
natDevice = args.Device;
Log.Write("server", "Type: {0}", natDevice.GetType()); Log.Write("server", "Type: {0}", natDevice.GetType());
Log.Write("server", "Your external IP is: {0}", natDevice.GetExternalIP()); Log.Write("server", "Your external IP is: {0}", natDevice.GetExternalIP());
@@ -335,10 +345,17 @@ namespace OpenRA
public static void DeviceLost(object sender, DeviceEventArgs args) public static void DeviceLost(object sender, DeviceEventArgs args)
{ {
natDevice = args.Device;
Log.Write("server", "NAT device lost."); Log.Write("server", "NAT device lost.");
Log.Write("server", "Type: {0}", natDevice.GetType());
try
{
natDevice = args.Device;
Log.Write("server", "Type: {0}", natDevice.GetType());
}
catch (Exception e)
{
Log.Write("server", "Can't fetch type from lost NAT device: {0}", e);
}
Settings.Server.NatDeviceAvailable = false; Settings.Server.NatDeviceAvailable = false;
Settings.Server.AllowUPnP = false; Settings.Server.AllowUPnP = false;