From 14f638fa53d09837eb0e85a693a0bef22f6865bf Mon Sep 17 00:00:00 2001
From: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
Date: Thu, 18 Feb 2021 10:59:53 +0100
Subject: [PATCH] Ticket refs #3794: implement Device.DHCPv4.Server.Enable
 parameter

---
 dmtree/tr181/dhcpv4.c | 26 +++++++++++++++++++++++++-
 json/tr181.json       | 17 ++++++++++++++++-
 2 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/dmtree/tr181/dhcpv4.c b/dmtree/tr181/dhcpv4.c
index 4689e3b9..56608f19 100644
--- a/dmtree/tr181/dhcpv4.c
+++ b/dmtree/tr181/dhcpv4.c
@@ -2236,6 +2236,30 @@ static int set_DHCPv4ServerPoolOption_Enable(char *refparam, struct dmctx *ctx,
 	return 0;
 }
 
+/*#Device.DHCPv4.Server.Enable!UCI:dhcp/dnsmasq,@dnsmasq[0]/dhcpv4server*/
+static int get_DHCPv4Server_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
+{
+	*value = dmuci_get_option_value_fallback_def("dhcp", "@dnsmasq[0]", "dhcpv4server", "1");
+	return 0;
+}
+
+static int set_DHCPv4Server_Enable(char *refparam, struct dmctx *ctx, void *data, char *instance, char *value, int action)
+{
+	bool b;
+
+	switch (action) {
+		case VALUECHECK:
+			if (dm_validate_boolean(value))
+				return FAULT_9007;
+			return 0;
+		case VALUESET:
+			string_to_bool(value, &b);
+			dmuci_set_value("dhcp", "@dnsmasq[0]", "dhcpv4server", b ? "1" : "0");
+			return 0;
+	}
+	return 0;
+}
+
 static int get_DHCPv4Server_PoolNumberOfEntries(char *refparam, struct dmctx *ctx, void *data, char *instance, char **value)
 {
 	struct uci_section *s = NULL;
@@ -3096,7 +3120,7 @@ DMOBJ tDHCPv4ServerObj[] = {
 
 DMLEAF tDHCPv4ServerParams[] = {
 /* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
-//{"Enable", &DMWRITE, DMT_BOOL, get_DHCPv4Server_Enable, set_DHCPv4Server_Enable, BBFDM_BOTH},
+{"Enable", &DMWRITE, DMT_BOOL, get_DHCPv4Server_Enable, set_DHCPv4Server_Enable, BBFDM_BOTH},
 {"PoolNumberOfEntries", &DMREAD, DMT_UNINT, get_DHCPv4Server_PoolNumberOfEntries, NULL, BBFDM_BOTH},
 {0}
 };
diff --git a/json/tr181.json b/json/tr181.json
index ee464101..7543c49f 100644
--- a/json/tr181.json
+++ b/json/tr181.json
@@ -61346,7 +61346,22 @@
 						"cwmp",
 						"usp"
 					],
-					"datatype": "boolean"
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"type": "uci",
+							"uci": {
+								"file": "dhcp",
+								"section": {
+									"type": "dnsmasq",
+									"name": "@dnsmasq[0]"
+								},
+								"option": {
+									"name": "dhcpv4server"
+								}
+							}
+						}
+					]
 				},
 				"PoolNumberOfEntries": {
 					"type": "unsignedInt",