diff options
author | MarcoFalke <falke.marco@gmail.com> | 2021-08-05 09:29:34 +0200 |
---|---|---|
committer | MarcoFalke <falke.marco@gmail.com> | 2021-08-05 09:29:54 +0200 |
commit | dd981b5e840c0f1b29e8adaaea285230efd0aba6 (patch) | |
tree | 0923dde66d782bd4771503f31e1cbfa050ebfb41 /src/net_processing.cpp | |
parent | e9472e6828ab862aa45f534f87d28a78ec7796d1 (diff) | |
parent | 9778b0fec13c047a4c7f3ae425d044da26eadc81 (diff) |
Merge bitcoin/bitcoin#22618: [p2p] Small follow-ups to 21528
9778b0fec13c047a4c7f3ae425d044da26eadc81 [net_processing] Provide debug error if code assumptions change. (Amiti Uttarwar)
aa79c912608fdc77c69dd43653aa87f1f34e01dd [docs] Add release notes for #21528 (Amiti Uttarwar)
Pull request description:
Adds a release note & addresses [this](https://github.com/bitcoin/bitcoin/pull/21528#discussion_r680963101) review comment to make expectations more explicit.
ACKs for top commit:
Zero-1729:
re-ACK 9778b0fec13c047a4c7f3ae425d044da26eadc81
jonatack:
ACK 9778b0fec13c047a4c7f3ae425d044da26eadc81
Tree-SHA512: 9507df5f2746d05c6df8c86b7a19364610ebfafc81af7650be7e68d7536a0685cce9fd2e5f287ef92b6245c584f8875b24a958109ba5bd8acf3c8fc9fd19eef2
Diffstat (limited to 'src/net_processing.cpp')
-rw-r--r-- | src/net_processing.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/net_processing.cpp b/src/net_processing.cpp index 9da2fe5d6f..8243ef0f55 100644 --- a/src/net_processing.cpp +++ b/src/net_processing.cpp @@ -3749,7 +3749,9 @@ void PeerManagerImpl::ProcessMessage(CNode& pfrom, const std::string& msg_type, return; } - SetupAddressRelay(pfrom, *peer); + // Since this must be an inbound connection, SetupAddressRelay will + // never fail. + Assume(SetupAddressRelay(pfrom, *peer)); // Only send one GetAddr response per connection to reduce resource waste // and discourage addr stamping of INV announcements. |