From ed42948051afb308cd7585d4284d286f49829a08 Mon Sep 17 00:00:00 2001
From: R4SAS <r4sas@i2pmail.org>
Date: Sun, 30 May 2021 03:23:00 +0300
Subject: [PATCH] prefer public ipv6 instead rfc4941 (closes #1251)

Wokrs only on linux-based systems. Not tested on other *nix systems, and
not works on windows.

Signed-off-by: R4SAS <r4sas@i2pmail.org>
---
 libi2pd/NTCP2.cpp | 9 +++++++++
 libi2pd/SSU.cpp   | 9 +++++++++
 libi2pd/util.h    | 6 +++---
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/libi2pd/NTCP2.cpp b/libi2pd/NTCP2.cpp
index d5a03d1c..54d6483c 100644
--- a/libi2pd/NTCP2.cpp
+++ b/libi2pd/NTCP2.cpp
@@ -23,6 +23,10 @@
 #include "HTTP.h"
 #include "util.h"
 
+#ifdef __linux__
+	#include <linux/in6.h>
+#endif
+
 namespace i2p
 {
 namespace transport
@@ -1198,6 +1202,11 @@ namespace transport
 								ep = boost::asio::ip::tcp::endpoint (m_Address6->address(), address->port);
 							else if (m_YggdrasilAddress && !context.SupportsV6 ())
 								ep = boost::asio::ip::tcp::endpoint (m_YggdrasilAddress->address(), address->port);
+#ifdef __linux__
+							// Set preference to use public IPv6 address -- tested on linux, not works on windows, and not tested on others
+							typedef boost::asio::detail::socket_option::boolean<IPV6_ADDR_PREFERENCES, IPV6_PREFER_SRC_PUBLIC> ipv6PreferPubAddr;
+							m_NTCP2V6Acceptor->set_option (ipv6PreferPubAddr (true));
+#endif
 							m_NTCP2V6Acceptor->bind (ep);
 							m_NTCP2V6Acceptor->listen ();
 
diff --git a/libi2pd/SSU.cpp b/libi2pd/SSU.cpp
index f7801bb0..0836f84e 100644
--- a/libi2pd/SSU.cpp
+++ b/libi2pd/SSU.cpp
@@ -14,6 +14,10 @@
 #include "SSU.h"
 #include "util.h"
 
+#ifdef __linux__
+	#include <linux/in6.h>
+#endif
+
 #ifdef _WIN32
 #include <boost/winapi/error_codes.hpp>
 #endif
@@ -62,6 +66,11 @@ namespace transport
 			m_SocketV6.set_option (boost::asio::ip::v6_only (true));
 			m_SocketV6.set_option (boost::asio::socket_base::receive_buffer_size (SSU_SOCKET_RECEIVE_BUFFER_SIZE));
 			m_SocketV6.set_option (boost::asio::socket_base::send_buffer_size (SSU_SOCKET_SEND_BUFFER_SIZE));
+#ifdef __linux__
+			// Set preference to use public IPv6 address -- tested on linux, not works on windows, and not tested on others
+			typedef boost::asio::detail::socket_option::boolean<IPV6_ADDR_PREFERENCES, IPV6_PREFER_SRC_PUBLIC> ipv6PreferPubAddr;
+			m_SocketV6.set_option (ipv6PreferPubAddr(true));
+#endif
 			m_SocketV6.bind (m_EndpointV6);
 			LogPrint (eLogInfo, "SSU: Start listening v6 port ", m_EndpointV6.port());
 		}
diff --git a/libi2pd/util.h b/libi2pd/util.h
index 0cab4121..000cb74e 100644
--- a/libi2pd/util.h
+++ b/libi2pd/util.h
@@ -177,13 +177,13 @@ namespace util
 
 			SaveStateHelper (T& orig): m_Original (orig), m_Copy (orig) {};
 			~SaveStateHelper () { m_Original = m_Copy; };
-			
+
 		private:
 
 			T& m_Original;
 			T m_Copy;
-	};	
-	
+	};
+
 	namespace net
 	{
 		int GetMTU (const boost::asio::ip::address& localAddress);