DNS Lookup improved, some changes

BornToBeRoot · BornToBeRoot · commit dc12ddc7a1da · 2017-08-15T22:03:01.000+02:00
diff --git a/Source/NETworkManager/App.xaml.cs b/Source/NETworkManager/App.xaml.cs
@@ -23,7 +23,7 @@ private void Application_Startup(object sender, StartupEventArgs e)
 
             if (CommandLineManager.Current.Help)
             {
-                StartupUri = new Uri("/Views/Others/HelpCommandLineWindow.xaml", UriKind.Relative);
+                StartupUri = new Uri("/Views/Help/HelpCommandLineWindow.xaml", UriKind.Relative);
                 return;
             }
 
diff --git a/Source/NETworkManager/Models/Network/DNSLookup.cs b/Source/NETworkManager/Models/Network/DNSLookup.cs
@@ -9,6 +9,8 @@ public class DNSLookup
     {
         #region Variables
         Resolver dnsResolver = new Resolver();
+
+        int resourceRecordsCount;
         #endregion
 
         #region Events
@@ -26,11 +28,11 @@ protected virtual void OnLookupError(DNSLookupErrorArgs e)
             LookupError?.Invoke(this, e);
         }
 
-        public event EventHandler LookupComplete;
+        public event EventHandler<DNSLookupCompleteArgs> LookupComplete;
 
-        protected virtual void OnLookupComplete()
+        protected virtual void OnLookupComplete(DNSLookupCompleteArgs e)
         {
-            LookupComplete?.Invoke(this, EventArgs.Empty);
+            LookupComplete?.Invoke(this, e);
         }
         #endregion
 
@@ -71,7 +73,7 @@ public void LookupAsync(string hostnameOrIPAddress, DNSLookupOptions dnsLookupOp
                 ProcessResponse(dnsResponse);
 
                 // If we get a CNAME back (from a result), do a second request and try to get the A, AAAA etc... 
-                if(dnsLookupOptions.Type != QType.CNAME)
+                if(dnsLookupOptions.ResolveCNAME && dnsLookupOptions.Type != QType.CNAME)
                 {
                     foreach (RecordCNAME r in dnsResponse.RecordsCNAME)
                     {
@@ -87,43 +89,43 @@ public void LookupAsync(string hostnameOrIPAddress, DNSLookupOptions dnsLookupOp
                     }
                 }
 
-                OnLookupComplete();
+                OnLookupComplete(new DNSLookupCompleteArgs(dnsResponse.RecordsA.Length + dnsResponse.RecordsAAAA.Length + dnsResponse.RecordsCNAME.Length + dnsResponse.RecordsMX.Length + dnsResponse.RecordsNS.Length + dnsResponse.RecordsPTR.Length + dnsResponse.RecordsSOA.Length + dnsResponse.RecordsTXT.Length));
             });
         }
 
         private void ProcessResponse(Response dnsResponse)
         {
             // A
             foreach (RecordA r in dnsResponse.RecordsA)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString().TrimEnd()));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
 
             // AAAA
             foreach (RecordAAAA r in dnsResponse.RecordsAAAA)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString().TrimEnd()));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
 
             // CNAME
             foreach (RecordCNAME r in dnsResponse.RecordsCNAME)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString().TrimEnd()));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
 
             // MX
             foreach (RecordMX r in dnsResponse.RecordsMX)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString().TrimEnd()));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
 
             // NS
             foreach (RecordNS r in dnsResponse.RecordsNS)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString().TrimEnd()));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
 
             // PTR
             foreach (RecordPTR r in dnsResponse.RecordsPTR)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString().TrimEnd()));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
 
             // SOA
             foreach (RecordSOA r in dnsResponse.RecordsSOA)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString().TrimEnd()));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
 
             // TXT
             foreach (RecordTXT r in dnsResponse.RecordsTXT)
-                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r.ToString().TrimEnd()));
+                OnRecordReceived(new DNSLookupRecordArgs(r.RR, r));
         }
         #endregion
     }
diff --git a/Source/NETworkManager/Models/Network/DNSLookupCompleteArgs.cs b/Source/NETworkManager/Models/Network/DNSLookupCompleteArgs.cs
@@ -0,0 +1,17 @@
+﻿namespace NETworkManager.Models.Network
+{
+    public class DNSLookupCompleteArgs : System.EventArgs
+    {
+        public int ResourceRecordsCount { get; set; }
+
+        public DNSLookupCompleteArgs()
+        {
+
+        }
+
+        public DNSLookupCompleteArgs(int resourceRecordsCount)
+        {
+            ResourceRecordsCount = resourceRecordsCount;
+        }
+    }
+}
diff --git a/Source/NETworkManager/Models/Network/DNSLookupOptions.cs b/Source/NETworkManager/Models/Network/DNSLookupOptions.cs
@@ -13,6 +13,7 @@ public class DNSLookupOptions
         public TransportType TransportType { get; set; }
         public int Attempts { get; set; }
         public int Timeout { get; set;}
+        public bool ResolveCNAME { get; set; }
 
         public DNSLookupOptions()
         {
diff --git a/Source/NETworkManager/Models/Network/DNSLookupRecordArgs.cs b/Source/NETworkManager/Models/Network/DNSLookupRecordArgs.cs
@@ -15,7 +15,7 @@ public DNSLookupRecordArgs()
         public DNSLookupRecordArgs(RR resourceRecord, object result)
         {
             ResourceRecord = resourceRecord;
-            Result = result.ToString();
+            Result = result.ToString().TrimEnd();
         }
     }
 }
diff --git a/Source/NETworkManager/Models/Settings/SettingsInfo.cs b/Source/NETworkManager/Models/Settings/SettingsInfo.cs
@@ -793,6 +793,20 @@ public QType DNSLookup_Type
             }
         }
 
+        private bool _dnsLookup_ResolveCNAME = true;
+        public bool DNSLookup_ResolveCNAME
+        {
+            get { return _dnsLookup_ResolveCNAME; }
+            set
+            {
+                if (value == _dnsLookup_ResolveCNAME)
+                    return;
+
+                _dnsLookup_ResolveCNAME = value;
+                SettingsChanged = true;
+            }
+        }
+
         private bool _dnsLookup_Recursion = true;
         public bool DNSLookup_Recursion
         {
@@ -861,7 +875,7 @@ public int DNSLookup_Timeout
                 _dnsLookup_Timeout = value;
                 SettingsChanged = true;
             }
-        }
+        }        
         #endregion
         #endregion
 
diff --git a/Source/NETworkManager/NETworkManager.csproj b/Source/NETworkManager/NETworkManager.csproj
@@ -164,6 +164,7 @@
     <Compile Include="3rdParty\Heijden.DNS\Structs.cs" />
     <Compile Include="Converters\NullableDateTimeToStringConverter.cs" />
     <Compile Include="Models\Network\DNSLookup.cs" />
+    <Compile Include="Models\Network\DNSLookupCompleteArgs.cs" />
     <Compile Include="Models\Network\DNSLookupOptions.cs" />
     <Compile Include="Models\Network\DNSLookupErrorArgs.cs" />
     <Compile Include="Models\Network\DNSLookupRecordInfo.cs" />
@@ -179,7 +180,7 @@
     <Compile Include="Views\Settings\SettingsApplicationWakeOnLANView.xaml.cs">
       <DependentUpon>SettingsApplicationWakeOnLANView.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Views\Others\HelpCommandLineWindow.xaml.cs">
+    <Compile Include="Views\Help\HelpCommandLineWindow.xaml.cs">
       <DependentUpon>HelpCommandLineWindow.xaml</DependentUpon>
     </Compile>
     <Compile Include="WpfHelper\ProtocolSettingsLayout.cs" />
@@ -319,7 +320,7 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
-    <Page Include="Views\Others\HelpCommandLineWindow.xaml">
+    <Page Include="Views\Help\HelpCommandLineWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -215,6 +215,7 @@
     <system:String x:Key="String_NoDnsRecordFoundCheckYourInputAndSettings">Kein DNS-Eintrag für "{0}" gefunden! Überprüfe deine Eingabe und die Einstellungen.</system:String>
     <system:String x:Key="String_UnkownError">Unbekannter Fehler!</system:String>
     <system:String x:Key="String_TimeoutWhenQueryingDNSServer">Timeout beim Abfragen des DNS-Servers mit der IP-Adresse "{0}"!</system:String>
+    <system:String x:Key="String_ResolveCNAME">CNAME auflösen</system:String>
 
     <!-- Buttons -->
     <system:String x:Key="String_Button_Change">Wechseln</system:String>
diff --git a/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml b/Source/NETworkManager/Resources/Localization/Resources.en-US.xaml
@@ -217,6 +217,7 @@
     <system:String x:Key="String_NoDnsRecordFoundCheckYourInputAndSettings">No dns record found for "{0}"! Check your input and the settings.</system:String>
     <system:String x:Key="String_UnkownError">Unkown error!</system:String>
     <system:String x:Key="String_TimeoutWhenQueryingDNSServer">Timeout when querying the DNS server with the IP-Address "{0}"!</system:String>
+    <system:String x:Key="String_ResolveCNAME">Resolve CNAME</system:String>
     
     <!-- Buttons -->
     <system:String x:Key="String_Button_Change">Change</system:String>
diff --git a/Source/NETworkManager/ViewModels/Applications/DNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/Applications/DNSLookupViewModel.cs
@@ -164,7 +164,8 @@ private void StartLookup()
                 UseResolverCache = SettingsManager.Current.DNSLookup_UseResolverCache,
                 TransportType = SettingsManager.Current.DNSLookup_TransportType,
                 Attempts = SettingsManager.Current.DNSLookup_Attempts,
-                Timeout = SettingsManager.Current.DNSLookup_Timeout
+                Timeout = SettingsManager.Current.DNSLookup_Timeout,
+                ResolveCNAME = SettingsManager.Current.DNSLookup_ResolveCNAME
             };
 
             DNSLookup dnsLookup = new DNSLookup();
@@ -182,7 +183,7 @@ private void DnsLookup_RecordReceived(object sender, DNSLookupRecordArgs e)
         {
             DNSLookupRecordInfo dnsLookupRecordInfo = DNSLookupRecordInfo.Parse(e);
 
-            Application.Current.Dispatcher.BeginInvoke(new Action(delegate ()
+            Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send,new Action(delegate ()
             {
                 LookupResult.Add(dnsLookupRecordInfo);
             }));                        
@@ -200,9 +201,9 @@ private void DnsLookup_LookupError(object sender, DNSLookupErrorArgs e)
             IsLookupRunning = false;
         }
 
-        private void DnsLookup_LookupComplete(object sender, EventArgs e)
+        private void DnsLookup_LookupComplete(object sender, DNSLookupCompleteArgs e)
         {
-            if (LookupResult.Count == 0)
+            if (e.ResourceRecordsCount == 0)
             {
                 ErrorMessage = string.Format(Application.Current.Resources["String_NoDnsRecordFoundCheckYourInputAndSettings"] as string, HostnameOrIPAddress);
                 DisplayErrorMessage = true;
diff --git a/Source/NETworkManager/ViewModels/Applications/WikiViewModel.cs b/Source/NETworkManager/ViewModels/Applications/WikiViewModel.cs
@@ -252,7 +252,7 @@ private async void OUILookupAction()
                 }
             }
 
-            foreach(OUIInfo info in await OUILookup.LookupByVendorAsync(vendors))
+            foreach (OUIInfo info in await OUILookup.LookupByVendorAsync(vendors))
             {
                 OUILookupResult.Add(info);
             }
@@ -342,7 +342,7 @@ private async void PortLookupAction()
                 }
             }
 
-                      foreach (PortLookupInfo info in await PortLookup.LookupByServiceAsync(portsByService))
+            foreach (PortLookupInfo info in await PortLookup.LookupByServiceAsync(portsByService))
             {
                 PortLookupResult.Add(info);
             }
diff --git a/Source/NETworkManager/ViewModels/Settings/SettingsApplicationDNSLookupViewModel.cs b/Source/NETworkManager/ViewModels/Settings/SettingsApplicationDNSLookupViewModel.cs
@@ -83,6 +83,23 @@ public QType Type
             }
         }
 
+        private bool _resolveCNAME;
+        public bool ResolveCNAME
+        {
+            get { return _resolveCNAME; }
+            set
+            {
+                if (value == _resolveCNAME)
+                    return;
+
+                if (!_isLoading)
+                    SettingsManager.Current.DNSLookup_ResolveCNAME = value;
+
+                _resolveCNAME = value;
+                OnPropertyChanged();
+            }
+        }
+
         private bool _recursion;
         public bool Recursion
         {
@@ -187,6 +204,7 @@ private void LoadSettings()
             Class = Classes.First(x => x == SettingsManager.Current.DNSLookup_Class);
             Types = Enum.GetValues(typeof(QType)).Cast<QType>().OrderBy(x => x.ToString()).ToList();
             Type = Types.First(x => x == SettingsManager.Current.DNSLookup_Type);
+            ResolveCNAME = SettingsManager.Current.DNSLookup_ResolveCNAME;
             Recursion = SettingsManager.Current.DNSLookup_Recursion;
             UseResolverCache = SettingsManager.Current.DNSLookup_UseResolverCache;
             TransportTypes = Enum.GetValues(typeof(TransportType)).Cast<TransportType>().OrderBy(x => x.ToString()).ToList();
diff --git a/Source/NETworkManager/Views/Help/HelpCommandLineWindow.xaml b/Source/NETworkManager/Views/Help/HelpCommandLineWindow.xaml
@@ -1,4 +1,4 @@
-﻿<Controls:MetroWindow x:Name="MetroWindowHelpCommandLine" x:Class="NETworkManager.Views.Others.HelpCommandLineWindow"
+﻿<Controls:MetroWindow x:Name="MetroWindowHelpCommandLine" x:Class="NETworkManager.Views.Help.HelpCommandLineWindow"
         xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
         xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/Source/NETworkManager/Views/Help/HelpCommandLineWindow.xaml.cs b/Source/NETworkManager/Views/Help/HelpCommandLineWindow.xaml.cs
@@ -1,6 +1,6 @@
 ﻿using MahApps.Metro.Controls;
 
-namespace NETworkManager.Views.Others
+namespace NETworkManager.Views.Help
 {
     /// <summary>
     /// Interaktionslogik für Settings.xaml
diff --git a/Source/NETworkManager/Views/Settings/SettingsApplicationDNSLookupView.xaml b/Source/NETworkManager/Views/Settings/SettingsApplicationDNSLookupView.xaml
@@ -23,6 +23,7 @@
         <ComboBox FontSize="14" ItemsSource="{Binding Classes}" SelectedItem="{Binding Class}" Width="250" HorizontalAlignment="Left"  Margin="0,0,0,10"/>
         <TextBlock Text="{DynamicResource String_Type}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />
         <ComboBox FontSize="14" ItemsSource="{Binding Types}" SelectedItem="{Binding Type}" Width="250" HorizontalAlignment="Left"  Margin="0,0,0,10"/>
+        <mah:ToggleSwitch Header="{DynamicResource String_ResolveCNAME}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding ResolveCNAME}" Margin="0,0,0,10"/>
         <mah:ToggleSwitch Header="{DynamicResource String_Recursion}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding Recursion}" Margin="0,0,0,10"/>
         <mah:ToggleSwitch Header="{DynamicResource String_UseResolverCache}" OnLabel="{DynamicResource String_ToggleSwitch_On}" OffLabel="{DynamicResource String_ToggleSwitch_Off}" IsChecked="{Binding UseResolverCache}" Margin="0,0,0,10"/>
         <TextBlock Text="{DynamicResource String_Protocol}" Style="{DynamicResource DefaultTextBlock}" VerticalAlignment="Center" Margin="0,0,0,10" />

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ private void Application_Startup(object sender, StartupEventArgs e)`
`23`	`23`
`24`	`24`	`if (CommandLineManager.Current.Help)`
`25`	`25`	`{`
`26`		`- StartupUri = new Uri("/Views/Others/HelpCommandLineWindow.xaml", UriKind.Relative);`
	`26`	`+ StartupUri = new Uri("/Views/Help/HelpCommandLineWindow.xaml", UriKind.Relative);`
`27`	`27`	`return;`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,7 @@ public class DNSLookupOptions`
`13`	`13`	`public TransportType TransportType { get; set; }`
`14`	`14`	`public int Attempts { get; set; }`
`15`	`15`	`public int Timeout { get; set;}`
	`16`	`+ public bool ResolveCNAME { get; set; }`
`16`	`17`
`17`	`18`	`public DNSLookupOptions()`
`18`	`19`	`{`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public DNSLookupRecordArgs()`
`15`	`15`	`public DNSLookupRecordArgs(RR resourceRecord, object result)`
`16`	`16`	`{`
`17`	`17`	`ResourceRecord = resourceRecord;`
`18`		`- Result = result.ToString();`
	`18`	`+ Result = result.ToString().TrimEnd();`
`19`	`19`	`}`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,8 @@ private void StartLookup()`
`164`	`164`	`UseResolverCache = SettingsManager.Current.DNSLookup_UseResolverCache,`
`165`	`165`	`TransportType = SettingsManager.Current.DNSLookup_TransportType,`
`166`	`166`	`Attempts = SettingsManager.Current.DNSLookup_Attempts,`
`167`		`- Timeout = SettingsManager.Current.DNSLookup_Timeout`
	`167`	`+ Timeout = SettingsManager.Current.DNSLookup_Timeout,`
	`168`	`+ ResolveCNAME = SettingsManager.Current.DNSLookup_ResolveCNAME`
`168`	`169`	`};`
`169`	`170`
`170`	`171`	`DNSLookup dnsLookup = new DNSLookup();`
`@@ -182,7 +183,7 @@ private void DnsLookup_RecordReceived(object sender, DNSLookupRecordArgs e)`
`182`	`183`	`{`
`183`	`184`	`DNSLookupRecordInfo dnsLookupRecordInfo = DNSLookupRecordInfo.Parse(e);`
`184`	`185`
`185`		`- Application.Current.Dispatcher.BeginInvoke(new Action(delegate ()`
	`186`	`+ Application.Current.Dispatcher.BeginInvoke(System.Windows.Threading.DispatcherPriority.Send,new Action(delegate ()`
`186`	`187`	`{`
`187`	`188`	`LookupResult.Add(dnsLookupRecordInfo);`
`188`	`189`	`}));`
`@@ -200,9 +201,9 @@ private void DnsLookup_LookupError(object sender, DNSLookupErrorArgs e)`
`200`	`201`	`IsLookupRunning = false;`
`201`	`202`	`}`
`202`	`203`
`203`		`- private void DnsLookup_LookupComplete(object sender, EventArgs e)`
	`204`	`+ private void DnsLookup_LookupComplete(object sender, DNSLookupCompleteArgs e)`
`204`	`205`	`{`
`205`		`- if (LookupResult.Count == 0)`
	`206`	`+ if (e.ResourceRecordsCount == 0)`
`206`	`207`	`{`
`207`	`208`	`ErrorMessage = string.Format(Application.Current.Resources["String_NoDnsRecordFoundCheckYourInputAndSettings"] as string, HostnameOrIPAddress);`
`208`	`209`	`DisplayErrorMessage = true;`