Merge pull request #165 from angusmf/master

Fix for issue #164

Author: TwoTenPvP

MLAPI/Data/Transports/UNET/UnetTransport.cs

@@ -8,6 +8,8 @@ namespace MLAPI.Transports.UNET
     [Serializable]
     public class UnetTransport : IUDPTransport
     {
+        private WeakReference temporaryBufferReference;
+        
         public ChannelType InternalChannel => ChannelType.ReliableFragmentedSequenced;
 		public uint ServerClientId => new NetId(0, 0, true).GetClientId();
         public int serverConnectionId;
@@ -68,6 +70,27 @@ public NetEventType PollReceive(out uint clientId, out int channelId, ref byte[]
             NetworkEventType eventType = NetworkTransport.Receive(out int hostId, out int connectionId, out channelId, data, bufferSize, out receivedSize, out byte err);
             clientId = new NetId((byte)hostId, (ushort)connectionId, false).GetClientId();
             NetworkError errorType = (NetworkError)err;
+
+            if (errorType == NetworkError.MessageToLong)
+            {
+                byte[] tempBuffer;
+                if (temporaryBufferReference != null && temporaryBufferReference.IsAlive && ((byte[]) temporaryBufferReference.Target).Length >= receivedSize)
+                {
+                    tempBuffer = (byte[])temporaryBufferReference.Target;
+                }
+                else
+                {
+                    tempBuffer = new byte[receivedSize];
+                    temporaryBufferReference = new WeakReference(tempBuffer);
+                }
+                
+                eventType = NetworkTransport.Receive(out hostId, out connectionId, out channelId, tempBuffer, tempBuffer.Length, out receivedSize, out err);
+                data = tempBuffer;
+            }
+            errorType = (NetworkError)err;
+            clientId = new NetId((byte)hostId, (ushort)connectionId, false).GetClientId();
+
+
             if (errorType == NetworkError.Timeout)
                 eventType = NetworkEventType.DisconnectEvent; //In UNET. Timeouts are not disconnects. We have to translate that here.
             error = 0;

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -20,6 +20,7 @@
 using MLAPI.Transports.UNET;
 using BitStream = MLAPI.Serialization.BitStream;
 using System.Security.Cryptography.X509Certificates;
+using UnityEngine.Networking;
 
 namespace MLAPI
 {
@@ -644,13 +645,13 @@ private void Update()
                     do
                     {
                         processedEvents++;
-                        uint clientId;
-                        int channelId;
-                        int receivedSize;
-                        byte error;
-                        byte[] data = messageBuffer;
-                        eventType = NetworkConfig.NetworkTransport.PollReceive(out clientId, out channelId, ref data, data.Length, out receivedSize, out error);
+                        eventType = NetworkConfig.NetworkTransport.PollReceive(out uint clientId, out int channelId, ref messageBuffer, messageBuffer.Length, out int receivedSize, out byte error);
 
+                        if ((NetworkError)error == NetworkError.MessageToLong)
+                        {
+                            byte[] b = messageBuffer;
+                            eventType = NetworkConfig.NetworkTransport.PollReceive(out clientId, out channelId, ref b, b.Length, out receivedSize, out error);
+                        }
                         switch (eventType)
                         {
                             case NetEventType.Connect:
@@ -731,7 +732,7 @@ private void Update()
                             case NetEventType.Data:
                                 if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo($"Incoming Data From {clientId} : {receivedSize} bytes");
 
-                                HandleIncomingData(clientId, data, channelId, receivedSize);
+                                HandleIncomingData(clientId, messageBuffer, channelId, receivedSize);
                                 break;
                             case NetEventType.Disconnect:
                                 NetworkProfiler.StartEvent(TickType.Receive, 0, "NONE", "TRANSPORT_DISCONNECT");