Feature: Ping Monitore - Add multiple hosts

Source/NETworkManager.Localization/Resources/Strings.resx

@@ -882,7 +882,7 @@ First make a backup copy of your profile files before enabling encryption!</valu
     <value>Hostname or IP address</value>
   </data>
   <data name="Hosts" xml:space="preserve">
-    <value>Hosts</value>
+    <value>Host(s)</value>
   </data>
   <data name="ID" xml:space="preserve">
     <value>ID</value>
@@ -1759,9 +1759,6 @@ Profile files are not affected!</value>
   <data name="Yellow" xml:space="preserve">
     <value>Yellow</value>
   </data>
-  <data name="EnterValidValueBetween25and100" xml:space="preserve">
-    <value>Enter a valid value between 25 and 100!</value>
-  </data>
   <data name="ProfileWithThisNameAlreadyExists" xml:space="preserve">
     <value>A profile with this name already exists!</value>
   </data>
@@ -3314,8 +3311,8 @@ If the option is disabled again, the values are no longer modified. However, the
   <data name="SNTPServerWithThisNameAlreadyExists" xml:space="preserve">
     <value>An SNTP server with this name already exists!</value>
   </data>
-  <data name="EnterValidDomainOrIPAddress" xml:space="preserve">
-    <value>Enter a valid domain (like "example.com") or a valid IP address (like 192.168.178.1)!</value>
+  <data name="EnterValidHostnameOrIPAddress" xml:space="preserve">
+    <value>Enter a valid hostname (like "server-01" or "example.com") or a valid IP address (like 192.168.178.1)!</value>
   </data>
   <data name="Servers" xml:space="preserve">
     <value>Server(s)</value>

Source/NETworkManager.Utilities/DNS.cs

@@ -75,7 +75,7 @@ public async Task<DNSResultIPAddress> ResolveAAsync(string query)
                 if (result.HasError)
                     return new DNSResultIPAddress(result.HasError, $"{result.NameServer}: {result.ErrorMessage}");
 
-                return new DNSResultIPAddress(result.Answers.ARecords().FirstOrDefault().Address);
+                return new DNSResultIPAddress(result.Answers.ARecords().FirstOrDefault()?.Address);
             }
             catch (DnsResponseException ex)
             {
@@ -98,7 +98,7 @@ public async Task<DNSResultIPAddress> ResolveAaaaAsync(string query)
                 if (result.HasError)
                     return new DNSResultIPAddress(result.HasError, $"{result.NameServer}: {result.ErrorMessage}");
 
-                return new DNSResultIPAddress(result.Answers.AaaaRecords().FirstOrDefault().Address);
+                return new DNSResultIPAddress(result.Answers.AaaaRecords().FirstOrDefault()?.Address);
             }
             catch (DnsResponseException ex)
             {
@@ -120,7 +120,7 @@ public async Task<DNSResultString> ResolveCnameAsync(string query)
                 if (result.HasError)
                     return new DNSResultString(result.HasError, $"{result.NameServer}: {result.ErrorMessage}");
 
-                return new DNSResultString(result.Answers.CnameRecords().FirstOrDefault().CanonicalName);
+                return new DNSResultString(result.Answers.CnameRecords().FirstOrDefault()?.CanonicalName);
             }
             catch (DnsResponseException ex)
             {
@@ -142,7 +142,7 @@ public async Task<DNSResultString> ResolvePtrAsync(IPAddress ipAddress)
                 if (result.HasError)
                     return new DNSResultString(result.HasError, $"{result.NameServer}: {result.ErrorMessage}");
 
-                return new DNSResultString(result.Answers.PtrRecords().FirstOrDefault().PtrDomainName);
+                return new DNSResultString(result.Answers.PtrRecords().FirstOrDefault()?.PtrDomainName);
             }
             catch (DnsResponseException ex)
             {

Source/NETworkManager.Utilities/DNSResultString.cs

@@ -4,7 +4,7 @@
     /// 
     /// </summary>
     public class DNSResultString : DNSResult
-    {
+    {        
         public string Value { get; set; }
 
         public DNSResultString(bool hasError, string errorMessage) : base(hasError, errorMessage)

Source/NETworkManager.Utilities/RegexHelper.cs

@@ -39,12 +39,9 @@ public static class RegexHelper
         // Match a subnet from 192.168.178.0/192.0.0.0 to 192.168.178.0/255.255.255.255
         public const string IPv4AddressSubnetmaskRegex = @"^" + IPv4AddressValues + @"\/" + SubnetmaskValues + @"$";
 
-        // Match IPv6 address
+        // Match IPv6 address like ::1
         public const string IPv6AddressRegex = @"(?:^|(?<=\s))(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:)|fe80:(:[0-9a-fA-F]{0,4}){0,4}%[0-9a-zA-Z]{1,}|::(ffff(:0{1,4}){0,1}:){0,1}((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])|([0-9a-fA-F]{1,4}:){1,4}:((25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9])\.){3,3}(25[0-5]|(2[0-4]|1{0,1}[0-9]){0,1}[0-9]))(?=\s|$)";
 
-        // Match IPv6 address within a string
-        public const string IPv6AddressExctractRegex = IPv6AddressRegex;
-
         // Match a subnet like 2001:0db8::/64
         public const string IPv6AddressCidrRegex = @"^s*((([0-9A-Fa-f]{1,4}:){7}([0-9A-Fa-f]{1,4}|:))|(([0-9A-Fa-f]{1,4}:){6}(:[0-9A-Fa-f]{1,4}|((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){5}(((:[0-9A-Fa-f]{1,4}){1,2})|:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3})|:))|(([0-9A-Fa-f]{1,4}:){4}(((:[0-9A-Fa-f]{1,4}){1,3})|((:[0-9A-Fa-f]{1,4})?:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){3}(((:[0-9A-Fa-f]{1,4}){1,4})|((:[0-9A-Fa-f]{1,4}){0,2}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){2}(((:[0-9A-Fa-f]{1,4}){1,5})|((:[0-9A-Fa-f]{1,4}){0,3}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(([0-9A-Fa-f]{1,4}:){1}(((:[0-9A-Fa-f]{1,4}){1,6})|((:[0-9A-Fa-f]{1,4}){0,4}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:))|(:(((:[0-9A-Fa-f]{1,4}){1,7})|((:[0-9A-Fa-f]{1,4}){0,5}:((25[0-5]|2[0-4]d|1dd|[1-9]?d)(.(25[0-5]|2[0-4]d|1dd|[1-9]?d)){3}))|:)))(%.+)?s*(\/([0-9]|[1-9][0-9]|1[0-1][0-9]|12[0-8])){1}?$";
 
@@ -57,7 +54,7 @@ public static class RegexHelper
         // Private hostname values
         private const string HostnameValues = @"(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-]*[A-Za-z0-9])";
 
-        // Hostname regex
+        // Hostname regex like server-01 or server-01.example.com
         public const string HostnameRegex = @"^" + HostnameValues + @"$";
 
         // Match a hostname with cidr like server-01.example.com/24

Source/NETworkManager.Validators/IPAddressOrHostnameAsRangeValidator.cs

@@ -0,0 +1,34 @@
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Windows.Controls;
+using NETworkManager.Localization.Resources;
+using NETworkManager.Utilities;
+
+namespace NETworkManager.Validators
+{
+    public class IPAddressOrHostnameAsRangeValidator : ValidationRule
+    {
+        public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+        {
+            var input = (value as string)?.Trim();
+
+            if (string.IsNullOrEmpty(input))
+                return new ValidationResult(false, Strings.EnterValidHostnameOrIPAddress);
+
+            foreach (var item in input.Split(";"))
+            {
+                var localItem = item.Trim();
+
+                // Check if it is a valid IPv4 address like 192.168.0.1, a valid IPv6 address like ::1 or a valid hostname like server-01 or server-01.example.com
+                var isValid = Regex.IsMatch(localItem, RegexHelper.IPv4AddressRegex) ||
+                    Regex.IsMatch(localItem, RegexHelper.IPv6AddressRegex) ||
+                    Regex.IsMatch(localItem, RegexHelper.HostnameRegex);
+
+                if (!isValid)
+                    return new ValidationResult(false, Strings.EnterValidHostnameOrIPAddress);
+            }
+
+            return ValidationResult.ValidResult;
+        }
+    }
+}

Source/NETworkManager.Validators/IPAddressOrHostnameValidator.cs

@@ -0,0 +1,33 @@
+using System.Globalization;
+using System.Text.RegularExpressions;
+using System.Windows.Controls;
+using NETworkManager.Localization.Resources;
+using NETworkManager.Utilities;
+
+namespace NETworkManager.Validators
+{
+    public class IPAddressOrHostnameValidator : ValidationRule
+    {
+        public override ValidationResult Validate(object value, CultureInfo cultureInfo)
+        {
+            var input = (value as string)?.Trim();
+
+            if(string.IsNullOrEmpty(input))
+                return new ValidationResult(false, Strings.EnterValidHostnameOrIPAddress);
+
+            // Check if it is a valid IPv4 address like 192.168.0.1
+            if (Regex.IsMatch(input, RegexHelper.IPv4AddressRegex))
+                return ValidationResult.ValidResult;
+
+            // Check if it is a valid IPv6 address like ::1
+            if (Regex.IsMatch(input, RegexHelper.IPv6AddressRegex))
+                return ValidationResult.ValidResult;
+
+            // Check if it is a valid hostname like server-01 or server-01.example.com
+            if (Regex.IsMatch(input, RegexHelper.HostnameRegex))
+                return ValidationResult.ValidResult;
+
+            return new ValidationResult(false, Strings.EnterValidHostnameOrIPAddress);
+        }
+    }
+}

Source/NETworkManager/ViewModels/NetworkConnectionViewModel.cs

@@ -773,7 +773,7 @@ private Task CheckConnectionInternetAsync(CancellationToken ct)
 
                         var result = await httpResponse.Content.ReadAsStringAsync();
 
-                        var match = Regex.Match(result, RegexHelper.IPv6AddressExctractRegex);
+                        var match = Regex.Match(result, RegexHelper.IPv6AddressRegex);
 
                         if (match.Success)
                         {