Merge pull request #63 from BornToBeRoot/traceroute-performance

Traceroute performance improved

Author: BornToBeRoot

Source/NETworkManager/App.xaml.cs

@@ -58,16 +58,17 @@ private void Application_Startup(object sender, StartupEventArgs e)
                 return;
             }
 
-            // Single instance
+            // Create mutex
             _mutex = new Mutex(true, "{" + Guid + "}");
             bool mutexIsAcquired = _mutex.WaitOne(TimeSpan.Zero, true);
+            
+            // Release mutex
+            if (mutexIsAcquired)
+                _mutex.ReleaseMutex();
 
             if (SettingsManager.Current.Window_MultipleInstances || mutexIsAcquired)
             {
-                StartupUri = new Uri("MainWindow.xaml", UriKind.Relative);
-
-                if (mutexIsAcquired)
-                    _mutex.ReleaseMutex();
+                StartupUri = new Uri("MainWindow.xaml", UriKind.Relative);                              
             }
             else
             {

Source/NETworkManager/Models/Network/Traceroute.cs

@@ -44,37 +44,65 @@ public void TraceAsync(IPAddress ipAddress, TracerouteOptions traceOptions, Canc
             Task.Run(() =>
             {
                 byte[] buffer = new byte[traceOptions.Buffer];
-                int maximumHops = traceOptions.MaximumHops + 1;
+                int maximumHops = traceOptions.MaximumHops;
 
-                int hop = 1;
+                bool maximumHopsReached = false;
 
-                do
+                // Get the ttl of the ip
+                using (System.Net.NetworkInformation.Ping ping = new System.Net.NetworkInformation.Ping())
                 {
-                    List<Task<Tuple<PingReply, long>>> tasks = new List<Task<Tuple<PingReply, long>>>();
+                    PingReply pingReply;
 
                     for (int i = 0; i < 3; i++)
+                    {
+                        pingReply = ping.Send(ipAddress, traceOptions.Timeout, buffer, new System.Net.NetworkInformation.PingOptions() { Ttl = 64, DontFragment = traceOptions.DontFragement });
+
+                        if (pingReply.Status == IPStatus.Success)
+                        {
+                            int ttl = 64 - pingReply.Options.Ttl;
+
+                            if (ttl < maximumHops)
+                                maximumHops = ttl;
+                            else
+                                maximumHopsReached = true;
+
+                            break;
+                        }
+                    }
+                }
+
+                // Async check all hops
+                Parallel.For(1, maximumHops + 1, new ParallelOptions() { CancellationToken = cancellationToken }, i =>
+                {
+                    List<Task<Tuple<PingReply, long>>> tasks = new List<Task<Tuple<PingReply, long>>>();
+
+                    for (int y = 0; y < 3; y++)
                     {
                         tasks.Add(Task.Run(() =>
-                       {
-                           Stopwatch stopwatch = new Stopwatch();
+                        {
+                            Stopwatch stopwatch = new Stopwatch();
 
-                           PingReply pingReply;
+                            PingReply pingReply;
 
-                           using (System.Net.NetworkInformation.Ping ping = new System.Net.NetworkInformation.Ping())
-                           {
-                               stopwatch.Start();
+                            using (System.Net.NetworkInformation.Ping ping = new System.Net.NetworkInformation.Ping())
+                            {
+                                stopwatch.Start();
 
-                               pingReply = ping.Send(ipAddress, traceOptions.Timeout, buffer, new System.Net.NetworkInformation.PingOptions() { Ttl = hop, DontFragment = traceOptions.DontFragement });
+                                pingReply = ping.Send(ipAddress, traceOptions.Timeout, buffer, new System.Net.NetworkInformation.PingOptions() { Ttl = i, DontFragment = traceOptions.DontFragement });
 
-                               stopwatch.Stop();
-                           }
+                                stopwatch.Stop();
+                            }
 
-                           return Tuple.Create(pingReply, stopwatch.ElapsedMilliseconds);
-                       }));
+                            return Tuple.Create(pingReply, stopwatch.ElapsedMilliseconds);
+                        }));
                     }
 
                     Task.WaitAll(tasks.ToArray());
 
+                    // Here is a good point to cancel (Don't resolve dns...)
+                    if (cancellationToken.IsCancellationRequested)
+                        return;
+
                     IPAddress ipAddressHop = tasks.FirstOrDefault(x => x.Result.Item1 != null).Result.Item1.Address;
 
                     string hostname = string.Empty;
@@ -86,24 +114,15 @@ public void TraceAsync(IPAddress ipAddress, TracerouteOptions traceOptions, Canc
                     }
                     catch (SocketException) { } // Couldn't resolve hostname
 
-                    OnHopReceived(new TracerouteHopReceivedArgs(hop, tasks[0].Result.Item2, tasks[1].Result.Item2, tasks[2].Result.Item2, ipAddressHop, hostname, tasks[0].Result.Item1.Status, tasks[1].Result.Item1.Status, tasks[2].Result.Item1.Status));
-
-                    if (ipAddressHop != null)
-                    {
-                        if (ipAddressHop.ToString() == ipAddress.ToString())
-                        {
-                            OnTraceComplete();
-                            return;
-                        }
-                    }
-
-                    hop++;
-                } while (hop < maximumHops && !cancellationToken.IsCancellationRequested);
+                    OnHopReceived(new TracerouteHopReceivedArgs(i, tasks[0].Result.Item2, tasks[1].Result.Item2, tasks[2].Result.Item2, ipAddressHop, hostname, tasks[0].Result.Item1.Status, tasks[1].Result.Item1.Status, tasks[2].Result.Item1.Status));
+                });
 
                 if (cancellationToken.IsCancellationRequested)
                     OnUserHasCanceled();
-                else if (hop == maximumHops)
+                else if (maximumHopsReached)
                     OnMaximumHopsReached(new MaximumHopsReachedArgs(traceOptions.MaximumHops));
+                else
+                    OnTraceComplete();
 
             }, cancellationToken);
         }

Source/NETworkManager/ViewModels/Applications/TracerouteViewModel.cs

@@ -224,6 +224,7 @@ public int Hops
         public TracerouteViewModel()
         {
             _traceResultView = CollectionViewSource.GetDefaultView(TraceResult);
+            _traceResultView.SortDescriptions.Add(new SortDescription("Hop", ListSortDirection.Ascending));
 
             LoadSettings();