From d8eb9efa721237fc7c77b66060fdff9681d2641b Mon Sep 17 00:00:00 2001
From: Omar Kallel <omar.kallel@pivasoftware.com>
Date: Sat, 21 Nov 2020 01:55:21 +0100
Subject: [PATCH] Get forced notifications from a struct dm_parameter array &&
 enhance the function check_instance_wildcard_parameter_by_regex

---
 libbbf_api/dmbbf.c    | 25 +++++++++++--------------
 libbbf_api/dmbbf.h    |  1 +
 libbbf_api/dmcommon.c | 33 ++++++++++-----------------------
 3 files changed, 22 insertions(+), 37 deletions(-)

diff --git a/libbbf_api/dmbbf.c b/libbbf_api/dmbbf.c
index 25fed370..684c2ea9 100644
--- a/libbbf_api/dmbbf.c
+++ b/libbbf_api/dmbbf.c
@@ -110,6 +110,14 @@ struct notification notifications[] = {
 	[6] = {"6", "passive_active_lw"}
 };
 
+struct dm_parameter forced_notifications_parameters[] = {
+		{.name = "Device.DeviceInfo.SoftwareVersion", .notification = "2"},
+		{.name = "Device.DeviceInfo.ProvisioningCode", .notification = "2"},
+		{.name = "Device.ManagementServer.ConnectionRequestURL", .notification = "2"},
+		{.name = "Device.ManagementServer.ConnReqJabberID", .notification = "2"},
+		{.name = "Device.SoftwareModules.ExecutionUnit.*.Status", .notification = "2"}
+};
+
 struct dm_acl dm_acl[] = {
 	[0] = {DM_PUBLIC_LIST, "public_list"},
 	[1] = {DM_PUBLIC_READ, "public_read"},
@@ -1888,21 +1896,10 @@ int dm_entry_enabled_notify(struct dmctx *dmctx)
 char* check_parameter_forced_notification(char *parameter)
 {
 	int i;
-	struct uci_list *list_notif;
-	char *pch, *notification = "0";
-	struct uci_element *e;
 
-	for (i = (ARRAY_SIZE(notifications) - 1); i >= 0; i--) {
-		dmuci_get_option_value_list("cwmp", "@forced_notifications[0]", notifications[i].type, &list_notif);
-		if (list_notif) {
-			uci_foreach_element(list_notif, e) {
-				pch = e->name;
-				if (strcmp(pch, parameter) == 0 || check_instance_wildcard_parameter_by_regex(parameter, pch) == 0) {
-					notification = notifications[i].value;
-					return notification;
-				}
-			}
-		}
+	for (i=0; i<ARRAY_SIZE(forced_notifications_parameters); i++) {
+		if (strcmp(forced_notifications_parameters[i].name, parameter) == 0 || check_instance_wildcard_parameter_by_regex(parameter, forced_notifications_parameters[i].name) == 0)
+			return forced_notifications_parameters[i].notification;
 	}
 	return NULL;
 }
diff --git a/libbbf_api/dmbbf.h b/libbbf_api/dmbbf.h
index 24a6eb0e..7c55a231 100644
--- a/libbbf_api/dmbbf.h
+++ b/libbbf_api/dmbbf.h
@@ -180,6 +180,7 @@ struct dm_parameter {
 	char *type; 
 	char *version;
 	unsigned int flags;
+	char *notification;
 };
 
 struct dm_json_parameter {
diff --git a/libbbf_api/dmcommon.c b/libbbf_api/dmcommon.c
index 7191291c..5ae18921 100644
--- a/libbbf_api/dmcommon.c
+++ b/libbbf_api/dmcommon.c
@@ -1852,28 +1852,15 @@ void append_dot_to_string(char *new_string, const char *string, size_t len)
 
 int check_instance_wildcard_parameter_by_regex(char *parameter, char* regex)
 {
-        char **array_str = strsplit_by_str(regex, ".*.");
-        int i = 0;
-        char *res= NULL, *tmp = NULL;
-        regex_t regex1 = {};
-        while (array_str[i]) {
-			if (res == NULL) {
-				dmasprintf(&res, "^%s", array_str[i]);
-				i++;
-				continue;
-			}
-			tmp = dmstrdup(res);
-			FREE(res);
-			dmasprintf(&res, "%s\\.[0-9][0-9]*\\.%s", tmp, array_str[i]);
-			FREE(tmp);
-			i++;
+        size_t l1, l2;
+        char **parameter_split = strsplit(parameter, ".", &l1);
+        char **regex_split = strsplit(regex, ".", &l2);
+        if (l1 != l2)
+                return -1;
+        int i;
+        for (i=0; i<l1; i++) {
+                if (strcmp(parameter_split[i], regex_split[i]) != 0 && (strcmp(regex_split[i], "*") != 0 || atoi(parameter_split[i])<=0))
+                        return -1;
         }
-        tmp = dmstrdup(res);
-        FREE(res);
-        dmasprintf(&res, "%s%c", tmp, '$');
-        regcomp(&regex1, res, 0);
-        int ret = regexec(&regex1, parameter, 0, NULL, 0);
-        regfree(&regex1);
-        FREE(res);
-        return ret;
+        return 0;
 }