Migrate to Open.Nat version 2.0.16
Move the dependency from all libraries to game engine only. Initialize after the renderer setup to ensure a visible window.
This commit is contained in:
Matthias Mailänder
@@ -10,127 +10,67 @@
|
||||
#endregion
|
||||
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Diagnostics;
|
||||
using System.Net;
|
||||
using Mono.Nat;
|
||||
using System.Threading;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
using Open.Nat;
|
||||
|
||||
namespace OpenRA.Network
|
||||
{
|
||||
public static class UPnP
|
||||
public class UPnP
|
||||
{
|
||||
static INatDevice natDevice;
|
||||
static NatDevice natDevice;
|
||||
static Mapping mapping;
|
||||
|
||||
public static void TryNatDiscovery()
|
||||
public static IPAddress ExternalIP { get; private set; }
|
||||
|
||||
public static async Task DiscoverNatDevices(int timeout)
|
||||
{
|
||||
NatDiscoverer.TraceSource.Switch.Level = SourceLevels.Verbose;
|
||||
var logChannel = Log.Channel("nat");
|
||||
NatDiscoverer.TraceSource.Listeners.Add(new TextWriterTraceListener(logChannel.Writer));
|
||||
|
||||
var natDiscoverer = new NatDiscoverer();
|
||||
var token = new CancellationTokenSource(timeout);
|
||||
natDevice = await natDiscoverer.DiscoverDeviceAsync(PortMapper.Upnp, token);
|
||||
try
|
||||
{
|
||||
NatUtility.Logger = Log.Channel("server").Writer;
|
||||
NatUtility.Verbose = Game.Settings.Server.VerboseNatDiscovery;
|
||||
NatUtility.DeviceFound += DeviceFound;
|
||||
Game.Settings.Server.NatDeviceAvailable = false;
|
||||
NatUtility.StartDiscovery();
|
||||
Log.Write("server", "NAT discovery started.");
|
||||
ExternalIP = await natDevice.GetExternalIPAsync();
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Write("server", "Can't discover UPnP-enabled device: {0}", e);
|
||||
Game.Settings.Server.NatDeviceAvailable = false;
|
||||
Game.Settings.Server.AllowPortForward = false;
|
||||
Console.WriteLine("Getting the external IP from NAT device failed: {0}", e.Message);
|
||||
Log.Write("nat", e.StackTrace);
|
||||
}
|
||||
}
|
||||
|
||||
public static void StoppingNatDiscovery()
|
||||
public static async Task ForwardPort(int listen, int external)
|
||||
{
|
||||
Log.Write("server", "Stopping NAT discovery.");
|
||||
NatUtility.StopDiscovery();
|
||||
|
||||
if (natDevice == null || natDevice.GetType() != typeof(Mono.Nat.Upnp.UpnpNatDevice))
|
||||
{
|
||||
Log.Write("server",
|
||||
"No NAT devices with UPnP enabled found within {0} ms deadline. Disabling automatic port forwarding.".F(Game.Settings.Server.NatDiscoveryTimeout));
|
||||
Game.Settings.Server.NatDeviceAvailable = false;
|
||||
Game.Settings.Server.AllowPortForward = false;
|
||||
}
|
||||
}
|
||||
|
||||
public static void DeviceFound(object sender, DeviceEventArgs args)
|
||||
{
|
||||
Log.Write("server", "NAT device discovered.");
|
||||
|
||||
Game.Settings.Server.NatDeviceAvailable = true;
|
||||
Game.Settings.Server.AllowPortForward = true;
|
||||
|
||||
mapping = new Mapping(Protocol.Tcp, listen, external, "OpenRA");
|
||||
try
|
||||
{
|
||||
natDevice = args.Device;
|
||||
Log.Write("server", "Type: {0}", natDevice.GetType());
|
||||
Log.Write("server", "Your external IP is: {0}", natDevice.GetExternalIP());
|
||||
|
||||
foreach (var mp in natDevice.GetAllMappings())
|
||||
Log.Write("server", "Existing port mapping: protocol={0}, public={1}, private={2}",
|
||||
mp.Protocol, mp.PublicPort, mp.PrivatePort);
|
||||
await natDevice.CreatePortMapAsync(mapping);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Write("server", "Can't fetch information from NAT device: {0}", e);
|
||||
|
||||
Game.Settings.Server.NatDeviceAvailable = false;
|
||||
Game.Settings.Server.AllowPortForward = false;
|
||||
Console.WriteLine("Port forwarding failed: {0}", e.Message);
|
||||
Log.Write("nat", e.StackTrace);
|
||||
}
|
||||
}
|
||||
|
||||
public static void ForwardPort(int lifetime)
|
||||
public static async Task RemovePortForward()
|
||||
{
|
||||
try
|
||||
{
|
||||
var mapping = new Mapping(Protocol.Tcp, Game.Settings.Server.ExternalPort, Game.Settings.Server.ListenPort, lifetime);
|
||||
natDevice.CreatePortMap(mapping);
|
||||
Log.Write("server", "Create port mapping: protocol = {0}, public = {1}, private = {2}, lifetime = {3} s",
|
||||
mapping.Protocol, mapping.PublicPort, mapping.PrivatePort, mapping.Lifetime);
|
||||
}
|
||||
catch (MappingException e)
|
||||
{
|
||||
if (e.ErrorCode == 725 && lifetime != 0)
|
||||
{
|
||||
Log.Write("server", "NAT device answered with OnlyPermanentLeasesSupported. Retrying...");
|
||||
ForwardPort(0);
|
||||
}
|
||||
else
|
||||
{
|
||||
Log.Write("server", "Can not forward ports via UPnP: {0}", e);
|
||||
Game.Settings.Server.AllowPortForward = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public static void RemovePortforward()
|
||||
{
|
||||
try
|
||||
{
|
||||
var mapping = new Mapping(Protocol.Tcp, Game.Settings.Server.ExternalPort, Game.Settings.Server.ListenPort);
|
||||
natDevice.DeletePortMap(mapping);
|
||||
Log.Write("server", "Remove port mapping: protocol = {0}, public = {1}, private = {2}, expiration = {3}",
|
||||
mapping.Protocol, mapping.PublicPort, mapping.PrivatePort, mapping.Expiration);
|
||||
await natDevice.DeletePortMapAsync(mapping);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Log.Write("server", "Can not remove UPnP portforwarding rules: {0}", e);
|
||||
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;
|
||||
Console.WriteLine("Port removal failed: {0}", e.Message);
|
||||
Log.Write("nat", e.StackTrace);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user