Skip to content

Drop fewer packets on UDP packet flood #5565

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
AndrewMeadows wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Drop fewer packets on UDP packet flood #5565

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a54ad05
ACK reveived but unprocessed packets when queued
AndrewMeadows Mar 23, 2026
195eafb
fix spelling typo
AndrewMeadows Mar 23, 2026
b0156e7
use correct stats, remove cruft, fix comments
AndrewMeadows Mar 23, 2026
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
5 changes: 2 additions & 3 deletions indra/llmessage/llcircuit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,7 @@ S32 LLCircuitData::resendUnackedPackets(const F64Seconds now)

packetp->mBuffer[0] |= LL_RESENT_FLAG; // tag packet id as being a resend

gMessageSystem->mPacketRing.sendPacket(packetp->mSocket,
(char *)packetp->mBuffer, packetp->mBufferLength,
gMessageSystem->sendPacketToSocket((char *)packetp->mBuffer, packetp->mBufferLength,
Copy link
Copy Markdown
Collaborator Author

@AndrewMeadows AndrewMeadows Mar 23, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The socket communication logic has been pulled out of LLPacketRing and moved into LLMessageSystem.

packetp->mHost);

mThrottles.throttleOverflow(TC_RESEND, packetp->mBufferLength * 8.f);
Expand Down Expand Up @@ -973,7 +972,7 @@ bool LLCircuitData::updateWatchDogTimers(LLMessageSystem *msgsys)
{
// let's call this one a loss!
mPacketsLost++;
gMessageSystem->mDroppedPackets++;
gMessageSystem->mLostPackets++;
Copy link
Copy Markdown
Collaborator Author

@AndrewMeadows AndrewMeadows Mar 23, 2026 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When the socket communication logic was moved into LLMessageSystem it caused a naming confusion: there was already a data member called mDroppedPackets being used for tracking outgoing packets that were lost, but new data members for tracking intentionally dropped (for testing purposes) incoming packets had very similar names. To address this we are changing this variable name.

if(gMessageSystem->mVerboseLog)
{
std::ostringstream str;
Expand Down
3 changes: 3 additions & 0 deletions indra/llmessage/llpacketbuffer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ class LLPacketBuffer
LLPacketBuffer(S32 hSocket); // receive a packet
~LLPacketBuffer();

LLPacketBuffer(const LLPacketBuffer&) = default;
LLPacketBuffer& operator=(const LLPacketBuffer&) = default;

S32 getSize() const { return mSize; }
const char *getData() const { return mData; }
LLHost getHost() const { return mHost; }
Expand Down
Loading
Loading