UdpConnection refactorings.

TcpConnection create a UdpConnection with a specific remote address, instead of Adress.Any.
NetworkLog logs not only the direction, but also the ipAddresses.

Author: Toemsel

Network/Connection.cs

@@ -795,7 +795,7 @@ private void HandleDefaultPackets(Packet packet)
             else if (packet.GetType().Equals(typeof(EstablishUdpRequest)))
             {
                 EstablishUdpRequest establishUdpRequest = (EstablishUdpRequest)packet;
-                IPEndPoint udpEndPoint = new IPEndPoint(IPAddress.Any, GetFreePort());
+                IPEndPoint udpEndPoint = new IPEndPoint(IPLocalEndPoint.Address, GetFreePort());
                 Send(new EstablishUdpResponse(udpEndPoint.Port, establishUdpRequest));
                 UdpConnection udpConnection = CreateUdpConnection(udpEndPoint,
                     new IPEndPoint(IPRemoteEndPoint.Address, establishUdpRequest.UdpPort), true);

Network/Logging/NetworkLog.cs

@@ -1,6 +1,7 @@
 using ConsoleTables;
 using Network.Enums;
 using Network.Packets;
+using Network.RSA;
 using System;
 using System.Diagnostics;
 using System.IO;
@@ -190,7 +191,7 @@ private void LogPacket(byte[] packet, Packet packetObj, PacketDirection directio
             if (!EnableLogging)
                 return;
 
-            ConsoleTable tableOutPut = BuildConsoleTable(packet, packetObj, direction.ToString());
+            ConsoleTable tableOutPut = BuildConsoleTable(packet, packetObj, direction);
 
             LogToAllOutputs(tableOutPut.ToStringAlternative());
         }
@@ -202,24 +203,28 @@ private void LogPacket(byte[] packet, Packet packetObj, PacketDirection directio
         /// <param name="packetObj">The <see cref="Packet"/> object.</param>
         /// <param name="direction"> The direction that the packet is traveling across the network.</param>
         /// <returns>The built <see cref="ConsoleTable"/>.</returns>
-        private ConsoleTable BuildConsoleTable(byte[] packet, Packet packetObj, string direction)
+        private ConsoleTable BuildConsoleTable(byte[] packet, Packet packetObj, PacketDirection direction)
         {
+            string localEndPoint = monitoredConnection.IPLocalEndPoint?.ToString();
+            string remoteEndPoint = monitoredConnection.IPRemoteEndPoint?.ToString();
+            
             object type = monitoredConnection.GetType().Name;
-            object local = monitoredConnection.IPLocalEndPoint?.ToString();
+            object route = string.Format("{0} -> {1}", direction == PacketDirection.Incoming ? remoteEndPoint : localEndPoint,
+                direction == PacketDirection.Incoming ? localEndPoint : remoteEndPoint);
             object ascii = Encoding.ASCII.GetString(packet, 0, packet.Length).Replace("\0", "").Replace("\n", "").Replace("\r", "");
             object packetName = packetObj.GetType().Name;
 
             ConsoleTable tableOutPut;
 
             if (string.IsNullOrWhiteSpace((string)ascii))
             {
-                tableOutPut = new ConsoleTable("Direction", "Type", "Local", "Packet");
-                tableOutPut.AddRow(direction, type, local, packetName);
+                tableOutPut = new ConsoleTable("Direction", "Type", "Route", "Packet");
+                tableOutPut.AddRow(direction, type, route, packetName);
             }
             else
             {
-                tableOutPut = new ConsoleTable("Direction", "Type", "Local", "ASCII", "Packet");
-                tableOutPut.AddRow(direction, type, local, ascii, packetName);
+                tableOutPut = new ConsoleTable("Direction", "Type", "Route", "Packet", "ASCII");
+                tableOutPut.AddRow(direction, type, route, packetName, ascii);
             }
 
             return tableOutPut;

Network/Network.xml

@@ -129,7 +129,7 @@ public override bool UseLoopback
         /// <param name="connectionEstablished">The action to perform upon connection.</param>
         internal void EstablishUdpConnection(Action<IPEndPoint, IPEndPoint> connectionEstablished)
         {
-            IPEndPoint udpEndPoint = new IPEndPoint(IPAddress.Any, GetFreePort());
+            IPEndPoint udpEndPoint = new IPEndPoint(IPLocalEndPoint.Address, GetFreePort());
             RegisterPacketHandler<EstablishUdpResponse>((packet, connection) =>
             {
                 UnRegisterPacketHandler<EstablishUdpResponse>(this);

Network/TcpConnection.cs

@@ -97,7 +97,7 @@ internal UdpConnection(UdpClient udpClient, IPEndPoint remoteEndPoint, bool writ
         public EndPoint LocalEndPoint => localEndPoint;
 
         /// <inheritdoc />
-        public override IPEndPoint IPRemoteEndPoint => localEndPoint;
+        public override IPEndPoint IPRemoteEndPoint => remoteEndPoint;
 
         /// <summary>
         /// The remote <see cref="EndPoint"/> for the <see cref="socket"/>.
@@ -199,7 +199,11 @@ protected override byte[] ReadBytes(int amount)
             if (amount == 0) return new byte[0];
             while (receivedBytes.Count < amount)
             {
-                receivedBytes.AddRange(client.Receive(ref localEndPoint).GetEnumerator().ToList<byte>());
+                // https://referencesource.microsoft.com/#System/net/System/Net/Sockets/UDPClient.cs,57ff640dfcb1cbf0
+                // UdpClient.cs (695) 20.10.2019
+                // the reference does fuck up our localEndPoint. Hence, we need to create a buffer...
+                IPEndPoint buffer = new IPEndPoint(localEndPoint.Address, localEndPoint.Port);
+                receivedBytes.AddRange(client.Receive(ref buffer).GetEnumerator().ToList<byte>());
                 Thread.Sleep(IntPerformance);
             }