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

Port back to Mono.Nat and make discovery async.

Browse Source
This commit is contained in:
Matthias Mailänder
2021-03-23 19:24:51 +01:00
committed by Paul Chote
parent 3f510b6d93
commit d15e7f76fc
13 changed files with 134 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRA.Game/Server/Server.cs
View File

@@ -221,8 +221,8 @@ namespace OpenRA.Server
if (type != ServerType.Local && settings.EnableGeoIP)
GeoIP.Initialize();
if (type != ServerType.Local && UPnP.Status == UPnPStatus.Enabled)
UPnP.ForwardPort(Settings.ListenPort, Settings.ListenPort).Wait();
if (type != ServerType.Local)
Nat.TryForwardPort(Settings.ListenPort, Settings.ListenPort);
foreach (var trait in modData.Manifest.ServerTraits)
serverTraits.Add(modData.ObjectCreator.CreateObject<ServerTrait>(trait));
@@ -310,8 +310,8 @@ namespace OpenRA.Server
if (State == ServerState.ShuttingDown)
{
EndGame();
if (type != ServerType.Local && UPnP.Status == UPnPStatus.Enabled)
UPnP.RemovePortForward().Wait();
if (type != ServerType.Local)
Nat.TryRemovePortForward();
break;
}
}