From 53afa68026ffa1313ae4aba3664de7791d23b1c8 Mon Sep 17 00:00:00 2001
From: Vasil Dimov <vd@FreeBSD.org>
Date: Tue, 7 Feb 2023 15:13:21 +0100
Subject: [PATCH] net: move MaybeFlipIPv6toCJDNS() from net to netbase

It need not be in the `net` module and we need to call it from
`LookupSubNet()`, thus move it to `netbase`.
---
 src/net.cpp     | 16 ----------------
 src/net.h       |  2 --
 src/netbase.cpp |  9 +++++++++
 src/netbase.h   |  9 +++++++++
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/net.cpp b/src/net.cpp
index d20d185e27b..cc4c676822f 100644
--- a/src/net.cpp
+++ b/src/net.cpp
@@ -269,22 +269,6 @@ std::optional<CService> GetLocalAddrForPeer(CNode& node)
     return std::nullopt;
 }
 
-/**
- * If an IPv6 address belongs to the address range used by the CJDNS network and
- * the CJDNS network is reachable (-cjdnsreachable config is set), then change
- * the type from NET_IPV6 to NET_CJDNS.
- * @param[in] service Address to potentially convert.
- * @return a copy of `service` either unmodified or changed to CJDNS.
- */
-CService MaybeFlipIPv6toCJDNS(const CService& service)
-{
-    CService ret{service};
-    if (ret.IsIPv6() && ret.HasCJDNSPrefix() && g_reachable_nets.Contains(NET_CJDNS)) {
-        ret.m_net = NET_CJDNS;
-    }
-    return ret;
-}
-
 // learn a new local address
 bool AddLocal(const CService& addr_, int nScore)
 {
diff --git a/src/net.h b/src/net.h
index 9a517ac332d..b6095ec53b0 100644
--- a/src/net.h
+++ b/src/net.h
@@ -166,8 +166,6 @@ void RemoveLocal(const CService& addr);
 bool SeenLocal(const CService& addr);
 bool IsLocal(const CService& addr);
 CService GetLocalAddress(const CNode& peer);
-CService MaybeFlipIPv6toCJDNS(const CService& service);
-
 
 extern bool fDiscover;
 extern bool fListen;
diff --git a/src/netbase.cpp b/src/netbase.cpp
index 16b5e1c70dd..09b8a606b65 100644
--- a/src/netbase.cpp
+++ b/src/netbase.cpp
@@ -774,3 +774,12 @@ bool IsBadPort(uint16_t port)
     }
     return false;
 }
+
+CService MaybeFlipIPv6toCJDNS(const CService& service)
+{
+    CService ret{service};
+    if (ret.IsIPv6() && ret.HasCJDNSPrefix() && g_reachable_nets.Contains(NET_CJDNS)) {
+        ret.m_net = NET_CJDNS;
+    }
+    return ret;
+}
diff --git a/src/netbase.h b/src/netbase.h
index aaa5229b82f..8b7da4109f8 100644
--- a/src/netbase.h
+++ b/src/netbase.h
@@ -307,4 +307,13 @@ bool Socks5(const std::string& strDest, uint16_t port, const ProxyCredentials* a
  */
 bool IsBadPort(uint16_t port);
 
+/**
+ * If an IPv6 address belongs to the address range used by the CJDNS network and
+ * the CJDNS network is reachable (-cjdnsreachable config is set), then change
+ * the type from NET_IPV6 to NET_CJDNS.
+ * @param[in] service Address to potentially convert.
+ * @return a copy of `service` either unmodified or changed to CJDNS.
+ */
+CService MaybeFlipIPv6toCJDNS(const CService& service);
+
 #endif // BITCOIN_NETBASE_H