tyler.durden
/
icinga2
mirror of https://github.com/Icinga/icinga2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix another deadlock in TlsStream

This commit is contained in:
Gunnar Beutner 2014-10-17 20:56:22 +02:00
parent 6193255446
commit 2c8f766200
1 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/base/tlsstream.cpp
View File

@ -161,14 +161,7 @@ size_t TlsStream::Read(void *buffer, size_t count)
std::ostringstream msgbuf; std::ostringstream msgbuf;
char errbuf[120]; char errbuf[120];
bool want_read; if (SSL_want_read(m_SSL.get()))
{
boost::mutex::scoped_lock lock(m_SSLLock);
want_read = SSL_want_read(m_SSL.get());
}
if (want_read)
m_Socket->Poll(true, false); m_Socket->Poll(true, false);
boost::mutex::scoped_lock alock(m_IOActionLock); boost::mutex::scoped_lock alock(m_IOActionLock);
@ -225,12 +218,7 @@ void TlsStream::Write(const void *buffer, size_t count)
bool want_write; bool want_write;
{ if (SSL_want_write(m_SSL.get()))
boost::mutex::scoped_lock lock(m_SSLLock);
want_write = SSL_want_write(m_SSL.get());
}
if (want_write)
m_Socket->Poll(false, true); m_Socket->Poll(false, true);
boost::mutex::scoped_lock alock(m_IOActionLock); boost::mutex::scoped_lock alock(m_IOActionLock);