[修改]1. 修改连接域名获取失败的处理

Author: AlianBlank

Runtime/Network/Network/NetworkManager.NetworkChannelBase.cs

@@ -542,6 +542,9 @@ public void SetRPCEndHandler(EventHandler<MessageObject> handler)
                 PRpcState.SetRPCEndHandler(handler);
             }
 
+            protected bool IsVerifyAddress = true;
+            protected IPEndPoint ConnectEndPoint;
+
             /// <summary>
             /// 连接到远程主机。
             /// </summary>
@@ -556,32 +559,42 @@ public virtual void Connect(Uri address, object userData = null)
                     PSocket = null;
                 }
 
-                bool isVerify = true;
-                IPEndPoint endPoint = null;
+                IsVerifyAddress = true;
+                ConnectEndPoint = null;
                 if (IPAddress.TryParse(address.Host, out var ipAddress))
                 {
-                    endPoint = new IPEndPoint(ipAddress, address.Port);
+                    ConnectEndPoint = new IPEndPoint(ipAddress, address.Port);
                 }
                 else
                 {
-                    var ipHost = Utility.Net.GetHostIPv4(address.Host);
-                    if (IPAddress.TryParse(ipHost, out ipAddress))
+                    try
                     {
-                        endPoint = new IPEndPoint(ipAddress, address.Port);
+                        var ipHost = Utility.Net.GetHostIPv4(address.Host);
+                        if (IPAddress.TryParse(ipHost, out ipAddress))
+                        {
+                            ConnectEndPoint = new IPEndPoint(ipAddress, address.Port);
+                        }
+                        else
+                        {
+                            // 获取IP失败
+                            Log.Error($"IP address is invalid.{address.Host}");
+                            IsVerifyAddress = false;
+                            Close();
+                            PSocket = null;
+                        }
                     }
-                    else
+                    catch (Exception e)
                     {
-                        // 获取IP失败
-                        Log.Error($"IP address is invalid.{address.Host}");
-                        isVerify = false;
+                        Log.Error($"IP address is invalid.{address.Host} {e.Message}");
+                        IsVerifyAddress = false;
                         Close();
                         PSocket = null;
                     }
                 }
 
-                if (isVerify)
+                if (IsVerifyAddress && ConnectEndPoint != null)
                 {
-                    switch (endPoint.AddressFamily)
+                    switch (ConnectEndPoint.AddressFamily)
                     {
                         case System.Net.Sockets.AddressFamily.InterNetwork:
                             PAddressFamily = AddressFamily.IPv4;
@@ -592,7 +605,7 @@ public virtual void Connect(Uri address, object userData = null)
                             break;
 
                         default:
-                            string errorMessage = Utility.Text.Format("Not supported address family '{0}'.", endPoint.AddressFamily);
+                            string errorMessage = Utility.Text.Format("Not supported address family '{0}'.", ConnectEndPoint.AddressFamily);
                             if (NetworkChannelError != null)
                             {
                                 NetworkChannelError(this, NetworkErrorCode.AddressFamilyError, SocketError.Success, errorMessage);

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

@@ -21,7 +21,6 @@ public sealed partial class NetworkManager
         private sealed class SystemTcpNetworkChannel : NetworkChannelBase
         {
             private ConnectState m_ConnectState = null;
-            private IPEndPoint m_ConnectedEndPoint = null;
             private SystemNetSocket PSystemNetSocket = null;
 
             /// <summary>
@@ -46,29 +45,13 @@ public override void Connect(Uri address, object userData = null)
                     return;
                 }
 
-                if (IPAddress.TryParse(address.Host, out var ipAddress))
-                {
-                    m_ConnectedEndPoint = new IPEndPoint(ipAddress, address.Port);
-                }
-                else
+                base.Connect(address, userData);
+                if (IsVerifyAddress)
                 {
-                    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;
-                    }
+                    PSystemNetSocket = new SystemNetSocket(ConnectEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
+                    PSocket = PSystemNetSocket;
                 }
 
-                base.Connect(address, userData);
-                PSystemNetSocket = new SystemNetSocket(m_ConnectedEndPoint.AddressFamily, SocketType.Stream, ProtocolType.Tcp);
-                PSocket = PSystemNetSocket;
                 if (PSocket == null)
                 {
                     string errorMessage = "Initialize network channel failure.";
@@ -337,7 +320,7 @@ private void ConnectAsync(object userData)
                 {
                     PIsConnecting = true;
                     m_ConnectState = new ConnectState(PSystemNetSocket, userData);
-                    ((SystemNetSocket)PSocket).BeginConnect(m_ConnectedEndPoint.Address, m_ConnectedEndPoint.Port, ConnectCallback, m_ConnectState);
+                    ((SystemNetSocket)PSocket).BeginConnect(ConnectEndPoint.Address, ConnectEndPoint.Port, ConnectCallback, m_ConnectState);
                 }
                 catch (Exception exception)
                 {