Skip to content

chore: release 1.7.0 merge to develop #2750

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 4 commits into from
Oct 26, 2023
Merged

chore: release 1.7.0 merge to develop #2750

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
cca13d8
chore: merge develop into release 1.7.0 (#2729)
ShadauxCat Oct 5, 2023
702875d
fix: Wrong MTU calculations in UnityTransport (#2731)
simon-lemay-unity Oct 10, 2023
f4004c7
chore: Tagging release 1.7.0 (#2736)
ShadauxCat Oct 12, 2023
d998723
Merge branch 'develop' into chore/release_1.7.0_merge_to_develop
ShadauxCat Oct 26, 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/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)

Additional documentation and release notes are available at [Multiplayer Documentation](https://docs-multiplayer.unity3d.com).

## [Unreleased]
## [1.7.0] - 2023-10-11

### Added

Expand Down
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
2 changes: 1 addition & 1 deletion com.unity.netcode.gameobjects/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "com.unity.netcode.gameobjects",
"displayName": "Netcode for GameObjects",
"description": "Netcode for GameObjects is a high-level netcode SDK that provides networking capabilities to GameObject/MonoBehaviour workflows within Unity and sits on top of underlying transport layer.",
"version": "1.6.0",
"version": "1.7.0",
"unity": "2020.3",
"dependencies": {
"com.unity.nuget.mono-cecil": "1.10.1",
Expand Down