From a00f3bfd0ff580625f63f024bdce9ed55100d63d Mon Sep 17 00:00:00 2001
From: Christian Poessinger <christian@poessinger.com>
Date: Sun, 19 Sep 2021 11:14:43 +0200
Subject: dhcp-server: T3841: add option to perform ICMP check before address
 assignment

(cherry picked from commit 83ea0cb273e29db22062cc133b6eabd4ba2761c7)
---
 data/templates/dhcp-server/dhcpd.conf.tmpl          | 6 ++++++
 interface-definitions/dhcp-server.xml.in            | 2 ++
 interface-definitions/include/dhcp-ping-check.xml.i | 8 ++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 interface-definitions/include/dhcp-ping-check.xml.i

diff --git a/data/templates/dhcp-server/dhcpd.conf.tmpl b/data/templates/dhcp-server/dhcpd.conf.tmpl
index 9aeaafcc2..11482c1ec 100644
--- a/data/templates/dhcp-server/dhcpd.conf.tmpl
+++ b/data/templates/dhcp-server/dhcpd.conf.tmpl
@@ -70,6 +70,9 @@ shared-network {{ network | replace('_','-') }} {
 {%     if network_config.authoritative is defined %}
     authoritative;
 {%     endif %}
+{%     if network_config.ping_check is defined %}
+    ping-check true;
+{%     endif %}
 {%     if network_config.shared_network_parameters is defined and network_config.shared_network_parameters is not none %}
     # The following {{ network_config.shared_network_parameters | length }} line(s)
     # were added as shared-network-parameters in the CLI and have not been validated
@@ -157,6 +160,9 @@ shared-network {{ network | replace('_','-') }} {
         default-lease-time {{ subnet_config.lease }};
         max-lease-time {{ subnet_config.lease }};
 {%         endif %}
+{%         if network_config.ping_check is not defined and subnet_config.ping_check is defined %}
+        ping-check true;
+{%         endif %}
 {%         if subnet_config.static_mapping is defined and subnet_config.static_mapping is not none %}
 {%           for host, host_config in subnet_config.static_mapping.items() if host_config.disable is not defined %}
         host {{ host | replace('_','-') if host_decl_name is defined else network | replace('_','-') + '_' + host | replace('_','-') }} {
diff --git a/interface-definitions/dhcp-server.xml.in b/interface-definitions/dhcp-server.xml.in
index 598be74b4..e1d224121 100644
--- a/interface-definitions/dhcp-server.xml.in
+++ b/interface-definitions/dhcp-server.xml.in
@@ -107,6 +107,7 @@
                   <help>Shared-network-name description</help>
                 </properties>
               </leafNode>
+              #include <include/dhcp-ping-check.xml.i>
               #include <include/generic-disable-node.xml.i>
               <leafNode name="shared-network-parameters">
                 <properties>
@@ -229,6 +230,7 @@
                       <multi/>
                     </properties>
                   </leafNode>
+                  #include <include/dhcp-ping-check.xml.i>
                   <leafNode name="pop-server">
                     <properties>
                       <help>IP address of POP3 server</help>
diff --git a/interface-definitions/include/dhcp-ping-check.xml.i b/interface-definitions/include/dhcp-ping-check.xml.i
new file mode 100644
index 000000000..0b2a1214a
--- /dev/null
+++ b/interface-definitions/include/dhcp-ping-check.xml.i
@@ -0,0 +1,8 @@
+<!-- include start from dhcp-ping-check.xml.i -->
+<leafNode name="ping-check">
+  <properties>
+    <help>Sends ICMP Echo request to the address being assigned</help>
+    <valueless/>
+  </properties>
+</leafNode>
+<!-- include end -->
-- 
cgit v1.2.3