浏览代码

Remove GetMacAddresses from NetworkManager

Niels van Velzen 3 月之前
父节点
当前提交
d18066f0f2
共有 2 个文件被更改,包括 0 次插入29 次删除
  1. 0 6
      MediaBrowser.Common/Net/INetworkManager.cs
  2. 0 23
      src/Jellyfin.Networking/Manager/NetworkManager.cs

+ 0 - 6
MediaBrowser.Common/Net/INetworkManager.cs

@@ -94,12 +94,6 @@ namespace MediaBrowser.Common.Net
         /// <returns>IP address to use, or loopback address if all else fails.</returns>
         string GetBindAddress(string source, out int? port);
 
-        /// <summary>
-        /// Get a list of all the MAC addresses associated with active interfaces.
-        /// </summary>
-        /// <returns>List of MAC addresses.</returns>
-        IReadOnlyList<PhysicalAddress> GetMacAddresses();
-
         /// <summary>
         /// Returns true if the address is part of the user defined LAN.
         /// </summary>

+ 0 - 23
src/Jellyfin.Networking/Manager/NetworkManager.cs

@@ -49,11 +49,6 @@ public class NetworkManager : INetworkManager, IDisposable
     /// </summary>
     private bool _eventfire;
 
-    /// <summary>
-    /// List of all interface MAC addresses.
-    /// </summary>
-    private IReadOnlyList<PhysicalAddress> _macAddresses;
-
     /// <summary>
     /// Dictionary containing interface addresses and their subnets.
     /// </summary>
@@ -91,7 +86,6 @@ public class NetworkManager : INetworkManager, IDisposable
         _startupConfig = startupConfig;
         _initLock = new();
         _interfaces = new List<IPData>();
-        _macAddresses = new List<PhysicalAddress>();
         _publishedServerUrls = new List<PublishedServerUriOverride>();
         _networkEventLock = new();
         _remoteAddressFilter = new List<IPNetwork>();
@@ -215,7 +209,6 @@ public class NetworkManager : INetworkManager, IDisposable
 
     /// <summary>
     /// Generate a list of all the interface ip addresses and submasks where that are in the active/unknown state.
-    /// Generate a list of all active mac addresses that aren't loopback addresses.
     /// </summary>
     private void InitializeInterfaces()
     {
@@ -224,7 +217,6 @@ public class NetworkManager : INetworkManager, IDisposable
             _logger.LogDebug("Refreshing interfaces.");
 
             var interfaces = new List<IPData>();
-            var macAddresses = new List<PhysicalAddress>();
 
             try
             {
@@ -236,13 +228,6 @@ public class NetworkManager : INetworkManager, IDisposable
                     try
                     {
                         var ipProperties = adapter.GetIPProperties();
-                        var mac = adapter.GetPhysicalAddress();
-
-                        // Populate MAC list
-                        if (adapter.NetworkInterfaceType != NetworkInterfaceType.Loopback && !PhysicalAddress.None.Equals(mac))
-                        {
-                            macAddresses.Add(mac);
-                        }
 
                         // Populate interface list
                         foreach (var info in ipProperties.UnicastAddresses)
@@ -302,7 +287,6 @@ public class NetworkManager : INetworkManager, IDisposable
             _logger.LogDebug("Discovered {NumberOfInterfaces} interfaces.", interfaces.Count);
             _logger.LogDebug("Interfaces addresses: {Addresses}", interfaces.OrderByDescending(s => s.AddressFamily == AddressFamily.InterNetwork).Select(s => s.Address.ToString()));
 
-            _macAddresses = macAddresses;
             _interfaces = interfaces;
         }
     }
@@ -711,13 +695,6 @@ public class NetworkManager : INetworkManager, IDisposable
         return true;
     }
 
-    /// <inheritdoc/>
-    public IReadOnlyList<PhysicalAddress> GetMacAddresses()
-    {
-        // Populated in construction - so always has values.
-        return _macAddresses;
-    }
-
     /// <inheritdoc/>
     public IReadOnlyList<IPData> GetLoopbacks()
     {