From daf2caadf12f7d945ba54f100178c2d14acabb43 Mon Sep 17 00:00:00 2001
From: Micah Morrison <micahmorrison95@gmail.com>
Date: Wed, 19 Apr 2023 09:12:31 -0400
Subject: [PATCH 1/2] Add custom NetNat range

---
 .../Controls/SelectionWindow.xaml             | 121 +++++++++++++-----
 WgServerforWindows/MainWindow.xaml.cs         |   4 +-
 .../Models/GlobalAppSettings.cs               |   8 ++
 .../Models/NetNatRangeSubCommand.cs           |  89 +++++++++++++
 .../Models/NewNetNatPrerequisite.cs           |  25 +++-
 .../Models/SelectionWindowModel.cs            |  35 ++++-
 .../Properties/Resources.Designer.cs          |  45 +++++++
 WgServerforWindows/Properties/Resources.resx  |  15 +++
 8 files changed, 301 insertions(+), 41 deletions(-)
 create mode 100644 WgServerforWindows/Models/NetNatRangeSubCommand.cs

diff --git a/WgServerforWindows/Controls/SelectionWindow.xaml b/WgServerforWindows/Controls/SelectionWindow.xaml
index 8ba7997..0b38115 100644
--- a/WgServerforWindows/Controls/SelectionWindow.xaml
+++ b/WgServerforWindows/Controls/SelectionWindow.xaml
@@ -1,35 +1,55 @@
-<Window x:Class="WgServerforWindows.Controls.SelectionWindow"
-        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"
-        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-        xmlns:properties="clr-namespace:WgServerforWindows.Properties"
-        xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
-        xmlns:models="clr-namespace:WgServerforWindows.Models"
-        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
-        xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
-        mc:Ignorable="d"
-        d:DataContext="{d:DesignInstance Type=models:SelectionWindowModel}"
-        Title="{Binding Title}" SizeToContent="WidthAndHeight" MaxWidth="350">
+<Window
+    x:Class="WgServerforWindows.Controls.SelectionWindow"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:b="http://schemas.microsoft.com/xaml/behaviors"
+    xmlns:c="clr-namespace:CalcBinding;assembly=CalcBinding"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:models="clr-namespace:WgServerforWindows.Models"
+    xmlns:properties="clr-namespace:WgServerforWindows.Properties"
+    xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+    Title="{Binding Title}"
+    MinWidth="{Binding MinWidth}"
+    MaxWidth="350"
+    d:DataContext="{d:DesignInstance Type=models:SelectionWindowModel}"
+    SizeToContent="WidthAndHeight"
+    mc:Ignorable="d">
     <Grid>
         <Grid.ColumnDefinitions>
-            <ColumnDefinition Width="*"/>
-            <ColumnDefinition Width="Auto"/>
-            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="Auto" />
         </Grid.ColumnDefinitions>
 
         <Grid.RowDefinitions>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="Auto"/>
-            <RowDefinition Height="20"/> <!-- Padding -->
-            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+            <!--  Padding  -->
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
         </Grid.RowDefinitions>
 
-        <TextBlock Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="0" Margin="20,10,20,10" Text="{Binding Text}" TextWrapping="Wrap"/>
+        <TextBlock
+            Grid.Row="0"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Margin="20,10,20,10"
+            Text="{Binding Text}"
+            TextWrapping="Wrap" />
 
-        <ComboBox Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" Margin="20,10,20,10" IsEditable="False"
-                  ItemsSource="{Binding Items}" SelectedItem="{Binding SelectedItem}" DisplayMemberPath="DisplayText"
-                  Visibility="{c:Binding IsList, FalseToVisibility=Collapsed}">
+        <ComboBox
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Margin="20,10,20,10"
+            DisplayMemberPath="DisplayText"
+            IsEditable="False"
+            ItemsSource="{Binding Items}"
+            SelectedItem="{Binding SelectedItem}"
+            Visibility="{c:Binding IsList,
+                                   FalseToVisibility=Collapsed}">
             <ComboBox.ItemContainerStyle>
                 <Style>
                     <Setter Property="Control.ToolTip" Value="{Binding Description}" />
@@ -37,22 +57,59 @@
             </ComboBox.ItemContainerStyle>
         </ComboBox>
 
-        <xctk:DateTimeUpDown Grid.Column="0" Grid.ColumnSpan="3" Grid.Row="1" Margin="20,10,20,10" Format="Custom" FormatString="HH:mm:ss"
-                             Value="{Binding SelectedItem.BackingObject}"
-                             Visibility="{c:Binding IsTimeSpan, FalseToVisibility=Collapsed}"/>
+        <xctk:DateTimeUpDown
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Margin="20,10,20,10"
+            Format="Custom"
+            FormatString="HH:mm:ss"
+            Visibility="{c:Binding IsTimeSpan,
+                                   FalseToVisibility=Collapsed}"
+            Value="{Binding SelectedItem.BackingObject}" />
 
-        <Button Grid.Column="1" Grid.Row="3" Padding="10,5,10,5" Margin="20,10,10,10" Content="{x:Static properties:Resources.Cancel}" Command="{Binding CancelCommand}">
+        <TextBox
+            Grid.Row="1"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Margin="20,10,20,10"
+            Text="{Binding SelectedItem.BackingObject, UpdateSourceTrigger=PropertyChanged, Delay=100}"
+            Visibility="{c:Binding IsString,
+                                   FalseToVisibility=Collapsed}" />
+
+        <TextBlock
+            Grid.Row="2"
+            Grid.Column="0"
+            Grid.ColumnSpan="3"
+            Margin="20,10,20,10"
+            Foreground="Red"
+            Text="{Binding ValidationError}"
+            TextWrapping="Wrap" />
+
+        <Button
+            Grid.Row="4"
+            Grid.Column="1"
+            Margin="20,10,10,10"
+            Padding="10,5,10,5"
+            Command="{Binding CancelCommand}"
+            Content="{x:Static properties:Resources.Cancel}">
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="Click">
-                    <b:CallMethodAction MethodName="Close" TargetObject="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"/>
+                    <b:CallMethodAction MethodName="Close" TargetObject="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
                 </b:EventTrigger>
             </b:Interaction.Triggers>
         </Button>
-        <Button Grid.Column="2" Grid.Row="3" Padding="10,5,10,5" Margin="10,10,20,10" Content="{x:Static properties:Resources.OK}" Command="{Binding SelectCommand}"
-                IsEnabled="{Binding CanSelect}">
+        <Button
+            Grid.Row="4"
+            Grid.Column="2"
+            Margin="10,10,20,10"
+            Padding="10,5,10,5"
+            Command="{Binding SelectCommand}"
+            Content="{x:Static properties:Resources.OK}"
+            IsEnabled="{Binding CanSelect}">
             <b:Interaction.Triggers>
                 <b:EventTrigger EventName="Click">
-                    <b:CallMethodAction MethodName="Close" TargetObject="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}"/>
+                    <b:CallMethodAction MethodName="Close" TargetObject="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=Window}}" />
                 </b:EventTrigger>
             </b:Interaction.Triggers>
         </Button>
diff --git a/WgServerforWindows/MainWindow.xaml.cs b/WgServerforWindows/MainWindow.xaml.cs
index 4525072..8c2c8db 100644
--- a/WgServerforWindows/MainWindow.xaml.cs
+++ b/WgServerforWindows/MainWindow.xaml.cs
@@ -37,7 +37,8 @@ public MainWindow()
             var privateNetworkTaskSubCommand = new PrivateNetworkTaskSubCommand();
             var privateNetworkPrerequisite = new PrivateNetworkPrerequisite(privateNetworkTaskSubCommand);
             var netIpAddressTaskSubCommand = new NewNetIpAddressTaskSubCommand();
-            var newNetNatPrerequisite = new NewNetNatPrerequisite(netIpAddressTaskSubCommand);
+            var netNatRangeSubCommand = new NetNatRangeSubCommand();
+            var newNetNatPrerequisite = new NewNetNatPrerequisite(netIpAddressTaskSubCommand, netNatRangeSubCommand);
             var internetSharingPrerequisite = new InternetSharingPrerequisite();
             var persistentInternetSharingPrerequisite = new PersistentInternetSharingPrerequisite();
             var serverStatusPrerequisite = new ServerStatusPrerequisite();
@@ -98,6 +99,7 @@ public MainWindow()
                                                              && !persistentInternetSharingPrerequisite.Fulfilled;
 
                 netIpAddressTaskSubCommand.CanResolveFunc = netIpAddressTaskSubCommand.CanConfigureFunc = () => newNetNatPrerequisite.Fulfilled;
+                netNatRangeSubCommand.CanConfigureFunc = () => serverConfigurationPrerequisite.Fulfilled;
 
                 var natPrerequisiteGroup = new NatPrerequisiteGroup(newNetNatPrerequisite, internetSharingPrerequisite, persistentInternetSharingPrerequisite);
 
diff --git a/WgServerforWindows/Models/GlobalAppSettings.cs b/WgServerforWindows/Models/GlobalAppSettings.cs
index a060ad0..5fdaf3f 100644
--- a/WgServerforWindows/Models/GlobalAppSettings.cs
+++ b/WgServerforWindows/Models/GlobalAppSettings.cs
@@ -30,6 +30,7 @@ private GlobalAppSettings()
             // Set up AppSettings tracking
             Tracker.Configure<GlobalAppSettings>()
                 .Property(a => a.BootTaskDelay)
+                .Property(a => a.CustomNetNatRange)
                 .Track(this);
         }
 
@@ -56,6 +57,13 @@ public TimeSpan BootTaskDelay
         }
         private TimeSpan _bootTaskDelay;
 
+        public string CustomNetNatRange
+        {
+            get => _customNetNatRange;
+            set => Set(nameof(CustomNetNatRange), ref _customNetNatRange, value);
+        }
+        private string _customNetNatRange;
+
         /// <summary>
         /// The public tracker instance located in Public\Documents. Can be used to track things other than the <see cref="Instance"/>.
         /// </summary>
diff --git a/WgServerforWindows/Models/NetNatRangeSubCommand.cs b/WgServerforWindows/Models/NetNatRangeSubCommand.cs
new file mode 100644
index 0000000..4716516
--- /dev/null
+++ b/WgServerforWindows/Models/NetNatRangeSubCommand.cs
@@ -0,0 +1,89 @@
+using System.Net;
+using SharpConfig;
+using WgServerforWindows.Controls;
+using WgServerforWindows.Properties;
+
+namespace WgServerforWindows.Models
+{
+    public class NetNatRangeSubCommand : PrerequisiteItem
+    {
+        public NetNatRangeSubCommand() : base
+        (
+            title: string.Empty,
+            successMessage: Resources.NetNatRangeSubCommandSuccessMessage,
+            errorMessage: string.Empty,
+            resolveText: string.Empty,
+            configureText: Resources.NewNetNatRangeSubCommandConfigureText
+        )
+        {
+        }
+
+        public override void Configure()
+        {
+            var serverConfiguration = new ServerConfiguration().Load<ServerConfiguration>(Configuration.LoadFromFile(ServerConfigurationPrerequisite.ServerDataPath));
+
+            string networkRange = GlobalAppSettings.Instance.CustomNetNatRange;
+
+            var selectionWindowModel = new SelectionWindowModel<string>
+            {
+                Title = Resources.NetNatRangeSelectionTitle,
+                Text = Resources.NetNatRangeSelectionText,
+                SelectedItem = new SelectionItem<string> { BackingObject = networkRange },
+                IsList = false,
+                IsString = true,
+                MinWidth = 350
+            };
+
+            selectionWindowModel.CanSelectFunc = () =>
+            {
+                if (!string.IsNullOrWhiteSpace(selectionWindowModel.SelectedItem.BackingObject))
+                {
+                    if (!IPNetwork.TryParse(selectionWindowModel.SelectedItem.BackingObject, out _))
+                    {
+                        selectionWindowModel.ValidationError = Resources.NetworkAddressValidationError;
+                        return false;
+                    }
+                    // IPNetwork.TryParse recognizes single IP addresses as CIDR (with 8 mask).
+                    // This is not good, because we want an explicit CIDR for the server.
+                    // Therefore, if IPNetwork.TryParse succeeds, and IPAddress.TryParse also succeeds, we have a problem.
+                    if (IPAddress.TryParse(selectionWindowModel.SelectedItem.BackingObject, out _))
+                    {
+                        // This is just a regular address. We want CIDR.
+                        selectionWindowModel.ValidationError = Resources.NetworkAddressValidationError;
+                        return false;
+                    }
+
+                    // Ensure that this range contains the server range
+                    IPNetwork netNatRange = IPNetwork.Parse(selectionWindowModel.SelectedItem.BackingObject);
+                    IPNetwork serverRange = IPNetwork.Parse(serverConfiguration.AddressProperty.Value);
+                    if (!netNatRange.Contains(serverRange))
+                    {
+                        selectionWindowModel.ValidationError = string.Format(Resources.NetNatRangeValidationError, serverRange);
+                        return false;
+                    }
+
+                    // It passed, so we're good.
+                    selectionWindowModel.ValidationError = null;
+                    return true;
+                }
+
+                // It's empty, which is fine.
+                selectionWindowModel.ValidationError = null;
+                return true;
+            };
+
+            new SelectionWindow
+            {
+                DataContext = selectionWindowModel
+            }.ShowDialog();
+
+            if (selectionWindowModel.DialogResult == true)
+            {
+                GlobalAppSettings.Instance.CustomNetNatRange = selectionWindowModel.SelectedItem.BackingObject;
+                GlobalAppSettings.Instance.Save();
+
+                Refresh();
+            }
+        }
+    }
+}
diff --git a/WgServerforWindows/Models/NewNetNatPrerequisite.cs b/WgServerforWindows/Models/NewNetNatPrerequisite.cs
index 9a74604..67c6390 100644
--- a/WgServerforWindows/Models/NewNetNatPrerequisite.cs
+++ b/WgServerforWindows/Models/NewNetNatPrerequisite.cs
@@ -15,9 +15,9 @@ public class NewNetNatPrerequisite : PrerequisiteItem
     {
         #region PrerequisiteItem members
 
-        public NewNetNatPrerequisite() : this(new NewNetIpAddressTaskSubCommand()) { }
+        public NewNetNatPrerequisite() : this(new NewNetIpAddressTaskSubCommand(), new NetNatRangeSubCommand()) { }
 
-        public NewNetNatPrerequisite(NewNetIpAddressTaskSubCommand newNetIpAddressTaskSubCommand) : base
+        public NewNetNatPrerequisite(NewNetIpAddressTaskSubCommand newNetIpAddressTaskSubCommand, NetNatRangeSubCommand netNatRangeSubCommand) : base
         (
             title: Resources.NewNatName,
             successMessage: Resources.NewNetSuccess,
@@ -28,6 +28,7 @@ public NewNetNatPrerequisite(NewNetIpAddressTaskSubCommand newNetIpAddressTaskSu
         {
             _newNetIpAddressTaskSubCommand = newNetIpAddressTaskSubCommand;
             SubCommands.Add(_newNetIpAddressTaskSubCommand);
+            SubCommands.Add(netNatRangeSubCommand);
         }
 
         public override BooleanTimeCachedProperty Fulfilled => _fulfilled ??= new BooleanTimeCachedProperty(TimeSpan.FromSeconds(1), () =>
@@ -52,7 +53,7 @@ public NewNetNatPrerequisite(NewNetIpAddressTaskSubCommand newNetIpAddressTaskSu
                     $"-NoProfile Get-NetNat -Name {_netNatName}"),
                 out int exitCode);
 
-            result &= exitCode == 0 && output.Contains(serverConfiguration.AddressProperty.Value);
+            result &= exitCode == 0 && output.Contains(GetDesiredAddressRange(serverConfiguration));
 
             // Verify the interface's IP address is correct
             output = new WireGuardExe().ExecuteCommand(new WireGuardCommand(string.Empty, WhichExe.Custom,
@@ -107,7 +108,7 @@ public void Resolve(string serverDataPath)
             // Create the NAT routing rule
             output = new WireGuardExe().ExecuteCommand(new WireGuardCommand(string.Empty, WhichExe.Custom,
                     "powershell.exe",
-                    $"-NoProfile New-NetNat -Name {_netNatName} -InternalIPInterfaceAddressPrefix {serverConfiguration.AddressProperty.Value}"),
+                    $"-NoProfile New-NetNat -Name {_netNatName} -InternalIPInterfaceAddressPrefix {GetDesiredAddressRange(serverConfiguration)}"),
                 out exitCode);
 
             if (exitCode != 0)
@@ -195,6 +196,22 @@ public override void Configure()
 
         #endregion
 
+        #region Private methods
+
+        private string GetDesiredAddressRange(ServerConfiguration serverConfiguration)
+        {
+            if (!string.IsNullOrEmpty(GlobalAppSettings.Instance.CustomNetNatRange))
+            {
+                return GlobalAppSettings.Instance.CustomNetNatRange;
+            }
+            else
+            {
+                return serverConfiguration.AddressProperty.Value;
+            }
+        }
+
+        #endregion
+
         #region Public properties
 
         public bool IsSupported
diff --git a/WgServerforWindows/Models/SelectionWindowModel.cs b/WgServerforWindows/Models/SelectionWindowModel.cs
index 261d79c..fc30dc2 100644
--- a/WgServerforWindows/Models/SelectionWindowModel.cs
+++ b/WgServerforWindows/Models/SelectionWindowModel.cs
@@ -1,7 +1,8 @@
-using System.Collections.ObjectModel;
-using System.Windows.Input;
-using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight;
 using GalaSoft.MvvmLight.Command;
+using System;
+using System.Collections.ObjectModel;
+using System.Windows.Input;
 
 namespace WgServerforWindows.Models
 {
@@ -21,6 +22,20 @@ public string Text
         }
         private string _text;
 
+        public string ValidationError
+        {
+            get => _validationError;
+            set => Set(nameof(ValidationError), ref _validationError, value);
+        }
+        private string _validationError;
+
+        public double MinWidth
+        {
+            get => _minWidth;
+            set => Set(nameof(MinWidth), ref _minWidth, value);
+        }
+        private double _minWidth;
+
         public ObservableCollection<SelectionItem<T>> Items { get; } = new ObservableCollection<SelectionItem<T>>();
 
         public SelectionItem<T> SelectedItem
@@ -30,6 +45,14 @@ public SelectionItem<T> SelectedItem
             {
                 Set(nameof(SelectedItem), ref _selectedItem, value);
                 RaisePropertyChanged(nameof(CanSelect));
+
+                SelectedItem.PropertyChanged += (_, args) =>
+                {
+                    if (args.PropertyName == nameof(SelectedItem.BackingObject))
+                    {
+                        RaisePropertyChanged(nameof(CanSelect));
+                    }
+                };
             }
         }
         private SelectionItem<T> _selectedItem;
@@ -38,6 +61,8 @@ public SelectionItem<T> SelectedItem
 
         public bool IsTimeSpan { get; set; }
 
+        public bool IsString { get; set; }
+
         public bool? DialogResult { get; private set; }
 
         public ICommand CancelCommand => _cancelCommand ??= new RelayCommand(() =>
@@ -52,7 +77,9 @@ public SelectionItem<T> SelectedItem
         });
         private RelayCommand _selectCommand;
 
-        public bool CanSelect => SelectedItem is { };
+        public bool CanSelect => CanSelectFunc?.Invoke() ?? SelectedItem is { };
+
+        public Func<bool> CanSelectFunc { get; set; }
     }
 
     public class SelectionItem : ObservableObject
diff --git a/WgServerforWindows/Properties/Resources.Designer.cs b/WgServerforWindows/Properties/Resources.Designer.cs
index 6ee124e..d2052f8 100644
--- a/WgServerforWindows/Properties/Resources.Designer.cs
+++ b/WgServerforWindows/Properties/Resources.Designer.cs
@@ -702,6 +702,42 @@ public static string NatRoutingNotSupported {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Specify custom NAT Network range:.
+        /// </summary>
+        public static string NetNatRangeSelectionText {
+            get {
+                return ResourceManager.GetString("NetNatRangeSelectionText", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to NAT Network Address Range.
+        /// </summary>
+        public static string NetNatRangeSelectionTitle {
+            get {
+                return ResourceManager.GetString("NetNatRangeSelectionTitle", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to Specify a custom subnet (must be a superset of the WireGuard network), allowing the NAT network to be shared by other adapters.
+        /// </summary>
+        public static string NetNatRangeSubCommandSuccessMessage {
+            get {
+                return ResourceManager.GetString("NetNatRangeSubCommandSuccessMessage", resourceCulture);
+            }
+        }
+        
+        /// <summary>
+        ///   Looks up a localized string similar to The NAT Network range does not contain the WireGuard server range ({0})..
+        /// </summary>
+        public static string NetNatRangeValidationError {
+            get {
+                return ResourceManager.GetString("NetNatRangeValidationError", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Network Address Translation.
         /// </summary>
@@ -792,6 +828,15 @@ public static string NewNetIpAddressTaskSubCommandSuccessMessage {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Specify custom NAT Network range.
+        /// </summary>
+        public static string NewNetNatRangeSubCommandConfigureText {
+            get {
+                return ResourceManager.GetString("NewNetNatRangeSubCommandConfigureText", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to NAT is enabled..
         /// </summary>
diff --git a/WgServerforWindows/Properties/Resources.resx b/WgServerforWindows/Properties/Resources.resx
index 5851861..85e77f8 100644
--- a/WgServerforWindows/Properties/Resources.resx
+++ b/WgServerforWindows/Properties/Resources.resx
@@ -587,4 +587,19 @@ Note: It is preferable to use a domain name with DDNS to avoid dynamic WAN IPs.<
   <data name="SettingsConfigure" xml:space="preserve">
     <value>Settings</value>
   </data>
+  <data name="NetNatRangeSubCommandSuccessMessage" xml:space="preserve">
+    <value>Specify a custom subnet (must be a superset of the WireGuard network), allowing the NAT network to be shared by other adapters</value>
+  </data>
+  <data name="NewNetNatRangeSubCommandConfigureText" xml:space="preserve">
+    <value>Specify custom NAT Network range</value>
+  </data>
+  <data name="NetNatRangeSelectionTitle" xml:space="preserve">
+    <value>NAT Network Address Range</value>
+  </data>
+  <data name="NetNatRangeSelectionText" xml:space="preserve">
+    <value>Specify custom NAT Network range:</value>
+  </data>
+  <data name="NetNatRangeValidationError" xml:space="preserve">
+    <value>The NAT Network range does not contain the WireGuard server range ({0}).</value>
+  </data>
 </root>
\ No newline at end of file

From 2e9959761d87cbfd2ad90cf34f10dc08dc8ad304 Mon Sep 17 00:00:00 2001
From: micahmo <micahmo@users.noreply.github.com>
Date: Wed, 19 Apr 2023 13:15:46 +0000
Subject: [PATCH 2/2] Bump version to 2.0.10

---
 Directory.Build.props                      |  6 +++---
 Installer/WS4WSetupScript.iss              |  2 +-
 WireGuardServerForWindows/VersionInfo2.xml | 10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index b094451..075feef 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,9 +1,9 @@
 <Project>
     <PropertyGroup>
         <!-- Keep in sync with WS4WSetupScript.iss and VersionInfo.xml -->
-        <AssemblyVersion>2.0.9.0</AssemblyVersion>
-        <FileVersion>2.0.9.0</FileVersion>
-        <InformationalVersion>2.0.9.0</InformationalVersion>
+        <AssemblyVersion>2.0.10.0</AssemblyVersion>
+        <FileVersion>2.0.10.0</FileVersion>
+        <InformationalVersion>2.0.10.0</InformationalVersion>
         <Authors>Micah Morrison</Authors>
         <Product>WS4W</Product>
     </PropertyGroup>
diff --git a/Installer/WS4WSetupScript.iss b/Installer/WS4WSetupScript.iss
index 11fd12e..301c2bb 100644
--- a/Installer/WS4WSetupScript.iss
+++ b/Installer/WS4WSetupScript.iss
@@ -1,6 +1,6 @@
 #define MyAppNameOld "WireGuard Server For Windows"
 #define MyAppName "Wg Server for Windows"
-#define MyAppVersion "2.0.9"
+#define MyAppVersion "2.0.10"
 #define MyAppPublisher "Micah Morrison"
 #define MyAppURL "https://github.com/micahmo/WgServerforWindows"
 #define MyAppExeName "WgServerforWindows.exe"
diff --git a/WireGuardServerForWindows/VersionInfo2.xml b/WireGuardServerForWindows/VersionInfo2.xml
index adb6c56..2102672 100644
--- a/WireGuardServerForWindows/VersionInfo2.xml
+++ b/WireGuardServerForWindows/VersionInfo2.xml
@@ -2,12 +2,12 @@
 <!-- Things to update: Version, Date, Release Notes -->
 <AppUpdate xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
            xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/micahmo/WgServerforWindows/master/WireGuardServerForWindows/AppUpdate.xsd">
-  <Version>2.0.9.0</Version>
-  <ReleaseDate>2023-03-02</ReleaseDate>
+  <Version>2.0.10.0</Version>
+  <ReleaseDate>2023-04-19</ReleaseDate>
   <!-- Default download -->
-  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.9/WS4WSetup-2.0.9.exe</DownloadLink>
-  <DownloadFileName>WS4WSetup-2.0.9.exe</DownloadFileName>
+  <DownloadLink>https://github.com/micahmo/WgServerforWindows/releases/download/v2.0.10/WS4WSetup-2.0.10.exe</DownloadLink>
+  <DownloadFileName>WS4WSetup-2.0.10.exe</DownloadFileName>
   <!-- Release notes -->
-  <VersionNotes> - Add the ability the configure a delay for boot tasks</VersionNotes>
+  <VersionNotes> - Specify a custom subnet range for NAT network</VersionNotes>
   <ReleaseNotes></ReleaseNotes>
 </AppUpdate>