Skip to content

Retain tunnel object through refreshes #836

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 7, 2025
+79 −13
Merged

Retain tunnel object through refreshes #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b35e141
Retain tunnel object through refresh.
11EJDE11 Oct 1, 2025
212033d
Fix dupe check
11EJDE11 Oct 2, 2025
a1b74e6
Change Task.Factory.StartNew to Task.Run
11EJDE11 Oct 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions DXMainClient/Domain/Multiplayer/CnCNet/CnCNetTunnel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public static CnCNetTunnel Parse(string str)

string address = parts[0];
string[] detailedAddress = address.Split(new char[] { ':' });

tunnel.Address = detailedAddress[0];
tunnel.Port = int.Parse(detailedAddress[1]);
tunnel.Country = parts[1];
Expand Down Expand Up @@ -86,7 +86,27 @@ public static CnCNetTunnel Parse(string str)
public int PingInMs { get; set; } = -1;

/// <summary>
/// Gets a list of player ports to use from a specific tunnel server.
/// Updates this tunnel's metadata from another tunnel instance, preserving Address, Port, and existing PingInMs.
/// </summary>
internal void UpdateFrom(CnCNetTunnel updatedTunnel)
{
Country = updatedTunnel.Country;
CountryCode = updatedTunnel.CountryCode;
Name = updatedTunnel.Name;
Clients = updatedTunnel.Clients;
MaxClients = updatedTunnel.MaxClients;
Official = updatedTunnel.Official;
Recommended = updatedTunnel.Recommended;
Version = updatedTunnel.Version;

RequiresPassword = updatedTunnel.RequiresPassword;
Latitude = updatedTunnel.Latitude;
Longitude = updatedTunnel.Longitude;
Distance = updatedTunnel.Distance;
}

/// <summary>
/// Gets a list of player ports to use from a specific V2 tunnel server.
/// </summary>
/// <returns>A list of player ports to use.</returns>
public List<int> GetPlayerPortInfo(int playerCount)
Expand Down
68 changes: 57 additions & 11 deletions DXMainClient/Domain/Multiplayer/CnCNet/TunnelHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ public class TunnelHandler : GameComponent

private const int SUPPORTED_TUNNEL_VERSION = 2;

private readonly object _refreshLock = new object();
private bool _refreshInProgress = false;

public TunnelHandler(WindowManager wm, CnCNetManager connectionManager) : base(wm.Game)
{
this.wm = wm;
Expand Down Expand Up @@ -78,26 +81,65 @@ private void DoCurrentTunnelPinged()

private void RefreshTunnelsAsync()
{
Task.Factory.StartNew(() =>
lock (_refreshLock)
{
if (_refreshInProgress)
return;
_refreshInProgress = true;
}

Task.Run(() =>
{
List<CnCNetTunnel> tunnels = RefreshTunnels();
wm.AddCallback(new Action<List<CnCNetTunnel>>(HandleRefreshedTunnels), tunnels);
try
{
List<CnCNetTunnel> tunnels = RefreshTunnels();
wm.AddCallback(new Action<List<CnCNetTunnel>>(HandleRefreshedTunnels), tunnels);
}
finally
{
lock (_refreshLock)
{
_refreshInProgress = false;
}
}
});
}

private void HandleRefreshedTunnels(List<CnCNetTunnel> tunnels)
private void HandleRefreshedTunnels(List<CnCNetTunnel> newTunnels)
{
if (tunnels.Count > 0)
Tunnels = tunnels;
if (newTunnels.Count == 0)
{
TunnelsRefreshed?.Invoke(this, EventArgs.Empty);
return;
}

TunnelsRefreshed?.Invoke(this, EventArgs.Empty);
var existingTunnels = Tunnels.ToDictionary(t => $"{t.Address}:{t.Port}");
var updatedTunnels = new List<CnCNetTunnel>();

foreach (var newTunnel in newTunnels)
{
string key = $"{newTunnel.Address}:{newTunnel.Port}";
if (existingTunnels.TryGetValue(key, out var existingTunnel))
{
// update existing tunnels
existingTunnel.UpdateFrom(newTunnel);
updatedTunnels.Add(existingTunnel);
}
else
{
// add new tunnels
updatedTunnels.Add(newTunnel);
}
}

Task[] pingTasks = new Task[Tunnels.Count];
// remove old tunnels
Tunnels = updatedTunnels;
TunnelsRefreshed?.Invoke(this, EventArgs.Empty);

for (int i = 0; i < Tunnels.Count; i++)
{
if (UserINISettings.Instance.PingUnofficialCnCNetTunnels || Tunnels[i].Official || Tunnels[i].Recommended)
pingTasks[i] = PingListTunnelAsync(i);
_ = PingListTunnelAsync(i);
}

if (CurrentTunnel != null)
Expand All @@ -120,7 +162,7 @@ private void HandleRefreshedTunnels(List<CnCNetTunnel> tunnels)

private Task PingListTunnelAsync(int index)
{
return Task.Factory.StartNew(() =>
return Task.Run(() =>
{
Tunnels[index].UpdatePing();
DoTunnelPinged(index);
Expand All @@ -129,7 +171,7 @@ private Task PingListTunnelAsync(int index)

private Task PingCurrentTunnelAsync(bool checkTunnelList = false)
{
return Task.Factory.StartNew(() =>
return Task.Run(() =>
{
var tunnel = CurrentTunnel;
if (tunnel == null) return;
Expand Down Expand Up @@ -212,6 +254,7 @@ private byte[] GetRawTunnelData(int retryCount = 2)
private List<CnCNetTunnel> RefreshTunnels()
{
List<CnCNetTunnel> returnValue = new List<CnCNetTunnel>();
var seenAddresses = new HashSet<string>(StringComparer.OrdinalIgnoreCase);

FileInfo tunnelCacheFile = SafePath.GetFile(ProgramConstants.ClientUserFilesPath, "tunnel_cache");

Expand Down Expand Up @@ -239,6 +282,9 @@ private List<CnCNetTunnel> RefreshTunnels()
if (tunnel.Version != SUPPORTED_TUNNEL_VERSION)
continue;

if (!seenAddresses.Add($"{tunnel.Address}:{tunnel.Port}"))
continue;

returnValue.Add(tunnel);
}
catch (Exception ex)
Expand Down
Loading