Allow socket receive to time out, improve socket error handling

HKMP/Networking/Client/ClientDatagramTransport.cs

@@ -45,18 +45,23 @@ public int GetSendLimit() {
     /// <param name="waitMillis">The number of milliseconds to wait for data to receive.</param>
     /// <returns>The number of bytes that were received, or -1 if no bytes were received in the given time.</returns>
     public int Receive(byte[] buf, int off, int len, int waitMillis) {
-        // TODO: timeout after waitMillis
         try {
+            _socket.ReceiveTimeout = waitMillis;
             var numReceived = _socket.Receive(
                 buf,
                 off,
                 len,
-                SocketFlags.None
+                SocketFlags.None,
+                out var socketError
             );
-            // Logger.Debug($"Client socket receive: {numReceived}");
-            return numReceived;
+
+            if (socketError == SocketError.Success) {
+                return numReceived;
+            }
+
+            Logger.Error($"UDP Socket Error on receive: {socketError}");
         } catch (SocketException e) {
-            Logger.Error($"UDP Socket exception:\n{e}");
+            Logger.Error($"UDP Socket exception, ErrorCode: {e.ErrorCode}, Socket ErrorCode: {e.SocketErrorCode}, Exception:\n{e}");
         }
 
         return -1;
@@ -70,7 +75,6 @@ public int Receive(byte[] buf, int off, int len, int waitMillis) {
     /// <param name="off">The offset in the buffer at which to start sending bytes.</param>
     /// <param name="len">The number of bytes to send.</param>
     public void Send(byte[] buf, int off, int len) {
-        // Logger.Debug($"Client sending {len} bytes of data");
         _socket.Send(buf, off, len, SocketFlags.None);
     }
 

HKMP/Networking/Server/DtlsServer.cs

@@ -134,9 +134,8 @@ private void SocketReceiveLoop(CancellationToken cancellationToken) {
         while (!cancellationToken.IsCancellationRequested) {
             EndPoint endPoint = new IPEndPoint(IPAddress.Any, 0);
 
-            // Logger.Debug("Blocking on server socket receive");
             var numReceived = 0;
-            var buffer = new byte[1400];
+            var buffer = new byte[MaxPacketSize];
 
             try {
                 numReceived = _socket.ReceiveFrom(
@@ -145,7 +144,7 @@ private void SocketReceiveLoop(CancellationToken cancellationToken) {
                     ref endPoint
                 );
             } catch (SocketException e) {
-                Logger.Error($"UDP server socket exception:\n{e}");
+                Logger.Error($"UDP Socket exception, ErrorCode: {e.ErrorCode}, Socket ErrorCode: {e.SocketErrorCode}, Exception:\n{e}");
             }
 
             var ipEndPoint = (IPEndPoint) endPoint;
@@ -158,7 +157,6 @@ ref endPoint
                 // Set the IP endpoint of the datagram transport instance so it can send data to the correct IP
                 serverDatagramTransport.IPEndPoint = ipEndPoint;
             } else {
-                // Logger.Debug($"Received data on server socket from existing client ({ipEndPoint}), length: {numReceived}");
                 serverDatagramTransport = dtlsServerClient.DatagramTransport;
             }
 
@@ -249,8 +247,6 @@ private void ClientReceiveLoop(DtlsServerClient dtlsServerClient, CancellationTo
             if (numReceived <= 0) {
                 continue;
             }
-
-            // Logger.Debug($"DtlsServerClient ({dtlsServerClient.EndPoint}) received {numReceived} bytes of data, invoking event");
 
             try {
                 DataReceivedEvent?.Invoke(dtlsServerClient, buffer, numReceived);

HKMP/Networking/Server/ServerDatagramTransport.cs

@@ -111,9 +111,7 @@ public void Send(byte[] buf, int off, int len) {
             Logger.Error("Cannot send because transport has no endpoint");
             return;
         }
-
-        // Logger.Debug($"Server sending {len} bytes of data to: {IPEndPoint}");
-
+
         _socket.SendTo(buf, off, len, SocketFlags.None, IPEndPoint);
     }