From 478fe51ead930e2a18f3a9297f8b9be4822378ec Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Tue, 22 Nov 2022 11:44:37 +0100 Subject: [PATCH] Merge bitcoin/bitcoin#26100: doc: clarify that NetPermissionFlags::Implicit is only about whitelists f362920c2ca85853b24c1cbc1d596dd1ff2fd556 doc: clarify that NetPermissionFlags::Implicit is only about whitelists (Vasil Dimov) Pull request description: `NetPermissionFlags::Implicit` applies just to connections from `-whitebind` or `-whitelist`, clarify that in its comment. ACKs for top commit: Zero-1729: crACK f362920c2ca85853b24c1cbc1d596dd1ff2fd556 aureleoules: ACK f362920c2ca85853b24c1cbc1d596dd1ff2fd556 hernanmarino: re ACK f362920c2ca85853b24c1cbc1d596dd1ff2fd556 Tree-SHA512: 03f6f8be221c6819bdd0b5b56b69b4e3a6dd25e5ca5a247eeb1261113144b9b74cf064a0b7815317782a0a18365dd3dab97963bd238e9b231dbe7e1cf0395683 --- src/net_permissions.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/net_permissions.h b/src/net_permissions.h index 0a29cc2216..61af86ec89 100644 --- a/src/net_permissions.h +++ b/src/net_permissions.h @@ -34,7 +34,8 @@ enum class NetPermissionFlags : uint32_t { // unlimited amounts of addrs. Addr = (1U << 7), - // True if the user did not specifically set fine grained permissions + // True if the user did not specifically set fine-grained permissions with + // the -whitebind or -whitelist configuration options. Implicit = (1U << 31), All = BloomFilter | ForceRelay | Relay | NoBan | Mempool | Download | Addr, };