INSANEMODE/IW4M-Admin
1
0
Fork 0
mirror of https://github.com/RaidMax/IW4M-Admin.git synced 2025-06-08 06:08:20 -05:00
Code Issues Releases Wiki Activity

Merge branch 'develop' into release/pre

Browse Source
This commit is contained in:
RaidMax 2025-05-24 15:37:54 -05:00
commit 1fa8126c14
No known key found for this signature in database
GPG Key ID: 97D1158CFCDAF9B2
4 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Application/API/Master/ApiServer.cs
View File

@ -24,5 +24,7 @@ namespace IW4MAdmin.Application.API.Master
public int ClientNum { get; set; } public int ClientNum { get; set; }
[JsonPropertyName("maxclientnum")] [JsonPropertyName("maxclientnum")]
public int MaxClientNum { get; set; } public int MaxClientNum { get; set; }
[JsonPropertyName("resolved_external_ip_address")]
public string? ResolvedExternalIPAddress { get; set; }
} }
} }

3
Application/Misc/MasterCommunication.cs
View File

@ -149,7 +149,8 @@ namespace IW4MAdmin.Application.Misc
MaxClientNum = s.MaxClients, MaxClientNum = s.MaxClients,
Id = s.EndPoint, Id = s.EndPoint,
Port = (short)s.ListenPort, Port = (short)s.ListenPort,
IPAddress = s.ListenAddress IPAddress = s.ListenAddress,
ResolvedExternalIPAddress = s.ResolvedIpEndPoint.Address.IsInternal() ? _manager.ExternalIPAddress : null
}).ToList(), }).ToList(),
WebfrontUrl = _appConfig.WebfrontUrl WebfrontUrl = _appConfig.WebfrontUrl
}; };

1
SharedLibraryCore/Dtos/ServerInfo.cs
View File

@ -25,6 +25,7 @@ namespace SharedLibraryCore.Dtos
public string IPAddress { get; set; } public string IPAddress { get; set; }
public string ExternalIPAddress { get; set; } public string ExternalIPAddress { get; set; }
public bool IsPasswordProtected { get; set; } public bool IsPasswordProtected { get; set; }
public string? ResolvedExternalIPAddress { get; set; }
public string Endpoint => $"{IPAddress}:{Port}"; public string Endpoint => $"{IPAddress}:{Port}";
public double? LobbyZScore public double? LobbyZScore

2
WebfrontCore/Controllers/API/Server.cs
View File

@ -39,6 +39,7 @@ namespace WebfrontCore.Controllers.API
name = server.GametypeName name = server.GametypeName
}, },
Parser = server.RconParser.Name, Parser = server.RconParser.Name,
ResolvedExternalIPAddress = server.ResolvedIpEndPoint.Address.IsInternal() ? Manager.ExternalIPAddress : null,
})); }));
} }
@ -68,6 +69,7 @@ namespace WebfrontCore.Controllers.API
name = foundServer.GametypeName name = foundServer.GametypeName
}, },
Parser = foundServer.RconParser.Name, Parser = foundServer.RconParser.Name,
ResolvedExternalIPAddress = foundServer.ResolvedIpEndPoint.Address.IsInternal() ? Manager.ExternalIPAddress : null
}); });
} }