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

Merge pull request #11286 from Mailaender/open.nat-2.0.16

Browse Source 
Dump Mono.NAT in favor of Open.Nat 2.0.16
This commit is contained in:
reaperrr
2016-06-26 16:16:11 +02:00
committed by GitHub
parent 3356e6a82d 5245df729d
commit 7ed792ba88
15 changed files with 81 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -70,10 +70,6 @@
<HintPath>..\thirdparty\download\MaxMind.GeoIP2.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="Mono.Nat">
<HintPath>..\thirdparty\download\Mono.Nat.dll</HintPath>
<Private>False</Private>
</Reference>
<Reference Include="ICSharpCode.SharpZipLib">
<HintPath>..\thirdparty\download\ICSharpCode.SharpZipLib.dll</HintPath>
<Private>False</Private>

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

@@ -509,7 +509,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var lc = orderManager.LocalClient;
if (lc != null && lc.Index == clientIndex && address == IPAddress.Loopback.ToString())
{
var externalIP = UPnP.GetExternalIP();
var externalIP = UPnP.ExternalIP;
if (externalIP != null)
address = externalIP.ToString();
}

2
OpenRA.Mods.Common/Widgets/Logic/ServerCreationLogic.cs
View File

@@ -88,7 +88,7 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var checkboxUPnP = panel.Get<CheckboxWidget>("UPNP_CHECKBOX");
checkboxUPnP.IsChecked = () => allowPortForward;
checkboxUPnP.OnClick = () => allowPortForward ^= true;
checkboxUPnP.IsDisabled = () => !Game.Settings.Server.NatDeviceAvailable;
checkboxUPnP.IsDisabled = () => !Game.Settings.Server.AllowPortForward;
var passwordField = panel.GetOrNull<PasswordFieldWidget>("PASSWORD");
if (passwordField != null)

2
OpenRA.Mods.Common/Widgets/Logic/SettingsLogic.cs
View File

@@ -630,7 +630,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
var gs = Game.Settings.Game;
BindCheckboxPref(panel, "NAT_DISCOVERY", ss, "DiscoverNatDevices");
BindCheckboxPref(panel, "VERBOSE_NAT_CHECKBOX", ss, "VerboseNatDiscovery");
BindCheckboxPref(panel, "PERFTEXT_CHECKBOX", ds, "PerfText");
BindCheckboxPref(panel, "PERFGRAPH_CHECKBOX", ds, "PerfGraph");
BindCheckboxPref(panel, "CHECKUNSYNCED_CHECKBOX", ds, "SanityCheckUnsyncedCode");
@@ -652,7 +651,6 @@ namespace OpenRA.Mods.Common.Widgets.Logic
return () =>
{
ss.DiscoverNatDevices = dss.DiscoverNatDevices;
ss.VerboseNatDiscovery = dss.VerboseNatDiscovery;
ds.PerfText = dds.PerfText;
ds.PerfGraph = dds.PerfGraph;
ds.SanityCheckUnsyncedCode = dds.SanityCheckUnsyncedCode;