diff --git a/Builds/QtCreator/rippled.pro b/Builds/QtCreator/rippled.pro
index 0f27c786c..9f4da0594 100644
--- a/Builds/QtCreator/rippled.pro
+++ b/Builds/QtCreator/rippled.pro
@@ -74,7 +74,6 @@ SOURCES += \
../../modules/ripple_app/ripple_app_pt6.cpp \
../../modules/ripple_app/ripple_app_pt7.cpp \
../../modules/ripple_app/ripple_app_pt8.cpp \
- ../../modules/ripple_asio/ripple_asio.cpp \
../../modules/ripple_basics/ripple_basics.cpp \
../../modules/ripple_core/ripple_core.cpp \
../../modules/ripple_client/ripple_client.cpp \
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj b/Builds/VisualStudio2012/RippleD.vcxproj
index 6af88cb57..8730a5359 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -671,13 +671,6 @@
true
true
-
-
- true
- true
- true
- true
-
true
true
@@ -973,6 +966,12 @@
+
+ true
+ true
+ true
+ true
+
true
true
@@ -985,6 +984,12 @@
true
true
+
+ true
+ true
+ true
+ true
+
true
true
@@ -1465,11 +1470,6 @@
-
-
-
-
-
@@ -1549,8 +1549,11 @@
+
+
+
diff --git a/Builds/VisualStudio2012/RippleD.vcxproj.filters b/Builds/VisualStudio2012/RippleD.vcxproj.filters
index a8f2710c7..b435d8d39 100644
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -142,12 +142,6 @@
{c69b07a2-44e5-4b06-99a9-81f5d137ea15}
-
- {a8c5d8be-1e90-4e9c-be7f-d2da53920cd4}
-
-
- {625992a9-7333-4782-8ee3-6ed072d02fe5}
-
{8476f6e8-7411-460f-bdef-68e3166078eb}
@@ -843,9 +837,6 @@
[0] Subtrees\beast
-
- [1] Ripple\ripple_asio
-
[1] Ripple\ripple_app\boost
@@ -879,6 +870,15 @@
[1] Ripple\ripple_basics\json
+
+ [1] Ripple\ripple_data\protocol
+
+
+ [1] Ripple\ripple_net\basics
+
+
+ [1] Ripple\ripple_net\basics
+
@@ -1601,27 +1601,12 @@
[1] Ripple\ripple_app\main
-
- [1] Ripple\ripple_asio
-
-
- [1] Ripple\ripple_asio\sockets
-
-
- [1] Ripple\ripple_asio\sockets
-
-
- [1] Ripple\ripple_asio\sockets
-
[1] Ripple\ripple_app\boost
[1] Ripple\ripple_basics\utility
-
- [1] Ripple\ripple_asio\sockets
-
[1] Ripple\ripple_app\websocket
@@ -1682,6 +1667,18 @@
[1] Ripple\ripple_basics\json
+
+ [1] Ripple\ripple_data\protocol
+
+
+ [1] Ripple\ripple_net\basics
+
+
+ [1] Ripple\ripple_net\basics
+
+
+ [1] Ripple\ripple_net\basics
+
diff --git a/SConstruct b/SConstruct
index 934537d7b..f002851f6 100644
--- a/SConstruct
+++ b/SConstruct
@@ -144,7 +144,6 @@ COMPILED_FILES.extend([
'modules/ripple_app/ripple_app_pt6.cpp',
'modules/ripple_app/ripple_app_pt7.cpp',
'modules/ripple_app/ripple_app_pt8.cpp',
- 'modules/ripple_asio/ripple_asio.cpp',
'modules/ripple_basics/ripple_basics.cpp',
'modules/ripple_core/ripple_core.cpp',
'modules/ripple_data/ripple_data.cpp',
diff --git a/modules/ripple_app/ripple_app.cpp b/modules/ripple_app/ripple_app.cpp
index 39b0bd5f7..4d2283ab3 100644
--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -344,13 +344,6 @@ static const uint64 tenTo17m1 = tenTo17 - 1;
#if ! defined (RIPPLE_MAIN_PART) || RIPPLE_MAIN_PART == 5
-// VFALCO This hack lets me compile just ripple_app_pt5.cpp when
-// ripple_asio.h and relatives change.
-}
-#include "../ripple_asio/ripple_asio.h"
-namespace ripple
-{
-
#include "ledger/LedgerTiming.cpp"
#include "ledger/ripple_AcceptedLedgerTx.cpp"
#include "main/ripple_Application.cpp"
diff --git a/modules/ripple_asio/ripple_asio.cpp b/modules/ripple_asio/ripple_asio.cpp
deleted file mode 100644
index 61012c686..000000000
--- a/modules/ripple_asio/ripple_asio.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
-//------------------------------------------------------------------------------
-/*
- Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-/** Add this to get the @ref ripple_asio module.
-
- @file ripple_asio.cpp
- @ingroup ripple_asio
-*/
-
-//------------------------------------------------------------------------------
-
-#include "BeastConfig.h"
-
-// Must come before
-#include "beast/modules/beast_core/beast_core.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include // for unit test
-#include
-#include
-
-#include "beast/modules/beast_asio/beast_asio.h"
-
-#include "ripple_asio.h"
-
-namespace ripple
-{
-
-#include "sockets/ripple_MultiSocketType.h"
-#include "sockets/RippleSSLContext.cpp"
-#include "sockets/ripple_MultiSocket.cpp"
-
-}
diff --git a/modules/ripple_asio/ripple_asio.h b/modules/ripple_asio/ripple_asio.h
deleted file mode 100644
index eb9de4268..000000000
--- a/modules/ripple_asio/ripple_asio.h
+++ /dev/null
@@ -1,22 +0,0 @@
-//------------------------------------------------------------------------------
-/*
- Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-#ifndef RIPPLE_ASIO_H_INCLUDED
-#define RIPPLE_ASIO_H_INCLUDED
-
-#include "beast/modules/beast_asio/beast_asio.h"
-
-namespace ripple
-{
-
-using namespace beast;
-
-#include "sockets/RippleSSLContext.h"
-#include "sockets/ripple_MultiSocket.h"
-
-}
-
-#endif
diff --git a/modules/ripple_asio/sockets/RippleSSLContext.cpp b/modules/ripple_net/basics/RippleSSLContext.cpp
similarity index 100%
rename from modules/ripple_asio/sockets/RippleSSLContext.cpp
rename to modules/ripple_net/basics/RippleSSLContext.cpp
diff --git a/modules/ripple_asio/sockets/RippleSSLContext.h b/modules/ripple_net/basics/RippleSSLContext.h
similarity index 100%
rename from modules/ripple_asio/sockets/RippleSSLContext.h
rename to modules/ripple_net/basics/RippleSSLContext.h
diff --git a/modules/ripple_asio/sockets/ripple_MultiSocket.cpp b/modules/ripple_net/basics/ripple_MultiSocket.cpp
similarity index 100%
rename from modules/ripple_asio/sockets/ripple_MultiSocket.cpp
rename to modules/ripple_net/basics/ripple_MultiSocket.cpp
diff --git a/modules/ripple_asio/sockets/ripple_MultiSocket.h b/modules/ripple_net/basics/ripple_MultiSocket.h
similarity index 100%
rename from modules/ripple_asio/sockets/ripple_MultiSocket.h
rename to modules/ripple_net/basics/ripple_MultiSocket.h
diff --git a/modules/ripple_asio/sockets/ripple_MultiSocketType.h b/modules/ripple_net/basics/ripple_MultiSocketType.h
similarity index 100%
rename from modules/ripple_asio/sockets/ripple_MultiSocketType.h
rename to modules/ripple_net/basics/ripple_MultiSocketType.h
diff --git a/modules/ripple_net/ripple_net.cpp b/modules/ripple_net/ripple_net.cpp
index a2ed5d803..ea4afeb4e 100644
--- a/modules/ripple_net/ripple_net.cpp
+++ b/modules/ripple_net/ripple_net.cpp
@@ -12,6 +12,23 @@
#include "BeastConfig.h"
+// Must come before
+#include "beast/modules/beast_core/beast_core.h"
+
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include // for unit test
+#include
+#include
+
+#include "beast/modules/beast_asio/beast_asio.h"
+
#include "ripple_net.h"
// VFALCO TODO Remove this dependency on theConfig
@@ -20,6 +37,10 @@
namespace ripple
{
+#include "basics/ripple_MultiSocketType.h" // private
+#include "basics/RippleSSLContext.cpp"
+#include "basics/ripple_MultiSocket.cpp"
+
#include "basics/ripple_HTTPRequest.cpp"
#include "basics/ripple_HttpsClient.cpp"
#include "basics/ripple_RPCServer.cpp"
diff --git a/modules/ripple_net/ripple_net.h b/modules/ripple_net/ripple_net.h
index 2452be7f9..652d126b9 100644
--- a/modules/ripple_net/ripple_net.h
+++ b/modules/ripple_net/ripple_net.h
@@ -7,18 +7,7 @@
#ifndef RIPPLE_NET_H_INCLUDED
#define RIPPLE_NET_H_INCLUDED
-/** Include this to get the @ref ripple_net module.
-
- @file ripple_net.h
- @ingroup ripple_net
-*/
-
-/** Network classes.
-
- This module provides classes that handle all network activities.
-
- @defgroup ripple_net
-*/
+#include "beast/modules/beast_asio/beast_asio.h"
#include "../ripple_basics/ripple_basics.h"
@@ -27,6 +16,8 @@
namespace ripple
{
+#include "basics/RippleSSLContext.h"
+#include "basics/ripple_MultiSocket.h"
#include "basics/ripple_HTTPRequest.h"
#include "basics/ripple_HttpsClient.h"
#include "basics/ripple_RPCServer.h"