Temporarily merge un-refactored modules into ripple_main

This commit is contained in:
Vinnie Falco
2013-06-01 20:54:16 -07:00
parent 456b6e5460
commit cd3195d901
12 changed files with 485 additions and 520 deletions

View File

@@ -23,43 +23,3 @@
*/
#include "ripple_net.h"
#include "../websocketpp/src/logger/logger.hpp" // for ripple_LogWebSockets.cpp
#include "../ripple_data/ripple_data.h"
#include "../ripple_ledger/ripple_ledger.h"
// VFALCO: TODO, fix these warnings!
#ifdef _MSC_VER
//#pragma warning (push) // Causes spurious C4503 "decorated name exceeds maximum length"
#pragma warning (disable: 4018) // signed/unsigned mismatch
#pragma warning (disable: 4244) // conversion, possible loss of data
#pragma warning (disable: 4309) // truncation of constant value
#endif
#include "src/cpp/ripple/Application.h"
// This is for PeerDoor and WSDoor
// Generate DH for SSL connection.
static DH* handleTmpDh(SSL* ssl, int is_export, int iKeyLength)
{
// VFALCO: TODO, eliminate this horrendous dependency on theApp and Wallet
return 512 == iKeyLength ? theApp->getWallet().getDh512() : theApp->getWallet().getDh1024();
}
#include "src/cpp/ripple/Suppression.cpp" // no log
#include "src/cpp/ripple/UniqueNodeList.cpp"
#include "src/cpp/ripple/SNTPClient.cpp"
#include "src/cpp/ripple/ConnectionPool.cpp"
#include "src/cpp/ripple/NetworkOPs.cpp"
#include "src/cpp/ripple/Peer.cpp"
#include "src/cpp/ripple/PeerDoor.cpp"
#include "src/cpp/ripple/WSDoor.cpp" // uses logging in WSConnection.h
#include "sockets/ripple_LogWebsockets.cpp"
#ifdef _MSC_VER
//#pragma warning (pop)
#endif