Skip to content

Commit 8b8fbc5

Browse files
committed
merge bitcoin#22618: Small follow-ups to 21528
1 parent 18fe765 commit 8b8fbc5

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

doc/release-notes-5978.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,10 @@ RPC changes
66

77
- `getnodeaddresses` now also accepts a "network" argument (ipv4, ipv6, onion,
88
or i2p) to return only addresses of the specified network.
9+
10+
P2P and network changes
11+
-----------------------
12+
13+
- A dashd node will no longer rumour addresses to inbound peers by default.
14+
They will become eligible for address gossip after sending an ADDR, ADDRV2,
15+
or GETADDR message.

src/net_processing.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4397,7 +4397,9 @@ void PeerManagerImpl::ProcessMessage(
43974397
return;
43984398
}
43994399

4400-
SetupAddressRelay(pfrom, *peer);
4400+
// Since this must be an inbound connection, SetupAddressRelay will
4401+
// never fail.
4402+
Assume(SetupAddressRelay(pfrom, *peer));
44014403

44024404
// Only send one GetAddr response per connection to reduce resource waste
44034405
// and discourage addr stamping of INV announcements.

test/functional/p2p_addr_relay.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ def relay_tests(self):
175175
# of the outbound peer which is often sent before the GETADDR response.
176176
assert_equal(inbound_peer.num_ipv4_received, 0)
177177

178-
# Send an empty ADDR message to intialize address relay on this connection.
178+
# Send an empty ADDR message to initialize address relay on this connection.
179179
inbound_peer.send_and_ping(msg_addr())
180180

181181
self.log.info('Check that subsequent addr messages sent from an outbound peer are relayed')

0 commit comments

Comments
 (0)