Skip to content

[core] Fixed the inconsistency between getFirstLostSeq() and ackDataUpTo() #2488

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
maxsharabayko merged 2 commits into from
Nov 1, 2022
Merged

[core] Fixed the inconsistency between getFirstLostSeq() and ackDataUpTo() #2488

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c02a94f
[core] Fixed the inconsistency between getFirstLostSeq() and ackDataU…
gou4shi1 Oct 14, 2022
d18df82
Update srtcore/core.cpp
gou4shi1 Oct 17, 2022
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
9 changes: 5 additions & 4 deletions srtcore/core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7807,6 +7807,9 @@ int srt::CUDT::sendCtrlAck(CPacket& ctrlpkt, int size)
dropToGroupRecvBase();
#endif

/* tsbpd thread may also call ackData when skipping packet so protect code */
Comment thread
gou4shi1 marked this conversation as resolved.
Outdated
UniqueLock bufflock(m_RcvBufferLock);

{
// If there is no loss, the ACK is the current largest sequence number plus 1;
// Otherwise it is the smallest sequence number in the receiver loss list.
Expand Down Expand Up @@ -7835,18 +7838,16 @@ int srt::CUDT::sendCtrlAck(CPacket& ctrlpkt, int size)
// to save time on buffer processing and bandwidth/AS measurement, a lite ACK only feeds back an ACK number
if (size == SEND_LITE_ACK)
{
bufflock.unlock();
ctrlpkt.pack(UMSG_ACK, NULL, &ack, size);
ctrlpkt.m_iID = m_PeerID;
nbsent = m_pSndQueue->sendto(m_PeerAddr, ctrlpkt);
DebugAck(CONID() + "sendCtrl(lite): ", local_prevack, ack);
return nbsent;
}

// There are new received packets to acknowledge, update related information.
/* tsbpd thread may also call ackData when skipping packet so protect code */
UniqueLock bufflock(m_RcvBufferLock);

// IF ack %> m_iRcvLastAck
// There are new received packets to acknowledge, update related information.
if (CSeqNo::seqcmp(ack, m_iRcvLastAck) > 0)
{
ackDataUpTo(ack);
Expand Down