diff options
| author | Andrew Chow <github@achow101.com> | 2023-10-26 14:21:40 -0400 |
|---|---|---|
| committer | Andrew Chow <github@achow101.com> | 2023-10-26 14:29:47 -0400 |
| commit | 7be62df80ff4d1339c039c6589232e50274b4b1a (patch) | |
| tree | aded303313ab98f3466f4af22e916090f5ea64af /src/netbase.h | |
| parent | 5572f98f058543eb87922b4a1bd6fccf91364aa9 (diff) | |
| parent | fb3e812277041f239b97b88689a5076796d75b9b (diff) | |
| download | bitcoin-7be62df80ff4d1339c039c6589232e50274b4b1a.tar.xz | |
Merge bitcoin/bitcoin#26078: p2p: return `CSubNet` in `LookupSubNet`
fb3e812277041f239b97b88689a5076796d75b9b p2p: return `CSubNet` in `LookupSubNet` (brunoerg)
Pull request description:
Analyzing the usage of `LookupSubNet`, noticed that most cases uses check if the subnet is valid by calling `subnet.IsValid()`, and the boolean returned by `LookupSubNet` hasn't been used so much, see:
https://github.com/bitcoin/bitcoin/blob/29d540b7ada890dd588c4825d40c27c5e6f20061/src/httpserver.cpp#L172-L174
https://github.com/bitcoin/bitcoin/blob/29d540b7ada890dd588c4825d40c27c5e6f20061/src/net_permissions.cpp#L114-L116
It makes sense to return `CSubNet` instead of `bool`.
ACKs for top commit:
achow101:
ACK fb3e812277041f239b97b88689a5076796d75b9b
vasild:
ACK fb3e812277041f239b97b88689a5076796d75b9b
theStack:
Code-review ACK fb3e812277041f239b97b88689a5076796d75b9b
stickies-v:
Concept ACK, but Approach ~0 (for now). Reviewed the code (fb3e812277041f239b97b88689a5076796d75b9b) and it all looks good to me.
Tree-SHA512: ba50d6bd5d58dfdbe1ce1faebd80dd8cf8c92ac53ef33519860b83399afffab482d5658cb6921b849d7a3df6d5cea911412850e08f3f4e27f7af510fbde4b254
Diffstat (limited to 'src/netbase.h')
| -rw-r--r-- | src/netbase.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/netbase.h b/src/netbase.h index 8b7da4109f..d51f63fd81 100644 --- a/src/netbase.h +++ b/src/netbase.h @@ -227,11 +227,9 @@ CService LookupNumeric(const std::string& name, uint16_t portDefault = 0, DNSLoo * @param[in] subnet_str A string representation of a subnet of the form * `network address [ "/", ( CIDR-style suffix | netmask ) ]` * e.g. "2001:db8::/32", "192.0.2.0/255.255.255.0" or "8.8.8.8". - * @param[out] subnet_out Internal subnet representation, if parsable/resolvable - * from `subnet_str`. - * @returns whether the operation succeeded or not. + * @returns a CSubNet object (that may or may not be valid). */ -bool LookupSubNet(const std::string& subnet_str, CSubNet& subnet_out); +CSubNet LookupSubNet(const std::string& subnet_str); /** * Create a TCP socket in the given address family. |