Move ConnectionTarget to its own file

OpenRA · May 7, 2021 · 109672b · 109672b
1 parent 121959e
commit 109672b
Show file tree

Hide file tree

Showing 2 changed files with 63 additions and 50 deletions.
diff --git a/OpenRA.Game/Network/Connection.cs b/OpenRA.Game/Network/Connection.cs
@@ -13,7 +13,6 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Threading;
@@ -41,55 +40,6 @@ public interface IConnection : IDisposable
 		void Receive(Action<int, byte[]> packetFn);
 	}
 
-	public class ConnectionTarget
-	{
-		readonly DnsEndPoint[] endpoints;
-
-		public ConnectionTarget()
-		{
-			endpoints = new[] { new DnsEndPoint("invalid", 0) };
-		}
-
-		public ConnectionTarget(string host, int port)
-		{
-			endpoints = new[] { new DnsEndPoint(host, port) };
-		}
-
-		public ConnectionTarget(IEnumerable<DnsEndPoint> endpoints)
-		{
-			this.endpoints = endpoints.ToArray();
-			if (this.endpoints.Length == 0)
-			{
-				throw new ArgumentException("ConnectionTarget must have at least one address.");
-			}
-		}
-
-		public IEnumerable<IPEndPoint> GetConnectEndPoints()
-		{
-			return endpoints
-				.SelectMany(e =>
-				{
-					try
-					{
-						return Dns.GetHostAddresses(e.Host)
-							.Select(a => new IPEndPoint(a, e.Port));
-					}
-					catch (Exception)
-					{
-						return Enumerable.Empty<IPEndPoint>();
-					}
-				})
-				.ToList();
-		}
-
-		public override string ToString()
-		{
-			return endpoints
-				.Select(e => "{0}:{1}".F(e.Host, e.Port))
-				.JoinWith("/");
-		}
-	}
-
 	class EchoConnection : IConnection
 	{
 		protected struct ReceivedPacket

diff --git a/OpenRA.Game/Network/ConnectionTarget.cs b/OpenRA.Game/Network/ConnectionTarget.cs
@@ -0,0 +1,63 @@
+#region Copyright & License Information
+/*
+ * Copyright 2007-2021 The OpenRA Developers (see AUTHORS)
+ * This file is part of OpenRA, which is free software. It is made
+ * available to you under the terms of the GNU General Public License
+ * as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version. For more
+ * information, see COPYING.
+ */
+#endregion
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Net;
+
+namespace OpenRA.Network
+{
+	public sealed class ConnectionTarget
+	{
+		readonly DnsEndPoint[] endpoints;
+
+		public ConnectionTarget()
+		{
+			endpoints = new[] { new DnsEndPoint("invalid", 0) };
+		}
+
+		public ConnectionTarget(string host, int port)
+		{
+			endpoints = new[] { new DnsEndPoint(host, port) };
+		}
+
+		public ConnectionTarget(IEnumerable<DnsEndPoint> endpoints)
+		{
+			this.endpoints = endpoints.ToArray();
+			if (this.endpoints.Length == 0)
+				throw new ArgumentException("ConnectionTarget must have at least one address.");
+		}
+
+		public IEnumerable<IPEndPoint> GetConnectEndPoints()
+		{
+			return endpoints.SelectMany(e =>
+			{
+				try
+				{
+					return Dns.GetHostAddresses(e.Host)
+						.Select(a => new IPEndPoint(a, e.Port));
+				}
+				catch (Exception)
+				{
+					return Enumerable.Empty<IPEndPoint>();
+				}
+			}).ToList();
+		}
+
+		public override string ToString()
+		{
+			return endpoints
+				.Select(e => "{0}:{1}".F(e.Host, e.Port))
+				.JoinWith("/");
+		}
+	}
+}