Tidy up ripple_net module

This commit is contained in:
Vinnie Falco
2013-08-31 11:56:02 -07:00
parent e7d043e4df
commit af0471fb7d
16 changed files with 70 additions and 65 deletions

View File

@@ -972,37 +972,39 @@
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.cpp"> <ClCompile Include="..\..\modules\ripple_net\basics\HTTPRequest.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_HttpsClient.cpp"> <ClCompile Include="..\..\modules\ripple_net\basics\HTTPClient.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_MultiSocket.cpp"> <ClCompile Include="..\..\modules\ripple_net\basics\MultiSocket.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_RPCServer.cpp"> <ClCompile Include="..\..\modules\ripple_net\basics\RPCServer.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.cpp"> <ClCompile Include="..\..\modules\ripple_net\basics\SNTPClient.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">true</ExcludedFromBuild>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp" /> <ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp">
<WarningLevel Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Level3</WarningLevel>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.cpp"> <ClCompile Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild> <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">true</ExcludedFromBuild>
@@ -1549,13 +1551,13 @@
<ClInclude Include="..\..\modules\ripple_hyperleveldb\ripple_hyperleveldb.h" /> <ClInclude Include="..\..\modules\ripple_hyperleveldb\ripple_hyperleveldb.h" />
<ClInclude Include="..\..\modules\ripple_leveldb\ripple_leveldb.h" /> <ClInclude Include="..\..\modules\ripple_leveldb\ripple_leveldb.h" />
<ClInclude Include="..\..\modules\ripple_mdb\ripple_mdb.h" /> <ClInclude Include="..\..\modules\ripple_mdb\ripple_mdb.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\impl\MultiSocketType.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\RippleSSLContext.h" /> <ClInclude Include="..\..\modules\ripple_net\basics\RippleSSLContext.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.h" /> <ClInclude Include="..\..\modules\ripple_net\basics\HTTPRequest.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_HttpsClient.h" /> <ClInclude Include="..\..\modules\ripple_net\basics\HTTPClient.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_MultiSocket.h" /> <ClInclude Include="..\..\modules\ripple_net\basics\MultiSocket.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_MultiSocketType.h" /> <ClInclude Include="..\..\modules\ripple_net\basics\RPCServer.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_RPCServer.h" /> <ClInclude Include="..\..\modules\ripple_net\basics\SNTPClient.h" />
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.h" />
<ClInclude Include="..\..\modules\ripple_net\ripple_net.h" /> <ClInclude Include="..\..\modules\ripple_net\ripple_net.h" />
<ClInclude Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.h" /> <ClInclude Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.h" />
<ClInclude Include="..\..\modules\ripple_websocket\ripple_websocket.h" /> <ClInclude Include="..\..\modules\ripple_websocket\ripple_websocket.h" />

View File

@@ -151,6 +151,9 @@
<Filter Include="[1] Ripple\ripple_basics\json"> <Filter Include="[1] Ripple\ripple_basics\json">
<UniqueIdentifier>{083291b1-1498-490e-9794-4319d21d5668}</UniqueIdentifier> <UniqueIdentifier>{083291b1-1498-490e-9794-4319d21d5668}</UniqueIdentifier>
</Filter> </Filter>
<Filter Include="[1] Ripple\ripple_net\basics\impl">
<UniqueIdentifier>{331a5979-0bb5-4224-919d-b8df0bc4e94f}</UniqueIdentifier>
</Filter>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp"> <ClCompile Include="..\..\Subtrees\beast\modules\beast_core\beast_core.cpp">
@@ -504,21 +507,9 @@
<ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp"> <ClCompile Include="..\..\modules\ripple_net\ripple_net.cpp">
<Filter>[1] Ripple\ripple_net</Filter> <Filter>[1] Ripple\ripple_net</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_HttpsClient.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.cpp"> <ClCompile Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.cpp">
<Filter>[1] Ripple\ripple_app\basics</Filter> <Filter>[1] Ripple\ripple_app\basics</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_RPCServer.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_app\node\ripple_NodeObject.cpp"> <ClCompile Include="..\..\modules\ripple_app\node\ripple_NodeObject.cpp">
<Filter>[1] Ripple\ripple_app\node</Filter> <Filter>[1] Ripple\ripple_app\node</Filter>
</ClCompile> </ClCompile>
@@ -876,7 +867,19 @@
<ClCompile Include="..\..\modules\ripple_net\basics\RippleSSLContext.cpp"> <ClCompile Include="..\..\modules\ripple_net\basics\RippleSSLContext.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter> <Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile> </ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\ripple_MultiSocket.cpp"> <ClCompile Include="..\..\modules\ripple_net\basics\HTTPRequest.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\HTTPClient.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\MultiSocket.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\RPCServer.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile>
<ClCompile Include="..\..\modules\ripple_net\basics\SNTPClient.cpp">
<Filter>[1] Ripple\ripple_net\basics</Filter> <Filter>[1] Ripple\ripple_net\basics</Filter>
</ClCompile> </ClCompile>
</ItemGroup> </ItemGroup>
@@ -1274,21 +1277,9 @@
<ClInclude Include="..\..\modules\ripple_net\ripple_net.h"> <ClInclude Include="..\..\modules\ripple_net\ripple_net.h">
<Filter>[1] Ripple\ripple_net</Filter> <Filter>[1] Ripple\ripple_net</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_HTTPRequest.h">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_HttpsClient.h">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.h"> <ClInclude Include="..\..\modules\ripple_app\basics\ripple_RPCServerHandler.h">
<Filter>[1] Ripple\ripple_app\basics</Filter> <Filter>[1] Ripple\ripple_app\basics</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_RPCServer.h">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_SNTPClient.h">
<Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude>
<ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeObject.h"> <ClInclude Include="..\..\modules\ripple_app\node\ripple_NodeObject.h">
<Filter>[1] Ripple\ripple_app\node</Filter> <Filter>[1] Ripple\ripple_app\node</Filter>
</ClInclude> </ClInclude>
@@ -1673,12 +1664,24 @@
<ClInclude Include="..\..\modules\ripple_net\basics\RippleSSLContext.h"> <ClInclude Include="..\..\modules\ripple_net\basics\RippleSSLContext.h">
<Filter>[1] Ripple\ripple_net\basics</Filter> <Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_MultiSocket.h"> <ClInclude Include="..\..\modules\ripple_net\basics\HTTPRequest.h">
<Filter>[1] Ripple\ripple_net\basics</Filter> <Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude> </ClInclude>
<ClInclude Include="..\..\modules\ripple_net\basics\ripple_MultiSocketType.h"> <ClInclude Include="..\..\modules\ripple_net\basics\HTTPClient.h">
<Filter>[1] Ripple\ripple_net\basics</Filter> <Filter>[1] Ripple\ripple_net\basics</Filter>
</ClInclude> </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>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto"> <CustomBuild Include="..\..\modules\ripple_data\protocol\ripple.proto">

View File

@@ -4,8 +4,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef RIPPLE_HTTPSCLIENT_H_INCLUDED #ifndef RIPPLE_NET_BASICS_HTTPCLIENT_H_INCLUDED
#define RIPPLE_HTTPSCLIENT_H_INCLUDED #define RIPPLE_NET_BASICS_HTTPCLIENT_H_INCLUDED
// VFALCO TODO Make this an abstract interface. // VFALCO TODO Make this an abstract interface.
// //

View File

@@ -4,8 +4,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef RIPPLE_HTTPREQUEST_H_INCLUDED #ifndef RIPPLE_NET_BASICS_HTTPREQUEST_H_INCLUDED
#define RIPPLE_HTTPREQUEST_H_INCLUDED #define RIPPLE_NET_BASICS_HTTPREQUEST_H_INCLUDED
/** An HTTP request we are handling from a client. /** An HTTP request we are handling from a client.
*/ */

View File

@@ -4,8 +4,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef RIPPLE_MULTISOCKET_H_INCLUDED #ifndef RIPPLE_NET_BASICS_MULTISOCKET_H_INCLUDED
#define RIPPLE_MULTISOCKET_H_INCLUDED #define RIPPLE_NET_BASICS_MULTISOCKET_H_INCLUDED
/** A Socket that can handshake with multiple protocols. /** A Socket that can handshake with multiple protocols.
*/ */

View File

@@ -4,8 +4,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef RIPPLE_RPCSERVER_H_INCLUDED #ifndef RIPPLE_NET_BASICS_RPCSERVER_H_INCLUDED
#define RIPPLE_RPCSERVER_H_INCLUDED #define RIPPLE_NET_BASICS_RPCSERVER_H_INCLUDED
/** Provides RPC services to a client. /** Provides RPC services to a client.

View File

@@ -4,8 +4,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef RIPPLE_ASIO_RIPPLESSLCONTEXT_H_INCLUDED #ifndef RIPPLE_NET_BASICS_RIPPLESSLCONTEXT_H_INCLUDED
#define RIPPLE_ASIO_RIPPLESSLCONTEXT_H_INCLUDED #define RIPPLE_NET_BASICS_RIPPLESSLCONTEXT_H_INCLUDED
/** The SSL contexts used by Ripple. /** The SSL contexts used by Ripple.

View File

@@ -4,8 +4,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef RIPPLE_SNTPCLIENT_H_INCLUDED #ifndef RIPPLE_NET_BASICS_SNTPCLIENT_H_INCLUDED
#define RIPPLE_SNTPCLIENT_H_INCLUDED #define RIPPLE_NET_BASICS_SNTPCLIENT_H_INCLUDED
class SNTPQuery class SNTPQuery
{ {

View File

@@ -4,8 +4,8 @@
*/ */
//============================================================================== //==============================================================================
#ifndef RIPPLE_ASIO_MULTISOCKETTYPE_H_INCLUDED #ifndef RIPPLE_NET_BASICS_IMPOL_MULTISOCKETTYPE_H_INCLUDED
#define RIPPLE_ASIO_MULTISOCKETTYPE_H_INCLUDED #define RIPPLE_NET_BASICS_IMPOL_MULTISOCKETTYPE_H_INCLUDED
/** Template for producing instances of MultiSocket /** Template for producing instances of MultiSocket
*/ */

View File

@@ -37,13 +37,13 @@
namespace ripple namespace ripple
{ {
#include "basics/ripple_MultiSocketType.h" // private #include "basics/impl/MultiSocketType.h"
#include "basics/RippleSSLContext.cpp"
#include "basics/ripple_MultiSocket.cpp"
#include "basics/ripple_HTTPRequest.cpp" #include "basics/RippleSSLContext.cpp"
#include "basics/ripple_HttpsClient.cpp" #include "basics/MultiSocket.cpp"
#include "basics/ripple_RPCServer.cpp" #include "basics/HTTPRequest.cpp"
#include "basics/ripple_SNTPClient.cpp" #include "basics/HTTPClient.cpp"
#include "basics/RPCServer.cpp"
#include "basics/SNTPClient.cpp"
} }

View File

@@ -17,11 +17,11 @@ namespace ripple
{ {
#include "basics/RippleSSLContext.h" #include "basics/RippleSSLContext.h"
#include "basics/ripple_MultiSocket.h" #include "basics/MultiSocket.h"
#include "basics/ripple_HTTPRequest.h" #include "basics/HTTPRequest.h"
#include "basics/ripple_HttpsClient.h" #include "basics/HTTPClient.h"
#include "basics/ripple_RPCServer.h" #include "basics/RPCServer.h"
#include "basics/ripple_SNTPClient.h" #include "basics/SNTPClient.h"
} }