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

Jump to bottom

[core] Fixed SRTO_LOSSMAXTTL setting on accepted socket. Fixes #735. #843

Merged
merged 2 commits into from
Sep 3, 2019
Merged

[core] Fixed SRTO_LOSSMAXTTL setting on accepted socket. Fixes #735. #843

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c1dfc0
[core] Fixed SRTO_LOSSMAXTTL setting on accepted socket. Fixes #735.
maxsharabayko Sep 2, 2019
0866fd7
[core] Removed unused CUDT variable
maxsharabayko Sep 2, 2019
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
8 changes: 1 addition & 7 deletions srtcore/core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ CUDT::CUDT()
m_iSndCryptoKeyLen = 0;
//Cfg
m_bDataSender = false; //Sender only if true: does not recv data
m_bTwoWayData = false;
m_bOPT_TsbPd = true; //Enable TsbPd on sender
m_iOPT_TsbPdDelay = SRT_LIVE_DEF_LATENCY_MS;
m_iOPT_PeerTsbPdDelay = 0; //Peer's TsbPd delay as receiver (here is its minimum value, if used)
Expand All @@ -271,8 +270,6 @@ CUDT::CUDT()
m_bRcvNakReport = true; //Receiver's Periodic NAK Reports
m_llInputBW = 0; // Application provided input bandwidth (internal input rate sampling == 0)
m_iOverheadBW = 25; // Percent above input stream rate (applies if m_llMaxBW == 0)
m_bTwoWayData = false;

m_pCache = NULL;

// Default congctl is "live".
Expand Down Expand Up @@ -319,7 +316,6 @@ CUDT::CUDT(const CUDT& ancestor)
m_llInputBW = ancestor.m_llInputBW;
m_iOverheadBW = ancestor.m_iOverheadBW;
m_bDataSender = ancestor.m_bDataSender;
m_bTwoWayData = ancestor.m_bTwoWayData;
m_bOPT_TsbPd = ancestor.m_bOPT_TsbPd;
m_iOPT_TsbPdDelay = ancestor.m_iOPT_TsbPdDelay;
m_iOPT_PeerTsbPdDelay = ancestor.m_iOPT_PeerTsbPdDelay;
Expand All @@ -331,6 +327,7 @@ CUDT::CUDT(const CUDT& ancestor)
m_bTLPktDrop = ancestor.m_bTLPktDrop;
m_bMessageAPI = ancestor.m_bMessageAPI;
m_iIpV6Only = ancestor.m_iIpV6Only;
m_iMaxReorderTolerance = ancestor.m_iMaxReorderTolerance;
//Runtime
m_bRcvNakReport = ancestor.m_bRcvNakReport;

Expand Down Expand Up @@ -4751,9 +4748,6 @@ bool CUDT::createCrypter(HandshakeSide side, bool bidirectional)
// These data should probably be filled only upon
// reception of the conclusion handshake - otherwise
// they have outdated values.
if ( bidirectional )
m_bTwoWayData = true;

m_pCryptoControl->setCryptoSecret(m_CryptoSecret);

if ( bidirectional || m_bDataSender )
Expand Down
4 changes: 1 addition & 3 deletions srtcore/core.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,11 +543,9 @@ class CUDT
HaiCrypt_Secret m_CryptoSecret;
int m_iSndCryptoKeyLen;

// XXX Consider removing them. The m_bDataSender may stay here
// XXX Consider removing. The m_bDataSender stays here
// in order to maintain the HS side selection in HSv4.
// m_bTwoWayData is unused.
bool m_bDataSender;
bool m_bTwoWayData;

// HSv4 (legacy handshake) support)
uint64_t m_ullSndHsLastTime_us; //Last SRT handshake request time
Expand Down