Fixed headersize calculation in NetworkProfiler

Author: TwoTenPvP

MLAPI/MonoBehaviours/Core/NetworkingManager.cs

@@ -681,15 +681,13 @@ private void Update()
             {
                 if((NetworkTime - lastSendTickTime >= (1f / NetworkConfig.SendTickrate)) || NetworkConfig.SendTickrate <= 0)
                 {
-                    NetworkProfiler.StartTick(TickType.Send);
                     foreach (KeyValuePair<uint, NetworkedClient> pair in connectedClients)
                     {
                         byte error;
                         NetworkConfig.NetworkTransport.SendQueue(pair.Key, out error);
                         if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo("Send Pending Queue: " + pair.Key);
                     }
                     lastSendTickTime = NetworkTime;
-                    NetworkProfiler.EndTick();
                 }
                 if((NetworkTime - lastReceiveTickTime >= (1f / NetworkConfig.ReceiveTickrate)) || NetworkConfig.ReceiveTickrate <= 0)
                 {
@@ -838,8 +836,16 @@ private void HandleIncomingData(uint clientId, byte[] data, int channelId, uint
                 else if (isPassthrough && !isServer)
                     passthroughOrigin = reader.ReadUInt();
 
-                byte headerSize = 0; //TODO
-                NetworkProfiler.StartEvent(TickType.Receive, totalSize - headerSize, channelId, messageType);
+                long headerBitSize = BitWriter.GetBitCount(messageType) + BitWriter.GetBitCount(targeted);
+                if (targeted) headerBitSize += BitWriter.GetBitCount(targetNetworkId) + BitWriter.GetBitCount(networkOrderId);
+                headerBitSize += BitWriter.GetBitCount(isPassthrough);
+                if (isPassthrough && isServer)
+                    headerBitSize += BitWriter.GetBitCount(passthroughTarget);
+                else if (isPassthrough && !isServer)
+                    headerBitSize += BitWriter.GetBitCount(passthroughOrigin);
+                
+                uint headerByteSize = (uint)Math.Ceiling(headerBitSize / 8d);
+                NetworkProfiler.StartEvent(TickType.Receive, totalSize - headerByteSize, channelId, messageType);
 
                 if (LogHelper.CurrentLogLevel <= LogLevel.Developer) LogHelper.LogInfo("Data Header" + 
                     ":messageHeader=" + messageType + 

MLAPI/NetworkingManagerComponents/Binary/BitWriter.cs

@@ -359,9 +359,9 @@ private static Type GetUnsignedType(Type t) =>
             t == typeof(long) ? typeof(ulong) :
             null;
 
-        private static ulong ZigZagEncode(long d, int bytes) => (ulong)(((d >> (bytes * 8 - 1))&1) | (d << 1));
+        public static ulong ZigZagEncode(long d, int bytes) => (ulong)(((d >> (bytes * 8 - 1))&1) | (d << 1));
 
-        private static long GetBitCount<T>(T t)
+        public static long GetBitCount<T>(T t)
         {
             Type type = t.GetType();
             long count = 0;