Skip to content

fix: Wrong MTU calculations in UnityTransport #2731

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ShadauxCat merged 14 commits into from
Oct 10, 2023
Merged

fix: Wrong MTU calculations in UnityTransport #2731

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
c84a1dc
fix: GlobalObjectIdHash generation for already existing in-scene plac…
NoelStephensUnity Oct 2, 2023
5a2b607
feat: Added `GenerateSerializationForGenericParameterAttribute` and `…
ShadauxCat Oct 2, 2023
aa7ecbf
fix: ClientNetworkTransform ownership change with half precision sync…
NoelStephensUnity Oct 3, 2023
a5c0130
fix: GlobalObjectIdHash Generation (missed changes) (#2721)
NoelStephensUnity Oct 3, 2023
d565d9d
feat: Support for generic NetworkBehaviour types, and fix: issues wit…
ShadauxCat Oct 3, 2023
b50b396
feat: Update UTP to 1.4 and add ability to set UTP's MTU (#2716)
simon-lemay-unity Oct 4, 2023
6353f59
feat: Log errors when Relay/WebSocket settings are mismatched (#2715)
simon-lemay-unity Oct 4, 2023
a60288f
fix: Errors with NetworkVariable<float> and others in inspector (#2714)
ShadauxCat Oct 4, 2023
1701474
fix: Active scene not being added to server side NetworkSceneManager …
NoelStephensUnity Oct 4, 2023
b223d5f
feat: expose NetworkObject.GetNetworkBehaviourAtOrderIndex (#2724)
ShadauxCat Oct 4, 2023
2ec3eb4
fix: Wrong MTU calculations in UnityTransport
simon-lemay-unity Oct 5, 2023
d093f08
Add unit test
simon-lemay-unity Oct 5, 2023
07ee4f7
Use NGO client ID when fetching peer MTU
simon-lemay-unity Oct 6, 2023
959fea5
Merge branch 'release/1.7.0' into fix/mtu-calculations-utp
simon-lemay-unity Oct 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/Runtime/Transports/UTP/BatchedSendQueue.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ public int FillWriterWithBytes(ref DataStreamWriter writer, int maxBytes = 0)
return 0;
}

var maxLength = maxBytes == 0 ? writer.Capacity : maxBytes;
var maxLength = maxBytes == 0 ? writer.Capacity : Math.Min(maxBytes, writer.Capacity);
var copyLength = Math.Min(maxLength, Length);

unsafe
Expand Down
10 changes: 9 additions & 1 deletion com.unity.netcode.gameobjects/Runtime/Transports/UTP/UnityTransport.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -784,13 +784,21 @@ private void SendBatchedMessages(SendTarget sendTarget, BatchedSendQueue queue)
{
return;
}

var mtu = 0;
if (NetworkManager)
{
var ngoClientId = NetworkManager.ConnectionManager.TransportIdToClientId(sendTarget.ClientId);
mtu = NetworkManager.GetPeerMTU(ngoClientId);
}

new SendBatchedMessagesJob
{
Driver = m_Driver.ToConcurrent(),
Target = sendTarget,
Queue = queue,
ReliablePipeline = m_ReliableSequencedPipeline,
MTU = NetworkManager ? NetworkManager.GetPeerMTU(sendTarget.ClientId) + m_Driver.MaxHeaderSize(sendTarget.NetworkPipeline) : 0,
MTU = mtu,
}.Run();
}

Expand Down
17 changes: 17 additions & 0 deletions com.unity.netcode.gameobjects/Tests/Editor/Transports/BatchedSendQueueTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -293,6 +293,23 @@ public void BatchedSendQueue_FillWriterWithBytes_WriterCapacityEqualToLength()
AssertIsTestMessage(data);
}

[Test]
public void BatchedSendQueue_FillWriterWithBytes_MaxBytesGreaterThanCapacity()
{
var dataLength = k_TestMessageSize + BatchedSendQueue.PerMessageOverhead;

using var q = new BatchedSendQueue(k_TestQueueCapacity);
using var data = new NativeArray<byte>(dataLength, Allocator.Temp);

q.PushMessage(m_TestMessage);
q.PushMessage(m_TestMessage);

var writer = new DataStreamWriter(data);
Assert.AreEqual(dataLength, q.FillWriterWithBytes(ref writer, dataLength * 2));
AssertIsTestMessage(data);
Assert.False(writer.HasFailedWrites);
}

[Test]
public void BatchedSendQueue_Consume_LessThanLength()
{
Expand Down