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

Move overlay classes to ripple_net module

Browse Source
This commit is contained in:
Vinnie Falco
2013-05-22 17:29:11 -07:00
parent 155a0a95c3
commit 6775ae60e0
5 changed files with 105 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
modules/ripple_basics/ripple_basics.cpp
View File

@@ -63,6 +63,7 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#include "src/cpp/ripple/PlatRand.cpp" // no log #include "src/cpp/ripple/PlatRand.cpp" // no log
#include "src/cpp/ripple/ProofOfWork.cpp" #include "src/cpp/ripple/ProofOfWork.cpp"
#include "src/cpp/ripple/RangeSet.cpp" #include "src/cpp/ripple/RangeSet.cpp"
#include "src/cpp/ripple/RippleAddress.cpp"
#include "src/cpp/ripple/rfc1751.cpp" // no log #include "src/cpp/ripple/rfc1751.cpp" // no log
#include "src/cpp/ripple/SHAMap.cpp" #include "src/cpp/ripple/SHAMap.cpp"
#include "src/cpp/ripple/SHAMapDiff.cpp" // no log #include "src/cpp/ripple/SHAMapDiff.cpp" // no log

3
modules/ripple_net/ripple_net.cpp
View File

@@ -41,6 +41,9 @@ static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
return 512 == iKeyLength ? theApp->getWallet().getDh512() : theApp->getWallet().getDh1024(); return 512 == iKeyLength ? theApp->getWallet().getDh512() : theApp->getWallet().getDh1024();
} }
#include "src/cpp/ripple/Suppression.cpp" // no log
#include "src/cpp/ripple/UniqueNodeList.cpp"
#include "src/cpp/ripple/SNTPClient.cpp" #include "src/cpp/ripple/SNTPClient.cpp"
#include "src/cpp/ripple/ConnectionPool.cpp" #include "src/cpp/ripple/ConnectionPool.cpp"

14
newcoin.vcxproj
View File

@@ -862,7 +862,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\ripple.pb.cc" /> <ClCompile Include="src\cpp\ripple\ripple.pb.cc" />
<ClCompile Include="src\cpp\ripple\RippleAddress.cpp" /> <ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\RippleCalc.cpp"> <ClCompile Include="src\cpp\ripple\RippleCalc.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -977,7 +982,12 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\SNTPClient.cpp" /> <ClCompile Include="src\cpp\ripple\SNTPClient.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Suppression.cpp" /> <ClCompile Include="src\cpp\ripple\Suppression.cpp" />
<ClCompile Include="src\cpp\ripple\Transaction.cpp"> <ClCompile Include="src\cpp\ripple\Transaction.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>

45
newcoin.vcxproj.filters
View File

@@ -113,6 +113,9 @@
<Filter Include="1. Modules\ripple_net\service"> <Filter Include="1. Modules\ripple_net\service">
<UniqueIdentifier>{074b2e47-f34b-42f1-945e-7e8083bbfb43}</UniqueIdentifier> <UniqueIdentifier>{074b2e47-f34b-42f1-945e-7e8083bbfb43}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="1. Modules\ripple_net\overlay">
<UniqueIdentifier>{1b44bca2-5d6b-45b6-815b-797059fb2c8e}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="src\cpp\database\sqlite3.c"> <ClCompile Include="src\cpp\database\sqlite3.c">
@@ -397,9 +400,6 @@
<ClCompile Include="src\cpp\protobuf\src\google\protobuf\stubs\substitute.cc"> <ClCompile Include="src\cpp\protobuf\src\google\protobuf\stubs\substitute.cc">
<Filter>0. Third Party Code\protobuf\stubs</Filter> <Filter>0. Third Party Code\protobuf\stubs</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\NicknameState.cpp"> <ClCompile Include="src\cpp\ripple\NicknameState.cpp">
<Filter>Unsorted Sources</Filter> <Filter>Unsorted Sources</Filter>
</ClCompile> </ClCompile>
@@ -409,12 +409,6 @@
<ClCompile Include="src\cpp\ripple\PFRequest.cpp"> <ClCompile Include="src\cpp\ripple\PFRequest.cpp">
<Filter>Unsorted Sources</Filter> <Filter>Unsorted Sources</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\Suppression.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\UniqueNodeList.cpp">
<Filter>Unsorted Sources</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\UpdateTables.cpp"> <ClCompile Include="src\cpp\ripple\UpdateTables.cpp">
<Filter>Unsorted Sources</Filter> <Filter>Unsorted Sources</Filter>
</ClCompile> </ClCompile>
@@ -724,6 +718,15 @@
<ClCompile Include="src\cpp\ripple\SNTPClient.cpp"> <ClCompile Include="src\cpp\ripple\SNTPClient.cpp">
<Filter>1. Modules\ripple_net\service</Filter> <Filter>1. Modules\ripple_net\service</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="src\cpp\ripple\UniqueNodeList.cpp">
<Filter>1. Modules\ripple_net\overlay</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\Suppression.cpp">
<Filter>1. Modules\ripple_net\overlay</Filter>
</ClCompile>
<ClCompile Include="src\cpp\ripple\RippleAddress.cpp">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClCompile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClInclude Include="database\sqlite3ext.h"> <ClInclude Include="database\sqlite3ext.h">
@@ -1023,9 +1026,6 @@
<ClInclude Include="src\cpp\protobuf\src\google\protobuf\stubs\type_traits.h"> <ClInclude Include="src\cpp\protobuf\src\google\protobuf\stubs\type_traits.h">
<Filter>0. Third Party Code\protobuf\stubs</Filter> <Filter>0. Third Party Code\protobuf\stubs</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\RippleAddress.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\KeyCache.h"> <ClInclude Include="src\cpp\ripple\KeyCache.h">
<Filter>Unsorted Sources</Filter> <Filter>Unsorted Sources</Filter>
</ClInclude> </ClInclude>
@@ -1041,15 +1041,6 @@
<ClInclude Include="src\cpp\ripple\PFRequest.h"> <ClInclude Include="src\cpp\ripple\PFRequest.h">
<Filter>Unsorted Sources</Filter> <Filter>Unsorted Sources</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\Suppression.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\uint256.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\UniqueNodeList.h">
<Filter>Unsorted Sources</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Version.h"> <ClInclude Include="src\cpp\ripple\Version.h">
<Filter>Unsorted Sources</Filter> <Filter>Unsorted Sources</Filter>
</ClInclude> </ClInclude>
@@ -1362,6 +1353,18 @@
<ClInclude Include="src\cpp\ripple\SNTPClient.h"> <ClInclude Include="src\cpp\ripple\SNTPClient.h">
<Filter>1. Modules\ripple_net\service</Filter> <Filter>1. Modules\ripple_net\service</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="src\cpp\ripple\uint256.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\UniqueNodeList.h">
<Filter>1. Modules\ripple_net\overlay</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\Suppression.h">
<Filter>1. Modules\ripple_net\overlay</Filter>
</ClInclude>
<ClInclude Include="src\cpp\ripple\RippleAddress.h">
<Filter>1. Modules\ripple_basics\types</Filter>
</ClInclude>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<None Include="wallet.xml" /> <None Include="wallet.xml" />

132
src/cpp/ripple/UniqueNodeList.cpp
View File

@@ -22,8 +22,6 @@
#include "Serializer.h" #include "Serializer.h"
#include "utils.h" #include "utils.h"
SETUP_LOG();
#define VALIDATORS_FETCH_SECONDS 30 #define VALIDATORS_FETCH_SECONDS 30
#define VALIDATORS_FILE_BYTES_MAX (50 << 10) #define VALIDATORS_FILE_BYTES_MAX (50 << 10)
@@ -54,8 +52,8 @@ void UniqueNodeList::start()
{ {
miscLoad(); miscLoad();
cLog(lsDEBUG) << "Validator fetch updated: " << mtpFetchUpdated; WriteLog (lsDEBUG, UniqueNodeList) << "Validator fetch updated: " << mtpFetchUpdated;
cLog(lsDEBUG) << "Validator score updated: " << mtpScoreUpdated; WriteLog (lsDEBUG, UniqueNodeList) << "Validator score updated: " << mtpScoreUpdated;
fetchNext(); // Start fetching. fetchNext(); // Start fetching.
scoreNext(false); // Start scoring. scoreNext(false); // Start scoring.
@@ -107,7 +105,7 @@ void UniqueNodeList::trustedLoad()
sClusterNodes.insert(std::make_pair(a, match[2])); sClusterNodes.insert(std::make_pair(a, match[2]));
} }
else else
cLog(lsWARNING) << "Entry in cluster list invalid: '" << c << "'"; WriteLog (lsWARNING, UniqueNodeList) << "Entry in cluster list invalid: '" << c << "'";
} }
Database* db=theApp->getWalletDB()->getDB(); Database* db=theApp->getWalletDB()->getDB();
@@ -147,12 +145,12 @@ bool UniqueNodeList::scoreRound(std::vector<scoreNode>& vsnNodes)
} }
} }
if (sLog(lsTRACE)) if (ShouldLog (lsTRACE, UniqueNodeList))
{ {
cLog(lsTRACE) << "midway: "; WriteLog (lsTRACE, UniqueNodeList) << "midway: ";
BOOST_FOREACH(scoreNode& sn, vsnNodes) BOOST_FOREACH(scoreNode& sn, vsnNodes)
{ {
cLog(lsTRACE) << str(boost::format("%s| %d, %d, %d: [%s]") WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("%s| %d, %d, %d: [%s]")
% sn.strValidator % sn.strValidator
% sn.iScore % sn.iScore
% sn.iRoundScore % sn.iRoundScore
@@ -172,12 +170,12 @@ bool UniqueNodeList::scoreRound(std::vector<scoreNode>& vsnNodes)
sn.iRoundScore = 0; sn.iRoundScore = 0;
} }
if (sLog(lsTRACE)) if (ShouldLog (lsTRACE, UniqueNodeList))
{ {
cLog(lsTRACE) << "finish: "; WriteLog (lsTRACE, UniqueNodeList) << "finish: ";
BOOST_FOREACH(scoreNode& sn, vsnNodes) BOOST_FOREACH(scoreNode& sn, vsnNodes)
{ {
cLog(lsTRACE) << str(boost::format("%s| %d, %d, %d: [%s]") WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("%s| %d, %d, %d: [%s]")
% sn.strValidator % sn.strValidator
% sn.iScore % sn.iScore
% sn.iRoundScore % sn.iRoundScore
@@ -296,11 +294,11 @@ void UniqueNodeList::scoreCompute()
} }
// For debugging, print out initial scores. // For debugging, print out initial scores.
if (sLog(lsTRACE)) if (ShouldLog (lsTRACE, UniqueNodeList))
{ {
BOOST_FOREACH(scoreNode& sn, vsnNodes) BOOST_FOREACH(scoreNode& sn, vsnNodes)
{ {
cLog(lsTRACE) << str(boost::format("%s| %d, %d, %d") WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("%s| %d, %d, %d")
% sn.strValidator % sn.strValidator
% sn.iScore % sn.iScore
% sn.iRoundScore % sn.iRoundScore
@@ -308,7 +306,7 @@ void UniqueNodeList::scoreCompute()
} }
} }
// cLog(lsTRACE) << str(boost::format("vsnNodes.size=%d") % vsnNodes.size()); // WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("vsnNodes.size=%d") % vsnNodes.size());
// Step through growing list of nodes adding each validation list. // Step through growing list of nodes adding each validation list.
// - Each validator may have provided referals. Add those referals as validators. // - Each validator may have provided referals. Add those referals as validators.
@@ -357,7 +355,7 @@ void UniqueNodeList::scoreCompute()
iReferral = itEntry->second; iReferral = itEntry->second;
} }
// cLog(lsTRACE) << str(boost::format("%s: Public=%s iReferral=%d") % strValidator % strReferral % iReferral); // WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("%s: Public=%s iReferral=%d") % strValidator % strReferral % iReferral);
} }
else else
@@ -368,7 +366,7 @@ void UniqueNodeList::scoreCompute()
? -1 // We ignore domains we can't find entires for. ? -1 // We ignore domains we can't find entires for.
: itEntry->second; : itEntry->second;
// cLog(lsTRACE) << str(boost::format("%s: Domain=%s iReferral=%d") % strValidator % strReferral % iReferral); // WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("%s: Domain=%s iReferral=%d") % strValidator % strReferral % iReferral);
} }
if (iReferral >= 0 && iNode != iReferral) if (iReferral >= 0 && iNode != iReferral)
@@ -384,12 +382,12 @@ void UniqueNodeList::scoreCompute()
for (int i = SCORE_ROUNDS; bDist && i--;) for (int i = SCORE_ROUNDS; bDist && i--;)
bDist = scoreRound(vsnNodes); bDist = scoreRound(vsnNodes);
if (sLog(lsTRACE)) if (ShouldLog (lsTRACE, UniqueNodeList))
{ {
cLog(lsTRACE) << "Scored:"; WriteLog (lsTRACE, UniqueNodeList) << "Scored:";
BOOST_FOREACH(scoreNode& sn, vsnNodes) BOOST_FOREACH(scoreNode& sn, vsnNodes)
{ {
cLog(lsTRACE) << str(boost::format("%s| %d, %d, %d: [%s]") WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("%s| %d, %d, %d: [%s]")
% sn.strValidator % sn.strValidator
% sn.iScore % sn.iScore
% sn.iRoundScore % sn.iRoundScore
@@ -470,7 +468,7 @@ void UniqueNodeList::scoreCompute()
{ {
umValidators[db->getStrBinary("Validator")] = db->getInt("Count"); umValidators[db->getStrBinary("Validator")] = db->getInt("Count");
// cLog(lsTRACE) << strValidator << ":" << db->getInt("Count"); // WriteLog (lsTRACE, UniqueNodeList) << strValidator << ":" << db->getInt("Count");
} }
} }
@@ -545,11 +543,11 @@ void UniqueNodeList::scoreTimerHandler(const boost::system::error_code& err)
mtpScoreNext = boost::posix_time::ptime(boost::posix_time::not_a_date_time); // Timer not set. mtpScoreNext = boost::posix_time::ptime(boost::posix_time::not_a_date_time); // Timer not set.
mtpScoreStart = boost::posix_time::second_clock::universal_time(); // Scoring. mtpScoreStart = boost::posix_time::second_clock::universal_time(); // Scoring.
cLog(lsTRACE) << "Scoring: Start"; WriteLog (lsTRACE, UniqueNodeList) << "Scoring: Start";
scoreCompute(); scoreCompute();
cLog(lsTRACE) << "Scoring: End"; WriteLog (lsTRACE, UniqueNodeList) << "Scoring: End";
// Save update time. // Save update time.
mtpScoreUpdated = mtpScoreStart; mtpScoreUpdated = mtpScoreStart;
@@ -569,7 +567,7 @@ void UniqueNodeList::scoreTimerHandler(const boost::system::error_code& err)
// <-- bNow: true, to force scoring for debugging. // <-- bNow: true, to force scoring for debugging.
void UniqueNodeList::scoreNext(bool bNow) void UniqueNodeList::scoreNext(bool bNow)
{ {
// cLog(lsTRACE) << str(boost::format("scoreNext: mtpFetchUpdated=%s mtpScoreStart=%s mtpScoreUpdated=%s mtpScoreNext=%s") % mtpFetchUpdated % mtpScoreStart % mtpScoreUpdated % mtpScoreNext); // WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("scoreNext: mtpFetchUpdated=%s mtpScoreStart=%s mtpScoreUpdated=%s mtpScoreNext=%s") % mtpFetchUpdated % mtpScoreStart % mtpScoreUpdated % mtpScoreNext);
bool bCanScore = mtpScoreStart.is_not_a_date_time() // Not scoring. bool bCanScore = mtpScoreStart.is_not_a_date_time() // Not scoring.
&& !mtpFetchUpdated.is_not_a_date_time(); // Something to score. && !mtpFetchUpdated.is_not_a_date_time(); // Something to score.
@@ -588,7 +586,7 @@ void UniqueNodeList::scoreNext(bool bNow)
mtpScoreNext = boost::posix_time::second_clock::universal_time() // Past now too. mtpScoreNext = boost::posix_time::second_clock::universal_time() // Past now too.
+ boost::posix_time::seconds(bNow ? 0 : SCORE_DELAY_SECONDS); + boost::posix_time::seconds(bNow ? 0 : SCORE_DELAY_SECONDS);
// cLog(lsTRACE) << str(boost::format("scoreNext: @%s") % mtpScoreNext); // WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("scoreNext: @%s") % mtpScoreNext);
mdtScoreTimer.expires_at(mtpScoreNext); mdtScoreTimer.expires_at(mtpScoreNext);
mdtScoreTimer.async_wait(boost::bind(&UniqueNodeList::scoreTimerHandler, this, _1)); mdtScoreTimer.async_wait(boost::bind(&UniqueNodeList::scoreTimerHandler, this, _1));
} }
@@ -630,7 +628,7 @@ void UniqueNodeList::processIps(const std::string& strSite, const RippleAddress&
std::string strEscNodePublic = sqlEscape(naNodePublic.humanNodePublic()); std::string strEscNodePublic = sqlEscape(naNodePublic.humanNodePublic());
cLog(lsDEBUG) WriteLog (lsDEBUG, UniqueNodeList)
<< str(boost::format("Validator: '%s' processing %d ips.") << str(boost::format("Validator: '%s' processing %d ips.")
% strSite % ( pmtVecStrIps ? pmtVecStrIps->size() : 0)); % strSite % ( pmtVecStrIps ? pmtVecStrIps->size() : 0));
@@ -668,7 +666,7 @@ void UniqueNodeList::processIps(const std::string& strSite, const RippleAddress&
} }
else else
{ {
cLog(lsTRACE) WriteLog (lsTRACE, UniqueNodeList)
<< str(boost::format("Validator: '%s' [" SECTION_IPS "]: rejecting '%s'") << str(boost::format("Validator: '%s' [" SECTION_IPS "]: rejecting '%s'")
% strSite % strReferral); % strSite % strReferral);
} }
@@ -699,7 +697,7 @@ int UniqueNodeList::processValidators(const std::string& strSite, const std::str
std::string strNodePublic = naNodePublic.isValid() ? naNodePublic.humanNodePublic() : strValidatorsSrc; std::string strNodePublic = naNodePublic.isValid() ? naNodePublic.humanNodePublic() : strValidatorsSrc;
int iValues = 0; int iValues = 0;
cLog(lsTRACE) WriteLog (lsTRACE, UniqueNodeList)
<< str(boost::format("Validator: '%s' : '%s' : processing %d validators.") << str(boost::format("Validator: '%s' : '%s' : processing %d validators.")
% strSite % strSite
% strValidatorsSrc % strValidatorsSrc
@@ -732,7 +730,7 @@ int UniqueNodeList::processValidators(const std::string& strSite, const std::str
if (!boost::regex_match(strReferral, smMatch, reReferral)) if (!boost::regex_match(strReferral, smMatch, reReferral))
{ {
cLog(lsWARNING) << str(boost::format("Bad validator: syntax error: %s: %s") % strSite % strReferral); WriteLog (lsWARNING, UniqueNodeList) << str(boost::format("Bad validator: syntax error: %s: %s") % strSite % strReferral);
} }
else else
{ {
@@ -743,7 +741,7 @@ int UniqueNodeList::processValidators(const std::string& strSite, const std::str
if (naValidator.setSeedGeneric(strRefered)) if (naValidator.setSeedGeneric(strRefered))
{ {
cLog(lsWARNING) << str(boost::format("Bad validator: domain or public key required: %s %s") % strRefered % strComment); WriteLog (lsWARNING, UniqueNodeList) << str(boost::format("Bad validator: domain or public key required: %s %s") % strRefered % strComment);
} }
else if (naValidator.setNodePublic(strRefered)) else if (naValidator.setNodePublic(strRefered))
{ {
@@ -751,7 +749,7 @@ int UniqueNodeList::processValidators(const std::string& strSite, const std::str
// XXX Schedule for CAS lookup. // XXX Schedule for CAS lookup.
nodeAddPublic(naValidator, vsWhy, strComment); nodeAddPublic(naValidator, vsWhy, strComment);
cLog(lsINFO) << str(boost::format("Node Public: %s %s") % strRefered % strComment); WriteLog (lsINFO, UniqueNodeList) << str(boost::format("Node Public: %s %s") % strRefered % strComment);
if (naNodePublic.isValid()) if (naNodePublic.isValid())
vstrValues.push_back(str(boost::format("('%s',%d,'%s')") % strNodePublic % iValues % naValidator.humanNodePublic())); vstrValues.push_back(str(boost::format("('%s',%d,'%s')") % strNodePublic % iValues % naValidator.humanNodePublic()));
@@ -763,7 +761,7 @@ int UniqueNodeList::processValidators(const std::string& strSite, const std::str
// A domain: need to look it up. // A domain: need to look it up.
nodeAddDomain(strRefered, vsWhy, strComment); nodeAddDomain(strRefered, vsWhy, strComment);
cLog(lsINFO) << str(boost::format("Node Domain: %s %s") % strRefered % strComment); WriteLog (lsINFO, UniqueNodeList) << str(boost::format("Node Domain: %s %s") % strRefered % strComment);
if (naNodePublic.isValid()) if (naNodePublic.isValid())
vstrValues.push_back(str(boost::format("('%s',%d,%s)") % strNodePublic % iValues % sqlEscape(strRefered))); vstrValues.push_back(str(boost::format("('%s',%d,%s)") % strNodePublic % iValues % sqlEscape(strRefered)));
@@ -914,7 +912,7 @@ void UniqueNodeList::processFile(const std::string& strDomain, const RippleAddre
if ((pvCurrencies = sectionEntries(secSite, SECTION_CURRENCIES)) && pvCurrencies->size()) if ((pvCurrencies = sectionEntries(secSite, SECTION_CURRENCIES)) && pvCurrencies->size())
{ {
// XXX Process currencies. // XXX Process currencies.
cLog(lsWARNING) << "Ignoring currencies: not implemented."; WriteLog (lsWARNING, UniqueNodeList) << "Ignoring currencies: not implemented.";
} }
getValidatorsUrl(naNodePublic, secSite); getValidatorsUrl(naNodePublic, secSite);
@@ -932,11 +930,11 @@ bool UniqueNodeList::responseFetch(const std::string& strDomain, const boost::sy
if (bGood) if (bGood)
{ {
cLog(lsTRACE) << boost::format("Validator: '%s' received " NODE_FILE_NAME ".") % strDomain; WriteLog (lsTRACE, UniqueNodeList) << boost::format("Validator: '%s' received " NODE_FILE_NAME ".") % strDomain;
} }
else else
{ {
cLog(lsTRACE) WriteLog (lsTRACE, UniqueNodeList)
<< boost::format("Validator: '%s' unable to retrieve " NODE_FILE_NAME ": %s") << boost::format("Validator: '%s' unable to retrieve " NODE_FILE_NAME ": %s")
% strDomain % strDomain
% err.message(); % err.message();
@@ -951,7 +949,7 @@ bool UniqueNodeList::responseFetch(const std::string& strDomain, const boost::sy
{ {
bGood = false; bGood = false;
cLog(lsTRACE) WriteLog (lsTRACE, UniqueNodeList)
<< boost::format("Validator: '%s' bad " NODE_FILE_NAME " missing single entry for " SECTION_DOMAIN ".") << boost::format("Validator: '%s' bad " NODE_FILE_NAME " missing single entry for " SECTION_DOMAIN ".")
% strDomain; % strDomain;
} }
@@ -960,7 +958,7 @@ bool UniqueNodeList::responseFetch(const std::string& strDomain, const boost::sy
{ {
bGood = false; bGood = false;
cLog(lsTRACE) WriteLog (lsTRACE, UniqueNodeList)
<< boost::format("Validator: '%s' bad " NODE_FILE_NAME " " SECTION_DOMAIN " does not match: %s") << boost::format("Validator: '%s' bad " NODE_FILE_NAME " " SECTION_DOMAIN " does not match: %s")
% strDomain % strDomain
% strSite; % strSite;
@@ -976,7 +974,7 @@ bool UniqueNodeList::responseFetch(const std::string& strDomain, const boost::sy
// Bad [validation_public_key] section. // Bad [validation_public_key] section.
bGood = false; bGood = false;
cLog(lsTRACE) WriteLog (lsTRACE, UniqueNodeList)
<< boost::format("Validator: '%s' bad " NODE_FILE_NAME " " SECTION_PUBLIC_KEY " does not have single entry.") << boost::format("Validator: '%s' bad " NODE_FILE_NAME " " SECTION_PUBLIC_KEY " does not have single entry.")
% strDomain; % strDomain;
} }
@@ -988,7 +986,7 @@ bool UniqueNodeList::responseFetch(const std::string& strDomain, const boost::sy
// Bad public key. // Bad public key.
bGood = false; bGood = false;
cLog(lsTRACE) WriteLog (lsTRACE, UniqueNodeList)
<< boost::format("Validator: '%s' bad " NODE_FILE_NAME " " SECTION_PUBLIC_KEY " is bad: ") << boost::format("Validator: '%s' bad " NODE_FILE_NAME " " SECTION_PUBLIC_KEY " is bad: ")
% strDomain % strDomain
% strNodePublicKey; % strNodePublicKey;
@@ -996,7 +994,7 @@ bool UniqueNodeList::responseFetch(const std::string& strDomain, const boost::sy
if (bGood) if (bGood)
{ {
// cLog(lsTRACE) << boost::format("naNodePublic: '%s'") % naNodePublic.humanNodePublic(); // WriteLog (lsTRACE, UniqueNodeList) << boost::format("naNodePublic: '%s'") % naNodePublic.humanNodePublic();
seedDomain sdCurrent; seedDomain sdCurrent;
@@ -1012,7 +1010,7 @@ bool UniqueNodeList::responseFetch(const std::string& strDomain, const boost::sy
// XXX Only if no other refs to keep it arround, other wise we have an attack vector. // XXX Only if no other refs to keep it arround, other wise we have an attack vector.
sdCurrent.naPublicKey = naNodePublic; sdCurrent.naPublicKey = naNodePublic;
// cLog(lsTRACE) << boost::format("sdCurrent.naPublicKey: '%s'") % sdCurrent.naPublicKey.humanNodePublic(); // WriteLog (lsTRACE, UniqueNodeList) << boost::format("sdCurrent.naPublicKey: '%s'") % sdCurrent.naPublicKey.humanNodePublic();
sdCurrent.tpFetch = boost::posix_time::second_clock::universal_time(); sdCurrent.tpFetch = boost::posix_time::second_clock::universal_time();
sdCurrent.iSha256 = iSha256; sdCurrent.iSha256 = iSha256;
@@ -1021,12 +1019,12 @@ bool UniqueNodeList::responseFetch(const std::string& strDomain, const boost::sy
if (bChangedB) if (bChangedB)
{ {
cLog(lsTRACE) << boost::format("Validator: '%s' processing new " NODE_FILE_NAME ".") % strDomain; WriteLog (lsTRACE, UniqueNodeList) << boost::format("Validator: '%s' processing new " NODE_FILE_NAME ".") % strDomain;
processFile(strDomain, naNodePublic, secSite); processFile(strDomain, naNodePublic, secSite);
} }
else else
{ {
cLog(lsTRACE) << boost::format("Validator: '%s' no change for " NODE_FILE_NAME ".") % strDomain; WriteLog (lsTRACE, UniqueNodeList) << boost::format("Validator: '%s' no change for " NODE_FILE_NAME ".") % strDomain;
fetchFinish(); fetchFinish();
} }
} }
@@ -1045,7 +1043,7 @@ bool UniqueNodeList::responseFetch(const std::string& strDomain, const boost::sy
// Get the ripple.txt and process it. // Get the ripple.txt and process it.
void UniqueNodeList::fetchProcess(std::string strDomain) void UniqueNodeList::fetchProcess(std::string strDomain)
{ {
cLog(lsTRACE) << "Fetching '" NODE_FILE_NAME "' from '" << strDomain << "'."; WriteLog (lsTRACE, UniqueNodeList) << "Fetching '" NODE_FILE_NAME "' from '" << strDomain << "'.";
std::deque<std::string> deqSites; std::deque<std::string> deqSites;
@@ -1071,7 +1069,7 @@ void UniqueNodeList::fetchTimerHandler(const boost::system::error_code& err)
if (!err) if (!err)
{ {
// Time to check for another fetch. // Time to check for another fetch.
cLog(lsTRACE) << "fetchTimerHandler"; WriteLog (lsTRACE, UniqueNodeList) << "fetchTimerHandler";
fetchNext(); fetchNext();
} }
} }
@@ -1105,7 +1103,7 @@ void UniqueNodeList::fetchNext()
tpNext = ptFromSeconds(iNext); tpNext = ptFromSeconds(iNext);
tpNow = boost::posix_time::second_clock::universal_time(); tpNow = boost::posix_time::second_clock::universal_time();
cLog(lsTRACE) << str(boost::format("fetchNext: iNext=%s tpNext=%s tpNow=%s") % iNext % tpNext % tpNow); WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("fetchNext: iNext=%s tpNext=%s tpNow=%s") % iNext % tpNext % tpNow);
strDomain = db->getStrBinary("Domain"); strDomain = db->getStrBinary("Domain");
db->endIterRows(); db->endIterRows();
@@ -1124,13 +1122,13 @@ void UniqueNodeList::fetchNext()
if (strDomain.empty() || bFull) if (strDomain.empty() || bFull)
{ {
cLog(lsTRACE) << str(boost::format("fetchNext: strDomain=%s bFull=%d") % strDomain % bFull); WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("fetchNext: strDomain=%s bFull=%d") % strDomain % bFull);
nothing(); nothing();
} }
else if (tpNext > tpNow) else if (tpNext > tpNow)
{ {
cLog(lsTRACE) << str(boost::format("fetchNext: set timer : strDomain=%s") % strDomain); WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("fetchNext: set timer : strDomain=%s") % strDomain);
// Fetch needs to happen in the future. Set a timer to wake us. // Fetch needs to happen in the future. Set a timer to wake us.
mtpFetchNext = tpNext; mtpFetchNext = tpNext;
@@ -1139,7 +1137,7 @@ void UniqueNodeList::fetchNext()
} }
else else
{ {
cLog(lsTRACE) << str(boost::format("fetchNext: fetch now: strDomain=%s tpNext=%s tpNow=%s") % strDomain % tpNext %tpNow); WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("fetchNext: fetch now: strDomain=%s tpNext=%s tpNow=%s") % strDomain % tpNext %tpNow);
// Fetch needs to happen now. // Fetch needs to happen now.
mtpFetchNext = boost::posix_time::ptime(boost::posix_time::not_a_date_time); mtpFetchNext = boost::posix_time::ptime(boost::posix_time::not_a_date_time);
@@ -1156,7 +1154,7 @@ void UniqueNodeList::fetchNext()
setSeedDomains(sdCurrent, false); setSeedDomains(sdCurrent, false);
cLog(lsTRACE) << "Validator: '" << strDomain << "' fetching " NODE_FILE_NAME "."; WriteLog (lsTRACE, UniqueNodeList) << "Validator: '" << strDomain << "' fetching " NODE_FILE_NAME ".";
fetchProcess(strDomain); // Go get it. fetchProcess(strDomain); // Go get it.
@@ -1251,7 +1249,7 @@ void UniqueNodeList::setSeedDomains(const seedDomain& sdSource, bool bNext)
int iScan = iToSeconds(sdSource.tpScan); int iScan = iToSeconds(sdSource.tpScan);
int iFetch = iToSeconds(sdSource.tpFetch); int iFetch = iToSeconds(sdSource.tpFetch);
// cLog(lsTRACE) << str(boost::format("setSeedDomains: iNext=%s tpNext=%s") % iNext % sdSource.tpNext); // WriteLog (lsTRACE) << str(boost::format("setSeedDomains: iNext=%s tpNext=%s") % iNext % sdSource.tpNext);
std::string strSql = boost::str(boost::format("REPLACE INTO SeedDomains (Domain,PublicKey,Source,Next,Scan,Fetch,Sha256,Comment) VALUES (%s, %s, %s, %d, %d, %d, '%s', %s);") std::string strSql = boost::str(boost::format("REPLACE INTO SeedDomains (Domain,PublicKey,Source,Next,Scan,Fetch,Sha256,Comment) VALUES (%s, %s, %s, %d, %d, %d, '%s', %s);")
% sqlEscape(sdSource.strDomain) % sqlEscape(sdSource.strDomain)
@@ -1269,7 +1267,7 @@ void UniqueNodeList::setSeedDomains(const seedDomain& sdSource, bool bNext)
if (!db->executeSQL(strSql)) if (!db->executeSQL(strSql))
{ {
// XXX Check result. // XXX Check result.
cLog(lsWARNING) << "setSeedDomains: failed."; WriteLog (lsWARNING, UniqueNodeList) << "setSeedDomains: failed.";
} }
if (bNext && (mtpFetchNext.is_not_a_date_time() || mtpFetchNext > sdSource.tpNext)) if (bNext && (mtpFetchNext.is_not_a_date_time() || mtpFetchNext > sdSource.tpNext))
@@ -1288,7 +1286,7 @@ void UniqueNodeList::nodeAddDomain(std::string strDomain, validatorSource vsWhy,
boost::to_lower(strDomain); boost::to_lower(strDomain);
// YYY Would be best to verify strDomain is a valid domain. // YYY Would be best to verify strDomain is a valid domain.
// cLog(lsTRACE) << str(boost::format("nodeAddDomain: '%s' %c '%s'") // WriteLog (lsTRACE) << str(boost::format("nodeAddDomain: '%s' %c '%s'")
// % strDomain // % strDomain
// % vsWhy // % vsWhy
// % strComment); // % strComment);
@@ -1389,7 +1387,7 @@ void UniqueNodeList::setSeedNodes(const seedNode& snSource, bool bNext)
int iScan = iToSeconds(snSource.tpScan); int iScan = iToSeconds(snSource.tpScan);
int iFetch = iToSeconds(snSource.tpFetch); int iFetch = iToSeconds(snSource.tpFetch);
// cLog(lsTRACE) << str(boost::format("setSeedNodes: iNext=%s tpNext=%s") % iNext % sdSource.tpNext); // WriteLog (lsTRACE) << str(boost::format("setSeedNodes: iNext=%s tpNext=%s") % iNext % sdSource.tpNext);
assert(snSource.naPublicKey.isValid()); assert(snSource.naPublicKey.isValid());
@@ -1409,7 +1407,7 @@ void UniqueNodeList::setSeedNodes(const seedNode& snSource, bool bNext)
if (!db->executeSQL(strSql)) if (!db->executeSQL(strSql))
{ {
// XXX Check result. // XXX Check result.
cLog(lsTRACE) << "setSeedNodes: failed."; WriteLog (lsTRACE, UniqueNodeList) << "setSeedNodes: failed.";
} }
} }
@@ -1530,21 +1528,21 @@ bool UniqueNodeList::nodeLoad(boost::filesystem::path pConfig)
{ {
if (pConfig.empty()) if (pConfig.empty())
{ {
cLog(lsINFO) << VALIDATORS_FILE_NAME " path not specified."; WriteLog (lsINFO, UniqueNodeList) << VALIDATORS_FILE_NAME " path not specified.";
return false; return false;
} }
if (!boost::filesystem::exists(pConfig)) if (!boost::filesystem::exists(pConfig))
{ {
cLog(lsWARNING) << str(boost::format(VALIDATORS_FILE_NAME " not found: %s") % pConfig); WriteLog (lsWARNING, UniqueNodeList) << str(boost::format(VALIDATORS_FILE_NAME " not found: %s") % pConfig);
return false; return false;
} }
if (!boost::filesystem::is_regular_file(pConfig)) if (!boost::filesystem::is_regular_file(pConfig))
{ {
cLog(lsWARNING) << str(boost::format(VALIDATORS_FILE_NAME " not regular file: %s") % pConfig); WriteLog (lsWARNING, UniqueNodeList) << str(boost::format(VALIDATORS_FILE_NAME " not regular file: %s") % pConfig);
return false; return false;
} }
@@ -1553,7 +1551,7 @@ bool UniqueNodeList::nodeLoad(boost::filesystem::path pConfig)
if (!ifsDefault) if (!ifsDefault)
{ {
cLog(lsFATAL) << str(boost::format(VALIDATORS_FILE_NAME " failed to open: %s") % pConfig); WriteLog (lsFATAL, UniqueNodeList) << str(boost::format(VALIDATORS_FILE_NAME " failed to open: %s") % pConfig);
return false; return false;
} }
@@ -1565,14 +1563,14 @@ bool UniqueNodeList::nodeLoad(boost::filesystem::path pConfig)
if (ifsDefault.bad()) if (ifsDefault.bad())
{ {
cLog(lsFATAL) << str(boost::format("Failed to read: %s") % pConfig); WriteLog (lsFATAL, UniqueNodeList) << str(boost::format("Failed to read: %s") % pConfig);
return false; return false;
} }
nodeProcess("local", strValidators, pConfig.string()); nodeProcess("local", strValidators, pConfig.string());
cLog(lsTRACE) << str(boost::format("Processing: %s") % pConfig); WriteLog (lsTRACE, UniqueNodeList) << str(boost::format("Processing: %s") % pConfig);
return true; return true;
} }
@@ -1583,7 +1581,7 @@ bool UniqueNodeList::validatorsResponse(const boost::system::error_code& err, in
if (!bReject) if (!bReject)
{ {
cLog(lsTRACE) << "Fetch '" VALIDATORS_FILE_NAME "' complete."; WriteLog (lsTRACE, UniqueNodeList) << "Fetch '" VALIDATORS_FILE_NAME "' complete.";
if (!err) if (!err)
{ {
@@ -1591,7 +1589,7 @@ bool UniqueNodeList::validatorsResponse(const boost::system::error_code& err, in
} }
else else
{ {
cLog(lsWARNING) << "Error: " << err.message(); WriteLog (lsWARNING, UniqueNodeList) << "Error: " << err.message();
} }
} }
@@ -1637,7 +1635,7 @@ void UniqueNodeList::nodeBootstrap()
// Always merge in the file specified in the config. // Always merge in the file specified in the config.
if (!theConfig.VALIDATORS_FILE.empty()) if (!theConfig.VALIDATORS_FILE.empty())
{ {
cLog(lsINFO) << "Bootstrapping UNL: loading from unl_default."; WriteLog (lsINFO, UniqueNodeList) << "Bootstrapping UNL: loading from unl_default.";
bLoaded = nodeLoad(theConfig.VALIDATORS_FILE); bLoaded = nodeLoad(theConfig.VALIDATORS_FILE);
} }
@@ -1645,7 +1643,7 @@ void UniqueNodeList::nodeBootstrap()
// If never loaded anything try the current directory. // If never loaded anything try the current directory.
if (!bLoaded && theConfig.VALIDATORS_FILE.empty()) if (!bLoaded && theConfig.VALIDATORS_FILE.empty())
{ {
cLog(lsINFO) << boost::str(boost::format("Bootstrapping UNL: loading from '%s'.") WriteLog (lsINFO, UniqueNodeList) << boost::str(boost::format("Bootstrapping UNL: loading from '%s'.")
% theConfig.VALIDATORS_BASE); % theConfig.VALIDATORS_BASE);
bLoaded = nodeLoad(theConfig.VALIDATORS_BASE); bLoaded = nodeLoad(theConfig.VALIDATORS_BASE);
@@ -1656,7 +1654,7 @@ void UniqueNodeList::nodeBootstrap()
{ {
RippleAddress naInvalid; // Don't want a referrer on added entries. RippleAddress naInvalid; // Don't want a referrer on added entries.
cLog(lsINFO) << boost::str(boost::format("Bootstrapping UNL: loading from '%s'.") WriteLog (lsINFO, UniqueNodeList) << boost::str(boost::format("Bootstrapping UNL: loading from '%s'.")
% theConfig.CONFIG_FILE); % theConfig.CONFIG_FILE);
if (processValidators("local", theConfig.CONFIG_FILE.string(), naInvalid, vsConfig, &theConfig.VALIDATORS)) if (processValidators("local", theConfig.CONFIG_FILE.string(), naInvalid, vsConfig, &theConfig.VALIDATORS))
@@ -1665,7 +1663,7 @@ void UniqueNodeList::nodeBootstrap()
if (!bLoaded) if (!bLoaded)
{ {
cLog(lsINFO) << boost::str(boost::format("Bootstrapping UNL: loading from '%s'.") WriteLog (lsINFO, UniqueNodeList) << boost::str(boost::format("Bootstrapping UNL: loading from '%s'.")
% theConfig.VALIDATORS_SITE); % theConfig.VALIDATORS_SITE);
nodeNetwork(); nodeNetwork();
@@ -1718,7 +1716,7 @@ void UniqueNodeList::nodeProcess(const std::string& strSite, const std::string&
} }
else else
{ {
cLog(lsWARNING) << boost::str(boost::format("'%s' missing [" SECTION_VALIDATORS "].") WriteLog (lsWARNING, UniqueNodeList) << boost::str(boost::format("'%s' missing [" SECTION_VALIDATORS "].")
% theConfig.VALIDATORS_BASE); % theConfig.VALIDATORS_BASE);
} }
} }