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

Merge pull request #9215 from LipkeGu/upnp_externalip_fix

Browse Source 
Move NAT Logic from ClientTooltipLogic into its own Function at LobbyUtils.
This commit is contained in:
abcdefg30
2015-09-19 17:22:02 +02:00
parent d77839bb3d 8a1a6945f1
commit 6cbcd66b87
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OpenRA.Mods.Common/Widgets/Logic/Lobby/ClientTooltipLogic.cs
View File

@@ -79,10 +79,8 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var ping = orderManager.LobbyInfo.PingFromClient(client);
latency.GetText = () => LobbyUtils.LatencyDescription(ping);
latency.GetColor = () => LobbyUtils.LatencyColor(ping);
var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress;
if (clientIndex == orderManager.LocalClient.Index && UPnP.NatDevice != null
&& address == IPAddress.Loopback.ToString())
address = UPnP.NatDevice.GetExternalIP().ToString();
var address = LobbyUtils.GetExternalIP(clientIndex, orderManager);
var cachedDescriptiveIP = LobbyUtils.DescriptiveIpAddress(address);
ip.GetText = () => cachedDescriptiveIP;
var cachedCountryLookup = GeoIP.LookupCountry(address);

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

@@ -482,5 +482,18 @@ namespace OpenRA.Mods.Common.Widgets.Logic
};
playerName.GetColor = () => player.Color.RGB;
}
public static string GetExternalIP(int clientIndex, OrderManager orderManager)
{
var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress;
if (clientIndex == orderManager.LocalClient.Index && address == IPAddress.Loopback.ToString() && UPnP.NatDevice != null)
{
var externalIP = UPnP.NatDevice.GetExternalIP();
if (externalIP != null)
address = externalIP.ToString();
}
return address;
}
}
}