diff --git a/modules/ripple_basics/ripple_basics.cpp b/modules/ripple_basics/ripple_basics.cpp index 573e1e8bb..01b56d045 100644 --- a/modules/ripple_basics/ripple_basics.cpp +++ b/modules/ripple_basics/ripple_basics.cpp @@ -65,13 +65,14 @@ #include "containers/ripple_RangeSet.cpp" #include "utility/ripple_Log.cpp" -#include "utility/ripple_UptimeTimer.cpp" -#include "utility/ripple_StringUtilities.cpp" #include "utility/ripple_ByteOrder.cpp" +#include "utility/ripple_DiffieHellmanUtil.cpp" +#include "utility/ripple_StringUtilities.cpp" #include "utility/ripple_Sustain.cpp" #include "utility/ripple_ThreadName.cpp" #include "utility/ripple_Time.cpp" +#include "utility/ripple_UptimeTimer.cpp" #ifdef WIN32 #include // for ripple_RandomNumbers.cpp diff --git a/modules/ripple_basics/ripple_basics.h b/modules/ripple_basics/ripple_basics.h index 1bca2a825..670005a1c 100644 --- a/modules/ripple_basics/ripple_basics.h +++ b/modules/ripple_basics/ripple_basics.h @@ -90,6 +90,8 @@ namespace boost { #include #include +// VFALCO: TODO, remove this dependency!!! +#include // for DiffieHellmanUtil #include "../ripple_json/ripple_json.h" @@ -103,12 +105,13 @@ namespace boost { #include "containers/ripple_TaggedCache.h" #include "utility/ripple_ByteOrder.h" -#include "utility/ripple_StringUtilities.h" -#include "utility/ripple_UptimeTimer.h" +#include "utility/ripple_DiffieHellmanUtil.h" #include "utility/ripple_PlatformMacros.h" #include "utility/ripple_RandomNumbers.h" +#include "utility/ripple_StringUtilities.h" #include "utility/ripple_Sustain.h" #include "utility/ripple_ThreadName.h" #include "utility/ripple_Time.h" +#include "utility/ripple_UptimeTimer.h" #endif diff --git a/src/cpp/ripple/utils.cpp b/modules/ripple_basics/utility/ripple_DiffieHellmanUtil.cpp similarity index 58% rename from src/cpp/ripple/utils.cpp rename to modules/ripple_basics/utility/ripple_DiffieHellmanUtil.cpp index 634d61e3b..913a7ab7f 100644 --- a/src/cpp/ripple/utils.cpp +++ b/modules/ripple_basics/utility/ripple_DiffieHellmanUtil.cpp @@ -1,36 +1,4 @@ -#ifdef __linux__ -#include -#include -#include -#endif - -#ifdef __FreeBSD__ -#include -#include -#endif - -#ifdef WIN32 -#define _WINSOCK_ -#include -#endif - -#include - -//#include -//#include -#include -//#include -//#include - -//#include - -#include "utils.h" -#include "uint256.h" - -// -// DH support -// std::string DH_der_gen(int iKeyLength) { diff --git a/modules/ripple_basics/utility/ripple_DiffieHellmanUtil.h b/modules/ripple_basics/utility/ripple_DiffieHellmanUtil.h new file mode 100644 index 000000000..c9e4679c8 --- /dev/null +++ b/modules/ripple_basics/utility/ripple_DiffieHellmanUtil.h @@ -0,0 +1,11 @@ + + +#ifndef RIPPLE_DIFFIEHELLMANUTIL_H +#define RIPPLE_DIFFIEHELLMANUTIL_H + +extern DH* DH_der_load (const std::string& strDer); +extern std::string DH_der_gen (int iKeyLength); + +#endif + +// vim:ts=4 diff --git a/modules/ripple_basics/utility/ripple_PlatformMacros.h b/modules/ripple_basics/utility/ripple_PlatformMacros.h index 4bd6101a9..60dfe3ad5 100644 --- a/modules/ripple_basics/utility/ripple_PlatformMacros.h +++ b/modules/ripple_basics/utility/ripple_PlatformMacros.h @@ -49,4 +49,10 @@ #endif +// VFALCO: TODO, Clean this junk up +#define nothing() do {} while (0) +#define fallthru() do {} while (0) +#define NUMBER(x) (sizeof(x)/sizeof((x)[0])) +#define isSetBit(x,y) (!!((x) & (y))) + #endif diff --git a/modules/ripple_ledger/ripple_ledger.cpp b/modules/ripple_ledger/ripple_ledger.cpp index 82807e5e9..d1aa91927 100644 --- a/modules/ripple_ledger/ripple_ledger.cpp +++ b/modules/ripple_ledger/ripple_ledger.cpp @@ -120,7 +120,6 @@ #include "src/cpp/ripple/TransactionQueue.h" #include "src/cpp/ripple/Transactor.h" #include "src/cpp/ripple/TrustSetTransactor.h" -#include "src/cpp/ripple/utils.h" #include "src/cpp/ripple/ValidationCollection.h" #include "src/cpp/ripple/Wallet.h" #include "src/cpp/ripple/WalletAddTransactor.h" diff --git a/modules/ripple_mess/ripple_mess.cpp b/modules/ripple_mess/ripple_mess.cpp index 4baf46ee6..41c97e80f 100644 --- a/modules/ripple_mess/ripple_mess.cpp +++ b/modules/ripple_mess/ripple_mess.cpp @@ -65,7 +65,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1; #include "src/cpp/ripple/SHAMapDiff.cpp" // no log #include "src/cpp/ripple/SHAMapNodes.cpp" // no log #include "src/cpp/ripple/SHAMapSync.cpp" -#include "src/cpp/ripple/utils.cpp" // no log #include "ripple.pb.cc" diff --git a/newcoin.vcxproj b/newcoin.vcxproj index 63bba33e4..113d88af5 100644 --- a/newcoin.vcxproj +++ b/newcoin.vcxproj @@ -192,6 +192,12 @@ true true + + true + true + true + true + true true @@ -1133,12 +1139,6 @@ true true - - true - true - true - true - true true @@ -1211,6 +1211,7 @@ + @@ -1636,7 +1637,6 @@ - diff --git a/newcoin.vcxproj.filters b/newcoin.vcxproj.filters index e0d82a6e4..57db27371 100644 --- a/newcoin.vcxproj.filters +++ b/newcoin.vcxproj.filters @@ -510,9 +510,6 @@ 1. Modules\ripple_mess\types - - 1. Modules\ripple_mess\types - 1. Modules\ripple_basics @@ -762,6 +759,9 @@ 1. Modules\ripple_basics\utility + + 1. Modules\ripple_basics\utility + @@ -1139,9 +1139,6 @@ 1. Modules\ripple_mess\types - - 1. Modules\ripple_mess\types - 1. Modules\ripple_basics @@ -1430,6 +1427,9 @@ 1. Modules\ripple_basics\utility + + 1. Modules\ripple_basics\utility + diff --git a/src/cpp/database/database.h b/src/cpp/database/database.h index e37c8458c..32c9b3b16 100644 --- a/src/cpp/database/database.h +++ b/src/cpp/database/database.h @@ -3,7 +3,6 @@ #include #include -#include "../ripple/utils.h" #define SQL_FOREACH(_db, _strQuery) \ if ((_db)->executeSQL(_strQuery)) \ diff --git a/src/cpp/ripple/Amount.cpp b/src/cpp/ripple/Amount.cpp index a23badb3d..8072f1e48 100644 --- a/src/cpp/ripple/Amount.cpp +++ b/src/cpp/ripple/Amount.cpp @@ -11,7 +11,6 @@ #include "Config.h" #include "SerializedTypes.h" -#include "utils.h" SETUP_LOG (STAmount) diff --git a/src/cpp/ripple/Application.cpp b/src/cpp/ripple/Application.cpp index 2f526499e..fcd0a6d07 100644 --- a/src/cpp/ripple/Application.cpp +++ b/src/cpp/ripple/Application.cpp @@ -12,7 +12,6 @@ #include "RPCDoor.h" #include "BitcoinUtil.h" #include "key.h" -#include "utils.h" #include "../database/SqliteDatabase.h" diff --git a/src/cpp/ripple/Config.cpp b/src/cpp/ripple/Config.cpp index 87672a5b3..1aa05ddb4 100644 --- a/src/cpp/ripple/Config.cpp +++ b/src/cpp/ripple/Config.cpp @@ -10,7 +10,6 @@ #include "Config.h" -#include "utils.h" #include "HashPrefixes.h" #define SECTION_ACCOUNT_PROBE_MAX "account_probe_max" diff --git a/src/cpp/ripple/ConnectionPool.cpp b/src/cpp/ripple/ConnectionPool.cpp index 5c08799fc..1f603418c 100644 --- a/src/cpp/ripple/ConnectionPool.cpp +++ b/src/cpp/ripple/ConnectionPool.cpp @@ -12,7 +12,9 @@ #include "Peer.h" #include "PeerDoor.h" #include "Application.h" -#include "utils.h" + +// VFALCO: TODO, make this an inline function +#define ADDRESS_SHARED(p) strHex(uint64( ((char*) (p).get()) - ((char*) 0))) // How often to enforce policies. #define POLICY_INTERVAL_SECONDS 5 diff --git a/src/cpp/ripple/DBInit.cpp b/src/cpp/ripple/DBInit.cpp index c57e26846..da9978822 100644 --- a/src/cpp/ripple/DBInit.cpp +++ b/src/cpp/ripple/DBInit.cpp @@ -1,4 +1,3 @@ -#include "utils.h" #include diff --git a/src/cpp/ripple/FieldNames.cpp b/src/cpp/ripple/FieldNames.cpp index cb722b8bd..d73a80270 100644 --- a/src/cpp/ripple/FieldNames.cpp +++ b/src/cpp/ripple/FieldNames.cpp @@ -7,7 +7,6 @@ #include #include -#include "utils.h" // These must stay at the top of this file std::map SField::codeToField; diff --git a/src/cpp/ripple/HttpsClient.cpp b/src/cpp/ripple/HttpsClient.cpp index af06bfa69..f473f9493 100644 --- a/src/cpp/ripple/HttpsClient.cpp +++ b/src/cpp/ripple/HttpsClient.cpp @@ -3,7 +3,6 @@ // #include "HttpsClient.h" -#include "utils.h" #include #include diff --git a/src/cpp/ripple/HttpsClient.h b/src/cpp/ripple/HttpsClient.h index a433c0a9d..41c22c298 100644 --- a/src/cpp/ripple/HttpsClient.h +++ b/src/cpp/ripple/HttpsClient.h @@ -11,7 +11,6 @@ #include #include "AutoSocket.h" -#include "utils.h" // // Async https client. diff --git a/src/cpp/ripple/LoadMonitor.h b/src/cpp/ripple/LoadMonitor.h index 54ff96220..3c3f44a7e 100644 --- a/src/cpp/ripple/LoadMonitor.h +++ b/src/cpp/ripple/LoadMonitor.h @@ -6,7 +6,6 @@ #include #include -#include "utils.h" // Monitors load levels and response times diff --git a/src/cpp/ripple/NetworkOPs.cpp b/src/cpp/ripple/NetworkOPs.cpp index 52f0a19a3..29845310c 100644 --- a/src/cpp/ripple/NetworkOPs.cpp +++ b/src/cpp/ripple/NetworkOPs.cpp @@ -3,7 +3,6 @@ #include -#include "utils.h" #include "Application.h" #include "Transaction.h" #include "HashPrefixes.h" diff --git a/src/cpp/ripple/ParameterTable.cpp b/src/cpp/ripple/ParameterTable.cpp index 3ccc68e17..7ef8b9331 100644 --- a/src/cpp/ripple/ParameterTable.cpp +++ b/src/cpp/ripple/ParameterTable.cpp @@ -3,8 +3,6 @@ #include #include -#include "utils.h" - bool ParameterNode::setValue(const std::string& name, const Json::Value& value, Json::Value& error) { if (name.empty()) // this node diff --git a/src/cpp/ripple/ParseSection.cpp b/src/cpp/ripple/ParseSection.cpp index 99f8ce39c..952450036 100644 --- a/src/cpp/ripple/ParseSection.cpp +++ b/src/cpp/ripple/ParseSection.cpp @@ -1,5 +1,4 @@ #include "ParseSection.h" -#include "utils.h" #include #include diff --git a/src/cpp/ripple/Peer.cpp b/src/cpp/ripple/Peer.cpp index c900f789a..e3dcda098 100644 --- a/src/cpp/ripple/Peer.cpp +++ b/src/cpp/ripple/Peer.cpp @@ -10,7 +10,9 @@ #include "Config.h" #include "Application.h" #include "SerializedTransaction.h" -#include "utils.h" + +// VFALCO: TODO, make this an inline function +#define ADDRESS(p) strHex(uint64( ((char*) p) - ((char*) 0))) SETUP_LOG (Peer) diff --git a/src/cpp/ripple/PeerDoor.cpp b/src/cpp/ripple/PeerDoor.cpp index 856ed2eea..868a7bb5e 100644 --- a/src/cpp/ripple/PeerDoor.cpp +++ b/src/cpp/ripple/PeerDoor.cpp @@ -8,7 +8,6 @@ #include "Application.h" #include "Config.h" -#include "utils.h" SETUP_LOG (PeerDoor) diff --git a/src/cpp/ripple/RPCErr.cpp b/src/cpp/ripple/RPCErr.cpp index b3a42d40c..b445279e5 100644 --- a/src/cpp/ripple/RPCErr.cpp +++ b/src/cpp/ripple/RPCErr.cpp @@ -1,6 +1,5 @@ #include "RPCErr.h" -#include "utils.h" // For logging struct RPCErr { }; diff --git a/src/cpp/ripple/RPCServer.cpp b/src/cpp/ripple/RPCServer.cpp index db4a23a29..bdb374036 100644 --- a/src/cpp/ripple/RPCServer.cpp +++ b/src/cpp/ripple/RPCServer.cpp @@ -2,7 +2,6 @@ #include "HttpsClient.h" #include "RPC.h" -#include "utils.h" #include diff --git a/src/cpp/ripple/RippleAddress.cpp b/src/cpp/ripple/RippleAddress.cpp index dfdab3f7c..0eff98a8c 100644 --- a/src/cpp/ripple/RippleAddress.cpp +++ b/src/cpp/ripple/RippleAddress.cpp @@ -16,7 +16,6 @@ #include "key.h" #include "BitcoinUtil.h" #include "rfc1751.h" -#include "utils.h" #include "Serializer.h" #include "Application.h" diff --git a/src/cpp/ripple/SNTPClient.cpp b/src/cpp/ripple/SNTPClient.cpp index e7a24e561..000b93af8 100644 --- a/src/cpp/ripple/SNTPClient.cpp +++ b/src/cpp/ripple/SNTPClient.cpp @@ -6,7 +6,6 @@ #include -#include "utils.h" #include "Config.h" SETUP_LOG (SNTPClient) diff --git a/src/cpp/ripple/UniqueNodeList.cpp b/src/cpp/ripple/UniqueNodeList.cpp index 26d7f4e4a..62fa68d5d 100644 --- a/src/cpp/ripple/UniqueNodeList.cpp +++ b/src/cpp/ripple/UniqueNodeList.cpp @@ -19,7 +19,6 @@ #include "HttpsClient.h" #include "ParseSection.h" #include "Serializer.h" -#include "utils.h" #define VALIDATORS_FETCH_SECONDS 30 #define VALIDATORS_FILE_BYTES_MAX (50 << 10) diff --git a/src/cpp/ripple/WSDoor.cpp b/src/cpp/ripple/WSDoor.cpp index 1e6c22379..baf01cca3 100644 --- a/src/cpp/ripple/WSDoor.cpp +++ b/src/cpp/ripple/WSDoor.cpp @@ -7,7 +7,6 @@ #include "Application.h" #include "Config.h" #include "NetworkOPs.h" -#include "utils.h" #include "WSConnection.h" #include "WSHandler.h" #include "Config.h" diff --git a/src/cpp/ripple/main.cpp b/src/cpp/ripple/main.cpp index 476d4bada..24dd35441 100644 --- a/src/cpp/ripple/main.cpp +++ b/src/cpp/ripple/main.cpp @@ -10,7 +10,6 @@ #include "CallRPC.h" #include "Config.h" #include "RPCHandler.h" -#include "utils.h" namespace po = boost::program_options; diff --git a/src/cpp/ripple/uint256.h b/src/cpp/ripple/uint256.h index 50bdf3a1d..c1fe96b7b 100644 --- a/src/cpp/ripple/uint256.h +++ b/src/cpp/ripple/uint256.h @@ -15,8 +15,6 @@ #include -#include "utils.h" - #if defined(_MSC_VER) && _MSC_VER < 1300 #define for if (false) ; else for #endif diff --git a/src/cpp/ripple/utils.h b/src/cpp/ripple/utils.h deleted file mode 100644 index b74722a50..000000000 --- a/src/cpp/ripple/utils.h +++ /dev/null @@ -1,19 +0,0 @@ -#ifndef __UTILS__ -#define __UTILS__ - -#include - -#define nothing() do {} while (0) -#define fallthru() do {} while (0) -#define NUMBER(x) (sizeof(x)/sizeof((x)[0])) -#define ADDRESS(p) strHex(uint64( ((char*) p) - ((char*) 0))) -#define ADDRESS_SHARED(p) strHex(uint64( ((char*) (p).get()) - ((char*) 0))) - -#define isSetBit(x,y) (!!((x) & (y))) - -DH* DH_der_load(const std::string& strDer); -std::string DH_der_gen(int iKeyLength); - -#endif - -// vim:ts=4