Fix: Based on Copilot feedback

Author: BornToBeRoot

Source/NETworkManager.Models/Export/ExportManager.NeighborInfo.cs

@@ -5,6 +5,7 @@
 using System.Text;
 using System.Xml.Linq;
 using NETworkManager.Models.Network;
+using NETworkManager.Utilities;
 using Newtonsoft.Json;
 
 namespace NETworkManager.Models.Export;
@@ -48,7 +49,7 @@ private static void CreateCsv(IEnumerable<NeighborInfo> collection, string fileP
 
         foreach (var info in collection)
             stringBuilder.AppendLine(
-                $"{info.IPAddress},{info.MACAddress},{info.InterfaceAlias},{info.InterfaceIndex},{info.State},{info.AddressFamily},{info.IsMulticast}");
+                $"{info.IPAddress},{info.MACAddress},{CsvHelper.QuoteString(info.InterfaceAlias)},{info.InterfaceIndex},{info.State},{info.AddressFamily},{info.IsMulticast}");
 
         File.WriteAllText(filePath, stringBuilder.ToString());
     }

Source/NETworkManager.Models/Firewall/Firewall.cs

@@ -15,9 +15,10 @@ namespace NETworkManager.Models.Firewall;
 
 /// <summary>
 /// Provides static methods to read and modify Windows Firewall rules via PowerShell.
-/// All operations share a single <see cref="Runspace"/> that is initialized once with
-/// the required execution policy and the NetSecurity module, reducing per-call overhead.
-/// A <see cref="SemaphoreSlim"/> serializes access so the runspace is never used concurrently.
+/// All operations share a single <see cref="Runspace"/> that is lazily initialized on
+/// first use with the required execution policy and the <c>NetSecurity</c> module imported,
+/// reducing per-call overhead. A <see cref="SemaphoreSlim"/> serializes access so the
+/// runspace is never used concurrently.
 /// </summary>
 public class Firewall
 {
@@ -40,26 +41,26 @@ public class Firewall
     private static readonly SemaphoreSlim Lock = new(1, 1);
 
     /// <summary>
-    /// Shared PowerShell runspace, initialized once in the static constructor with
-    /// <c>Set-ExecutionPolicy Bypass</c> and <c>Import-Module NetSecurity</c>.
+    /// Lazily initialized PowerShell runspace. Created and configured on first access so that
+    /// simply navigating to the Firewall view does not start a PowerShell process unless a
+    /// modifying operation is actually performed.
     /// </summary>
-    private static readonly Runspace SharedRunspace;
-
-    /// <summary>
-    /// Opens <see cref="SharedRunspace"/> and runs the one-time initialization script
-    /// so that subsequent operations do not need to repeat the module import.
-    /// </summary>
-    static Firewall()
+    private static readonly Lazy<Runspace> _sharedRunspace = new(() =>
     {
-        SharedRunspace = RunspaceFactory.CreateRunspace();
-        SharedRunspace.Open();
+        var runspace = RunspaceFactory.CreateRunspace();
+        runspace.Open();
 
         using var ps = SMA.PowerShell.Create();
-        ps.Runspace = SharedRunspace;
+        ps.Runspace = runspace;
         ps.AddScript(@"
 Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process
 Import-Module NetSecurity -ErrorAction Stop").Invoke();
-    }
+
+        return runspace;
+    });
+
+    /// <summary>Returns the shared runspace, initializing it on first access.</summary>
+    private static Runspace SharedRunspace => _sharedRunspace.Value;
 
     #endregion
 

Source/NETworkManager.Models/Network/NeighborTable.cs

@@ -19,10 +19,10 @@ namespace NETworkManager.Models.Network;
 /// Provides static methods to read and modify the Windows IP neighbor table
 /// (IPv4 ARP and IPv6 NDP). Read access uses the <c>GetIpNetTable2</c> Win32 API.
 /// Modifying operations (add/delete entries, clear table) run via PowerShell in a
-/// shared <see cref="Runspace"/> that is initialized once with the required execution
-/// policy and the <c>NetTCPIP</c> module imported. A <see cref="SemaphoreSlim"/>
-/// serializes access so the runspace is never used concurrently. Modifying operations
-/// require the application to run with elevated rights.
+/// shared <see cref="Runspace"/> that is lazily initialized on first use with the
+/// required execution policy and the <c>NetTCPIP</c> module imported. A
+/// <see cref="SemaphoreSlim"/> serializes access so the runspace is never used
+/// concurrently. Modifying operations require the application to run with elevated rights.
 /// </summary>
 public class NeighborTable
 {
@@ -75,11 +75,7 @@ private struct MIB_IPNET_ROW2
     [DllImport("Iphlpapi.dll")]
     private static extern void FreeMibTable(IntPtr memory);
 
-    /// <summary>Looks up a single neighbor cache entry by address. Returns 0 on success.</summary>
-    [DllImport("Iphlpapi.dll")]
-    private static extern uint GetIpNetEntry2(ref MIB_IPNET_ROW2 row);
-
-    /// <summary>
+/// <summary>
     /// Ensures that only one PowerShell pipeline runs on <see cref="SharedRunspace"/> at a time.
     /// </summary>
     private static readonly SemaphoreSlim Lock = new(1, 1);
@@ -97,26 +93,26 @@ private struct MIB_IPNET_ROW2
     private static readonly TimeSpan InterfaceAliasCacheDuration = TimeSpan.FromMinutes(5);
 
     /// <summary>
-    /// Shared PowerShell runspace, initialized once in the static constructor with
-    /// <c>Set-ExecutionPolicy Bypass</c> and <c>Import-Module NetTCPIP</c> so that
-    /// subsequent operations do not need to repeat the module import.
+    /// Lazily initialized PowerShell runspace. Created and configured on first access so that
+    /// read-only paths (e.g. MAC address lookup in IP Scanner) do not start a PowerShell
+    /// process unless a modifying operation is actually performed.
     /// </summary>
-    private static readonly Runspace SharedRunspace;
-
-    /// <summary>
-    /// Opens <see cref="SharedRunspace"/> and runs the one-time initialization script.
-    /// </summary>
-    static NeighborTable()
+    private static readonly Lazy<Runspace> _sharedRunspace = new(() =>
     {
-        SharedRunspace = RunspaceFactory.CreateRunspace();
-        SharedRunspace.Open();
+        var runspace = RunspaceFactory.CreateRunspace();
+        runspace.Open();
 
         using var ps = SMA.PowerShell.Create();
-        ps.Runspace = SharedRunspace;
+        ps.Runspace = runspace;
         ps.AddScript(@"
 Set-ExecutionPolicy -ExecutionPolicy Bypass -Scope Process
 Import-Module NetTCPIP -ErrorAction Stop").Invoke();
-    }
+
+        return runspace;
+    });
+
+    /// <summary>Returns the shared runspace, initializing it on first access.</summary>
+    private static Runspace SharedRunspace => _sharedRunspace.Value;
 
     #endregion
 
@@ -226,7 +222,9 @@ private static List<NeighborInfo> GetTable()
                 list.Add(new NeighborInfo(
                     ipAddress,
                     macAddress,
-                    ipAddress.IsIPv6Multicast || IPv4Address.IsMulticast(ipAddress),
+                    addressFamily == AddressFamily.InterNetworkV6
+                        ? ipAddress.IsIPv6Multicast
+                        : IPv4Address.IsMulticast(ipAddress),
                     (int)row.InterfaceIndex,
                     alias ?? string.Empty,
                     (NeighborState)row.State,
@@ -289,47 +287,13 @@ private static Dictionary<int, string> BuildInterfaceAliasMap()
     }
 
     /// <summary>
-    /// Returns the MAC address for <paramref name="ipAddress"/> via <c>GetIpNetEntry2</c>,
-    /// or <see langword="null"/> when no cache entry exists. Supports both IPv4 and IPv6.
+    /// Returns the MAC address for <paramref name="ipAddress"/> by scanning the neighbor
+    /// cache, or <see langword="null"/> when no entry exists. Supports both IPv4 and IPv6.
     /// </summary>
     public static string GetMACAddress(IPAddress ipAddress)
     {
-        var addressFamily = ipAddress.AddressFamily;
-
-        if (addressFamily != AddressFamily.InterNetwork && addressFamily != AddressFamily.InterNetworkV6)
-            return null;
-
-        var row = new MIB_IPNET_ROW2
-        {
-            Address = new byte[SOCKADDR_INET_SIZE],
-            PhysicalAddress = new byte[IF_MAX_PHYS_ADDRESS_LENGTH]
-        };
-
-        if (addressFamily == AddressFamily.InterNetwork)
-        {
-            // SOCKADDR_IN: family(2) at offset 0, addr(4) at offset 4
-            BitConverter.GetBytes(AF_INET).CopyTo(row.Address, 0);
-            ipAddress.GetAddressBytes().CopyTo(row.Address, 4);
-        }
-        else
-        {
-            // SOCKADDR_IN6: family(2) at offset 0, addr(16) at offset 8, scope_id(4) at offset 24
-            BitConverter.GetBytes(AF_INET6).CopyTo(row.Address, 0);
-            ipAddress.GetAddressBytes().CopyTo(row.Address, 8);
-            BitConverter.GetBytes((uint)ipAddress.ScopeId).CopyTo(row.Address, 24);
-        }
-
-        if (GetIpNetEntry2(ref row) != 0)
-            return null;
-
-        var macLen = (int)row.PhysicalAddressLength;
-        if (macLen is <= 0 or > IF_MAX_PHYS_ADDRESS_LENGTH)
-            return null;
-
-        var macBytes = new byte[macLen];
-        Buffer.BlockCopy(row.PhysicalAddress, 0, macBytes, 0, macLen);
-        
-        return new PhysicalAddress(macBytes).ToString();
+        var entry = GetTable().FirstOrDefault(x => x.IPAddress.Equals(ipAddress));
+        return entry?.MACAddress.ToString();
     }
 
     /// <summary>

Source/NETworkManager/ViewModels/NeighborTableViewModel.cs

@@ -489,7 +489,10 @@ private async void AutoRefreshTimer_Tick(object sender, EventArgs e)
     {
         _autoRefreshTimer.Stop();
 
-        await Refresh();
+        // Skip refresh while a modify operation (add/delete) is in progress to avoid
+        // clearing the table while the user is interacting with it.
+        if (!IsModifying)
+            await Refresh();
 
         _autoRefreshTimer.Start();
     }

Website/docs/application/neighbor-table.md

@@ -18,7 +18,7 @@ Both protocols are susceptible to spoofing/poisoning attacks that can manipulate
 
 :::
 
-::::::note
+:::note
 
 Adding and deleting neighbor entries requires administrator privileges. If the application is not running as administrator, the view is in read-only mode. Use the **Restart as administrator** button to relaunch the application with elevated rights.
 

Website/docs/changelog/next-release.md

@@ -27,7 +27,7 @@ Release date: **xx.xx.2025**
 
 ## Breaking Changes
 
-- **ARP Table** has been renamed to **[Neighbor Table](../application/neighbor-table.md)**. Existing settings are automatically migrated on first launch after the update. [#3403](https://github.com/BornToBeRoot/NETworkManager/pull/3403)
+- **ARP Table** has been renamed to **[Neighbor Table](../application/neighbor-table.md)**. The application list entry is automatically migrated on first launch. Other view settings (auto-refresh interval, export file type/path) reset to their defaults. [#3403](https://github.com/BornToBeRoot/NETworkManager/pull/3403)
 - **IP Scanner** export: The `ARPMACAddress` and `ARPVendor` columns have been removed from CSV, XML and JSON exports. Use `MACAddress` and `Vendor` instead, which contain the same value (ARP/NDP preferred, NetBIOS as fallback). [#3403](https://github.com/BornToBeRoot/NETworkManager/pull/3403)
 
 ## What's new?