Skip to content

Create protocol and channel intermediate peer/tcp classes. #863

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

Merged
evoskuil merged 5 commits into from
Oct 16, 2025
Merged

Create protocol and channel intermediate peer/tcp classes. #863

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
38164b9
Generalize session_peer.
evoskuil Oct 16, 2025
805ee53
Create protocol and channel intermediate peer/tcp classes.
evoskuil Oct 16, 2025
b97dac3
Move channels and distributors into subdirectories.
evoskuil Oct 16, 2025
7059cba
Move server sessions attach/start from network to node.
evoskuil Oct 16, 2025
1ce34a9
Fix errant inline qualifier causing fn undefined warning.
evoskuil Oct 16, 2025
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
13 changes: 11 additions & 2 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@ src_libbitcoin_node_la_LIBADD = ${bitcoin_database_LIBS} ${bitcoin_network_LIBS}
src_libbitcoin_node_la_SOURCES = \
src/block_arena.cpp \
src/block_memory.cpp \
src/channel_peer.cpp \
src/configuration.cpp \
src/error.cpp \
src/full_node.cpp \
src/parser.cpp \
src/settings.cpp \
src/channels/channel_peer.cpp \
src/chasers/chaser.cpp \
src/chasers/chaser_block.cpp \
src/chasers/chaser_check.cpp \
Expand All @@ -65,6 +65,7 @@ src_libbitcoin_node_la_SOURCES = \
src/protocols/protocol_header_out_31800.cpp \
src/protocols/protocol_header_out_70012.cpp \
src/protocols/protocol_observer.cpp \
src/protocols/protocol_peer.cpp \
src/protocols/protocol_performer.cpp \
src/protocols/protocol_transaction_in_106.cpp \
src/protocols/protocol_transaction_out_106.cpp \
Expand Down Expand Up @@ -145,7 +146,6 @@ include_bitcoin_nodedir = ${includedir}/bitcoin/node
include_bitcoin_node_HEADERS = \
include/bitcoin/node/block_arena.hpp \
include/bitcoin/node/block_memory.hpp \
include/bitcoin/node/channel_peer.hpp \
include/bitcoin/node/chase.hpp \
include/bitcoin/node/configuration.hpp \
include/bitcoin/node/define.hpp \
Expand All @@ -156,6 +156,13 @@ include_bitcoin_node_HEADERS = \
include/bitcoin/node/settings.hpp \
include/bitcoin/node/version.hpp

include_bitcoin_node_channelsdir = ${includedir}/bitcoin/node/channels
include_bitcoin_node_channels_HEADERS = \
include/bitcoin/node/channels/channel.hpp \
include/bitcoin/node/channels/channel_peer.hpp \
include/bitcoin/node/channels/channel_tcp.hpp \
include/bitcoin/node/channels/channels.hpp

include_bitcoin_node_chasersdir = ${includedir}/bitcoin/node/chasers
include_bitcoin_node_chasers_HEADERS = \
include/bitcoin/node/chasers/chaser.hpp \
Expand Down Expand Up @@ -189,7 +196,9 @@ include_bitcoin_node_protocols_HEADERS = \
include/bitcoin/node/protocols/protocol_header_out_31800.hpp \
include/bitcoin/node/protocols/protocol_header_out_70012.hpp \
include/bitcoin/node/protocols/protocol_observer.hpp \
include/bitcoin/node/protocols/protocol_peer.hpp \
include/bitcoin/node/protocols/protocol_performer.hpp \
include/bitcoin/node/protocols/protocol_tcp.hpp \
include/bitcoin/node/protocols/protocol_transaction_in_106.hpp \
include/bitcoin/node/protocols/protocol_transaction_out_106.hpp \
include/bitcoin/node/protocols/protocols.hpp
Expand Down
3 changes: 2 additions & 1 deletion builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,12 +249,12 @@ add_definitions(
add_library( ${CANONICAL_LIB_NAME}
"../../src/block_arena.cpp"
"../../src/block_memory.cpp"
"../../src/channel_peer.cpp"
"../../src/configuration.cpp"
"../../src/error.cpp"
"../../src/full_node.cpp"
"../../src/parser.cpp"
"../../src/settings.cpp"
"../../src/channels/channel_peer.cpp"
"../../src/chasers/chaser.cpp"
"../../src/chasers/chaser_block.cpp"
"../../src/chasers/chaser_check.cpp"
Expand All @@ -277,6 +277,7 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/protocols/protocol_header_out_31800.cpp"
"../../src/protocols/protocol_header_out_70012.cpp"
"../../src/protocols/protocol_observer.cpp"
"../../src/protocols/protocol_peer.cpp"
"../../src/protocols/protocol_performer.cpp"
"../../src/protocols/protocol_transaction_in_106.cpp"
"../../src/protocols/protocol_transaction_out_106.cpp"
Expand Down
10 changes: 8 additions & 2 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<ItemGroup>
<ClCompile Include="..\..\..\..\src\block_arena.cpp" />
<ClCompile Include="..\..\..\..\src\block_memory.cpp" />
<ClCompile Include="..\..\..\..\src\channel_peer.cpp" />
<ClCompile Include="..\..\..\..\src\channels\channel_peer.cpp" />
<ClCompile Include="..\..\..\..\src\chasers\chaser.cpp" />
<ClCompile Include="..\..\..\..\src\chasers\chaser_block.cpp" />
<ClCompile Include="..\..\..\..\src\chasers\chaser_check.cpp" />
Expand All @@ -150,6 +150,7 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_header_out_31800.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_header_out_70012.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_observer.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_peer.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_performer.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_in_106.cpp" />
<ClCompile Include="..\..\..\..\src\protocols\protocol_transaction_out_106.cpp" />
Expand All @@ -164,7 +165,10 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\block_arena.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\block_memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channel_peer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_peer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_tcp.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channels.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chase.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\chasers\chaser_block.hpp" />
Expand Down Expand Up @@ -196,7 +200,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_header_out_31800.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_header_out_70012.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_observer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_peer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_performer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_tcp.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_in_106.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_out_106.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocols.hpp" />
Expand Down
56 changes: 40 additions & 16 deletions builds/msvc/vs2022/libbitcoin-node/libbitcoin-node.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,44 +8,50 @@
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="include">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000004}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000005}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000005}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000006}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000006}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000007}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\channels">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000008}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\chasers">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000007}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000009}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\impl">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000008}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\impl\chasers">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000B}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000D}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000009}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000B}</UniqueIdentifier>
</Filter>
<Filter Include="include\bitcoin\node\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000A}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000C}</UniqueIdentifier>
</Filter>
<Filter Include="resource">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000C}</UniqueIdentifier>
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-00000000000E}</UniqueIdentifier>
</Filter>
<Filter Include="src">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000000}</UniqueIdentifier>
</Filter>
<Filter Include="src\chasers">
<Filter Include="src\channels">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000001}</UniqueIdentifier>
</Filter>
<Filter Include="src\protocols">
<Filter Include="src\chasers">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000002}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
<Filter Include="src\protocols">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000003}</UniqueIdentifier>
</Filter>
<Filter Include="src\sessions">
<UniqueIdentifier>{5FFB5F52-0772-4404-0000-000000000004}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\src\block_arena.cpp">
Expand All @@ -54,8 +60,8 @@
<ClCompile Include="..\..\..\..\src\block_memory.cpp">
<Filter>src</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\channel_peer.cpp">
<Filter>src</Filter>
<ClCompile Include="..\..\..\..\src\channels\channel_peer.cpp">
<Filter>src\channels</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\chasers\chaser.cpp">
<Filter>src\chasers</Filter>
Expand Down Expand Up @@ -135,6 +141,9 @@
<ClCompile Include="..\..\..\..\src\protocols\protocol_observer.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol_peer.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\protocols\protocol_performer.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
Expand Down Expand Up @@ -173,8 +182,17 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\block_memory.hpp">
<Filter>include\bitcoin\node</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\channel_peer.hpp">
<Filter>include\bitcoin\node</Filter>
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel.hpp">
<Filter>include\bitcoin\node\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_peer.hpp">
<Filter>include\bitcoin\node\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channel_tcp.hpp">
<Filter>include\bitcoin\node\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\channels\channels.hpp">
<Filter>include\bitcoin\node\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\chase.hpp">
<Filter>include\bitcoin\node</Filter>
Expand Down Expand Up @@ -269,9 +287,15 @@
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_observer.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_peer.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_performer.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_tcp.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\node\protocols\protocol_transaction_in_106.hpp">
<Filter>include\bitcoin\node\protocols</Filter>
</ClInclude>
Expand Down
7 changes: 6 additions & 1 deletion include/bitcoin/node.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
#include <bitcoin/network.hpp>
#include <bitcoin/node/block_arena.hpp>
#include <bitcoin/node/block_memory.hpp>
#include <bitcoin/node/channel_peer.hpp>
#include <bitcoin/node/chase.hpp>
#include <bitcoin/node/configuration.hpp>
#include <bitcoin/node/define.hpp>
Expand All @@ -28,6 +27,10 @@
#include <bitcoin/node/parser.hpp>
#include <bitcoin/node/settings.hpp>
#include <bitcoin/node/version.hpp>
#include <bitcoin/node/channels/channel.hpp>
#include <bitcoin/node/channels/channel_peer.hpp>
#include <bitcoin/node/channels/channel_tcp.hpp>
#include <bitcoin/node/channels/channels.hpp>
#include <bitcoin/node/chasers/chaser.hpp>
#include <bitcoin/node/chasers/chaser_block.hpp>
#include <bitcoin/node/chasers/chaser_check.hpp>
Expand All @@ -52,7 +55,9 @@
#include <bitcoin/node/protocols/protocol_header_out_31800.hpp>
#include <bitcoin/node/protocols/protocol_header_out_70012.hpp>
#include <bitcoin/node/protocols/protocol_observer.hpp>
#include <bitcoin/node/protocols/protocol_peer.hpp>
#include <bitcoin/node/protocols/protocol_performer.hpp>
#include <bitcoin/node/protocols/protocol_tcp.hpp>
#include <bitcoin/node/protocols/protocol_transaction_in_106.hpp>
#include <bitcoin/node/protocols/protocol_transaction_out_106.hpp>
#include <bitcoin/node/protocols/protocols.hpp>
Expand Down
50 changes: 50 additions & 0 deletions include/bitcoin/node/channels/channel.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
/**
* Copyright (c) 2011-2025 libbitcoin developers (see AUTHORS)
*
* This file is part of libbitcoin.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_NODE_CHANNELS_CHANNEL_HPP
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_HPP

#include <memory>
#include <bitcoin/network.hpp>
#include <bitcoin/node/channels/channel.hpp>
#include <bitcoin/node/configuration.hpp>
#include <bitcoin/node/define.hpp>

namespace libbitcoin {
namespace node {

/// Abstract base channel state for the node.
class BCN_API channel
{
public:
typedef std::shared_ptr<node::channel> ptr;

protected:
channel(const network::logger&, const network::socket::ptr&,
const node::configuration&, uint64_t=zero) NOEXCEPT
{
}

virtual ~channel() NOEXCEPT {}

};

} // namespace node
} // namespace libbitcoin

#endif
7 changes: 4 additions & 3 deletions include/bitcoin/node/channel_peer.hpp → ...de/bitcoin/node/channels/channel_peer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_NODE_CHANNEL_PEER_HPP
#define LIBBITCOIN_NODE_CHANNEL_PEER_HPP
#ifndef LIBBITCOIN_NODE_CHANNELS_CHANNEL_PEER_HPP
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_PEER_HPP

#include <memory>
#include <bitcoin/network.hpp>
#include <bitcoin/node/channels/channel.hpp>
#include <bitcoin/node/configuration.hpp>
#include <bitcoin/node/define.hpp>

Expand All @@ -29,7 +30,7 @@ namespace node {

/// Peer channel state for the node.
class BCN_API channel_peer
: public network::channel_peer
: public network::channel_peer, node::channel
{
public:
typedef std::shared_ptr<node::channel_peer> ptr;
Expand Down
53 changes: 53 additions & 0 deletions include/bitcoin/node/channels/channel_tcp.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
/**
* Copyright (c) 2011-2025 libbitcoin developers (see AUTHORS)
*
* This file is part of libbitcoin.
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_NODE_CHANNELS_CHANNEL_TCP_HPP
#define LIBBITCOIN_NODE_CHANNELS_CHANNEL_TCP_HPP

#include <memory>
#include <bitcoin/network.hpp>
#include <bitcoin/node/channels/channel.hpp>
#include <bitcoin/node/configuration.hpp>
#include <bitcoin/node/define.hpp>

namespace libbitcoin {
namespace node {

/// TCP channel state for the node.
class BCN_API channel_tcp
: public network::channel_tcp, node::channel
{
public:
typedef std::shared_ptr<node::channel_tcp> ptr;
using options_t = network::settings::tcp_server;

channel_tcp(const network::logger& log, const network::socket::ptr& socket,
const node::configuration& config, uint64_t identifier=zero,
const options_t& options={}) NOEXCEPT
: network::channel_tcp(log, socket, config.network, identifier, options),
node::channel(log, socket, config, identifier)
{
}

virtual ~channel_tcp() NOEXCEPT {}
};

} // namespace node
} // namespace libbitcoin

#endif
Loading
Loading