ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-11-19 18:45:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix deadlock in blacklist code.

Browse Source
This commit is contained in:
David Schwartz
2013-09-24 13:18:50 -07:00
parent c3bb005324
commit 01d7d7bed9
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/ripple_basics/containers/BlackList.h
View File

@@ -48,7 +48,7 @@ public:
boost::mutex::scoped_lock sl(mMutex);
iBlackList* e = findEntry(source, true);
return (e == NULL) || (e->mBalance <= (mCreditLimit * mDecaySeconds)) || isWhiteList(source);
return (e == NULL) || (e->mBalance <= (mCreditLimit * mDecaySeconds)) || isWhiteListLocked(source);
}
// Clean up stale entries
@@ -123,16 +123,8 @@ public:
bool isWhiteList(const std::string& source)
{
{
boost::mutex::scoped_lock sl(mMutex);
BOOST_FOREACH(const std::string& entry, mWhiteList)
{ // Does this source start with the entry?
if ((source.size() >= entry.size()) && (entry.compare(0, entry.size(), source) == 0))
return true;
}
}
return false;
boost::mutex::scoped_lock sl(mMutex);
return isWhiteListLocked(source);
}
static const int mWarnCost = 10; // The cost of being warned
@@ -151,6 +143,16 @@ private:
std::vector<std::string> mWhiteList;
boost::mutex mMutex;
bool isWhiteListLocked(const std::string& source)
{
BOOST_FOREACH(const std::string& entry, mWhiteList)
{ // Does this source start with the entry?
if ((source.size() >= entry.size()) && (entry.compare(0, entry.size(), source) == 0))
return true;
}
return false;
}
bool chargeEntry(const std::string& source, int charge)
{
boost::mutex::scoped_lock sl(mMutex);