Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-05-30 05:52:33 +02:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge #20138: net: Assume that SetCommonVersion is called at most once per peer

Browse Source 
fa0f415709 net: Assume that SetCommonVersion is called at most once per peer (MarcoFalke)

Pull request description:

  This restores the check removed in https://github.com/bitcoin/bitcoin/pull/17785#discussion_r503224381

  Instead of using `error`, which was used previously, it uses a newly introduced `Assume()`. `error` had several issues:
  * It logs unconditionally to the debug log
  * It doesn't abort the program when the error is hit in tests

ACKs for top commit:
  practicalswift:
    cr ACK fa0f415709: patch looks correct
  jnewbery:
    utACK fa0f415709

Tree-SHA512: cd7424a9485775e8c7093b725f8f52a90d47485185e79bac80f7810e450d0b3fda608d8805e9239094929f7bad2dca3fe772fb78ae606c2399d15405521e136b
This commit is contained in:
MarcoFalke 2020-12-07 12:48:38 +01:00
commit 00f4dcd552
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
2 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/net.h
View File

@ -24,14 +24,15 @@
#include <sync.h> #include <sync.h>
#include <threadinterrupt.h> #include <threadinterrupt.h>
#include <uint256.h> #include <uint256.h>
#include <util/check.h>
#include <atomic> #include <atomic>
#include <condition_variable>
#include <cstdint> #include <cstdint>
#include <deque> #include <deque>
#include <map> #include <map>
#include <thread>
#include <memory> #include <memory>
#include <condition_variable> #include <thread>
class CScheduler; class CScheduler;
class CNode; class CNode;
@ -1131,6 +1132,7 @@ public:
void SetCommonVersion(int greatest_common_version) void SetCommonVersion(int greatest_common_version)
{ {
Assume(m_greatest_common_version == INIT_PROTO_VERSION);
m_greatest_common_version = greatest_common_version; m_greatest_common_version = greatest_common_version;
} }
int GetCommonVersion() const int GetCommonVersion() const

23
src/test/fuzz/net.cpp
View File

@ -48,8 +48,9 @@ void test_one_input(const std::vector<uint8_t>& buffer)
fuzzed_data_provider.ConsumeRandomLengthString(32), fuzzed_data_provider.ConsumeRandomLengthString(32),
fuzzed_data_provider.PickValueInArray({ConnectionType::INBOUND, ConnectionType::OUTBOUND_FULL_RELAY, ConnectionType::MANUAL, ConnectionType::FEELER, ConnectionType::BLOCK_RELAY, ConnectionType::ADDR_FETCH}), fuzzed_data_provider.PickValueInArray({ConnectionType::INBOUND, ConnectionType::OUTBOUND_FULL_RELAY, ConnectionType::MANUAL, ConnectionType::FEELER, ConnectionType::BLOCK_RELAY, ConnectionType::ADDR_FETCH}),
fuzzed_data_provider.ConsumeBool()}; fuzzed_data_provider.ConsumeBool()};
node.SetCommonVersion(fuzzed_data_provider.ConsumeIntegral<int>());
while (fuzzed_data_provider.ConsumeBool()) { while (fuzzed_data_provider.ConsumeBool()) {
switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 11)) { switch (fuzzed_data_provider.ConsumeIntegralInRange<int>(0, 10)) {
case 0: { case 0: {
node.CloseSocketDisconnect(); node.CloseSocketDisconnect();
break; break;
@ -59,10 +60,6 @@ void test_one_input(const std::vector<uint8_t>& buffer)
break; break;
} }
case 2: { case 2: {
node.SetCommonVersion(fuzzed_data_provider.ConsumeIntegral<int>());
break;
}
case 3: {
const std::vector<bool> asmap = ConsumeRandomLengthBitVector(fuzzed_data_provider); const std::vector<bool> asmap = ConsumeRandomLengthBitVector(fuzzed_data_provider);
if (!SanityCheckASMap(asmap)) { if (!SanityCheckASMap(asmap)) {
break; break;
@ -71,18 +68,18 @@ void test_one_input(const std::vector<uint8_t>& buffer)
node.copyStats(stats, asmap); node.copyStats(stats, asmap);
break; break;
} }
case 4: { case 3: {
const CNode* add_ref_node = node.AddRef(); const CNode* add_ref_node = node.AddRef();
assert(add_ref_node == &node); assert(add_ref_node == &node);
break; break;
} }
case 5: { case 4: {
if (node.GetRefCount() > 0) { if (node.GetRefCount() > 0) {
node.Release(); node.Release();
} }
break; break;
} }
case 6: { case 5: {
if (node.m_addr_known == nullptr) { if (node.m_addr_known == nullptr) {
break; break;
} }
@ -93,7 +90,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
node.AddAddressKnown(*addr_opt); node.AddAddressKnown(*addr_opt);
break; break;
} }
case 7: { case 6: {
if (node.m_addr_known == nullptr) { if (node.m_addr_known == nullptr) {
break; break;
} }
@ -105,7 +102,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
node.PushAddress(*addr_opt, fast_random_context); node.PushAddress(*addr_opt, fast_random_context);
break; break;
} }
case 8: { case 7: {
const std::optional<CInv> inv_opt = ConsumeDeserializable<CInv>(fuzzed_data_provider); const std::optional<CInv> inv_opt = ConsumeDeserializable<CInv>(fuzzed_data_provider);
if (!inv_opt) { if (!inv_opt) {
break; break;
@ -113,11 +110,11 @@ void test_one_input(const std::vector<uint8_t>& buffer)
node.AddKnownTx(inv_opt->hash); node.AddKnownTx(inv_opt->hash);
break; break;
} }
case 9: { case 8: {
node.PushTxInventory(ConsumeUInt256(fuzzed_data_provider)); node.PushTxInventory(ConsumeUInt256(fuzzed_data_provider));
break; break;
} }
case 10: { case 9: {
const std::optional<CService> service_opt = ConsumeDeserializable<CService>(fuzzed_data_provider); const std::optional<CService> service_opt = ConsumeDeserializable<CService>(fuzzed_data_provider);
if (!service_opt) { if (!service_opt) {
break; break;
@ -125,7 +122,7 @@ void test_one_input(const std::vector<uint8_t>& buffer)
node.SetAddrLocal(*service_opt); node.SetAddrLocal(*service_opt);
break; break;
} }
case 11: { case 10: {
const std::vector<uint8_t> b = ConsumeRandomLengthByteVector(fuzzed_data_provider); const std::vector<uint8_t> b = ConsumeRandomLengthByteVector(fuzzed_data_provider);
bool complete; bool complete;
node.ReceiveMsgBytes(b, complete); node.ReceiveMsgBytes(b, complete);