Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes for Structured Overlay #405

Merged
merged 2 commits into from
Jun 18, 2014
Merged

Changes for Structured Overlay #405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e2c3ba
Add missing beast includes
vinniefalco Jun 17, 2014
d606618
Refactor Overlay for Structured Network support:
vinniefalco Jun 10, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 43 additions & 25 deletions Builds/VisualStudio2013/RippleD.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2720,31 +2720,6 @@
</ClCompile>
<ClInclude Include="..\..\src\ripple\module\net\rpc\RPCUtil.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\Message.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\Overlay.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\Peer.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\make_Overlay.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\predicates.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\module\overlay\impl\Message.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\module\overlay\impl\OverlayImpl.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\module\overlay\impl\OverlayImpl.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\module\overlay\impl\PeerDoor.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\module\overlay\impl\PeerDoor.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\impl\PeerImp.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\rpc\ErrorCodes.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\rpc\Manager.h">
Expand Down Expand Up @@ -3108,6 +3083,49 @@
<ClCompile Include="..\..\src\ripple\nodestore\tests\TimingTests.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\Message.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\Overlay.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\Peer.h">
</ClInclude>
<None Include="..\..\src\ripple\overlay\README.md">
</None>
<ClCompile Include="..\..\src\ripple\overlay\impl\Message.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClCompile Include="..\..\src\ripple\overlay\impl\OverlayImpl.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\impl\OverlayImpl.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\overlay\impl\PeerDoor.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\impl\PeerDoor.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\overlay\impl\PeerImp.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\impl\PeerImp.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\impl\Tuning.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\impl\abstract_protocol_handler.h">
</ClInclude>
<ClCompile Include="..\..\src\ripple\overlay\impl\message_name.cpp">
<ExcludedFromBuild>True</ExcludedFromBuild>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\impl\message_name.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\impl\message_stream.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\impl\peer_protocol_detector.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\make_Overlay.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\predicates.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\peerfinder\api\Callback.h">
</ClInclude>
<ClInclude Include="..\..\src\ripple\peerfinder\api\Config.h">
Expand Down
105 changes: 63 additions & 42 deletions Builds/VisualStudio2013/RippleD.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,15 +433,6 @@
<Filter Include="ripple\module\net\rpc">
<UniqueIdentifier>{643F2F19-8319-49F7-7DF1-4BF4F52BF4BF}</UniqueIdentifier>
</Filter>
<Filter Include="ripple\module\overlay">
<UniqueIdentifier>{AE687926-F53E-728F-2D48-A1DEC283E86E}</UniqueIdentifier>
</Filter>
<Filter Include="ripple\module\overlay\api">
<UniqueIdentifier>{909364A1-443C-393A-3505-D36E048D7181}</UniqueIdentifier>
</Filter>
<Filter Include="ripple\module\overlay\impl">
<UniqueIdentifier>{C04BC25B-9F43-7B79-91FE-6C62B0E206EE}</UniqueIdentifier>
</Filter>
<Filter Include="ripple\module\rpc">
<UniqueIdentifier>{4DB18141-EDCD-D13F-A8D3-407F5EF72217}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -469,6 +460,12 @@
<Filter Include="ripple\nodestore\tests">
<UniqueIdentifier>{3FDC73B9-A9C7-3533-FD40-E4032B9FA9FB}</UniqueIdentifier>
</Filter>
<Filter Include="ripple\overlay">
<UniqueIdentifier>{51E817F6-DC2E-045A-9009-37E3D16D0990}</UniqueIdentifier>
</Filter>
<Filter Include="ripple\overlay\impl">
<UniqueIdentifier>{07E4BC73-2B68-D0D1-D922-FEBBB573F503}</UniqueIdentifier>
</Filter>
<Filter Include="ripple\peerfinder">
<UniqueIdentifier>{186385AD-A056-FA3A-7E0E-759EB55E9EAB}</UniqueIdentifier>
</Filter>
Expand Down Expand Up @@ -3858,39 +3855,6 @@
<ClInclude Include="..\..\src\ripple\module\net\rpc\RPCUtil.h">
<Filter>ripple\module\net\rpc</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\Message.h">
<Filter>ripple\module\overlay\api</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\Overlay.h">
<Filter>ripple\module\overlay\api</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\Peer.h">
<Filter>ripple\module\overlay\api</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\make_Overlay.h">
<Filter>ripple\module\overlay\api</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\api\predicates.h">
<Filter>ripple\module\overlay\api</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\module\overlay\impl\Message.cpp">
<Filter>ripple\module\overlay\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\module\overlay\impl\OverlayImpl.cpp">
<Filter>ripple\module\overlay\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\module\overlay\impl\OverlayImpl.h">
<Filter>ripple\module\overlay\impl</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\module\overlay\impl\PeerDoor.cpp">
<Filter>ripple\module\overlay\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\module\overlay\impl\PeerDoor.h">
<Filter>ripple\module\overlay\impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\overlay\impl\PeerImp.h">
<Filter>ripple\module\overlay\impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\module\rpc\ErrorCodes.h">
<Filter>ripple\module\rpc</Filter>
</ClInclude>
Expand Down Expand Up @@ -4293,6 +4257,63 @@
<ClCompile Include="..\..\src\ripple\nodestore\tests\TimingTests.cpp">
<Filter>ripple\nodestore\tests</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\Message.h">
<Filter>ripple\overlay</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\Overlay.h">
<Filter>ripple\overlay</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\Peer.h">
<Filter>ripple\overlay</Filter>
</ClInclude>
<None Include="..\..\src\ripple\overlay\README.md">
<Filter>ripple\overlay</Filter>
</None>
<ClCompile Include="..\..\src\ripple\overlay\impl\Message.cpp">
<Filter>ripple\overlay\impl</Filter>
</ClCompile>
<ClCompile Include="..\..\src\ripple\overlay\impl\OverlayImpl.cpp">
<Filter>ripple\overlay\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\impl\OverlayImpl.h">
<Filter>ripple\overlay\impl</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\overlay\impl\PeerDoor.cpp">
<Filter>ripple\overlay\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\impl\PeerDoor.h">
<Filter>ripple\overlay\impl</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\overlay\impl\PeerImp.cpp">
<Filter>ripple\overlay\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\impl\PeerImp.h">
<Filter>ripple\overlay\impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\impl\Tuning.h">
<Filter>ripple\overlay\impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\impl\abstract_protocol_handler.h">
<Filter>ripple\overlay\impl</Filter>
</ClInclude>
<ClCompile Include="..\..\src\ripple\overlay\impl\message_name.cpp">
<Filter>ripple\overlay\impl</Filter>
</ClCompile>
<ClInclude Include="..\..\src\ripple\overlay\impl\message_name.h">
<Filter>ripple\overlay\impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\impl\message_stream.h">
<Filter>ripple\overlay\impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\impl\peer_protocol_detector.h">
<Filter>ripple\overlay\impl</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\make_Overlay.h">
<Filter>ripple\overlay</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\overlay\predicates.h">
<Filter>ripple\overlay</Filter>
</ClInclude>
<ClInclude Include="..\..\src\ripple\peerfinder\api\Callback.h">
<Filter>ripple\peerfinder\api</Filter>
</ClInclude>
Expand Down
2 changes: 1 addition & 1 deletion src/beast/beast/asio/abstract_socket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#include <beast/asio/buffer_sequence.h>
#include <beast/asio/shared_handler.h>

#include <boost/asio/io_service.hpp>
#include <boost/asio/socket_base.hpp>
#include <boost/asio/ssl/stream_base.hpp>

Expand Down
3 changes: 3 additions & 0 deletions src/beast/beast/module/asio/protocol/InputParser.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
#define BEAST_ASIO_HANDSHAKE_INPUTPARSER_H_INCLUDED

#include <beast/module/asio/basics/FixedInputBuffer.h>
#include <beast/strings/String.h>

#include <cctype>

namespace beast {
namespace asio {
Expand Down
2 changes: 1 addition & 1 deletion src/ripple/common/MultiSocket.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
#include <beast/asio/abstract_socket.h>
#include <beast/net/IPEndpoint.h>
#include <beast/module/asio/protocol/HandshakeDetectLogicPROXY.h>

#include <boost/asio/ip/tcp.hpp>
#include <boost/asio/ssl/context.hpp>

namespace ripple {

Expand Down
2 changes: 1 addition & 1 deletion src/ripple/module/app/consensus/LedgerConsensus.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
//==============================================================================

#include <ripple/module/overlay/api/predicates.h>
#include <ripple/overlay/predicates.h>

namespace ripple {

Expand Down
4 changes: 2 additions & 2 deletions src/ripple/module/app/ledger/InboundLedger.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
//==============================================================================

#include <ripple/module/overlay/api/Overlay.h>
#include <ripple/overlay/Overlay.h>
#include <ripple/nodestore/Database.h>

namespace ripple {
Expand Down Expand Up @@ -502,7 +502,7 @@ void InboundLedger::trigger (Peer::ptr const& peer)
if (iPeer)
{
mByHash = false;
iPeer->sendPacket (packet, false);
iPeer->send (packet);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/ripple/module/app/ledger/LedgerMaster.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -550,7 +550,7 @@ class LedgerMasterImp
tmBH.set_ledgerhash (nextLedger->getHash().begin (), 32);
Message::pointer packet = std::make_shared<Message> (tmBH, protocol::mtGET_OBJECTS);

target->sendPacket (packet, false);
target->send (packet);
WriteLog (lsTRACE, LedgerMaster) << "Requested fetch pack for " << nextLedger->getLedgerSeq() - 1;
}
else
Expand Down
8 changes: 5 additions & 3 deletions src/ripple/module/app/main/Application.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@
#include <ripple/common/seconds_clock.h>
#include <ripple/module/app/main/Tuning.h>
#include <ripple/module/app/misc/ProofOfWorkFactory.h>
#include <ripple/module/overlay/api/make_Overlay.h>
#include <ripple/module/rpc/Manager.h>
#include <ripple/module/rpc/Manager.h>
#include <ripple/nodestore/Database.h>
#include <ripple/nodestore/DummyScheduler.h>
#include <ripple/nodestore/Manager.h>

#include <ripple/overlay/make_Overlay.h>
#include <beast/asio/io_latency_probe.h>
#include <beast/module/core/thread/DeadlineTimer.h>
#include <fstream>

namespace ripple {

// VFALCO TODO Clean this global up
Expand Down
4 changes: 2 additions & 2 deletions src/ripple/module/app/misc/NetworkOPs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
//==============================================================================

#include <ripple/basics/utility/Time.h>
#include <ripple/overlay/predicates.h>
#include <ripple/common/jsonrpc_fields.h>
#include <ripple/module/overlay/api/predicates.h>
#include <beast/module/core/thread/DeadlineTimer.h>
#include <beast/module/core/system/SystemStats.h>
#include <tuple>
Expand Down Expand Up @@ -3288,7 +3288,7 @@ void NetworkOPsImp::makeFetchPack (Job&, std::weak_ptr<Peer> wPeer,

m_journal.info << "Built fetch pack with " << reply.objects ().size () << " nodes";
Message::pointer msg = std::make_shared<Message> (reply, protocol::mtGET_OBJECTS);
peer->sendPacket (msg, false);
peer->send (msg);
}
catch (...)
{
Expand Down
6 changes: 3 additions & 3 deletions src/ripple/module/app/peers/PeerSet.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
//==============================================================================

#include <ripple/module/overlay/api/Overlay.h>
#include <ripple/overlay/Overlay.h>
#include <beast/asio/placeholders.h>

namespace ripple {
Expand Down Expand Up @@ -151,7 +151,7 @@ void PeerSet::sendRequest (const protocol::TMGetLedger& tmGL, Peer::ptr const& p
if (!peer)
sendRequest (tmGL);
else
peer->sendPacket (std::make_shared<Message> (tmGL, protocol::mtGET_LEDGER), false);
peer->send (std::make_shared<Message> (tmGL, protocol::mtGET_LEDGER));
}

void PeerSet::sendRequest (const protocol::TMGetLedger& tmGL)
Expand All @@ -169,7 +169,7 @@ void PeerSet::sendRequest (const protocol::TMGetLedger& tmGL)
Peer::ptr peer (getApp().overlay ().findPeerByShortID (p.first));

if (peer)
peer->sendPacket (packet, false);
peer->send (packet);
}
}

Expand Down
2 changes: 1 addition & 1 deletion src/ripple/module/app/peers/PeerSet.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
#ifndef RIPPLE_PEERSET_H
#define RIPPLE_PEERSET_H

#include <ripple/module/overlay/api/Peer.h>
#include <ripple/overlay/Peer.h>

namespace ripple {

Expand Down
2 changes: 1 addition & 1 deletion src/ripple/module/app/tx/TransactionAcquire.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
*/
//==============================================================================

#include <ripple/module/overlay/api/Overlay.h>
#include <ripple/overlay/Overlay.h>

namespace ripple {

Expand Down
16 changes: 0 additions & 16 deletions src/ripple/module/overlay/README.md
View file
Open in desktop

This file was deleted.

Loading