* Added multithreaded port scanning

* Fixed all UDP ports being displayed as OPEN
* Connection timeout can now be set in millliseconds, seconds and minutes
* Design changes
* Improved some code documentation

Author: CodeDead

Advanced PortChecker/Advanced PortChecker.csproj

@@ -71,10 +71,11 @@
     </ApplicationDefinition>
     <Compile Include="Classes\Export\ExportType.cs" />
     <Compile Include="Classes\Export\ExportWriter.cs" />
-    <Compile Include="Classes\Controls\LvCheck.cs" />
-    <Compile Include="Classes\Scanner\OperationInformation.cs" />
-    <Compile Include="Classes\Scanner\PortChecker.cs" />
-    <Compile Include="Classes\StyleManager.cs" />
+    <Compile Include="Classes\Objects\LvCheck.cs" />
+    <Compile Include="Classes\Scanner\ScanOperation.cs" />
+    <Compile Include="Classes\Scanner\PortScanner.cs" />
+    <Compile Include="Classes\GUI\StyleManager.cs" />
+    <Compile Include="Classes\Utils\ThreadCalculator.cs" />
     <Compile Include="Windows\AboutWindow.xaml.cs">
       <DependentUpon>AboutWindow.xaml</DependentUpon>
     </Compile>

Advanced PortChecker/App.config

@@ -23,7 +23,7 @@
                 <value>True</value>
             </setting>
             <setting name="TimeOut" serializeAs="String">
-                <value>1000</value>
+                <value>500</value>
             </setting>
             <setting name="WindowOpacity" serializeAs="String">
                 <value>1</value>
@@ -35,7 +35,10 @@
                 <value>True</value>
             </setting>
             <setting name="TimeOutType" serializeAs="String">
-                <value>1</value>
+                <value>0</value>
+            </setting>
+            <setting name="ScanThreads" serializeAs="String">
+                <value>2</value>
             </setting>
         </Advanced_PortChecker.Properties.Settings>
     </userSettings>

Advanced PortChecker/Classes/Export/ExportWriter.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Text;
 using System.Windows.Controls;
-using Advanced_PortChecker.Classes.Controls;
+using Advanced_PortChecker.Classes.Objects;
 
 namespace Advanced_PortChecker.Classes.Export
 {

…nced PortChecker/Classes/StyleManager.cs … PortChecker/Classes/GUI/StyleManager.csAdvanced PortChecker/Classes/StyleManager.cs renamed to Advanced PortChecker/Classes/GUI/StyleManager.cs Advanced PortChecker/Classes/StyleManager.cs renamed to Advanced PortChecker/Classes/GUI/StyleManager.cs

@@ -3,7 +3,7 @@
 using System.Windows.Media;
 using Syncfusion.Windows.Shared;
 
-namespace Advanced_PortChecker.Classes
+namespace Advanced_PortChecker.Classes.GUI
 {
     /// <summary>
     /// Static class to change the style of an object

… PortChecker/Classes/Controls/LvCheck.cs …d PortChecker/Classes/Objects/LvCheck.csAdvanced PortChecker/Classes/Controls/LvCheck.cs renamed to Advanced PortChecker/Classes/Objects/LvCheck.cs Advanced PortChecker/Classes/Controls/LvCheck.cs renamed to Advanced PortChecker/Classes/Objects/LvCheck.cs

@@ -1,4 +1,4 @@
-namespace Advanced_PortChecker.Classes.Controls
+namespace Advanced_PortChecker.Classes.Objects
 {
     /// <summary>
     /// Represents the content of a ListViewItem

…rtChecker/Classes/Scanner/PortChecker.cs …rtChecker/Classes/Scanner/PortScanner.csAdvanced PortChecker/Classes/Scanner/PortChecker.cs renamed to Advanced PortChecker/Classes/Scanner/PortScanner.cs Advanced PortChecker/Classes/Scanner/PortChecker.cs renamed to Advanced PortChecker/Classes/Scanner/PortScanner.cs

@@ -2,15 +2,14 @@
 using System.Collections.Generic;
 using System.Net;
 using System.Net.Sockets;
-using System.Threading.Tasks;
-using Advanced_PortChecker.Classes.Controls;
+using Advanced_PortChecker.Classes.Objects;
 
 namespace Advanced_PortChecker.Classes.Scanner
 {
     /// <summary>
     /// Static class to determine whether a certain port is open or not
     /// </summary>
-    internal static class PortChecker
+    internal static class PortScanner
     {
         // ReSharper disable once InconsistentNaming
         /// <summary>
@@ -19,26 +18,23 @@ internal static class PortChecker
         /// <param name="address">The IP address that needs to be scanned</param>
         /// <param name="startPort">The starting point of ports that needs to be scanned</param>
         /// <param name="stopPort">The final port in a range of ports that needs to be scanned</param>
-        /// <param name="timeout">The amount of time before the operation cancels</param>
-        /// <param name="oi">The operation information regarding this scan</param>
-        /// <returns>A list of information regarding the ports and address that was scanned</returns>
+        /// <param name="timeout">The amount of time before a connection times out</param>
+        /// <param name="scanOperation">The operation information regarding this scan</param>
+        /// <returns>A list of LvCheck objects containing information regarding the ports and address that were scanned</returns>
         // ReSharper disable once IdentifierTypo
-        internal static async Task<List<LvCheck>> CheckTCPUDP(string address, int startPort, int stopPort, int timeout, OperationInformation oi)
+        internal static List<LvCheck> CheckTCPUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation)
         {
             List<LvCheck> lv = new List<LvCheck>();
-            await Task.Run(() =>
+            for (int i = startPort; i <= stopPort; i++)
             {
-                for (int i = startPort; i <= stopPort; i++)
-                {
-                    if (oi.IsCancelled) return;
-
-                    lv.AddRange(CheckTCP(address, i, i, timeout, oi, false).Result);
-                    lv.AddRange(CheckUDP(address, i, i, timeout, oi, false).Result);
+                if (scanOperation.IsCancelled) break;
 
-                    oi.Progress.Report(i);
-                }
-            });
+                lv.AddRange(CheckTCP(address, i, i, timeout, scanOperation, false));
+                lv.AddRange(CheckUDP(address, i, i, timeout, scanOperation, false));
 
+                scanOperation.Progress.Report(1);
+            }
+            scanOperation.ScanCompletedEvent?.Invoke();
             return lv;
         }
 
@@ -49,37 +45,39 @@ await Task.Run(() =>
         /// <param name="address">The IP address that needs to be scanned</param>
         /// <param name="startPort">The starting point of ports that needs to be scanned</param>
         /// <param name="stopPort">The final port in a range of ports that needs to be scanned</param>
-        /// <param name="timeout">The amount of time before the operation cancels</param>
-        /// <param name="oi">The operation information regarding this scan</param>
+        /// <param name="timeout">The amount of time before the connection times out</param>
+        /// <param name="scanOperation">The operation information regarding this scan</param>
         /// <param name="reportProgress">A boolean to represent whether this method should report the current progress or not</param>
-        /// <returns>A list of information regarding the ports and address that was scanned</returns>
-        internal static async Task<List<LvCheck>> CheckTCP(string address, int startPort, int stopPort, int timeout, OperationInformation oi, bool reportProgress)
+        /// <returns>A list of LvCheck objects containing information regarding the ports and address that were scanned</returns>
+        internal static List<LvCheck> CheckTCP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)
         {
             List<LvCheck> lv = new List<LvCheck>();
-            await Task.Run(() =>
+            for (int i = startPort; i <= stopPort; i++)
             {
-                for (int i = startPort; i <= stopPort; i++)
+                if (scanOperation.IsCancelled) break;
+
+                LvCheck check = new LvCheck
                 {
-                    if (oi.IsCancelled) return;
-
-                    // ReSharper disable once UseObjectOrCollectionInitializer
-                    LvCheck check = new LvCheck
-                    {
-                        Address = address,
-                        Port = i,
-                        HostName = GetMachineNameFromIpAddress(address),
-                        Type = "TCP",
-                        Description = IsTcpOpen(address, i, timeout) ? "Open" : "Closed"
-                    };
-                    lv.Add(check);
-
-                    if (reportProgress)
-                    {
-                        oi.Progress.Report(i);
-                    }
-                    oi.ItemProgress.Report(check);
+                    Address = address,
+                    Port = i,
+                    HostName = GetMachineNameFromIpAddress(address),
+                    Type = "TCP",
+                    Description = IsTcpOpen(address, i, timeout) ? "Open" : "Closed"
+                };
+                lv.Add(check);
+
+                if (reportProgress)
+                {
+                    scanOperation.Progress.Report(1);
                 }
-            });
+                scanOperation.ItemProgress.Report(check);
+            }
+
+            if (reportProgress)
+            {
+                scanOperation.ScanCompletedEvent?.Invoke();
+            }
+            
             return lv;
         }
 
@@ -90,37 +88,38 @@ await Task.Run(() =>
         /// <param name="address">The IP address that needs to be scanned</param>
         /// <param name="startPort">The starting point of ports that needs to be scanned</param>
         /// <param name="stopPort">The final port in a range of ports that needs to be scanned</param>
-        /// <param name="timeout">The amount of time before the operation cancels</param>
-        /// <param name="oi">The operation information regarding this scan</param>
+        /// <param name="timeout">The amount of time before the connection times out</param>
+        /// <param name="scanOperation">The operation information regarding this scan</param>
         /// <param name="reportProgress">A boolean to represent whether this method should report the current progress or not</param>
-        /// <returns>A list of information regarding the ports and address that was scanned</returns>
-        internal static async Task<List<LvCheck>> CheckUDP(string address, int startPort, int stopPort, int timeout, OperationInformation oi, bool reportProgress)
+        /// <returns>A list of LvCheck objects containing information regarding the ports and address that were scanned</returns>
+        internal static List<LvCheck> CheckUDP(string address, int startPort, int stopPort, int timeout, ScanOperation scanOperation, bool reportProgress)
         {
             List<LvCheck> lv = new List<LvCheck>();
-            await Task.Run(() =>
+            for (int i = startPort; i <= stopPort; i++)
             {
-                for (int i = startPort; i <= stopPort; i++)
+                if (scanOperation.IsCancelled) break;
+
+                LvCheck check = new LvCheck
+                {
+                    Address = address,
+                    Port = i,
+                    HostName = GetMachineNameFromIpAddress(address),
+                    Type = "UDP",
+                    Description = IsUdpOpen(address, i, timeout) ? "Open" : "Closed"
+                };
+                lv.Add(check);
+
+                if (reportProgress)
                 {
-                    if (oi.IsCancelled) return;
-
-                    // ReSharper disable once UseObjectOrCollectionInitializer
-                    LvCheck check = new LvCheck
-                    {
-                        Address = address,
-                        Port = i,
-                        HostName = GetMachineNameFromIpAddress(address),
-                        Type = "UDP",
-                        Description = IsUdpOpen(address, i, timeout) ? "Open" : "Closed"
-                    };
-                    lv.Add(check);
-
-                    if (reportProgress)
-                    {
-                        oi.Progress.Report(i);
-                    }
-                    oi.ItemProgress.Report(check);
+                    scanOperation.Progress.Report(1);
                 }
-            });
+                scanOperation.ItemProgress.Report(check);
+            }
+
+            if (reportProgress)
+            {
+                scanOperation.ScanCompletedEvent?.Invoke();
+            }
             return lv;
         }
 
@@ -130,8 +129,8 @@ await Task.Run(() =>
         /// </summary>
         /// <param name="address">The IP address that needs to be scanned</param>
         /// <param name="port">The port that needs to be scanned</param>
-        /// <param name="timeout">The amount of time before the operation cancels</param>
-        /// <returns>Returns true if the port is open for connections</returns>
+        /// <param name="timeout">The amount of time before the connection times out</param>
+        /// <returns>Returns true if the port is open</returns>
         private static bool IsTcpOpen(string address, int port, int timeout)
         {
             try
@@ -156,8 +155,8 @@ private static bool IsTcpOpen(string address, int port, int timeout)
         /// </summary>
         /// <param name="address">The IP address that needs to be scanned</param>
         /// <param name="port">The port that needs to be scanned</param>
-        /// <param name="timeout">The amount of time before the operation cancels</param>
-        /// <returns>Returns true if the port is open for connections</returns>
+        /// <param name="timeout">The amount of time before the connection times out</param>
+        /// <returns>Returns true if the port is open</returns>
         private static bool IsUdpOpen(string address, int port, int timeout)
         {
             try
@@ -168,14 +167,21 @@ private static bool IsUdpOpen(string address, int port, int timeout)
                     udpClient.Client.SendTimeout = timeout;
 
                     udpClient.Connect(address, port);
-                    return true;
+
+                    byte[] sendBytes = new byte[4];
+                    new Random().NextBytes(sendBytes);
+                    udpClient.Send(sendBytes, sendBytes.Length);
+                    
+                    IPEndPoint remoteIpEndPoint = new IPEndPoint(IPAddress.Any, 0);
+
+                    byte[] result = udpClient.Receive(ref remoteIpEndPoint);
+                    return result.Length != 0;
                 }
             }
             catch (Exception)
             {
-                // ignored
+                return false;
             }
-            return false;
         }
 
         /// <summary>

…/Classes/Scanner/OperationInformation.cs …Checker/Classes/Scanner/ScanOperation.csAdvanced PortChecker/Classes/Scanner/OperationInformation.cs renamed to Advanced PortChecker/Classes/Scanner/ScanOperation.cs Advanced PortChecker/Classes/Scanner/OperationInformation.cs renamed to Advanced PortChecker/Classes/Scanner/ScanOperation.cs

@@ -1,12 +1,12 @@
 using System;
-using Advanced_PortChecker.Classes.Controls;
+using Advanced_PortChecker.Classes.Objects;
 
 namespace Advanced_PortChecker.Classes.Scanner
 {
     /// <summary>
     /// Represents the content of a scan operation
     /// </summary>
-    internal sealed class OperationInformation
+    internal sealed class ScanOperation
     {
         /// <summary>
         /// A boolean to indicate whether an operation was cancelled
@@ -20,5 +20,13 @@ internal sealed class OperationInformation
         /// The LvCheck item that is currently undergoing an operation
         /// </summary>
         internal IProgress<LvCheck> ItemProgress { get; set; }
+        /// <summary>
+        /// Delegate that can be called when the ScanOperation has completed its work
+        /// </summary>
+        internal delegate void ScanOperationCompleted();
+        /// <summary>
+        /// Event that can be used to indicate that a ScanOperation has completed its work
+        /// </summary>
+        internal ScanOperationCompleted ScanCompletedEvent;
     }
 }

Advanced PortChecker/Classes/Utils/ThreadCalculator.cs

@@ -0,0 +1,63 @@
+using System.Collections.Generic;
+
+namespace Advanced_PortChecker.Classes.Utils
+{
+    /// <summary>
+    /// Internal class to calculate the amount of actions that can to be performed per thread
+    /// </summary>
+    internal static class ThreadCalculator
+    {
+        /// <summary>
+        /// Get the actions that can be performed per thread
+        /// </summary>
+        /// <param name="numberOfThreads">The number of threads that need to perform a certain amount of actions</param>
+        /// <param name="numberOfActions">The number of actions that need to be performed by the threads</param>
+        /// <returns>The number of actions that need to be performed per thread</returns>
+        internal static IEnumerable<int> GetActionsPerThreads(int numberOfThreads, int numberOfActions)
+        {
+            // We have too many threads for the requested amount of actions
+            while (numberOfActions < numberOfThreads)
+            {
+                numberOfThreads--;
+            }
+
+            int[] actionsPerThread = new int[numberOfThreads];
+            // Intentional loss of data
+            int perThread = numberOfActions / numberOfThreads;
+            int actionRemainder = numberOfActions - (numberOfThreads * perThread);
+
+            // No need to split anything. The threads can perform an equal amount of actions
+            if (actionRemainder == 0)
+            {
+                for (int i = 0; i < numberOfThreads; i++)
+                {
+                    actionsPerThread[i] = perThread;
+                }
+            }
+            // We have more actions than we have threads. Time to reduce our thread count to the amount of actions
+            else if (numberOfThreads > numberOfActions)
+            {
+                for (int i = 0; i < numberOfActions; i++)
+                {
+                    actionsPerThread[i]++;
+                }
+            }
+            // We have an unequal amount of actions per thread, time to split them
+            else
+            {
+                // All threads perform the calculated amount of actions (rounded down)
+                for (int i = 0; i < actionsPerThread.Length; i++)
+                {
+                    actionsPerThread[i] = perThread;
+                }
+
+                // Some tasks will have to do more work
+                for (int i = 0; i < actionRemainder; i++)
+                {
+                    actionsPerThread[i]++;
+                }
+            }
+            return actionsPerThread;
+        }
+    }
+}