Skip to content

backport: merge bitcoin#24531, #25500, #25814, #25962, #26888, #27264, #27257, #27324, #27374, #27467, #27411, partial bitcoin#25472 (networking backports: part 8) #6255

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
PastaPastaPasta merged 12 commits into from
Sep 16, 2024
Merged

backport: merge bitcoin#24531, #25500, #25814, #25962, #26888, #27264, #27257, #27324, #27374, #27467, #27411, partial bitcoin#25472 (networking backports: part 8) #6255

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
b50febc
merge bitcoin#24531: Use designated initializers
kwvg Mar 11, 2022
54bb3a4
merge bitcoin#25500: Move inbound eviction logic to its own translati…
kwvg May 26, 2022
6d49454
partial bitcoin#25472: Increase MS Visual Studio minimum version
kwvg Aug 30, 2024
79e67fd
merge bitcoin#25814: simplify GetLocalAddress()
kwvg Aug 10, 2022
d9e56f3
merge bitcoin#25962: Add CNodeOptions and increase constness
kwvg Aug 31, 2022
d3f5b38
merge bitcoin#26888: simplify the call to vProcessMsg.splice()
kwvg Jan 13, 2023
3465df2
merge bitcoin#27264: Improve diversification of new connections
kwvg Sep 14, 2021
9023dd2
merge bitcoin#27257: End friendship of CNode, CConnman and ConnmanTes…
kwvg Aug 31, 2024
ab11e0f
merge bitcoin#27324: bitcoin#27257 follow-ups
kwvg Sep 6, 2024
a52b3a3
merge bitcoin#27374: skip netgroup diversity of new connections for t…
kwvg Sep 13, 2024
1376289
merge bitcoin#27467: skip netgroup diversity follow-up
kwvg Sep 6, 2024
8320e0c
merge bitcoin#27411: Restrict self-advertisements with privacy networ…
kwvg Sep 13, 2024
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
Prev Previous commit
Next Next commit
merge bitcoin#27264: Improve diversification of new connections
  • Loading branch information
@kwvg
kwvg committed Sep 12, 2024
commit 3465df2689ea7b9fbdb67fc41afc90f705d20dde
17 changes: 9 additions & 8 deletions src/net.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2482,19 +2482,20 @@ void CConnman::ThreadOpenConnections(const std::vector<std::string> connect, CDe
if (pnode->IsBlockOnlyConn()) nOutboundBlockRelay++;
if (pnode->IsFullOutboundConn() && pnode->ConnectedThroughNetwork() == Network::NET_ONION) nOutboundOnionRelay++;

// Netgroups for inbound and manual peers are not excluded because our goal here
// is to not use multiple of our limited outbound slots on a single netgroup
// but inbound and manual peers do not use our outbound slots. Inbound peers
// also have the added issue that they could be attacker controlled and used
// to prevent us from connecting to particular hosts if we used them here.
// Make sure our persistent outbound slots belong to different netgroups.
switch (pnode->m_conn_type) {
// We currently don't take inbound connections into account. Since they are
// free to make, an attacker could make them to prevent us from connecting to
// certain peers.
case ConnectionType::INBOUND:
case ConnectionType::MANUAL:
// Short-lived outbound connections should not affect how we select outbound
// peers from addrman.
case ConnectionType::ADDR_FETCH:
case ConnectionType::FEELER:
break;
case ConnectionType::MANUAL:
case ConnectionType::OUTBOUND_FULL_RELAY:
case ConnectionType::BLOCK_RELAY:
case ConnectionType::ADDR_FETCH:
case ConnectionType::FEELER:
setConnected.insert(m_netgroupman.GetGroup(pnode->addr));
} // no default case, so the compiler can warn about missing cases
}
Expand Down