diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 6fa102db2..40fc3f7aa 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -376,6 +376,12 @@
true
true
+
+ true
+ true
+ true
+ true
+
@@ -890,12 +896,6 @@
true
true
-
- true
- true
- true
- true
-
true
true
@@ -1400,6 +1400,7 @@
+
@@ -1482,7 +1483,6 @@
-
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index 288bf4aca..33bc84ff6 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -666,9 +666,6 @@
[1] Ripple\ripple_app\_misc
-
- [1] Ripple\ripple_app\_network
-
[1] Ripple\ripple_app\_network
@@ -849,6 +846,9 @@
[1] Ripple\ripple_net\basics
+
+ [1] Ripple\ripple_net\basics
+
@@ -1398,9 +1398,6 @@
[1] Ripple\ripple_app\_misc
-
- [1] Ripple\ripple_app\_network
-
[1] Ripple\ripple_app\_network
@@ -1584,6 +1581,9 @@
[1] Ripple\ripple_net\basics
+
+ [1] Ripple\ripple_net\basics
+
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 01f1813cf..5cf8f9865 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -144,7 +144,6 @@ namespace ripple
#include "src/cpp/ripple/TransactionMaster.h"
#include "src/cpp/ripple/ripple_LocalCredentials.h"
#include "src/cpp/ripple/WSDoor.h"
-#include "src/cpp/ripple/SNTPClient.h"
#include "src/cpp/ripple/RPCHandler.h"
#include "src/cpp/ripple/TransactionQueue.h"
#include "src/cpp/ripple/OrderBookDB.h"
@@ -316,7 +315,6 @@ static DH* handleTmpDh (SSL* ssl, int is_export, int iKeyLength)
#include "src/cpp/ripple/ripple_RippleState.cpp"
#include "src/cpp/ripple/RPCDoor.cpp"
#include "src/cpp/ripple/ScriptData.cpp"
-#include "src/cpp/ripple/SNTPClient.cpp"
#include "src/cpp/ripple/TransactionCheck.cpp"
#include "src/cpp/ripple/TransactionMaster.cpp"
#include "src/cpp/ripple/TransactionQueue.cpp"
diff --git a/src/cpp/ripple/SNTPClient.cpp b/modules/ripple_net/basics/ripple_SNTPClient.cpp
similarity index 100%
rename from src/cpp/ripple/SNTPClient.cpp
rename to modules/ripple_net/basics/ripple_SNTPClient.cpp
diff --git a/src/cpp/ripple/SNTPClient.h b/modules/ripple_net/basics/ripple_SNTPClient.h
similarity index 77%
rename from src/cpp/ripple/SNTPClient.h
rename to modules/ripple_net/basics/ripple_SNTPClient.h
index 23ba358b5..87e03c31c 100644
--- a/src/cpp/ripple/SNTPClient.h
+++ b/modules/ripple_net/basics/ripple_SNTPClient.h
@@ -4,8 +4,8 @@
*/
//==============================================================================
-#ifndef __SNTPCLIENT__
-#define __SNTPCLIENT__
+#ifndef RIPPLE_SNTPCLIENT_H_INCLUDED
+#define RIPPLE_SNTPCLIENT_H_INCLUDED
class SNTPQuery
{
@@ -20,19 +20,33 @@ public:
}
};
+//------------------------------------------------------------------------------
+
+// VFALCO TODO Make an abstract interface for this to hide the boost
+//
class SNTPClient : LeakChecked
{
public:
- SNTPClient (boost::asio::io_service& service);
- void init (const std::vector& servers);
- void addServer (const std::string& mServer);
+ explicit SNTPClient (boost::asio::io_service& service);
+
+ void init (std::vector const& servers);
+
+ void addServer (std::string const& mServer);
void queryAll ();
bool doQuery ();
bool getOffset (int& offset);
private:
- std::map mQueries;
+ void receivePacket (const boost::system::error_code& error, std::size_t bytes);
+ void resolveComplete (const boost::system::error_code& error, boost::asio::ip::udp::resolver::iterator iterator);
+ void sentPacket (boost::shared_ptr, const boost::system::error_code&, std::size_t);
+ void timerEntry (const boost::system::error_code&);
+ void sendComplete (const boost::system::error_code& error, std::size_t bytesTransferred);
+ void processReply ();
+
+private:
+ std::map mQueries;
boost::mutex mLock;
boost::asio::ip::udp::socket mSocket;
@@ -47,14 +61,6 @@ private:
std::vector mReceiveBuffer;
boost::asio::ip::udp::endpoint mReceiveEndpoint;
-
- void receivePacket (const boost::system::error_code& error, std::size_t bytes);
- void resolveComplete (const boost::system::error_code& error, boost::asio::ip::udp::resolver::iterator iterator);
- void sentPacket (boost::shared_ptr, const boost::system::error_code&, std::size_t);
- void timerEntry (const boost::system::error_code&);
- void sendComplete (const boost::system::error_code& error, std::size_t bytesTransferred);
- void processReply ();
};
#endif
-// vim:ts=4
diff --git a/modules/ripple_net/ripple_net.cpp b/modules/ripple_net/ripple_net.cpp
index 37310919d..a2ed5d803 100644
--- a/modules/ripple_net/ripple_net.cpp
+++ b/modules/ripple_net/ripple_net.cpp
@@ -23,5 +23,6 @@ namespace ripple
#include "basics/ripple_HTTPRequest.cpp"
#include "basics/ripple_HttpsClient.cpp"
#include "basics/ripple_RPCServer.cpp"
+#include "basics/ripple_SNTPClient.cpp"
}
diff --git a/modules/ripple_net/ripple_net.h b/modules/ripple_net/ripple_net.h
index 43d05e3b9..2452be7f9 100644
--- a/modules/ripple_net/ripple_net.h
+++ b/modules/ripple_net/ripple_net.h
@@ -30,6 +30,7 @@ namespace ripple
#include "basics/ripple_HTTPRequest.h"
#include "basics/ripple_HttpsClient.h"
#include "basics/ripple_RPCServer.h"
+#include "basics/ripple_SNTPClient.h"
}