diff --git a/Builds/VisualStudio2013/RippleD.vcxproj b/Builds/VisualStudio2013/RippleD.vcxproj index b78571b869..e8e69db1f4 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj +++ b/Builds/VisualStudio2013/RippleD.vcxproj @@ -50,7 +50,7 @@ - _WIN32_WINNT=0x6000;DEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x6000;DEBUG;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRTDBG_MAP_ALLOC;_CRT_SECURE_NO_WARNINGS;_DEBUG;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;%(AdditionalIncludeDirectories) 4800;4244;4267;4018 Async @@ -87,7 +87,7 @@ - _WIN32_WINNT=0x6000;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + _WIN32_WINNT=0x6000;DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER;NDEBUG;OPENSSL_NO_SSL2;WIN32_CONSOLE;_CRT_SECURE_NO_WARNINGS;_SCL_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) ..\..\build\proto;..\..\src;..\..\src\beast;..\..\src\protobuf\src;..\..\src\protobuf\vsprojects;%(AdditionalIncludeDirectories) 4800;4244;4267;4018 Async @@ -1877,6 +1877,16 @@ + + True + + + + + True + + + True @@ -1911,6 +1921,11 @@ + + True + + + True @@ -2124,10 +2139,14 @@ + + + + True @@ -2137,18 +2156,30 @@ True + + True + True + + True + True + + True + True True + + True + True @@ -2158,61 +2189,45 @@ True + + + + + + + + + + + + + + + + True + + + - - - - - - True - - - True - - - True - - - True - - - - - - - - - - - - - - - - - True - - - @@ -2255,116 +2270,52 @@ - + + + + + + + + + + + + + + + True - - - + True - - - + True - + True - + True - - - + True - - - + True - - - - - + True - - - - - + True - + - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - True - - - True - - - - - - - True - - - - - True - - - - - True - - - - - True - - - - - - - True - - - - + + + True @@ -2671,6 +2622,98 @@ + + + + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + True + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Document protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) @@ -2683,21 +2726,15 @@ protoc --cpp_out=..\..\build\proto --proto_path=%(RelativeDir) %(Identity) false - + - + - + - + - - - - - - - + True @@ -2729,6 +2766,12 @@ + + + + + + @@ -3070,25 +3113,6 @@ - - - - - - - - - - - - True - - - True - - - True - @@ -3116,9 +3140,6 @@ True - - True - True @@ -3130,8 +3151,6 @@ - - @@ -3182,14 +3201,10 @@ - - - + - - ..\..\src\hyperleveldb;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) ..\..\src\hyperleveldb;..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) @@ -3208,8 +3223,6 @@ - - ..\..\src\leveldb\include;..\..\src\rocksdb2\include;%(AdditionalIncludeDirectories) ..\..\src\leveldb\include;..\..\src\rocksdb2\include;%(AdditionalIncludeDirectories) @@ -3220,10 +3233,10 @@ + + - - @@ -3244,10 +3257,6 @@ ..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) ..\..\src\snappy\config;..\..\src\snappy\snappy;%(AdditionalIncludeDirectories) - - - - diff --git a/Builds/VisualStudio2013/RippleD.vcxproj.filters b/Builds/VisualStudio2013/RippleD.vcxproj.filters index f144100b6a..7224346d26 100644 --- a/Builds/VisualStudio2013/RippleD.vcxproj.filters +++ b/Builds/VisualStudio2013/RippleD.vcxproj.filters @@ -337,14 +337,8 @@ {1B5E3484-E132-ADEA-8A38-01B0F4ABAC58} - - {386F7193-3E90-1C28-75BE-5AE6461046C7} - - - {619EFB02-2AE3-7579-A69B-043F89A5BB5D} - - - {2B3171C5-9F59-6210-04BD-2E267A74D1BE} + + {B1F0C3D5-71C4-3ABF-E292-F147387D07CB} {235DCF23-2CF8-4F03-1A54-C159823A7E8D} @@ -352,17 +346,11 @@ {D9A8899A-B47C-E5BB-DDF1-32A50545A7D3} - - {1BC34E8A-BA0B-B540-36B1-3372C411208A} + + {165391B0-6CF7-0ECF-2566-2F12A922148E} - - {B1A9A795-C082-6590-D035-B2EDF0FE742C} - - - {06727C83-D304-C785-3D46-E2571F391900} - - - {1906827A-5174-9515-DC11-9D11C511E0CB} + + {8EF07519-1C32-2E82-D707-702EB0157733} {BEDCC703-A2C8-FF25-7E1E-3471BD39ED98} @@ -409,12 +397,15 @@ {8016685C-6468-9514-D06F-F95060DB5F10} + + {AAA1F4C4-829E-8085-A768-FB4DC3670296} + + + {0AFA29AA-2CF8-9A4D-112E-AA1044C005EC} + {7F5082C0-3323-CAC3-1868-CA49C7F63A34} - - {574CB17C-88F0-44EC-2182-AD07D6E99D36} - {A05858D1-18F0-3A7E-ECFD-7729C370F65B} @@ -442,12 +433,6 @@ {1D95DF26-0788-BD2C-2864-8B038A51FD58} - - {C0840101-C28E-ACD4-6862-2178B7E27420} - - - {55CFEEC5-7FF5-F959-9862-9FAE232054B7} - {29DBD04F-9324-A965-5C79-AA06EC10BA58} @@ -2784,6 +2769,18 @@ ripple\app\node + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + + + ripple\app\paths + ripple\app\paths\cursor @@ -2820,6 +2817,12 @@ ripple\app\paths\cursor + + ripple\app\paths + + + ripple\app\paths + ripple\app\paths @@ -3072,12 +3075,18 @@ ripple\basics + + ripple\basics + ripple\basics ripple\basics + + ripple\basics + ripple\basics\impl @@ -3087,18 +3096,30 @@ ripple\basics\impl + + ripple\basics\impl + ripple\basics\impl + + ripple\basics\impl + ripple\basics\impl + + ripple\basics\impl + ripple\basics\impl ripple\basics\impl + + ripple\basics\impl + ripple\basics\impl @@ -3108,15 +3129,33 @@ ripple\basics\impl + + ripple\basics + ripple\basics ripple\basics + + ripple\basics + ripple\basics + + ripple\basics + + + ripple\basics + + + ripple\basics + + + ripple\basics + ripple\basics @@ -3126,6 +3165,12 @@ ripple\basics + + ripple\basics + + + ripple\basics\tests + ripple\basics @@ -3135,53 +3180,11 @@ ripple\basics - + ripple\basics - - ripple\common - - - ripple\common - - - ripple\common\impl - - - ripple\common\impl - - - ripple\common\impl - - - ripple\common\impl - - - ripple\common - - - ripple\common - - - ripple\common - - - ripple\common - - - ripple\common - - - ripple\common - - - ripple\common - - - ripple\common\tests - - - ripple\common + + ripple\basics ripple\core @@ -3237,140 +3240,62 @@ ripple\core - - ripple\data\crypto + + ripple\crypto + + + ripple\crypto + + + ripple\crypto + + + ripple\crypto + + + ripple\crypto + + + ripple\crypto + + + ripple\crypto + + + ripple\crypto\impl - - ripple\data\crypto - - - ripple\data\crypto + + ripple\crypto\impl - - ripple\data\crypto - - - ripple\data\crypto + + ripple\crypto\impl - - ripple\data\crypto + + ripple\crypto\impl - - ripple\data\crypto + + ripple\crypto\impl - - ripple\data\crypto - - - ripple\data\protocol + + ripple\crypto\impl - - ripple\data\protocol - - - ripple\data\protocol + + ripple\crypto\impl - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol + + ripple\crypto\impl - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol + + ripple\crypto\impl - - ripple\data\protocol + + ripple\crypto - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\protocol - - - ripple\data\utility + + ripple\crypto + + + ripple\crypto ripple\json\impl @@ -3759,32 +3684,137 @@ ripple\peerfinder + + ripple\protocol + + + ripple\protocol + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol\impl + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + + + ripple\protocol + ripple\proto - - ripple\resource\api + + ripple\resource - - ripple\resource\api + + ripple\resource - - ripple\resource\api + + ripple\resource - - ripple\resource\api + + ripple\resource - - ripple\resource\api - - - ripple\resource\api - - - ripple\resource\api - - - ripple\resource\api + + ripple\resource ripple\resource\impl @@ -3822,6 +3852,15 @@ ripple\resource\impl + + ripple\resource + + + ripple\resource + + + ripple\resource + ripple\rpc @@ -4206,30 +4245,6 @@ ripple\sitefiles - - ripple\sslutil - - - ripple\sslutil - - - ripple\sslutil - - - ripple\sslutil - - - ripple\sslutil - - - ripple\sslutil\impl - - - ripple\sslutil\impl - - - ripple\sslutil\impl - ripple\types @@ -4266,9 +4281,6 @@ ripple\types\impl - - ripple\types\impl - ripple\types\impl @@ -4281,9 +4293,6 @@ ripple\types - - ripple\types - ripple\types @@ -4359,18 +4368,12 @@ ripple\unity - - ripple\unity - ripple\unity - + ripple\unity - - ripple\unity - ripple\unity @@ -4392,9 +4395,6 @@ ripple\unity - - ripple\unity - ripple\unity @@ -4407,12 +4407,12 @@ ripple\unity + + ripple\unity + ripple\unity - - ripple\unity - ripple\unity @@ -4437,12 +4437,6 @@ ripple\unity - - ripple\unity - - - ripple\unity - ripple\unity diff --git a/SConstruct b/SConstruct index 09c63f2f48..a811806637 100644 --- a/SConstruct +++ b/SConstruct @@ -199,7 +199,10 @@ def config_base(env): ) check_openssl() - env.Append(CPPDEFINES=['OPENSSL_NO_SSL2']) + env.Append(CPPDEFINES=[ + 'OPENSSL_NO_SSL2' + ,'DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER' + ]) try: BOOST_ROOT = os.path.normpath(os.environ['BOOST_ROOT']) @@ -568,20 +571,19 @@ for toolchain in all_toolchains: 'app9.cpp', 'basics.cpp', 'beast.cpp', - 'common.cpp', 'core.cpp', - 'data.cpp', + 'crypto.cpp', 'json.cpp', 'net.cpp', 'overlay.cpp', 'peerfinder.cpp', 'protobuf.cpp', + 'protocol.cpp', 'ripple.proto.cpp', 'resource.cpp', 'rpcx.cpp', 'server.cpp', 'sitefiles.cpp', - 'sslutil.cpp', 'types.cpp', 'validators.cpp', 'websocket.cpp', diff --git a/src/beast/beast/module/core/text/LexicalCast.h b/src/beast/beast/module/core/text/LexicalCast.h index c83fdda40c..59b481eb90 100644 --- a/src/beast/beast/module/core/text/LexicalCast.h +++ b/src/beast/beast/module/core/text/LexicalCast.h @@ -22,7 +22,7 @@ #include #include // - +#include #include #include #include diff --git a/src/ripple/app/book/Amount.h b/src/ripple/app/book/Amount.h index e5056fc9fe..fe04319ad0 100644 --- a/src/ripple/app/book/Amount.h +++ b/src/ripple/app/book/Amount.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_CORE_AMOUNT_H_INCLUDED #define RIPPLE_CORE_AMOUNT_H_INCLUDED -#include +#include #include #include // diff --git a/src/ripple/app/book/Offer.h b/src/ripple/app/book/Offer.h index ffd25ee44c..38b847b9ff 100644 --- a/src/ripple/app/book/Offer.h +++ b/src/ripple/app/book/Offer.h @@ -25,7 +25,7 @@ #include #include -#include +#include #include diff --git a/src/ripple/app/book/Taker.h b/src/ripple/app/book/Taker.h index 542071bc65..f7e15c6b70 100644 --- a/src/ripple/app/book/Taker.h +++ b/src/ripple/app/book/Taker.h @@ -24,10 +24,8 @@ #include #include #include - -#include +#include #include - #include namespace ripple { diff --git a/src/ripple/app/consensus/LedgerConsensus.cpp b/src/ripple/app/consensus/LedgerConsensus.cpp index ddc299b57c..94ca6c22c1 100644 --- a/src/ripple/app/consensus/LedgerConsensus.cpp +++ b/src/ripple/app/consensus/LedgerConsensus.cpp @@ -18,7 +18,11 @@ //============================================================================== #include +#include +#include +#include #include +#include #include #include diff --git a/src/ripple/app/data/DatabaseCon.cpp b/src/ripple/app/data/DatabaseCon.cpp index a4a37c3b25..f9a16468c7 100644 --- a/src/ripple/app/data/DatabaseCon.cpp +++ b/src/ripple/app/data/DatabaseCon.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include + namespace ripple { DatabaseCon::DatabaseCon (std::string const& strName, const char* initStrings[], int initCount) diff --git a/src/ripple/app/data/DatabaseCon.h b/src/ripple/app/data/DatabaseCon.h index c58dbbb14f..102f182213 100644 --- a/src/ripple/app/data/DatabaseCon.h +++ b/src/ripple/app/data/DatabaseCon.h @@ -21,12 +21,15 @@ #define RIPPLE_DATABASECON_H #include +#include namespace ripple { +class Database; + // VFALCO NOTE This looks like a pointless class. Figure out // what purpose it is really trying to serve and do it better. -class DatabaseCon : beast::LeakChecked +class DatabaseCon { public: DatabaseCon (std::string const& name, const char* initString[], int countInit); diff --git a/src/ripple/app/data/SqliteDatabase.cpp b/src/ripple/app/data/SqliteDatabase.cpp index fa35889607..f7695ccac3 100644 --- a/src/ripple/app/data/SqliteDatabase.cpp +++ b/src/ripple/app/data/SqliteDatabase.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#include +#include +#include + namespace ripple { SqliteStatement::SqliteStatement (SqliteDatabase* db, const char* sql, bool aux) diff --git a/src/ripple/app/data/SqliteDatabase.h b/src/ripple/app/data/SqliteDatabase.h index a03c4d1518..664057c6f4 100644 --- a/src/ripple/app/data/SqliteDatabase.h +++ b/src/ripple/app/data/SqliteDatabase.h @@ -21,6 +21,7 @@ #define RIPPLE_SQLITEDATABASE_H_INCLUDED #include +#include namespace ripple { @@ -80,7 +81,7 @@ private: void run (); void runWal (); - typedef RippleMutex LockType; + typedef std::mutex LockType; typedef std::lock_guard ScopedLockType; LockType m_walMutex; diff --git a/src/ripple/app/ledger/AcceptedLedger.cpp b/src/ripple/app/ledger/AcceptedLedger.cpp index a9aeeb2203..c383571ed7 100644 --- a/src/ripple/app/ledger/AcceptedLedger.cpp +++ b/src/ripple/app/ledger/AcceptedLedger.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include + namespace ripple { // VFALCO TODO Remove this global and make it a member of the App diff --git a/src/ripple/app/ledger/AcceptedLedgerTx.cpp b/src/ripple/app/ledger/AcceptedLedgerTx.cpp index 9db297c602..387626189b 100644 --- a/src/ripple/app/ledger/AcceptedLedgerTx.cpp +++ b/src/ripple/app/ledger/AcceptedLedgerTx.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/InboundLedger.cpp b/src/ripple/app/ledger/InboundLedger.cpp index fa64eb01b4..96110f2498 100644 --- a/src/ripple/app/ledger/InboundLedger.cpp +++ b/src/ripple/app/ledger/InboundLedger.cpp @@ -17,8 +17,14 @@ */ //============================================================================== +#include +#include +#include #include +#include +#include #include +#include namespace ripple { diff --git a/src/ripple/app/ledger/InboundLedgers.cpp b/src/ripple/app/ledger/InboundLedgers.cpp index 861fb695b1..593c2823c1 100644 --- a/src/ripple/app/ledger/InboundLedgers.cpp +++ b/src/ripple/app/ledger/InboundLedgers.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include +#include #include // namespace ripple { diff --git a/src/ripple/app/ledger/Ledger.cpp b/src/ripple/app/ledger/Ledger.cpp index e16840f455..ef8c39cc36 100644 --- a/src/ripple/app/ledger/Ledger.cpp +++ b/src/ripple/app/ledger/Ledger.cpp @@ -17,13 +17,16 @@ */ //============================================================================== +#include #include #include #include -#include +#include #include +#include #include #include +#include #include #include diff --git a/src/ripple/app/ledger/Ledger.h b/src/ripple/app/ledger/Ledger.h index eb9cf0af9b..a1b2e6dad1 100644 --- a/src/ripple/app/ledger/Ledger.h +++ b/src/ripple/app/ledger/Ledger.h @@ -26,7 +26,7 @@ #include #include #include -#include +#include #include namespace ripple { diff --git a/src/ripple/app/ledger/LedgerHistory.cpp b/src/ripple/app/ledger/LedgerHistory.cpp index d851932c5b..e727c00e77 100644 --- a/src/ripple/app/ledger/LedgerHistory.cpp +++ b/src/ripple/app/ledger/LedgerHistory.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include + namespace ripple { // VFALCO TODO replace macros diff --git a/src/ripple/app/ledger/LedgerProposal.cpp b/src/ripple/app/ledger/LedgerProposal.cpp index 7d6241145e..d060ffe1ca 100644 --- a/src/ripple/app/ledger/LedgerProposal.cpp +++ b/src/ripple/app/ledger/LedgerProposal.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include namespace ripple { diff --git a/src/ripple/app/ledger/LedgerTiming.cpp b/src/ripple/app/ledger/LedgerTiming.cpp index c7da845f7d..c5d0abdbff 100644 --- a/src/ripple/app/ledger/LedgerTiming.cpp +++ b/src/ripple/app/ledger/LedgerTiming.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include + namespace ripple { // VFALCO Should rename ContinuousLedgerTiming to LedgerTiming diff --git a/src/ripple/app/ledger/SerializedValidation.cpp b/src/ripple/app/ledger/SerializedValidation.cpp index ad2159a9c0..a0b8ff73a3 100644 --- a/src/ripple/app/ledger/SerializedValidation.cpp +++ b/src/ripple/app/ledger/SerializedValidation.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include namespace ripple { diff --git a/src/ripple/app/main/Application.cpp b/src/ripple/app/main/Application.cpp index 74b2a7dfbd..701dfccad3 100644 --- a/src/ripple/app/main/Application.cpp +++ b/src/ripple/app/main/Application.cpp @@ -20,17 +20,19 @@ #include #include #include +#include #include #include #include -#include -#include -#include +#include +#include #include +#include #include #include #include #include +#include #include #include #include diff --git a/src/ripple/app/main/Application.h b/src/ripple/app/main/Application.h index 00365fcc3a..c033d4b8fe 100644 --- a/src/ripple/app/main/Application.h +++ b/src/ripple/app/main/Application.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include diff --git a/src/ripple/app/main/BasicFullBelowCache.h b/src/ripple/app/main/BasicFullBelowCache.h index a99c19f3e8..88ae9c8810 100644 --- a/src/ripple/app/main/BasicFullBelowCache.h +++ b/src/ripple/app/main/BasicFullBelowCache.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED #define RIPPLE_RADMAP_BASICFULLBELOWCACHE_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/app/main/LoadManager.cpp b/src/ripple/app/main/LoadManager.cpp index 305ad2db27..5994223c34 100644 --- a/src/ripple/app/main/LoadManager.cpp +++ b/src/ripple/app/main/LoadManager.cpp @@ -17,7 +17,9 @@ */ //============================================================================== +#include #include +#include namespace ripple { diff --git a/src/ripple/app/main/LocalCredentials.cpp b/src/ripple/app/main/LocalCredentials.cpp index 91b8730427..36ada486d2 100644 --- a/src/ripple/app/main/LocalCredentials.cpp +++ b/src/ripple/app/main/LocalCredentials.cpp @@ -18,7 +18,7 @@ //============================================================================== #include -#include +#include #include namespace ripple { diff --git a/src/ripple/app/main/Main.cpp b/src/ripple/app/main/Main.cpp index e00106e367..06e8e56c3b 100644 --- a/src/ripple/app/main/Main.cpp +++ b/src/ripple/app/main/Main.cpp @@ -21,6 +21,10 @@ #include #include #include +#include +#include +#include +#include #include #include diff --git a/src/ripple/app/main/ParameterTable.cpp b/src/ripple/app/main/ParameterTable.cpp index 795c125ea8..2a0ae9c971 100644 --- a/src/ripple/app/main/ParameterTable.cpp +++ b/src/ripple/app/main/ParameterTable.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include namespace ripple { diff --git a/src/ripple/app/misc/HashRouter.cpp b/src/ripple/app/misc/HashRouter.cpp index fcd7784aad..e9aa8af250 100644 --- a/src/ripple/app/misc/HashRouter.cpp +++ b/src/ripple/app/misc/HashRouter.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include namespace ripple { diff --git a/src/ripple/app/misc/NetworkOPs.cpp b/src/ripple/app/misc/NetworkOPs.cpp index c8eee8ddfc..66a4a37c8b 100644 --- a/src/ripple/app/misc/NetworkOPs.cpp +++ b/src/ripple/app/misc/NetworkOPs.cpp @@ -19,12 +19,22 @@ #include #include +#include +#include #include #include -#include +#include +#include #include #include +#include +#include #include +#include +#include +#include +#include +#include #include #include #include // diff --git a/src/ripple/app/misc/ProofOfWorkFactory.cpp b/src/ripple/app/misc/ProofOfWorkFactory.cpp index 0c39bdb55f..9c45cd1323 100644 --- a/src/ripple/app/misc/ProofOfWorkFactory.cpp +++ b/src/ripple/app/misc/ProofOfWorkFactory.cpp @@ -17,8 +17,13 @@ */ //============================================================================== +#include +#include #include #include +#include +#include +#include #include // namespace ripple { @@ -28,7 +33,7 @@ class ProofOfWorkFactoryImp , public beast::LeakChecked { public: - typedef boost::bimap< boost::bimaps::multiset_of, + typedef boost::bimaps::bimap< boost::bimaps::multiset_of, boost::bimaps::unordered_set_of > powMap_t; typedef powMap_t::value_type powMap_vt; diff --git a/src/ripple/app/misc/ProofOfWorkFactory.h b/src/ripple/app/misc/ProofOfWorkFactory.h index 00dcf6472c..e1ad8c37b5 100644 --- a/src/ripple/app/misc/ProofOfWorkFactory.h +++ b/src/ripple/app/misc/ProofOfWorkFactory.h @@ -22,7 +22,9 @@ #include #include +#include #include // +#include namespace ripple { diff --git a/src/ripple/app/misc/SerializedLedger.h b/src/ripple/app/misc/SerializedLedger.h index 0030a9b77e..0f68e1f104 100644 --- a/src/ripple/app/misc/SerializedLedger.h +++ b/src/ripple/app/misc/SerializedLedger.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SERIALIZEDLEDGER_H #define RIPPLE_SERIALIZEDLEDGER_H -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/app/misc/SerializedTransaction.cpp b/src/ripple/app/misc/SerializedTransaction.cpp index daf51b4c7d..0f0e35046b 100644 --- a/src/ripple/app/misc/SerializedTransaction.cpp +++ b/src/ripple/app/misc/SerializedTransaction.cpp @@ -18,6 +18,9 @@ //============================================================================== #include +#include +#include +#include #include #include diff --git a/src/ripple/app/misc/SerializedTransaction.h b/src/ripple/app/misc/SerializedTransaction.h index cdf5167fe2..fc88978d03 100644 --- a/src/ripple/app/misc/SerializedTransaction.h +++ b/src/ripple/app/misc/SerializedTransaction.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_SERIALIZEDTRANSACTION_H #define RIPPLE_SERIALIZEDTRANSACTION_H -#include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/misc/Validations.cpp b/src/ripple/app/misc/Validations.cpp index 5acbe6f221..9792a8bc6e 100644 --- a/src/ripple/app/misc/Validations.cpp +++ b/src/ripple/app/misc/Validations.cpp @@ -18,6 +18,8 @@ //============================================================================== #include +#include +#include #include // #include #include diff --git a/src/ripple/app/paths/PathRequest.cpp b/src/ripple/app/paths/PathRequest.cpp index 479bfd38f0..66671dcb90 100644 --- a/src/ripple/app/paths/PathRequest.cpp +++ b/src/ripple/app/paths/PathRequest.cpp @@ -19,8 +19,11 @@ #include #include +#include #include #include +#include +#include #include #include #include diff --git a/src/ripple/app/paths/PathRequests.cpp b/src/ripple/app/paths/PathRequests.cpp index 7505c890ff..9060988796 100644 --- a/src/ripple/app/paths/PathRequests.cpp +++ b/src/ripple/app/paths/PathRequests.cpp @@ -17,6 +17,9 @@ */ //============================================================================== +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/paths/PathRequests.h b/src/ripple/app/paths/PathRequests.h index e6d373899c..dc88fb150d 100644 --- a/src/ripple/app/paths/PathRequests.h +++ b/src/ripple/app/paths/PathRequests.h @@ -20,6 +20,7 @@ #ifndef RIPPLE_PATHREQUESTS_H #define RIPPLE_PATHREQUESTS_H +#include #include namespace ripple { diff --git a/src/ripple/app/paths/Pathfinder.cpp b/src/ripple/app/paths/Pathfinder.cpp index 3093b8a6c9..6a47b815c3 100644 --- a/src/ripple/app/paths/Pathfinder.cpp +++ b/src/ripple/app/paths/Pathfinder.cpp @@ -19,7 +19,7 @@ #include #include - +#include #include namespace ripple { diff --git a/src/ripple/app/peers/UniqueNodeList.cpp b/src/ripple/app/peers/UniqueNodeList.cpp index 4f37eba813..9084261c5a 100644 --- a/src/ripple/app/peers/UniqueNodeList.cpp +++ b/src/ripple/app/peers/UniqueNodeList.cpp @@ -20,6 +20,7 @@ #include #include #include +#include #include #include // #include @@ -27,6 +28,7 @@ #include #include #include +#include namespace ripple { diff --git a/src/ripple/app/shamap/SHAMap.cpp b/src/ripple/app/shamap/SHAMap.cpp index c38ec7f217..58ed7e98fd 100644 --- a/src/ripple/app/shamap/SHAMap.cpp +++ b/src/ripple/app/shamap/SHAMap.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include diff --git a/src/ripple/app/shamap/SHAMap.h b/src/ripple/app/shamap/SHAMap.h index 95d9a583f3..18f06cab06 100644 --- a/src/ripple/app/shamap/SHAMap.h +++ b/src/ripple/app/shamap/SHAMap.h @@ -27,7 +27,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/ripple/app/shamap/SHAMapItem.h b/src/ripple/app/shamap/SHAMapItem.h index c79eb96c61..8bb8752b02 100644 --- a/src/ripple/app/shamap/SHAMapItem.h +++ b/src/ripple/app/shamap/SHAMapItem.h @@ -21,7 +21,7 @@ #define RIPPLE_SHAMAPITEM_H #include -#include +#include #include #include diff --git a/src/ripple/app/shamap/SHAMapNodeID.cpp b/src/ripple/app/shamap/SHAMapNodeID.cpp index 8c90003bac..a1c44f024a 100644 --- a/src/ripple/app/shamap/SHAMapNodeID.cpp +++ b/src/ripple/app/shamap/SHAMapNodeID.cpp @@ -17,9 +17,10 @@ */ //============================================================================== +#include +#include #include #include -#include #include #include #include diff --git a/src/ripple/app/shamap/SHAMapNodeID.h b/src/ripple/app/shamap/SHAMapNodeID.h index ed2c8077f3..983234cd97 100644 --- a/src/ripple/app/shamap/SHAMapNodeID.h +++ b/src/ripple/app/shamap/SHAMapNodeID.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SHAMAPNODEID_H #define RIPPLE_SHAMAPNODEID_H -#include +#include #include #include #include diff --git a/src/ripple/app/shamap/SHAMapSync.cpp b/src/ripple/app/shamap/SHAMapSync.cpp index 282443e300..c24365a6be 100644 --- a/src/ripple/app/shamap/SHAMapSync.cpp +++ b/src/ripple/app/shamap/SHAMapSync.cpp @@ -19,6 +19,7 @@ #include #include +#include // DEPRECATED namespace ripple { @@ -808,7 +809,7 @@ public: { unsigned int seed; - // VFALCO TODO Replace this with beast::Random + // VFALCO DEPRECATED Should use C++11 RAND_pseudo_bytes (reinterpret_cast (&seed), sizeof (seed)); srand (seed); diff --git a/src/ripple/app/shamap/SHAMapTreeNode.h b/src/ripple/app/shamap/SHAMapTreeNode.h index 12d49c216d..5f15ea3071 100644 --- a/src/ripple/app/shamap/SHAMapTreeNode.h +++ b/src/ripple/app/shamap/SHAMapTreeNode.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include namespace ripple { diff --git a/src/ripple/app/shamap/TreeNodeCache.h b/src/ripple/app/shamap/TreeNodeCache.h index 26e614ac78..c223f2a39e 100644 --- a/src/ripple/app/shamap/TreeNodeCache.h +++ b/src/ripple/app/shamap/TreeNodeCache.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_APP_SHAMAP_TREENODECACHE_H_INCLUDED #define RIPPLE_APP_SHAMAP_TREENODECACHE_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/app/transactors/Change.cpp b/src/ripple/app/transactors/Change.cpp index 7b47d4adc2..7f5ff79c29 100644 --- a/src/ripple/app/transactors/Change.cpp +++ b/src/ripple/app/transactors/Change.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { class Change diff --git a/src/ripple/app/tx/Transaction.h b/src/ripple/app/tx/Transaction.h index 230a32e590..6024c2f0dd 100644 --- a/src/ripple/app/tx/Transaction.h +++ b/src/ripple/app/tx/Transaction.h @@ -21,7 +21,7 @@ #define RIPPLE_TRANSACTION_H #include -#include +#include namespace ripple { diff --git a/src/ripple/app/tx/TransactionMaster.cpp b/src/ripple/app/tx/TransactionMaster.cpp index 7f9178ecdb..1e9cf24bad 100644 --- a/src/ripple/app/tx/TransactionMaster.cpp +++ b/src/ripple/app/tx/TransactionMaster.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { TransactionMaster::TransactionMaster () diff --git a/src/ripple/app/tx/TransactionMeta.h b/src/ripple/app/tx/TransactionMeta.h index fd1b4ba6ad..985678be4f 100644 --- a/src/ripple/app/tx/TransactionMeta.h +++ b/src/ripple/app/tx/TransactionMeta.h @@ -21,7 +21,8 @@ #define RIPPLE_TRANSACTIONMETA_H #include -#include +#include +#include #include namespace ripple { diff --git a/src/ripple/app/tx/TxQueue.h b/src/ripple/app/tx/TxQueue.h index ef79ed638d..096aa4feaa 100644 --- a/src/ripple/app/tx/TxQueue.h +++ b/src/ripple/app/tx/TxQueue.h @@ -20,6 +20,9 @@ #ifndef RIPPLE_TXQUEUE_H_INCLUDED #define RIPPLE_TXQUEUE_H_INCLUDED +// VFALCO TODO merge TxQueueEntry.h into this file +#include + namespace ripple { class TxQueue : beast::LeakChecked diff --git a/src/ripple/app/websocket/WSConnection.cpp b/src/ripple/app/websocket/WSConnection.cpp index 8719ce31c1..791ec0c798 100644 --- a/src/ripple/app/websocket/WSConnection.cpp +++ b/src/ripple/app/websocket/WSConnection.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include +#include +#include +#include #include #include diff --git a/src/ripple/app/websocket/WSConnection.h b/src/ripple/app/websocket/WSConnection.h index 994527802f..9812fe32a5 100644 --- a/src/ripple/app/websocket/WSConnection.h +++ b/src/ripple/app/websocket/WSConnection.h @@ -21,6 +21,7 @@ #define RIPPLE_WSCONNECTION_H #include +#include #include #include #include diff --git a/src/ripple/app/websocket/WSServerHandler.h b/src/ripple/app/websocket/WSServerHandler.h index 540e4efce2..a3f7ed795b 100644 --- a/src/ripple/app/websocket/WSServerHandler.h +++ b/src/ripple/app/websocket/WSServerHandler.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_WSSERVERHANDLER_H_INCLUDED #define RIPPLE_WSSERVERHANDLER_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/ArraySize.h b/src/ripple/basics/ArraySize.h index a600f8913c..49d07cac34 100644 --- a/src/ripple/basics/ArraySize.h +++ b/src/ripple/basics/ArraySize.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_ARRAYSIZE_H_INCLUDED -#define RIPPLE_ARRAYSIZE_H_INCLUDED +#ifndef RIPPLE_BASICS_ARRAYSIZE_H_INCLUDED +#define RIPPLE_BASICS_ARRAYSIZE_H_INCLUDED namespace ripple { diff --git a/src/ripple/basics/BasicTypes.h b/src/ripple/basics/BasicTypes.h index 7240125c44..8013ef7a5d 100644 --- a/src/ripple/basics/BasicTypes.h +++ b/src/ripple/basics/BasicTypes.h @@ -17,21 +17,17 @@ */ //============================================================================== -#ifndef RIPPLE_BASICTYPES_H -#define RIPPLE_BASICTYPES_H +#ifndef RIPPLE_BASICS_BASICTYPES_H_INCLUDED +#define RIPPLE_BASICS_BASICTYPES_H_INCLUDED #include namespace ripple { -/** Synchronization primitives. - This lets us switch between tracked and untracked mutexes. -*/ +// VFALCO DEPRECATED typedef std::mutex RippleMutex; typedef std::recursive_mutex RippleRecursiveMutex; -//------------------------------------------------------------------------------ - } // ripple #endif diff --git a/src/ripple/basics/BoostIncludes.h b/src/ripple/basics/BoostIncludes.h deleted file mode 100644 index 706ed242ca..0000000000 --- a/src/ripple/basics/BoostIncludes.h +++ /dev/null @@ -1,32 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef RIPPLE_BOOSTINCLUDES_H_INCLUDED -#define RIPPLE_BOOSTINCLUDES_H_INCLUDED - -#define BOOST_FILESYSTEM_NO_DEPRECATED - -#include -#include -#include - -// work-around for broken -#include - -#endif diff --git a/src/ripple/basics/CheckLibraryVersions.h b/src/ripple/basics/CheckLibraryVersions.h index 5bb150dde7..6be0718e48 100644 --- a/src/ripple/basics/CheckLibraryVersions.h +++ b/src/ripple/basics/CheckLibraryVersions.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_CHECKLIBRARYVERSIONS_H_INCLUDED -#define RIPPLE_CHECKLIBRARYVERSIONS_H_INCLUDED +#ifndef RIPPLE_BASICS_CHECKLIBRARYVERSIONS_H_INCLUDED +#define RIPPLE_BASICS_CHECKLIBRARYVERSIONS_H_INCLUDED #include diff --git a/src/ripple/basics/CountedObject.h b/src/ripple/basics/CountedObject.h index 363650a419..5a3a80e346 100644 --- a/src/ripple/basics/CountedObject.h +++ b/src/ripple/basics/CountedObject.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_COUNTEDOBJECT_H_INCLUDED -#define RIPPLE_COUNTEDOBJECT_H_INCLUDED +#ifndef RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED +#define RIPPLE_BASICS_COUNTEDOBJECT_H_INCLUDED #include #include diff --git a/src/ripple/common/DecayingSample.h b/src/ripple/basics/DecayingSample.h similarity index 97% rename from src/ripple/common/DecayingSample.h rename to src/ripple/basics/DecayingSample.h index e8eafe6a8e..49c7b61d8d 100644 --- a/src/ripple/common/DecayingSample.h +++ b/src/ripple/basics/DecayingSample.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_COMMON_DECAYINGSAMPLE_H_INCLUDED -#define RIPPLE_COMMON_DECAYINGSAMPLE_H_INCLUDED +#ifndef RIPPLE_BASICS_DECAYINGSAMPLE_H_INCLUDED +#define RIPPLE_BASICS_DECAYINGSAMPLE_H_INCLUDED namespace ripple { diff --git a/src/ripple/common/KeyCache.h b/src/ripple/basics/KeyCache.h similarity index 98% rename from src/ripple/common/KeyCache.h rename to src/ripple/basics/KeyCache.h index 63f53617a5..f18210bb98 100644 --- a/src/ripple/common/KeyCache.h +++ b/src/ripple/basics/KeyCache.h @@ -17,16 +17,15 @@ */ //============================================================================== -#ifndef RIPPLE_KEYCACHE_H_INCLUDED -#define RIPPLE_KEYCACHE_H_INCLUDED - -#include +#ifndef RIPPLE_BASICS_KEYCACHE_H_INCLUDED +#define RIPPLE_BASICS_KEYCACHE_H_INCLUDED +#include #include #include #include #include -#include +#include namespace ripple { diff --git a/src/ripple/basics/Log.h b/src/ripple/basics/Log.h index 8f389eaaf6..39f3d22779 100644 --- a/src/ripple/basics/Log.h +++ b/src/ripple/basics/Log.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_BASICS_LOG_H_INCLUDED #define RIPPLE_BASICS_LOG_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/LoggedTimings.h b/src/ripple/basics/LoggedTimings.h index ebbd47573a..16dcdea8b2 100644 --- a/src/ripple/basics/LoggedTimings.h +++ b/src/ripple/basics/LoggedTimings.h @@ -20,6 +20,7 @@ #ifndef RIPPLE_BASICS_LOGGEDTIMINGS_H_INCLUDED #define RIPPLE_BASICS_LOGGEDTIMINGS_H_INCLUDED +#include #include #include #include diff --git a/src/ripple/basics/README.md b/src/ripple/basics/README.md new file mode 100644 index 0000000000..a19cbf5bf5 --- /dev/null +++ b/src/ripple/basics/README.md @@ -0,0 +1,5 @@ +# Basics + +Utility functions and classes. + +There should be no dependencies on business logic in other modules. \ No newline at end of file diff --git a/src/ripple/basics/RangeSet.h b/src/ripple/basics/RangeSet.h index 6c94e04515..903e6a1e4a 100644 --- a/src/ripple/basics/RangeSet.h +++ b/src/ripple/basics/RangeSet.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_RANGESET_H_INCLUDED -#define RIPPLE_RANGESET_H_INCLUDED +#ifndef RIPPLE_BASICS_RANGESET_H_INCLUDED +#define RIPPLE_BASICS_RANGESET_H_INCLUDED #include #include diff --git a/src/ripple/common/Resolver.h b/src/ripple/basics/Resolver.h similarity index 96% rename from src/ripple/common/Resolver.h rename to src/ripple/basics/Resolver.h index c0f96394b2..01c818afc1 100644 --- a/src/ripple/common/Resolver.h +++ b/src/ripple/basics/Resolver.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_COMMON_RESOLVER_H_INCLUDED -#define RIPPLE_COMMON_RESOLVER_H_INCLUDED +#ifndef RIPPLE_BASICS_RESOLVER_H_INCLUDED +#define RIPPLE_BASICS_RESOLVER_H_INCLUDED #include #include diff --git a/src/ripple/common/ResolverAsio.h b/src/ripple/basics/ResolverAsio.h similarity index 91% rename from src/ripple/common/ResolverAsio.h rename to src/ripple/basics/ResolverAsio.h index a2cf15d66a..9f68ad0601 100644 --- a/src/ripple/common/ResolverAsio.h +++ b/src/ripple/basics/ResolverAsio.h @@ -17,13 +17,12 @@ */ //============================================================================== -#ifndef RIPPLE_COMMON_RESOLVERASIO_H_INCLUDED -#define RIPPLE_COMMON_RESOLVERASIO_H_INCLUDED - -#include +#ifndef RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED +#define RIPPLE_BASICS_RESOLVERASIO_H_INCLUDED +#include #include -#include +#include namespace ripple { diff --git a/src/ripple/basics/StringUtilities.h b/src/ripple/basics/StringUtilities.h index b6abff4677..63ed2b6f53 100644 --- a/src/ripple/basics/StringUtilities.h +++ b/src/ripple/basics/StringUtilities.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_STRINGUTILITIES_H -#define RIPPLE_STRINGUTILITIES_H +#ifndef RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED +#define RIPPLE_BASICS_STRINGUTILITIES_H_INCLUDED #include #include diff --git a/src/ripple/basics/Sustain.h b/src/ripple/basics/Sustain.h index 8c9a45b039..30ea9e868e 100644 --- a/src/ripple/basics/Sustain.h +++ b/src/ripple/basics/Sustain.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SUSTAIN_H -#define RIPPLE_SUSTAIN_H +#ifndef RIPPLE_BASICS_SUSTAIN_H_INCLUDED +#define RIPPLE_BASICS_SUSTAIN_H_INCLUDED namespace ripple { diff --git a/src/ripple/basics/SyncUnorderedMap.h b/src/ripple/basics/SyncUnorderedMap.h index 089a871cc7..4e242cc4ce 100644 --- a/src/ripple/basics/SyncUnorderedMap.h +++ b/src/ripple/basics/SyncUnorderedMap.h @@ -17,10 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_SYNC_UNORDERED_MAP_H -#define RIPPLE_SYNC_UNORDERED_MAP_H +#ifndef RIPPLE_BASICS_SYNCUNORDEREDMAP_H_INCLUDED +#define RIPPLE_BASICS_SYNCUNORDEREDMAP_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/common/TaggedCache.h b/src/ripple/basics/TaggedCache.h similarity index 99% rename from src/ripple/common/TaggedCache.h rename to src/ripple/basics/TaggedCache.h index 0dc20a92d3..8e02a65265 100644 --- a/src/ripple/common/TaggedCache.h +++ b/src/ripple/basics/TaggedCache.h @@ -17,10 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_TAGGEDCACHE_H_INCLUDED -#define RIPPLE_TAGGEDCACHE_H_INCLUDED +#ifndef RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED +#define RIPPLE_BASICS_TAGGEDCACHE_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/basics/ThreadName.h b/src/ripple/basics/ThreadName.h index 418789a918..e19d7a3b0e 100644 --- a/src/ripple/basics/ThreadName.h +++ b/src/ripple/basics/ThreadName.h @@ -17,11 +17,12 @@ */ //============================================================================== -#ifndef RIPPLE_THREADNAME_H -#define RIPPLE_THREADNAME_H +#ifndef RIPPLE_BASICS_THREADNAME_H_INCLUDED +#define RIPPLE_BASICS_THREADNAME_H_INCLUDED namespace ripple { +// VFALCO This should use the beast function extern void setCallingThreadName (char const*); } // ripple diff --git a/src/ripple/basics/Time.h b/src/ripple/basics/Time.h index 9524f34d63..d0474ef5a7 100644 --- a/src/ripple/basics/Time.h +++ b/src/ripple/basics/Time.h @@ -17,11 +17,12 @@ */ //============================================================================== -#ifndef RIPPLE_TIME_H -#define RIPPLE_TIME_H +#ifndef RIPPLE_BASICS_TIME_H_INCLUDED +#define RIPPLE_BASICS_TIME_H_INCLUDED namespace ripple { +// VFALCO TODO Roll this into some utilities header int iToSeconds (boost::posix_time::ptime ptWhen); boost::posix_time::ptime ptFromSeconds (int iSeconds); uint64_t utFromSeconds (int iSeconds); diff --git a/src/ripple/basics/ToString.h b/src/ripple/basics/ToString.h index bd462d1d6d..7a711d94ef 100644 --- a/src/ripple/basics/ToString.h +++ b/src/ripple/basics/ToString.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_TOSTRING_H -#define RIPPLE_TOSTRING_H +#ifndef RIPPLE_BASICS_TOSTRING_H_INCLUDED +#define RIPPLE_BASICS_TOSTRING_H_INCLUDED namespace ripple { diff --git a/src/ripple/common/UnorderedContainers.h b/src/ripple/basics/UnorderedContainers.h similarity index 97% rename from src/ripple/common/UnorderedContainers.h rename to src/ripple/basics/UnorderedContainers.h index c30df2ae40..f3a59ec2a4 100644 --- a/src/ripple/common/UnorderedContainers.h +++ b/src/ripple/basics/UnorderedContainers.h @@ -17,12 +17,11 @@ */ //============================================================================== -#ifndef RIPPLE_UNORDERED_CONTAINERS_H -#define RIPPLE_UNORDERED_CONTAINERS_H +#ifndef RIPPLE_BASICS_UNORDERED_CONTAINERS_H_INCLUDED +#define RIPPLE_BASICS_UNORDERED_CONTAINERS_H_INCLUDED #include #include - #include #include diff --git a/src/ripple/basics/UptimeTimer.h b/src/ripple/basics/UptimeTimer.h index 4a39a509d6..f59ad8c135 100644 --- a/src/ripple/basics/UptimeTimer.h +++ b/src/ripple/basics/UptimeTimer.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_UPTIMETIMER_H -#define RIPPLE_UPTIMETIMER_H +#ifndef RIPPLE_BASICS_UPTIMETIMER_H_INCLUDED +#define RIPPLE_BASICS_UPTIMETIMER_H_INCLUDED #include diff --git a/src/ripple/common/byte_view.h b/src/ripple/basics/byte_view.h similarity index 92% rename from src/ripple/common/byte_view.h rename to src/ripple/basics/byte_view.h index 7df7379fea..7dc57fda3c 100644 --- a/src/ripple/common/byte_view.h +++ b/src/ripple/basics/byte_view.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_BYTE_VIEW_H_INCLUDED -#define RIPPLE_BYTE_VIEW_H_INCLUDED +#ifndef RIPPLE_BASICS_BYTE_VIEW_H_INCLUDED +#define RIPPLE_BASICS_BYTE_VIEW_H_INCLUDED #include @@ -26,6 +26,7 @@ namespace ripple { +// VFALCO DEPRECATED typedef beast::buffer_view byte_view; typedef beast::buffer_view const_byte_view; diff --git a/src/ripple/common/impl/KeyCache.cpp b/src/ripple/basics/impl/KeyCache.cpp similarity index 98% rename from src/ripple/common/impl/KeyCache.cpp rename to src/ripple/basics/impl/KeyCache.cpp index e30e9a2c64..8f98ab9d34 100644 --- a/src/ripple/common/impl/KeyCache.cpp +++ b/src/ripple/basics/impl/KeyCache.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/common/impl/ResolverAsio.cpp b/src/ripple/basics/impl/ResolverAsio.cpp similarity index 99% rename from src/ripple/common/impl/ResolverAsio.cpp rename to src/ripple/basics/impl/ResolverAsio.cpp index 6739f49b44..78f1460a81 100644 --- a/src/ripple/common/impl/ResolverAsio.cpp +++ b/src/ripple/basics/impl/ResolverAsio.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/common/impl/TaggedCache.cpp b/src/ripple/basics/impl/TaggedCache.cpp similarity index 99% rename from src/ripple/common/impl/TaggedCache.cpp rename to src/ripple/basics/impl/TaggedCache.cpp index c3956cfa2b..eed6037d6b 100644 --- a/src/ripple/common/impl/TaggedCache.cpp +++ b/src/ripple/basics/impl/TaggedCache.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include diff --git a/src/ripple/common/impl/make_SSLContext.cpp b/src/ripple/basics/impl/make_SSLContext.cpp similarity index 99% rename from src/ripple/common/impl/make_SSLContext.cpp rename to src/ripple/basics/impl/make_SSLContext.cpp index c9c21a789e..c6d57a36fa 100644 --- a/src/ripple/common/impl/make_SSLContext.cpp +++ b/src/ripple/basics/impl/make_SSLContext.cpp @@ -17,8 +17,8 @@ */ //============================================================================== -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/common/make_SSLContext.h b/src/ripple/basics/make_SSLContext.h similarity index 95% rename from src/ripple/common/make_SSLContext.h rename to src/ripple/basics/make_SSLContext.h index 64887bdcb1..8ef97cc5ef 100644 --- a/src/ripple/common/make_SSLContext.h +++ b/src/ripple/basics/make_SSLContext.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_COMMON_MAKE_SSLCONTEXT_H_INCLUDED -#define RIPPLE_COMMON_MAKE_SSLCONTEXT_H_INCLUDED +#ifndef RIPPLE_BASICS_MAKE_SSLCONTEXT_H_INCLUDED +#define RIPPLE_BASICS_MAKE_SSLCONTEXT_H_INCLUDED #include #include diff --git a/src/ripple/common/seconds_clock.h b/src/ripple/basics/seconds_clock.h similarity index 94% rename from src/ripple/common/seconds_clock.h rename to src/ripple/basics/seconds_clock.h index dd55a93f86..dc2d39028c 100644 --- a/src/ripple/common/seconds_clock.h +++ b/src/ripple/basics/seconds_clock.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_SECONDS_CLOCK_H_INCLUDED -#define RIPPLE_SECONDS_CLOCK_H_INCLUDED +#ifndef RIPPLE_BASICS_SECONDS_CLOCK_H_INCLUDED +#define RIPPLE_BASICS_SECONDS_CLOCK_H_INCLUDED #include #include diff --git a/src/ripple/common/tests/cross_offer.test.cpp b/src/ripple/basics/tests/cross_offer.test.cpp similarity index 100% rename from src/ripple/common/tests/cross_offer.test.cpp rename to src/ripple/basics/tests/cross_offer.test.cpp diff --git a/src/ripple/core/Config.h b/src/ripple/core/Config.h index 84caf9aacc..cb31e89bfd 100644 --- a/src/ripple/core/Config.h +++ b/src/ripple/core/Config.h @@ -22,7 +22,7 @@ #include #include -#include +#include #include #include #include diff --git a/src/ripple/core/impl/LoadFeeTrackImp.h b/src/ripple/core/impl/LoadFeeTrackImp.h index ccb28f02a9..010f093974 100644 --- a/src/ripple/core/impl/LoadFeeTrackImp.h +++ b/src/ripple/core/impl/LoadFeeTrackImp.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_LOADFEETRACKIMP_H_INCLUDED #define RIPPLE_LOADFEETRACKIMP_H_INCLUDED -#include +#include #include #include diff --git a/src/ripple/data/crypto/Base58Data.h b/src/ripple/crypto/Base58Data.h similarity index 98% rename from src/ripple/data/crypto/Base58Data.h rename to src/ripple/crypto/Base58Data.h index 72a6c38253..803d4de40c 100644 --- a/src/ripple/data/crypto/Base58Data.h +++ b/src/ripple/crypto/Base58Data.h @@ -29,8 +29,8 @@ // - E-mail usually won't line-break if there's no punctuation to break at. // - Doubleclicking selects the whole number as one word if it's all alphanumeric. // -#ifndef RIPPLE_BASE58DATA_H -#define RIPPLE_BASE58DATA_H +#ifndef RIPPLE_CRYPTO_BASE58DATA_H +#define RIPPLE_CRYPTO_BASE58DATA_H #include #include diff --git a/src/ripple/sslutil/CAutoBN_CTX.h b/src/ripple/crypto/CAutoBN_CTX.h similarity index 92% rename from src/ripple/sslutil/CAutoBN_CTX.h rename to src/ripple/crypto/CAutoBN_CTX.h index 8a81435be7..ddd3359845 100644 --- a/src/ripple/sslutil/CAutoBN_CTX.h +++ b/src/ripple/crypto/CAutoBN_CTX.h @@ -22,10 +22,11 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. -#ifndef RIPPLE_SSLUTIL_CAUTOBN_CTX_H_INCLUDED -#define RIPPLE_SSLUTIL_CAUTOBN_CTX_H_INCLUDED +#ifndef RIPPLE_CRYPTO_CAUTOBN_CTX_H_INCLUDED +#define RIPPLE_CRYPTO_CAUTOBN_CTX_H_INCLUDED -#include +#include +#include namespace ripple { diff --git a/src/ripple/sslutil/CBigNum.h b/src/ripple/crypto/CBigNum.h similarity index 96% rename from src/ripple/sslutil/CBigNum.h rename to src/ripple/crypto/CBigNum.h index 4111a1be73..256a71e81b 100644 --- a/src/ripple/sslutil/CBigNum.h +++ b/src/ripple/crypto/CBigNum.h @@ -22,8 +22,11 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. -#ifndef RIPPLE_SSLUTIL_CBIGNUM_H_INCLUDED -#define RIPPLE_SSLUTIL_CBIGNUM_H_INCLUDED +#ifndef RIPPLE_CRYPTO_CBIGNUM_H_INCLUDED +#define RIPPLE_CRYPTO_CBIGNUM_H_INCLUDED + +#include +#include namespace ripple { diff --git a/src/ripple/data/crypto/CKey.h b/src/ripple/crypto/CKey.h similarity index 97% rename from src/ripple/data/crypto/CKey.h rename to src/ripple/crypto/CKey.h index efe78605a1..c5152230c9 100644 --- a/src/ripple/data/crypto/CKey.h +++ b/src/ripple/crypto/CKey.h @@ -22,8 +22,14 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. -#ifndef RIPPLE_CKEY_H -#define RIPPLE_CKEY_H +#ifndef RIPPLE_CRYPTO_CKEY_H_INCLUDED +#define RIPPLE_CRYPTO_CKEY_H_INCLUDED + +#include // VFALCO Remove this cyclic dep +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/sslutil/DHUtil.h b/src/ripple/crypto/DHUtil.h similarity index 90% rename from src/ripple/sslutil/DHUtil.h rename to src/ripple/crypto/DHUtil.h index 28e0c64f8c..bf3e869749 100644 --- a/src/ripple/sslutil/DHUtil.h +++ b/src/ripple/crypto/DHUtil.h @@ -17,8 +17,11 @@ */ //============================================================================== -#ifndef RIPPLE_SSLUTIL_DHUTIL_H_INCLUDED -#define RIPPLE_SSLUTIL_DHUTIL_H_INCLUDED +#ifndef RIPPLE_CRYPTO_DHUTIL_H_INCLUDED +#define RIPPLE_CRYPTO_DHUTIL_H_INCLUDED + +#include +#include namespace ripple { diff --git a/src/ripple/sslutil/ECDSACanonical.h b/src/ripple/crypto/ECDSACanonical.h similarity index 94% rename from src/ripple/sslutil/ECDSACanonical.h rename to src/ripple/crypto/ECDSACanonical.h index 11643dc75e..480715d988 100644 --- a/src/ripple/sslutil/ECDSACanonical.h +++ b/src/ripple/crypto/ECDSACanonical.h @@ -17,8 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_SSLUTIL_ECDSACANONICAL_H_INCLUDED -#define RIPPLE_SSLUTIL_ECDSACANONICAL_H_INCLUDED +#ifndef RIPPLE_CRYPTO_ECDSACANONICAL_H_INCLUDED +#define RIPPLE_CRYPTO_ECDSACANONICAL_H_INCLUDED + +#include namespace ripple { diff --git a/src/ripple/sslutil/README.md b/src/ripple/crypto/README.md similarity index 100% rename from src/ripple/sslutil/README.md rename to src/ripple/crypto/README.md diff --git a/src/ripple/data/crypto/RFC1751.h b/src/ripple/crypto/RFC1751.h similarity index 94% rename from src/ripple/data/crypto/RFC1751.h rename to src/ripple/crypto/RFC1751.h index 57969613d1..3f085adad4 100644 --- a/src/ripple/data/crypto/RFC1751.h +++ b/src/ripple/crypto/RFC1751.h @@ -17,8 +17,11 @@ */ //============================================================================== -#ifndef RIPPLE_RFC1751_H -#define RIPPLE_RFC1751_H +#ifndef RIPPLE_CRYPTO_RFC1751_H_INCLUDED +#define RIPPLE_CRYPTO_RFC1751_H_INCLUDED + +#include +#include namespace ripple { diff --git a/src/ripple/types/RandomNumbers.h b/src/ripple/crypto/RandomNumbers.h similarity index 96% rename from src/ripple/types/RandomNumbers.h rename to src/ripple/crypto/RandomNumbers.h index 80d5182d97..7292de3744 100644 --- a/src/ripple/types/RandomNumbers.h +++ b/src/ripple/crypto/RandomNumbers.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_TYPES_RANDOMNUMBERS_H -#define RIPPLE_TYPES_RANDOMNUMBERS_H +#ifndef RIPPLE_CRYPTO_RANDOMNUMBERS_H_INCLUDED +#define RIPPLE_CRYPTO_RANDOMNUMBERS_H_INCLUDED #include diff --git a/src/ripple/sslutil/bignum_error.h b/src/ripple/crypto/bignum_error.h similarity index 94% rename from src/ripple/sslutil/bignum_error.h rename to src/ripple/crypto/bignum_error.h index 35f17f5fa0..ec397eb8b8 100644 --- a/src/ripple/sslutil/bignum_error.h +++ b/src/ripple/crypto/bignum_error.h @@ -22,8 +22,8 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. -#ifndef RIPPLE_SSLUTIL_BIGNUM_ERROR_H_INCLUDED -#define RIPPLE_SSLUTIL_BIGNUM_ERROR_H_INCLUDED +#ifndef RIPPLE_CRYPTO_BIGNUM_ERROR_H_INCLUDED +#define RIPPLE_CRYPTO_BIGNUM_ERROR_H_INCLUDED #include diff --git a/src/ripple/data/crypto/Base58Data.cpp b/src/ripple/crypto/impl/Base58Data.cpp similarity index 98% rename from src/ripple/data/crypto/Base58Data.cpp rename to src/ripple/crypto/impl/Base58Data.cpp index edcc952169..0311c77192 100644 --- a/src/ripple/data/crypto/Base58Data.cpp +++ b/src/ripple/crypto/impl/Base58Data.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { // Copyright (c) 2009-2010 Satoshi Nakamoto diff --git a/src/ripple/sslutil/impl/CBigNum.cpp b/src/ripple/crypto/impl/CBigNum.cpp similarity index 99% rename from src/ripple/sslutil/impl/CBigNum.cpp rename to src/ripple/crypto/impl/CBigNum.cpp index d679dc67b1..50f0886c9b 100644 --- a/src/ripple/sslutil/impl/CBigNum.cpp +++ b/src/ripple/crypto/impl/CBigNum.cpp @@ -22,6 +22,10 @@ // Distributed under the MIT/X11 software license, see the accompanying // file license.txt or http://www.opensource.org/licenses/mit-license.php. +#include +#include +#include + namespace ripple { CBigNum::CBigNum () diff --git a/src/ripple/data/crypto/CKey.cpp b/src/ripple/crypto/impl/CKey.cpp similarity index 97% rename from src/ripple/data/crypto/CKey.cpp rename to src/ripple/crypto/impl/CKey.cpp index 265c3afb97..c1bd1d4bff 100644 --- a/src/ripple/data/crypto/CKey.cpp +++ b/src/ripple/crypto/impl/CKey.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include +#include #include namespace ripple { diff --git a/src/ripple/data/crypto/CKeyDeterministic.cpp b/src/ripple/crypto/impl/CKeyDeterministic.cpp similarity index 98% rename from src/ripple/data/crypto/CKeyDeterministic.cpp rename to src/ripple/crypto/impl/CKeyDeterministic.cpp index 1ce6eabf4a..667b106b34 100644 --- a/src/ripple/data/crypto/CKeyDeterministic.cpp +++ b/src/ripple/crypto/impl/CKeyDeterministic.cpp @@ -17,6 +17,11 @@ */ //============================================================================== +#include +#include +#include +#include + namespace ripple { // #define EC_DEBUG @@ -26,6 +31,7 @@ namespace ripple { // <-- seed uint128 CKey::PassPhraseToKey (std::string const& passPhrase) { + // VFALCO NOTE This is a bad dependency, CKey shouldn't need it Serializer s; s.addRaw (passPhrase); diff --git a/src/ripple/data/crypto/CKeyECIES.cpp b/src/ripple/crypto/impl/CKeyECIES.cpp similarity index 98% rename from src/ripple/data/crypto/CKeyECIES.cpp rename to src/ripple/crypto/impl/CKeyECIES.cpp index 53472c11b6..83120d7e1d 100644 --- a/src/ripple/data/crypto/CKeyECIES.cpp +++ b/src/ripple/crypto/impl/CKeyECIES.cpp @@ -17,6 +17,11 @@ */ //============================================================================== +#include +#include +#include +#include + namespace ripple { // ECIES uses elliptic curve keys to send an encrypted message. diff --git a/src/ripple/sslutil/impl/DHUtil.cpp b/src/ripple/crypto/impl/DHUtil.cpp similarity index 98% rename from src/ripple/sslutil/impl/DHUtil.cpp rename to src/ripple/crypto/impl/DHUtil.cpp index 7ea9d31fb7..28059ab700 100644 --- a/src/ripple/sslutil/impl/DHUtil.cpp +++ b/src/ripple/crypto/impl/DHUtil.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { std::string DH_der_gen (int iKeyLength) diff --git a/src/ripple/sslutil/impl/ECDSACanonical.cpp b/src/ripple/crypto/impl/ECDSACanonical.cpp similarity index 86% rename from src/ripple/sslutil/impl/ECDSACanonical.cpp rename to src/ripple/crypto/impl/ECDSACanonical.cpp index fdbe5e77df..ad29820909 100644 --- a/src/ripple/sslutil/impl/ECDSACanonical.cpp +++ b/src/ripple/crypto/impl/ECDSACanonical.cpp @@ -17,134 +17,139 @@ */ //============================================================================== +#include #include #include #include +#include +#include namespace ripple { namespace detail { - // A simple wrapper for a BIGNUM to make it - // easier to allocate, construct, and free them - struct BigNum + +// A simple wrapper for a BIGNUM to make it +// easier to allocate, construct, and free them +struct BigNum +{ + BIGNUM* num; + + BigNum& operator=(BigNum const&) = delete; + + BigNum () + : num (BN_new ()) { - BIGNUM* num; - BigNum& operator=(BigNum const&) = delete; + } - BigNum () - : num (BN_new ()) - { - - } - - BigNum (const char *hex) - : num (BN_new ()) - { - BN_hex2bn (&num, hex); - } - - BigNum (unsigned char const* ptr, size_t len) - : num (BN_new ()) - { - set (ptr, len); - } - - BigNum (BigNum const& other) - : num (BN_new ()) - { - if (BN_copy (num, other.num) == nullptr) - BN_clear (num); - } - - ~BigNum () - { - BN_free (num); - } - - operator BIGNUM* () - { - return num; - } - - operator BIGNUM const* () const - { - return num; - } - - bool set (unsigned char const* ptr, size_t len) - { - if (BN_bin2bn (ptr, len, num) == nullptr) - return false; - - return true; - } - }; - - class SignaturePart + BigNum (const char *hex) + : num (BN_new ()) { - private: - size_t m_skip; - BigNum m_bn; + BN_hex2bn (&num, hex); + } - public: - SignaturePart (unsigned char const* sig, size_t size) - : m_skip (0) - { - // The format is: <02> - if ((sig[0] != 0x02) || (size < 3)) - return; + BigNum (unsigned char const* ptr, size_t len) + : num (BN_new ()) + { + set (ptr, len); + } - size_t const len (sig[1]); + BigNum (BigNum const& other) + : num (BN_new ()) + { + if (BN_copy (num, other.num) == nullptr) + BN_clear (num); + } - // Claimed length can't be longer than amount of data available - if (len > (size - 2)) - return; + ~BigNum () + { + BN_free (num); + } - // Signature must be between 1 and 33 bytes. - if ((len < 1) || (len > 33)) - return; + operator BIGNUM* () + { + return num; + } - // The signature can't be negative - if ((sig[2] & 0x80) != 0) - return; + operator BIGNUM const* () const + { + return num; + } - // It can't be zero - if ((sig[2] == 0) && (len == 1)) - return; + bool set (unsigned char const* ptr, size_t len) + { + if (BN_bin2bn (ptr, len, num) == nullptr) + return false; - // And it can't be padded - if ((sig[2] == 0) && ((sig[3] & 0x80) == 0)) - return; + return true; + } +}; - // Load the signature (ignore the marker prefix and length) and if - // successful, count the number of bytes we consumed. - if (m_bn.set (sig + 2, len)) - m_skip = len + 2; - } +class SignaturePart +{ +private: + size_t m_skip; + BigNum m_bn; - bool valid () const - { - return m_skip != 0; - } +public: + SignaturePart (unsigned char const* sig, size_t size) + : m_skip (0) + { + // The format is: <02> + if ((sig[0] != 0x02) || (size < 3)) + return; - // The signature as a BIGNUM - BigNum getBigNum () const - { - return m_bn; - } + size_t const len (sig[1]); - // Returns the number of bytes to skip for this signature part - size_t skip () const - { - return m_skip; - } - }; + // Claimed length can't be longer than amount of data available + if (len > (size - 2)) + return; - // The SECp256k1 modulus - static BigNum const modulus ( - "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141"); -} + // Signature must be between 1 and 33 bytes. + if ((len < 1) || (len > 33)) + return; + + // The signature can't be negative + if ((sig[2] & 0x80) != 0) + return; + + // It can't be zero + if ((sig[2] == 0) && (len == 1)) + return; + + // And it can't be padded + if ((sig[2] == 0) && ((sig[3] & 0x80) == 0)) + return; + + // Load the signature (ignore the marker prefix and length) and if + // successful, count the number of bytes we consumed. + if (m_bn.set (sig + 2, len)) + m_skip = len + 2; + } + + bool valid () const + { + return m_skip != 0; + } + + // The signature as a BIGNUM + BigNum getBigNum () const + { + return m_bn; + } + + // Returns the number of bytes to skip for this signature part + size_t skip () const + { + return m_skip; + } +}; + +// The SECp256k1 modulus +static BigNum const modulus ( + "FFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFEBAAEDCE6AF48A03BBFD25E8CD0364141"); + +} // detail /** Determine whether a signature is canonical. Canonical signatures are important to protect against signature morphing diff --git a/src/ripple/data/crypto/RFC1751.cpp b/src/ripple/crypto/impl/RFC1751.cpp similarity index 98% rename from src/ripple/data/crypto/RFC1751.cpp rename to src/ripple/crypto/impl/RFC1751.cpp index 0b69c4061f..06a734e352 100644 --- a/src/ripple/data/crypto/RFC1751.cpp +++ b/src/ripple/crypto/impl/RFC1751.cpp @@ -17,6 +17,15 @@ */ //============================================================================== +#include +#include +#include +#include +#include +#include +#include +#include + namespace ripple { // @@ -477,6 +486,9 @@ std::string RFC1751::getWordFromBlob (void const* data, size_t bytes) { std::uint32_t hash; + // VFALCO Murmur is deprecated and since this does not need to be + // cryptographically secure we should just replace it with something + // else and remove Murmur from beast. beast::Murmur::Hash (data, bytes, 0, &hash); return s_dictionary [hash % (sizeof (s_dictionary) / sizeof (s_dictionary [0]))]; diff --git a/src/ripple/types/impl/RandomNumbers.cpp b/src/ripple/crypto/impl/RandomNumbers.cpp similarity index 95% rename from src/ripple/types/impl/RandomNumbers.cpp rename to src/ripple/crypto/impl/RandomNumbers.cpp index 9682366c5a..a203583a1d 100644 --- a/src/ripple/types/impl/RandomNumbers.cpp +++ b/src/ripple/crypto/impl/RandomNumbers.cpp @@ -17,13 +17,10 @@ */ //============================================================================== -// VFALCO TODO Replace OpenSSL randomness with a dependency-free implementation -// Perhaps Schneier's Fortuna or a variant. Abstract the collection of -// entropy and provide OS-specific implementation. We can re-use the -// BearShare source code for this. -// -// Add Random number generation to beast -// +#include +#include +#include +#include #include #if BEAST_WIN32 #include diff --git a/src/ripple/data/utility/UptimeTimerAdapter.h b/src/ripple/data/utility/UptimeTimerAdapter.h deleted file mode 100644 index 5275e35fbf..0000000000 --- a/src/ripple/data/utility/UptimeTimerAdapter.h +++ /dev/null @@ -1,38 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef RIPPLE_UPTIMETIMERADAPTER_H -#define RIPPLE_UPTIMETIMERADAPTER_H - -#include - -namespace ripple { - -/** Adapter providing uptime measurements for template classes. */ -struct UptimeTimerAdapter -{ - inline static int getElapsedSeconds () - { - return UptimeTimer::getInstance ().getElapsedSeconds (); - } -}; - -} // ripple - -#endif diff --git a/src/ripple/net/InfoSub.h b/src/ripple/net/InfoSub.h index 61f94eaccf..cb3104095b 100644 --- a/src/ripple/net/InfoSub.h +++ b/src/ripple/net/InfoSub.h @@ -21,7 +21,8 @@ #define RIPPLE_NET_RPC_INFOSUB_H_INCLUDED #include -#include +#include +#include #include #include #include diff --git a/src/ripple/net/impl/RPCCall.cpp b/src/ripple/net/impl/RPCCall.cpp index 066d0af187..191b0b7220 100644 --- a/src/ripple/net/impl/RPCCall.cpp +++ b/src/ripple/net/impl/RPCCall.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/net/impl/SNTPClient.cpp b/src/ripple/net/impl/SNTPClient.cpp index eb6a9e6171..0af7925f01 100644 --- a/src/ripple/net/impl/SNTPClient.cpp +++ b/src/ripple/net/impl/SNTPClient.cpp @@ -18,8 +18,8 @@ //============================================================================== #include +#include #include -#include #include #include #include diff --git a/src/ripple/nodestore/NodeObject.h b/src/ripple/nodestore/NodeObject.h index a9c6476bca..50b35adbec 100644 --- a/src/ripple/nodestore/NodeObject.h +++ b/src/ripple/nodestore/NodeObject.h @@ -21,7 +21,7 @@ #define RIPPLE_NODESTORE_NODEOBJECT_H_INCLUDED #include -#include +#include // VFALCO NOTE Intentionally not in the NodeStore namespace diff --git a/src/ripple/overlay/Peer.h b/src/ripple/overlay/Peer.h index 7ec64c3d45..9b72c7656f 100644 --- a/src/ripple/overlay/Peer.h +++ b/src/ripple/overlay/Peer.h @@ -24,7 +24,7 @@ #include #include -#include +#include #include diff --git a/src/ripple/overlay/impl/OverlayImpl.cpp b/src/ripple/overlay/impl/OverlayImpl.cpp index 130a6b2de3..59bd156d44 100644 --- a/src/ripple/overlay/impl/OverlayImpl.cpp +++ b/src/ripple/overlay/impl/OverlayImpl.cpp @@ -17,17 +17,14 @@ */ //============================================================================== -#include +#include +#include #include #include #include #include #include -#if DOXYGEN -#include -#endif - namespace ripple { /** A functor to visit all active peers and retrieve their JSON data */ diff --git a/src/ripple/overlay/impl/OverlayImpl.h b/src/ripple/overlay/impl/OverlayImpl.h index cabbc948a6..321d5915da 100644 --- a/src/ripple/overlay/impl/OverlayImpl.h +++ b/src/ripple/overlay/impl/OverlayImpl.h @@ -23,11 +23,11 @@ #include #include #include -#include -#include -#include +#include +#include +#include #include -#include +#include #include #include #include diff --git a/src/ripple/overlay/impl/PeerImp.cpp b/src/ripple/overlay/impl/PeerImp.cpp index 94194c71d9..cfb2845ae0 100644 --- a/src/ripple/overlay/impl/PeerImp.cpp +++ b/src/ripple/overlay/impl/PeerImp.cpp @@ -17,11 +17,15 @@ */ //============================================================================== -#include #include +#include +#include #include #include #include +#include +#include +#include #include #include #include // diff --git a/src/ripple/overlay/impl/PeerImp.h b/src/ripple/overlay/impl/PeerImp.h index d49936c196..0127e985a9 100644 --- a/src/ripple/overlay/impl/PeerImp.h +++ b/src/ripple/overlay/impl/PeerImp.h @@ -30,7 +30,7 @@ #include #include #include -#include +#include #include #include // VFALCO REMOVE #include diff --git a/src/ripple/overlay/make_Overlay.h b/src/ripple/overlay/make_Overlay.h index d058c101b9..0408249ea0 100644 --- a/src/ripple/overlay/make_Overlay.h +++ b/src/ripple/overlay/make_Overlay.h @@ -22,8 +22,8 @@ #include #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/peerfinder/impl/Manager.cpp b/src/ripple/peerfinder/impl/Manager.cpp index bf06abd00f..f73f34f9be 100644 --- a/src/ripple/peerfinder/impl/Manager.cpp +++ b/src/ripple/peerfinder/impl/Manager.cpp @@ -27,10 +27,6 @@ #include // #include -#if DOXYGEN -#include -#endif - namespace ripple { namespace PeerFinder { diff --git a/src/ripple/data/protocol/BuildInfo.h b/src/ripple/protocol/BuildInfo.h similarity index 94% rename from src/ripple/data/protocol/BuildInfo.h rename to src/ripple/protocol/BuildInfo.h index fc45baef95..3b4c786583 100644 --- a/src/ripple/data/protocol/BuildInfo.h +++ b/src/ripple/protocol/BuildInfo.h @@ -17,8 +17,11 @@ */ //============================================================================== -#ifndef RIPPLE_BUILDINFO_H_INCLUDED -#define RIPPLE_BUILDINFO_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_BUILDINFO_H_INCLUDED +#define RIPPLE_PROTOCOL_BUILDINFO_H_INCLUDED + +#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/HashPrefix.h b/src/ripple/protocol/HashPrefix.h similarity index 96% rename from src/ripple/data/protocol/HashPrefix.h rename to src/ripple/protocol/HashPrefix.h index 4b4b05cb22..e03e265eb9 100644 --- a/src/ripple/data/protocol/HashPrefix.h +++ b/src/ripple/protocol/HashPrefix.h @@ -17,8 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_HASHPREFIX_H -#define RIPPLE_HASHPREFIX_H +#ifndef RIPPLE_PROTOCOL_HASHPREFIX_H_INCLUDED +#define RIPPLE_PROTOCOL_HASHPREFIX_H_INCLUDED + +#include namespace ripple { diff --git a/src/ripple/common/jsonrpc_fields.h b/src/ripple/protocol/JsonFields.h similarity index 97% rename from src/ripple/common/jsonrpc_fields.h rename to src/ripple/protocol/JsonFields.h index de640bacb9..6e9b617a51 100644 --- a/src/ripple/common/jsonrpc_fields.h +++ b/src/ripple/protocol/JsonFields.h @@ -17,10 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_COMMON_JSONRPC_FIELDS_H_INCLUDED -#define RIPPLE_COMMON_JSONRPC_FIELDS_H_INCLUDED - -#include +#ifndef RIPPLE_PROTOCOL_JSONFIELDS_H_INCLUDED +#define RIPPLE_PROTOCOL_JSONFIELDS_H_INCLUDED namespace ripple { namespace jss { diff --git a/src/ripple/data/protocol/KnownFormats.h b/src/ripple/protocol/KnownFormats.h similarity index 96% rename from src/ripple/data/protocol/KnownFormats.h rename to src/ripple/protocol/KnownFormats.h index 016ac58179..46aca3db9f 100644 --- a/src/ripple/data/protocol/KnownFormats.h +++ b/src/ripple/protocol/KnownFormats.h @@ -17,10 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_KNOWNFORMATS_H_INCLUDED -#define RIPPLE_KNOWNFORMATS_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_KNOWNFORMATS_H_INCLUDED +#define RIPPLE_PROTOCOL_KNOWNFORMATS_H_INCLUDED -#include +#include #include // namespace ripple { diff --git a/src/ripple/data/protocol/LedgerFormats.h b/src/ripple/protocol/LedgerFormats.h similarity index 96% rename from src/ripple/data/protocol/LedgerFormats.h rename to src/ripple/protocol/LedgerFormats.h index 12215235d5..286d800575 100644 --- a/src/ripple/data/protocol/LedgerFormats.h +++ b/src/ripple/protocol/LedgerFormats.h @@ -17,10 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_LEDGERFORMATS_H_INCLUDED -#define RIPPLE_LEDGERFORMATS_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_LEDGERFORMATS_H_INCLUDED +#define RIPPLE_PROTOCOL_LEDGERFORMATS_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/Protocol.h b/src/ripple/protocol/Protocol.h similarity index 95% rename from src/ripple/data/protocol/Protocol.h rename to src/ripple/protocol/Protocol.h index a8511247b6..eeb1bcbac0 100644 --- a/src/ripple/data/protocol/Protocol.h +++ b/src/ripple/protocol/Protocol.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_PROTOCOL_H -#define RIPPLE_PROTOCOL_H +#ifndef RIPPLE_PROTOCOL_PROTOCOL_H_INCLUDED +#define RIPPLE_PROTOCOL_PROTOCOL_H_INCLUDED #include #include diff --git a/src/ripple/protocol/README.md b/src/ripple/protocol/README.md new file mode 100644 index 0000000000..241d370f98 --- /dev/null +++ b/src/ripple/protocol/README.md @@ -0,0 +1,4 @@ +# protocol + +Classes and functions for handling data and +values associated with the Ripple protocol. diff --git a/src/ripple/data/protocol/RippleAddress.h b/src/ripple/protocol/RippleAddress.h similarity index 98% rename from src/ripple/data/protocol/RippleAddress.h rename to src/ripple/protocol/RippleAddress.h index e497ccd868..742b538693 100644 --- a/src/ripple/data/protocol/RippleAddress.h +++ b/src/ripple/protocol/RippleAddress.h @@ -17,11 +17,11 @@ */ //============================================================================== -#ifndef RIPPLE_RIPPLEADDRESS_H -#define RIPPLE_RIPPLEADDRESS_H - -#include +#ifndef RIPPLE_PROTOCOL_RIPPLEADDRESS_H_INCLUDED +#define RIPPLE_PROTOCOL_RIPPLEADDRESS_H_INCLUDED +#include +#include #include #include #include @@ -30,7 +30,6 @@ #include #include #include -#include namespace ripple { diff --git a/src/ripple/data/protocol/SField.h b/src/ripple/protocol/SField.h similarity index 98% rename from src/ripple/data/protocol/SField.h rename to src/ripple/protocol/SField.h index f04ca46138..622ef6616d 100644 --- a/src/ripple/data/protocol/SField.h +++ b/src/ripple/protocol/SField.h @@ -17,10 +17,11 @@ */ //============================================================================== -#ifndef RIPPLE_FIELDNAMES_H -#define RIPPLE_FIELDNAMES_H +#ifndef RIPPLE_PROTOCOL_FIELDNAMES_H_INCLUDED +#define RIPPLE_PROTOCOL_FIELDNAMES_H_INCLUDED #include +#include namespace ripple { diff --git a/src/ripple/data/protocol/STAmount.h b/src/ripple/protocol/STAmount.h similarity index 98% rename from src/ripple/data/protocol/STAmount.h rename to src/ripple/protocol/STAmount.h index adb419738d..4502cd6baa 100644 --- a/src/ripple/data/protocol/STAmount.h +++ b/src/ripple/protocol/STAmount.h @@ -17,14 +17,13 @@ */ //============================================================================== -#ifndef RIPPLE_STAMOUNT_H -#define RIPPLE_STAMOUNT_H +#ifndef RIPPLE_PROTOCOL_STAMOUNT_H_INCLUDED +#define RIPPLE_PROTOCOL_STAMOUNT_H_INCLUDED -#include -#include -#include +#include +#include +#include #include - #include // namespace ripple { diff --git a/src/ripple/data/protocol/STArray.h b/src/ripple/protocol/STArray.h similarity index 97% rename from src/ripple/data/protocol/STArray.h rename to src/ripple/protocol/STArray.h index 9d98a1dc9d..de338be108 100644 --- a/src/ripple/data/protocol/STArray.h +++ b/src/ripple/protocol/STArray.h @@ -17,11 +17,11 @@ */ //============================================================================== -#ifndef RIPPLE_STARRAY_H -#define RIPPLE_STARRAY_H +#ifndef RIPPLE_PROTOCOL_STARRAY_H_INCLUDED +#define RIPPLE_PROTOCOL_STARRAY_H_INCLUDED #include -#include +#include #include namespace ripple { diff --git a/src/ripple/data/protocol/STBitString.h b/src/ripple/protocol/STBitString.h similarity index 96% rename from src/ripple/data/protocol/STBitString.h rename to src/ripple/protocol/STBitString.h index 61642bd377..fb08ce0ec6 100644 --- a/src/ripple/data/protocol/STBitString.h +++ b/src/ripple/protocol/STBitString.h @@ -17,10 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_STBITS_H -#define RIPPLE_STBITS_H +#ifndef RIPPLE_PROTOCOL_STBITS_H_INCLUDED +#define RIPPLE_PROTOCOL_STBITS_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/STInteger.h b/src/ripple/protocol/STInteger.h similarity index 95% rename from src/ripple/data/protocol/STInteger.h rename to src/ripple/protocol/STInteger.h index 5c283bf356..52095c7752 100644 --- a/src/ripple/data/protocol/STInteger.h +++ b/src/ripple/protocol/STInteger.h @@ -17,10 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_STINTEGER_H -#define RIPPLE_STINTEGER_H +#ifndef RIPPLE_PROTOCOL_STINTEGER_H_INCLUDED +#define RIPPLE_PROTOCOL_STINTEGER_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/STObject.h b/src/ripple/protocol/STObject.h similarity index 97% rename from src/ripple/data/protocol/STObject.h rename to src/ripple/protocol/STObject.h index ad8f1cb5b0..6e97502f9c 100644 --- a/src/ripple/data/protocol/STObject.h +++ b/src/ripple/protocol/STObject.h @@ -17,14 +17,14 @@ */ //============================================================================== -#ifndef RIPPLE_STOBJECT_H -#define RIPPLE_STOBJECT_H +#ifndef RIPPLE_PROTOCOL_STOBJECT_H_INCLUDED +#define RIPPLE_PROTOCOL_STOBJECT_H_INCLUDED #include -#include -#include -#include -#include +#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/data/protocol/STParsedJSON.h b/src/ripple/protocol/STParsedJSON.h similarity index 96% rename from src/ripple/data/protocol/STParsedJSON.h rename to src/ripple/protocol/STParsedJSON.h index 51ba336d39..3738152207 100644 --- a/src/ripple/data/protocol/STParsedJSON.h +++ b/src/ripple/protocol/STParsedJSON.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_DATA_STPARSEDJSON_H -#define RIPPLE_DATA_STPARSEDJSON_H +#ifndef RIPPLE_PROTOCOL_STPARSEDJSON_H_INCLUDED +#define RIPPLE_PROTOCOL_STPARSEDJSON_H_INCLUDED namespace ripple { diff --git a/src/ripple/data/protocol/SerializedObjectTemplate.h b/src/ripple/protocol/SerializedObjectTemplate.h similarity index 94% rename from src/ripple/data/protocol/SerializedObjectTemplate.h rename to src/ripple/protocol/SerializedObjectTemplate.h index aa332c2969..34fc02fe0d 100644 --- a/src/ripple/data/protocol/SerializedObjectTemplate.h +++ b/src/ripple/protocol/SerializedObjectTemplate.h @@ -17,8 +17,11 @@ */ //============================================================================== -#ifndef RIPPLE_SERIALIZEDOBJECTTEMPLATE_H -#define RIPPLE_SERIALIZEDOBJECTTEMPLATE_H +#ifndef RIPPLE_PROTOCOL_SERIALIZEDOBJECTTEMPLATE_H_INCLUDED +#define RIPPLE_PROTOCOL_SERIALIZEDOBJECTTEMPLATE_H_INCLUDED + +#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/SerializedType.h b/src/ripple/protocol/SerializedType.h similarity index 97% rename from src/ripple/data/protocol/SerializedType.h rename to src/ripple/protocol/SerializedType.h index 6642eaf14d..49c06a746a 100644 --- a/src/ripple/data/protocol/SerializedType.h +++ b/src/ripple/protocol/SerializedType.h @@ -17,11 +17,11 @@ */ //============================================================================== -#ifndef RIPPLE_SERIALIZEDTYPE_H -#define RIPPLE_SERIALIZEDTYPE_H +#ifndef RIPPLE_PROTOCOL_SERIALIZEDTYPE_H_INCLUDED +#define RIPPLE_PROTOCOL_SERIALIZEDTYPE_H_INCLUDED -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/SerializedTypes.h b/src/ripple/protocol/SerializedTypes.h similarity index 97% rename from src/ripple/data/protocol/SerializedTypes.h rename to src/ripple/protocol/SerializedTypes.h index 9609bb3c32..f0eb05a41c 100644 --- a/src/ripple/data/protocol/SerializedTypes.h +++ b/src/ripple/protocol/SerializedTypes.h @@ -17,15 +17,16 @@ */ //============================================================================== -#ifndef RIPPLE_SERIALIZEDTYPES_H -#define RIPPLE_SERIALIZEDTYPES_H +#ifndef RIPPLE_PROTOCOL_SERIALIZEDTYPES_H_INCLUDED +#define RIPPLE_PROTOCOL_SERIALIZEDTYPES_H_INCLUDED -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/Serializer.h b/src/ripple/protocol/Serializer.h similarity index 97% rename from src/ripple/data/protocol/Serializer.h rename to src/ripple/protocol/Serializer.h index 44dbbe96ef..d1bf434474 100644 --- a/src/ripple/data/protocol/Serializer.h +++ b/src/ripple/protocol/Serializer.h @@ -17,12 +17,14 @@ */ //============================================================================== -#ifndef RIPPLE_SERIALIZER_H -#define RIPPLE_SERIALIZER_H +#ifndef RIPPLE_PROTOCOL_SERIALIZER_H_INCLUDED +#define RIPPLE_PROTOCOL_SERIALIZER_H_INCLUDED -#include -#include +#include +#include +#include #include +#include namespace ripple { diff --git a/src/ripple/data/protocol/TER.h b/src/ripple/protocol/TER.h similarity index 98% rename from src/ripple/data/protocol/TER.h rename to src/ripple/protocol/TER.h index 01897d5e5b..306d53d1dd 100644 --- a/src/ripple/data/protocol/TER.h +++ b/src/ripple/protocol/TER.h @@ -17,8 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_TER_H -#define RIPPLE_TER_H +#ifndef RIPPLE_PROTOCOL_TER_H +#define RIPPLE_PROTOCOL_TER_H + +#include namespace ripple { diff --git a/src/ripple/data/protocol/TxFlags.h b/src/ripple/protocol/TxFlags.h similarity index 97% rename from src/ripple/data/protocol/TxFlags.h rename to src/ripple/protocol/TxFlags.h index 3988802ea8..d343878d84 100644 --- a/src/ripple/data/protocol/TxFlags.h +++ b/src/ripple/protocol/TxFlags.h @@ -17,8 +17,8 @@ */ //============================================================================== -#ifndef RIPPLE_TXFLAGS_H -#define RIPPLE_TXFLAGS_H +#ifndef RIPPLE_PROTOCOL_TXFLAGS_H_INCLUDED +#define RIPPLE_PROTOCOL_TXFLAGS_H_INCLUDED namespace ripple { diff --git a/src/ripple/data/protocol/TxFormats.h b/src/ripple/protocol/TxFormats.h similarity index 93% rename from src/ripple/data/protocol/TxFormats.h rename to src/ripple/protocol/TxFormats.h index fc92c24d35..83d602e385 100644 --- a/src/ripple/data/protocol/TxFormats.h +++ b/src/ripple/protocol/TxFormats.h @@ -17,10 +17,10 @@ */ //============================================================================== -#ifndef RIPPLE_TXFORMATS_H_INCLUDED -#define RIPPLE_TXFORMATS_H_INCLUDED +#ifndef RIPPLE_PROTOCOL_TXFORMATS_H_INCLUDED +#define RIPPLE_PROTOCOL_TXFORMATS_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp similarity index 99% rename from src/ripple/data/protocol/BuildInfo.cpp rename to src/ripple/protocol/impl/BuildInfo.cpp index 171b961893..2029b40057 100644 --- a/src/ripple/data/protocol/BuildInfo.cpp +++ b/src/ripple/protocol/impl/BuildInfo.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include #include diff --git a/src/ripple/data/protocol/HashPrefix.cpp b/src/ripple/protocol/impl/HashPrefix.cpp similarity index 97% rename from src/ripple/data/protocol/HashPrefix.cpp rename to src/ripple/protocol/impl/HashPrefix.cpp index 01076ea536..0b5a2bf02c 100644 --- a/src/ripple/data/protocol/HashPrefix.cpp +++ b/src/ripple/protocol/impl/HashPrefix.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { // The prefix codes are part of the Ripple protocol and existing codes cannot be diff --git a/src/ripple/data/protocol/LedgerFormats.cpp b/src/ripple/protocol/impl/LedgerFormats.cpp similarity index 99% rename from src/ripple/data/protocol/LedgerFormats.cpp rename to src/ripple/protocol/impl/LedgerFormats.cpp index a904b0db92..4e4b1f0d4a 100644 --- a/src/ripple/data/protocol/LedgerFormats.cpp +++ b/src/ripple/protocol/impl/LedgerFormats.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include namespace ripple { diff --git a/src/ripple/data/protocol/RippleAddress.cpp b/src/ripple/protocol/impl/RippleAddress.cpp similarity index 98% rename from src/ripple/data/protocol/RippleAddress.cpp rename to src/ripple/protocol/impl/RippleAddress.cpp index 299c608674..285f3c8521 100644 --- a/src/ripple/data/protocol/RippleAddress.cpp +++ b/src/ripple/protocol/impl/RippleAddress.cpp @@ -19,7 +19,16 @@ #include #include +#include +#include +#include +#include +#include #include +#include +#include +#include +#include namespace ripple { @@ -327,7 +336,7 @@ Account RippleAddress::getAccountID () const } } -typedef RippleMutex StaticLockType; +typedef std::mutex StaticLockType; typedef std::lock_guard StaticScopedLockType; static StaticLockType s_lock; diff --git a/src/ripple/data/protocol/SField.cpp b/src/ripple/protocol/impl/SField.cpp similarity index 99% rename from src/ripple/data/protocol/SField.cpp rename to src/ripple/protocol/impl/SField.cpp index ae9a5627f6..b86a7b8b77 100644 --- a/src/ripple/data/protocol/SField.cpp +++ b/src/ripple/protocol/impl/SField.cpp @@ -17,7 +17,11 @@ */ //============================================================================== -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/STAmount.cpp b/src/ripple/protocol/impl/STAmount.cpp similarity index 99% rename from src/ripple/data/protocol/STAmount.cpp rename to src/ripple/protocol/impl/STAmount.cpp index bb9e591701..343a97be73 100644 --- a/src/ripple/data/protocol/STAmount.cpp +++ b/src/ripple/protocol/impl/STAmount.cpp @@ -17,10 +17,16 @@ */ //============================================================================== +#include +#include +#include #include -#include +#include #include -#include +#include +#include +#include +#include // namespace ripple { diff --git a/src/ripple/data/protocol/STAmount.test.cpp b/src/ripple/protocol/impl/STAmount.test.cpp similarity index 99% rename from src/ripple/data/protocol/STAmount.test.cpp rename to src/ripple/protocol/impl/STAmount.test.cpp index e7ee78cf95..d1265079d6 100644 --- a/src/ripple/data/protocol/STAmount.test.cpp +++ b/src/ripple/protocol/impl/STAmount.test.cpp @@ -17,7 +17,9 @@ */ //============================================================================== -#include +#include +#include +#include #include namespace ripple { diff --git a/src/ripple/data/protocol/STArray.cpp b/src/ripple/protocol/impl/STArray.cpp similarity index 97% rename from src/ripple/data/protocol/STArray.cpp rename to src/ripple/protocol/impl/STArray.cpp index ef34827129..8c1f469204 100644 --- a/src/ripple/data/protocol/STArray.cpp +++ b/src/ripple/protocol/impl/STArray.cpp @@ -18,6 +18,8 @@ //============================================================================== #include +#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/STInteger.cpp b/src/ripple/protocol/impl/STInteger.cpp similarity index 95% rename from src/ripple/data/protocol/STInteger.cpp rename to src/ripple/protocol/impl/STInteger.cpp index cad380ec5e..0143dc4aef 100644 --- a/src/ripple/data/protocol/STInteger.cpp +++ b/src/ripple/protocol/impl/STInteger.cpp @@ -19,7 +19,11 @@ #include #include -#include +#include +#include +#include +#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/STObject.cpp b/src/ripple/protocol/impl/STObject.cpp similarity index 98% rename from src/ripple/data/protocol/STObject.cpp rename to src/ripple/protocol/impl/STObject.cpp index 3ae7d1e6d8..dfd34b1ce7 100644 --- a/src/ripple/data/protocol/STObject.cpp +++ b/src/ripple/protocol/impl/STObject.cpp @@ -18,6 +18,14 @@ //============================================================================== #include +#include +#include +#include +#include +#include +#include +#include +#include #include // namespace ripple { diff --git a/src/ripple/data/protocol/STParsedJSON.cpp b/src/ripple/protocol/impl/STParsedJSON.cpp similarity index 99% rename from src/ripple/data/protocol/STParsedJSON.cpp rename to src/ripple/protocol/impl/STParsedJSON.cpp index fb5c749401..20c9c1fbf6 100644 --- a/src/ripple/data/protocol/STParsedJSON.cpp +++ b/src/ripple/protocol/impl/STParsedJSON.cpp @@ -18,7 +18,8 @@ //============================================================================== #include -#include +#include +#include // VFALCO Questionable dependency #include #include diff --git a/src/ripple/data/protocol/SerializedObjectTemplate.cpp b/src/ripple/protocol/impl/SerializedObjectTemplate.cpp similarity index 97% rename from src/ripple/data/protocol/SerializedObjectTemplate.cpp rename to src/ripple/protocol/impl/SerializedObjectTemplate.cpp index c5d0fccecf..cc56482ea7 100644 --- a/src/ripple/data/protocol/SerializedObjectTemplate.cpp +++ b/src/ripple/protocol/impl/SerializedObjectTemplate.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { SOTemplate::SOTemplate () diff --git a/src/ripple/data/protocol/SerializedTypes.cpp b/src/ripple/protocol/impl/SerializedTypes.cpp similarity index 98% rename from src/ripple/data/protocol/SerializedTypes.cpp rename to src/ripple/protocol/impl/SerializedTypes.cpp index 2f4087e761..9803a5ba3c 100644 --- a/src/ripple/data/protocol/SerializedTypes.cpp +++ b/src/ripple/protocol/impl/SerializedTypes.cpp @@ -19,6 +19,9 @@ #include #include +#include +#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/Serializer.cpp b/src/ripple/protocol/impl/Serializer.cpp similarity index 99% rename from src/ripple/data/protocol/Serializer.cpp rename to src/ripple/protocol/impl/Serializer.cpp index 69b6905b41..49f87911aa 100644 --- a/src/ripple/data/protocol/Serializer.cpp +++ b/src/ripple/protocol/impl/Serializer.cpp @@ -18,7 +18,10 @@ //============================================================================== #include +#include #include +#include +#include namespace ripple { diff --git a/src/ripple/data/protocol/TER.cpp b/src/ripple/protocol/impl/TER.cpp similarity index 99% rename from src/ripple/data/protocol/TER.cpp rename to src/ripple/protocol/impl/TER.cpp index 987da11ecd..95436e78bd 100644 --- a/src/ripple/data/protocol/TER.cpp +++ b/src/ripple/protocol/impl/TER.cpp @@ -18,6 +18,7 @@ //============================================================================== #include +#include namespace ripple { diff --git a/src/ripple/data/protocol/TxFormats.cpp b/src/ripple/protocol/impl/TxFormats.cpp similarity index 99% rename from src/ripple/data/protocol/TxFormats.cpp rename to src/ripple/protocol/impl/TxFormats.cpp index 3bad340c5c..f151f71cbd 100644 --- a/src/ripple/data/protocol/TxFormats.cpp +++ b/src/ripple/protocol/impl/TxFormats.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { TxFormats::TxFormats () diff --git a/src/ripple/resource/api/Charge.h b/src/ripple/resource/Charge.h similarity index 100% rename from src/ripple/resource/api/Charge.h rename to src/ripple/resource/Charge.h diff --git a/src/ripple/resource/api/Consumer.h b/src/ripple/resource/Consumer.h similarity index 96% rename from src/ripple/resource/api/Consumer.h rename to src/ripple/resource/Consumer.h index 3ea6968e25..9392f01ee0 100644 --- a/src/ripple/resource/api/Consumer.h +++ b/src/ripple/resource/Consumer.h @@ -20,8 +20,8 @@ #ifndef RIPPLE_RESOURCE_CONSUMER_H_INCLUDED #define RIPPLE_RESOURCE_CONSUMER_H_INCLUDED -#include -#include +#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/api/Disposition.h b/src/ripple/resource/Disposition.h similarity index 100% rename from src/ripple/resource/api/Disposition.h rename to src/ripple/resource/Disposition.h diff --git a/src/ripple/resource/api/Fees.h b/src/ripple/resource/Fees.h similarity index 98% rename from src/ripple/resource/api/Fees.h rename to src/ripple/resource/Fees.h index 1bbd44df90..9a537ce09d 100644 --- a/src/ripple/resource/api/Fees.h +++ b/src/ripple/resource/Fees.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RESOURCE_FEES_H_INCLUDED #define RIPPLE_RESOURCE_FEES_H_INCLUDED -#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/api/Gossip.h b/src/ripple/resource/Gossip.h similarity index 100% rename from src/ripple/resource/api/Gossip.h rename to src/ripple/resource/Gossip.h diff --git a/src/ripple/resource/api/LegacyFees.h b/src/ripple/resource/LegacyFees.h similarity index 98% rename from src/ripple/resource/api/LegacyFees.h rename to src/ripple/resource/LegacyFees.h index ffbb3ed20f..523a02fddf 100644 --- a/src/ripple/resource/api/LegacyFees.h +++ b/src/ripple/resource/LegacyFees.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_RESOURCE_LEGACYFEES_H_INCLUDED #define RIPPLE_RESOURCE_LEGACYFEES_H_INCLUDED -#include +#include namespace ripple { diff --git a/src/ripple/resource/api/Manager.h b/src/ripple/resource/Manager.h similarity index 96% rename from src/ripple/resource/api/Manager.h rename to src/ripple/resource/Manager.h index cb22a83d28..fe4edcee51 100644 --- a/src/ripple/resource/api/Manager.h +++ b/src/ripple/resource/Manager.h @@ -21,8 +21,8 @@ #define RIPPLE_RESOURCE_MANAGER_H_INCLUDED #include -#include -#include +#include +#include #include #include #include diff --git a/src/ripple/resource/TODO.md b/src/ripple/resource/TODO.md deleted file mode 100644 index e0c2c154ee..0000000000 --- a/src/ripple/resource/TODO.md +++ /dev/null @@ -1 +0,0 @@ -# ResourceManager TODO diff --git a/src/ripple/resource/api/Types.h b/src/ripple/resource/Types.h similarity index 100% rename from src/ripple/resource/api/Types.h rename to src/ripple/resource/Types.h diff --git a/src/ripple/resource/impl/Charge.cpp b/src/ripple/resource/impl/Charge.cpp index 682ba514c1..40b5656b6b 100644 --- a/src/ripple/resource/impl/Charge.cpp +++ b/src/ripple/resource/impl/Charge.cpp @@ -17,12 +17,12 @@ */ //============================================================================== +#include #include namespace ripple { namespace Resource { - Charge::Charge (value_type cost, std::string const& label) : m_cost (cost) , m_label (label) diff --git a/src/ripple/resource/impl/Consumer.cpp b/src/ripple/resource/impl/Consumer.cpp index 66c222e9fd..a2f191d21d 100644 --- a/src/ripple/resource/impl/Consumer.cpp +++ b/src/ripple/resource/impl/Consumer.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#include +#include +#include + namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Entry.h b/src/ripple/resource/impl/Entry.h index f0c7def2a7..d4296a1271 100644 --- a/src/ripple/resource/impl/Entry.h +++ b/src/ripple/resource/impl/Entry.h @@ -20,13 +20,21 @@ #ifndef RIPPLE_RESOURCE_ENTRY_H_INCLUDED #define RIPPLE_RESOURCE_ENTRY_H_INCLUDED +#include +#include +#include +#include +#include + namespace ripple { namespace Resource { typedef beast::abstract_clock clock_type; // An entry in the table -struct Entry : public beast::List ::Node +// VFALCO DEPRECATED using boost::intrusive list +struct Entry + : public beast::List ::Node { Entry () = delete; diff --git a/src/ripple/resource/impl/Fees.cpp b/src/ripple/resource/impl/Fees.cpp index 998c8b2a2e..3892479ecc 100644 --- a/src/ripple/resource/impl/Fees.cpp +++ b/src/ripple/resource/impl/Fees.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Import.h b/src/ripple/resource/impl/Import.h index 38723aa31a..3ed72f7934 100644 --- a/src/ripple/resource/impl/Import.h +++ b/src/ripple/resource/impl/Import.h @@ -20,6 +20,8 @@ #ifndef RIPPLE_RESOURCE_IMPORT_H_INCLUDED #define RIPPLE_RESOURCE_IMPORT_H_INCLUDED +#include + namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Key.h b/src/ripple/resource/impl/Key.h index 4418e535ae..5638b1e524 100644 --- a/src/ripple/resource/impl/Key.h +++ b/src/ripple/resource/impl/Key.h @@ -20,6 +20,10 @@ #ifndef RIPPLE_RESOURCE_KEY_H_INCLUDED #define RIPPLE_RESOURCE_KEY_H_INCLUDED +#include +#include +#include + namespace ripple { namespace Resource { @@ -64,7 +68,7 @@ struct Key return m_name_hash (v.name); default: - bassertfalse; + assert(false); }; return 0; @@ -92,7 +96,7 @@ struct Key return lhs.name == rhs.name; default: - bassertfalse; + assert(false); }; return false; diff --git a/src/ripple/resource/impl/LegacyFees.cpp b/src/ripple/resource/impl/LegacyFees.cpp index 68361fb6e6..d1baeb4ecf 100644 --- a/src/ripple/resource/impl/LegacyFees.cpp +++ b/src/ripple/resource/impl/LegacyFees.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include + namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Logic.h b/src/ripple/resource/impl/Logic.h index ff3d0039ef..2b642dc86c 100644 --- a/src/ripple/resource/impl/Logic.h +++ b/src/ripple/resource/impl/Logic.h @@ -20,9 +20,15 @@ #ifndef RIPPLE_RESOURCE_LOGIC_H_INCLUDED #define RIPPLE_RESOURCE_LOGIC_H_INCLUDED -#include - +#include +#include +#include +#include +#include #include +#include +#include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Manager.cpp b/src/ripple/resource/impl/Manager.cpp index 33584956e9..f178438f6a 100644 --- a/src/ripple/resource/impl/Manager.cpp +++ b/src/ripple/resource/impl/Manager.cpp @@ -17,8 +17,11 @@ */ //============================================================================== +#include +#include #include - +#include // + namespace ripple { namespace Resource { diff --git a/src/ripple/resource/impl/Tests.cpp b/src/ripple/resource/impl/Tests.cpp index 878db6916b..d3e4be1a91 100644 --- a/src/ripple/resource/impl/Tests.cpp +++ b/src/ripple/resource/impl/Tests.cpp @@ -18,8 +18,10 @@ //============================================================================== #include +#include #include #include +#include namespace ripple { namespace Resource { diff --git a/src/ripple/rpc/Request.h b/src/ripple/rpc/Request.h index 94ee705c5f..3f64aaa293 100644 --- a/src/ripple/rpc/Request.h +++ b/src/ripple/rpc/Request.h @@ -20,8 +20,9 @@ #ifndef RIPPLE_RPC_REQUEST_H_INCLUDED #define RIPPLE_RPC_REQUEST_H_INCLUDED +#include +#include #include -#include namespace ripple { diff --git a/src/ripple/rpc/Status.h b/src/ripple/rpc/Status.h index d16452f615..3016690679 100644 --- a/src/ripple/rpc/Status.h +++ b/src/ripple/rpc/Status.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_STATUS_H #define RIPPLE_STATUS_H -#include +#include #include namespace ripple { diff --git a/src/ripple/rpc/handlers/BlackList.cpp b/src/ripple/rpc/handlers/BlackList.cpp index 0dfe163d88..8be993ea78 100644 --- a/src/ripple/rpc/handlers/BlackList.cpp +++ b/src/ripple/rpc/handlers/BlackList.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/GetCounts.cpp b/src/ripple/rpc/handlers/GetCounts.cpp index 5f636dd1a3..bc07007daf 100644 --- a/src/ripple/rpc/handlers/GetCounts.cpp +++ b/src/ripple/rpc/handlers/GetCounts.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include diff --git a/src/ripple/rpc/handlers/Random.cpp b/src/ripple/rpc/handlers/Random.cpp index 8ce5a4ca0a..e0a7acae0f 100644 --- a/src/ripple/rpc/handlers/Random.cpp +++ b/src/ripple/rpc/handlers/Random.cpp @@ -17,6 +17,8 @@ */ //============================================================================== +#include +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/RipplePathFind.cpp b/src/ripple/rpc/handlers/RipplePathFind.cpp index aa45826808..8da1c7ac70 100644 --- a/src/ripple/rpc/handlers/RipplePathFind.cpp +++ b/src/ripple/rpc/handlers/RipplePathFind.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include diff --git a/src/ripple/rpc/handlers/SMS.cpp b/src/ripple/rpc/handlers/SMS.cpp index 43bb65e2c2..8388899fc7 100644 --- a/src/ripple/rpc/handlers/SMS.cpp +++ b/src/ripple/rpc/handlers/SMS.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include namespace ripple { diff --git a/src/ripple/rpc/handlers/Subscribe.cpp b/src/ripple/rpc/handlers/Subscribe.cpp index a4cf4d0bb8..5b26e142fa 100644 --- a/src/ripple/rpc/handlers/Subscribe.cpp +++ b/src/ripple/rpc/handlers/Subscribe.cpp @@ -17,6 +17,7 @@ */ //============================================================================== +#include #include #include diff --git a/src/ripple/rpc/impl/RPCHandler.cpp b/src/ripple/rpc/impl/RPCHandler.cpp index a86cee3b55..f42b660870 100644 --- a/src/ripple/rpc/impl/RPCHandler.cpp +++ b/src/ripple/rpc/impl/RPCHandler.cpp @@ -17,7 +17,10 @@ */ //============================================================================== -#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/rpc/impl/TransactionSign.cpp b/src/ripple/rpc/impl/TransactionSign.cpp index 34b113dc38..ffb2e9fdef 100644 --- a/src/ripple/rpc/impl/TransactionSign.cpp +++ b/src/ripple/rpc/impl/TransactionSign.cpp @@ -19,6 +19,7 @@ #include #include +#include #include #include diff --git a/src/ripple/server/JsonWriter.h b/src/ripple/server/JsonWriter.h index 9914dbcb3e..41384b3a71 100644 --- a/src/ripple/server/JsonWriter.h +++ b/src/ripple/server/JsonWriter.h @@ -26,6 +26,7 @@ #include #include #include +#include namespace ripple { namespace HTTP { diff --git a/src/ripple/server/impl/JSONRPCUtil.cpp b/src/ripple/server/impl/JSONRPCUtil.cpp index 7ca584456a..fc8a5e9936 100644 --- a/src/ripple/server/impl/JSONRPCUtil.cpp +++ b/src/ripple/server/impl/JSONRPCUtil.cpp @@ -19,9 +19,10 @@ #include #include -#include -#include +#include +#include #include +#include #include namespace ripple { diff --git a/src/ripple/server/impl/ServerHandlerImp.cpp b/src/ripple/server/impl/ServerHandlerImp.cpp index f756bbbd16..abf6f46498 100644 --- a/src/ripple/server/impl/ServerHandlerImp.cpp +++ b/src/ripple/server/impl/ServerHandlerImp.cpp @@ -22,12 +22,12 @@ #include #include #include -#include +#include #include #include #include -#include -#include +#include +#include #include // #include #include diff --git a/src/ripple/server/impl/ServerImpl.cpp b/src/ripple/server/impl/ServerImpl.cpp index f124e080da..0c80e348e4 100644 --- a/src/ripple/server/impl/ServerImpl.cpp +++ b/src/ripple/server/impl/ServerImpl.cpp @@ -17,10 +17,6 @@ */ //============================================================================== -#if DOXYGEN -#include -#endif - #include #include #include diff --git a/src/ripple/server/impl/ServerImpl.h b/src/ripple/server/impl/ServerImpl.h index 88ee207e86..73f0fbed55 100644 --- a/src/ripple/server/impl/ServerImpl.h +++ b/src/ripple/server/impl/ServerImpl.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_SERVER_SERVERIMPL_H_INCLUDED #define RIPPLE_SERVER_SERVERIMPL_H_INCLUDED -#include +#include #include #include #include diff --git a/src/ripple/server/tests/Server.test.cpp b/src/ripple/server/tests/Server.test.cpp index c369c4ed4c..a5f9703f7a 100644 --- a/src/ripple/server/tests/Server.test.cpp +++ b/src/ripple/server/tests/Server.test.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/ripple/sslutil/TODO.md b/src/ripple/sslutil/TODO.md deleted file mode 100644 index fc6a847bdf..0000000000 --- a/src/ripple/sslutil/TODO.md +++ /dev/null @@ -1 +0,0 @@ -# SSLUtil TODO diff --git a/src/ripple/types/Book.h b/src/ripple/types/Book.h index 8cb1f933c0..09b6b9b18b 100644 --- a/src/ripple/types/Book.h +++ b/src/ripple/types/Book.h @@ -21,6 +21,7 @@ #define RIPPLE_TYPES_BOOK_H_INCLUDED #include +#include namespace ripple { diff --git a/src/ripple/types/UintTypes.h b/src/ripple/types/UintTypes.h index 69fc5c9f31..cd2609defe 100644 --- a/src/ripple/types/UintTypes.h +++ b/src/ripple/types/UintTypes.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_TYPES_BASICS #define RIPPLE_TYPES_BASICS -#include +#include #include namespace ripple { diff --git a/src/ripple/types/impl/Base58.cpp b/src/ripple/types/impl/Base58.cpp index 70fdf20ad8..cddcfee80f 100644 --- a/src/ripple/types/impl/Base58.cpp +++ b/src/ripple/types/impl/Base58.cpp @@ -17,6 +17,11 @@ */ //============================================================================== +#include +#include +#include +#include + // Copyright (c) 2009-2010 Satoshi Nakamoto // Copyright (c) 2011 The Bitcoin Developers // Distributed under the MIT/X11 software license, see the accompanying diff --git a/src/ripple/types/impl/Issue.cpp b/src/ripple/types/impl/Issue.cpp index 1810d175f2..129e4e4d9f 100644 --- a/src/ripple/types/impl/Issue.cpp +++ b/src/ripple/types/impl/Issue.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include diff --git a/src/ripple/types/impl/UintTypes.cpp b/src/ripple/types/impl/UintTypes.cpp index c1c50df324..0560a0215f 100644 --- a/src/ripple/types/impl/UintTypes.cpp +++ b/src/ripple/types/impl/UintTypes.cpp @@ -19,8 +19,8 @@ #include -#include -#include +#include +#include namespace ripple { diff --git a/src/ripple/unity/app.cpp b/src/ripple/unity/app.cpp index fa3295db09..0b6474fc24 100644 --- a/src/ripple/unity/app.cpp +++ b/src/ripple/unity/app.cpp @@ -20,10 +20,8 @@ #include #include -#include #include #include -#include #include #include #include @@ -37,7 +35,7 @@ #include #include #include - +#include #include //------------------------------------------------------------------------------ diff --git a/src/ripple/unity/app.h b/src/ripple/unity/app.h index 5b2312dad9..8282b75d58 100644 --- a/src/ripple/unity/app.h +++ b/src/ripple/unity/app.h @@ -44,10 +44,8 @@ //------------------------------------------------------------------------------ #include -#include -#include -#include +#include // VFALCO TODO Remove this include #include @@ -55,8 +53,8 @@ // Order matters here. If you get compile errors, // reorder the include lines until the order is correct. -#include -#include +#include +#include #include #include diff --git a/src/ripple/unity/app1.cpp b/src/ripple/unity/app1.cpp index 326cb8909f..745286f1bc 100644 --- a/src/ripple/unity/app1.cpp +++ b/src/ripple/unity/app1.cpp @@ -19,26 +19,14 @@ #include -#include -#include -#include - #include +#include #include - -#include - -#include #include #include #include - -// requires Application +#include #include - -#include - -#include #include #include diff --git a/src/ripple/unity/app2.cpp b/src/ripple/unity/app2.cpp index ccfb12d068..6c26d0137b 100644 --- a/src/ripple/unity/app2.cpp +++ b/src/ripple/unity/app2.cpp @@ -21,24 +21,19 @@ #include -#include - -#include // Uses theApp -#include -#include -#include - -#include -#include -#include -#include -#include - #include #include #include #include - +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include #include diff --git a/src/ripple/unity/app4.cpp b/src/ripple/unity/app4.cpp index 7ae2e53f19..f2653b883e 100644 --- a/src/ripple/unity/app4.cpp +++ b/src/ripple/unity/app4.cpp @@ -21,22 +21,14 @@ #include -#include - -#include - -#include // for UniqueNodeList.cpp - -#include - +#include +#include +#include #include #include -#include +#include #include #include #include #include #include - -#include -#include diff --git a/src/ripple/unity/app5.cpp b/src/ripple/unity/app5.cpp index 43aedb7cb9..b5e639bcfd 100644 --- a/src/ripple/unity/app5.cpp +++ b/src/ripple/unity/app5.cpp @@ -20,15 +20,6 @@ #include #include -#include -#include - -#include -#include - -#include - -#include #include #include diff --git a/src/ripple/unity/app6.cpp b/src/ripple/unity/app6.cpp index 59db29b8f6..d4a4b21a37 100644 --- a/src/ripple/unity/app6.cpp +++ b/src/ripple/unity/app6.cpp @@ -21,8 +21,6 @@ #include -#include - #include #include #include diff --git a/src/ripple/unity/app7.cpp b/src/ripple/unity/app7.cpp index cab79fcdee..a533f00ea0 100644 --- a/src/ripple/unity/app7.cpp +++ b/src/ripple/unity/app7.cpp @@ -21,16 +21,9 @@ #include -#include - -#include - #include #include #include #include - -#include -#include #include #include diff --git a/src/ripple/unity/app8.cpp b/src/ripple/unity/app8.cpp index 537b66c3c0..1ba9cd63b4 100644 --- a/src/ripple/unity/app8.cpp +++ b/src/ripple/unity/app8.cpp @@ -25,9 +25,6 @@ #pragma warning (push) #pragma warning (disable: 4309) // truncation of constant value #endif - -#include - #include #include #include diff --git a/src/ripple/unity/app9.cpp b/src/ripple/unity/app9.cpp index c522f9378a..7c257a8e75 100644 --- a/src/ripple/unity/app9.cpp +++ b/src/ripple/unity/app9.cpp @@ -25,9 +25,7 @@ #include #include #include - #include - #include #include #include diff --git a/src/ripple/unity/basics.cpp b/src/ripple/unity/basics.cpp index 01230b34f3..5aea3ceca3 100644 --- a/src/ripple/unity/basics.cpp +++ b/src/ripple/unity/basics.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#if DOXYGEN +#include +#endif + #include #include @@ -29,3 +33,10 @@ #include #include #include + +#include +#include +#include +#include + +#include diff --git a/src/ripple/unity/sslutil.cpp b/src/ripple/unity/crypto.cpp similarity index 70% rename from src/ripple/unity/sslutil.cpp rename to src/ripple/unity/crypto.cpp index 608630962c..b196eaf788 100644 --- a/src/ripple/unity/sslutil.cpp +++ b/src/ripple/unity/crypto.cpp @@ -17,10 +17,18 @@ */ //============================================================================== +#if DOXYGEN +#include +#endif + #include -#include - -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/data.cpp b/src/ripple/unity/data.cpp deleted file mode 100644 index 94630227be..0000000000 --- a/src/ripple/unity/data.cpp +++ /dev/null @@ -1,87 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#include - -#include - -//#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -// VFALCO TODO fix these warnings! -#if BEAST_MSVC -#pragma warning (push) -#pragma warning (disable: 4018) // signed/unsigned mismatch -#endif - -#ifdef min -#undef min -#endif - -#include - -#include // needs RippleAddress VFALCO TODO remove this dependency cycle -#include - -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#if BEAST_MSVC -#pragma warning (pop) -#endif diff --git a/src/ripple/unity/data.h b/src/ripple/unity/data.h index 4b3d755997..7aced0723e 100644 --- a/src/ripple/unity/data.h +++ b/src/ripple/unity/data.h @@ -27,27 +27,25 @@ struct bignum_st; typedef struct bignum_st BIGNUM; -#include -#include -#include -#include -#include -#include -#include -#include // needs CKey -#include -#include // needs Serializer, TER -#include -#include -#include // needs SOTemplate from SerializedObjectTemplate -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include // needs CKey +#include +#include // needs Serializer, TER +#include +#include +#include // needs SOTemplate from SerializedObjectTemplate +#include +#include +#include +#include -#include - -#include +#include //------------------------------------------------------------------------------ diff --git a/src/ripple/unity/net.h b/src/ripple/unity/net.h deleted file mode 100644 index 92265801f8..0000000000 --- a/src/ripple/unity/net.h +++ /dev/null @@ -1,42 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef RIPPLE_NET_H_INCLUDED -#define RIPPLE_NET_H_INCLUDED - -#undef DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER -#define DEPRECATED_IN_MAC_OS_X_VERSION_10_7_AND_LATER /**/ -#include - -#include - -#include -#include - -#include -#include -#include -#include - -#include -#include -#include -#include - -#endif diff --git a/src/ripple/unity/nodestore.cpp b/src/ripple/unity/nodestore.cpp index c7903ac7a1..626cb6fee9 100644 --- a/src/ripple/unity/nodestore.cpp +++ b/src/ripple/unity/nodestore.cpp @@ -27,9 +27,9 @@ #include -#include -#include -#include +#include +#include +#include #include #include diff --git a/src/ripple/unity/overlay.cpp b/src/ripple/unity/overlay.cpp index 6b85720485..16aac28616 100644 --- a/src/ripple/unity/overlay.cpp +++ b/src/ripple/unity/overlay.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#if DOXYGEN +#include +#endif + #include #include diff --git a/src/ripple/unity/peerfinder.cpp b/src/ripple/unity/peerfinder.cpp index 03393994ca..b3807920d4 100644 --- a/src/ripple/unity/peerfinder.cpp +++ b/src/ripple/unity/peerfinder.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#if DOXYGEN +#include +#endif + #include #ifndef NDEBUG diff --git a/src/ripple/unity/common.cpp b/src/ripple/unity/protocol.cpp similarity index 56% rename from src/ripple/unity/common.cpp rename to src/ripple/unity/protocol.cpp index d60da05cdd..d2d0dc2729 100644 --- a/src/ripple/unity/common.cpp +++ b/src/ripple/unity/protocol.cpp @@ -19,9 +19,23 @@ #include -#include -#include -#include -#include +#if DOXYGEN +#include +#endif -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/src/ripple/unity/resource.cpp b/src/ripple/unity/resource.cpp index 7ac494402c..56c842c175 100644 --- a/src/ripple/unity/resource.cpp +++ b/src/ripple/unity/resource.cpp @@ -17,28 +17,18 @@ */ //============================================================================== +#if DOXYGEN +#include +#endif + #include -#include - -#include - -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include #include -#include #include +#include +#include +#include #include #include #include +#include diff --git a/src/ripple/unity/resource.h b/src/ripple/unity/resource.h deleted file mode 100644 index 5c63361881..0000000000 --- a/src/ripple/unity/resource.h +++ /dev/null @@ -1,34 +0,0 @@ -//------------------------------------------------------------------------------ -/* - This file is part of rippled: https://github.com/ripple/rippled - Copyright (c) 2012, 2013 Ripple Labs Inc. - - Permission to use, copy, modify, and/or distribute this software for any - purpose with or without fee is hereby granted, provided that the above - copyright notice and this permission notice appear in all copies. - - THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES - WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF - MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR - ANY SPECIAL , DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN - ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -*/ -//============================================================================== - -#ifndef RIPPLE_RESOURCE_H_INCLUDED -#define RIPPLE_RESOURCE_H_INCLUDED - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#endif diff --git a/src/ripple/unity/rpcx.cpp b/src/ripple/unity/rpcx.cpp index 6d28a231d9..94e0c86fbd 100644 --- a/src/ripple/unity/rpcx.cpp +++ b/src/ripple/unity/rpcx.cpp @@ -22,7 +22,7 @@ // Unfortunate but necessary since RPC handlers can literally do anything #include #include -#include +#include #include diff --git a/src/ripple/unity/server.cpp b/src/ripple/unity/server.cpp index 5d1d1cd969..8c8ba6713c 100644 --- a/src/ripple/unity/server.cpp +++ b/src/ripple/unity/server.cpp @@ -17,6 +17,10 @@ */ //============================================================================== +#if DOXYGEN +#include +#endif + #include #include diff --git a/src/ripple/unity/types.cpp b/src/ripple/unity/types.cpp index e9be606248..f2ce041f28 100644 --- a/src/ripple/unity/types.cpp +++ b/src/ripple/unity/types.cpp @@ -20,7 +20,6 @@ #include #include -#include #ifdef BEAST_WIN32 #include // for ByteOrder.cpp @@ -38,7 +37,6 @@ #include #include -#include #include #include #include diff --git a/src/ripple/unity/types.h b/src/ripple/unity/types.h index a678686424..26aee9c25e 100644 --- a/src/ripple/unity/types.h +++ b/src/ripple/unity/types.h @@ -45,7 +45,6 @@ #include #include #include -#include #include #include diff --git a/src/ripple/unity/websocket.h b/src/ripple/unity/websocket.h index 3d4de77af5..dfe039a7a5 100644 --- a/src/ripple/unity/websocket.h +++ b/src/ripple/unity/websocket.h @@ -25,8 +25,6 @@ #define __STDC_LIMIT_MACROS #endif -#include - #include #include #include diff --git a/src/ripple/validators/impl/ChosenList.h b/src/ripple/validators/impl/ChosenList.h index fb4216db31..d7087851d5 100644 --- a/src/ripple/validators/impl/ChosenList.h +++ b/src/ripple/validators/impl/ChosenList.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_VALIDATORS_CHOSENLIST_H_INCLUDED #define RIPPLE_VALIDATORS_CHOSENLIST_H_INCLUDED -#include +#include #include namespace ripple { diff --git a/src/ripple/validators/impl/Validator.h b/src/ripple/validators/impl/Validator.h index f123170662..da1bc5e66f 100644 --- a/src/ripple/validators/impl/Validator.h +++ b/src/ripple/validators/impl/Validator.h @@ -20,7 +20,7 @@ #ifndef RIPPLE_VALIDATORS_VALIDATOR_H_INCLUDED #define RIPPLE_VALIDATORS_VALIDATOR_H_INCLUDED -#include // VFALCO Doesn't belong here +#include #include #include #include diff --git a/src/ripple/validators/tests/Validators.test.cpp b/src/ripple/validators/tests/Validators.test.cpp index 50b9bfcb14..7753723a78 100644 --- a/src/ripple/validators/tests/Validators.test.cpp +++ b/src/ripple/validators/tests/Validators.test.cpp @@ -17,7 +17,7 @@ */ //============================================================================== -#include +#include #include #include #include diff --git a/src/websocket/src/sockets/autotls.hpp b/src/websocket/src/sockets/autotls.hpp index 217373ce60..c835580a89 100644 --- a/src/websocket/src/sockets/autotls.hpp +++ b/src/websocket/src/sockets/autotls.hpp @@ -28,6 +28,7 @@ #ifndef WEBSOCKETPP_SOCKET_AUTOTLS_HPP #define WEBSOCKETPP_SOCKET_AUTOTLS_HPP +#include #include #include