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

[core] fix CRcvBufferNew::m_iStartSeqNo was not sync in group #2266

Merged
merged 1 commit into from
Apr 21, 2022
Merged

[core] fix CRcvBufferNew::m_iStartSeqNo was not sync in group #2266

Show file tree
Hide file tree
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
2 changes: 2 additions & 0 deletions srtcore/buffer_rcv.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ class CRcvBufferNew

void setPeerRexmitFlag(bool flag) { m_bPeerRexmitFlag = flag; }

void applyGroupISN(int rcv_isn) { m_iStartSeqNo = rcv_isn; }

void applyGroupTime(const time_point& timebase, bool wrp, uint32_t delay, const duration& udrift);

void applyGroupDrift(const time_point& timebase, bool wrp, const duration& udrift);
Expand Down
5 changes: 5 additions & 0 deletions srtcore/core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3330,6 +3330,11 @@ void srt::CUDT::synchronizeWithGroup(CUDTGroup* gp)
<< " (shift by " << CSeqNo::seqcmp(snd_isn, m_iSndLastAck) << ")");
setInitialRcvSeq(rcv_isn);
setInitialSndSeq(snd_isn);
#if ENABLE_NEW_RCVBUFFER
enterCS(m_RecvLock);
m_pRcvBuffer->applyGroupISN(rcv_isn);
leaveCS(m_RecvLock);
#endif
}
else
{
Expand Down