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

catch MappingExceptions in NatDevice.GetExternalIP

Browse Source
This commit is contained in:
Matthias Mailänder
2015-11-22 11:37:58 +01:00
parent bacac082cc
commit 86a2a54640
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
OpenRA.Game/Network/UPnP.cs
View File

@@ -9,7 +9,7 @@
#endregion #endregion
using System; using System;
using System.Net;
using Mono.Nat; using Mono.Nat;
namespace OpenRA.Network namespace OpenRA.Network
@@ -116,5 +116,21 @@ namespace OpenRA.Network
Game.Settings.Server.AllowPortForward = false; Game.Settings.Server.AllowPortForward = false;
} }
} }
public static IPAddress GetExternalIP()
{
if (NatDevice == null)
return null;
try
{
return NatDevice.GetExternalIP();
}
catch (Exception e)
{
Log.Write("server", "Failed to get the external IP from NAT device: {0}", e);
return null;
}
}
} }
} }

4
OpenRA.Mods.Common/Widgets/Logic/Lobby/LobbyUtils.cs
View File

@@ -497,9 +497,9 @@ namespace OpenRA.Mods.Common.Widgets.Logic
public static string GetExternalIP(int clientIndex, OrderManager orderManager) public static string GetExternalIP(int clientIndex, OrderManager orderManager)
{ {
var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress; var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress;
if (clientIndex == orderManager.LocalClient.Index && address == IPAddress.Loopback.ToString() && UPnP.NatDevice != null) if (clientIndex == orderManager.LocalClient.Index && address == IPAddress.Loopback.ToString())
{ {
var externalIP = UPnP.NatDevice.GetExternalIP(); var externalIP = UPnP.GetExternalIP();
if (externalIP != null) if (externalIP != null)
address = externalIP.ToString(); address = externalIP.ToString();
} }