Skip to content

fix: Wrong resulting data length that sending after extra BasePacketLayer modification #1064

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

Open
am1goo wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: Wrong resulting data length that sending after extra BasePacketLayer modification #1064

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 6 additions & 4 deletions Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/NetManager.Socket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -620,31 +620,33 @@ public bool SendBroadcast(byte[] data, int start, int length, int port)
return false;

NetPacket packet;
int packetSize;
if (_extraPacketLayer != null)
{
int headerSize = NetPacket.GetHeaderSize(PacketProperty.Broadcast);
packet = PoolGetPacket(headerSize + length + _extraPacketLayer.ExtraPacketSizeForLayer);
packet.Property = PacketProperty.Broadcast;
Buffer.BlockCopy(data, start, packet.RawData, headerSize, length);
int checksumComputeStart = 0;
int preCrcLength = length + headerSize;
packetSize = length + headerSize;
IPEndPoint emptyEp = null;
_extraPacketLayer.ProcessOutBoundPacket(ref emptyEp, ref packet.RawData, ref checksumComputeStart, ref preCrcLength);
_extraPacketLayer.ProcessOutBoundPacket(ref emptyEp, ref packet.RawData, ref checksumComputeStart, ref packetSize);
}
else
{
packet = PoolGetWithData(PacketProperty.Broadcast, data, start, length);
packetSize = packet.Size;
}

bool broadcastSuccess = false;
bool multicastSuccess = false;
try
{
broadcastSuccess = _udpSocketv4.SendTo(packet.RawData, 0, packet.Size, SocketFlags.None, new IPEndPoint(IPAddress.Broadcast, port)) > 0;
broadcastSuccess = _udpSocketv4.SendTo(packet.RawData, 0, packetSize, SocketFlags.None, new IPEndPoint(IPAddress.Broadcast, port)) > 0;

if (_udpSocketv6 != null)
{
multicastSuccess = _udpSocketv6.SendTo(packet.RawData, 0, packet.Size, SocketFlags.None, new IPEndPoint(MulticastAddressV6, port)) > 0;
multicastSuccess = _udpSocketv6.SendTo(packet.RawData, 0, packetSize, SocketFlags.None, new IPEndPoint(MulticastAddressV6, port)) > 0;
}
}
catch (SocketException ex)
Expand Down