Skip to content

Commit 996ac52

Browse files
vinniefalcovinniefalco
committed
Move websocket subtree and create ripple_websocket module
1 parent 9452f77 commit 996ac52

File tree

267 files changed

+368
-50388
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

267 files changed

+368
-50388
lines changed

‎Builds/VisualStudio2012/RippleD.vcxproj

+118-49
Large diffs are not rendered by default.

‎Builds/VisualStudio2012/RippleD.vcxproj.filters

+153-72
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,6 @@
1010
<Filter Include="0. Third Party Code\SQLite">
1111
<UniqueIdentifier>{60c3631e-8855-4a61-bdd3-9892d96242d5}</UniqueIdentifier>
1212
</Filter>
13-
<Filter Include="0. Third Party Code\websocket">
14-
<UniqueIdentifier>{cd4c41c0-3ee6-49f8-8322-d11422b892f9}</UniqueIdentifier>
15-
</Filter>
16-
<Filter Include="0. Third Party Code\websocket\core">
17-
<UniqueIdentifier>{9fe711b6-ec1c-4a6c-9f78-2812f4627e70}</UniqueIdentifier>
18-
</Filter>
1913
<Filter Include="0. Third Party Code\LevelDB">
2014
<UniqueIdentifier>{83e0c1a9-5ac4-4c68-ba62-45e24bf60c85}</UniqueIdentifier>
2115
</Filter>
@@ -142,38 +136,20 @@
142136
<Filter Include="1. Modules\ripple_app\refactored\ledger">
143137
<UniqueIdentifier>{857187f0-ff25-4ebe-af30-544b7b7f503a}</UniqueIdentifier>
144138
</Filter>
139+
<Filter Include="1. Modules\ripple_websocket">
140+
<UniqueIdentifier>{90f3b8c4-01a1-41f1-969b-39ec650c00cd}</UniqueIdentifier>
141+
</Filter>
142+
<Filter Include="1. Modules\ripple_websocket\subtree">
143+
<UniqueIdentifier>{9d37d3a1-e8ac-49c5-845b-702a191f28e0}</UniqueIdentifier>
144+
</Filter>
145+
<Filter Include="1. Modules\ripple_websocket\autosocket">
146+
<UniqueIdentifier>{9cd9dfb0-daa3-474e-b1c7-b048f5b85e71}</UniqueIdentifier>
147+
</Filter>
145148
</ItemGroup>
146149
<ItemGroup>
147150
<ClCompile Include="..\..\src\cpp\database\sqlite3.c">
148151
<Filter>0. Third Party Code\SQLite</Filter>
149152
</ClCompile>
150-
<ClCompile Include="..\..\src\cpp\websocketpp\src\base64\base64.cpp">
151-
<Filter>0. Third Party Code\websocket\core</Filter>
152-
</ClCompile>
153-
<ClCompile Include="..\..\src\cpp\websocketpp\src\rng\boost_rng.cpp">
154-
<Filter>0. Third Party Code\websocket\core</Filter>
155-
</ClCompile>
156-
<ClCompile Include="..\..\src\cpp\websocketpp\src\messages\data.cpp">
157-
<Filter>0. Third Party Code\websocket\core</Filter>
158-
</ClCompile>
159-
<ClCompile Include="..\..\src\cpp\websocketpp\src\processors\hybi_header.cpp">
160-
<Filter>0. Third Party Code\websocket\core</Filter>
161-
</ClCompile>
162-
<ClCompile Include="..\..\src\cpp\websocketpp\src\processors\hybi_util.cpp">
163-
<Filter>0. Third Party Code\websocket\core</Filter>
164-
</ClCompile>
165-
<ClCompile Include="..\..\src\cpp\websocketpp\src\md5\md5.c">
166-
<Filter>0. Third Party Code\websocket\core</Filter>
167-
</ClCompile>
168-
<ClCompile Include="..\..\src\cpp\websocketpp\src\network_utilities.cpp">
169-
<Filter>0. Third Party Code\websocket\core</Filter>
170-
</ClCompile>
171-
<ClCompile Include="..\..\src\cpp\websocketpp\src\sha1\sha1.cpp">
172-
<Filter>0. Third Party Code\websocket\core</Filter>
173-
</ClCompile>
174-
<ClCompile Include="..\..\src\cpp\websocketpp\src\uri.cpp">
175-
<Filter>0. Third Party Code\websocket\core</Filter>
176-
</ClCompile>
177153
<ClCompile Include="..\..\src\cpp\leveldb_core.cpp">
178154
<Filter>0. Third Party Code\LevelDB</Filter>
179155
</ClCompile>
@@ -282,9 +258,6 @@
282258
<ClCompile Include="..\..\src\cpp\protobuf\src\google\protobuf\stubs\substitute.cc">
283259
<Filter>0. Third Party Code\protobuf\stubs</Filter>
284260
</ClCompile>
285-
<ClCompile Include="..\..\src\cpp\websocket_core.cpp">
286-
<Filter>0. Third Party Code\websocket</Filter>
287-
</ClCompile>
288261
<ClCompile Include="..\..\src\cpp\ripple\Transaction.cpp">
289262
<Filter>1. Modules\ripple_app\_unfactored\transactions</Filter>
290263
</ClCompile>
@@ -885,41 +858,53 @@
885858
<ClCompile Include="..\..\Subtrees\leveldb\util\logging.cc">
886859
<Filter>0. Third Party Code\LevelDB\util</Filter>
887860
</ClCompile>
861+
<ClCompile Include="..\..\modules\ripple_websocket\ripple_websocket.cpp">
862+
<Filter>1. Modules\ripple_websocket</Filter>
863+
</ClCompile>
864+
<ClCompile Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.cpp">
865+
<Filter>1. Modules\ripple_websocket\autosocket</Filter>
866+
</ClCompile>
867+
<ClCompile Include="..\..\Subtrees\websocket\src\network_utilities.cpp">
868+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
869+
</ClCompile>
870+
<ClCompile Include="..\..\Subtrees\websocket\src\uri.cpp">
871+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
872+
</ClCompile>
873+
<ClCompile Include="..\..\Subtrees\websocket\src\base64\base64.cpp">
874+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
875+
</ClCompile>
876+
<ClCompile Include="..\..\Subtrees\websocket\src\md5\md5.c">
877+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
878+
</ClCompile>
879+
<ClCompile Include="..\..\Subtrees\websocket\src\messages\data.cpp">
880+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
881+
</ClCompile>
882+
<ClCompile Include="..\..\Subtrees\websocket\src\processors\hybi_header.cpp">
883+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
884+
</ClCompile>
885+
<ClCompile Include="..\..\Subtrees\websocket\src\processors\hybi_util.cpp">
886+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
887+
</ClCompile>
888+
<ClCompile Include="..\..\Subtrees\websocket\src\rng\boost_rng.cpp">
889+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
890+
</ClCompile>
891+
<ClCompile Include="..\..\Subtrees\websocket\src\rng\blank_rng.cpp">
892+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
893+
</ClCompile>
894+
<ClCompile Include="..\..\Subtrees\websocket\src\sha1\sha.cpp">
895+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
896+
</ClCompile>
897+
<ClCompile Include="..\..\Subtrees\websocket\src\sha1\sha1.cpp">
898+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
899+
</ClCompile>
900+
<ClCompile Include="..\..\Subtrees\websocket\src\sha1\shacmp.cpp">
901+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
902+
</ClCompile>
903+
<ClCompile Include="..\..\Subtrees\websocket\src\sha1\shatest.cpp">
904+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
905+
</ClCompile>
888906
</ItemGroup>
889907
<ItemGroup>
890-
<ClInclude Include="..\..\src\cpp\websocketpp\src\common.hpp">
891-
<Filter>0. Third Party Code\websocket\core</Filter>
892-
</ClInclude>
893-
<ClInclude Include="..\..\src\cpp\websocketpp\src\connection.hpp">
894-
<Filter>0. Third Party Code\websocket\core</Filter>
895-
</ClInclude>
896-
<ClInclude Include="..\..\src\cpp\websocketpp\src\endpoint.hpp">
897-
<Filter>0. Third Party Code\websocket\core</Filter>
898-
</ClInclude>
899-
<ClInclude Include="..\..\src\cpp\websocketpp\src\network_utilities.hpp">
900-
<Filter>0. Third Party Code\websocket\core</Filter>
901-
</ClInclude>
902-
<ClInclude Include="..\..\src\cpp\websocketpp\src\sockets\plain.hpp">
903-
<Filter>0. Third Party Code\websocket\core</Filter>
904-
</ClInclude>
905-
<ClInclude Include="..\..\src\cpp\websocketpp\src\shared_const_buffer.hpp">
906-
<Filter>0. Third Party Code\websocket\core</Filter>
907-
</ClInclude>
908-
<ClInclude Include="..\..\src\cpp\websocketpp\src\sockets\socket_base.hpp">
909-
<Filter>0. Third Party Code\websocket\core</Filter>
910-
</ClInclude>
911-
<ClInclude Include="..\..\src\cpp\websocketpp\src\sockets\tls.hpp">
912-
<Filter>0. Third Party Code\websocket\core</Filter>
913-
</ClInclude>
914-
<ClInclude Include="..\..\src\cpp\websocketpp\src\uri.hpp">
915-
<Filter>0. Third Party Code\websocket\core</Filter>
916-
</ClInclude>
917-
<ClInclude Include="..\..\src\cpp\websocketpp\src\websocket_frame.hpp">
918-
<Filter>0. Third Party Code\websocket\core</Filter>
919-
</ClInclude>
920-
<ClInclude Include="..\..\src\cpp\websocketpp\src\websocketpp.hpp">
921-
<Filter>0. Third Party Code\websocket\core</Filter>
922-
</ClInclude>
923908
<ClInclude Include="..\..\src\cpp\protobuf\src\google\protobuf\service.h">
924909
<Filter>0. Third Party Code\protobuf\protobuf</Filter>
925910
</ClInclude>
@@ -1217,9 +1202,6 @@
12171202
<ClInclude Include="..\..\src\cpp\ripple\WSDoor.h">
12181203
<Filter>1. Modules\ripple_app\_unfactored\network</Filter>
12191204
</ClInclude>
1220-
<ClInclude Include="..\..\src\cpp\ripple\AutoSocket.h">
1221-
<Filter>1. Modules\ripple_app\_unfactored\network</Filter>
1222-
</ClInclude>
12231205
<ClInclude Include="..\..\src\cpp\ripple\NetworkOPs.h">
12241206
<Filter>1. Modules\ripple_app\_unfactored\network</Filter>
12251207
</ClInclude>
@@ -1647,6 +1629,105 @@
16471629
<ClInclude Include="..\..\Subtrees\leveldb\util\logging.h">
16481630
<Filter>0. Third Party Code\LevelDB\util</Filter>
16491631
</ClInclude>
1632+
<ClInclude Include="..\..\modules\ripple_websocket\ripple_websocket.h">
1633+
<Filter>1. Modules\ripple_websocket</Filter>
1634+
</ClInclude>
1635+
<ClInclude Include="..\..\modules\ripple_websocket\autosocket\ripple_AutoSocket.h">
1636+
<Filter>1. Modules\ripple_websocket\autosocket</Filter>
1637+
</ClInclude>
1638+
<ClInclude Include="..\..\Subtrees\websocket\src\common.hpp">
1639+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1640+
</ClInclude>
1641+
<ClInclude Include="..\..\Subtrees\websocket\src\connection.hpp">
1642+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1643+
</ClInclude>
1644+
<ClInclude Include="..\..\Subtrees\websocket\src\endpoint.hpp">
1645+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1646+
</ClInclude>
1647+
<ClInclude Include="..\..\Subtrees\websocket\src\network_utilities.hpp">
1648+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1649+
</ClInclude>
1650+
<ClInclude Include="..\..\Subtrees\websocket\src\shared_const_buffer.hpp">
1651+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1652+
</ClInclude>
1653+
<ClInclude Include="..\..\Subtrees\websocket\src\uri.hpp">
1654+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1655+
</ClInclude>
1656+
<ClInclude Include="..\..\Subtrees\websocket\src\websocket_frame.hpp">
1657+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1658+
</ClInclude>
1659+
<ClInclude Include="..\..\Subtrees\websocket\src\websocketpp.hpp">
1660+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1661+
</ClInclude>
1662+
<ClInclude Include="..\..\Subtrees\websocket\src\base64\base64.h">
1663+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1664+
</ClInclude>
1665+
<ClInclude Include="..\..\Subtrees\websocket\src\http\constants.hpp">
1666+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1667+
</ClInclude>
1668+
<ClInclude Include="..\..\Subtrees\websocket\src\http\parser.hpp">
1669+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1670+
</ClInclude>
1671+
<ClInclude Include="..\..\Subtrees\websocket\src\logger\logger.hpp">
1672+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1673+
</ClInclude>
1674+
<ClInclude Include="..\..\Subtrees\websocket\src\md5\md5.h">
1675+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1676+
</ClInclude>
1677+
<ClInclude Include="..\..\Subtrees\websocket\src\md5\md5.hpp">
1678+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1679+
</ClInclude>
1680+
<ClInclude Include="..\..\Subtrees\websocket\src\messages\data.hpp">
1681+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1682+
</ClInclude>
1683+
<ClInclude Include="..\..\Subtrees\websocket\src\messages\control.hpp">
1684+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1685+
</ClInclude>
1686+
<ClInclude Include="..\..\Subtrees\websocket\src\processors\hybi.hpp">
1687+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1688+
</ClInclude>
1689+
<ClInclude Include="..\..\Subtrees\websocket\src\processors\hybi_header.hpp">
1690+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1691+
</ClInclude>
1692+
<ClInclude Include="..\..\Subtrees\websocket\src\processors\hybi_legacy.hpp">
1693+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1694+
</ClInclude>
1695+
<ClInclude Include="..\..\Subtrees\websocket\src\processors\hybi_util.hpp">
1696+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1697+
</ClInclude>
1698+
<ClInclude Include="..\..\Subtrees\websocket\src\processors\processor.hpp">
1699+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1700+
</ClInclude>
1701+
<ClInclude Include="..\..\Subtrees\websocket\src\rng\blank_rng.hpp">
1702+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1703+
</ClInclude>
1704+
<ClInclude Include="..\..\Subtrees\websocket\src\rng\boost_rng.hpp">
1705+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1706+
</ClInclude>
1707+
<ClInclude Include="..\..\Subtrees\websocket\src\roles\client.hpp">
1708+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1709+
</ClInclude>
1710+
<ClInclude Include="..\..\Subtrees\websocket\src\roles\server.hpp">
1711+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1712+
</ClInclude>
1713+
<ClInclude Include="..\..\Subtrees\websocket\src\sha1\sha1.h">
1714+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1715+
</ClInclude>
1716+
<ClInclude Include="..\..\Subtrees\websocket\src\sockets\autotls.hpp">
1717+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1718+
</ClInclude>
1719+
<ClInclude Include="..\..\Subtrees\websocket\src\sockets\plain.hpp">
1720+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1721+
</ClInclude>
1722+
<ClInclude Include="..\..\Subtrees\websocket\src\sockets\socket_base.hpp">
1723+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1724+
</ClInclude>
1725+
<ClInclude Include="..\..\Subtrees\websocket\src\sockets\tls.hpp">
1726+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1727+
</ClInclude>
1728+
<ClInclude Include="..\..\Subtrees\websocket\src\utf8_validator\utf8_validator.hpp">
1729+
<Filter>1. Modules\ripple_websocket\subtree</Filter>
1730+
</ClInclude>
16501731
</ItemGroup>
16511732
<ItemGroup>
16521733
<None Include="..\..\src\cpp\protobuf\src\google\protobuf\descriptor.proto">

‎SConstruct

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,12 +103,12 @@ INCLUDE_PATHS = [
103103
COMPILED_FILES = [
104104
'src/cpp/database/sqlite3.c',
105105
'src/cpp/leveldb_core.cpp',
106-
'src/cpp/websocket_core.cpp',
107106
'Subtrees/beast/modules/beast_core/beast_core.cpp',
108107
'Subtrees/beast/modules/beast_basics/beast_basics.cpp',
109108
'modules/ripple_basics/ripple_basics.cpp',
110109
'modules/ripple_data/ripple_data.cpp',
111110
'modules/ripple_json/ripple_json.cpp',
111+
'modules/ripple_websocket/ripple_websocket.cpp',
112112
'modules/ripple_app/ripple_app_pt1.cpp',
113113
'modules/ripple_app/ripple_app_pt2.cpp',
114114
'modules/ripple_app/ripple_app_pt3.cpp',

‎Subtrees/websocket/src/sha1/sha1.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,8 @@
3737
*
3838
*/
3939

40-
41-
#include "sha1.h"
42-
43-
using websocketpp::SHA1;
40+
namespace websocketpp
41+
{
4442

4543
/*
4644
* SHA1
@@ -589,3 +587,5 @@ unsigned SHA1::CircularShift(int bits, unsigned word)
589587
{
590588
return ((word << bits) & 0xFFFFFFFF) | ((word & 0xFFFFFFFF) >> (32-bits));
591589
}
590+
591+
}

‎Subtrees/websocket/src/sockets/autotls.hpp

+1-9
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,7 @@
2828
#ifndef WEBSOCKETPP_SOCKET_AUTOTLS_HPP
2929
#define WEBSOCKETPP_SOCKET_AUTOTLS_HPP
3030

31-
#include "../common.hpp"
32-
#include "socket_base.hpp"
33-
#include "../../../ripple/AutoSocket.h"
34-
35-
#include <boost/asio.hpp>
36-
#include <boost/asio/ssl.hpp>
37-
#include <boost/bind.hpp>
38-
39-
#include <iostream>
31+
// Note that AutoSocket.h must be included before this file
4032

4133
namespace websocketpp {
4234
namespace socket {

‎modules/ripple_app/ripple_app.cpp

+1-10
Original file line numberDiff line numberDiff line change
@@ -104,13 +104,7 @@
104104

105105

106106

107-
// VFALCO NOTE Log dependencies have wormed their way into websocketpp,
108-
// which needs the ripple_basic module to compile.
109-
//
110-
// VFALCO TODO Make a unity include for websocket
111-
// for WSDoor, et. al.
112-
#include "src/cpp/websocketpp/src/sockets/autotls.hpp"
113-
#include "src/cpp/websocketpp/src/websocketpp.hpp"
107+
#include "../modules/ripple_websocket/ripple_websocket.h"
114108

115109
//------------------------------------------------------------------------------
116110

@@ -222,7 +216,6 @@
222216
#include "src/cpp/ripple/ripple_DatabaseCon.h"
223217

224218
#include "src/cpp/ripple/ripple_IApplication.h"
225-
#include "src/cpp/ripple/AutoSocket.h"
226219
#include "src/cpp/ripple/CallRPC.h"
227220
#include "src/cpp/ripple/Transactor.h"
228221
#include "src/cpp/ripple/ChangeTransactor.h"
@@ -261,8 +254,6 @@
261254
#include "src/cpp/ripple/WSHandler.h"
262255
#include "src/cpp/ripple/WalletAddTransactor.h"
263256

264-
#include "../websocketpp/src/logger/logger.hpp" // for ripple_LogWebSockets.cpp
265-
266257
//------------------------------------------------------------------------------
267258

268259
// VFALCO TODO figure out who needs these and move to a sensible private header.

‎modules/ripple_websocket/autosocket/ripple_AutoSocket.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//------------------------------------------------------------------------------
2+
/*
3+
Copyright (c) 2011-2013, OpenCoin, Inc.
4+
*/
5+
//==============================================================================
6+
7+
LogPartition AutoSocket::AutoSocketPartition ("AutoSocket");
8+

‎src/cpp/ripple/AutoSocket.h ‎modules/ripple_websocket/autosocket/ripple_AutoSocket.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
#ifndef __AUTOSOCKET_H_
88
#define __AUTOSOCKET_H_
99

10-
extern LogPartition AutoSocketPartition;
11-
1210
// Socket wrapper that supports both SSL and non-SSL connections.
1311
// Generally, handle it as you would an SSL connection.
1412
// To force a non-SSL connection, just don't call async_handshake.
@@ -255,6 +253,8 @@ class AutoSocket
255253
}
256254

257255
private:
256+
static LogPartition AutoSocketPartition;
257+
258258
socket_ptr mSocket;
259259
bool mSecure;
260260

0 commit comments

Comments
 (0)