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

try to grab the external IP of localhost from the NAT router

Browse Source
This commit is contained in:
Matthias Mailänder
2013-08-07 19:07:23 +02:00
parent feb7f80a39
commit 9d40b430dc
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -16,7 +16,7 @@ using Mono.Nat.Upnp;
namespace OpenRA.Network namespace OpenRA.Network
{ {
class UPnP public class UPnP
{ {
public static INatDevice NatDevice; public static INatDevice NatDevice;

4
OpenRA.Mods.RA/OpenRA.Mods.RA.csproj
View File

@@ -75,6 +75,10 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath> <HintPath>..\thirdparty\ICSharpCode.SharpZipLib.dll</HintPath>
</Reference> </Reference>
<Reference Include="Mono.Nat">
<HintPath>..\thirdparty\Mono.Nat.dll</HintPath>
<Private>False</Private>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Activities\LegacyCaptureActor.cs" /> <Compile Include="Activities\LegacyCaptureActor.cs" />

2
OpenRA.Mods.RA/Widgets/Logic/ClientTooltipLogic.cs
View File

@@ -68,6 +68,8 @@ namespace OpenRA.Mods.RA.Widgets.Logic
admin.IsVisible = () => orderManager.LobbyInfo.ClientWithIndex(clientIndex).IsAdmin; admin.IsVisible = () => orderManager.LobbyInfo.ClientWithIndex(clientIndex).IsAdmin;
latency.GetText = () => "Latency: {0}".F(LobbyUtils.LatencyDescription(orderManager.LobbyInfo.ClientWithIndex(clientIndex).Latency)); latency.GetText = () => "Latency: {0}".F(LobbyUtils.LatencyDescription(orderManager.LobbyInfo.ClientWithIndex(clientIndex).Latency));
var ipAddress = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress; var ipAddress = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress;
if ((ipAddress == null || ipAddress == "127.0.0.1") && UPnP.NatDevice != null)
ipAddress = UPnP.NatDevice.GetExternalIP().ToString();
ip.GetText = () => LobbyUtils.DescriptiveIpAddress(ipAddress); ip.GetText = () => LobbyUtils.DescriptiveIpAddress(ipAddress);
location.GetText = () => LobbyUtils.LookupCountry(ipAddress); location.GetText = () => LobbyUtils.LookupCountry(ipAddress);
} }