DNS Lookup error message added

BornToBeRoot · BornToBeRoot · commit 94c3aa2eeb88 · 2017-08-13T17:48:39.000+02:00
diff --git a/Source/NETworkManager/3rdParty/Heijden.DNS/Resolver.cs b/Source/NETworkManager/3rdParty/Heijden.DNS/Resolver.cs
@@ -409,7 +409,7 @@ private Response TcpRequest(Request request)
                     {
                         IAsyncResult result = tcpClient.BeginConnect(m_DnsServers[intDnsServer].Address, m_DnsServers[intDnsServer].Port, null, null);
 
-                        bool success = result.AsyncWaitHandle.WaitOne(m_Timeout * 1000, true);
+                        bool success = result.AsyncWaitHandle.WaitOne(m_Timeout, true);
 
                         if (!success || !tcpClient.Connected)
                         {
diff --git a/Source/NETworkManager/Models/Network/DNSLookup.cs b/Source/NETworkManager/Models/Network/DNSLookup.cs
@@ -63,7 +63,7 @@ public void LookupAsync(string hostnameOrIPAddress, DNSLookupOptions dnsLookupOp
                 // If there was an error... return
                 if (!string.IsNullOrEmpty(dnsResponse.Error))
                 {
-                    OnLookupError(new DNSLookupErrorArgs(dnsResponse.Error));
+                    OnLookupError(new DNSLookupErrorArgs(dnsResponse.Error, dnsResolver.DnsServer));
                     return;
                 }
                 
@@ -73,8 +73,18 @@ public void LookupAsync(string hostnameOrIPAddress, DNSLookupOptions dnsLookupOp
                 // 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)
                 {
-                    foreach(RecordCNAME r in dnsResponse.RecordsCNAME)
-                        ProcessResponse(dnsResolver.Query(r.CNAME, dnsLookupOptions.Type, dnsLookupOptions.Class));
+                    foreach (RecordCNAME r in dnsResponse.RecordsCNAME)
+                    {
+                        Response dnsResponse2 = dnsResolver.Query(r.CNAME, dnsLookupOptions.Type, dnsLookupOptions.Class);
+
+                        if(!string.IsNullOrEmpty(dnsResponse2.Error))
+                        {
+                            OnLookupError(new DNSLookupErrorArgs(dnsResponse2.Error, dnsResolver.DnsServer));
+                            continue;
+                        }
+
+                        ProcessResponse(dnsResponse2);
+                    }
                 }
 
                 OnLookupComplete();
diff --git a/Source/NETworkManager/Models/Network/DNSLookupErrorArgs.cs b/Source/NETworkManager/Models/Network/DNSLookupErrorArgs.cs
@@ -1,17 +1,21 @@
-﻿namespace NETworkManager.Models.Network
+﻿using System.Net;
+
+namespace NETworkManager.Models.Network
 {
     public class DNSLookupErrorArgs : System.EventArgs
     {
-        public string Error { get; set; }
-        
+        public string ErrorCode { get; set; }
+        public string DNSServer { get; set; }
+
         public DNSLookupErrorArgs()
         {
 
         }
 
-        public DNSLookupErrorArgs(string error)
+        public DNSLookupErrorArgs(string errorCode, string dnsServer)
         {
-            Error = error;
+            ErrorCode = errorCode;
+            DNSServer = dnsServer;
         }
     }
 }
diff --git a/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml b/Source/NETworkManager/Resources/Localization/Resources.de-DE.xaml
@@ -212,6 +212,9 @@
     <system:String x:Key="String_Recursion">Rekursion</system:String>
     <system:String x:Key="String_UseResolverCache">Resolver-Cache verwenden</system:String>
     <system:String x:Key="String_Result">Ergebnis</system:String>
+    <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>
 
     <!-- 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
@@ -214,6 +214,9 @@
     <system:String x:Key="String_Recursion">Recursion</system:String>
     <system:String x:Key="String_UseResolverCache">Use resolver cache</system:String>
     <system:String x:Key="String_Result">Result</system:String>
+    <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>
     
     <!-- 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
@@ -62,33 +62,48 @@ public bool IsLookupRunning
                 OnPropertyChanged();
             }
         }
+             
+        private AsyncObservableCollection<DNSLookupRecordInfo> _lookupResult = new AsyncObservableCollection<DNSLookupRecordInfo>();
+        public AsyncObservableCollection<DNSLookupRecordInfo> LookupResult
+        {
+            get { return _lookupResult; }
+            set
+            {
+                if (value == _lookupResult)
+                    return;
+
+                _lookupResult = value;
+            }
+        }
 
-        private bool _cancelLookup;
-        public bool CancelLookup
+        private bool _displayErrorMessage;
+        public bool DisplayErrorMessage
         {
-            get { return _cancelLookup; }
+            get { return _displayErrorMessage; }
             set
             {
-                if (value == _cancelLookup)
+                if (value == _displayErrorMessage)
                     return;
 
-                _cancelLookup = value;
+                _displayErrorMessage = value;
                 OnPropertyChanged();
             }
         }
 
-        private AsyncObservableCollection<DNSLookupRecordInfo> _lookupResult = new AsyncObservableCollection<DNSLookupRecordInfo>();
-        public AsyncObservableCollection<DNSLookupRecordInfo> LookupResult
+        private string _errorMessage;
+        public string ErrorMessage
         {
-            get { return _lookupResult; }
+            get { return _errorMessage; }
             set
             {
-                if (value == _lookupResult)
+                if (value == _errorMessage)
                     return;
 
-                _lookupResult = value;
+                _errorMessage = value;
+                OnPropertyChanged();
             }
         }
+
         #endregion
 
         #region Contructor
@@ -131,11 +146,12 @@ private void LookupAction()
         #region Methods      
         private void StartLookup()
         {
+            DisplayErrorMessage = false;
             IsLookupRunning = true;
 
             // Reset the latest results
             LookupResult.Clear();
-
+            
             HostnameOrIPAddressHistory = new List<string>(HistoryListHelper.Modify(HostnameOrIPAddressHistory, HostnameOrIPAddress, SettingsManager.Current.Application_HistoryListEntries));
 
             DNSLookupOptions dnsLookupOptions = new DNSLookupOptions
@@ -174,12 +190,24 @@ private void DnsLookup_RecordReceived(object sender, DNSLookupRecordArgs e)
 
         private void DnsLookup_LookupError(object sender, DNSLookupErrorArgs e)
         {
-            MessageBox.Show(e.Error);
+            if (e.ErrorCode == "Timeout Error")
+                ErrorMessage = string.Format(Application.Current.Resources["String_TimeoutWhenQueryingDNSServer"] as string, e.DNSServer);
+            else
+                ErrorMessage = Application.Current.Resources["String_UnkownError"] as string;
+
+            DisplayErrorMessage = true;
+
             IsLookupRunning = false;
         }
 
         private void DnsLookup_LookupComplete(object sender, EventArgs e)
         {
+            if (LookupResult.Count == 0)
+            {
+                ErrorMessage = string.Format(Application.Current.Resources["String_NoDnsRecordFoundCheckYourInputAndSettings"] as string, HostnameOrIPAddress);
+                DisplayErrorMessage = true;
+            }
+
             IsLookupRunning = false;
         }
         #endregion
diff --git a/Source/NETworkManager/Views/Applications/DNSLookupView.xaml b/Source/NETworkManager/Views/Applications/DNSLookupView.xaml
@@ -26,13 +26,14 @@
             <Grid.RowDefinitions>
                 <RowDefinition Height="Auto" />
                 <RowDefinition Height="Auto" />
+                <RowDefinition Height="Auto" />
             </Grid.RowDefinitions>
             <Grid Grid.Row="0">
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="*" />
                     <ColumnDefinition Width="Auto" />
                 </Grid.ColumnDefinitions>
-                <ComboBox Grid.Column="0" x:Name="txtHostnameOrIPAddress" ItemsSource="{Binding HostnameOrIPAddressHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_HostnameOrIPAddress}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}" IsEnabled="{Binding IsPingRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
+                <ComboBox Grid.Column="0" x:Name="txtHostnameOrIPAddress" ItemsSource="{Binding HostnameOrIPAddressHistory}" mah:TextBoxHelper.Watermark="{DynamicResource String_Watermark_HostnameOrIPAddress}" Validation.ErrorTemplate="{StaticResource DefaultErrorTemplate}" IsEnabled="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" Style="{StaticResource HistoryComboBox}">
                     <ComboBox.Text>
                         <Binding Path="HostnameOrIPAddress" Mode="TwoWay" UpdateSourceTrigger="PropertyChanged">
                             <Binding.ValidationRules>
@@ -41,15 +42,15 @@
                         </Binding>
                     </ComboBox.Text>
                 </ComboBox>
-                <Button Grid.Column="1" Command="{Binding LookupCommand}" IsDefault="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" IsCancel="{Binding IsLookupRunning}" HorizontalAlignment="Right" Margin="10,0,0,0">
+                <Button Grid.Column="1" Command="{Binding LookupCommand}" IsDefault="{Binding IsLookupRunning, Converter={StaticResource BooleanReverseConverter}}" HorizontalAlignment="Right" Margin="10,0,0,0">
                     <Button.Resources>
                         <Style TargetType="{x:Type Button}" BasedOn="{StaticResource ImageWithTextButton}">
                             <Setter Property="IsEnabled" Value="True" />
                             <Style.Triggers>
                                 <DataTrigger Binding="{Binding Path=(Validation.HasError), ElementName=txtHostnameOrIPAddress}" Value="True" >
                                     <Setter Property="IsEnabled" Value="False" />
                                 </DataTrigger>
-                                <DataTrigger Binding="{Binding CancelPing}" Value="True">
+                                <DataTrigger Binding="{Binding IsLookupRunning}" Value="True">
                                     <Setter Property="IsEnabled" Value="False" />
                                 </DataTrigger>
                             </Style.Triggers>
@@ -70,26 +71,10 @@
                                     <Style TargetType="{x:Type Rectangle}">
                                         <Setter Property="OpacityMask" Value="{StaticResource VisualControlPlay}" />
                                         <Setter Property="Fill" Value="{DynamicResource GrayBrush3}" />
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding IsLookupRunning}" Value="True">
-                                                <Setter Property="OpacityMask" Value="{StaticResource VisualClose}" />
-                                            </DataTrigger>
-                                        </Style.Triggers>
                                     </Style>
                                 </Rectangle.Style>
                             </Rectangle>
-                            <TextBlock Grid.Column="1" FontSize="14" Margin="10,5" TextAlignment="Center">
-                                <TextBlock.Style>
-                                    <Style TargetType="{x:Type TextBlock}">
-                                        <Setter Property="Text" Value="{DynamicResource String_Button_Lookup}"/>
-                                        <Style.Triggers>
-                                            <DataTrigger Binding="{Binding IsLookupRunning}" Value="True" >
-                                                <Setter Property="Text" Value="{DynamicResource String_Button_Cancel}"/>
-                                            </DataTrigger>
-                                        </Style.Triggers>
-                                    </Style>
-                                </TextBlock.Style>
-                            </TextBlock>
+                            <TextBlock Grid.Column="1" FontSize="14" Text="{DynamicResource String_Button_Lookup}" Margin="10,5" TextAlignment="Center" />
                         </Grid>
                     </Button.Content>
                 </Button>
@@ -105,6 +90,7 @@
                     </Style>
                 </Controls:MetroProgressBar.Style>
             </Controls:MetroProgressBar>
+            <TextBlock Grid.Row="2" Foreground="{DynamicResource AccentColorBrush}" Text="{Binding ErrorMessage}" Visibility="{Binding DisplayErrorMessage, Converter={StaticResource BooleanToVisibilityConverter}}" Style="{DynamicResource DefaultTextBlock}" Margin="0,10,0,0" />
         </Grid>
         <TextBlock Grid.Row="2" Text="{DynamicResource String_Header_Result}" Style="{StaticResource HeaderTextBlock}" />
         <Control:ScrollingDataGrid Grid.Row="3" CanUserSortColumns="False" CanUserReorderColumns="False" Style="{StaticResource MetroDataGrid}" FontSize="14" mah:ControlsHelper.ContentCharacterCasing="Normal" ItemsSource="{Binding LookupResult}" CanUserAddRows="False" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto" AutoGenerateColumns="False" IsReadOnly="True">

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ private Response TcpRequest(Request request)`
`409`	`409`	`{`
`410`	`410`	`IAsyncResult result = tcpClient.BeginConnect(m_DnsServers[intDnsServer].Address, m_DnsServers[intDnsServer].Port, null, null);`
`411`	`411`
`412`		`- bool success = result.AsyncWaitHandle.WaitOne(m_Timeout * 1000, true);`
	`412`	`+ bool success = result.AsyncWaitHandle.WaitOne(m_Timeout, true);`
`413`	`413`
`414`	`414`	`if (!success \|\| !tcpClient.Connected)`
`415`	`415`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,17 +1,21 @@`
`1`		`-namespace NETworkManager.Models.Network`
	`1`	`+using System.Net;`
	`2`	`+`
	`3`	`+namespace NETworkManager.Models.Network`
`2`	`4`	`{`
`3`	`5`	`public class DNSLookupErrorArgs : System.EventArgs`
`4`	`6`	`{`
`5`		`- public string Error { get; set; }`
`6`		`-`
	`7`	`+ public string ErrorCode { get; set; }`
	`8`	`+ public string DNSServer { get; set; }`
	`9`	`+`
`7`	`10`	`public DNSLookupErrorArgs()`
`8`	`11`	`{`
`9`	`12`
`10`	`13`	`}`
`11`	`14`
`12`		`- public DNSLookupErrorArgs(string error)`
	`15`	`+ public DNSLookupErrorArgs(string errorCode, string dnsServer)`
`13`	`16`	`{`
`14`		`- Error = error;`
	`17`	`+ ErrorCode = errorCode;`
	`18`	`+ DNSServer = dnsServer;`
`15`	`19`	`}`
`16`	`20`	`}`
`17`	`21`	`}`