diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2021-07-07 01:06:27 +0000 |
|---|---|---|
| committer | brunoerg <brunoely.gc@gmail.com> | 2024-02-28 10:05:56 -0300 |
| commit | 66bc6e2d1749f43d7b314aa2784a06af78440170 (patch) | |
| tree | e7d3a522f1cd8b01df80e2735ef5f70650a83210 /src/net.cpp | |
| parent | 8e06be347c5e14cbe75256eba170e0867f95f360 (diff) | |
| download | bitcoin-66bc6e2d1749f43d7b314aa2784a06af78440170.tar.xz | |
Accept "in" and "out" flags to -whitelist to allow whitelisting manual connections
Diffstat (limited to 'src/net.cpp')
| -rw-r--r-- | src/net.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/net.cpp b/src/net.cpp index 64f4620eff..c7b851d59a 100644 --- a/src/net.cpp +++ b/src/net.cpp @@ -519,6 +519,10 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo return nullptr; } + NetPermissionFlags permission_flags = NetPermissionFlags::None; + std::vector<NetWhitelistPermissions> whitelist_permissions = conn_type == ConnectionType::MANUAL ? vWhitelistedRangeOutgoing : std::vector<NetWhitelistPermissions>{}; + AddWhitelistPermissionFlags(permission_flags, addrConnect, whitelist_permissions); + // Add node NodeId id = GetNewNodeId(); uint64_t nonce = GetDeterministicRandomizer(RANDOMIZER_ID_LOCALHOSTNONCE).Write(id).Finalize(); @@ -535,6 +539,7 @@ CNode* CConnman::ConnectNode(CAddress addrConnect, const char *pszDest, bool fCo conn_type, /*inbound_onion=*/false, CNodeOptions{ + .permission_flags = permission_flags, .i2p_sam_session = std::move(i2p_transient_session), .recv_flood_size = nReceiveFloodSize, .use_v2transport = use_v2transport, @@ -1735,7 +1740,7 @@ void CConnman::CreateNodeFromAcceptedSocket(std::unique_ptr<Sock>&& sock, { int nInbound = 0; - AddWhitelistPermissionFlags(permission_flags, addr, vWhitelistedRange); + AddWhitelistPermissionFlags(permission_flags, addr, vWhitelistedRangeIncoming); { LOCK(m_nodes_mutex); |