Handle ConnectUsingIPv6 failures, retry with IPv4

michaelklishin · michaelklishin · commit ff05395816bf · 2017-07-12T22:43:16.000+03:00
diff --git a/projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler.cs b/projects/client/RabbitMQ.Client/src/client/impl/SocketFrameHandler.cs
@@ -87,7 +87,14 @@ public SocketFrameHandler(AmqpTcpEndpoint endpoint,
 
             if (Socket.OSSupportsIPv6 && endpoint.AddressFamily != AddressFamily.InterNetwork)
             {
-                m_socket = ConnectUsingIPv6(endpoint, socketFactory, connectionTimeout);
+                try {
+                    m_socket = ConnectUsingIPv6(endpoint, socketFactory, connectionTimeout);
+                #pragma warning disable 0168
+                } catch (ConnectFailureException cfe)
+                #pragma warning restore 0168
+                {
+                    m_socket = null;
+                }
             }
 
             if (m_socket == null && endpoint.AddressFamily != AddressFamily.InterNetworkV6)

Original file line number	Diff line number	Diff line change
`@@ -87,7 +87,14 @@ public SocketFrameHandler(AmqpTcpEndpoint endpoint,`
`87`	`87`
`88`	`88`	`if (Socket.OSSupportsIPv6 && endpoint.AddressFamily != AddressFamily.InterNetwork)`
`89`	`89`	`{`
`90`		`- m_socket = ConnectUsingIPv6(endpoint, socketFactory, connectionTimeout);`
	`90`	`+ try {`
	`91`	`+ m_socket = ConnectUsingIPv6(endpoint, socketFactory, connectionTimeout);`
	`92`	`+ #pragma warning disable 0168`
	`93`	`+ } catch (ConnectFailureException cfe)`
	`94`	`+ #pragma warning restore 0168`
	`95`	`+ {`
	`96`	`+ m_socket = null;`
	`97`	`+ }`
`91`	`98`	`}`
`92`	`99`
`93`	`100`	`if (m_socket == null && endpoint.AddressFamily != AddressFamily.InterNetworkV6)`