Preparations for v2.0

hmz777 · hmz777 · commit d88cc8cc312e · 2020-08-03T23:16:01.000+03:00
- Fixed a bug in the spoof protection mechanism.
- Fixed a bug related to the tray icon's context menu.
- Fixed a bug related to blocking newly discovered devices from toast notifications.
- Code refactorings.
diff --git a/NetStalker/NetStalker/App.config b/NetStalker/NetStalker/App.config
@@ -1,75 +1,75 @@
-﻿<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <configSections>
         <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-            <section name="NetStalker.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false" />
+            <section name="NetStalker.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
         </sectionGroup>
     </configSections>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
     <userSettings>
         <NetStalker.Properties.Settings>
             <setting name="FriendlyName" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Gateway" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="LocalIp" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Color" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Accent" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Tile" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Minimize" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="GatewayMac" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="Protocol" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="PacketDirection" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="AdapterName" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="SpoofProtection" serializeAs="String">
                 <value>False</value>
             </setting>
             <setting name="NetMask" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="NetSize" serializeAs="String">
                 <value>0</value>
             </setting>
             <setting name="SuppressN" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="LocalMac" serializeAs="String">
-                <value />
+                <value/>
             </setting>
             <setting name="BroadcastAddress" serializeAs="String">
-                <value />
+                <value/>
             </setting>
         </NetStalker.Properties.Settings>
     </userSettings>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0" />
+        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.0" newVersion="4.0.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
-	<legacyCorruptedStateExceptionsPolicy enabled="true" />
+	<legacyCorruptedStateExceptionsPolicy enabled="true"/>
   </runtime>
 </configuration>
diff --git a/NetStalker/NetStalker/Forms/Main/Main.cs b/NetStalker/NetStalker/Forms/Main/Main.cs
@@ -52,6 +52,10 @@ public partial class Main : MaterialForm, IView
         /// The list of targets of type <see cref="Device"/>
         /// </summary>
         public static ConcurrentDictionary<IPAddress, Device> Devices;
+        /// <summary>
+        /// An indication that the app is being closed from the tray icon's context menu.
+        /// </summary>
+        public bool TrayExitFlag = false;
         #endregion
 
         public Main(string[] args = null)
@@ -344,9 +348,14 @@ private void Main_FormClosing(object sender, FormClosingEventArgs e)
                     ValuesTimer.Dispose();
                 }
 
-                if (MetroMessageBox.Show(this, "Quit the application ?", "Quit", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.Cancel)
+                Devices = null;
+
+                if (e.CloseReason == CloseReason.UserClosing && !TrayExitFlag)
                 {
-                    e.Cancel = true;
+                    if (MetroMessageBox.Show(this, "Quit the application ?", "Quit", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.Cancel)
+                    {
+                        e.Cancel = true;
+                    }
                 }
             }
         }
@@ -591,7 +600,7 @@ private void FastObjectListView1_ItemsAdding(object sender, ItemsAddingEventArgs
                 if (Ad.Count > 0)
                 {
                     Device Device = Ad[0];
-                    NotificationAPI Napi = new NotificationAPI(Device);
+                    NotificationAPI Napi = new NotificationAPI(Device, this);
                     Napi.CreateNotification();
                     Napi.AttachHandlers();
                     Napi.ShowToast();
@@ -601,6 +610,11 @@ private void FastObjectListView1_ItemsAdding(object sender, ItemsAddingEventArgs
         }
 
         private void FastObjectListView1_SubItemChecking(object sender, SubItemCheckingEventArgs e)
+        {
+            SubItemCheckingHandler(e);
+        }
+
+        public void SubItemCheckingHandler(SubItemCheckingEventArgs e)
         {
             try
             {
@@ -633,6 +647,9 @@ private void FastObjectListView1_SubItemChecking(object sender, SubItemCheckingE
                     //Activate the BR if it's not already active
                     if (!Blocker_Redirector.BRMainSwitch)
                     {
+                        if (Blocker_Redirector.BRTask != null && Blocker_Redirector.BRTask.Status == TaskStatus.Running)
+                            Blocker_Redirector.BRTask.Wait();
+
                         Blocker_Redirector.BRMainSwitch = true;
                         Blocker_Redirector.BlockAndRedirect();
                     }
@@ -658,6 +675,9 @@ private void FastObjectListView1_SubItemChecking(object sender, SubItemCheckingE
                     //Activate the BR if it's not already active
                     if (!Blocker_Redirector.BRMainSwitch)
                     {
+                        if (Blocker_Redirector.BRTask != null && Blocker_Redirector.BRTask.Status == TaskStatus.Running)
+                            Blocker_Redirector.BRTask.Wait();
+
                         Blocker_Redirector.BRMainSwitch = true;
                         Blocker_Redirector.BlockAndRedirect();
                     }
diff --git a/NetStalker/NetStalker/MainLogic/Blocker-Redirector.cs b/NetStalker/NetStalker/MainLogic/Blocker-Redirector.cs
@@ -46,50 +46,50 @@ public static void BlockAndRedirect()
             MainDevice.Filter = "ip";
 
             BRTask = Task.Run(() =>
-             {
-                 RawCapture rawCapture;
-                 EthernetPacket packet;
-
-                 while (BRMainSwitch)
-                 {
-                     if ((rawCapture = MainDevice.GetNextPacket()) != null)
-                     {
-                         packet = Packet.ParsePacket(rawCapture.LinkLayerType, rawCapture.Data) as EthernetPacket;
-                         if (packet == null)
-                             continue;
-
-                         KeyValuePair<IPAddress, Device> device;
-
-                         if (!(device = Main.Devices.FirstOrDefault(D => D.Value.MAC.Equals(packet.SourceHardwareAddress))).Equals(default(KeyValuePair<IPAddress, Device>)) && device.Value.Redirected)
-                         {
-                             if (device.Value.UploadCap == 0 || device.Value.UploadCap > device.Value.PacketsSentSinceLastReset)
-                             {
-                                 packet.SourceHardwareAddress = MainDevice.MacAddress;
-                                 packet.DestinationHardwareAddress = AppConfiguration.GatewayMac;
-                                 MainDevice.SendPacket(packet);
-                                 device.Value.PacketsSentSinceLastReset += packet.Bytes.Length;
-                             }
-                         }
-                         else if (packet.SourceHardwareAddress.Equals(AppConfiguration.GatewayMac))
-                         {
-                             IPv4Packet IPV4 = packet.Extract<IPv4Packet>();
-
-                             if (!(device = Main.Devices.FirstOrDefault(D => D.Key.Equals(IPV4.DestinationAddress))).Equals(default(KeyValuePair<IPAddress, Device>)) && device.Value.Redirected)
-                             {
-                                 if (device.Value.DownloadCap == 0 || device.Value.DownloadCap > device.Value.PacketsReceivedSinceLastReset)
-                                 {
-                                     packet.SourceHardwareAddress = MainDevice.MacAddress;
-                                     packet.DestinationHardwareAddress = device.Value.MAC;
-                                     MainDevice.SendPacket(packet);
-                                     device.Value.PacketsReceivedSinceLastReset += packet.Bytes.Length;
-                                 }
-                             }
-                         }
-                     }
-
-                     SpoofClients();
-                 }
-             });
+            {
+                RawCapture rawCapture;
+                EthernetPacket packet;
+
+                while (BRMainSwitch)
+                {
+                    if ((rawCapture = MainDevice.GetNextPacket()) != null)
+                    {
+                        packet = Packet.ParsePacket(rawCapture.LinkLayerType, rawCapture.Data) as EthernetPacket;
+                        if (packet == null)
+                            continue;
+
+                        KeyValuePair<IPAddress, Device> device;
+
+                        if (!(device = Main.Devices.FirstOrDefault(D => D.Value.MAC.Equals(packet.SourceHardwareAddress))).Equals(default(KeyValuePair<IPAddress, Device>)) && device.Value.Redirected)
+                        {
+                            if (device.Value.UploadCap == 0 || device.Value.UploadCap > device.Value.PacketsSentSinceLastReset)
+                            {
+                                packet.SourceHardwareAddress = MainDevice.MacAddress;
+                                packet.DestinationHardwareAddress = AppConfiguration.GatewayMac;
+                                MainDevice.SendPacket(packet);
+                                device.Value.PacketsSentSinceLastReset += packet.Bytes.Length;
+                            }
+                        }
+                        else if (packet.SourceHardwareAddress.Equals(AppConfiguration.GatewayMac))
+                        {
+                            IPv4Packet IPV4 = packet.Extract<IPv4Packet>();
+
+                            if (!(device = Main.Devices.FirstOrDefault(D => D.Key.Equals(IPV4.DestinationAddress))).Equals(default(KeyValuePair<IPAddress, Device>)) && device.Value.Redirected)
+                            {
+                                if (device.Value.DownloadCap == 0 || device.Value.DownloadCap > device.Value.PacketsReceivedSinceLastReset)
+                                {
+                                    packet.SourceHardwareAddress = MainDevice.MacAddress;
+                                    packet.DestinationHardwareAddress = device.Value.MAC;
+                                    MainDevice.SendPacket(packet);
+                                    device.Value.PacketsReceivedSinceLastReset += packet.Bytes.Length;
+                                }
+                            }
+                        }
+                    }
+
+                    SpoofClients();
+                }
+            });
         }
 
         /// <summary>
@@ -135,12 +135,12 @@ public static void ConstructAndSendArp(Device device, BROperation Operation)
             }
             else
             {
-                ArpPacket ArpPacketForVicProtection = new ArpPacket(ArpOperation.Request, MainDevice.MacAddress, AppConfiguration.LocalIp, device.MAC, device.IP);
-                ArpPacket ArpPacketForGatewayProtection = new ArpPacket(ArpOperation.Request, MainDevice.MacAddress, AppConfiguration.LocalIp, AppConfiguration.GatewayMac, AppConfiguration.GatewayIp)
+                ArpPacket ArpPacketForVicProtection = new ArpPacket(ArpOperation.Response, MainDevice.MacAddress, AppConfiguration.LocalIp, device.MAC, device.IP);
+                ArpPacket ArpPacketForGatewayProtection = new ArpPacket(ArpOperation.Response, MainDevice.MacAddress, AppConfiguration.LocalIp, AppConfiguration.GatewayMac, AppConfiguration.GatewayIp);
+                EthernetPacket EtherPacketForVicProtection = new EthernetPacket(device.MAC, MainDevice.MacAddress, EthernetType.Arp)
                 {
                     PayloadPacket = ArpPacketForVicProtection
                 };
-                EthernetPacket EtherPacketForVicProtection = new EthernetPacket(device.MAC, MainDevice.MacAddress, EthernetType.Arp);
                 EthernetPacket EtherPacketForGatewayProtection = new EthernetPacket(AppConfiguration.GatewayMac, MainDevice.MacAddress, EthernetType.Arp)
                 {
                     PayloadPacket = ArpPacketForGatewayProtection
diff --git a/NetStalker/NetStalker/MainLogic/Controller.cs b/NetStalker/NetStalker/MainLogic/Controller.cs
@@ -1,4 +1,5 @@
 ﻿using NetStalker.MainLogic;
+using NetStalker.ToastNotifications;
 using System;
 using System.Windows.Forms;
 
@@ -53,7 +54,7 @@ public static void AttachOnExitEventHandler(IView view)
                 Scanner.CloseAllCaptures(view);
 
                 //Clean all notifications
-                //NotificationAPI.ClearNotifications();
+                NotificationAPI.ClearNotifications();
             };
         }
     }
diff --git a/NetStalker/NetStalker/MainLogic/DeviceList.cs b/NetStalker/NetStalker/MainLogic/DeviceList.cs
diff --git a/NetStalker/NetStalker/MainLogic/Tools.cs b/NetStalker/NetStalker/MainLogic/Tools.cs
@@ -1,11 +1,13 @@
-﻿using Microsoft.WindowsAPICodePack.Shell.PropertySystem;
+﻿using BrightIdeasSoftware;
+using Microsoft.WindowsAPICodePack.Shell.PropertySystem;
 using ShellHelpers;
 using System;
 using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Net;
 using System.Net.NetworkInformation;
+using System.Reflection;
 
 namespace NetStalker.MainLogic
 {
diff --git a/NetStalker/NetStalker/NetStalker.csproj b/NetStalker/NetStalker/NetStalker.csproj
@@ -8,7 +8,7 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>NetStalker</RootNamespace>
     <AssemblyName>NetStalker</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
@@ -35,7 +35,7 @@
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
+    <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>
     </DefineConstants>
@@ -45,7 +45,7 @@
     <RunCodeAnalysis>false</RunCodeAnalysis>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>x64</PlatformTarget>
+    <PlatformTarget>x86</PlatformTarget>
     <DebugType>pdbonly</DebugType>
     <Optimize>true</Optimize>
     <OutputPath>bin\Release\</OutputPath>
@@ -104,7 +104,6 @@
     <Compile Include="Forms\Information\ErrorForm.Designer.cs">
       <DependentUpon>ErrorForm.cs</DependentUpon>
     </Compile>
-    <Compile Include="MainLogic\DeviceList.cs" />
     <Compile Include="MainLogic\NativeMethods.cs" />
     <Compile Include="MainLogic\Scanner.cs" />
     <Compile Include="MainLogic\IView.cs" />
diff --git a/NetStalker/NetStalker/ToastNotifications/NotificationAPI.cs b/NetStalker/NetStalker/ToastNotifications/NotificationAPI.cs

Original file line number	Diff line number	Diff line change
`@@ -52,6 +52,10 @@ public partial class Main : MaterialForm, IView`
`52`	`52`	`/// The list of targets of type <see cref="Device"/>`
`53`	`53`	`/// </summary>`
`54`	`54`	`public static ConcurrentDictionary<IPAddress, Device> Devices;`
	`55`	`+ /// <summary>`
	`56`	`+ /// An indication that the app is being closed from the tray icon's context menu.`
	`57`	`+ /// </summary>`
	`58`	`+ public bool TrayExitFlag = false;`
`55`	`59`	`#endregion`
`56`	`60`
`57`	`61`	`public Main(string[] args = null)`
`@@ -344,9 +348,14 @@ private void Main_FormClosing(object sender, FormClosingEventArgs e)`
`344`	`348`	`ValuesTimer.Dispose();`
`345`	`349`	`}`
`346`	`350`
`347`		`- if (MetroMessageBox.Show(this, "Quit the application ?", "Quit", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.Cancel)`
	`351`	`+ Devices = null;`
	`352`	`+`
	`353`	`+ if (e.CloseReason == CloseReason.UserClosing && !TrayExitFlag)`
`348`	`354`	`{`
`349`		`- e.Cancel = true;`
	`355`	`+ if (MetroMessageBox.Show(this, "Quit the application ?", "Quit", MessageBoxButtons.OKCancel, MessageBoxIcon.Question) == DialogResult.Cancel)`
	`356`	`+ {`
	`357`	`+ e.Cancel = true;`
	`358`	`+ }`
`350`	`359`	`}`
`351`	`360`	`}`
`352`	`361`	`}`
`@@ -591,7 +600,7 @@ private void FastObjectListView1_ItemsAdding(object sender, ItemsAddingEventArgs`
`591`	`600`	`if (Ad.Count > 0)`
`592`	`601`	`{`
`593`	`602`	`Device Device = Ad[0];`
`594`		`- NotificationAPI Napi = new NotificationAPI(Device);`
	`603`	`+ NotificationAPI Napi = new NotificationAPI(Device, this);`
`595`	`604`	`Napi.CreateNotification();`
`596`	`605`	`Napi.AttachHandlers();`
`597`	`606`	`Napi.ShowToast();`
`@@ -601,6 +610,11 @@ private void FastObjectListView1_ItemsAdding(object sender, ItemsAddingEventArgs`
`601`	`610`	`}`
`602`	`611`
`603`	`612`	`private void FastObjectListView1_SubItemChecking(object sender, SubItemCheckingEventArgs e)`
	`613`	`+ {`
	`614`	`+ SubItemCheckingHandler(e);`
	`615`	`+ }`
	`616`	`+`
	`617`	`+ public void SubItemCheckingHandler(SubItemCheckingEventArgs e)`
`604`	`618`	`{`
`605`	`619`	`try`
`606`	`620`	`{`
`@@ -633,6 +647,9 @@ private void FastObjectListView1_SubItemChecking(object sender, SubItemCheckingE`
`633`	`647`	`//Activate the BR if it's not already active`
`634`	`648`	`if (!Blocker_Redirector.BRMainSwitch)`
`635`	`649`	`{`
	`650`	`+ if (Blocker_Redirector.BRTask != null && Blocker_Redirector.BRTask.Status == TaskStatus.Running)`
	`651`	`+ Blocker_Redirector.BRTask.Wait();`
	`652`	`+`
`636`	`653`	`Blocker_Redirector.BRMainSwitch = true;`
`637`	`654`	`Blocker_Redirector.BlockAndRedirect();`
`638`	`655`	`}`
`@@ -658,6 +675,9 @@ private void FastObjectListView1_SubItemChecking(object sender, SubItemCheckingE`
`658`	`675`	`//Activate the BR if it's not already active`
`659`	`676`	`if (!Blocker_Redirector.BRMainSwitch)`
`660`	`677`	`{`
	`678`	`+ if (Blocker_Redirector.BRTask != null && Blocker_Redirector.BRTask.Status == TaskStatus.Running)`
	`679`	`+ Blocker_Redirector.BRTask.Wait();`
	`680`	`+`
`661`	`681`	`Blocker_Redirector.BRMainSwitch = true;`
`662`	`682`	`Blocker_Redirector.BlockAndRedirect();`
`663`	`683`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using NetStalker.MainLogic;`
	`2`	`+using NetStalker.ToastNotifications;`
`2`	`3`	`using System;`
`3`	`4`	`using System.Windows.Forms;`
`4`	`5`
`@@ -53,7 +54,7 @@ public static void AttachOnExitEventHandler(IView view)`
`53`	`54`	`Scanner.CloseAllCaptures(view);`
`54`	`55`
`55`	`56`	`//Clean all notifications`
`56`		`- //NotificationAPI.ClearNotifications();`
	`57`	`+ NotificationAPI.ClearNotifications();`
`57`	`58`	`};`
`58`	`59`	`}`
`59`	`60`	`}`