From d3ea1f5e90375a66cb14017819cd98cd1ee62d5d Mon Sep 17 00:00:00 2001
From: Monviech <79600909+Monviech@users.noreply.github.com>
Date: Wed, 20 Sep 2023 14:15:17 +0200
Subject: [PATCH] VPN: IPsec: Connections: Pools add IP4_DNS and IP6_DNS
 Configuration Payloads (#6864)

---
 .../controllers/OPNsense/IPsec/forms/dialogPool.xml   | 11 ++++++++++-
 .../mvc/app/models/OPNsense/IPsec/Swanctl.xml         |  7 +++++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogPool.xml b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogPool.xml
index d8460c217..04695460f 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogPool.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/IPsec/forms/dialogPool.xml
@@ -18,5 +18,14 @@
           Accepts a single CIDR subnet defining the pool to allocate addresses from
         </help>
     </field>
-
+    <field>
+        <id>pool.dns</id>
+        <label>DNS</label>
+        <type>select_multiple</type>
+        <style>tokenize</style>
+        <allownew>true</allownew>
+        <help>
+          DNS servers to push as configuration payload (RFC4306 3.15 - Value 3 and 10). Accepts multiple IPv4/IPv6 addresses.
+        </help>
+    </field>
 </form>
diff --git a/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml b/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml
index 4e4b25380..816a857e2 100644
--- a/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/IPsec/Swanctl.xml
@@ -328,6 +328,13 @@
                     <NetMaskRequired>Y</NetMaskRequired>
                     <ValidationMessage>Please specify a valid CIDR subnet.</ValidationMessage>
                 </addrs>
+                <dns type="NetworkField">
+                    <FieldSeparator>,</FieldSeparator>    
+                    <NetMaskAllowed>N</NetMaskAllowed>
+                    <WildcardEnabled>N</WildcardEnabled>
+                    <AsList>Y</AsList>
+                    <ValidationMessage>'Entry is not a valid IPv4 or IPv6 address.'</ValidationMessage>
+                </dns>
             </Pool>
         </Pools>
         <VTIs>