Skip to content

Remove channel_tcp and protocol_tcp, rename session_tcp to session_server. #657

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 2 commits into from
Dec 9, 2025
Merged

Remove channel_tcp and protocol_tcp, rename session_tcp to session_server. #657

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
2bd8b97
Remove channel_tcp and protocol_tcp.
evoskuil Dec 8, 2025
0c4f2cd
Rename session_tcp to session_server.
evoskuil Dec 8, 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
11 changes: 3 additions & 8 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ src_libbitcoin_network_la_SOURCES = \
src/channels/channel.cpp \
src/channels/channel_http.cpp \
src/channels/channel_peer.cpp \
src/channels/channel_tcp.cpp \
src/channels/channel_ws.cpp \
src/config/address.cpp \
src/config/authority.cpp \
Expand Down Expand Up @@ -127,7 +126,7 @@ src_libbitcoin_network_la_SOURCES = \
src/sessions/session_outbound.cpp \
src/sessions/session_peer.cpp \
src/sessions/session_seed.cpp \
src/sessions/session_tcp.cpp
src/sessions/session_server.cpp

# local: test/libbitcoin-network-test
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -161,7 +160,6 @@ test_libbitcoin_network_test_SOURCES = \
test/channels/channel.cpp \
test/channels/channel_http.cpp \
test/channels/channel_peer.cpp \
test/channels/channel_tcp.cpp \
test/channels/channel_ws.cpp \
test/config/address.cpp \
test/config/authority.cpp \
Expand Down Expand Up @@ -239,7 +237,6 @@ test_libbitcoin_network_test_SOURCES = \
test/protocols/protocol_ping_60001.cpp \
test/protocols/protocol_reject_70002.cpp \
test/protocols/protocol_seed_209.cpp \
test/protocols/protocol_tcp.cpp \
test/protocols/protocol_version_106.cpp \
test/protocols/protocol_version_70001.cpp \
test/protocols/protocol_version_70002.cpp \
Expand All @@ -255,7 +252,7 @@ test_libbitcoin_network_test_SOURCES = \
test/sessions/session_manual.cpp \
test/sessions/session_outbound.cpp \
test/sessions/session_seed.cpp \
test/sessions/session_tcp.cpp
test/sessions/session_server.cpp

endif WITH_TESTS

Expand Down Expand Up @@ -303,7 +300,6 @@ include_bitcoin_network_channels_HEADERS = \
include/bitcoin/network/channels/channel.hpp \
include/bitcoin/network/channels/channel_http.hpp \
include/bitcoin/network/channels/channel_peer.hpp \
include/bitcoin/network/channels/channel_tcp.hpp \
include/bitcoin/network/channels/channel_ws.hpp \
include/bitcoin/network/channels/channels.hpp

Expand Down Expand Up @@ -458,7 +454,6 @@ include_bitcoin_network_protocols_HEADERS = \
include/bitcoin/network/protocols/protocol_ping_60001.hpp \
include/bitcoin/network/protocols/protocol_reject_70002.hpp \
include/bitcoin/network/protocols/protocol_seed_209.hpp \
include/bitcoin/network/protocols/protocol_tcp.hpp \
include/bitcoin/network/protocols/protocol_version_106.hpp \
include/bitcoin/network/protocols/protocol_version_70001.hpp \
include/bitcoin/network/protocols/protocol_version_70002.hpp \
Expand Down Expand Up @@ -502,6 +497,6 @@ include_bitcoin_network_sessions_HEADERS = \
include/bitcoin/network/sessions/session_outbound.hpp \
include/bitcoin/network/sessions/session_peer.hpp \
include/bitcoin/network/sessions/session_seed.hpp \
include/bitcoin/network/sessions/session_tcp.hpp \
include/bitcoin/network/sessions/session_server.hpp \
include/bitcoin/network/sessions/sessions.hpp

7 changes: 2 additions & 5 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,6 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/channels/channel.cpp"
"../../src/channels/channel_http.cpp"
"../../src/channels/channel_peer.cpp"
"../../src/channels/channel_tcp.cpp"
"../../src/channels/channel_ws.cpp"
"../../src/config/address.cpp"
"../../src/config/authority.cpp"
Expand Down Expand Up @@ -309,7 +308,7 @@ add_library( ${CANONICAL_LIB_NAME}
"../../src/sessions/session_outbound.cpp"
"../../src/sessions/session_peer.cpp"
"../../src/sessions/session_seed.cpp"
"../../src/sessions/session_tcp.cpp" )
"../../src/sessions/session_server.cpp" )

# ${CANONICAL_LIB_NAME} project specific include directory normalization for build.
#------------------------------------------------------------------------------
Expand Down Expand Up @@ -367,7 +366,6 @@ if (with-tests)
"../../test/channels/channel.cpp"
"../../test/channels/channel_http.cpp"
"../../test/channels/channel_peer.cpp"
"../../test/channels/channel_tcp.cpp"
"../../test/channels/channel_ws.cpp"
"../../test/config/address.cpp"
"../../test/config/authority.cpp"
Expand Down Expand Up @@ -445,7 +443,6 @@ if (with-tests)
"../../test/protocols/protocol_ping_60001.cpp"
"../../test/protocols/protocol_reject_70002.cpp"
"../../test/protocols/protocol_seed_209.cpp"
"../../test/protocols/protocol_tcp.cpp"
"../../test/protocols/protocol_version_106.cpp"
"../../test/protocols/protocol_version_70001.cpp"
"../../test/protocols/protocol_version_70002.cpp"
Expand All @@ -461,7 +458,7 @@ if (with-tests)
"../../test/sessions/session_manual.cpp"
"../../test/sessions/session_outbound.cpp"
"../../test/sessions/session_seed.cpp"
"../../test/sessions/session_tcp.cpp" )
"../../test/sessions/session_server.cpp" )

add_test( NAME libbitcoin-network-test COMMAND libbitcoin-network-test
--run_test=*
Expand Down
4 changes: 1 addition & 3 deletions builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
<ClCompile Include="..\..\..\..\test\channels\channel.cpp" />
<ClCompile Include="..\..\..\..\test\channels\channel_http.cpp" />
<ClCompile Include="..\..\..\..\test\channels\channel_peer.cpp" />
<ClCompile Include="..\..\..\..\test\channels\channel_tcp.cpp" />
<ClCompile Include="..\..\..\..\test\channels\channel_ws.cpp" />
<ClCompile Include="..\..\..\..\test\config\address.cpp">
<ObjectFileName>$(IntDir)test_config_address.obj</ObjectFileName>
Expand Down Expand Up @@ -233,7 +232,6 @@
<ClCompile Include="..\..\..\..\test\protocols\protocol_ping_60001.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol_reject_70002.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol_seed_209.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol_tcp.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_106.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_70001.cpp" />
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_70002.cpp" />
Expand All @@ -251,7 +249,7 @@
<ClCompile Include="..\..\..\..\test\sessions\session_manual.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session_outbound.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session_seed.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session_tcp.cpp" />
<ClCompile Include="..\..\..\..\test\sessions\session_server.cpp" />
<ClCompile Include="..\..\..\..\test\settings.cpp" />
<ClCompile Include="..\..\..\..\test\test.cpp" />
</ItemGroup>
Expand Down
8 changes: 1 addition & 7 deletions builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,9 +108,6 @@
<ClCompile Include="..\..\..\..\test\channels\channel_peer.cpp">
<Filter>src\channels</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\channels\channel_tcp.cpp">
<Filter>src\channels</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\channels\channel_ws.cpp">
<Filter>src\channels</Filter>
</ClCompile>
Expand Down Expand Up @@ -354,9 +351,6 @@
<ClCompile Include="..\..\..\..\test\protocols\protocol_seed_209.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\protocols\protocol_tcp.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_106.cpp">
<Filter>src\protocols</Filter>
</ClCompile>
Expand Down Expand Up @@ -402,7 +396,7 @@
<ClCompile Include="..\..\..\..\test\sessions\session_seed.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\sessions\session_tcp.cpp">
<ClCompile Include="..\..\..\..\test\sessions\session_server.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\settings.cpp">
Expand Down
7 changes: 2 additions & 5 deletions builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@
<ClCompile Include="..\..\..\..\src\channels\channel.cpp" />
<ClCompile Include="..\..\..\..\src\channels\channel_http.cpp" />
<ClCompile Include="..\..\..\..\src\channels\channel_peer.cpp" />
<ClCompile Include="..\..\..\..\src\channels\channel_tcp.cpp" />
<ClCompile Include="..\..\..\..\src\channels\channel_ws.cpp" />
<ClCompile Include="..\..\..\..\src\config\address.cpp">
<ObjectFileName>$(IntDir)src_config_address.obj</ObjectFileName>
Expand Down Expand Up @@ -220,7 +219,7 @@
<ClCompile Include="..\..\..\..\src\sessions\session_outbound.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_peer.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_seed.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_tcp.cpp" />
<ClCompile Include="..\..\..\..\src\sessions\session_server.cpp" />
<ClCompile Include="..\..\..\..\src\settings.cpp" />
</ItemGroup>
<ItemGroup>
Expand All @@ -246,7 +245,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_http.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_peer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_tcp.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_ws.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channels.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\config\address.hpp" />
Expand Down Expand Up @@ -344,7 +342,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_ping_60001.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_reject_70002.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_seed_209.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_tcp.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_106.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_70001.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_70002.hpp" />
Expand Down Expand Up @@ -376,7 +373,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_outbound.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_peer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_seed.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_tcp.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_server.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\sessions.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\settings.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\network\version.hpp" />
Expand Down
13 changes: 2 additions & 11 deletions builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,6 @@
<ClCompile Include="..\..\..\..\src\channels\channel_peer.cpp">
<Filter>src\channels</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\channels\channel_tcp.cpp">
<Filter>src\channels</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\channels\channel_ws.cpp">
<Filter>src\channels</Filter>
</ClCompile>
Expand Down Expand Up @@ -420,7 +417,7 @@
<ClCompile Include="..\..\..\..\src\sessions\session_seed.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\sessions\session_tcp.cpp">
<ClCompile Include="..\..\..\..\src\sessions\session_server.cpp">
<Filter>src\sessions</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\src\settings.cpp">
Expand Down Expand Up @@ -494,9 +491,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_peer.hpp">
<Filter>include\bitcoin\network\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_tcp.hpp">
<Filter>include\bitcoin\network\channels</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_ws.hpp">
<Filter>include\bitcoin\network\channels</Filter>
</ClInclude>
Expand Down Expand Up @@ -788,9 +782,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_seed_209.hpp">
<Filter>include\bitcoin\network\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_tcp.hpp">
<Filter>include\bitcoin\network\protocols</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_106.hpp">
<Filter>include\bitcoin\network\protocols</Filter>
</ClInclude>
Expand Down Expand Up @@ -884,7 +875,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_seed.hpp">
<Filter>include\bitcoin\network\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_tcp.hpp">
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_server.hpp">
<Filter>include\bitcoin\network\sessions</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\sessions.hpp">
Expand Down
4 changes: 1 addition & 3 deletions include/bitcoin/network.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
#include <bitcoin/network/channels/channel.hpp>
#include <bitcoin/network/channels/channel_http.hpp>
#include <bitcoin/network/channels/channel_peer.hpp>
#include <bitcoin/network/channels/channel_tcp.hpp>
#include <bitcoin/network/channels/channel_ws.hpp>
#include <bitcoin/network/channels/channels.hpp>
#include <bitcoin/network/config/address.hpp>
Expand Down Expand Up @@ -136,7 +135,6 @@
#include <bitcoin/network/protocols/protocol_ping_60001.hpp>
#include <bitcoin/network/protocols/protocol_reject_70002.hpp>
#include <bitcoin/network/protocols/protocol_seed_209.hpp>
#include <bitcoin/network/protocols/protocol_tcp.hpp>
#include <bitcoin/network/protocols/protocol_version_106.hpp>
#include <bitcoin/network/protocols/protocol_version_70001.hpp>
#include <bitcoin/network/protocols/protocol_version_70002.hpp>
Expand Down Expand Up @@ -168,7 +166,7 @@
#include <bitcoin/network/sessions/session_outbound.hpp>
#include <bitcoin/network/sessions/session_peer.hpp>
#include <bitcoin/network/sessions/session_seed.hpp>
#include <bitcoin/network/sessions/session_tcp.hpp>
#include <bitcoin/network/sessions/session_server.hpp>
#include <bitcoin/network/sessions/sessions.hpp>

#endif
2 changes: 1 addition & 1 deletion include/bitcoin/network/channels/channel_peer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class BCT_API channel_peer
{
public:
typedef std::shared_ptr<channel_peer> ptr;
////using options_t = settings_t::tcp_server;
using options_t = settings_t::tcp_server;
using interface = rpc::interface::peer::dispatch;
using dispatcher = rpc::dispatcher<interface>;

Expand Down
51 changes: 0 additions & 51 deletions include/bitcoin/network/channels/channel_tcp.hpp
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion include/bitcoin/network/channels/channels.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <bitcoin/network/channels/channel.hpp>
#include <bitcoin/network/channels/channel_http.hpp>
#include <bitcoin/network/channels/channel_peer.hpp>
#include <bitcoin/network/channels/channel_tcp.hpp>
#include <bitcoin/network/channels/channel_ws.hpp>

#endif
2 changes: 2 additions & 0 deletions include/bitcoin/network/protocols/protocol.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@ class BCT_API protocol
{
public:
typedef std::shared_ptr<protocol> ptr;
using channel_t = channel;
using options_t = channel_t::options_t;

DELETE_COPY_MOVE(protocol);

Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/network/protocols/protocol_http.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ class BCT_API protocol_http
const channel_http::ptr channel_;

// These are thread safe.
const session_tcp::ptr session_;
const session_server::ptr session_;
const uint16_t default_port_;
const options_t& options_;
};
Expand Down
Loading
Loading