Merge ripple_client into ripple_net

2025-11-29 07:25:51 +00:00 · 2013-09-01 03:03:22 -07:00
parent 5b8d104fb1
commit 65df4b9daf
24 changed files with 1324 additions and 1390 deletions
--- a/Builds/QtCreator/rippled.pro
+++ b/Builds/QtCreator/rippled.pro
@@ -77,7 +77,6 @@ SOURCES += \
    ../../modules/ripple_app/ripple_app_pt8.cpp \
    ../../modules/ripple_basics/ripple_basics.cpp \
    ../../modules/ripple_core/ripple_core.cpp \
-    ../../modules/ripple_client/ripple_client.cpp \
    ../../modules/ripple_data/ripple_data.cpp \
    ../../modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp \
    ../../modules/ripple_leveldb/ripple_leveldb.cpp \
--- a/Builds/VisualStudio2012/RippleD.vcxproj
+++ b/Builds/VisualStudio2012/RippleD.vcxproj
@@ -241,12 +241,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_InfoSub.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_NicknameState.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -462,42 +456,18 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\CallRPC.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCServerHandler.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCUtil.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCErr.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCHandler.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCSub.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMap.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -769,12 +739,6 @@
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_client\ripple_client.cpp">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">false</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_core\functional\ripple_Config.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1005,6 +969,36 @@
    <ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp">
      <WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level3</WarningLevel>
    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\RPCCall.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\InfoSub.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\RPCErr.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\RPCSub.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\RPCUtil.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
+    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.cpp">
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1407,7 +1401,6 @@
    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IFeatures.h" />
    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IFeeVote.h" />
    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IHashRouter.h" />
-    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_InfoSub.h" />
    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IProofOfWorkFactory.h" />
    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IValidations.h" />
    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_NicknameState.h" />
@@ -1439,12 +1432,8 @@
    <ClInclude Include="..\..\modules\ripple_app\peers\ripple_PeerSet.h" />
    <ClInclude Include="..\..\modules\ripple_app\peers\ripple_UniqueNodeList.h" />
    <ClInclude Include="..\..\modules\ripple_app\ripple_app.h" />
-    <ClInclude Include="..\..\modules\ripple_app\rpc\CallRPC.h" />
    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCServerHandler.h" />
-    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCUtil.h" />
-    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCErr.h" />
    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCHandler.h" />
-    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCSub.h" />
    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMap.h" />
    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMapAddNode.h" />
    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMapItem.h" />
@@ -1505,7 +1494,6 @@
    <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_Time.h" />
    <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_LoggedTimings.h" />
    <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_UptimeTimer.h" />
-    <ClInclude Include="..\..\modules\ripple_client\ripple_client.h" />
    <ClInclude Include="..\..\modules\ripple_core\functional\LoadSource.h" />
    <ClInclude Include="..\..\modules\ripple_core\functional\LoadType.h" />
    <ClInclude Include="..\..\modules\ripple_core\functional\ripple_Config.h" />
@@ -1559,6 +1547,11 @@
    <ClInclude Include="..\..\modules\ripple_net\basics\RPCServer.h" />
    <ClInclude Include="..\..\modules\ripple_net\basics\SNTPClient.h" />
    <ClInclude Include="..\..\modules\ripple_net\ripple_net.h" />
+    <ClInclude Include="..\..\modules\ripple_net\rpc\RPCCall.h" />
+    <ClInclude Include="..\..\modules\ripple_net\rpc\InfoSub.h" />
+    <ClInclude Include="..\..\modules\ripple_net\rpc\RPCErr.h" />
+    <ClInclude Include="..\..\modules\ripple_net\rpc\RPCSub.h" />
+    <ClInclude Include="..\..\modules\ripple_net\rpc\RPCUtil.h" />
    <ClInclude Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.h" />
    <ClInclude Include="..\..\modules\ripple_websocket\ripple_websocket.h" />
    <ClInclude Include="..\..\Subtrees\leveldb\db\builder.h" />
--- a/Builds/VisualStudio2012/RippleD.vcxproj.filters
+++ b/Builds/VisualStudio2012/RippleD.vcxproj.filters
@@ -46,9 +46,6 @@
    <Filter Include="[1] Ripple\ripple_basics\utility">
      <UniqueIdentifier>{c817e7d7-36d7-410e-ad16-f51c5eb024af}</UniqueIdentifier>
    </Filter>
-    <Filter Include="[1] Ripple\ripple_client">
-      <UniqueIdentifier>{c8fec1f5-496a-4a1e-bc8e-8096163c7766}</UniqueIdentifier>
-    </Filter>
    <Filter Include="[1] Ripple\ripple_core\functional">
      <UniqueIdentifier>{548037f2-eb8a-41bd-95dc-05f58cdbc041}</UniqueIdentifier>
    </Filter>
@@ -151,6 +148,9 @@
    <Filter Include="[1] Ripple\ripple_net\basics\impl">
      <UniqueIdentifier>{331a5979-0bb5-4224-919d-b8df0bc4e94f}</UniqueIdentifier>
    </Filter>
+    <Filter Include="[1] Ripple\ripple_net\rpc">
+      <UniqueIdentifier>{045285aa-9043-4cee-b8ca-cc8881e52f6a}</UniqueIdentifier>
+    </Filter>
  </ItemGroup>
  <ItemGroup>
    <ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp">
@@ -477,9 +477,6 @@
    <ClCompile Include="..\..\Subtrees\leveldb\port\port_win.cc">
      <Filter>[0] Subtrees\leveldb\port</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_client\ripple_client.cpp">
-      <Filter>[1] Ripple\ripple_client</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_app\ripple_app_pt5.cpp">
      <Filter>[1] Ripple\ripple_app</Filter>
    </ClCompile>
@@ -645,9 +642,6 @@
    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_HashRouter.cpp">
      <Filter>[1] Ripple\ripple_app\misc</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_InfoSub.cpp">
-      <Filter>[1] Ripple\ripple_app\misc</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_app\misc\ripple_NicknameState.cpp">
      <Filter>[1] Ripple\ripple_app\misc</Filter>
    </ClCompile>
@@ -708,15 +702,9 @@
    <ClCompile Include="..\..\modules\ripple_app\peers\PeerDoor.cpp">
      <Filter>[1] Ripple\ripple_app\peers</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\CallRPC.cpp">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCHandler.cpp">
      <Filter>[1] Ripple\ripple_app\rpc</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCSub.cpp">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_app\shamap\ripple_SHAMap.cpp">
      <Filter>[1] Ripple\ripple_app\shamap</Filter>
    </ClCompile>
@@ -825,9 +813,6 @@
    <ClCompile Include="..\..\modules\ripple_data\protocol\BuildInfo.cpp">
      <Filter>[1] Ripple\ripple_data\protocol</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCErr.cpp">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_app\ripple_app.cpp">
      <Filter>[1] Ripple\ripple_app</Filter>
    </ClCompile>
@@ -861,12 +846,6 @@
    <ClCompile Include="..\..\modules\ripple_net\basics\SNTPClient.cpp">
      <Filter>[1] Ripple\ripple_net\basics</Filter>
    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCErr.cpp">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClCompile>
-    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCUtil.cpp">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClCompile>
    <ClCompile Include="..\..\modules\ripple_net\basics\RPCDoor.cpp">
      <Filter>[1] Ripple\ripple_net\basics</Filter>
    </ClCompile>
@@ -888,6 +867,21 @@
    <ClCompile Include="..\..\modules\ripple_app\rpc\RPCServerHandler.cpp">
      <Filter>[1] Ripple\ripple_app\rpc</Filter>
    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\RPCErr.cpp">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\RPCSub.cpp">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\RPCUtil.cpp">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\RPCCall.cpp">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClCompile>
+    <ClCompile Include="..\..\modules\ripple_net\rpc\InfoSub.cpp">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="..\..\modules\ripple_app\ripple_app.h">
@@ -1268,9 +1262,6 @@
    <ClInclude Include="..\..\Subtrees\leveldb\port\port_posix.h">
      <Filter>[0] Subtrees\leveldb\port</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_client\ripple_client.h">
-      <Filter>[1] Ripple\ripple_client</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\ripple_basics\utility\ripple_LogFile.h">
      <Filter>[1] Ripple\ripple_basics\utility</Filter>
    </ClInclude>
@@ -1427,9 +1418,6 @@
    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IHashRouter.h">
      <Filter>[1] Ripple\ripple_app\misc</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_InfoSub.h">
-      <Filter>[1] Ripple\ripple_app\misc</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\ripple_app\misc\ripple_IProofOfWorkFactory.h">
      <Filter>[1] Ripple\ripple_app\misc</Filter>
    </ClInclude>
@@ -1490,15 +1478,9 @@
    <ClInclude Include="..\..\modules\ripple_app\peers\ripple_ClusterNodeStatus.h">
      <Filter>[1] Ripple\ripple_app\peers</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\rpc\CallRPC.h">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCHandler.h">
      <Filter>[1] Ripple\ripple_app\rpc</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCSub.h">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\ripple_app\shamap\ripple_SHAMap.h">
      <Filter>[1] Ripple\ripple_app\shamap</Filter>
    </ClInclude>
@@ -1616,8 +1598,29 @@
    <ClInclude Include="..\..\modules\ripple_data\protocol\BuildInfo.h">
      <Filter>[1] Ripple\ripple_data\protocol</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCErr.h">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
+    <ClInclude Include="..\..\modules\ripple_net\basics\RippleSSLContext.h">
+      <Filter>[1] Ripple\ripple_net\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\basics\HTTPRequest.h">
+      <Filter>[1] Ripple\ripple_net\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\basics\HTTPClient.h">
+      <Filter>[1] Ripple\ripple_net\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\basics\MultiSocket.h">
+      <Filter>[1] Ripple\ripple_net\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\basics\RPCServer.h">
+      <Filter>[1] Ripple\ripple_net\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\basics\SNTPClient.h">
+      <Filter>[1] Ripple\ripple_net\basics</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\basics\impl\MultiSocketType.h">
+      <Filter>[1] Ripple\ripple_net\basics\impl</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\basics\RPCDoor.h">
+      <Filter>[1] Ripple\ripple_net\basics</Filter>
    </ClInclude>
    <ClInclude Include="..\..\modules\ripple_core\functional\LoadSource.h">
      <Filter>[1] Ripple\ripple_core\functional</Filter>
@@ -1676,9 +1679,6 @@
    <ClInclude Include="..\..\modules\ripple_net\basics\impl\MultiSocketType.h">
      <Filter>[1] Ripple\ripple_net\basics\impl</Filter>
    </ClInclude>
-    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCErr.h">
-      <Filter>[1] Ripple\ripple_app\rpc</Filter>
-    </ClInclude>
    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCUtil.h">
      <Filter>[1] Ripple\ripple_app\rpc</Filter>
    </ClInclude>
@@ -1691,6 +1691,21 @@
    <ClInclude Include="..\..\modules\ripple_app\rpc\RPCServerHandler.h">
      <Filter>[1] Ripple\ripple_app\rpc</Filter>
    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\rpc\RPCErr.h">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\rpc\RPCSub.h">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\rpc\RPCUtil.h">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\rpc\RPCCall.h">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClInclude>
+    <ClInclude Include="..\..\modules\ripple_net\rpc\InfoSub.h">
+      <Filter>[1] Ripple\ripple_net\rpc</Filter>
+    </ClInclude>
  </ItemGroup>
  <ItemGroup>
    <CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">
--- a/1
+++ b/1
@@ -146,7 +146,6 @@ COMPILED_FILES.extend([
    'modules/ripple_app/ripple_app_pt7.cpp',
    'modules/ripple_app/ripple_app_pt8.cpp',
    'modules/ripple_basics/ripple_basics.cpp',
-    'modules/ripple_client/ripple_client.cpp',
    'modules/ripple_core/ripple_core.cpp',
    'modules/ripple_data/ripple_data.cpp',
    'modules/ripple_hyperleveldb/ripple_hyperleveldb.cpp',
--- a/modules/ripple_app/main/ripple_RippleMain.cpp
+++ b/modules/ripple_app/main/ripple_RippleMain.cpp
@@ -487,7 +487,7 @@ int RippleMain::run (int argc, char const* const* argv)
            setCallingThreadName ("rpc");
            std::vector<std::string> vCmd   = vm["parameters"].as<std::vector<std::string> > ();

-            iResult = commandLineRPC (vCmd);
+            iResult = RPCCall::fromCommandLine (vCmd);
        }
    }

--- a/modules/ripple_app/ripple_app.cpp
+++ b/modules/ripple_app/ripple_app.cpp
@@ -10,7 +10,6 @@

 #include "beast/modules/beast_db/beast_db.h"

-#include "../ripple_client/ripple_client.h"
 #include "../ripple_hyperleveldb/ripple_hyperleveldb.h"
 #include "../ripple_net/ripple_net.h"
 #include "../ripple_websocket/ripple_websocket.h"
@@ -33,8 +32,6 @@ namespace ripple
 # include "main/ripple_FatalErrorReporter.h"
 #include "main/ripple_FatalErrorReporter.cpp"

-# include "rpc/RPCErr.h"
-# include "rpc/RPCUtil.h"
 # include "rpc/RPCHandler.h"
 #include "rpc/RPCHandler.cpp"
 # include "rpc/RPCServerHandler.h"
--- a/modules/ripple_app/ripple_app.h
+++ b/modules/ripple_app/ripple_app.h
@@ -60,7 +60,7 @@

 #include "../ripple_core/ripple_core.h"

-#include "../ripple_client/ripple_client.h"
+#include "../ripple_net/ripple_net.h"

 #include "beast/modules/beast_sqdb/beast_sqdb.h"
 #include "beast/modules/beast_sqlite/beast_sqlite.h"
@@ -126,7 +126,6 @@ namespace ripple
 #include "main/ripple_Application.h"
 #include "tx/TransactionQueue.h"
 #include "ledger/OrderBookDB.h"
-#include "rpc/CallRPC.h"
 #include "tx/Transactor.h"
 #include "tx/ChangeTransactor.h"
 #include "tx/ripple_TransactionAcquire.h"
@@ -144,7 +143,6 @@ namespace ripple
 #include  "paths/ripple_Pathfinder.h"
 #include "tx/PaymentTransactor.h"
 #include "peers/PeerDoor.h"
-#include "rpc/RPCSub.h"
 #include "tx/RegularKeySetTransactor.h"
 #include "paths/ripple_RippleState.h"
 #include "tx/AccountSetTransactor.h"
--- a/modules/ripple_app/ripple_app_pt8.cpp
+++ b/modules/ripple_app/ripple_app_pt8.cpp
@@ -8,9 +8,7 @@

 #include "ripple_app.h"

-#include "../ripple_client/ripple_client.h"
 #include "../ripple_net/ripple_net.h"
-#include "../ripple_websocket/ripple_websocket.h"

 #ifdef _MSC_VER
 #pragma warning (push)
@@ -20,8 +18,7 @@
 namespace ripple
 {

-# include "rpc/RPCErr.h"
-#include "paths/ripple_PathRequest.cpp" // needs RPCErr.h
+#include "paths/ripple_PathRequest.cpp"
 #include "paths/ripple_RippleCalc.cpp"
 #include "paths/ripple_PathState.cpp"

--- a/modules/ripple_app/rpc/CallRPC.cpp
+++ b/modules/ripple_app/rpc/CallRPC.cpp
--- a/modules/ripple_app/rpc/CallRPC.h
+++ b/modules/ripple_app/rpc/CallRPC.h
@@ -1,74 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-#ifndef __CALLRPC__
-#define __CALLRPC__
-
-class RPCParser
-{
-public:
-    Json::Value parseCommand (std::string strMethod, Json::Value jvParams);
-
-private:
-    typedef Json::Value (RPCParser::*parseFuncPtr) (const Json::Value& jvParams);
-
-    Json::Value parseAccountRaw (const Json::Value& jvParams, bool bPeer);
-
-    Json::Value parseAccountItems (const Json::Value& jvParams);
-    Json::Value parseAccountLines (const Json::Value& jvParams);
-    Json::Value parseAccountTransactions (const Json::Value& jvParams);
-    Json::Value parseAsIs (const Json::Value& jvParams);
-    Json::Value parseBookOffers (const Json::Value& jvParams);
-    Json::Value parseConnect (const Json::Value& jvParams);
-#if ENABLE_INSECURE
-    Json::Value parseDataDelete (const Json::Value& jvParams);
-    Json::Value parseDataFetch (const Json::Value& jvParams);
-    Json::Value parseDataStore (const Json::Value& jvParams);
-#endif
-    Json::Value parseEvented (const Json::Value& jvParams);
-    Json::Value parseFeature (const Json::Value& jvParams);
-    Json::Value parseFetchInfo (const Json::Value& jvParams);
-    Json::Value parseGetCounts (const Json::Value& jvParams);
-    Json::Value parseInternal (const Json::Value& jvParams);
-    Json::Value parseJson (const Json::Value& jvParams);
-    Json::Value parseLedger (const Json::Value& jvParams);
-    Json::Value parseLedgerId (const Json::Value& jvParams);
-#if ENABLE_INSECURE
-    Json::Value parseLogin (const Json::Value& jvParams);
-#endif
-    Json::Value parseLogLevel (const Json::Value& jvParams);
-    Json::Value parseOwnerInfo (const Json::Value& jvParams);
-    Json::Value parseProofCreate (const Json::Value& jvParams);
-    Json::Value parseProofSolve (const Json::Value& jvParams);
-    Json::Value parseProofVerify (const Json::Value& jvParams);
-    Json::Value parseRandom (const Json::Value& jvParams);
-    Json::Value parseRipplePathFind (const Json::Value& jvParams);
-    Json::Value parseSMS (const Json::Value& jvParams);
-    Json::Value parseSignSubmit (const Json::Value& jvParams);
-    Json::Value parseTx (const Json::Value& jvParams);
-    Json::Value parseTxHistory (const Json::Value& jvParams);
-    Json::Value parseTxAccount (const Json::Value& jvParams);
-    Json::Value parseUnlAdd (const Json::Value& jvParams);
-    Json::Value parseUnlDelete (const Json::Value& jvParams);
-    Json::Value parseValidationCreate (const Json::Value& jvParams);
-    Json::Value parseValidationSeed (const Json::Value& jvParams);
-    Json::Value parseWalletAccounts (const Json::Value& jvParams);
-    Json::Value parseWalletPropose (const Json::Value& jvParams);
-    Json::Value parseWalletSeed (const Json::Value& jvParams);
-};
-
-extern int commandLineRPC (const std::vector<std::string>& vCmd);
-
-extern void callRPC (
-    boost::asio::io_service& io_service,
-    const std::string& strIp, const int iPort,
-    const std::string& strUsername, const std::string& strPassword,
-    const std::string& strPath, const std::string& strMethod,
-    const Json::Value& jvParams, const bool bSSL,
-    FUNCTION_TYPE<void (const Json::Value& jvInput)> callbackFuncP = FUNCTION_TYPE<void (const Json::Value& jvInput)> ());
-#endif
-
-// vim:ts=4
--- a/modules/ripple_client/ripple_client.cpp
+++ b/modules/ripple_client/ripple_client.cpp
@@ -1,23 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-#include "BeastConfig.h"
-
-#include "../ripple_client/ripple_client.h"
-#include "../ripple_core/ripple_core.h"
-#include "../ripple_net/ripple_net.h"
-
-namespace ripple
-{
-
-# include "../ripple_app/rpc/RPCErr.h"
-#include "../ripple_app/rpc/RPCErr.cpp"
-#include "../ripple_app/rpc/RPCUtil.cpp"
-#include "../ripple_app/rpc/CallRPC.cpp"
-#include "../ripple_app/rpc/RPCSub.cpp"
-#include "../ripple_app/misc/ripple_InfoSub.cpp"
-
-}
--- a/modules/ripple_client/ripple_client.h
+++ b/modules/ripple_client/ripple_client.h
@@ -1,34 +0,0 @@
-//------------------------------------------------------------------------------
-/*
-    Copyright (c) 2011-2013, OpenCoin, Inc.
-*/
-//==============================================================================
-
-/** Client classes.
-
-    This module provides classes that perform client interaction with the server.
-
-    @defgroup ripple_client
-*/
-
-#ifndef RIPPLE_CLIENT_H
-#define RIPPLE_CLIENT_H
-
-#include "beast/modules/beast_core/beast_core.h" // Must come before <boost/bind.hpp>
-
-#include <boost/unordered_set.hpp> // InfoSub
-
-#include "../ripple_core/ripple_core.h"
-#include "../ripple_data/ripple_data.h"
-
-namespace ripple
-{
-
-#include "../ripple_app/rpc/RPCUtil.h" // only for RPCServerHandler
-#include "../ripple_app/rpc/CallRPC.h"
- #include "../ripple_app/misc/ripple_InfoSub.h"
-#include "../ripple_app/rpc/RPCSub.h"
-
-}
-
-#endif
--- a/modules/ripple_net/ripple_net.cpp
+++ b/modules/ripple_net/ripple_net.cpp
@@ -26,18 +26,12 @@
 #include <boost/mpl/at.hpp>
 #include <boost/mpl/vector.hpp>

-#include "beast/modules/beast_asio/beast_asio.h"
-
 #include "ripple_net.h"

-// VFALCO TODO Remove this dependency on theConfig
-#include "../modules/ripple_core/ripple_core.h" // theConfig for HttpsClient
-
 namespace ripple
 {

 #include "basics/impl/MultiSocketType.h"
-
 #include "basics/RippleSSLContext.cpp"
 #include "basics/MultiSocket.cpp"
 #include "basics/HTTPRequest.cpp"
@@ -46,4 +40,10 @@ namespace ripple
 #include "basics/RPCServer.cpp"
 #include "basics/SNTPClient.cpp"

+#include "rpc/RPCCall.cpp"
+#include "rpc/RPCErr.cpp"
+#include "rpc/RPCSub.cpp"
+#include "rpc/RPCUtil.cpp"
+#include "rpc/InfoSub.cpp"
+
 }
--- a/modules/ripple_net/ripple_net.h
+++ b/modules/ripple_net/ripple_net.h
@@ -7,10 +7,17 @@
 #ifndef RIPPLE_NET_H_INCLUDED
 #define RIPPLE_NET_H_INCLUDED

+#include "beast/modules/beast_core/beast_core.h" // Must come before <boost/bind.hpp>
+
+#include <boost/unordered_set.hpp> // For InfoSub
+
 #include "beast/modules/beast_asio/beast_asio.h"

 #include "../ripple_basics/ripple_basics.h"
+#include "../ripple_core/ripple_core.h"
+#include "../ripple_data/ripple_data.h"

+// VFALCO TODO MOVE TO .cpp ASAP!, make users abstract!
 #include "../ripple_websocket/ripple_websocket.h"

 namespace ripple
@@ -24,6 +31,12 @@ namespace ripple
 #include "basics/RPCDoor.h"
 #include "basics/SNTPClient.h"

+# include "rpc/RPCErr.h"
+# include "rpc/RPCUtil.h"
+#include "rpc/RPCCall.h"
+# include "rpc/InfoSub.h"
+#include "rpc/RPCSub.h"
+
 }

 #endif
--- a/modules/ripple_app/misc/ripple_InfoSub.cpp
+++ b/modules/ripple_app/misc/ripple_InfoSub.cpp
@@ -18,8 +18,8 @@
 // VFALCO TODO Figure out how to clean up these globals

 InfoSub::InfoSub (Source& source)
-    : m_source (source)
-    , mLock (this, "InfoSub", __FILE__, __LINE__)
+    : mLock (this, "InfoSub", __FILE__, __LINE__)
+    , m_source (source)
 {
    static Atomic <int> s_seq_id;
    mSeq = ++s_seq_id;
--- a/modules/ripple_app/misc/ripple_InfoSub.h
+++ b/modules/ripple_app/misc/ripple_InfoSub.h
@@ -4,8 +4,8 @@
 */
 //==============================================================================

-#ifndef RIPPLE_INFOSUB_H
-#define RIPPLE_INFOSUB_H
+#ifndef RIPPLE_NET_RPC_INFOSUB_H_INCLUDED
+#define RIPPLE_NET_RPC_INFOSUB_H_INCLUDED

 // Operations that clients may wish to perform against the network
 // Master operational handler, server sequencer, network tracker
--- a/modules/ripple_net/rpc/RPCCall.cpp
+++ b/modules/ripple_net/rpc/RPCCall.cpp
--- a/modules/ripple_net/rpc/RPCCall.h
+++ b/modules/ripple_net/rpc/RPCCall.h
@@ -0,0 +1,34 @@
+//------------------------------------------------------------------------------
+/*
+    Copyright (c) 2011-2013, OpenCoin, Inc.
+*/
+//==============================================================================
+
+#ifndef RIPPLE_NET_RPC_RPCCALL_H_INCLUDED
+#define RIPPLE_NET_RPC_RPCCALL_H_INCLUDED
+
+//
+// This a trusted interface, the user is expected to provide valid input to perform valid requests.
+// Error catching and reporting is not a requirement of this command line interface.
+//
+// Improvements to be more strict and to provide better diagnostics are welcome.
+//
+
+/** Processes Ripple RPC calls.
+*/
+class RPCCall
+{
+public:
+
+    static int fromCommandLine (const std::vector<std::string>& vCmd);
+
+    static void fromNetwork (
+        boost::asio::io_service& io_service,
+        const std::string& strIp, const int iPort,
+        const std::string& strUsername, const std::string& strPassword,
+        const std::string& strPath, const std::string& strMethod,
+        const Json::Value& jvParams, const bool bSSL,
+        FUNCTION_TYPE<void (const Json::Value& jvInput)> callbackFuncP = FUNCTION_TYPE<void (const Json::Value& jvInput)> ());
+};
+
+#endif
--- a/modules/ripple_net/rpc/RPCErr.cpp
+++ b/modules/ripple_net/rpc/RPCErr.cpp
--- a/modules/ripple_net/rpc/RPCErr.h
+++ b/modules/ripple_net/rpc/RPCErr.h
@@ -4,8 +4,8 @@
 */
 //==============================================================================

-#ifndef __RPCERR__
-#define __RPCERR__
+#ifndef RIPPLE_NET_RPC_RPCERR_H_INCLUDED
+#define RIPPLE_NET_RPC_RPCERR_H_INCLUDED

 enum
 {
--- a/modules/ripple_net/rpc/RPCSub.cpp
+++ b/modules/ripple_net/rpc/RPCSub.cpp
@@ -38,11 +38,11 @@ RPCSub::RPCSub (InfoSub::Source& source, boost::asio::io_service& io_service,
    if (mPort < 0)
        mPort   = mSSL ? 443 : 80;

-    WriteLog (lsINFO, RPCSub) << boost::str (boost::format ("callRPC sub: ip='%s' port=%d ssl=%d path='%s'")
-                              % mIp
-                              % mPort
-                              % mSSL
-                              % mPath);
+    WriteLog (lsINFO, RPCSub) <<
+        "RPCCall::fromNetwork sub: ip=" << mIp <<
+        " port=" << mPort <<
+        " ssl= "<< (mSSL ? "yes" : "no") <<
+        " path='" << mPath << "'";
 }

 // XXX Could probably create a bunch of send jobs in a single get of the lock.
@@ -81,9 +81,9 @@ void RPCSub::sendThread ()
            // XXX Might not need this in a try.
            try
            {
-                WriteLog (lsINFO, RPCSub) << boost::str (boost::format ("callRPC calling: %s") % mIp);
+                WriteLog (lsINFO, RPCSub) << "RPCCall::fromNetwork: " << mIp;

-                callRPC (
+                RPCCall::fromNetwork (
                    m_io_service,
                    mIp, mPort,
                    mUsername, mPassword,
@@ -93,7 +93,7 @@ void RPCSub::sendThread ()
            }
            catch (const std::exception& e)
            {
-                WriteLog (lsINFO, RPCSub) << boost::str (boost::format ("callRPC exception: %s") % e.what ());
+                WriteLog (lsINFO, RPCSub) << "RPCCall::fromNetwork exception: " << e.what ();
            }
        }
    }
@@ -104,14 +104,15 @@ void RPCSub::send (const Json::Value& jvObj, bool broadcast)
 {
    ScopedLockType sl (mLock, __FILE__, __LINE__);

-    if (RPC_EVENT_QUEUE_MAX == mDeque.size ())
+    if (mDeque.size () >= eventQueueMax)
    {
        // Drop the previous event.
-        WriteLog (lsWARNING, RPCSub) << boost::str (boost::format ("callRPC drop"));
+        WriteLog (lsWARNING, RPCSub) << "RPCCall::fromNetwork drop";
        mDeque.pop_back ();
    }

-    WriteLog (broadcast ? lsDEBUG : lsINFO, RPCSub) << boost::str (boost::format ("callRPC push: %s") % jvObj);
+    WriteLog (broadcast ? lsDEBUG : lsINFO, RPCSub) <<
+        "RPCCall::fromNetwork push: " << jvObj;

    mDeque.push_back (std::make_pair (mSeq++, jvObj));

@@ -120,8 +121,8 @@ void RPCSub::send (const Json::Value& jvObj, bool broadcast)
        // Start a sending thread.
        mSending    = true;

-        WriteLog (lsINFO, RPCSub) << boost::str (boost::format ("callRPC start"));
-        
+        WriteLog (lsINFO, RPCSub) << "RPCCall::fromNetwork start";
+
        m_jobQueue.addJob (
            jtCLIENT, "RPCSub::sendThread", BIND_TYPE (&RPCSub::sendThread, this));
    }
--- a/modules/ripple_net/rpc/RPCSub.h
+++ b/modules/ripple_net/rpc/RPCSub.h
@@ -4,11 +4,8 @@
 */
 //==============================================================================

-#ifndef RIPPLE_RPCSUB_H_INCLUDED
-#define RIPPLE_RPCSUB_H_INCLUDED
-
-// VFALCO TODO replace this macro with a language constant
-#define RPC_EVENT_QUEUE_MAX 32
+#ifndef RIPPLE_NET_RPC_RPCSUB_H_INCLUDED
+#define RIPPLE_NET_RPC_RPCSUB_H_INCLUDED

 // Subscription object for JSON-RPC
 // VFALCO TODO Move the implementation into the .cpp
@@ -48,6 +45,12 @@ protected:
    void    sendThread ();

 private:
+// VFALCO TODO replace this macro with a language constant
+    enum
+    {
+        eventQueueMax = 32
+    };
+
    boost::asio::io_service& m_io_service;
    JobQueue& m_jobQueue;

--- a/modules/ripple_net/rpc/RPCUtil.cpp
+++ b/modules/ripple_net/rpc/RPCUtil.cpp
--- a/modules/ripple_net/rpc/RPCUtil.h
+++ b/modules/ripple_net/rpc/RPCUtil.h
@@ -4,8 +4,8 @@
 */
 //==============================================================================

-#ifndef RIPPLE_RPC_RPCUTIL_H_INCLUDED
-#define RIPPLE_RPC_RPCUTIL_H_INCLUDEDRIPPLE_RPC_H_INCLUDED
+#ifndef RIPPLE_NET_RPC_RPCUTIL_H_INCLUDED
+#define RIPPLE_NET_RPC_RPCUTIL_H_INCLUDED

 // VFALCO TODO Wrap these up into a class. It looks like they just do some
 //             convenience packaging of JSON data from the pieces. It looks