Merge pull request #102 from liangminhua/develop

Support create 0.0.0.0 IpEndPoint.
heartofimpetus · Jul 12, 2018 · 36b094f · 36b094f
2 parents 6d6dc02 + 5eb08d7
commit 36b094f
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/src/Ether.Network/Utils/NetUtils.cs b/src/Ether.Network/Utils/NetUtils.cs
@@ -18,9 +18,16 @@ internal static class NetUtils
         /// <returns>Parsed <see cref="IPAddress"/>.</returns>
         public static IPAddress GetIpAddress(string ipOrHost)
         {
-            string host = Dns.GetHostAddressesAsync(ipOrHost).Result.First().ToString();
-
-            return IPAddress.TryParse(host, out IPAddress address) ? address : null;
+            if (IPAddress.TryParse(ipOrHost, out IPAddress address))
+            {
+                return address;
+            }
+            else
+            {
+                return Dns.GetHostAddressesAsync(ipOrHost).Result
+                    .Where(x => x.AddressFamily == AddressFamily.InterNetwork)
+                    .FirstOrDefault();
+            }
         }
 
         /// <summary>