Merge pull request #1395 from johnhaddon/ipV6DisplayDriver

DisplayDriverServer : Create IPv6 endpoint
ImageEngine · Feb 12, 2024 · cd22b19 · cd22b19
2 parents e644618 + c357ea1
commit cd22b19
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/Changes b/Changes
@@ -1,6 +1,12 @@
 10.5.x.x (relative to 10.5.6.0)
 ========
 
+
+Improvements
+------------
+
+- DisplayDriverServer : Fixed delays connecting to the server on Windows.
+
 10.5.6.0 (relative to 10.5.5.0)
 ========
 
@@ -11,7 +17,6 @@ Improvements
 - `IECoreGL::ColorTexture`: Added new constructor that accepts an argument specifying the internal storage format to use.
 
 
-
 10.5.5.0 (relative to 10.5.4.2)
 ========
 

diff --git a/src/IECoreImage/DisplayDriverServer.cpp b/src/IECoreImage/DisplayDriverServer.cpp
@@ -175,7 +175,7 @@ class DisplayDriverServer::PrivateData : public RefCounted
 
 		void openPort( DisplayDriverServer::Port portNumber )
 		{
-			m_endpoint = boost::asio::ip::tcp::endpoint( tcp::v4(), portNumber );
+			m_endpoint = boost::asio::ip::tcp::endpoint( tcp::v6(), portNumber );
 			m_acceptor.open(  m_endpoint.protocol() );
 #ifdef _MSC_VER
 			m_acceptor.set_option( boost::asio::ip::tcp::acceptor::reuse_address( false ) );
@@ -184,6 +184,7 @@ class DisplayDriverServer::PrivateData : public RefCounted
 #else
 			m_acceptor.set_option( boost::asio::ip::tcp::acceptor::reuse_address( true ) );
 #endif
+			m_acceptor.set_option( boost::asio::ip::v6_only( false ) );
 			m_acceptor.bind( m_endpoint );
 			m_acceptor.listen();
 		}