From 56f9dba015c592b8925795012e3061a710070a27 Mon Sep 17 00:00:00 2001
From: Pieter Wuille <pieter@wuille.net>
Date: Sun, 11 Oct 2020 00:13:10 -0700
Subject: [PATCH] Only relay IPv4, IPv6, Tor addresses

---
 src/net_processing.cpp | 1 +
 src/netaddress.h       | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/src/net_processing.cpp b/src/net_processing.cpp
index 951b8a1811..9ad3f5d6f4 100644
--- a/src/net_processing.cpp
+++ b/src/net_processing.cpp
@@ -1528,6 +1528,7 @@ void RelayTransaction(const uint256& txid, const uint256& wtxid, const CConnman&
 
 static void RelayAddress(const CAddress& addr, bool fReachable, const CConnman& connman)
 {
+    if (!fReachable && !addr.IsRelayable()) return;
 
     // Relay to a limited number of other nodes
     // Use deterministic randomness to send to the same nodes for 24 hours
diff --git a/src/netaddress.h b/src/netaddress.h
index 3bcf6d35ca..023e83e73d 100644
--- a/src/netaddress.h
+++ b/src/netaddress.h
@@ -211,6 +211,14 @@ class CNetAddr
         friend bool operator!=(const CNetAddr& a, const CNetAddr& b) { return !(a == 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.
          */