Merge pull request #249 from henning724/master

处理遍历适配器时的异常，解决一部分tun/tap启动问题
netchx · Mar 9, 2020 · 9d637a3 · 9d637a3
2 parents b76a22d + 8ff8582
commit 9d637a3
Showing 1 changed file with 29 additions and 23 deletions.
diff --git a/Netch/Utils/Configuration.cs b/Netch/Utils/Configuration.cs
@@ -109,39 +109,45 @@ public static bool SearchOutbounds()
             var AddressGot = false;
             foreach (var adapter in NetworkInterface.GetAllNetworkInterfaces())
             {
-                var adapterProperties = adapter.GetIPProperties();
-                var p = adapterProperties.GetIPv4Properties();
-                Logging.Info($"检测适配器：{adapter.Name} {adapter.Id} {adapter.Description}, index: {p.Index}");
-
-                // 通过索引查找对应适配器的 IPv4 地址
-                if (p.Index == Global.Adapter.Index)
+                try
                 {
-                    var AdapterIPs = "";
+                    var adapterProperties = adapter.GetIPProperties();
+                    var p = adapterProperties.GetIPv4Properties();
+                    Logging.Info($"检测适配器：{adapter.Name} {adapter.Id} {adapter.Description}, index: {p.Index}");
 
-                    foreach (var ip in adapterProperties.UnicastAddresses)
+                    // 通过索引查找对应适配器的 IPv4 地址
+                    if (p.Index == Global.Adapter.Index)
                     {
-                        if (ip.Address.AddressFamily == AddressFamily.InterNetwork)
+                        var AdapterIPs = "";
+
+                        foreach (var ip in adapterProperties.UnicastAddresses)
                         {
-                            AddressGot = true;
-                            Global.Adapter.Address = ip.Address;
-                            Logging.Info($"当前出口 IPv4 地址：{Global.Adapter.Address}");
-                            break;
+                            if (ip.Address.AddressFamily == AddressFamily.InterNetwork)
+                            {
+                                AddressGot = true;
+                                Global.Adapter.Address = ip.Address;
+                                Logging.Info($"当前出口 IPv4 地址：{Global.Adapter.Address}");
+                                break;
+                            }
+                            AdapterIPs = $"{ip.Address} | ";
                         }
-                        AdapterIPs = $"{ip.Address} | ";
-                    }
 
-                    if (!AddressGot)
-                    {
-                        if (AdapterIPs.Length > 3)
+                        if (!AddressGot)
                         {
-                            AdapterIPs = AdapterIPs.Substring(0, AdapterIPs.Length - 3);
-                            Logging.Info($"所有出口地址：{AdapterIPs}");
+                            if (AdapterIPs.Length > 3)
+                            {
+                                AdapterIPs = AdapterIPs.Substring(0, AdapterIPs.Length - 3);
+                                Logging.Info($"所有出口地址：{AdapterIPs}");
+                            }
+                            Logging.Info("出口无 IPv4 地址，当前只支持 IPv4 地址");
+                            return false;
                         }
-                        Logging.Info("出口无 IPv4 地址，当前只支持 IPv4 地址");
-                        return false;
+                        break;
                     }
-                    break;
+
                 }
+                catch (Exception)
+                { }
             }
 
             if (!AddressGot)