From 65ab1fd638b2e49b4e4aac295957154d2e2c7bcc Mon Sep 17 00:00:00 2001
From: H3Krn <hhhkroon@hotmail.com>
Date: Sat, 1 Jun 2024 15:02:10 +0200
Subject: [PATCH] Add next-server option to Kea (#7505)

---------

Co-authored-by: Harm Kroon <harm.kroon@tomtom.com>
---
 .../app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml    | 6 ++++++
 src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php      | 1 +
 src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml      | 4 ++++
 3 files changed, 11 insertions(+)

diff --git a/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml b/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml
index 880bb7dce..9f444e20a 100644
--- a/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml
+++ b/src/opnsense/mvc/app/controllers/OPNsense/Kea/forms/dialogSubnet4.xml
@@ -74,6 +74,12 @@
         <allownew>true</allownew>
         <help>Specifies a list of RFC 868 time servers available to the client.</help>
     </field>
+    <field>
+        <id>subnet4.next_server</id>
+        <label>Next server</label>
+        <type>text</type>
+        <help>Next server IP address</help>
+    </field>
     <field>
         <id>subnet4.option_data.tftp_server_name</id>
         <label>TFTP server</label>
diff --git a/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php b/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php
index c726e5868..7e1bfed72 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php
+++ b/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.php
@@ -141,6 +141,7 @@ class KeaDhcpv4 extends BaseModel
             $record = [
                 'id' => $subnet_id++,
                 'subnet' => (string)$subnet->subnet,
+                'next-server' => (string)$subnet->next_server,
                 'option-data' => [],
                 'pools' => [],
                 'reservations' => []
diff --git a/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml b/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml
index 2364c824e..35383b85c 100644
--- a/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml
+++ b/src/opnsense/mvc/app/models/OPNsense/Kea/KeaDhcpv4.xml
@@ -36,6 +36,10 @@
                     <AddressFamily>ipv4</AddressFamily>
                     <Required>Y</Required>
                 </subnet>
+                <next_server type="NetworkField">
+                    <NetMaskAllowed>N</NetMaskAllowed>
+                    <AddressFamily>ipv4</AddressFamily>
+                </next_server>
                 <option_data_autocollect type="BooleanField">
                     <Default>1</Default>
                     <Required>Y</Required>