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.

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

Fixed a timestamp of ACKACK control packet. #613

Merged
merged 1 commit into from
Mar 18, 2019
Merged
Changes from all commits
Commits
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: 1 addition & 4 deletions srtcore/core.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -6285,7 +6285,7 @@ void CUDT::sendCtrl(UDTMessageType pkttype, void* lparam, void* rparam, int size
uint64_t currtime_tk;
CTimer::rdtsc(currtime_tk);

ctrlpkt.m_iTimeStamp = int(currtime_tk/m_ullCPUFrequency - m_StartTime);
ctrlpkt.m_iTimeStamp = int(CTimer::getTime() - m_StartTime);;

int nbsent = 0;
int local_prevack = 0;
Expand Down Expand Up @@ -6333,9 +6333,6 @@ void CUDT::sendCtrl(UDTMessageType pkttype, void* lparam, void* rparam, int size
break;
}

uint64_t currtime_tk;
CTimer::rdtsc(currtime_tk);

// There are new received packets to acknowledge, update related information.
/* tsbpd thread may also call ackData when skipping packet so protect code */
CGuard::enterCS(m_AckLock);
Expand Down