获取网卡相关数据时，剔除本地环回和隧道网卡

NewLifeX · Apr 24, 2024 · 0354a2e · 0354a2e
1 parent b4d9bc0
commit 0354a2e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 9 deletions.
diff --git a/NewLife.Core/Common/MachineInfo.cs b/NewLife.Core/Common/MachineInfo.cs
@@ -777,6 +777,7 @@ public void RefreshSpeed()
         var received = 0L;
         try
         {
+            // 包含本地环回和隧道网卡
             // WSL获取网络列表时可能报错
             foreach (var ni in NetworkInterface.GetAllNetworkInterfaces())
             {

diff --git a/NewLife.Core/Net/NetHelper.cs b/NewLife.Core/Net/NetHelper.cs
@@ -277,7 +277,7 @@ public static IEnumerable<IPInterfaceProperties> GetActiveInterfaces()
         foreach (var item in NetworkInterface.GetAllNetworkInterfaces())
         {
             if (item.OperationalStatus != OperationalStatus.Up) continue;
-            if (item.NetworkInterfaceType == NetworkInterfaceType.Loopback) continue;
+            if (item.NetworkInterfaceType is NetworkInterfaceType.Loopback or NetworkInterfaceType.Tunnel or NetworkInterfaceType.Unknown) continue;
 
             var ip = item.GetIPProperties();
             if (ip != null) yield return ip;
@@ -364,10 +364,8 @@ public static IEnumerable<IPAddress> GetIPs()
         var dic = new Dictionary<UnicastIPAddressInformation, Int32>();
         foreach (var item in NetworkInterface.GetAllNetworkInterfaces())
         {
-            if (item.OperationalStatus != OperationalStatus.Up)
-                continue;
-            if (item.NetworkInterfaceType == NetworkInterfaceType.Loopback)
-                continue;
+            if (item.OperationalStatus != OperationalStatus.Up) continue;
+            if (item.NetworkInterfaceType is NetworkInterfaceType.Loopback or NetworkInterfaceType.Tunnel or NetworkInterfaceType.Unknown) continue;
 
             var ipp = item.GetIPProperties();
             if (ipp != null && ipp.UnicastAddresses.Count > 0)
@@ -465,16 +463,14 @@ public static IEnumerable<IPAddress> GetMulticasts()
     }
 
     private static readonly String[] _Excludes = ["Loopback", "VMware", "VBox", "Virtual", "Teredo", "Microsoft", "VPN", "VNIC", "IEEE"];
-    /// <summary>获取所有物理网卡MAC地址</summary>
+    /// <summary>获取所有物理网卡MAC地址。包括未启用网卡，剔除本地和隧道</summary>
     /// <returns></returns>
     public static IEnumerable<Byte[]> GetMacs()
     {
         foreach (var item in NetworkInterface.GetAllNetworkInterfaces())
         {
             // 只要物理网卡
-            if (item.NetworkInterfaceType is NetworkInterfaceType.Loopback or
-                NetworkInterfaceType.Tunnel or
-                NetworkInterfaceType.Unknown) continue;
+            if (item.NetworkInterfaceType is NetworkInterfaceType.Loopback or NetworkInterfaceType.Tunnel or NetworkInterfaceType.Unknown) continue;
             if (_Excludes.Any(e => item.Description.Contains(e))) continue;
             if (Runtime.Windows && item.Speed < 1_000_000) continue;