From eecec6b5caeaef14a03ddbb1d09f9c599273b998 Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 6 Dec 2020 13:44:56 +0100
Subject: dhcp: T2562: add "listen-address" CLI node for better DHCP relay
 support

Running ISC DHCP server as backend server for multiple pools served to relay
agents requires DHCPd to explicitly listen on give interfaces or a "transit"
subnet declaration facing the network where we receive the DHCPREQ messages on.

This implements a new "listen-address" CLI node, the given address is validated
if it is assigned to the system and upon success, a proper "subnet { }" statement
is added into dhcpd.conf
---
 interface-definitions/dhcp-server.xml.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'interface-definitions/dhcp-server.xml.in')

diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 2f78f11ea..161eeed28 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -11,13 +11,13 @@
         <children>
           <leafNode name="disable">
             <properties>
-              <help>Option to disable DHCP server</help>
+              <help>Disable DHCP server</help>
               <valueless/>
             </properties>
           </leafNode>
           <leafNode name="dynamic-dns-update">
             <properties>
-              <help>DHCP server to dynamically update the Domain Name System (DNS)</help>
+              <help>Dynamically update Domain Name System (RFC4702)</help>
               <valueless/>
             </properties>
           </leafNode>
@@ -32,19 +32,20 @@
           </leafNode>
           <leafNode name="hostfile-update">
             <properties>
-              <help>Enable DHCP server updating /etc/hosts (per client lease)</help>
+              <help>Updating /etc/hosts file (per client lease)</help>
               <valueless/>
             </properties>
           </leafNode>
           <leafNode name="host-decl-name">
             <properties>
-              <help>Instruct server to use host declaration name for forward DNS name</help>
+              <help>Use host declaration name for forward DNS name</help>
               <valueless/>
             </properties>
           </leafNode>
+          #include <include/listen-address.xml.i>
           <tagNode name="shared-network-name">
             <properties>
-              <help>DHCP shared network name [REQUIRED]</help>
+              <help>Name of DHCP shared network</help>
               <constraint>
                 <regex>[-_a-zA-Z0-9.]+</regex>
               </constraint>
-- 
cgit v1.2.3