net: execute Discover() when bind=0.0.0.0 or :: is set

andremralves · andremralves · commit c1de11271532 · 2025-02-26T04:01:12.000-03:00
diff --git a/src/init.cpp b/src/init.cpp
@@ -1902,6 +1902,10 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
 
     const uint16_t default_bind_port_onion = default_bind_port + 1;
 
+    // If the user did not specify -bind= or -whitebind= then we bind
+    // on any address - 0.0.0.0 (IPv4) and :: (IPv6).
+    connOptions.bind_on_any = args.GetArgs("-bind").empty() && args.GetArgs("-whitebind").empty();
+
     const auto BadPortWarning = [](const char* prefix, uint16_t port) {
         return strprintf(_("%s request to listen on port %u. This port is considered \"bad\" and "
                            "thus it is unlikely that any peer will connect to it. See "
@@ -1916,6 +1920,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         if (index == std::string::npos) {
             bind_addr = Lookup(bind_arg, default_bind_port, /*fAllowLookup=*/false);
             if (bind_addr.has_value()) {
+                connOptions.bind_on_any |= bind_addr.value().IsBindAny();
                 connOptions.vBinds.push_back(bind_addr.value());
                 if (IsBadPort(bind_addr.value().GetPort())) {
                     InitWarning(BadPortWarning("-bind", bind_addr.value().GetPort()));
@@ -1928,6 +1933,7 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
                 const std::string truncated_bind_arg = bind_arg.substr(0, index);
                 bind_addr = Lookup(truncated_bind_arg, default_bind_port_onion, false);
                 if (bind_addr.has_value()) {
+                    connOptions.bind_on_any |= bind_addr.value().IsBindAny();
                     connOptions.onion_binds.push_back(bind_addr.value());
                     continue;
                 }
@@ -1943,10 +1949,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         connOptions.vWhiteBinds.push_back(whitebind);
     }
 
-    // If the user did not specify -bind= or -whitebind= then we bind
-    // on any address - 0.0.0.0 (IPv4) and :: (IPv6).
-    connOptions.bind_on_any = args.GetArgs("-bind").empty() && args.GetArgs("-whitebind").empty();
-
     // Emit a warning if a bad port is given to -port= but only if -bind and -whitebind are not
     // given, because if they are, then -port= is ignored.
     if (connOptions.bind_on_any && args.IsArgSet("-port")) {
@@ -1963,7 +1965,6 @@ bool AppInitMain(NodeContext& node, interfaces::BlockAndHeaderTipInfo* tip_info)
         onion_service_target = connOptions.vBinds.front();
     } else {
         onion_service_target = DefaultOnionServiceTarget(default_bind_port_onion);
-        connOptions.onion_binds.push_back(onion_service_target);
     }
 
     if (args.GetBoolArg("-listenonion", DEFAULT_LISTEN_ONION)) {
diff --git a/src/net.cpp b/src/net.cpp
@@ -146,8 +146,10 @@ uint16_t GetListenPort()
     // If -bind= is provided with ":port" part, use that (first one if multiple are provided).
     for (const std::string& bind_arg : gArgs.GetArgs("-bind")) {
         constexpr uint16_t dummy_port = 0;
+        // maybe bind_arg has "=onion"
+        const std::string truncated_bind_arg = bind_arg.substr(0, bind_arg.rfind('='));
 
-        const std::optional<CService> bind_addr{Lookup(bind_arg, dummy_port, /*fAllowLookup=*/false)};
+        const std::optional<CService> bind_addr{Lookup(truncated_bind_arg, dummy_port, /*fAllowLookup=*/false)};
         if (bind_addr.has_value() && bind_addr->GetPort() != dummy_port) return bind_addr->GetPort();
     }
 
@@ -3273,7 +3275,7 @@ bool CConnman::InitBinds(const Options& options)
             return false;
         }
     }
-    if (options.bind_on_any) {
+    if (options.bind_on_any && options.vBinds.empty() && options.onion_binds.empty()) {
         // Don't consider errors to bind on IPv6 "::" fatal because the host OS
         // may not have IPv6 support and the user did not explicitly ask us to
         // bind on that.
@@ -3286,6 +3288,14 @@ bool CConnman::InitBinds(const Options& options)
         if (!Bind(ipv4_any, BF_REPORT_ERROR, NetPermissionFlags::None)) {
             return false;
         }
+
+        struct in_addr onion_service_target;
+        onion_service_target.s_addr = htonl(INADDR_LOOPBACK);
+        const uint16_t onion_port = GetListenPort() + 1;
+        const CService onion_addr = {onion_service_target, onion_port}; // 127.0.0.1
+        if (!Bind(onion_addr, BF_REPORT_ERROR | BF_DONT_ADVERTISE, NetPermissionFlags::None)) {
+            return false;
+        }
     }
     return true;
 }

Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,10 @@ uint16_t GetListenPort()`
`146`	`146`	`// If -bind= is provided with ":port" part, use that (first one if multiple are provided).`
`147`	`147`	`for (const std::string& bind_arg : gArgs.GetArgs("-bind")) {`
`148`	`148`	`constexpr uint16_t dummy_port = 0;`
	`149`	`+ // maybe bind_arg has "=onion"`
	`150`	`+ const std::string truncated_bind_arg = bind_arg.substr(0, bind_arg.rfind('='));`
`149`	`151`
`150`		`- const std::optional<CService> bind_addr{Lookup(bind_arg, dummy_port, /fAllowLookup=/false)};`
	`152`	`+ const std::optional<CService> bind_addr{Lookup(truncated_bind_arg, dummy_port, /fAllowLookup=/false)};`
`151`	`153`	`if (bind_addr.has_value() && bind_addr->GetPort() != dummy_port) return bind_addr->GetPort();`
`152`	`154`	`}`
`153`	`155`
`@@ -3273,7 +3275,7 @@ bool CConnman::InitBinds(const Options& options)`
`3273`	`3275`	`return false;`
`3274`	`3276`	`}`
`3275`	`3277`	`}`
`3276`		`- if (options.bind_on_any) {`
	`3278`	`+ if (options.bind_on_any && options.vBinds.empty() && options.onion_binds.empty()) {`
`3277`	`3279`	`// Don't consider errors to bind on IPv6 "::" fatal because the host OS`
`3278`	`3280`	`// may not have IPv6 support and the user did not explicitly ask us to`
`3279`	`3281`	`// bind on that.`
`@@ -3286,6 +3288,14 @@ bool CConnman::InitBinds(const Options& options)`
`3286`	`3288`	`if (!Bind(ipv4_any, BF_REPORT_ERROR, NetPermissionFlags::None)) {`
`3287`	`3289`	`return false;`
`3288`	`3290`	`}`
	`3291`	`+`
	`3292`	`+ struct in_addr onion_service_target;`
	`3293`	`+ onion_service_target.s_addr = htonl(INADDR_LOOPBACK);`
	`3294`	`+ const uint16_t onion_port = GetListenPort() + 1;`
	`3295`	`+ const CService onion_addr = {onion_service_target, onion_port}; // 127.0.0.1`
	`3296`	`+ if (!Bind(onion_addr, BF_REPORT_ERROR \| BF_DONT_ADVERTISE, NetPermissionFlags::None)) {`
	`3297`	`+ return false;`
	`3298`	`+ }`
`3289`	`3299`	`}`
`3290`	`3300`	`return true;`
`3291`	`3301`	`}`