Skip to content

Commit 71f8870

Browse files
committed
[修改]1. 修改消息长度的大小为uint类型
1 parent b80c6b1 commit 71f8870

File tree

6 files changed

+18
-15
lines changed

6 files changed

+18
-15
lines changed

Runtime/Network/Helper/DefaultPacketReceiveHeaderHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public sealed class DefaultPacketReceiveHeaderHandler : IPacketReceiveHeaderHand
99
/// <summary>
1010
/// 包长度
1111
/// </summary>
12-
public ushort PacketLength { get; private set; }
12+
public uint PacketLength { get; private set; }
1313

1414
/// <summary>
1515
/// 消息ID
@@ -47,15 +47,15 @@ public bool Handler(object source)
4747

4848
// packetLength
4949
int offset = 0;
50-
var packetLength = reader.ReadUShort(ref offset); //4
50+
var packetLength = reader.ReadUInt(ref offset); //4
5151
PacketLength = packetLength;
5252
// operationType
5353
OperationType = reader.ReadByte(ref offset); //1
5454
// zipFlag
5555
ZipFlag = reader.ReadByte(ref offset); //1
5656
// uniqueId
5757
UniqueId = reader.ReadInt(ref offset); //4
58-
// MsgId
58+
// MessageId
5959
Id = reader.ReadInt(ref offset); //4
6060
return true;
6161
}

Runtime/Network/Helper/DefaultPacketSendHeaderHandler.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public DefaultPacketSendHeaderHandler()
5555
/// <summary>
5656
/// 获取网络消息包长度。
5757
/// </summary>
58-
public ushort PacketLength { get; private set; }
58+
public uint PacketLength { get; private set; }
5959

6060
/// <summary>
6161
/// 是否压缩消息内容
@@ -96,9 +96,9 @@ public bool Handler<T>(T messageObject, IMessageCompressHandler messageCompressH
9696
}
9797

9898
var messageLength = messageBodyBuffer.Length;
99-
PacketLength = (ushort)(PacketHeaderLength + messageLength);
99+
PacketLength = (uint)(PacketHeaderLength + messageLength);
100100
// 数据包总大小
101-
m_CachedByte.WriteUShort(PacketLength, ref m_Offset);
101+
m_CachedByte.WriteUInt(PacketLength, ref m_Offset);
102102
// 消息操作类型
103103
m_CachedByte.WriteByte((byte)(ProtoMessageIdHandler.IsHeartbeat(messageType) ? 1 : 4), ref m_Offset);
104104
// 消息压缩标记

Runtime/Network/Interface/IPacketReceiveHeaderHandler.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,14 @@ namespace GameFrameX.Network.Runtime
1313
public interface IPacketReceiveHeaderHandler
1414
{
1515
/// <summary>
16-
/// 消息包头长度
16+
/// 获取网络消息包长度。
1717
/// </summary>
18-
ushort PacketHeaderLength { get; }
18+
uint PacketLength { get; }
1919

2020
/// <summary>
21-
/// 获取网络消息包长度。
21+
/// 消息包头长度
2222
/// </summary>
23-
ushort PacketLength { get; }
23+
ushort PacketHeaderLength { get; }
2424

2525
/// <summary>
2626
/// 获取网络消息包协议编号。

Runtime/Network/Interface/IPacketSendHeaderHandler.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public interface IPacketSendHeaderHandler
2020
/// <summary>
2121
/// 获取网络消息包长度。
2222
/// </summary>
23-
ushort PacketLength { get; }
23+
uint PacketLength { get; }
2424

2525
/// <summary>
2626
/// 是否压缩消息内容

Runtime/Network/Network/SystemSocket/NetworkManager.SystemTcpNetworkChannel.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,9 @@ private void ReceiveAsync()
8181
{
8282
try
8383
{
84-
PSystemNetSocket.BeginReceive(PReceiveState.Stream.GetBuffer(), (int)PReceiveState.Stream.Position, (int)(PReceiveState.Stream.Length - PReceiveState.Stream.Position), SocketFlags.None, ReceiveCallback, PSystemNetSocket);
84+
var position = (int)PReceiveState.Stream.Position;
85+
var length = (int)(PReceiveState.Stream.Length - PReceiveState.Stream.Position);
86+
PSystemNetSocket.BeginReceive(PReceiveState.Stream.GetBuffer(), position, length, SocketFlags.None, ReceiveCallback, PSystemNetSocket);
8587
}
8688
catch (Exception exception)
8789
{
@@ -176,7 +178,8 @@ private bool ProcessPackHeader()
176178
var buffer = new byte[headerLength];
177179
_ = PReceiveState.Stream.Read(buffer, 0, headerLength);
178180
var processSuccess = PNetworkChannelHelper.DeserializePacketHeader(buffer);
179-
PReceiveState.Reset(PacketReceiveHeaderHandler.PacketLength - PacketReceiveHeaderHandler.PacketHeaderLength, PacketReceiveHeaderHandler);
181+
var bodyLength = (int)(PacketReceiveHeaderHandler.PacketLength - PacketReceiveHeaderHandler.PacketHeaderLength);
182+
PReceiveState.Reset(bodyLength, PacketReceiveHeaderHandler);
180183
return processSuccess;
181184
}
182185

@@ -186,7 +189,7 @@ private bool ProcessPackHeader()
186189
/// <returns></returns>
187190
private bool ProcessPackBody()
188191
{
189-
var bodyLength = PReceiveState.PacketHeader.PacketLength - PReceiveState.PacketHeader.PacketHeaderLength;
192+
var bodyLength = (int)(PReceiveState.PacketHeader.PacketLength - PReceiveState.PacketHeader.PacketHeaderLength);
190193
var buffer = new byte[bodyLength];
191194
_ = PReceiveState.Stream.Read(buffer, 0, bodyLength);
192195

Runtime/Network/Network/WebSocket/NetworkManager.WebSocketNetworkChannel.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ private void ReceiveCallback(byte[] buffer)
254254
var processSuccess = PNetworkChannelHelper.DeserializePacketHeader(buffer);
255255
if (processSuccess)
256256
{
257-
var bodyLength = PacketReceiveHeaderHandler.PacketLength - PacketReceiveHeaderHandler.PacketHeaderLength;
257+
var bodyLength = (int)(PacketReceiveHeaderHandler.PacketLength - PacketReceiveHeaderHandler.PacketHeaderLength);
258258
PReceiveState.Reset(bodyLength, PacketReceiveHeaderHandler);
259259
if (buffer.Length < bodyLength)
260260
{

0 commit comments

Comments
 (0)