From ce5331e46235535b877d2b4539b059a0be53b79c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 9 Nov 2013 17:05:11 +0100 Subject: [PATCH 1/2] display unknown ip addresses closes #3833 --- .../Widgets/Logic/ClientTooltipLogic.cs | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/OpenRA.Mods.RA/Widgets/Logic/ClientTooltipLogic.cs b/OpenRA.Mods.RA/Widgets/Logic/ClientTooltipLogic.cs index 68d040034c..5a9b9cc8be 100644 --- a/OpenRA.Mods.RA/Widgets/Logic/ClientTooltipLogic.cs +++ b/OpenRA.Mods.RA/Widgets/Logic/ClientTooltipLogic.cs @@ -11,8 +11,8 @@ using System; using System.Drawing; using System.Linq; -using OpenRA.Widgets; using OpenRA.Network; +using OpenRA.Widgets; namespace OpenRA.Mods.RA.Widgets.Logic { @@ -31,13 +31,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic var latencyPrefixFont = Game.Renderer.Fonts[latencyPrefix.Font]; var ip = widget.Get("IP"); - var ipFont = Game.Renderer.Fonts[ip.Font]; + var addressFont = Game.Renderer.Fonts[ip.Font]; var location = widget.Get("LOCATION"); var locationFont = Game.Renderer.Fonts[location.Font]; var locationOffset = location.Bounds.Y; - var ipOffset = ip.Bounds.Y; + var addressOffset = ip.Bounds.Y; var latencyOffset = latency.Bounds.Y; var tooltipHeight = widget.Bounds.Height; @@ -46,16 +46,16 @@ namespace OpenRA.Mods.RA.Widgets.Logic tooltipContainer.IsVisible = () => (orderManager.LobbyInfo.ClientWithIndex(clientIndex) != null); tooltipContainer.BeforeRender = () => { - var latencyPrefixSize = latencyPrefix.Bounds.X + latencyPrefixFont.Measure(latencyPrefix.GetText()+" ").X; - var width = Math.Max(locationFont.Measure(location.GetText()).X, (Math.Max(adminFont.Measure(admin.GetText()).X, - Math.Max(ipFont.Measure(ip.GetText()).X, latencyPrefixSize + latencyFont.Measure(latency.GetText()).X)))); + var latencyPrefixSize = latencyPrefix.Bounds.X + latencyPrefixFont.Measure(latencyPrefix.GetText() + " ").X; + var width = Math.Max(locationFont.Measure(location.GetText()).X, Math.Max(adminFont.Measure(admin.GetText()).X, + Math.Max(addressFont.Measure(ip.GetText()).X, latencyPrefixSize + latencyFont.Measure(latency.GetText()).X))); widget.Bounds.Width = width + 2 * margin; latency.Bounds.Width = widget.Bounds.Width; ip.Bounds.Width = widget.Bounds.Width; admin.Bounds.Width = widget.Bounds.Width; location.Bounds.Width = widget.Bounds.Width; - ip.Bounds.Y = ipOffset; + ip.Bounds.Y = addressOffset; latency.Bounds.Y = latencyOffset; location.Bounds.Y = locationOffset; widget.Bounds.Height = tooltipHeight; @@ -75,14 +75,13 @@ namespace OpenRA.Mods.RA.Widgets.Logic admin.IsVisible = () => orderManager.LobbyInfo.ClientWithIndex(clientIndex).IsAdmin; latency.GetText = () => LobbyUtils.LatencyDescription(orderManager.LobbyInfo.ClientWithIndex(clientIndex).Latency); latency.GetColor = () => LobbyUtils.LatencyColor(orderManager.LobbyInfo.ClientWithIndex(clientIndex).Latency); - var ipAddress = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress; - if ((ipAddress == null || ipAddress == "127.0.0.1") && UPnP.NatDevice != null) - ipAddress = UPnP.NatDevice.GetExternalIP().ToString(); - var cachedDescriptiveIP = LobbyUtils.DescriptiveIpAddress(ipAddress); + var address = orderManager.LobbyInfo.ClientWithIndex(clientIndex).IpAddress; + if (address == "127.0.0.1" && UPnP.NatDevice != null) + address = UPnP.NatDevice.GetExternalIP().ToString(); + var cachedDescriptiveIP = LobbyUtils.DescriptiveIpAddress(address); ip.GetText = () => cachedDescriptiveIP; - var cachedCountryLookup = LobbyUtils.LookupCountry(ipAddress); + var cachedCountryLookup = LobbyUtils.LookupCountry(address); location.GetText = () => cachedCountryLookup; } } } - From 21a607a43e3a2f8586e31277eab1711bd987ef60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Sat, 9 Nov 2013 17:23:33 +0100 Subject: [PATCH 2/2] StyleCop cleanup --- OpenRA.Game/Server/Server.cs | 6 +++--- OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/OpenRA.Game/Server/Server.cs b/OpenRA.Game/Server/Server.cs index 841d2270ab..1b8c3fdeee 100644 --- a/OpenRA.Game/Server/Server.cs +++ b/OpenRA.Game/Server/Server.cs @@ -28,9 +28,9 @@ namespace OpenRA.Server { public enum ServerState : int { - WaitingPlayers = 1, - GameStarted = 2, - ShuttingDown = 3 + WaitingPlayers = 1, + GameStarted = 2, + ShuttingDown = 3 } public class Server diff --git a/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs b/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs index bac7c8b0e9..dfe3de8d17 100644 --- a/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs +++ b/OpenRA.Mods.RA/ServerTraits/MasterServerPinger.cs @@ -33,7 +33,6 @@ namespace OpenRA.Mods.RA.Server server.SendMessage(masterServerMessages.Dequeue()); } - public void LobbyInfoSynced(S server) { PingMasterServer(server); } public void GameStarted(S server) { PingMasterServer(server); } public void GameEnded(S server) { PingMasterServer(server); } @@ -65,7 +64,7 @@ namespace OpenRA.Mods.RA.Server wc.DownloadData( server.Settings.MasterServer + url.F( server.Settings.ExternalPort, Uri.EscapeUriString(server.Settings.Name), - (int) server.State, + (int)server.State, server.lobbyInfo.Clients.Where(c1 => c1.Bot == null).Count(), server.lobbyInfo.Clients.Where(c1 => c1.Bot != null).Count(), Game.CurrentMods.Select(f => "{0}@{1}".F(f.Key, f.Value.Version)).JoinWith(","), @@ -80,11 +79,11 @@ namespace OpenRA.Mods.RA.Server } } } - catch(Exception ex) + catch (Exception ex) { Log.Write("server", ex.ToString()); - lock( masterServerMessages ) - masterServerMessages.Enqueue( "Master server communication failed." ); + lock (masterServerMessages) + masterServerMessages.Enqueue("Master server communication failed."); } isBusy = false;