CSHARP-1462: IPv6 addresses were getting lost in the shuffle.

Author: craiggwilson

src/MongoDB.Driver.Tests/ClusterRegistryTests.cs

@@ -42,7 +42,7 @@ public void Instance_should_return_the_same_instance_every_time()
         public void GetOrCreateCluster_should_return_a_cluster_with_the_correct_settings()
         {
             var credentials = new[] { MongoCredential.CreateMongoCRCredential("source", "username", "password") };
-            var servers = new[] { new MongoServerAddress("localhost") };
+            var servers = new[] { new MongoServerAddress("localhost"), new MongoServerAddress("127.0.0.1", 30000), new MongoServerAddress("[::1]", 27018) };
 
             var sslSettings = new SslSettings
             {
@@ -76,16 +76,19 @@ public void GetOrCreateCluster_should_return_a_cluster_with_the_correct_settings
 
             using (var cluster = subject.GetOrCreateCluster(clientSettings.ToClusterKey()))
             {
-                var address = clientSettings.Servers.Single();
-                var endPoints = new[] { new DnsEndPoint(address.Host, address.Port) };
+                var endPoints = new EndPoint[]
+                {
+                    new DnsEndPoint("localhost", 27017),
+                    new IPEndPoint(IPAddress.Parse("127.0.0.1"), 30000),
+                    new IPEndPoint(IPAddress.Parse("[::1]"), 27018)
+                };
                 cluster.Settings.ConnectionMode.Should().Be(ClusterConnectionMode.ReplicaSet);
                 cluster.Settings.EndPoints.Equals(endPoints);
                 cluster.Settings.ReplicaSetName.Should().Be("rs");
                 cluster.Settings.PostServerSelector.Should().NotBeNull().And.Subject.Should().BeOfType<LatencyLimitingServerSelector>();
                 cluster.Settings.MaxServerSelectionWaitQueueSize.Should().Be(20);
 
-                var serverDescription = cluster.Description.Servers.Single(s => s.EndPoint.Equals(endPoints[0]));
-                serverDescription.EndPoint.Should().Be(endPoints[0]);
+                cluster.Description.Servers.Select(s => s.EndPoint).Should().Contain(endPoints);
 
                 // TODO: don't know how to test the rest of the settings because they are all private to the cluster
             }

src/MongoDB.Driver.Tests/MongoUrlBuilderTests.cs

@@ -745,6 +745,7 @@ public void TestServer(string host, int? port, string connectionString)
         [TestCase(new string[] { "host1", "host2" }, new object[] { 27018, null }, "mongodb://host1:27018,host2")]
         [TestCase(new string[] { "host1", "host2" }, new object[] { 27018, 27017 }, "mongodb://host1:27018,host2")]
         [TestCase(new string[] { "host1", "host2" }, new object[] { 27018, 27018 }, "mongodb://host1:27018,host2:27018")]
+        [TestCase(new string[] { "[::1]", "host2" }, new object[] { 27018, 27018 }, "mongodb://[::1]:27018,host2:27018")]
         public void TestServers(string[] hosts, object[] ports, string connectionString)
         {
             var servers = (hosts == null) ? null : new List<MongoServerAddress>();

src/MongoDB.Driver/ClusterRegistry.cs

@@ -17,6 +17,7 @@
 using System.Linq;
 using System.Net;
 using System.Net.Security;
+using System.Net.Sockets;
 using System.Security.Cryptography.X509Certificates;
 using MongoDB.Driver.Core.Authentication;
 using MongoDB.Driver.Core.Clusters;
@@ -79,7 +80,7 @@ private ICluster CreateCluster(ClusterKey clusterKey)
 
         private ClusterSettings ConfigureCluster(ClusterSettings settings, ClusterKey clusterKey)
         {
-            var endPoints = clusterKey.Servers.Select(s => (EndPoint)new DnsEndPoint(s.Host, s.Port));
+            var endPoints = clusterKey.Servers.Select(s => EndPointHelper.Parse(s.ToString()));
             return settings.With(
                 connectionMode: clusterKey.ConnectionMode.ToCore(),
                 endPoints: Optional.Enumerable(endPoints),
@@ -139,6 +140,11 @@ private SslStreamSettings ConfigureSsl(SslStreamSettings settings, ClusterKey cl
 
         private TcpStreamSettings ConfigureTcp(TcpStreamSettings settings, ClusterKey clusterKey)
         {
+            if (clusterKey.IPv6)
+            {
+                settings = settings.With(addressFamily: AddressFamily.InterNetworkV6);
+            }
+
             return settings.With(
                 connectTimeout: clusterKey.ConnectTimeout,
                 readTimeout: clusterKey.SocketTimeout,

src/MongoDB.Driver/MongoUrlBuilder.cs

@@ -576,7 +576,12 @@ public void Parse(string url)
                 }
                 else if ((ipEndPoint = endPoint as IPEndPoint) != null)
                 {
-                    return new MongoServerAddress(ipEndPoint.Address.ToString(), ipEndPoint.Port);
+                    var address = ipEndPoint.Address.ToString();
+                    if (ipEndPoint.AddressFamily == System.Net.Sockets.AddressFamily.InterNetworkV6)
+                    {
+                        address = "[" + address + "]";
+                    }
+                    return new MongoServerAddress(address, ipEndPoint.Port);
                 }
                 else
                 {