[增加]1. 增加网络对域名和IP的兼容

Author: AlianBlank

Runtime/Network/Network/NetworkManager.NetworkChannelBase.cs

@@ -556,28 +556,54 @@ public virtual void Connect(Uri address, object userData = null)
                     PSocket = null;
                 }
 
-                EndPoint endPoint = new IPEndPoint(IPAddress.Parse(address.Host), address.Port);
-                switch (endPoint.AddressFamily)
+                bool isVerify = true;
+                IPEndPoint endPoint = null;
+                if (IPAddress.TryParse(address.Host, out var ipAddress))
                 {
-                    case System.Net.Sockets.AddressFamily.InterNetwork:
-                        PAddressFamily = AddressFamily.IPv4;
-                        break;
+                    endPoint = new IPEndPoint(ipAddress, address.Port);
+                }
+                else
+                {
+                    var ipHost = Utility.Net.GetHostIPv4(address.Host);
+                    if (IPAddress.TryParse(ipHost, out ipAddress))
+                    {
+                        endPoint = new IPEndPoint(ipAddress, address.Port);
+                    }
+                    else
+                    {
+                        // 获取IP失败
+                        Log.Error($"IP address is invalid.{address.Host}");
+                        isVerify = false;
+                        Close();
+                        PSocket = null;
+                    }
+                }
 
-                    case System.Net.Sockets.AddressFamily.InterNetworkV6:
-                        PAddressFamily = AddressFamily.IPv6;
-                        break;
+                if (isVerify)
+                {
+                    switch (endPoint.AddressFamily)
+                    {
+                        case System.Net.Sockets.AddressFamily.InterNetwork:
+                            PAddressFamily = AddressFamily.IPv4;
+                            break;
 
-                    default:
-                        string errorMessage = Utility.Text.Format("Not supported address family '{0}'.", endPoint.AddressFamily);
-                        if (NetworkChannelError != null)
-                        {
-                            NetworkChannelError(this, NetworkErrorCode.AddressFamilyError, SocketError.Success, errorMessage);
-                            return;
-                        }
+                        case System.Net.Sockets.AddressFamily.InterNetworkV6:
+                            PAddressFamily = AddressFamily.IPv6;
+                            break;
+
+                        default:
+                            string errorMessage = Utility.Text.Format("Not supported address family '{0}'.", endPoint.AddressFamily);
+                            if (NetworkChannelError != null)
+                            {
+                                NetworkChannelError(this, NetworkErrorCode.AddressFamilyError, SocketError.Success, errorMessage);
+                                return;
+                            }
 
-                        throw new GameFrameworkException(errorMessage);
+                            throw new GameFrameworkException(errorMessage);
+                    }
                 }
 
+
                 PSendState.Reset();
                 PReceiveState.PrepareForPacketHeader();
             }

Runtime/Network/Network/SystemSocket/NetworkManager.SystemTcpNetworkChannel.cs

@@ -46,7 +46,26 @@ public override void Connect(Uri address, object userData = null)
                     return;
                 }
 
-                m_ConnectedEndPoint = new IPEndPoint(IPAddress.Parse(address.Host), address.Port);
+                if (IPAddress.TryParse(address.Host, out var ipAddress))
+                {
+                    m_ConnectedEndPoint = new IPEndPoint(ipAddress, address.Port);
+                }
+                else
+                {
+                    var ipHost = Utility.Net.GetHostIPv4(address.Host);
+                    if (IPAddress.TryParse(ipHost, out ipAddress))
+                    {
+                        m_ConnectedEndPoint = new IPEndPoint(ipAddress, address.Port);
+                    }
+                    else
+                    {
+                        // 获取IP失败
+                        Log.Error($"IP address is invalid.{address.Host}");
+                        Close();
+                        return;
+                    }
+                }
+
                 base.Connect(address, userData);
                 PSystemNetSocket = new SystemNetSocket(m_ConnectedEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
                 PSocket = PSystemNetSocket;