fix ipv6 preference on linux

Signed-off-by: R4SAS <r4sas@i2pmail.org>
Phala-Network · May 30, 2021 · be31640 · be31640
1 parent 3931985
commit be31640
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/libi2pd/NTCP2.cpp b/libi2pd/NTCP2.cpp
@@ -1197,16 +1197,19 @@ namespace transport
 							m_NTCP2V6Acceptor->open (boost::asio::ip::tcp::v6());
 							m_NTCP2V6Acceptor->set_option (boost::asio::ip::v6_only (true));
 							m_NTCP2V6Acceptor->set_option (boost::asio::socket_base::reuse_address (true));
+#ifdef __linux__
+							if (!m_Address6 && !m_YggdrasilAddress) // only if not binded to address
+							{
+								// 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::integer<BOOST_ASIO_OS_DEF(IPPROTO_IPV6), IPV6_ADDR_PREFERENCES> ipv6PreferAddr;
+								m_NTCP2V6Acceptor->set_option (ipv6PreferAddr(IPV6_PREFER_SRC_PUBLIC | IPV6_PREFER_SRC_HOME | IPV6_PREFER_SRC_NONCGA));
+							}
+#endif
 							auto ep = boost::asio::ip::tcp::endpoint(boost::asio::ip::tcp::v6(), address->port);
 							if (m_Address6 && !context.SupportsMesh ())
 								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
@@ -67,9 +67,12 @@ namespace transport
 			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));
+			if (m_EndpointV6.address() != boost::asio::ip::address().from_string("::")) // only if not binded to address
+			{
+				// 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::integer<BOOST_ASIO_OS_DEF(IPPROTO_IPV6), IPV6_ADDR_PREFERENCES> ipv6PreferAddr;
+				m_SocketV6.set_option (ipv6PreferAddr(IPV6_PREFER_SRC_PUBLIC | IPV6_PREFER_SRC_HOME | IPV6_PREFER_SRC_NONCGA));
+			}
 #endif
 			m_SocketV6.bind (m_EndpointV6);
 			LogPrint (eLogInfo, "SSU: Start listening v6 port ", m_EndpointV6.port());