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

Fix API crash with race condition on locks 

This was split from #5416 and #5419.

More patches from #5419 are pending.

refs #5419
refs #5418
refs #5416

refs #5408
refs #5148
refs #5007
refs #4968
refs #4910
This commit is contained in:
Michael Friedrich 2017-09-18 15:25:29 +02:00
parent e23801f299
commit 9948bee51c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/remote/apilistener.cpp
View File

@ -1309,37 +1309,37 @@ double ApiListener::CalculateZoneLag(const Endpoint::Ptr& endpoint)
void ApiListener::AddAnonymousClient(const JsonRpcConnection::Ptr& aclient) void ApiListener::AddAnonymousClient(const JsonRpcConnection::Ptr& aclient)
{ {
ObjectLock olock(this); boost::mutex::scoped_lock(m_AnonymousClientsLock);
m_AnonymousClients.insert(aclient); m_AnonymousClients.insert(aclient);
} }
void ApiListener::RemoveAnonymousClient(const JsonRpcConnection::Ptr& aclient) void ApiListener::RemoveAnonymousClient(const JsonRpcConnection::Ptr& aclient)
{ {
ObjectLock olock(this); boost::mutex::scoped_lock(m_AnonymousClientsLock);
m_AnonymousClients.erase(aclient); m_AnonymousClients.erase(aclient);
} }
std::set<JsonRpcConnection::Ptr> ApiListener::GetAnonymousClients(void) const std::set<JsonRpcConnection::Ptr> ApiListener::GetAnonymousClients(void) const
{ {
ObjectLock olock(this); boost::mutex::scoped_lock(m_AnonymousClientsLock);
return m_AnonymousClients; return m_AnonymousClients;
} }
void ApiListener::AddHttpClient(const HttpServerConnection::Ptr& aclient) void ApiListener::AddHttpClient(const HttpServerConnection::Ptr& aclient)
{ {
ObjectLock olock(this); boost::mutex::scoped_lock(m_HttpClientsLock);
m_HttpClients.insert(aclient); m_HttpClients.insert(aclient);
} }
void ApiListener::RemoveHttpClient(const HttpServerConnection::Ptr& aclient) void ApiListener::RemoveHttpClient(const HttpServerConnection::Ptr& aclient)
{ {
ObjectLock olock(this); boost::mutex::scoped_lock(m_HttpClientsLock);
m_HttpClients.erase(aclient); m_HttpClients.erase(aclient);
} }
std::set<HttpServerConnection::Ptr> ApiListener::GetHttpClients(void) const std::set<HttpServerConnection::Ptr> ApiListener::GetHttpClients(void) const
{ {
ObjectLock olock(this); boost::mutex::scoped_lock(m_HttpClientsLock);
return m_HttpClients; return m_HttpClients;
} }

4
lib/remote/apilistener.hpp
View File

@ -115,8 +115,12 @@ protected:
private: private:
boost::shared_ptr<SSL_CTX> m_SSLContext; boost::shared_ptr<SSL_CTX> m_SSLContext;
std::set<TcpSocket::Ptr> m_Servers; std::set<TcpSocket::Ptr> m_Servers;
mutable boost::mutex m_AnonymousClientsLock;
mutable boost::mutex m_HttpClientsLock;
std::set<JsonRpcConnection::Ptr> m_AnonymousClients; std::set<JsonRpcConnection::Ptr> m_AnonymousClients;
std::set<HttpServerConnection::Ptr> m_HttpClients; std::set<HttpServerConnection::Ptr> m_HttpClients;
Timer::Ptr m_Timer; Timer::Ptr m_Timer;
Timer::Ptr m_ReconnectTimer; Timer::Ptr m_ReconnectTimer;
Timer::Ptr m_AuthorityTimer; Timer::Ptr m_AuthorityTimer;