Skip to content
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

Fix Linux Specific Softlock on empty datagrams #534

Merged
merged 3 commits into from
Nov 15, 2023
Merged

Fix Linux Specific Softlock on empty datagrams #534

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ecd9668
also read from selectReadList
ced777ric Nov 15, 2023
f577f39
repeat for non native
ced777ric Nov 15, 2023
71062a1
empty datagrams also have a size of 0
ced777ric Nov 15, 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
20 changes: 13 additions & 7 deletions LiteNetLib/NetManager.Socket.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,8 @@ private bool NativeReceiveFrom(ref NetPacket packet, IntPtr s, byte[] addrBuffer
//Reading data
packet.Size = NativeSocket.RecvFrom(s, packet.RawData, NetConstants.MaxPacketSize, addrBuffer, ref addrSize);
if (packet.Size == 0)
return false; //socket closed
return true; //socket closed or empty packet

if (packet.Size == -1)
{
var errorCode = NativeSocket.GetSocketError();
Expand Down Expand Up @@ -187,21 +188,24 @@ private void NativeReceiveLogic()
continue;
}
bool messageReceived = false;
if (socketv4.Available != 0)
if (socketv4.Available != 0 || selectReadList.Contains(socketv4))
{
if (NativeReceiveFrom(ref packet, socketHandle4, addrBuffer4, addrSize4) == false)
return;
messageReceived = true;
}
if (socketV6.Available != 0)
if (socketV6.Available != 0 || selectReadList.Contains(socketV6))
{
if (NativeReceiveFrom(ref packet, socketHandle6, addrBuffer6, addrSize6) == false)
return;
messageReceived = true;
}

selectReadList.Clear();

if (messageReceived)
continue;
selectReadList.Clear();

selectReadList.Add(socketv4);
selectReadList.Add(socketV6);
try
Expand Down Expand Up @@ -260,20 +264,22 @@ private void ReceiveLogic()
else
{
bool messageReceived = false;
if (socketv4.Available != 0)
if (socketv4.Available != 0 || selectReadList.Contains(socketv4))
{
ReceiveFrom(socketv4, ref bufferEndPoint4);
messageReceived = true;
}
if (socketV6.Available != 0)
if (socketV6.Available != 0 || selectReadList.Contains(socketV6))
{
ReceiveFrom(socketV6, ref bufferEndPoint6);
messageReceived = true;
}

selectReadList.Clear();

if (messageReceived)
continue;

selectReadList.Clear();
selectReadList.Add(socketv4);
selectReadList.Add(socketV6);
Socket.Select(selectReadList, null, null, ReceivePollingTime);
Expand Down