From 919890bded7cd57aa17486e1befacfb4e411d7ab Mon Sep 17 00:00:00 2001 From: Matthew Endsley Date: Wed, 3 Feb 2021 02:17:22 -0800 Subject: [PATCH] Remove NetworkConnection.RemoteEndPoint This field was originally created to provide a non-generic alternative to the Connection class' EndPoint field. However, we've replaced the generic ConnectionEndPoint with IPEndPoint in the Connection class. Since the bas class has a less-generic alias, it is now safe to remove RemoteEndPoint from NetworkConnection in favor of always using Connection.EndPoint --- .../ThreadLimitedUdpConnectionTests.cs | 4 ++-- Hazel.UnitTests/UdpConnectionTests.cs | 4 ++-- Hazel.UnitTests/UnityUdpConnectionTests.cs | 4 ++-- .../ThreadLimitedUdpServerConnection.cs | 1 - Hazel/NetworkConnection.cs | 15 +++------------ Hazel/Udp/UdpClientConnection.cs | 9 ++++----- Hazel/Udp/UdpServerConnection.cs | 9 ++++----- Hazel/Udp/UnityUdpClientConnection.cs | 7 +++---- 8 files changed, 20 insertions(+), 33 deletions(-) diff --git a/Hazel.UnitTests/ThreadLimitedUdpConnectionTests.cs b/Hazel.UnitTests/ThreadLimitedUdpConnectionTests.cs index b9a3a0a..a5c3fa6 100644 --- a/Hazel.UnitTests/ThreadLimitedUdpConnectionTests.cs +++ b/Hazel.UnitTests/ThreadLimitedUdpConnectionTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Net; using System.Threading; @@ -96,7 +96,7 @@ namespace Hazel.UnitTests Assert.AreEqual(ep, connection.EndPoint); //UdpConnection fields - Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 4296), connection.RemoteEndPoint); + Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 4296), connection.EndPoint); Assert.AreEqual(1, connection.Statistics.DataBytesSent); Assert.AreEqual(0, connection.Statistics.DataBytesReceived); } diff --git a/Hazel.UnitTests/UdpConnectionTests.cs b/Hazel.UnitTests/UdpConnectionTests.cs index 73017d7..2421268 100644 --- a/Hazel.UnitTests/UdpConnectionTests.cs +++ b/Hazel.UnitTests/UdpConnectionTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Net; using System.Threading; @@ -95,7 +95,7 @@ namespace Hazel.UnitTests Assert.AreEqual(ep, connection.EndPoint); //UdpConnection fields - Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 4296), connection.RemoteEndPoint); + Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 4296), connection.EndPoint); Assert.AreEqual(1, connection.Statistics.DataBytesSent); Assert.AreEqual(0, connection.Statistics.DataBytesReceived); } diff --git a/Hazel.UnitTests/UnityUdpConnectionTests.cs b/Hazel.UnitTests/UnityUdpConnectionTests.cs index 5b84bbe..4f989c5 100644 --- a/Hazel.UnitTests/UnityUdpConnectionTests.cs +++ b/Hazel.UnitTests/UnityUdpConnectionTests.cs @@ -1,4 +1,4 @@ -using System; +using System; using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Net; using System.Threading; @@ -95,7 +95,7 @@ namespace Hazel.UnitTests Assert.AreEqual(ep, connection.EndPoint); //UdpConnection fields - Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 4296), connection.RemoteEndPoint); + Assert.AreEqual(new IPEndPoint(IPAddress.Loopback, 4296), connection.EndPoint); Assert.AreEqual(1, connection.Statistics.DataBytesSent); Assert.AreEqual(0, connection.Statistics.DataBytesReceived); } diff --git a/Hazel/FewerThreads/ThreadLimitedUdpServerConnection.cs b/Hazel/FewerThreads/ThreadLimitedUdpServerConnection.cs index 149ab9e..0cb864f 100644 --- a/Hazel/FewerThreads/ThreadLimitedUdpServerConnection.cs +++ b/Hazel/FewerThreads/ThreadLimitedUdpServerConnection.cs @@ -33,7 +33,6 @@ namespace Hazel.Udp.FewerThreads { this.Listener = listener; this.ConnectionId = connectionId; - this.RemoteEndPoint = endPoint; this.EndPoint = endPoint; this.IPMode = IPMode; diff --git a/Hazel/NetworkConnection.cs b/Hazel/NetworkConnection.cs index 58915b7..9799509 100644 --- a/Hazel/NetworkConnection.cs +++ b/Hazel/NetworkConnection.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -28,26 +28,17 @@ namespace Hazel /// public Func OnInternalDisconnect; - /// - /// The remote end point of this connection. - /// - /// - /// This is the end point of the other device given as an rather than a generic - /// as the base does. - /// - public EndPoint RemoteEndPoint { get; protected set; } - public virtual float AveragePingMs { get; } public long GetIP4Address() { if (IPMode == IPMode.IPv4) { - return ((IPEndPoint)this.RemoteEndPoint).Address.Address; + return this.EndPoint.Address.Address; } else { - var bytes = ((IPEndPoint)this.RemoteEndPoint).Address.GetAddressBytes(); + var bytes = this.EndPoint.Address.GetAddressBytes(); return BitConverter.ToInt64(bytes, bytes.Length - 8); } } diff --git a/Hazel/Udp/UdpClientConnection.cs b/Hazel/Udp/UdpClientConnection.cs index af93286..072bc6d 100644 --- a/Hazel/Udp/UdpClientConnection.cs +++ b/Hazel/Udp/UdpClientConnection.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net; using System.Net.Sockets; using System.Threading; @@ -37,7 +37,6 @@ namespace Hazel.Udp : base() { this.EndPoint = remoteEndPoint; - this.RemoteEndPoint = remoteEndPoint; this.IPMode = ipMode; this.socket = CreateSocket(ipMode); @@ -89,7 +88,7 @@ namespace Hazel.Udp 0, length, SocketFlags.None, - RemoteEndPoint, + EndPoint, HandleSendTo, null); } @@ -318,7 +317,7 @@ namespace Hazel.Udp 0, bytes.Length, SocketFlags.None, - RemoteEndPoint); + EndPoint); } catch { } @@ -343,4 +342,4 @@ namespace Hazel.Udp base.Dispose(disposing); } } -} \ No newline at end of file +} diff --git a/Hazel/Udp/UdpServerConnection.cs b/Hazel/Udp/UdpServerConnection.cs index 32093c1..f348adb 100644 --- a/Hazel/Udp/UdpServerConnection.cs +++ b/Hazel/Udp/UdpServerConnection.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Net; namespace Hazel.Udp @@ -28,7 +28,6 @@ namespace Hazel.Udp : base() { this.Listener = listener; - this.RemoteEndPoint = endPoint; this.EndPoint = endPoint; this.IPMode = IPMode; @@ -39,7 +38,7 @@ namespace Hazel.Udp /// protected override void WriteBytesToConnection(byte[] bytes, int length) { - Listener.SendData(bytes, length, RemoteEndPoint); + Listener.SendData(bytes, length, EndPoint); } /// @@ -82,7 +81,7 @@ namespace Hazel.Udp try { - Listener.SendDataSync(bytes, bytes.Length, RemoteEndPoint); + Listener.SendDataSync(bytes, bytes.Length, EndPoint); } catch { } @@ -91,7 +90,7 @@ namespace Hazel.Udp protected override void Dispose(bool disposing) { - Listener.RemoveConnectionTo(RemoteEndPoint); + Listener.RemoveConnectionTo(EndPoint); if (disposing) { diff --git a/Hazel/Udp/UnityUdpClientConnection.cs b/Hazel/Udp/UnityUdpClientConnection.cs index eb9264b..8b50180 100644 --- a/Hazel/Udp/UnityUdpClientConnection.cs +++ b/Hazel/Udp/UnityUdpClientConnection.cs @@ -19,7 +19,6 @@ namespace Hazel.Udp : base() { this.EndPoint = remoteEndPoint; - this.RemoteEndPoint = remoteEndPoint; this.IPMode = ipMode; this.socket = CreateSocket(ipMode); @@ -55,7 +54,7 @@ namespace Hazel.Udp 0, length, SocketFlags.None, - RemoteEndPoint, + EndPoint, HandleSendTo, null); } @@ -153,7 +152,7 @@ namespace Hazel.Udp var msg = MessageReader.GetSized(ushort.MaxValue); try { - var ep = this.RemoteEndPoint; + EndPoint ep = this.EndPoint; socket.BeginReceiveFrom(msg.Buffer, 0, msg.Buffer.Length, SocketFlags.None, ref ep, ReadCallback, msg); } catch @@ -173,7 +172,7 @@ namespace Hazel.Udp try { - var ep = this.RemoteEndPoint; + EndPoint ep = this.EndPoint; msg.Length = socket.EndReceiveFrom(result, ref ep); } catch (SocketException e) -- 2.39.5