Only relay IPv4, IPv6, Tor addresses

sipa · furszy · commit f44be9471bd2 · 2021-08-10T20:14:53.000-03:00
diff --git a/src/net_processing.cpp b/src/net_processing.cpp
@@ -822,6 +822,7 @@ static void RelayTransaction(const CTransaction& tx, CConnman* connman)
 
 static void RelayAddress(const CAddress& addr, bool fReachable, CConnman* connman)
 {
+    if (!fReachable && !addr.IsRelayable()) return;
     int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)
 
     // Relay to a limited number of other nodes
diff --git a/src/netaddress.h b/src/netaddress.h
@@ -211,6 +211,14 @@ class CNetAddr
     friend bool operator!=(const CNetAddr& a, const CNetAddr& b);
     friend bool operator<(const CNetAddr& a, const CNetAddr& b);
 
+    /**
+     * Whether this address should be relayed to other peers even if we can't reach it ourselves.
+     */
+    bool IsRelayable() const
+    {
+        return IsIPv4() || IsIPv6() || IsTor();
+    }
+
     /**
      * Serialize to a stream.
      */

Original file line number	Diff line number	Diff line change
`@@ -822,6 +822,7 @@ static void RelayTransaction(const CTransaction& tx, CConnman* connman)`
`822`	`822`
`823`	`823`	`static void RelayAddress(const CAddress& addr, bool fReachable, CConnman* connman)`
`824`	`824`	`{`
	`825`	`+ if (!fReachable && !addr.IsRelayable()) return;`
`825`	`826`	`int nRelayNodes = fReachable ? 2 : 1; // limited relaying of addresses outside our network(s)`
`826`	`827`
`827`	`828`	`// Relay to a limited number of other nodes`