Skip to content

Commit 1a5c912

Browse files
evoskuilevoskuil
authored
Merge pull request #657 from evoskuil/master
Remove channel_tcp and protocol_tcp, rename session_tcp to session_server.
2 parents 497e010 + 0c4f2cd commit 1a5c912

File tree

23 files changed

+41
-253
lines changed

23 files changed

+41
-253
lines changed

‎Makefile.am‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ src_libbitcoin_network_la_SOURCES = \
4545
src/channels/channel.cpp \
4646
src/channels/channel_http.cpp \
4747
src/channels/channel_peer.cpp \
48-
src/channels/channel_tcp.cpp \
4948
src/channels/channel_ws.cpp \
5049
src/config/address.cpp \
5150
src/config/authority.cpp \
@@ -127,7 +126,7 @@ src_libbitcoin_network_la_SOURCES = \
127126
src/sessions/session_outbound.cpp \
128127
src/sessions/session_peer.cpp \
129128
src/sessions/session_seed.cpp \
130-
src/sessions/session_tcp.cpp
129+
src/sessions/session_server.cpp
131130

132131
# local: test/libbitcoin-network-test
133132
#------------------------------------------------------------------------------
@@ -161,7 +160,6 @@ test_libbitcoin_network_test_SOURCES = \
161160
test/channels/channel.cpp \
162161
test/channels/channel_http.cpp \
163162
test/channels/channel_peer.cpp \
164-
test/channels/channel_tcp.cpp \
165163
test/channels/channel_ws.cpp \
166164
test/config/address.cpp \
167165
test/config/authority.cpp \
@@ -239,7 +237,6 @@ test_libbitcoin_network_test_SOURCES = \
239237
test/protocols/protocol_ping_60001.cpp \
240238
test/protocols/protocol_reject_70002.cpp \
241239
test/protocols/protocol_seed_209.cpp \
242-
test/protocols/protocol_tcp.cpp \
243240
test/protocols/protocol_version_106.cpp \
244241
test/protocols/protocol_version_70001.cpp \
245242
test/protocols/protocol_version_70002.cpp \
@@ -255,7 +252,7 @@ test_libbitcoin_network_test_SOURCES = \
255252
test/sessions/session_manual.cpp \
256253
test/sessions/session_outbound.cpp \
257254
test/sessions/session_seed.cpp \
258-
test/sessions/session_tcp.cpp
255+
test/sessions/session_server.cpp
259256

260257
endif WITH_TESTS
261258

@@ -303,7 +300,6 @@ include_bitcoin_network_channels_HEADERS = \
303300
include/bitcoin/network/channels/channel.hpp \
304301
include/bitcoin/network/channels/channel_http.hpp \
305302
include/bitcoin/network/channels/channel_peer.hpp \
306-
include/bitcoin/network/channels/channel_tcp.hpp \
307303
include/bitcoin/network/channels/channel_ws.hpp \
308304
include/bitcoin/network/channels/channels.hpp
309305

@@ -458,7 +454,6 @@ include_bitcoin_network_protocols_HEADERS = \
458454
include/bitcoin/network/protocols/protocol_ping_60001.hpp \
459455
include/bitcoin/network/protocols/protocol_reject_70002.hpp \
460456
include/bitcoin/network/protocols/protocol_seed_209.hpp \
461-
include/bitcoin/network/protocols/protocol_tcp.hpp \
462457
include/bitcoin/network/protocols/protocol_version_106.hpp \
463458
include/bitcoin/network/protocols/protocol_version_70001.hpp \
464459
include/bitcoin/network/protocols/protocol_version_70002.hpp \
@@ -502,6 +497,6 @@ include_bitcoin_network_sessions_HEADERS = \
502497
include/bitcoin/network/sessions/session_outbound.hpp \
503498
include/bitcoin/network/sessions/session_peer.hpp \
504499
include/bitcoin/network/sessions/session_seed.hpp \
505-
include/bitcoin/network/sessions/session_tcp.hpp \
500+
include/bitcoin/network/sessions/session_server.hpp \
506501
include/bitcoin/network/sessions/sessions.hpp
507502

‎builds/cmake/CMakeLists.txt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@ add_library( ${CANONICAL_LIB_NAME}
227227
"../../src/channels/channel.cpp"
228228
"../../src/channels/channel_http.cpp"
229229
"../../src/channels/channel_peer.cpp"
230-
"../../src/channels/channel_tcp.cpp"
231230
"../../src/channels/channel_ws.cpp"
232231
"../../src/config/address.cpp"
233232
"../../src/config/authority.cpp"
@@ -309,7 +308,7 @@ add_library( ${CANONICAL_LIB_NAME}
309308
"../../src/sessions/session_outbound.cpp"
310309
"../../src/sessions/session_peer.cpp"
311310
"../../src/sessions/session_seed.cpp"
312-
"../../src/sessions/session_tcp.cpp" )
311+
"../../src/sessions/session_server.cpp" )
313312

314313
# ${CANONICAL_LIB_NAME} project specific include directory normalization for build.
315314
#------------------------------------------------------------------------------
@@ -367,7 +366,6 @@ if (with-tests)
367366
"../../test/channels/channel.cpp"
368367
"../../test/channels/channel_http.cpp"
369368
"../../test/channels/channel_peer.cpp"
370-
"../../test/channels/channel_tcp.cpp"
371369
"../../test/channels/channel_ws.cpp"
372370
"../../test/config/address.cpp"
373371
"../../test/config/authority.cpp"
@@ -445,7 +443,6 @@ if (with-tests)
445443
"../../test/protocols/protocol_ping_60001.cpp"
446444
"../../test/protocols/protocol_reject_70002.cpp"
447445
"../../test/protocols/protocol_seed_209.cpp"
448-
"../../test/protocols/protocol_tcp.cpp"
449446
"../../test/protocols/protocol_version_106.cpp"
450447
"../../test/protocols/protocol_version_70001.cpp"
451448
"../../test/protocols/protocol_version_70002.cpp"
@@ -461,7 +458,7 @@ if (with-tests)
461458
"../../test/sessions/session_manual.cpp"
462459
"../../test/sessions/session_outbound.cpp"
463460
"../../test/sessions/session_seed.cpp"
464-
"../../test/sessions/session_tcp.cpp" )
461+
"../../test/sessions/session_server.cpp" )
465462

466463
add_test( NAME libbitcoin-network-test COMMAND libbitcoin-network-test
467464
--run_test=*

‎builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,6 @@
133133
<ClCompile Include="..\..\..\..\test\channels\channel.cpp" />
134134
<ClCompile Include="..\..\..\..\test\channels\channel_http.cpp" />
135135
<ClCompile Include="..\..\..\..\test\channels\channel_peer.cpp" />
136-
<ClCompile Include="..\..\..\..\test\channels\channel_tcp.cpp" />
137136
<ClCompile Include="..\..\..\..\test\channels\channel_ws.cpp" />
138137
<ClCompile Include="..\..\..\..\test\config\address.cpp">
139138
<ObjectFileName>$(IntDir)test_config_address.obj</ObjectFileName>
@@ -233,7 +232,6 @@
233232
<ClCompile Include="..\..\..\..\test\protocols\protocol_ping_60001.cpp" />
234233
<ClCompile Include="..\..\..\..\test\protocols\protocol_reject_70002.cpp" />
235234
<ClCompile Include="..\..\..\..\test\protocols\protocol_seed_209.cpp" />
236-
<ClCompile Include="..\..\..\..\test\protocols\protocol_tcp.cpp" />
237235
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_106.cpp" />
238236
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_70001.cpp" />
239237
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_70002.cpp" />
@@ -251,7 +249,7 @@
251249
<ClCompile Include="..\..\..\..\test\sessions\session_manual.cpp" />
252250
<ClCompile Include="..\..\..\..\test\sessions\session_outbound.cpp" />
253251
<ClCompile Include="..\..\..\..\test\sessions\session_seed.cpp" />
254-
<ClCompile Include="..\..\..\..\test\sessions\session_tcp.cpp" />
252+
<ClCompile Include="..\..\..\..\test\sessions\session_server.cpp" />
255253
<ClCompile Include="..\..\..\..\test\settings.cpp" />
256254
<ClCompile Include="..\..\..\..\test\test.cpp" />
257255
</ItemGroup>

‎builds/msvc/vs2022/libbitcoin-network-test/libbitcoin-network-test.vcxproj.filters‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -108,9 +108,6 @@
108108
<ClCompile Include="..\..\..\..\test\channels\channel_peer.cpp">
109109
<Filter>src\channels</Filter>
110110
</ClCompile>
111-
<ClCompile Include="..\..\..\..\test\channels\channel_tcp.cpp">
112-
<Filter>src\channels</Filter>
113-
</ClCompile>
114111
<ClCompile Include="..\..\..\..\test\channels\channel_ws.cpp">
115112
<Filter>src\channels</Filter>
116113
</ClCompile>
@@ -354,9 +351,6 @@
354351
<ClCompile Include="..\..\..\..\test\protocols\protocol_seed_209.cpp">
355352
<Filter>src\protocols</Filter>
356353
</ClCompile>
357-
<ClCompile Include="..\..\..\..\test\protocols\protocol_tcp.cpp">
358-
<Filter>src\protocols</Filter>
359-
</ClCompile>
360354
<ClCompile Include="..\..\..\..\test\protocols\protocol_version_106.cpp">
361355
<Filter>src\protocols</Filter>
362356
</ClCompile>
@@ -402,7 +396,7 @@
402396
<ClCompile Include="..\..\..\..\test\sessions\session_seed.cpp">
403397
<Filter>src\sessions</Filter>
404398
</ClCompile>
405-
<ClCompile Include="..\..\..\..\test\sessions\session_tcp.cpp">
399+
<ClCompile Include="..\..\..\..\test\sessions\session_server.cpp">
406400
<Filter>src\sessions</Filter>
407401
</ClCompile>
408402
<ClCompile Include="..\..\..\..\test\settings.cpp">

‎builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,6 @@
127127
<ClCompile Include="..\..\..\..\src\channels\channel.cpp" />
128128
<ClCompile Include="..\..\..\..\src\channels\channel_http.cpp" />
129129
<ClCompile Include="..\..\..\..\src\channels\channel_peer.cpp" />
130-
<ClCompile Include="..\..\..\..\src\channels\channel_tcp.cpp" />
131130
<ClCompile Include="..\..\..\..\src\channels\channel_ws.cpp" />
132131
<ClCompile Include="..\..\..\..\src\config\address.cpp">
133132
<ObjectFileName>$(IntDir)src_config_address.obj</ObjectFileName>
@@ -220,7 +219,7 @@
220219
<ClCompile Include="..\..\..\..\src\sessions\session_outbound.cpp" />
221220
<ClCompile Include="..\..\..\..\src\sessions\session_peer.cpp" />
222221
<ClCompile Include="..\..\..\..\src\sessions\session_seed.cpp" />
223-
<ClCompile Include="..\..\..\..\src\sessions\session_tcp.cpp" />
222+
<ClCompile Include="..\..\..\..\src\sessions\session_server.cpp" />
224223
<ClCompile Include="..\..\..\..\src\settings.cpp" />
225224
</ItemGroup>
226225
<ItemGroup>
@@ -246,7 +245,6 @@
246245
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel.hpp" />
247246
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_http.hpp" />
248247
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_peer.hpp" />
249-
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_tcp.hpp" />
250248
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_ws.hpp" />
251249
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channels.hpp" />
252250
<ClInclude Include="..\..\..\..\include\bitcoin\network\config\address.hpp" />
@@ -344,7 +342,6 @@
344342
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_ping_60001.hpp" />
345343
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_reject_70002.hpp" />
346344
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_seed_209.hpp" />
347-
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_tcp.hpp" />
348345
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_106.hpp" />
349346
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_70001.hpp" />
350347
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_70002.hpp" />
@@ -376,7 +373,7 @@
376373
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_outbound.hpp" />
377374
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_peer.hpp" />
378375
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_seed.hpp" />
379-
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_tcp.hpp" />
376+
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_server.hpp" />
380377
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\sessions.hpp" />
381378
<ClInclude Include="..\..\..\..\include\bitcoin\network\settings.hpp" />
382379
<ClInclude Include="..\..\..\..\include\bitcoin\network\version.hpp" />

‎builds/msvc/vs2022/libbitcoin-network/libbitcoin-network.vcxproj.filters‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -165,9 +165,6 @@
165165
<ClCompile Include="..\..\..\..\src\channels\channel_peer.cpp">
166166
<Filter>src\channels</Filter>
167167
</ClCompile>
168-
<ClCompile Include="..\..\..\..\src\channels\channel_tcp.cpp">
169-
<Filter>src\channels</Filter>
170-
</ClCompile>
171168
<ClCompile Include="..\..\..\..\src\channels\channel_ws.cpp">
172169
<Filter>src\channels</Filter>
173170
</ClCompile>
@@ -420,7 +417,7 @@
420417
<ClCompile Include="..\..\..\..\src\sessions\session_seed.cpp">
421418
<Filter>src\sessions</Filter>
422419
</ClCompile>
423-
<ClCompile Include="..\..\..\..\src\sessions\session_tcp.cpp">
420+
<ClCompile Include="..\..\..\..\src\sessions\session_server.cpp">
424421
<Filter>src\sessions</Filter>
425422
</ClCompile>
426423
<ClCompile Include="..\..\..\..\src\settings.cpp">
@@ -494,9 +491,6 @@
494491
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_peer.hpp">
495492
<Filter>include\bitcoin\network\channels</Filter>
496493
</ClInclude>
497-
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_tcp.hpp">
498-
<Filter>include\bitcoin\network\channels</Filter>
499-
</ClInclude>
500494
<ClInclude Include="..\..\..\..\include\bitcoin\network\channels\channel_ws.hpp">
501495
<Filter>include\bitcoin\network\channels</Filter>
502496
</ClInclude>
@@ -788,9 +782,6 @@
788782
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_seed_209.hpp">
789783
<Filter>include\bitcoin\network\protocols</Filter>
790784
</ClInclude>
791-
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_tcp.hpp">
792-
<Filter>include\bitcoin\network\protocols</Filter>
793-
</ClInclude>
794785
<ClInclude Include="..\..\..\..\include\bitcoin\network\protocols\protocol_version_106.hpp">
795786
<Filter>include\bitcoin\network\protocols</Filter>
796787
</ClInclude>
@@ -884,7 +875,7 @@
884875
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_seed.hpp">
885876
<Filter>include\bitcoin\network\sessions</Filter>
886877
</ClInclude>
887-
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_tcp.hpp">
878+
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\session_server.hpp">
888879
<Filter>include\bitcoin\network\sessions</Filter>
889880
</ClInclude>
890881
<ClInclude Include="..\..\..\..\include\bitcoin\network\sessions\sessions.hpp">

‎include/bitcoin/network.hpp‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@
4242
#include <bitcoin/network/channels/channel.hpp>
4343
#include <bitcoin/network/channels/channel_http.hpp>
4444
#include <bitcoin/network/channels/channel_peer.hpp>
45-
#include <bitcoin/network/channels/channel_tcp.hpp>
4645
#include <bitcoin/network/channels/channel_ws.hpp>
4746
#include <bitcoin/network/channels/channels.hpp>
4847
#include <bitcoin/network/config/address.hpp>
@@ -136,7 +135,6 @@
136135
#include <bitcoin/network/protocols/protocol_ping_60001.hpp>
137136
#include <bitcoin/network/protocols/protocol_reject_70002.hpp>
138137
#include <bitcoin/network/protocols/protocol_seed_209.hpp>
139-
#include <bitcoin/network/protocols/protocol_tcp.hpp>
140138
#include <bitcoin/network/protocols/protocol_version_106.hpp>
141139
#include <bitcoin/network/protocols/protocol_version_70001.hpp>
142140
#include <bitcoin/network/protocols/protocol_version_70002.hpp>
@@ -168,7 +166,7 @@
168166
#include <bitcoin/network/sessions/session_outbound.hpp>
169167
#include <bitcoin/network/sessions/session_peer.hpp>
170168
#include <bitcoin/network/sessions/session_seed.hpp>
171-
#include <bitcoin/network/sessions/session_tcp.hpp>
169+
#include <bitcoin/network/sessions/session_server.hpp>
172170
#include <bitcoin/network/sessions/sessions.hpp>
173171

174172
#endif

‎include/bitcoin/network/channels/channel_peer.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ class BCT_API channel_peer
3838
{
3939
public:
4040
typedef std::shared_ptr<channel_peer> ptr;
41-
////using options_t = settings_t::tcp_server;
41+
using options_t = settings_t::tcp_server;
4242
using interface = rpc::interface::peer::dispatch;
4343
using dispatcher = rpc::dispatcher<interface>;
4444

‎include/bitcoin/network/channels/channel_tcp.hpp‎

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎include/bitcoin/network/channels/channels.hpp‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <bitcoin/network/channels/channel.hpp>
2323
#include <bitcoin/network/channels/channel_http.hpp>
2424
#include <bitcoin/network/channels/channel_peer.hpp>
25-
#include <bitcoin/network/channels/channel_tcp.hpp>
2625
#include <bitcoin/network/channels/channel_ws.hpp>
2726

2827
#endif

0 commit comments

Comments
 (0)