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

Bugfix: close the crypto under correct conditions #1078

Merged
merged 1 commit into from
Jan 21, 2020
Merged

Bugfix: close the crypto under correct conditions #1078

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
5 changes: 3 additions & 2 deletions srtcore/core.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5395,8 +5395,6 @@ bool CUDT::close()
sendCtrl(UMSG_SHUTDOWN);
}

m_pCryptoControl->close();

// Store current connection information.
CInfoBlock ib;
ib.m_iIPversion = m_PeerAddr.family();
Expand All @@ -5408,6 +5406,9 @@ bool CUDT::close()
m_bConnected = false;
}

if (m_pCryptoControl)
m_pCryptoControl->close();

if (m_bTsbPd && !pthread_equal(m_RcvTsbPdThread, pthread_t()))
{
HLOGC(mglog.Debug, log << "CLOSING, joining TSBPD thread...");
Expand Down