obuspa: use hotplug instead of procd interface trigger

-------------------------------------------------------------------------------
* 400cc66 added root object for G.fast
-------------------------------------------------------------------------------
commit 400cc66081f2b10b481d5a745bc505b78af098bd
Author: Jani Juvan <jani.juvan@iopsys.eu>
Date: 2020-12-16 14:39:24 +0100

    added root object for G.fast

Base directory -> /
 dslmngr.c | 137 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
 1 file changed, 128 insertions(+), 9 deletions(-)
-------------------------------------------------------------------------------

bbf/Config_bbfdm.in

@@ -16,12 +16,4 @@ config BBF_TR143
 	bool "Compile with tr143 diagnostics features"
 	default y
 
-config BBF_TR157
-	bool "Compile with tr157 bulkdata collector features"
-	default y
-	
-config BBF_TR064
-	bool "Compile with tr064 features"
-	default n
-
 endif

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=2.7-2020-10-23
+PKG_VERSION:=3.2.7
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=143afb5f2baf5fddd17160b6cf77657b422d2d44
+PKG_SOURCE_VERSION:=ae196c54590dc343db14a70879f21ef88203c426
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -44,7 +44,7 @@ define Package/libbbf_api/description
 endef
 
 define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR104, TR143, TR157 and TR064 data models
+ Library contains the data model tree. It includes TR181, TR104 and TR143 data models
 endef
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -74,16 +74,6 @@ CONFIGURE_ARGS += \
 	--enable-tr143
 endif
 
-ifeq ($(CONFIG_BBF_TR157),y)
-CONFIGURE_ARGS += \
-	--enable-tr157
-endif
-
-ifeq ($(CONFIG_BBF_TR064),y)
-CONFIGURE_ARGS += \
-	--enable-tr064
-endif
-
 ifeq ($(CONFIG_PACKAGE_libopenssl),y)
 CONFIGURE_ARGS += \
 	--enable-libopenssl
@@ -119,8 +109,6 @@ define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
 	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(CP) $(PKG_BUILD_DIR)/dmtree/tr181/*.h $(1)/usr/include/libbbfdm/
-	$(CP) $(PKG_BUILD_DIR)/dmtree/tr157/*.h $(1)/usr/include/libbbfdm/
 	$(CP) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/

bulkdata/src/Makefile

@@ -5,7 +5,7 @@ PROG_OBJS = bulkdata.o common.o config.o http.o log.o report.o times.o buci.o
 LIB_OBJS = datamodel.o
 
 PROG_CFLAGS = $(CFLAGS) -Wall -Werror -fPIC
-PROG_LDFLAGS = $(LDFLAGS) -lubus -luci -lubox -ljson-c -lcurl -lblobmsg_json -lbbfdm
+PROG_LDFLAGS = $(LDFLAGS) -lubus -luci -lubox -ljson-c -lcurl -lblobmsg_json -lbbfdm -lbbf_api
 LIB_LDFLAGS = $(LDFLAGS) -lbbf_api
 
 %.o: %.c

bulkdata/src/common.c

@@ -17,7 +17,7 @@ static pathnode *temphead = NULL;
 int bulkdata_dm_ctx_init(struct dmctx *ctx)
 {
 	struct bulkdata *bulkdata = &bulkdata_main;
-	dm_ctx_init(ctx, DM_CWMP, bulkdata->amd_version, bulkdata->instance_mode);
+	dm_ctx_init(ctx, bulkdata->instance_mode);
 	return 0;
 }
 

bulkdata/src/config.c

@@ -14,7 +14,6 @@
 #include <string.h>
 #include <stdlib.h>
 #include <stdarg.h>
-#include <libbbfdm/deviceinfo.h>
 
 #include "log.h"
 #include "config.h"
@@ -77,9 +76,9 @@ int get_device_id_config(struct bulkdata *bulkdata)
 	struct dmctx dmctx = {0};
 
 	bulkdata_dm_ctx_init(&dmctx);
-	bulkdata->device_id.manufacturer_oui = strdup(get_deviceid_manufactureroui());
-	bulkdata->device_id.product_class = strdup(get_deviceid_productclass());
-	bulkdata->device_id.serial_number = strdup(get_deviceid_serialnumber());
+	bulkdata->device_id.manufacturer_oui = bulkdata_get_value_param("Device.DeviceInfo.ManufacturerOUI");
+	bulkdata->device_id.product_class = bulkdata_get_value_param("Device.DeviceInfo.ProductClass");
+	bulkdata->device_id.serial_number = bulkdata_get_value_param("Device.DeviceInfo.SerialNumber");
 	bulkdata_dm_ctx_clean(&dmctx);
 
 	return 0;

bulkdata/src/datamodel.c

@@ -36,8 +36,8 @@ static int browseBulkDataProfileInst(struct dmctx *dmctx, DMNODE *parent_node, v
 	synchronize_specific_config_sections_with_dmmap("bulkdata", "profile", "dmmap_bulkdata", &dup_list);
 	list_for_each_entry(p, &dup_list, list) {
 
-		inst = handle_update_instance(1, dmctx, &max_inst, update_instance_alias, 5,
-			   p->dmmap_section, "profile_instance", "profile_alias", "dmmap_bulkdata", "profile");
+		inst = handle_update_instance(1, dmctx, &max_inst, update_instance_alias, 3,
+			   p->dmmap_section, "profile_instance", "profile_alias");
 
 		if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP)
 			break;
@@ -65,8 +65,8 @@ static int browseBulkDataProfileParameterInst(struct dmctx *dmctx, DMNODE *paren
 		browse_args.option = "profile_id";
 		browse_args.value = prev_profile_id;
 
-		inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 7,
-			   p->dmmap_section, "parameter_instance", "parameter_alias", "dmmap_bulkdata", "profile_parameter",
+		inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 5,
+			   p->dmmap_section, "parameter_instance", "parameter_alias",
 			   check_browse_section, (void *)&browse_args);
 
 		if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP)
@@ -95,8 +95,8 @@ static int browseBulkDataProfileHTTPRequestURIParameterInst(struct dmctx *dmctx,
 		browse_args.option = "profile_id";
 		browse_args.value = prev_profile_id;
 
-		inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 7,
-			   p->dmmap_section, "requesturiparameter_instance", "requesturiparameter_alias", "dmmap_bulkdata", "profile_http_request_uri_parameter",
+		inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 5,
+			   p->dmmap_section, "requesturiparameter_instance", "requesturiparameter_alias",
 			   check_browse_section, (void *)&browse_args);
 
 		if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP)
@@ -112,13 +112,12 @@ static int browseBulkDataProfileHTTPRequestURIParameterInst(struct dmctx *dmctx,
 static int addObjBulkDataProfile(char *refparam, struct dmctx *ctx, void *data, char **instance)
 {
 	struct uci_section *profile, *dmmap_bulkdata;
-	char prof_id[16], *last_inst = NULL, *value, *v;
+	char prof_id[16], *last_inst = NULL;
 
-	check_create_dmmap_package("dmmap_bulkdata");
 	last_inst = get_last_instance_bbfdm("dmmap_bulkdata", "profile", "profile_instance");
 	snprintf(prof_id, sizeof(prof_id), "%d", last_inst ? atoi(last_inst)+1 : 1);
 
-	dmuci_add_section("bulkdata", "profile", &profile, &value);
+	dmuci_add_section("bulkdata", "profile", &profile);
 	dmuci_set_value_by_section(profile, "profile_id", prof_id);
 	dmuci_set_value_by_section(profile, "enable", "0");
 	dmuci_set_value_by_section(profile, "nbre_of_retained_failed_reports", "0");
@@ -139,9 +138,9 @@ static int addObjBulkDataProfile(char *refparam, struct dmctx *ctx, void *data,
 	dmuci_set_value_by_section(profile, "http_retry_minimum_wait_interval", "5");
 	dmuci_set_value_by_section(profile, "http_persist_across_reboot", "0");
 
-	dmuci_add_section_bbfdm("dmmap_bulkdata", "profile", &dmmap_bulkdata, &v);
+	dmuci_add_section_bbfdm("dmmap_bulkdata", "profile", &dmmap_bulkdata);
 	dmuci_set_value_by_section(dmmap_bulkdata, "section_name", section_name(profile));
-	*instance = update_instance(last_inst, 4, dmmap_bulkdata, "profile_instance", "dmmap_bulkdata", "profile");
+	*instance = update_instance(last_inst, 2, dmmap_bulkdata, "profile_instance");
 
 	return 0;
 }
@@ -221,24 +220,24 @@ static int delObjBulkDataProfile(char *refparam, struct dmctx *ctx, void *data,
 static int addObjBulkDataProfileParameter(char *refparam, struct dmctx *ctx, void *data, char **instance)
 {
 	struct uci_section *profile_parameter, *dmmap_bulkdata;
-	char *value, *last_inst, *prev_profile_id, *v;
+	char *last_inst, *prev_profile_id;
 	struct browse_args browse_args = {0};
 
 	dmuci_get_value_by_section_string((struct uci_section *)data, "profile_id", &prev_profile_id);
 
 	last_inst = get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_bulkdata", "profile_parameter", "parameter_instance", "profile_id", prev_profile_id);
 
-	dmuci_add_section("bulkdata", "profile_parameter", &profile_parameter, &value);
+	dmuci_add_section("bulkdata", "profile_parameter", &profile_parameter);
 	dmuci_set_value_by_section(profile_parameter, "profile_id", prev_profile_id);
 
 	browse_args.option = "profile_id";
 	browse_args.value = prev_profile_id;
 
-	dmuci_add_section_bbfdm("dmmap_bulkdata", "profile_parameter", &dmmap_bulkdata, &v);
+	dmuci_add_section_bbfdm("dmmap_bulkdata", "profile_parameter", &dmmap_bulkdata);
 	dmuci_set_value_by_section(dmmap_bulkdata, "section_name", section_name(profile_parameter));
 	dmuci_set_value_by_section(dmmap_bulkdata, "profile_id", prev_profile_id);
 
-	*instance = update_instance(last_inst, 6, dmmap_bulkdata, "parameter_instance", "dmmap_bulkdata", "profile_parameter", check_browse_section, (void *)&browse_args);
+	*instance = update_instance(last_inst, 5, dmmap_bulkdata, "parameter_instance", NULL, check_browse_section, (void *)&browse_args);
 
 	return 0;
 }
@@ -275,24 +274,24 @@ static int delObjBulkDataProfileParameter(char *refparam, struct dmctx *ctx, voi
 static int addObjBulkDataProfileHTTPRequestURIParameter(char *refparam, struct dmctx *ctx, void *data, char **instance)
 {
 	struct uci_section *profile_http_request_uri_parameter, *dmmap_bulkdata;
-	char *value, *last_inst, *prev_profile_id, *v;
+	char *last_inst, *prev_profile_id;
 	struct browse_args browse_args = {0};
 
 	dmuci_get_value_by_section_string((struct uci_section *)data, "profile_id", &prev_profile_id);
 
 	last_inst = get_last_instance_lev2_bbfdm_dmmap_opt("dmmap_bulkdata", "profile_http_request_uri_parameter", "requesturiparameter_instance", "profile_id", prev_profile_id);
 
-	dmuci_add_section("bulkdata", "profile_http_request_uri_parameter", &profile_http_request_uri_parameter, &value);
+	dmuci_add_section("bulkdata", "profile_http_request_uri_parameter", &profile_http_request_uri_parameter);
 	dmuci_set_value_by_section(profile_http_request_uri_parameter, "profile_id", prev_profile_id);
 
 	browse_args.option = "profile_id";
 	browse_args.value = prev_profile_id;
 
-	dmuci_add_section_bbfdm("dmmap_bulkdata", "profile_http_request_uri_parameter", &dmmap_bulkdata, &v);
+	dmuci_add_section_bbfdm("dmmap_bulkdata", "profile_http_request_uri_parameter", &dmmap_bulkdata);
 	dmuci_set_value_by_section(dmmap_bulkdata, "section_name", section_name(profile_http_request_uri_parameter));
 	dmuci_set_value_by_section(dmmap_bulkdata, "profile_id", prev_profile_id);
 
-	*instance = update_instance(last_inst, 6, dmmap_bulkdata, "requesturiparameter_instance", "dmmap_bulkdata", "profile_http_request_uri_parameter", check_browse_section, (void *)&browse_args);
+	*instance = update_instance(last_inst, 5, dmmap_bulkdata, "requesturiparameter_instance", NULL, check_browse_section, (void *)&browse_args);
 
 	return 0;
 }
@@ -1174,120 +1173,120 @@ static int set_BulkDataProfileHTTPRequestURIParameter_Reference(char *refparam,
 
 /* *** Device.BulkData. *** */
 DMOBJ tDeviceBulkDataObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
-{"BulkData", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tBulkDataObj, tBulkDataParams, NULL, BBFDM_BOTH},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"BulkData", &DMREAD, NULL, NULL, NULL, NULL, NULL, tBulkDataObj, tBulkDataParams, NULL, BBFDM_BOTH},
 {0}
 };
 
 DMOBJ tBulkDataObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
-{"Profile", &DMWRITE, addObjBulkDataProfile, delObjBulkDataProfile, NULL, browseBulkDataProfileInst, NULL, NULL, NULL, tBulkDataProfileObj, tBulkDataProfileParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", NULL}},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"Profile", &DMWRITE, addObjBulkDataProfile, delObjBulkDataProfile, NULL, browseBulkDataProfileInst, NULL, tBulkDataProfileObj, tBulkDataProfileParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", NULL}},
 {0}
 };
 
 DMLEAF tBulkDataParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"Enable", &DMWRITE, DMT_BOOL, get_BulkData_Enable, set_BulkData_Enable, NULL, NULL, BBFDM_BOTH},
-{"Status", &DMREAD, DMT_STRING, get_BulkData_Status, NULL, NULL, NULL, BBFDM_BOTH},
-{"MinReportingInterval", &DMREAD, DMT_UNINT, get_BulkData_MinReportingInterval, NULL, NULL, NULL, BBFDM_BOTH},
-{"Protocols", &DMREAD, DMT_STRING, get_BulkData_Protocols, NULL, NULL, NULL, BBFDM_BOTH},
-{"EncodingTypes", &DMREAD, DMT_STRING, get_BulkData_EncodingTypes, NULL, NULL, NULL, BBFDM_BOTH},
-{"ParameterWildCardSupported", &DMREAD, DMT_BOOL, get_BulkData_ParameterWildCardSupported, NULL, NULL, NULL, BBFDM_BOTH},
-{"MaxNumberOfProfiles", &DMREAD, DMT_INT, get_BulkData_MaxNumberOfProfiles, NULL, NULL, NULL, BBFDM_BOTH},
-{"MaxNumberOfParameterReferences", &DMREAD, DMT_INT, get_BulkData_MaxNumberOfParameterReferences, NULL, NULL, NULL, BBFDM_BOTH},
-{"ProfileNumberOfEntries", &DMREAD, DMT_UNINT, get_BulkData_ProfileNumberOfEntries, NULL, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"Enable", &DMWRITE, DMT_BOOL, get_BulkData_Enable, set_BulkData_Enable, BBFDM_BOTH},
+{"Status", &DMREAD, DMT_STRING, get_BulkData_Status, NULL, BBFDM_BOTH},
+{"MinReportingInterval", &DMREAD, DMT_UNINT, get_BulkData_MinReportingInterval, NULL, BBFDM_BOTH},
+{"Protocols", &DMREAD, DMT_STRING, get_BulkData_Protocols, NULL, BBFDM_BOTH},
+{"EncodingTypes", &DMREAD, DMT_STRING, get_BulkData_EncodingTypes, NULL, BBFDM_BOTH},
+{"ParameterWildCardSupported", &DMREAD, DMT_BOOL, get_BulkData_ParameterWildCardSupported, NULL, BBFDM_BOTH},
+{"MaxNumberOfProfiles", &DMREAD, DMT_INT, get_BulkData_MaxNumberOfProfiles, NULL, BBFDM_BOTH},
+{"MaxNumberOfParameterReferences", &DMREAD, DMT_INT, get_BulkData_MaxNumberOfParameterReferences, NULL, BBFDM_BOTH},
+{"ProfileNumberOfEntries", &DMREAD, DMT_UNINT, get_BulkData_ProfileNumberOfEntries, NULL, BBFDM_BOTH},
 {0}
 };
 
 /* *** Device.BulkData.Profile.{i}. *** */
 DMOBJ tBulkDataProfileObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
-{"Parameter", &DMWRITE, addObjBulkDataProfileParameter, delObjBulkDataProfileParameter, NULL, browseBulkDataProfileParameterInst, NULL, NULL, NULL, NULL, tBulkDataProfileParameterParams, NULL, BBFDM_BOTH},
-{"CSVEncoding", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tBulkDataProfileCSVEncodingParams, NULL, BBFDM_BOTH},
-{"JSONEncoding", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tBulkDataProfileJSONEncodingParams, NULL, BBFDM_BOTH},
-{"HTTP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tBulkDataProfileHTTPObj, tBulkDataProfileHTTPParams, NULL, BBFDM_BOTH},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"Parameter", &DMWRITE, addObjBulkDataProfileParameter, delObjBulkDataProfileParameter, NULL, browseBulkDataProfileParameterInst, NULL, NULL, tBulkDataProfileParameterParams, NULL, BBFDM_BOTH},
+{"CSVEncoding", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tBulkDataProfileCSVEncodingParams, NULL, BBFDM_BOTH},
+{"JSONEncoding", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tBulkDataProfileJSONEncodingParams, NULL, BBFDM_BOTH},
+{"HTTP", &DMREAD, NULL, NULL, NULL, NULL, NULL, tBulkDataProfileHTTPObj, tBulkDataProfileHTTPParams, NULL, BBFDM_BOTH},
 {0}
 };
 
 DMLEAF tBulkDataProfileParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"Enable", &DMWRITE, DMT_BOOL, get_BulkDataProfile_Enable, set_BulkDataProfile_Enable, NULL, NULL, BBFDM_BOTH},
-{"Alias", &DMWRITE, DMT_STRING, get_BulkDataProfile_Alias, set_BulkDataProfile_Alias, NULL, NULL, BBFDM_BOTH},
-{"Name", &DMWRITE, DMT_STRING, get_BulkDataProfile_Name, set_BulkDataProfile_Name, NULL, NULL, BBFDM_BOTH},
-{"NumberOfRetainedFailedReports", &DMWRITE, DMT_INT, get_BulkDataProfile_NumberOfRetainedFailedReports, set_BulkDataProfile_NumberOfRetainedFailedReports, NULL, NULL, BBFDM_BOTH},
-{"Protocol", &DMWRITE, DMT_STRING, get_BulkDataProfile_Protocol, set_BulkDataProfile_Protocol, NULL, NULL, BBFDM_BOTH},
-{"EncodingType", &DMWRITE, DMT_STRING, get_BulkDataProfile_EncodingType, set_BulkDataProfile_EncodingType, NULL, NULL, BBFDM_BOTH},
-{"ReportingInterval", &DMWRITE, DMT_UNINT, get_BulkDataProfile_ReportingInterval, set_BulkDataProfile_ReportingInterval, NULL, NULL, BBFDM_BOTH},
-{"TimeReference", &DMWRITE, DMT_TIME, get_BulkDataProfile_TimeReference, set_BulkDataProfile_TimeReference, NULL, NULL, BBFDM_BOTH},
-{"ParameterNumberOfEntries", &DMREAD, DMT_UNINT, get_BulkDataProfile_ParameterNumberOfEntries, NULL, NULL, NULL, BBFDM_BOTH},
-//{"StreamingHost", &DMWRITE, DMT_STRING, get_BulkDataProfile_StreamingHost, set_BulkDataProfile_StreamingHost, NULL, NULL, BBFDM_BOTH},
-//{"StreamingPort", &DMWRITE, DMT_UNINT, get_BulkDataProfile_StreamingPort, set_BulkDataProfile_StreamingPort, NULL, NULL, BBFDM_BOTH},
-//{"StreamingSessionID", &DMWRITE, DMT_UNINT, get_BulkDataProfile_StreamingSessionID, set_BulkDataProfile_StreamingSessionID, NULL, NULL, BBFDM_BOTH},
-//{"FileTransferURL", &DMWRITE, DMT_STRING, get_BulkDataProfile_FileTransferURL, set_BulkDataProfile_FileTransferURL, NULL, NULL, BBFDM_BOTH},
-//{"FileTransferUsername", &DMWRITE, DMT_STRING, get_BulkDataProfile_FileTransferUsername, set_BulkDataProfile_FileTransferUsername, NULL, NULL, BBFDM_BOTH},
-//{"FileTransferPassword", &DMWRITE, DMT_STRING, get_BulkDataProfile_FileTransferPassword, set_BulkDataProfile_FileTransferPassword, NULL, NULL, BBFDM_BOTH},
-//{"ControlFileFormat", &DMWRITE, DMT_STRING, get_BulkDataProfile_ControlFileFormat, set_BulkDataProfile_ControlFileFormat, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"Enable", &DMWRITE, DMT_BOOL, get_BulkDataProfile_Enable, set_BulkDataProfile_Enable, BBFDM_BOTH},
+{"Alias", &DMWRITE, DMT_STRING, get_BulkDataProfile_Alias, set_BulkDataProfile_Alias, BBFDM_BOTH},
+{"Name", &DMWRITE, DMT_STRING, get_BulkDataProfile_Name, set_BulkDataProfile_Name, BBFDM_BOTH},
+{"NumberOfRetainedFailedReports", &DMWRITE, DMT_INT, get_BulkDataProfile_NumberOfRetainedFailedReports, set_BulkDataProfile_NumberOfRetainedFailedReports, BBFDM_BOTH},
+{"Protocol", &DMWRITE, DMT_STRING, get_BulkDataProfile_Protocol, set_BulkDataProfile_Protocol, BBFDM_BOTH},
+{"EncodingType", &DMWRITE, DMT_STRING, get_BulkDataProfile_EncodingType, set_BulkDataProfile_EncodingType, BBFDM_BOTH},
+{"ReportingInterval", &DMWRITE, DMT_UNINT, get_BulkDataProfile_ReportingInterval, set_BulkDataProfile_ReportingInterval, BBFDM_BOTH},
+{"TimeReference", &DMWRITE, DMT_TIME, get_BulkDataProfile_TimeReference, set_BulkDataProfile_TimeReference, BBFDM_BOTH},
+{"ParameterNumberOfEntries", &DMREAD, DMT_UNINT, get_BulkDataProfile_ParameterNumberOfEntries, NULL, BBFDM_BOTH},
+//{"StreamingHost", &DMWRITE, DMT_STRING, get_BulkDataProfile_StreamingHost, set_BulkDataProfile_StreamingHost, BBFDM_BOTH},
+//{"StreamingPort", &DMWRITE, DMT_UNINT, get_BulkDataProfile_StreamingPort, set_BulkDataProfile_StreamingPort, BBFDM_BOTH},
+//{"StreamingSessionID", &DMWRITE, DMT_UNINT, get_BulkDataProfile_StreamingSessionID, set_BulkDataProfile_StreamingSessionID, BBFDM_BOTH},
+//{"FileTransferURL", &DMWRITE, DMT_STRING, get_BulkDataProfile_FileTransferURL, set_BulkDataProfile_FileTransferURL, BBFDM_BOTH},
+//{"FileTransferUsername", &DMWRITE, DMT_STRING, get_BulkDataProfile_FileTransferUsername, set_BulkDataProfile_FileTransferUsername, BBFDM_BOTH},
+//{"FileTransferPassword", &DMWRITE, DMT_STRING, get_BulkDataProfile_FileTransferPassword, set_BulkDataProfile_FileTransferPassword, BBFDM_BOTH},
+//{"ControlFileFormat", &DMWRITE, DMT_STRING, get_BulkDataProfile_ControlFileFormat, set_BulkDataProfile_ControlFileFormat, BBFDM_BOTH},
 //{"Controller", &DMREAD, DMT_STRING, get_BulkDataProfile_Controller, NULL, NULL, NULL, BBFDM_USP},
 {0}
 };
 
 /* *** Device.BulkData.Profile.{i}.Parameter.{i}. *** */
 DMLEAF tBulkDataProfileParameterParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"Name", &DMWRITE, DMT_STRING, get_BulkDataProfileParameter_Name, set_BulkDataProfileParameter_Name, NULL, NULL, BBFDM_BOTH},
-{"Reference", &DMWRITE, DMT_STRING, get_BulkDataProfileParameter_Reference, set_BulkDataProfileParameter_Reference, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"Name", &DMWRITE, DMT_STRING, get_BulkDataProfileParameter_Name, set_BulkDataProfileParameter_Name, BBFDM_BOTH},
+{"Reference", &DMWRITE, DMT_STRING, get_BulkDataProfileParameter_Reference, set_BulkDataProfileParameter_Reference, BBFDM_BOTH},
 {0}
 };
 
 /* *** Device.BulkData.Profile.{i}.CSVEncoding. *** */
 DMLEAF tBulkDataProfileCSVEncodingParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"FieldSeparator", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_FieldSeparator, set_BulkDataProfileCSVEncoding_FieldSeparator, NULL, NULL, BBFDM_BOTH},
-{"RowSeparator", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_RowSeparator, set_BulkDataProfileCSVEncoding_RowSeparator, NULL, NULL, BBFDM_BOTH},
-{"EscapeCharacter", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_EscapeCharacter, set_BulkDataProfileCSVEncoding_EscapeCharacter, NULL, NULL, BBFDM_BOTH},
-{"ReportFormat", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_ReportFormat, set_BulkDataProfileCSVEncoding_ReportFormat, NULL, NULL, BBFDM_BOTH},
-{"RowTimestamp", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_RowTimestamp, set_BulkDataProfileCSVEncoding_RowTimestamp, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"FieldSeparator", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_FieldSeparator, set_BulkDataProfileCSVEncoding_FieldSeparator, BBFDM_BOTH},
+{"RowSeparator", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_RowSeparator, set_BulkDataProfileCSVEncoding_RowSeparator, BBFDM_BOTH},
+{"EscapeCharacter", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_EscapeCharacter, set_BulkDataProfileCSVEncoding_EscapeCharacter, BBFDM_BOTH},
+{"ReportFormat", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_ReportFormat, set_BulkDataProfileCSVEncoding_ReportFormat, BBFDM_BOTH},
+{"RowTimestamp", &DMWRITE, DMT_STRING, get_BulkDataProfileCSVEncoding_RowTimestamp, set_BulkDataProfileCSVEncoding_RowTimestamp, BBFDM_BOTH},
 {0}
 };
 
 /* *** Device.BulkData.Profile.{i}.JSONEncoding. *** */
 DMLEAF tBulkDataProfileJSONEncodingParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"ReportFormat", &DMWRITE, DMT_STRING, get_BulkDataProfileJSONEncoding_ReportFormat, set_BulkDataProfileJSONEncoding_ReportFormat, NULL, NULL, BBFDM_BOTH},
-{"ReportTimestamp", &DMWRITE, DMT_STRING, get_BulkDataProfileJSONEncoding_ReportTimestamp, set_BulkDataProfileJSONEncoding_ReportTimestamp, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"ReportFormat", &DMWRITE, DMT_STRING, get_BulkDataProfileJSONEncoding_ReportFormat, set_BulkDataProfileJSONEncoding_ReportFormat, BBFDM_BOTH},
+{"ReportTimestamp", &DMWRITE, DMT_STRING, get_BulkDataProfileJSONEncoding_ReportTimestamp, set_BulkDataProfileJSONEncoding_ReportTimestamp, BBFDM_BOTH},
 {0}
 };
 
 /* *** Device.BulkData.Profile.{i}.HTTP. *** */
 DMOBJ tBulkDataProfileHTTPObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
-{"RequestURIParameter", &DMWRITE, addObjBulkDataProfileHTTPRequestURIParameter, delObjBulkDataProfileHTTPRequestURIParameter, NULL, browseBulkDataProfileHTTPRequestURIParameterInst, NULL, NULL, NULL, NULL, tBulkDataProfileHTTPRequestURIParameterParams, NULL, BBFDM_BOTH},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"RequestURIParameter", &DMWRITE, addObjBulkDataProfileHTTPRequestURIParameter, delObjBulkDataProfileHTTPRequestURIParameter, NULL, browseBulkDataProfileHTTPRequestURIParameterInst, NULL, NULL, tBulkDataProfileHTTPRequestURIParameterParams, NULL, BBFDM_BOTH},
 {0}
 };
 
 DMLEAF tBulkDataProfileHTTPParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"URL", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_URL, set_BulkDataProfileHTTP_URL, NULL, NULL, BBFDM_BOTH},
-{"Username", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_Username, set_BulkDataProfileHTTP_Username, NULL, NULL, BBFDM_BOTH},
-{"Password", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_Password, set_BulkDataProfileHTTP_Password, NULL, NULL, BBFDM_BOTH},
-{"CompressionsSupported", &DMREAD, DMT_STRING, get_BulkDataProfileHTTP_CompressionsSupported, NULL, NULL, NULL, BBFDM_BOTH},
-{"Compression", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_Compression, set_BulkDataProfileHTTP_Compression, NULL, NULL, BBFDM_BOTH},
-{"MethodsSupported", &DMREAD, DMT_STRING, get_BulkDataProfileHTTP_MethodsSupported, NULL, NULL, NULL, BBFDM_BOTH},
-{"Method", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_Method, set_BulkDataProfileHTTP_Method, NULL, NULL, BBFDM_BOTH},
-{"UseDateHeader", &DMWRITE, DMT_BOOL, get_BulkDataProfileHTTP_UseDateHeader, set_BulkDataProfileHTTP_UseDateHeader, NULL, NULL, BBFDM_BOTH},
-{"RetryEnable", &DMWRITE, DMT_BOOL, get_BulkDataProfileHTTP_RetryEnable, set_BulkDataProfileHTTP_RetryEnable, NULL, NULL, BBFDM_BOTH},
-{"RetryMinimumWaitInterval", &DMWRITE, DMT_UNINT, get_BulkDataProfileHTTP_RetryMinimumWaitInterval, set_BulkDataProfileHTTP_RetryMinimumWaitInterval, NULL, NULL, BBFDM_BOTH},
-{"RetryIntervalMultiplier", &DMWRITE, DMT_UNINT, get_BulkDataProfileHTTP_RetryIntervalMultiplier, set_BulkDataProfileHTTP_RetryIntervalMultiplier, NULL, NULL, BBFDM_BOTH},
-{"RequestURIParameterNumberOfEntries", &DMREAD, DMT_UNINT, get_BulkDataProfileHTTP_RequestURIParameterNumberOfEntries, NULL, NULL, NULL, BBFDM_BOTH},
-{"PersistAcrossReboot", &DMWRITE, DMT_BOOL, get_BulkDataProfileHTTP_PersistAcrossReboot, set_BulkDataProfileHTTP_PersistAcrossReboot, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"URL", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_URL, set_BulkDataProfileHTTP_URL, BBFDM_BOTH},
+{"Username", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_Username, set_BulkDataProfileHTTP_Username, BBFDM_BOTH},
+{"Password", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_Password, set_BulkDataProfileHTTP_Password, BBFDM_BOTH},
+{"CompressionsSupported", &DMREAD, DMT_STRING, get_BulkDataProfileHTTP_CompressionsSupported, NULL, BBFDM_BOTH},
+{"Compression", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_Compression, set_BulkDataProfileHTTP_Compression, BBFDM_BOTH},
+{"MethodsSupported", &DMREAD, DMT_STRING, get_BulkDataProfileHTTP_MethodsSupported, NULL, BBFDM_BOTH},
+{"Method", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTP_Method, set_BulkDataProfileHTTP_Method, BBFDM_BOTH},
+{"UseDateHeader", &DMWRITE, DMT_BOOL, get_BulkDataProfileHTTP_UseDateHeader, set_BulkDataProfileHTTP_UseDateHeader, BBFDM_BOTH},
+{"RetryEnable", &DMWRITE, DMT_BOOL, get_BulkDataProfileHTTP_RetryEnable, set_BulkDataProfileHTTP_RetryEnable, BBFDM_BOTH},
+{"RetryMinimumWaitInterval", &DMWRITE, DMT_UNINT, get_BulkDataProfileHTTP_RetryMinimumWaitInterval, set_BulkDataProfileHTTP_RetryMinimumWaitInterval, BBFDM_BOTH},
+{"RetryIntervalMultiplier", &DMWRITE, DMT_UNINT, get_BulkDataProfileHTTP_RetryIntervalMultiplier, set_BulkDataProfileHTTP_RetryIntervalMultiplier, BBFDM_BOTH},
+{"RequestURIParameterNumberOfEntries", &DMREAD, DMT_UNINT, get_BulkDataProfileHTTP_RequestURIParameterNumberOfEntries, NULL, BBFDM_BOTH},
+{"PersistAcrossReboot", &DMWRITE, DMT_BOOL, get_BulkDataProfileHTTP_PersistAcrossReboot, set_BulkDataProfileHTTP_PersistAcrossReboot, BBFDM_BOTH},
 {0}
 };
 
 /* *** Device.BulkData.Profile.{i}.HTTP.RequestURIParameter.{i}. *** */
 DMLEAF tBulkDataProfileHTTPRequestURIParameterParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"Name", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTPRequestURIParameter_Name, set_BulkDataProfileHTTPRequestURIParameter_Name, NULL, NULL, BBFDM_BOTH},
-{"Reference", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTPRequestURIParameter_Reference, set_BulkDataProfileHTTPRequestURIParameter_Reference, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"Name", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTPRequestURIParameter_Name, set_BulkDataProfileHTTPRequestURIParameter_Name, BBFDM_BOTH},
+{"Reference", &DMWRITE, DMT_STRING, get_BulkDataProfileHTTPRequestURIParameter_Reference, set_BulkDataProfileHTTPRequestURIParameter_Reference, BBFDM_BOTH},
 {0}
 };
 

bulkdata/src/report.c

@@ -53,7 +53,7 @@ static void create_json_bulkdata_report_object_hierarchy(struct profile *profile
 			strcpy(buf, param_name);
 			for (pch = strtok_r(buf, ".", &pchr); pch != NULL; pch = strtok_r(NULL, ".", &pchr)) {
 				argv[j] = pch;
-				json_obj1 = (json_object *)dmjson_select_obj(json_obj, argv);
+				json_obj1 = (json_object *)bbf_api_dmjson_select_obj(json_obj, argv);
 				if (json_obj1)
 					json_obj2 = json_obj1;
 				else {

catv/files/etc/init.d/catv

@@ -1,7 +1,4 @@
 #!/bin/sh /etc/rc.common
-#
-# Copyright (C) 2015 inteno.org
-#
 
 START=71
 USE_PROCD=1

cifsd-tools/Makefile

@@ -1,53 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=cifsd-tools
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/namjaejeon/cifsd-tools.git
-PKG_SOURCE_DATE:=2019-02-14
-PKG_SOURCE_VERSION:=a7d7dfc40524b88dbcb2052034a75f446b3cefdd
-PKG_MIRROR_HASH:=a74f95a79c3cdcc78e66c080729141abee0d821e21a326d88b11d849738314fb
-
-PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-PKG_INSTALL:=1
-PKG_FIXUP:=autoreconf
-PKG_REMOVE_FILES:=autogen.sh aclocal.m4
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/cifsd-tools
-  SECTION:=net
-  CATEGORY:=Network
-  SUBMENU:=Filesystem
-  TITLE:=Kernel CIFS/SMB server support and userspace tools
-  DEPENDS:=+kmod-fs-cifsd +glib2 +libnl-core +libnl-genl $(ICONV_DEPENDS)
-endef
-
-define Package/cifsd-tools/description
-  Userspace tools (cifsd, cifsadmin) for the CIFS/SMB kernel fileserver.
-  The config file location is /etc/cifs/smb.conf
-endef
-
-define Package/cifsd-tools/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcifsdtools.so* $(1)/usr/lib/
-
-	$(INSTALL_DIR) $(1)/etc/cifs
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/smb.conf.example $(1)/etc/cifs
-
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_CONF) ./files/cifsd.config $(1)/etc/config/cifsd
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/cifsd.init $(1)/etc/init.d/cifsd
-
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{cifsadmin,cifsd} $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,cifsd-tools))

cifsd-tools/files/cifsd.config

@@ -1,9 +0,0 @@
-config global 'global'
-	option server_string	'CIFSD on OpenWRT'
-	option ipc_timeout	'8' # IPC timeout is used as a workaround for uninterruptible sleep until this is fixed upstream.
-
-config share
-	option name	'share'
-	option comment	'Default guest share'
-	option path	'/mnt'
-	option guest_ok	'yes'

cifsd-tools/files/cifsd.init

@@ -1,161 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=90
-USE_PROCD=1
-PROG=/usr/sbin/cifsd
-USER_DB=/etc/cifs/cifsdpwd.db
-CIFS_ADMIN=cifsadmin
-
-EXTRA_COMMANDS="users"
-EXTRA_HELP="	users	Show list of users created by cifsadmin"
-
-users() {
-	[ -f "$USER_DB" ] && cut -d ':' $USER_DB -f1 || \
-		printf "No users available.\n"
-}
-
-validate_cifsd_global() {
-	uci_validate_section cifsd global global \
-		'server_string:string' \
-		'workgroup:string' \
-		'netbios_name:string' \
-		'interface:string' \
-		'ipc_timeout:uinteger'
-}
-
-validate_cifsd_share() {
-	uci_validate_section cifsd share "${1}" \
-		'name:string' \
-		'comment:string' \
-		'path:string' \
-		'guest_ok:bool' \
-		'read_only:bool' \
-		'allow_hosts:list' \
-		'deny_hosts:list' \
-		'users:string' \
-		'invalid_users:string' \
-		'create_mask:string' \
-		'dir_mask:string' \
-		'max_connections:uinteger' \
-		'veto_files:list'
-}
-
-validate_cifsd_users() {
-	uci_validate_section cifsd users "${1}" \
-		'user:string' \
-		'password:string' \
-		'desc:string'
-}
-
-load_cifsd_global() {
-	local server_string
-	local workgroup
-	local netbios_name
-	local ipc_timeout
-
-	validate_cifsd_global
-
-	echo -e "[global]" >> /var/etc/cifsd.conf
-	[ -n "$server_string" ] && echo -e "\tserver string = $server_string" >> /var/etc/cifsd.conf
-	[ -n "$workgroup" ] && echo -e "\tworkgroup = $workgroup" >> /var/etc/cifsd.conf
-	[ -n "$netbios_name" ] && echo -e "\tnetbios name = $netbios_name" >> /var/etc/cifsd.conf
-	[ -n "$ipc_timeout" ] && echo -e "\tipc timeout name = $ipc_timeout" >> /var/etc/cifsd.conf || \
-		echo -e "\tipc timeout name = 8" >> /var/etc/cifsd.conf
-}
-
-load_cifsd_share() {
-	local name
-	local comment
-	local path
-	local guest_ok
-	local allow_hosts
-	local deny_hosts
-	local users
-	local invalid_users
-	local max_connections
-	local veto_files
-	local dir_mask
-	local create_mask
-	local read_only
-
-	validate_cifsd_share ${1}
-
-	if [ -z "$name" -o -z "$path" ]; then
-		logread -t ${0} "Missing name or path."
-		return
-	fi
-
-	echo -e "\n[$name]\n\tpath = $path" >> /var/etc/cifsd.conf
-	[ -n "$comment" ] && echo -e "\tcomment = $comment" >> /var/etc/cifsd.conf
-	[ -n "$guest_ok" ] && echo -e "\tguest ok = $guest_ok" >> /var/etc/cifsd.conf
-	[ -n "$allow_hosts" ] && echo -e "\tallow hosts = $allow_hosts" >> /var/etc/cifsd.conf
-	[ -n "$deny_hosts" ] && echo -e "\tdeny hosts = $deny_hosts" >> /var/etc/cifsd.conf
-	[ -n "$users" ] && echo -e "\tvalid users = $users" >> /var/etc/cifsd.conf
-	[ -n "$invalid_users" ] && echo -e "\tinvalid users = $invalid_users" >> /var/etc/cifsd.conf
-	[ -n "$max_connections" ] && echo -e "\tmax connections = $max_connections" >> /var/etc/cifsd.conf
-	[ -n "$create_mask" ] && echo -e "\tcreate mask = $create_mask" >> /var/etc/cifsd.conf
-	[ -n "$dir_mask" ] && echo -e "\tdirectory mask = $dir_mask" >> /var/etc/cifsd.conf
-
-	if [ -n "$read_only" ]; then
-		echo -e "\tread only = $read_only" >> /var/etc/cifsd.conf
-		if [ "${read_only}" -eq "0" ]; then
-			echo -e "\twrite ok = 1" >> /var/etc/cifsd.conf
-		fi
-	else
-		echo -e "\twrite ok = 1" >> /var/etc/cifsd.conf
-	fi
-
-	[ -n "$veto_files" ] && echo -e "\tveto files = $veto_files" >> /var/etc/cifsd.conf
-}
-
-load_cifsd_users() {
-	local user
-	local password
-	local desc
-
-	validate_cifsd_users ${1}
-	[ $(which ${CIFS_ADMIN}) ] || {
-		logread -t ${0} "${CIFS_ADMIN} tools is not available"
-		return;
-	}
-
-	cifsadmin -a "${user}" -p "${password}"
-	if [ "$?" -ne 0 ]; then
-		logread -t ${0} "Failed to create/update ${user}"
-	fi
-}
-
-service_triggers()
-{
-	procd_add_config_trigger "config.change" "cifsd" /etc/init.d/cifsd restart
-}
-
-init_config() {
-	[ -f "/var/etc/cifsd.conf" ] && rm /var/etc/cifsd.conf
-
-	config_load cifsd
-	load_cifsd_global
-
-	# Delete existing users
-	[ -f "${USER_DB}" ] && {
-		rm -f "${USER_DB}"
-	}
-	config_foreach load_cifsd_users users
-	config_foreach load_cifsd_share share
-}
-
-start_service() {
-	. /lib/functions.sh
-	init_config
-
-	[ ! "$(grep cifsd /proc/modules)" ] && modprobe cifsd
-	procd_open_instance
-	procd_set_param command /usr/bin/env LANG=en_US.UTF-8 $PROG -c /var/etc/cifsd.conf
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service() {
-	killall cifsd
-	# IPC timeout will kill the remaining processes.
-}

cifsd/001-fix_implicit_declarations.patch

@@ -1,73 +0,0 @@
-For some reason, fs.h on Inteno kernel is missing inode->i_mutex nesting subclasses for the lock validator
-which is triggering implicit declaration error. To workaround this hardcore use of mutex_lock by removing
-kernel version check.
----
---- a/vfs.c
-+++ b/vfs.c
-@@ -544,15 +544,9 @@ int cifsd_vfs_setattr(struct cifsd_work
- 
- 	attrs->ia_valid |= ATTR_CTIME;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock(inode);
--	err = notify_change(dentry, attrs, NULL);
--	inode_unlock(inode);
--#else
- 	mutex_lock(&inode->i_mutex);
- 	err = notify_change(dentry, attrs, NULL);
- 	mutex_unlock(&inode->i_mutex);
--#endif
- 
- 	if (update_size)
- 		put_write_access(inode);
-@@ -753,11 +747,8 @@ int cifsd_vfs_remove_file(char *name)
- 	if (!dir->d_inode)
- 		goto out;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock_nested(dir->d_inode, I_MUTEX_PARENT);
--#else
- 	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
--#endif
-+
- 	dentry = lookup_one_len(last, dir, strlen(last));
- 	if (IS_ERR(dentry)) {
- 		err = PTR_ERR(dentry);
-@@ -783,11 +774,7 @@ int cifsd_vfs_remove_file(char *name)
- 
- 	dput(dentry);
- out_err:
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_unlock(dir->d_inode);
--#else
- 	mutex_unlock(&dir->d_inode->i_mutex);
--#endif
- out:
- 	path_put(&parent);
- 	return err;
-@@ -1302,11 +1289,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
- 	int err = 0;
- 
- 	dget(dentry);
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock(dir->d_inode);
--#else
- 	mutex_lock(&dir->d_inode->i_mutex);
--#endif
-+
- 	if (!dentry->d_inode || !dentry->d_inode->i_nlink) {
- 		err = -ENOENT;
- 		goto out;
-@@ -1318,11 +1302,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
- 		err = vfs_unlink(dir->d_inode, dentry, NULL);
- 
- out:
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_unlock(dir->d_inode);
--#else
- 	mutex_unlock(&dir->d_inode->i_mutex);
--#endif
-+
- 	dput(dentry);
- 	if (err)
- 		cifsd_debug("failed to delete, err %d\n", err);

cifsd/Makefile

@@ -1,60 +0,0 @@
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=cifsd
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/namjaejeon/cifsd.git
-PKG_SOURCE_DATE:=2019-03-05
-PKG_SOURCE_VERSION:=e1715ce125d55b125b1b58a6f1819ef8e54cc3ba
-PKG_MIRROR_HASH:=521585ebfda0ecc02372b1a38ebf762fbbcead6d0b754a47599a5bf6bfdb3fb6
-
-PKG_MAINTAINER:=Andy Walsh <andy.walsh44+github@gmail.com>
-PKG_LICENSE:=GPL-2.0
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define KernelPackage/fs-cifsd
-	SUBMENU:=Filesystems
-	TITLE:=CIFS/SMB kernel server support
-	FILES:=$(PKG_BUILD_DIR)/cifsd.$(LINUX_KMOD_SUFFIX)
-	DEPENDS+= \
-		+kmod-nls-base \
-		+kmod-nls-utf8 \
-		+kmod-crypto-md4 \
-		+kmod-crypto-md5 \
-		+kmod-crypto-hmac \
-		+kmod-crypto-ecb \
-		+kmod-crypto-des \
-		+kmod-crypto-sha256 \
-		+kmod-crypto-cmac \
-		+kmod-crypto-sha512 \
-		+kmod-crypto-aead \
-		+kmod-crypto-ccm
-	KCONFIG:= \
-		CONFIG_KEYS=y \
-		CONFIG_CRYPTO_ARC4=y
-endef
-
-define KernelPackage/fs-cifsd/description
-	Kernel module for a CIFS/SMBv2,3 fileserver.
-endef
-
-TARGET_CFLAGS+= -DCONFIG_CIFSD_ACL
-
-MAKE_OPTS:=\
-	ARCH="$(LINUX_KARCH)" \
-	CROSS_COMPILE="$(TARGET_CROSS)" \
-	M="$(PKG_BUILD_DIR)"
-
-define Build/Compile
-	$(MAKE) -C "$(LINUX_DIR)" \
-		$(MAKE_OPTS) \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		CONFIG_CIFS_SERVER=m \
-		modules
-endef
-
-$(eval $(call KernelPackage,fs-cifsd))

cifsd/patches/001-fix_implicit_declarations.patch

@@ -1,69 +0,0 @@
---- a/vfs.c
-+++ b/vfs.c
-@@ -544,15 +544,9 @@ int cifsd_vfs_setattr(struct cifsd_work
- 
- 	attrs->ia_valid |= ATTR_CTIME;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock(inode);
--	err = notify_change(dentry, attrs, NULL);
--	inode_unlock(inode);
--#else
- 	mutex_lock(&inode->i_mutex);
- 	err = notify_change(dentry, attrs, NULL);
- 	mutex_unlock(&inode->i_mutex);
--#endif
- 
- 	if (update_size)
- 		put_write_access(inode);
-@@ -753,11 +747,8 @@ int cifsd_vfs_remove_file(char *name)
- 	if (!dir->d_inode)
- 		goto out;
- 
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock_nested(dir->d_inode, I_MUTEX_PARENT);
--#else
- 	mutex_lock_nested(&dir->d_inode->i_mutex, I_MUTEX_PARENT);
--#endif
-+
- 	dentry = lookup_one_len(last, dir, strlen(last));
- 	if (IS_ERR(dentry)) {
- 		err = PTR_ERR(dentry);
-@@ -783,11 +774,7 @@ int cifsd_vfs_remove_file(char *name)
- 
- 	dput(dentry);
- out_err:
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_unlock(dir->d_inode);
--#else
- 	mutex_unlock(&dir->d_inode->i_mutex);
--#endif
- out:
- 	path_put(&parent);
- 	return err;
-@@ -1302,11 +1289,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
- 	int err = 0;
- 
- 	dget(dentry);
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_lock(dir->d_inode);
--#else
- 	mutex_lock(&dir->d_inode->i_mutex);
--#endif
-+
- 	if (!dentry->d_inode || !dentry->d_inode->i_nlink) {
- 		err = -ENOENT;
- 		goto out;
-@@ -1318,11 +1302,8 @@ int cifsd_vfs_unlink(struct dentry *dir,
- 		err = vfs_unlink(dir->d_inode, dentry, NULL);
- 
- out:
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(4, 2, 0)
--	inode_unlock(dir->d_inode);
--#else
- 	mutex_unlock(&dir->d_inode->i_mutex);
--#endif
-+
- 	dput(dentry);
- 	if (err)
- 		cifsd_debug("failed to delete, err %d\n", err);

crashlog/readme

@@ -24,7 +24,7 @@ What we need is the public key for the clients.
 For dropbear "dropbearkey -y -f files/etc/dropbear/logid" will generate the public key.
 
 ----------
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@inteno
+ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@iopsys
 ----------
 
 The public key should be just one line. Add that line to the 

dslmngr/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=63525fe43aa57a710bb097e4c0ed496c4032db6d
+PKG_SOURCE_VERSION:=400cc66081f2b10b481d5a745bc505b78af098bd
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 endif

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=5.3.14
+PKG_VERSION:=6.0.2
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=33a3b440dd413dfa6febbc4d92d5a57cba9aee4d
+PKG_SOURCE_VERSION:=fee575f414324c68d0916fab06d10eccb78541fd
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -60,7 +60,7 @@ endef
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
   CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM$(CHIP_ID) \
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK

endptmngr/Makefile

@@ -7,15 +7,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_RELEASE:=1
-PKG_VERSION:=0.3
-PKG_SOURCE_VERSION:=34ae1996beda98691d779e49f231bd662fc87cda
+PKG_VERSION:=0.4
+PKG_SOURCE_VERSION:=d87c1def50d9672dbeb9d5972f36a364b29334b9
 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
 ifeq ($(CONFIG_ENDPT_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=endptmngr-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
+PKG_SOURCE_URL:=https://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=endptmngr-open
 PATCH_DIR:=
 PKG_HASH:=skip
@@ -31,6 +31,16 @@ export BUILD_DIR
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_PARALLEL:=1
 
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+PKG_CONFIG_DEPENDS := \
+	CONFIG_TARGET_BOARD
+
+export CONFIG_BRCM_SDK_VER_504001
+export CONFIG_BRCM_SDK_VER_504002
+export CONFIG_BRCM_SDK_VER_504003
+export CONFIG_BRCM_SDK_VER_504004
+export CONFIG_BRCM_SDK_VER_504005
 
 
 include $(INCLUDE_DIR)/package.mk
@@ -43,7 +53,7 @@ define Package/endptmngr
   CATEGORY:=Utilities
   TITLE:=Brcmslic
   URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +bcmkernel @TARGET_HAS_VOICE @!TARGET_NO_VOICE
+  DEPENDS:= +libubox +ubus +libpicoevent +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
 endef
 
 define Package/endptmngr/description

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=5.2-2020-10-19
+PKG_VERSION:=6.3.2-2020-12-21
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=47934d448f59cd8facec3bab0e2ed9e6f4e492db
+PKG_SOURCE_VERSION:=495e905c30ac7423035a8c0c2c67effc0c607475
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -32,14 +32,6 @@ CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/icwmp-tr098
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=CWMP client for TR-098 Data Model
-  DEPENDS:=+PACKAGE_icwmp-tr098:libuci +PACKAGE_icwmp-tr098:libmicroxml +PACKAGE_icwmp-tr098:libubox +PACKAGE_icwmp-tr098:jshn +PACKAGE_icwmp-tr098:libubus +PACKAGE_icwmp-tr098:libblobmsg-json +PACKAGE_icwmp-tr098:libpthread +PACKAGE_icwmp-tr098:ubusd +PACKAGE_icwmp-tr098:shflags +PACKAGE_icwmp-tr098:getopt +PACKAGE_icwmp-tr098:zlib +PACKAGE_icwmp-tr098:libjson-c +PACKAGE_icwmp-tr098:libopenssl +PACKAGE_icwmp-tr098:curl +PACKAGE_icwmp-tr098:libcurl +PACKAGE_icwmp-tr098:libtr098
-endef
-
 define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
@@ -66,11 +58,6 @@ endif
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE -D_AADJ
 
-ifeq ($(CONFIG_PACKAGE_icwmp-tr098),y)
-CONFIGURE_ARGS += \
-	--enable-icwmp_tr098
-endif
-
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)
@@ -122,11 +109,6 @@ endif
 	$(CP) ./files/* $(1)/
 endef
 
-define Package/icwmp-tr098/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
-endef
-
 define Package/$(PKG_NAME)/postinst
 	#!/bin/sh
 	if [ -z "$${IPKG_INSTROOT}" ]; then
@@ -146,4 +128,3 @@ define Package/$(PKG_NAME)/prerm
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
-$(eval $(call BuildPackage,icwmp-tr098))

icwmp/files/etc/config/cwmp

@@ -15,6 +15,7 @@ config acs 'acs'
 	option retry_interval_multiplier '2000'
 	option https_ssl_capath ''
 	option ipv6_enable '0'
+	option ip_version '4'
 
 config cpe 'cpe'
 	option interface 'eth0.1'
@@ -38,8 +39,8 @@ config cpe 'cpe'
 	option notification '1'
 	option datamodel 'tr181'
 	option exec_download '0'
-	option notify_periodic_enable '1'
-	option notify_period '10'
+	option periodic_notify_enable '1'
+	option periodic_notify_interval '10'
 	
 config lwn 'lwn'
 	option enable '1'

icwmp/files/etc/init.d/icwmpd

@@ -28,10 +28,6 @@ validate_url() {
 	return 1
 }
 
-build_dmmap_instance() {
-	[ ! -e /etc/icwmpd/.icwmpd_backup_session.xml ] && /usr/sbin/icwmp get name "" 0 >/dev/null 2>&1
-}
-
 get_acs_url() {
 	local default_acs="http://10.10.1.6:8000/openacs/acs"
 	local acs_dhcp_discovery="$(uci -q get cwmp.acs.dhcp_discovery)"
@@ -128,17 +124,6 @@ wait_for_option43() {
 	fi
 }
 
-wait_for_wifi() {
-	local time=$1
-	local tm=1
-
-	while [ ! -f /tmp/wifi.started ]; do
-		sleep 1
-		[ $tm -ge $time ] && break
-		tm=$((tm+1))
-	done
-}
-
 wait_for_resolvfile() {
 	local time=$1
 	local tm=1
@@ -153,17 +138,6 @@ wait_for_resolvfile() {
 	done
 }
 
-wait_for_asterisk() {
-	local time=$1
-	local tm=1
-
-	while [ -z "$(pidof asterisk)" ]; do
-		sleep 1
-		[ $tm -ge $time ] && break
-		tm=$((tm+1))
-	done
-}
-
 set_wan_interface() {
 	local l3_device=""
 	local default_wan_interface=""
@@ -183,13 +157,12 @@ start_service() {
 		touch /tmp/.icwmpd_boot
 	else
 		[ -f /sbin/netifd ] && echo "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-		[ -f /etc/config/wireless ] && echo "Waiting for WiFi to be started ..." && wait_for_wifi 20
+		[ -f /etc/config/wireless ] && echo "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
 		[ -f /usr/sbin/dnsmasq ] && echo "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
 		[ -f /etc/config/dhcp ] && echo "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-		[ -f /usr/sbin/asterisk ] && echo "Waiting for Voice to be started ..." && wait_for_asterisk 5
+		[ -f /usr/sbin/asterisk ] && echo "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
 
 		config_load cwmp
-		build_dmmap_instance
 		set_wan_interface
 		wait_for_option43 20
 		get_acs_url
@@ -220,10 +193,5 @@ notify() {
 
 service_triggers() {
 	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
-        if [ "$(uci -q get cwmp.cpe.notification)" == "1" ]; then
-		for conf in $(ls /etc/config/); do
-			procd_add_config_trigger "config.change" "$conf" /etc/init.d/icwmpd notify
-		done
-	fi
 }
 

icwmp/files/etc/uci-defaults/85-cwmp-set-userid

@@ -1,4 +1,3 @@
-
 # Copy defaults by the factory to the cwmp UCI user section.
 
 
@@ -15,10 +14,19 @@ mac=$(printf "%12.12X" $((0x$baseMac)))
 # Get system serial number.
 serial=$(db -q get hw.board.serial_number)
 
-uci -q batch <<-EOF
-	set cwmp.acs.userid="${mac:0:6}-${serial}"
-	set cwmp.cpe.userid="${mac:0:6}-${serial}"
-EOF
+# Get userid values
+acs_userid=$(uci -q get cwmp.acs.userid)
+cpe_userid=$(uci -q get cwmp.cpe.userid)
 
+# Only set if they are empty
+if [ -z "$acs_userid" ]
+then
+    uci -q set cwmp.acs.userid="${mac:0:6}-${serial}"
+fi
+
+if [ -z "$cpe_userid" ]
+then
+    uci -q set cwmp.cpe.userid="${mac:0:6}-${serial}"
+fi
 
 # No need for commit here, it is done by uci_apply_defaults().

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=2.0.30
+PKG_VERSION:=2.1.32
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1a842eea52becc9b5ecb26549e855671443ee626
+PKG_SOURCE_VERSION:=2bb1c564d31a99d80a3f977c1f817777722a601d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
@@ -40,12 +40,22 @@ define Package/libieee1905
   TITLE:=IEEE1905 cmdu tlv utility library
 endef
 
+define Package/libwsc
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Wifi Simple Configuration building and processing library
+  DEPENDS= +libopenssl +libuci +libubus
+endef
+
 define Package/lib1905hle
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=IEEE1905 hle stack library
 endef
 
+LIBS := \
+	$(if $(CONFIG_PACKAGE_libwsc),libwsc.so)
+
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
@@ -53,6 +63,9 @@ TARGET_CFLAGS += \
 	-Wall \
 	-Wextra
 
+MAKE_FLAGS += \
+	LIBS="$(LIBS)"
+
 ifeq ($(CONFIG_IEEE1905_SPEED_UP_DISCOVERY),y)
 TARGET_CFLAGS += -DSPEED_UP_DISCOVERY
 endif
@@ -97,6 +110,18 @@ define Package/libieee1905/install
 	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib/libieee1905.so
 endef
 
+define Package/libwsc/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/libwsc.so
+endef
+
+define Build/InstallDev/libwsc.so
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwsc/include/wsc.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/lib/libwsc.so $(1)/usr/lib/
+endef
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/ieee1905
@@ -107,8 +132,10 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/lib1905hle/include/*.h $(1)/usr/include/lib1905hle/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/lib/libieee1905.so $(1)/usr/lib
+	$(foreach lib,$(LIBS),$(call Build/InstallDev/$(lib),$(1),$(2));)
 endef
 
 $(eval $(call BuildPackage,libieee1905))
 $(eval $(call BuildPackage,lib1905hle))
+$(eval $(call BuildPackage,libwsc))
 $(eval $(call BuildPackage,ieee1905))

iop/config

@@ -7,6 +7,9 @@ CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
 CONFIG_PACKAGE_alsa-lib=y
+CONFIG_PACKAGE_atftp=m
+CONFIG_PACKAGE_atftpd=m
+CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
@@ -14,14 +17,14 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
 CONFIG_PACKAGE_ethtool=y
-CONFIG_PACKAGE_fatrace=y
-CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_ieee1905=y
 CONFIG_PACKAGE_map-1905=y
 CONFIG_PACKAGE_map-topology=y
+CONFIG_PACKAGE_mosquitto-client-ssl=y
+CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_wfadatad=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_inbd=y
@@ -48,6 +51,7 @@ CONFIG_PACKAGE_juci-theme-iopsys=y
 CONFIG_PACKAGE_libdaemon=y
 CONFIG_PACKAGE_libgmp=y
 CONFIG_PACKAGE_libreadline=y
+CONFIG_PACKAGE_libreswan=m
 CONFIG_PACKAGE_libwifi=y
 CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_map=y
@@ -90,11 +94,13 @@ CONFIG_PACKAGE_tc=y
 CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_terminfo=y
 CONFIG_PACKAGE_traceroute6=y
+CONFIG_PACKAGE_uledd=y
 CONFIG_PACKAGE_umbim=y
 CONFIG_PACKAGE_uqmi=y
 CONFIG_PACKAGE_usb-modeswitch=y
 CONFIG_PACKAGE_usbreset=y
 CONFIG_PACKAGE_uspd=y
+CONFIG_PACKAGE_vsftpd-tls=m
 CONFIG_PACKAGE_wget=y
 CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_wifimngr=y
@@ -194,7 +200,7 @@ CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 CONFIG_KERNEL_DEVTMPFS=y
 CONFIG_KERNEL_DEVTMPFS_MOUNT=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_LOCALMIRROR="http://download.iopsys.eu/iopsys/mirror/"
+CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 
 # Generation of /etc/banner.
 CONFIG_IMAGEOPT=y

iop/scripts/genconfig.sh

@@ -444,7 +444,7 @@ function genconfig {
 		touch package/kernel/linux/Makefile
 
 		# we need to signal to bradcom SDK that we have changed the board id
-		# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
+		# currently boardparms.c and boardparms_voice.c is the only place that is depending on boardid name
 		# so just touch that file.
 		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
 

iop/scripts/genconfig_min.sh

@@ -397,7 +397,7 @@ function genconfig_min {
 		touch package/kernel/linux/Makefile
 
 		# we need to signal to bradcom SDK that we have changed the board id
-		# currently boardparms.c and boardparms_voice.c is the only place that is depending on inteno boardid name
+		# currently boardparms.c and boardparms_voice.c is the only place that is depending on boardid name
 		# so just touch that file.
 		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
 

iop/scripts/smoketest.sh

@@ -1,73 +0,0 @@
-
-# Shorthand command for doing a HIL runtime smoketest on the
-# latest built image. Does the image boot up correctly?
-# More info here:
-# https://dev.iopsys.eu/iopsys/iopsys-taas
-
-
-function smoketest {
-	local image app
-
-	# Path to TaaS binarys. Try some likely ones.
-	if ! which taas-smoketest >/dev/null; then
-		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
-		PATH="${PATH}:${PWD}/../taas/bin"
-		PATH="${PATH}:${HOME}/iopsys-taas/bin"
-		PATH="${PATH}:${HOME}/taas/bin"
-		PATH="${PATH}:${HOME}/bin"
-		PATH="${PATH}:/opt/iopsys-taas/bin"
-		PATH="${PATH}:/opt/taas/bin"
-	fi
-
-	if ! which taas-smoketest >/dev/null; then
-		echo "Error; missing command \"taas-smoketest\". Install it with:"
-		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
-		exit 1
-	fi
-
-	# Prerequisites?
-	for app in expect socat timeout stdbuf bash env head strings \
-			tee cut tr grep curl ssh; do
-		if ! which $app >/dev/null; then
-			echo "Error; missing command \"$app\""
-			echo "Install it from your Linux distro!"
-			exit 1
-		fi
-	done
-
-	# Find the default latest image (.y3 or FIT).
-	for image in bin/targets/iopsys-*/generic/last.y3 \
-			bin/targets/iopsys-*/generic/last.pkgtb; do
-		[ -s "$image" ] || continue
-
-		# Convert Iopsys target name to the TaaS product name format.
-		product=$(grep CONFIG_TARGET_PROFILE .config | \
-			tr -s "=\"" " " | cut -d " " -f 2)
-		case "$product" in
-			smarthub3)
-				product="SmartHub3a"
-				;;
-			dg400prime|eg400)
-				product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
-				;;
-			*)
-				product=""
-				;;
-		esac
-
-		if [ -n "$product" ]; then
-			taas-smoketest "$image" "$product" || exit
-			echo "Smoketest OK"
-		else
-			echo "Unsupported target; skipping smoketest."
-		fi
-
-		exit 0
-	done
-
-	echo "No image found"
-	exit 1
-}
-
-register_command "smoketest" "Write image to a device in the lab and check if it boots up."
-

iop/scripts/taas.sh

@@ -0,0 +1,95 @@
+
+# Shorthand command for doing a HIL runtime smoketest on the
+# latest built image. Does the image boot up correctly?
+# More info here:
+# https://dev.iopsys.eu/iopsys/iopsys-taas
+
+
+#--------------------------------------------------------------
+function taas-init() {
+	local f
+
+	# Path to TaaS binarys. Try some likely ones.
+	if ! which taas-smoketest >/dev/null; then
+		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
+		PATH="${PATH}:${PWD}/../taas/bin"
+		PATH="${PATH}:${HOME}/iopsys-taas/bin"
+		PATH="${PATH}:${HOME}/taas/bin"
+		PATH="${PATH}:${HOME}/bin"
+		PATH="${PATH}:/opt/iopsys-taas/bin"
+		PATH="${PATH}:/opt/taas/bin"
+	fi
+
+	if ! which taas-smoketest >/dev/null; then
+		echo "Error; TaaS is missing! Install it with:"
+		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
+		exit 1
+	fi
+
+	# NAND erase block size.
+	nandBlkSz=$(grep CONFIG_TARGET_NAND_BLOCKSZ .config | \
+		tr -s "=\"" " " | cut -d " " -f 2)
+	nandBlkSz=$((nandBlkSz / 1024))
+
+	# Create a list of all images which might be of use.
+	for f in ${PWD}/bin/targets/iopsys-*/generic/last.* \
+			${PWD}/build_dir/target-arm*/bcmkernel/bcm963xx/targets/9*/bcm*_linux_raw_image_${nandBlkSz}.bin; do
+		[[ -s "$f" ]] && images+=("$f")
+	done
+
+	# Convert Iopsys target name to the TaaS product name format
+	# according to what is available in the remote lab for HIL.
+	# Also find a suitable image.
+	product=$(grep CONFIG_TARGET_PROFILE .config | \
+		tr -s "=\"" " " | cut -d " " -f 2) || exit
+	case "$product" in
+		smarthub3)
+			export product="SmartHub3a"
+			;;
+		dg400prime|eg400|ex600)
+			export product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
+			;;
+		*)
+			echo "Unsupported target; skipping!"
+			exit 0
+			;;
+	esac
+
+	if [[ ${#images[@]} -eq 0 ]]; then
+		echo "No image found"
+		exit 1
+	fi
+}
+
+
+
+#--------------------------------------------------------------
+function taas-smoketest {
+	declare -a images
+
+	taas-init || return
+	echo "Testing a $product with ${images[@]}..."
+	command taas-smoketest "${images[@]}" "$product" "$@"
+}
+
+
+
+#--------------------------------------------------------------
+function taas-bootstrap {
+	declare -a images
+
+	if [[ -n "$1" ]]; then
+		taas-init || return
+		echo "Flashing $1..."
+		command taas-bootstrap "${images[@]}" "$@"
+	else
+		echo "Usage: ./iop taas-bootstrap dutX"
+		exit 1
+	fi
+}
+
+
+
+register_command "taas-bootstrap" "Write image to a remote lab device."
+register_command "taas-smoketest" "Write image to a remote lab device and test it."
+

libpicoevent/Makefile

@@ -11,7 +11,7 @@ PKG_RELEASE:=1
 PKG_VERSION:=0.3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libpicoevent.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f4ab03b22fca57cec6c959fb5c54bcdd64c32467
+PKG_SOURCE_VERSION:=f446f186102539cceedaa15a95a33547ac3c1fd7
 PKG_NAME:=libpicoevent
 
 PKG_LICENSE:=LGPL-2.1-only

map-1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-1905
-PKG_VERSION:=0.0.14
+PKG_VERSION:=0.0.15
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=745a773b15f35275df63a20e1be342d24b7e7534
+PKG_SOURCE_VERSION:=405e44f14d623db7a5f03e76945315774d2b6deb
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.0.3
+PKG_VERSION:=3.1.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6bb0bba83e4c5189c93ed339ed061b86d7766f4d
+PKG_SOURCE_VERSION:=1f9e4c5beafa216ff16110f3715dc901a25eb897
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -23,7 +23,7 @@ define Package/map-agent
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libmaputils
+  DEPENDS:=+libwifi +libuci +libubox +ubus +libmaputils +libwsc
 endef
 
 define Package/map-agent/description
@@ -51,6 +51,7 @@ endef
 
 define Package/map-agent/install
 	$(INSTALL_DIR) $(1)/etc
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(CP) $(PKG_BUILD_DIR)/src/utils/*.so* $(1)/usr/lib/

map-agent/files/etc/config/mapagent

@@ -0,0 +1,62 @@
+config wifiagent
+	option enabled '1'
+	option debug '6'
+	option profile '2'
+
+config fh-iface
+	option ifname 'wl0'
+	option steer 'rssi bssload'
+	list exclude '00:11:22:33:44:55'
+	list exclude_btm '00:aa:bb:cc:dd:ee'
+	list assoc_ctrl '00:10:20:30:40:50'
+	option btm_retry '3'
+	option btm_retry_secs '180'
+	option fallback_legacy '1'
+	option steer_legacy_reassoc_secs '30'
+	option steer_legacy_retry_secs '3600'
+	option assoc_ctrl_secs '30'
+	option band '2'
+
+config fh-iface
+	option ifname 'wl1'
+	option steer 'rssi bssload'
+	list exclude '00:11:22:33:44:55'
+	list exclude_btm '00:aa:bb:cc:dd:ee'
+	option band '5'
+
+#config bk-iface
+#	option ifname 'apclii0'
+#	option enabled '1'
+#	option onboarded '0'
+#	option disallow_bsta '1		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
+
+config steer-param 'rssi'
+	option priority '0'
+	option rssi_threshold '-68'
+	option hysteresis '5'
+	option margin '3'
+	option diffsnr '8'
+
+config steer-param 'bssload'
+	option priority '0'
+	option bssload_threshold '80'
+
+### custom rules follows ###
+config rule-custom
+	option action steer
+	option sta 'd8:32:e3:4d:35:d2'
+	option bss '00:22:07:11:22:33'
+
+config rule-custom
+	option action restrict
+	option sta 'd8:32:e3:4d:35:d2'
+	option bss '00:22:07:11:22:33'
+
+#config bk-iface
+#	option ifname 'wlan1_1'
+#
+#config fh-iface
+#	option ifname 'wlan0'
+#
+#config fh-iface
+#	option ifname 'wlan1'

map-agent/files/etc/init.d/mapagent

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=20
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+        procd_set_param command "/usr/sbin/mapagent" "-d"
+	procd_set_param respawn
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "ieee1905"
+}
+
+reload_service() {
+	stop
+	start
+}

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=1.0.3
+PKG_VERSION:=2.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f1b50ed876f14347480e9e131ac6de76922e131a
+PKG_SOURCE_VERSION:=ae4d7c0279cf2f40b8f3ae0afa3e0f004e27e1f5
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
@@ -22,7 +22,7 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libmaputils
+  DEPENDS:=+libuci +libubox +ubus +libmaputils +libwsc
 endef
 
 define Package/map-controller/description
@@ -42,6 +42,7 @@ MAKE_PATH:=src
 
 define Package/map-controller/install
 	$(INSTALL_DIR) $(1)/etc
+	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
 endef

map-controller/files/etc/config/mapcontroller

@@ -0,0 +1,111 @@
+config wificntlr
+	option enabled '1'
+	option registrar '5 2'	    #bands on which wps registrar supported
+	option debug '6'
+
+config fh-credentials
+	option band '5'
+	option encryption 'psk2'
+	option key '1234567890'
+	option ssid 'map-net5'
+	option vlan '101'
+
+config fh-credentials
+	option band '2'
+	option encryption 'psk2'
+	option key '1234567890'
+	option ssid 'map-net2'
+	option vlan '0'               # 0 - 2 rsvd, 3 - 4094 => vlan id
+
+config bk-credentials
+	option band '5'
+	option encryption 'psk2'
+	option key '5555555555'
+	option ssid 'map-bkhaul-5'
+	option multi_ap '2'
+#	option multi_ap_backhaul_sta '1'                        # possible future TODO
+#	option multi_ap_backhaul_key 'multiap_key123'           # possible future TODO
+#	option multi_ap_backhaul_ssid 'MultiAP-0022077E9CD6'    # possible future TODO
+	option disallow_bsta '1'		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
+
+config bk-credentials
+	option band '2'
+	option encryption 'psk2'
+	option key '2222222222'
+	option ssid 'map-bkhaul-2'
+	option multi_ap '2'
+#	option multi_ap_backhaul_sta '1'                        # possible future TODO
+#	option multi_ap_backhaul_key 'multiap_key123'           # possible future TODO
+#	option multi_ap_backhaul_ssid 'MultiAP-0022077E9CD6'    # possible future TODO
+	option disallow_bsta '0'                # 0 or 1 profile-1 bSTA
+
+config agent-policy
+	option agent_id '00:22:07:7E:9C:D6'        # 1905al macaddress of agent
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent sc include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile20 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA
+
+config agent-policy
+	option agent_id '00:00:00:00:00:00'
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent sc include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile20 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option pvid '100'                          # primary vlan id
+	option pcp_default '5'                     # default vlan pcp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA
+
+config agent-policy
+	option agent_id '00:22:07:A3:6C:DA'    # 1905al macaddress of agent
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option include_sta_stats '0'               # sta stats in 3:4d:35:d2'
+	option bss '00:22:07:11:22:33'
+
+config rule-custom
+	option action restrict
+	option sta 'd8:32:e3:4d:35:d2'
+	option bss '00:22:07:11:22:33'

map-controller/files/etc/init.d/mapcontroller

@@ -0,0 +1,25 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=20
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+        procd_set_param command "/usr/sbin/mapcontroller" "-d"
+	procd_set_param respawn
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "ieee1905"
+}
+
+reload_service() {
+	stop
+	start
+}

mqtt-ciotc/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Inteno
+# Copyright (C) 2020 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk

natalie-dect/Makefile

@@ -11,7 +11,7 @@ PKG_SOURCE_VERSION:=378c404fba3efc8f1bcde54370a5370670fa1853
 ifeq ($(CONFIG_NATALIE_OPEN),y)
 BRCM_KERNEL_PROFILE=$(shell echo $(CONFIG_BCM_KERNEL_PROFILE) | sed s/\"//g)
 PKG_SOURCE:=$(PKG_NAME)-$(BRCM_KERNEL_PROFILE)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_SOURCE_URL:=http://download.iopsys.eu/iopsys/opensdk/
+PKG_SOURCE_URL:=https://download.iopsys.eu/iopsys/opensdk/
 PKG_NAME:=natalie-dect-open
 else
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=2.0.21
+PKG_VERSION:=3.0.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=25b920c13160360de16300a8d04a068feb197c50
+PKG_SOURCE_VERSION:=09c1959e36f7084486a4d39548cef422a1ece483
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif
@@ -22,14 +22,13 @@ PKG_FIXUP:=autoreconf
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/obuspa
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=USP agent
-  DEPENDS:=+libcoap +libopenssl +libcurl +libsqlite3 +libcares +libubox +libubus +libblobmsg-json +uspd
+  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto
 endef
 
 define Package/obuspa/description
@@ -38,18 +37,7 @@ endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE \
-	-Wall \
-	-Wextra \
-	-fstrict-aliasing \
-	-Werror=format-overflow \
-	-Wno-error=unused-parameter \
-	-Wno-error=sign-compare
-
-
-ifneq ($(CONFIG_USE_MUSL),)
-TARGET_CFLAGS += -DUSE_MUSL
-endif
+	-D_GNU_SOURCE
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare

obuspa/files/etc/config/obuspa

@@ -1,44 +1,43 @@
-# controller, mtp, connection makes a group and related to one another
-# ex: first controller will be mapped to first mtp and first connection
-# details, always defined in groups
-
-config obuspa
-	option enable 'true'
-	option cert '/etc/obuspa/rootCA.pem'
+config obuspa 'global'
+	option enabled 'true'
 	option interface 'wan'
+	#option ifname 'eth0.1'
 	option debug 'false'
 	option log_level '1'
+	#option db_file '/tmp/usp.db'
+	#option trust_cert '/etc/obuspa/rootCA.pem'
+	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/var/log/obuspa'
 
-config controller
-	option endpointid 'self::usp-controller.com'
-	option enable 'true'
-	# Trust cerificate number
-	option AssignedRole 1
-	option PeriodicNotifInterval "86400"
-	option PeriodicNotifTime "0001-01-01T00:00:00Z"
-	option USPRetryMinimumWaitInterval "5"
-	option USPRetryIntervalMultiplier "2000"
-	option ControllerCode ""
-	option protocol 'STOMP'
+config localagent 'localagent'
+	option Enable 'true'
 
+# Adds Device.LocalAgent.Controller.
+config controller 'localcontroller'
+	option EndpointID 'proto::interop-usp-controller'
+	option Protocol 'MQTT'
+	option Topic '/usp/controller'
+	option mqtt 'localmqtt'
+
+# Adds Device.LocalAgent.MTP.
 config mtp
-	option enable 'true'
-	option protocol 'STOMP'
-	option destination ''
+	option Protocol 'MQTT'
+	option ResponseTopicConfigured '/usp/endpoint'
+	option mqtt 'localmqtt'
 
-config connection
-	option host 'usp-controller.com'
-	option username 'username'
-	option password 'password'
-	option encryption 'true'
-	option enable 'true'
-	option port 61613
-	option virtualhost '/'
-	option EnableHeartbeats "true"
-	option OutgoingHeartbeat "30000"
-	option IncomingHeartbeat "300000"
-	option ServerRetryInitialInterval "60"
-	option ServerRetryIntervalMultiplier "2000"
-	option ServerRetryMaxInterval "30720"
+# Adds Device.MQTT.Client.
+config mqtt 'localmqtt'
+	option BrokerAddress '127.0.0.1'
+	option BrokerPort '1883'
+	option TransportProtocol 'TCP/IP'
+	option Username 'admin'
+	option Password 'admin'
+
+# Add Device.LocalAgent.Subscription.
+config subscription
+	option ID 'default-boot-event-ACS'
+	option NotifType 'Event'
+	option ReferenceList 'Device.Boot!'
+	option Persistent 'true'
+	option controller 'localcontroller'
 

obuspa/files/etc/hotplug.d/iface/85-obuspa

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+. /lib/functions/network.sh
+
+[ "$ACTION" == "ifup" ] || exit 0
+
+[ -f /etc/config/obuspa ] || exit 0
+
+handle_obuspa_restart() {
+	[ "$INTERFACE" == "loopback" ] && exit 0
+
+	local interface=$(uci -q get obuspa.global.interface)
+	[ "$interface" == "$INTERFACE" ] || exit 0
+
+	mkdir -p /tmp/ipv4
+
+	network_flush_cache
+
+	local previpaddr=""
+	local curipaddr=""
+	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
+	previpaddr=$(cat $ipaddrfile 2>/dev/null)
+	network_get_ipaddr curipaddr $INTERFACE
+	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
+
+	[ "$previpaddr" == "$curipaddr" ] && exit 0
+
+	/etc/init.d/obuspa reload &
+}
+
+handle_obuspa_restart

obuspa/files/etc/init.d/obuspa

@@ -2,14 +2,23 @@
 
 START=99
 USE_PROCD=1
-
 PROG=/usr/sbin/obuspa
-l3device=""
-certificate=""
+
+EXTRA_COMMANDS="remove_db"
+EXTRA_HELP="	remove_db Removes obuspa persistent db before restarting"
+
 PARAM_FILE="/tmp/obuspa_param_reset.txt"
-conn_num=1
-mtp_num=1
-stomp_num=1
+CONFIGURATION=obuspa
+KEEP_FILES="/lib/upgrade/keep.d/obuspa"
+USP_TEMP_FILE="/tmp/usp.tmp"
+controller_num=0
+mtp_num=0
+stomp_num=0
+mqtt_num=0
+subs_num=0
+index=0
+
+. /lib/functions/network.sh
 
 log() {
 	echo "${@}"|logger -t obuspa -p debug
@@ -23,54 +32,113 @@ db_set() {
 	fi
 }
 
+get_index() {
+	index=$(( index + 1 ))
+	if [ "$1" = "$2" ]; then
+		echo "${index}" > ${USP_TEMP_FILE}
+	fi
+}
+
+get_uci_ref_index() {
+	local val;
+
+	[ -f ${USP_TEMP_FILE} ] && rm -f ${USP_TEMP_FILE}
+
+	index=0
+	config_load $CONFIGURATION
+	config_foreach get_index $1 $2
+	val=$(cat ${USP_TEMP_FILE})
+
+	if [ -z $val ]; then
+		val=0
+	fi
+
+	rm -f ${USP_TEMP_FILE}
+
+	echo $val
+}
+
 validate_obuspa_section()
 {
-	uci_validate_section obuspa obuspa "${1}" \
-		'enable:bool:true' \
-		'cert:string:"/etc/obuspa/rootCA.pem"' \
-		'interface:string:wan' \
+	uci_validate_section ${CONFIGURATION} obuspa "${1}" \
+		'enabled:bool:true' \
+		'trust_cert:string' \
+		'client_cert:string' \
+		'interface:string' \
+		'ifname:string:"br-lan"' \
 		'debug:bool:false' \
-		'log_level:uinteger:2' \
-		'log_dest:string:stdout'
+		'log_level:uinteger' \
+		'log_dest:string' \
+		'db_file:string'
+}
+
+validate_localagent_section()
+{
+	uci_validate_section ${CONFIGURATION} localagent "${1}" \
+		'Enable:bool:true' \
+		'ParameterName:string:Device.DeviceInfo.SoftwareVersion' \
+		'EndpointID:string'
 }
 
 validate_controller_section()
 {
-	uci_validate_section obuspa controller "${1}" \
-		'endpointid:string:"self:usp-controller.com"' \
-		'enable:bool:true' \
-		'AssignedRole:uinteger:1' \
+	uci_validate_section ${CONFIGURATION} controller "${1}" \
+		'EndpointID:string' \
+		'Enable:bool:true' \
+		'AssignedRole:string:Device.LocalAgent.ControllerTrust.Role.1' \
 		'PeriodicNotifInterval:uinteger:86400' \
-		'PeriodicNotifTime:string:"0001-01-01T00:00:00Z"' \
-		'USPRetryMinimumWaitInterval:uinteger:5' \
-		'USPRetryIntervalMultiplier:uinteger:2000' \
+		'PeriodicNotifTime:string' \
+		'USPNotifRetryMinimumWaitInterval:uinteger:5' \
+		'USPNotifRetryIntervalMultiplier:uinteger:2000' \
 		'ControllerCode:string' \
-		'protocol:or("STOMP","CoAP")' \
-		'CoAPHost:string' \
-		'CoAPPath:string' \
-		'CoAPPort:uinteger'
+		'Protocol:or("STOMP","CoAP","MQTT")' \
+		'Reference:string' \
+		'Destination:string:controller-notify-dest' \
+		'Topic:string' \
+		'coap_host:string' \
+		'coap_path:string' \
+		'coap_port:uinteger' \
+		'mqtt:string' \
+		'stomp:string'
+}
+
+validate_subscription_section()
+{
+	uci_validate_section ${CONFIGURATION} subscription "${1}" \
+		'Enable:bool:true' \
+		'ID:string' \
+		'NotifType:string' \
+		'ReferenceList:string' \
+		'Persistent:bool:true' \
+		'Recipient:string' \
+		'controller:string'
 }
 
 validate_mtp_section()
 {
-	uci_validate_section obuspa mtp "${1}" \
-		'enable:bool:true' \
-		'protocol:or("STOMP","CoAP")' \
-		'destination:string' \
-		'CoAPPath:string' \
-		'CoAPPort:uinteger'
+	uci_validate_section ${CONFIGURATION} mtp "${1}" \
+		'Enable:bool:true' \
+		'Protocol:or("STOMP","CoAP","MQTT")' \
+		'Reference:string' \
+		'ResponseTopicConfigured:string' \
+		'PublishQoS:uinteger' \
+		'Destination:string' \
+		'coap_path:string' \
+		'coap_port:uinteger' \
+		'mqtt:string' \
+		'stomp:string'
 }
 
-validate_connection_section()
+validate_stomp_connection_section()
 {
-	uci_validate_section obuspa connection "${1}" \
-		'host:string:"usp-controller.com"' \
-		'username:string:""' \
-		'password:string:""' \
+	uci_validate_section ${CONFIGURATION} stomp "${1}" \
+		'Host:string:usp-controller.com' \
+		'Username:string' \
+		'Password:string' \
 		'encryption:bool:true' \
-		'enable:bool:true' \
-		'port:uinteger:61613' \
-		'virtualhost:string:"/"' \
+		'Enable:bool:true' \
+		'Port:uinteger:61613' \
+		'VirtualHost:string:/' \
 		'EnableHeartbeats:bool:true' \
 		'OutgoingHeartbeat:uinteger:30000' \
 		'IncomingHeartbeat:uinteger:300000' \
@@ -79,82 +147,227 @@ validate_connection_section()
 		'ServerRetryMaxInterval:uinteger:30720'
 }
 
-configure_controller() {
-	local endpointid enable AssignedRole PeriodicNotifInterval PeriodicNotifTime USPRetryMinimumWaitInterval
-	local USPRetryIntervalMultiplier ControllerCode protocol CoAPHost CoAPPath CoAPPort
+validate_mqtt_client_section()
+{
+	uci_validate_section ${CONFIGURATION} mqtt "${1}" \
+		'BrokerAddress:string' \
+		'BrokerPort:uinteger:1883' \
+		'Enable:bool:true' \
+		'Username:string' \
+		'Password:string' \
+		'ProtocolVersion:string:5.0' \
+		'TransportProtocol:string:TCP/IP' \
+		'KeepAliveTime:uinteger:60' \
+		'ClientID:string' \
+		'ConnectRetryTime:uinteger:5' \
+		'ConnectRetryIntervalMultiplier:uinteger:2000' \
+		'ConnectRetryMaxInterval:uinteger:60'
+}
 
-	validate_controller_section "${1}" || {
-		log "Validation of section failed"
+configure_localagent() {
+	local Enable ParameterName EndpointID
+	local _num
+
+	validate_localagent_section 'localagent' || {
+		log "Validation of localagent section failed"
 		return 1;
 	}
-	db_set Device.LocalAgent.Controller.${conn_num}.EndpointID "${endpointid}"
-	db_set Device.LocalAgent.Controller.${conn_num}.Alias "cpe-${conn_num}"
-	db_set Device.LocalAgent.Controller.${conn_num}.Enable "true"
-	db_set Device.LocalAgent.Controller.${conn_num}.AssignedRole "Device.LocalAgent.ControllerTrust.Role.${AssignedRole}"
-	db_set Device.LocalAgent.Controller.${conn_num}.PeriodicNotifInterval "${PeriodicNotifInterval}"
-	db_set Device.LocalAgent.Controller.${conn_num}.PeriodicNotifTime "${PeriodicNotifTime}"
-	db_set Device.LocalAgent.Controller.${conn_num}.USPRetryMinimumWaitInterval "${USPRetryMinimumWaitInterval}"
-	db_set Device.LocalAgent.Controller.${conn_num}.USPRetryIntervalMultiplier "${USPRetryIntervalMultiplier}"
-	db_set Device.LocalAgent.Controller.${conn_num}.ControllerCode "${ControllerCode}"
-	db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.Alias "cpe-${conn_num}" 
-	db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.Enable "${enable}"
-	db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.Protocol "${protocol}"
-	if [ "${protocol}"=="STOMP" ]; then
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.STOMP.Reference "Device.STOMP.Connection.${conn_num}"
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.STOMP.Destination "controller-notify-dest"
-	elif [ "${protocol}"=="CoAP" ]; then
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.CoAP.Host "${CoAPHost}"
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.CoAP.Path "${CoAPPath}"
-		db_set Device.LocalAgent.Controller.${conn_num}.MTP.${conn_num}.CoAP.Port "${CoAPPort}"
-	else
-		log "Unsupported protocol ${protocol}"
+
+	if [ -n "${EndpointID}" ]; then
+		db_set Device.LocalAgent.EndpointID "${EndpointID}"
 	fi
+
+	_num=1
+	while [ ${_num} -le ${controller_num} ]
+	do
+		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.Alias "cpe-1"
+		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.Enable "${Enable}"
+		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.ParameterName "${ParameterName}"
+		_num=$(( ${_num} + 1 ))
+	done
+
 	db_set
-	conn_num=$((conn_num+1))
+}
+
+configure_controller() {
+	local EndpointID Enable AssignedRole PeriodicNotifInterval PeriodicNotifTime USPNotifRetryMinimumWaitInterval
+	local USPNotifRetryIntervalMultiplier ControllerCode Protocol Destination coap_host coap_path coap_port
+	local Reference Topic mqtt stomp
+
+	validate_controller_section "${1}" || {
+		log "Validation of controller section failed"
+		return 1;
+	}
+
+	if [ -z ${EndpointID} -o -z ${Protocol} ]; then
+		log "controller:: EndpointID id and Protocol cannot be empty"
+		return 1;
+	fi
+
+	if [ -z "${stomp}" -a -z "${Reference}"  -a -z "${mqtt}" -a -z "${coap_path}" ]; then
+		log "controller:: Invalid configuration"
+		return 1;
+	fi
+
+	if [ -z ${Reference} ]; then
+		if [ ${Protocol} = "STOMP" ]; then
+			val=$(get_uci_ref_index stomp ${stomp})
+			if [ ${val} -eq 0 ]; then
+				log "Not able to find the referred stomp section"
+				return 1;
+			fi
+			Reference="Device.STOMP.Connection.${val}"
+		elif [ ${Protocol} = "MQTT" ]; then
+			val=$(get_uci_ref_index mqtt ${mqtt})
+			if [ ${val} -eq 0 ]; then
+				log "Not able to find the referred mqtt section"
+				return 1;
+			fi
+			Reference="Device.MQTT.Client.${val}"
+		fi
+	fi
+
+	controller_num=$(( controller_num + 1 ))
+
+	db_set Device.LocalAgent.Controller.${controller_num}.Alias "cpe-${controller_num}"
+	db_set Device.LocalAgent.Controller.${controller_num}.Enable "${Enable}"
+	db_set Device.LocalAgent.Controller.${controller_num}.EndpointID "${EndpointID}"
+	#db_set Device.LocalAgent.Controller.${controller_num}.AssignedRole "${AssignedRole}"
+	db_set Device.LocalAgent.Controller.${controller_num}.PeriodicNotifInterval "${PeriodicNotifInterval}"
+	if [ -n "${PeriodicNotifTime}" ]; then
+		db_set Device.LocalAgent.Controller.${controller_num}.PeriodicNotifTime "${PeriodicNotifTime}"
+	else
+		db_set Device.LocalAgent.Controller.${controller_num}.PeriodicNotifTime "0001-01-01T00:00:00Z"
+	fi
+	db_set Device.LocalAgent.Controller.${controller_num}.USPNotifRetryMinimumWaitInterval "${USPNotifRetryMinimumWaitInterval}"
+	db_set Device.LocalAgent.Controller.${controller_num}.USPNotifRetryIntervalMultiplier "${USPNotifRetryIntervalMultiplier}"
+	db_set Device.LocalAgent.Controller.${controller_num}.ControllerCode "${ControllerCode}"
+
+	db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.Alias "cpe-${controller_num}"
+	db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.Enable "${Enable}"
+	db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.Protocol "${Protocol}"
+	# only support configuration of one mtp path per controller using uci
+	if [ "${Protocol}" = "MQTT" ]; then
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.MQTT.Reference "${Reference}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.MQTT.Topic "${Topic}"
+	elif [ "${Protocol}" = "STOMP" ]; then
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Reference "${Reference}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Destination "${Destination}"
+	elif [ "${Protocol}" = "CoAP" ]; then
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Host "${coap_host}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Path "${coap_path}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Port "${coap_port}"
+	else
+		log "Unsupported Protocol ${Protocol}"
+	fi
+
+	db_set
+}
+
+configure_subscription(){
+	local ID Enable NotifType ReferenceList Persistent Recipient
+	local controller
+
+	validate_subscription_section "${1}" || {
+		log "Validation of subscription section failed"
+		return 1;
+	}
+
+	if [ -z "${Recipient}" -a -z "${controller}" ]; then
+		log "No recipient for subscription"
+	fi
+
+	if [ -z ${Recipient} ]; then
+		val=$(get_uci_ref_index controller ${controller})
+		if [ ${val} -eq 0 ]; then
+			log "Not able to find the referred controller section"
+				return 1;
+		fi
+		Recipient="Device.LocalAgent.Controller.${val}"
+	fi
+
+	subs_num=$(( subs_num + 1))
+
+	db_set Device.LocalAgent.Subscription.${subs_num}.Alias "cpe-${subs_num}"
+	db_set Device.LocalAgent.Subscription.${subs_num}.Enable "${Enable}"
+	db_set Device.LocalAgent.Subscription.${subs_num}.ID "${ID}"
+	db_set Device.LocalAgent.Subscription.${subs_num}.NotifType "${NotifType}"
+	db_set Device.LocalAgent.Subscription.${subs_num}.ReferenceList "${ReferenceList}"
+	db_set Device.LocalAgent.Subscription.${subs_num}.Persistent "${Persistent}"
+	db_set Device.LocalAgent.Subscription.${subs_num}.Recipient "${Recipient}"
 }
 
 configure_mtp() {
-	local protocol enable destination CoAPPath CoAPPort
+	local Enable Protocol Reference ResponseTopicConfigured PublishQoS
+	local stomp mqtt
 
 	validate_mtp_section "${1}" || {
-		log "Validation of section failed"
+		log "Validation of mtp section failed"
 		return 1;
 	}
+
+	if [ -z ${Reference} ]; then
+		if [ ${Protocol} = "STOMP" ]; then
+			val=$(get_uci_ref_index stomp ${stomp})
+			if [ ${val} -eq 0 ]; then
+				log "Referred stomp section not found"
+				return 1;
+			fi
+			Reference="Device.STOMP.Connection.${val}"
+		elif [ ${Protocol} = "MQTT" ]; then
+			val=$(get_uci_ref_index mqtt ${mqtt})
+			if [ ${val} -eq 0 ]; then
+				log "Referred mqtt section not found"
+				return 1;
+			fi
+			Reference="Device.MQTT.Client.${val}"
+		fi
+	fi
+	mtp_num=$(( mtp_num + 1 ))
+
 	db_set Device.LocalAgent.MTP.${mtp_num}.Alias "cpe-${mtp_num}"
-	db_set Device.LocalAgent.MTP.${mtp_num}.Enable "${enable}"
-	db_set Device.LocalAgent.MTP.${mtp_num}.Protocol "${protocol}"
-	if [ "${protocol}"=="STOMP" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Reference "Device.STOMP.Connection.${mtp_num}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Destination "${destination}"
-	elif [ "${protocol}"=="CoAP" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${CoAPPath}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${CoAPPort}"
+	db_set Device.LocalAgent.MTP.${mtp_num}.Enable "${Enable}"
+	db_set Device.LocalAgent.MTP.${mtp_num}.Protocol "${Protocol}"
+	if [ "${Protocol}" = "MQTT" ]; then
+		db_set Device.LocalAgent.MTP.${mtp_num}.MQTT.Reference "${Reference}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.MQTT.ResponseTopicConfigured "${ResponseTopicConfigured}"
+		if [ -n "${PublishQoS}" ]; then
+			db_set Device.LocalAgent.MTP.${mtp_num}.MQTT.PublishQoS "${PublishQoS}"
+		fi
+	elif [ "${Protocol}" = "STOMP" ]; then
+		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Reference "${Reference}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Destination "${Destination}"
+	elif [ "${Protocol}" = "CoAP" ]; then
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${coap_path}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${coap_port}"
 	else
-		log "Unsupported protocol ${protocol}"
+		log "Unsupported Protocol ${Protocol} in mtp"
 	fi
 	db_set
-	mtp_num=$((mtp_num+1))
 }
 
-configure_connection() {
-	local host username password encryption enable port virtualhost EnableHeartbeats
+configure_stomp_connection() {
+	local Host Username Password Enable Port VirtualHost EnableHeartbeats
 	local OutgoingHeartbeat IncomingHeartbeat ServerRetryInitialInterval
 	local ServerRetryIntervalMultiplier ServerRetryMaxInterval
+	local encryption
 
-	validate_connection_section "${1}" || {
-		log "Validation of section failed"
+	validate_stomp_connection_section "${1}" || {
+		log "Validation of stomp section failed"
 		return 1;
 	}
 
-	db_set Device.STOMP.Connection.${stomp_num}.Host "${host}"
-	db_set Device.STOMP.Connection.${stomp_num}.Username "${username}"
-	db_set Device.STOMP.Connection.${stomp_num}.Password "${password}"
+	stomp_num=$(( stomp_num + 1 ))
+
+	db_set Device.STOMP.Connection.${stomp_num}.Host "${Host}"
+	db_set Device.STOMP.Connection.${stomp_num}.Username "${Username}"
+	db_set Device.STOMP.Connection.${stomp_num}.Password "${Password}"
 
 	db_set Device.STOMP.Connection.${stomp_num}.Alias "cpe-${stomp_num}"
-	db_set Device.STOMP.Connection.${stomp_num}.Enable "${enable}"
-	db_set Device.STOMP.Connection.${stomp_num}.Port "${port}"
+	db_set Device.STOMP.Connection.${stomp_num}.Enable "${Enable}"
+	db_set Device.STOMP.Connection.${stomp_num}.Port "${Port}"
 	db_set Device.STOMP.Connection.${stomp_num}.X_ARRIS-COM_EnableEncryption "${encryption}"
-	db_set Device.STOMP.Connection.${stomp_num}.VirtualHost "${virtualhost}"
+	db_set Device.STOMP.Connection.${stomp_num}.VirtualHost "${VirtualHost}"
 	db_set Device.STOMP.Connection.${stomp_num}.EnableHeartbeats "${EnableHeartbeats}"
 	db_set Device.STOMP.Connection.${stomp_num}.OutgoingHeartbeat "${OutgoingHeartbeat}"
 	db_set Device.STOMP.Connection.${stomp_num}.IncomingHeartbeat "${IncomingHeartbeat}"
@@ -162,20 +375,51 @@ configure_connection() {
 	db_set Device.STOMP.Connection.${stomp_num}.ServerRetryIntervalMultiplier "${ServerRetryIntervalMultiplier}"
 	db_set Device.STOMP.Connection.${stomp_num}.ServerRetryMaxInterval "${ServerRetryMaxInterval}"
 	db_set
-	stomp_num=$((stomp_num+1))
 }
 
-configure_obuspa() {
-	local enable cert interface debug log_level log_dest
+configure_mqtt_client(){
+	local BrokerAddress BrokerPort Enable Username Password ProtocolVersion KeepAliveTime
+	local TransportProtocol ConnectRetryTime ConnectRetryMaxInterval ConnectRetryIntervalMultiplier
 
-	validate_obuspa_section "${1}" || {
-		log "Validation of section failed"
+	validate_mqtt_client_section "${1}" || {
+		log "Validation of mqtt section failed"
 		return 1;
 	}
 
-	[ ${enable} -eq 0 ] && \
-		echo "obuspa not enabled" >>/dev/console && \
-		exit
+	if [ -z "${BrokerAddress}" ]; then
+		log "Broker address can not be empty for mqtt"
+		return 1;
+	fi
+
+	mqtt_num=$(( mqtt_num + 1 ))
+
+	db_set Device.MQTT.Client.${mqtt_num}.Alias "cpe-${mqtt_num}"
+	db_set Device.MQTT.Client.${mqtt_num}.Enable "${Enable}"
+	db_set Device.MQTT.Client.${mqtt_num}.BrokerAddress "${BrokerAddress}"
+	db_set Device.MQTT.Client.${mqtt_num}.BrokerPort "${BrokerPort}"
+	db_set Device.MQTT.Client.${mqtt_num}.Username "${Username}"
+	db_set Device.MQTT.Client.${mqtt_num}.Password "${Password}"
+	db_set Device.MQTT.Client.${mqtt_num}.ProtocolVersion "${ProtocolVersion}"
+	db_set Device.MQTT.Client.${mqtt_num}.TransportProtocol "${TransportProtocol}"
+	db_set Device.MQTT.Client.${mqtt_num}.KeepAliveTime "${KeepAliveTime}"
+	db_set Device.MQTT.Client.${mqtt_num}.ClientID "${ClientID}"
+	db_set Device.MQTT.Client.${mqtt_num}.ConnectRetryTime "${ConnectRetryTime}"
+	db_set Device.MQTT.Client.${mqtt_num}.ConnectRetryIntervalMultiplier "${ConnectRetryIntervalMultiplier}"
+	db_set Device.MQTT.Client.${mqtt_num}.ConnectRetryMaxInterval "${ConnectRetryMaxInterval}"
+
+	db_set
+}
+
+
+configure_obuspa() {
+	local enabled trust_cert ifname interface debug log_level db_file log_dest
+
+	validate_obuspa_section "global" || {
+		log "Validation of global section failed"
+		return 1;
+	}
+
+	[ ${enabled} -eq 0 ] && exit 0
 
 	if [ ${debug} -eq 1 ]; then
 		# Forward stdout of the command to logd
@@ -184,42 +428,92 @@ configure_obuspa() {
 		procd_set_param stderr 1
 		procd_append_param command -p
 	fi
-	procd_append_param command -v ${log_level} -l ${log_dest}
 
-	# Get wan L3 interface
-	json_load "$(ubus -t 2 call network.interface.${interface} status)"
-	json_get_var l3device l3_device
-	export USP_BOARD_IFNAME=${l3device}
+	if [ -n ${log_level} ]; then
+		procd_append_param command -v ${log_level}
+	fi
 
-	# Set this variable for root user
-	grep -q USP_BOARD_IFNAME /root/.profile || \
-		echo "export USP_BOARD_IFNAME=${l3device}" >> /root/.profile
+	if [ -n "${log_dest}" ]; then
+		procd_append_param command -l ${log_dest}
+	fi
 
-	[ -f $cert ] && certificate=$cert
+	if [ -n "${interface}" ]; then
+		network_get_device ifname ${interface}
+		log "ifname from ${interface} is ${ifname}"
+	fi
 
+	# Set this variable for root user and obuspa -c tool
+	grep -q "export USP_BOARD_IFNAME=${ifname}" /root/.profile || \
+		echo "export USP_BOARD_IFNAME=${ifname}" >> /root/.profile
+
+	if [ -n "${db_file}" ]; then
+		echo "${db_file}" >>${KEEP_FILES}
+		procd_append_param command -f ${db_file}
+	fi
+
+	if [ -n "${trust_cert}" ]; then
+		echo "${trust_cert}" >>${KEEP_FILES}
+		if [ -f "${trust_cert}" ]; then
+			procd_append_param command -t ${trust_cert}
+		fi
+	fi
+
+	if [ -n "${client_cert}" ]; then
+		echo "${client_cert}" >>${KEEP_FILES}
+		if [ -f "${client_cert}" ]; then
+			procd_append_param command -a ${client_cert}
+		fi
+	fi
+
+	procd_set_param env USP_BOARD_IFNAME=${ifname}
 }
+
+# Create factory reset file
 db_init() {
 	[ -f ${PARAM_FILE} ] && rm -f ${PARAM_FILE}
 	[ -f /tmp/usp.db ] && rm -f /tmp/usp.db
+	[ -f ${KEEP_FILES} ] && rm -f ${KEEP_FILES}
 
-	config_load obuspa
+	# Load configuration
+	config_load $CONFIGURATION
 	config_foreach configure_obuspa obuspa
 	config_foreach configure_controller controller
-	config_foreach configure_connection connection
+	config_foreach configure_localagent localagent
 	config_foreach configure_mtp mtp
+	config_foreach configure_stomp_connection stomp
+	config_foreach configure_mqtt_client mqtt
+	config_foreach configure_subscription subscription
+
 	db_set Internal.Reboot.Cause "LocalFactoryReset"
 }
 
+# if uci changes for obuspa remove persistent db and then reload
+remove_db() {
+	local db_file
+
+	config_load obuspa
+	config_get db_file global db_file
+
+	log "Removing db file (${db_file})"
+	[ -f ${db_file} ] && rm -f ${db_file}
+
+	sed -i "g/export USP_BOARD_IFNAME/d" /root/.profile
+
+	log "Restarting service"
+	stop
+	start
+}
+
 start_service() {
-	procd_open_instance obuspa
-	procd_set_param env USP_BOARD_IFNAME=${l3device}
+	procd_open_instance ${CONFIGURATION}
 	procd_set_param command ${PROG}
 	db_init
 	procd_append_param command -r ${PARAM_FILE}
-	if [ -f "${certificate}" ]; then
-		procd_append_param command -t ${certificate}
-	fi
-	procd_set_param respawn
+	procd_set_param respawn \
+			${respawn_threshold:-5} \
+			${respawn_timeout:-10} ${respawn_retry:-3}
+
+	procd_set_param watch usp.raw
 	procd_close_instance
 }
 
@@ -233,5 +527,11 @@ reload_service() {
 }
 
 service_triggers() {
-	procd_add_config_trigger "config.change" "obuspa"  /etc/init.d/obuspa restart
+	procd_add_reload_trigger "uspd"
+	procd_add_config_trigger "config.change" "${CONFIGURATION}" /etc/init.d/obuspa remove_db
+
+#	local interface
+#	config_load obuspa
+#	config_get interface global interface
+#	[ -n "$interface" ] && procd_add_interface_trigger "interface.*" "$interface" /etc/init.d/obuspa reload
 }

paho-mqtt-c/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2013 Inteno
+# Copyright (C) 2020 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.5
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=0513e171013512bc14ef8b650c715e3fd9c59820
+PKG_SOURCE_VERSION:=dd4a72aca663bf3c9a57f20e889e43a55d3da1b3
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 

qosmngr/files/etc/uci-defaults/60-qos_queue_generate

@@ -24,15 +24,17 @@ generate_queue(){
 	fi
 
 	i=0
+	local total_q=$((${no_of_q##* } + 1))
         for i in $no_of_q; do
+		order=$((total_q - i))
 		uci add qos queue
 		uci rename qos.@queue[-1]="q_${i}_${ifname}"
 		uci set qos.@queue[-1].enable="1"
 		uci set qos.@queue[-1].ifname="$ifname"
-		uci set qos.@queue[-1].precedence="$i"
+		uci set qos.@queue[-1].precedence="$order"
 		uci set qos.@queue[-1].scheduling="SP"
 		uci set qos.@queue[-1].rate="0"
-		uci set qos.@queue[-1].burst_size="-1"
+		uci set qos.@queue[-1].burst_size="0"
 		uci set qos.@queue[-1].weight="1"
 	done
 

qosmngr/files/lib/qos/broadcom.sh

@@ -3,30 +3,144 @@
 
 IP_RULE=""
 BR_RULE=""
-is_bcm968=0
 
+POLICER_SKIP=0
 POLICER_COUNT=0
+INTF_NAME=""
+Q_COUNT=0
+ITER=0
+PREV_ORDER=""
+CURR_ORDER=""
+MAX_ORDER=""
 
-#function to handle a queue section
-handle_queue() {
+# Function to handle a queue order and
+# update total number of queues
+handle_q_order() {
 	qid="$1" #queue section ID
 
 	config_get is_enable "$qid" "enable"
 
-	#no need to configure disabled queues
+	# No need to configure disabled queues
 	if [ $is_enable == '0' ]; then
 		return
 	fi
 
 	config_get ifname "$qid" "ifname"
-	#if ifname is empty that is good enough to break
+	# If ifname is empty that is good enough to break
 	if [ -z "$ifname" ];then
 		return
 	fi
 
+	# Create precedence file containing queue order per
+	# interface.
+	local precedence_file="/tmp/qos/$ifname/q_order"
 	local q_no=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
-	#lower the value, lower the priority of queue on this chip
-	config_get order "$qid" "precedence"
+
+	config_get precedence "$qid" "precedence"
+	value=${precedence}_q${q_no}
+	echo $value >> $precedence_file
+
+	# Update the number of queues per interface.
+	q_no=$((q_no + 1))
+	echo $q_no > /tmp/qos/queue_stats/$ifname/q_idx
+}
+
+# Function to check if values are greater than (total number
+# of queue -1) and map them to corresponding value.
+configure_precedence_to_file() {
+	order="$1"
+	line="$2"
+	order_file="$3"
+
+	if [ $order == $PREV_ORDER ]; then
+		queue_id=${line#*_}
+		val=${CURR_ORDER}_${queue_id}
+		echo $val >> $order_file
+	else
+		PREV_ORDER=$order
+		queue_id=${line#*_}
+		val=${MAX_ORDER}_${queue_id}
+		echo $val >> $order_file
+		CURR_ORDER=$MAX_ORDER
+		MAX_ORDER=$((MAX_ORDER - 1))
+	fi
+}
+
+# Fucntion to map queue precedence per interface
+# ranging from 1-X to 0-(no of queues -1)
+map_queue_precedence() {
+	ifname="$1"
+	total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
+	q_no=`expr $total_q - 1`
+
+	MAX_ORDER=$q_no
+
+	local precedence_file="/tmp/qos/$ifname/q_precedence"
+	local order_file="/tmp/qos/$ifname/q_order"
+
+	sort -n -r -k1 $order_file >> $precedence_file
+	rm $order_file
+
+	while read line
+	do
+		order=${line%_*}
+		if [ $order  -gt $q_no ]; then
+			ITER=$((ITER + 1))
+			configure_precedence_to_file $order $line $order_file
+		else
+			if [ $ITER == '0' ]; then
+				echo $line >> $order_file
+			else
+				configure_precedence_to_file $order $line $order_file
+			fi
+		fi
+
+	done < $precedence_file
+}
+
+map_precedence() {
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
+		map_queue_precedence $interf
+	done
+}
+
+# function to handle a queue section
+handle_queue() {
+	qid="$1" #queue section ID
+
+	config_get is_enable "$qid" "enable"
+
+	# no need to configure disabled queues
+	if [ $is_enable == '0' ]; then
+		return
+	fi
+
+	config_get ifname "$qid" "ifname"
+	# if ifname is empty that is good enough to break
+	if [ -z "$ifname" ];then
+		return
+	fi
+
+	# This is to get the qid per interface.
+	if [ $INTF_NAME == $ifname ]; then
+		Q_COUNT=$((Q_COUNT + 1))
+	else
+		Q_COUNT='0'
+	fi
+
+	INTF_NAME=$ifname
+
+	local total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
+	q_no=`expr $total_q - 1` local
+	precedence_file="/tmp/qos/$ifname/q_order"
+
+	# TR181 suggests lower the precedence value higher the priority
+	# but in the chip its the opposite ie lower the value, lower
+	# the priority of queue on this chip. So we need to reverse the
+	# precedence value.
+	precedence="$(grep -i q${Q_COUNT} $precedence_file)"
+	precedence=${precedence%_*}
+	order=`expr $q_no - $precedence`
 
 	config_get sc_alg "$qid" "scheduling"
 	config_get wgt "$qid" "weight"
@@ -47,12 +161,17 @@ handle_queue() {
 		;;
 	esac
 
+	# ignore precedence value in case of WRR
+	if [ $salg -eq 2 ]; then
+	       order=0
+	fi
+
 	# Call tmctl which is a broadcomm command to configure queues on a port.
-	tmctl setqcfg --devtype 0 --if $ifname --qid $q_no --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
+	tmctl setqcfg --devtype 0 --if $ifname --qid $Q_COUNT --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
 
 	# In BCM968 chips, the counters for queues are read, on other model, its read and reset. So, to maintain counter
 	# value and uniform behaviour, we are storing counter value for each queue in files
-	local d_name="/tmp/qos/queue_stats/${ifname}/q_${q_no}"
+	local d_name="/tmp/qos/queue_stats/${ifname}/q_${Q_COUNT}"
 	mkdir $d_name
 	local f_name="$d_name/txPackets"
 	touch $f_name
@@ -67,8 +186,6 @@ handle_queue() {
 	touch $f_name
 	echo 0 > $f_name
 
-	q_no=$((q_no + 1))
-	echo $q_no > /tmp/qos/queue_stats/$ifname/q_idx
 }
 
 #function to handle a policer section
@@ -589,7 +706,7 @@ handle_policer_rules() {
 	fi
 
 	# The policer object is not available on non BCM968* chips
-	if [ $is_bcm968 -eq 1 ]; then
+	if [ $POLICER_SKIP -eq 1 ]; then
 		assign_policer_to_port $ifname $pindex
 	else
 		config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
@@ -685,6 +802,8 @@ configure_queue() {
 	rm -rf /tmp/qos/queue_stats
 
 	for intf in $(db get hw.board.ethernetPortOrder); do
+		rm -rf /tmp/qos/$intf
+
 		mkdir -p /tmp/qos/queue_stats/$intf
 		touch /tmp/qos/queue_stats/$intf/q_idx
 		echo 0 > /tmp/qos/queue_stats/$intf/q_idx
@@ -692,17 +811,23 @@ configure_queue() {
 		for i in 0 1 2 3 4 5 6 7; do
 			tmctl delqcfg --devtype 0 --if $intf --qid $i &>/dev/null
 		done
+
+		mkdir -p /tmp/qos/$intf
+		touch /tmp/qos/$intf/q_order
+		touch /tmp/qos/$intf/q_precedence
 	done
 
 	# Load UCI file
 	config_load qos
+	config_foreach handle_q_order queue
+	map_precedence
 	config_foreach handle_queue queue
 }
 
 configure_policer() {
 	# The policer object is not available on non BCM968* chips, just clean up
 	# the old config if any and return
-	if [ $is_bcm968 -eq 0 ]; then
+	if [ $POLICER_SKIP -eq 0 ]; then
 		for intf in $(db get hw.board.ethernetPortOrder); do
 			# setting rate and burst size to 0 disables rate limiting
 			ethswctl -c rxratectrl -n 1 -p $intf -x 0 -y 0
@@ -743,10 +868,10 @@ configure_qos() {
 
 reload_qos() {
 	local service_name="$1"
-	local cpu_model="$(grep Hardware /proc/cpuinfo  | awk '{print$NF}')"
+	local cpu_model="$(brcm_fw_tool -k info)"
 
 	case $cpu_model in
-		BCM968*) is_bcm968=1 ;;
+		68*|6755) POLICER_SKIP=1 ;;
 	esac
 
 	if [ -z "$service_name" ]; then
@@ -805,7 +930,7 @@ get_queue_stats() {
 				local f_name="/tmp/qos/queue_stats/${ifname}/q_${q_index}/${pname}"
 				# In non BCM968* chips, read operation on queues is actually a read and reset,
 				# so values need to be maintained to present cumulative value
-				if [ $is_bcm968 -eq 0 ]; then
+				if [ $POLICER_SKIP -eq 0 ]; then
 					tmp_val=$(cat $f_name)
 					val=$((val + tmp_val))
 				fi
@@ -866,7 +991,7 @@ get_queue_stats() {
 					local f_name="/tmp/qos/queue_stats/${ifname}/q_${q_index}/${pname}"
 					# In non BCM968* chips, read operation on queues is actually a read and reset,
 					# so values need to be maintained to present cumulative value
-					if [ $is_bcm968 -eq 0 ]; then
+					if [ $POLICER_SKIP -eq 0 ]; then
 						tmp_val=$(cat $f_name)
 						val=$((val + tmp_val))
 					fi
@@ -942,7 +1067,7 @@ get_eth_q_stats() {
 		local f_name="/tmp/qos/queue_stats/${ifname}/q_${qid}/${pname}"
 		# In non BCM968* chips, read operation on queues is actually a read and reset,
 		# so values need to be maintained to present cumulative value
-		if [ $is_bcm968 -eq 0 ]; then
+		if [ $POLICER_SKIP -eq 0 ]; then
 			tmp_val=$(cat $f_name)
 			val=$((val + tmp_val))
 		fi
@@ -974,10 +1099,10 @@ get_eth_q_stats() {
 read_queue_stats() {
 	itf="$1"
 	q_idx="$2"
-	local cpu_model="$(grep Hardware /proc/cpuinfo  | awk '{print$NF}')"
+	local cpu_model="$(brcm_fw_tool -k info)"
 
 	case $cpu_model in
-		BCM968*) is_bcm968=1 ;;
+		68*|6755) POLICER_SKIP=1 ;;
 	esac
 
 	if [ -n "$itf" -a -n "$q_idx" ]; then

swmodd/Makefile

@@ -6,10 +6,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.1.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3bfc97cd6f8e22f561601c47b79203b17fdb0fbe
+PKG_SOURCE_VERSION:=c8cc4a3b332ea931dbf2fe7e6b94bebf5c4bcc33
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -21,7 +21,7 @@ define Package/swmodd
 	SECTION:=utils
 	CATEGORY:=Utilities
 	TITLE:=SWMOD - software modules ubus backend
-	DEPENDS:=+libuci +libubox +ubus +libuuid
+	DEPENDS:=+libuci +libubox +ubus +libuuid +PACKAGE_liblxc:liblxc
 endef
 
 define Package/swmodd/description
@@ -32,6 +32,11 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE
 
+ifeq ($(CONFIG_PACKAGE_liblxc),y)
+MAKE_FLAGS += \
+	SWMOD_LXC="yes"
+endif
+
 define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/swmodd.init $(1)/etc/init.d/swmodd

tr064/.cproject

@@ -1,107 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
-	<storageModule moduleId="org.eclipse.cdt.core.settings">
-		<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.debug.1423203916">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.debug.1423203916" moduleId="org.eclipse.cdt.core.settings" name="Debug">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.debug" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.debug.1423203916" name="Debug" parent="cdt.managedbuild.config.gnu.cross.exe.debug">
-					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.debug.1423203916." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.debug.482080998" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.debug">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1864775892" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
-							<builder buildPath="${workspace_loc:/tr064}/Debug" id="cdt.managedbuild.builder.gnu.cross.84968765" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.912678595" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
-								<option defaultValue="gnu.c.optimization.level.none" id="gnu.c.compiler.option.optimization.level.732187738" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.debugging.level.406132207" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.max" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.656190220" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.894741631" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
-								<option id="gnu.cpp.compiler.option.optimization.level.1987025848" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.debugging.level.1506505331" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.1176314661" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
-								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.1134635640" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1076025733" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.862614592" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.assembler.638528350" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.390953300" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-		<cconfiguration id="cdt.managedbuild.config.gnu.cross.exe.release.517635632">
-			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.cross.exe.release.517635632" moduleId="org.eclipse.cdt.core.settings" name="Release">
-				<externalSettings/>
-				<extensions>
-					<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
-					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-				</extensions>
-			</storageModule>
-			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-				<configuration artifactName="${ProjName}" buildArtefactType="org.eclipse.cdt.build.core.buildArtefactType.exe" buildProperties="org.eclipse.cdt.build.core.buildArtefactType=org.eclipse.cdt.build.core.buildArtefactType.exe,org.eclipse.cdt.build.core.buildType=org.eclipse.cdt.build.core.buildType.release" cleanCommand="rm -rf" description="" id="cdt.managedbuild.config.gnu.cross.exe.release.517635632" name="Release" parent="cdt.managedbuild.config.gnu.cross.exe.release">
-					<folderInfo id="cdt.managedbuild.config.gnu.cross.exe.release.517635632." name="/" resourcePath="">
-						<toolChain id="cdt.managedbuild.toolchain.gnu.cross.exe.release.2086871607" name="Cross GCC" superClass="cdt.managedbuild.toolchain.gnu.cross.exe.release">
-							<targetPlatform archList="all" binaryParser="org.eclipse.cdt.core.ELF" id="cdt.managedbuild.targetPlatform.gnu.cross.1691338213" isAbstract="false" osList="all" superClass="cdt.managedbuild.targetPlatform.gnu.cross"/>
-							<builder buildPath="${workspace_loc:/tr064}/Release" id="cdt.managedbuild.builder.gnu.cross.2045398730" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.builder.gnu.cross"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.c.compiler.804948441" name="Cross GCC Compiler" superClass="cdt.managedbuild.tool.gnu.cross.c.compiler">
-								<option defaultValue="gnu.c.optimization.level.most" id="gnu.c.compiler.option.optimization.level.422910401" name="Optimization Level" superClass="gnu.c.compiler.option.optimization.level" useByScannerDiscovery="false" valueType="enumerated"/>
-								<option id="gnu.c.compiler.option.debugging.level.1240870180" name="Debug Level" superClass="gnu.c.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.c.debugging.level.none" valueType="enumerated"/>
-								<inputType id="cdt.managedbuild.tool.gnu.c.compiler.input.118715116" superClass="cdt.managedbuild.tool.gnu.c.compiler.input"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.compiler.119838407" name="Cross G++ Compiler" superClass="cdt.managedbuild.tool.gnu.cross.cpp.compiler">
-								<option id="gnu.cpp.compiler.option.optimization.level.198417757" name="Optimization Level" superClass="gnu.cpp.compiler.option.optimization.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.optimization.level.most" valueType="enumerated"/>
-								<option id="gnu.cpp.compiler.option.debugging.level.380023243" name="Debug Level" superClass="gnu.cpp.compiler.option.debugging.level" useByScannerDiscovery="false" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.c.linker.751400281" name="Cross GCC Linker" superClass="cdt.managedbuild.tool.gnu.cross.c.linker">
-								<inputType id="cdt.managedbuild.tool.gnu.c.linker.input.398459196" superClass="cdt.managedbuild.tool.gnu.c.linker.input">
-									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
-									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
-								</inputType>
-							</tool>
-							<tool id="cdt.managedbuild.tool.gnu.cross.cpp.linker.1354328537" name="Cross G++ Linker" superClass="cdt.managedbuild.tool.gnu.cross.cpp.linker"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.archiver.1258554594" name="Cross GCC Archiver" superClass="cdt.managedbuild.tool.gnu.cross.archiver"/>
-							<tool id="cdt.managedbuild.tool.gnu.cross.assembler.2022763402" name="Cross GCC Assembler" superClass="cdt.managedbuild.tool.gnu.cross.assembler">
-								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.1223740654" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
-							</tool>
-						</toolChain>
-					</folderInfo>
-				</configuration>
-			</storageModule>
-			<storageModule moduleId="org.eclipse.cdt.core.externalSettings"/>
-		</cconfiguration>
-	</storageModule>
-	<storageModule moduleId="cdtBuildSystem" version="4.0.0">
-		<project id="tr064.cdt.managedbuild.target.gnu.cross.exe.1457888368" name="Executable" projectType="cdt.managedbuild.target.gnu.cross.exe"/>
-	</storageModule>
-	<storageModule moduleId="scannerConfiguration">
-		<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.debug.1423203916;cdt.managedbuild.config.gnu.cross.exe.debug.1423203916.;cdt.managedbuild.tool.gnu.cross.c.compiler.912678595;cdt.managedbuild.tool.gnu.c.compiler.input.656190220">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-		<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.517635632;cdt.managedbuild.config.gnu.cross.exe.release.517635632.;cdt.managedbuild.tool.gnu.cross.c.compiler.804948441;cdt.managedbuild.tool.gnu.c.compiler.input.118715116">
-			<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId=""/>
-		</scannerConfigBuildInfo>
-	</storageModule>
-	<storageModule moduleId="org.eclipse.cdt.core.LanguageSettingsProviders"/>
-	<storageModule moduleId="org.eclipse.cdt.make.core.buildtargets"/>
-</cproject>

tr064/.project

@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>tr064</name>
-	<comment></comment>
-	<projects>
-		<project>openssl-1.0.2i</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.genmakebuilder</name>
-			<triggers>clean,full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.cdt.managedbuilder.core.ScannerConfigBuilder</name>
-			<triggers>full,incremental,</triggers>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.cdt.core.cnature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.managedBuildNature</nature>
-		<nature>org.eclipse.cdt.managedbuilder.core.ScannerConfigNature</nature>
-	</natures>
-</projectDescription>

tr064/.settings/language.settings.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project>
-	<configuration id="cdt.managedbuild.config.gnu.cross.exe.debug.1423203916" name="Debug">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1404192411374960532" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-		</extension>
-	</configuration>
-	<configuration id="cdt.managedbuild.config.gnu.cross.exe.release.517635632" name="Release">
-		<extension point="org.eclipse.cdt.core.LanguageSettingsProvider">
-			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
-			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
-			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="org.eclipse.cdt.internal.build.crossgcc.CrossGCCBuiltinSpecsDetector" console="false" env-hash="1404192411374960532" id="org.eclipse.cdt.build.crossgcc.CrossGCCBuiltinSpecsDetector" keep-relative-paths="false" name="CDT Cross GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
-				<language-scope id="org.eclipse.cdt.core.gcc"/>
-				<language-scope id="org.eclipse.cdt.core.g++"/>
-			</provider>
-		</extension>
-	</configuration>
-</project>

tr064/Makefile

@@ -1,82 +0,0 @@
-# Copyright (C) 2017 PIVA Software <www.pivasoftware.com>
-# 	Author: OMAR Kallel <omar.kallel@pivasoftware.com>
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=tr064
-PKG_VERSION:=1.0
-PKG_SOURCE_URL:=https://dev.iopsys.eu/suite/tr-064.git
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e53d492a09c433718a520987c419cb6a4d4ae8dc
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=LGPL-2.1-only Apache-2.0
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_TR064_DEBUG \
-	CONFIG_TR064_DEVEL
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)/$(PKG_NAME)-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/tr064
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=tr064
-  DEPENDS:=+libubus +libuci +libubox +libmicroxml +libjson-c +libpthread +libopenssl +libubus +libubox
-endef
-
-define Package/tr064/description
-	TR-064 protocol
-endef
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE
-
-TARGET_LDFLAGS += \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-CONFIGURE_ARGS += \
-	--with-uci-include-path=$(STAGING_DIR)/usr/include \
-	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
-	--with-libubus-include-path=$(STAGING_DIR)/usr/include
-
-ifeq ($(CONFIG_TR064_DEBUG),y)
-CONFIGURE_ARGS += \
-	--enable-debug
-endif
-
-ifeq ($(CONFIG_TR064_DEVEL),y)
-CONFIGURE_ARGS += \
-	--enable-devel
-endif
-
-CONFIGURE_ARGS += \
-	--enable-jsonc=1
-
-define Package/tr064/conffiles
-/etc/config/tr064
-endef
-
-define Package/tr064/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/upnp-md
-	$(INSTALL_DIR) $(1)/etc/upnp-md/web
-	$(INSTALL_DIR) $(1)/etc/upnp-md/x509
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/upnp-md-pupnp/upnp-md $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/web/*.xml $(1)/etc/upnp-md/web
-	$(CP) $(PKG_BUILD_DIR)/tools/parse_ftp_server_log.sh $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/tools/kill_child.sh $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/x509/*.pem $(1)/etc/upnp-md/x509
-	$(INSTALL_CONF) $(PKG_BUILD_DIR)/conf/upnp-md.conf $(1)/etc/upnp-md
-	$(CP) $(PKG_BUILD_DIR)/conf/DMconf.xml $(1)/etc/upnp-md
-	$(CP) $(PKG_BUILD_DIR)/conf/CPID.csv $(1)/etc/upnp-md
-	$(CP) $(PKG_BUILD_DIR)/conf/tr064 $(1)/etc/config
-	$(CP) $(PKG_BUILD_DIR)/conf/tr064d $(1)/etc/init.d
-	chmod 0744 $(1)/etc/init.d/tr064d
-endef
-
-$(eval $(call BuildPackage,tr064))

twamp/src/datamodel.c

@@ -29,7 +29,7 @@ static char *get_last_instance_with_option(char *package, char *section, char *o
 	char *inst = NULL;
 
 	uci_foreach_option_eq(package, section, option, val, s) {
-		inst = update_instance(inst, 4, s, opt_inst, package, section);
+		inst = update_instance(inst, 2, s, opt_inst);
 	}
 	return inst;
 }
@@ -55,13 +55,13 @@ struct ip_args
 
 static int addObjIPInterfaceTWAMPReflector(char *refparam, struct dmctx *ctx, void *data, char **instance)
 {
-	struct uci_section *connection;
-	char *value1, *last_inst, *id;
+	struct uci_section *connection = NULL;
 
-	last_inst = get_last_instance_with_option("twamp", "twamp_reflector", "interface", section_name(((struct ip_args *)data)->ip_sec), "twamp_inst");
-	id = get_last_id("twamp", "twamp_reflector");
-	dmuci_add_section("twamp", "twamp_reflector", &connection, &value1);
-	dmasprintf(instance, "%d", last_inst?atoi(last_inst)+1:1);
+	char *last_inst = get_last_instance_with_option("twamp", "twamp_reflector", "interface", section_name(((struct ip_args *)data)->ip_sec), "twamp_inst");
+	char *id = get_last_id("twamp", "twamp_reflector");
+
+	dmuci_add_section("twamp", "twamp_reflector", &connection);
+	dmasprintf(instance, "%d", last_inst ? atoi(last_inst)+1 : 1);
 	dmuci_set_value_by_section(connection, "twamp_inst", *instance);
 	dmuci_set_value_by_section(connection, "id", id);
 	dmuci_set_value_by_section(connection, "enable", "0");
@@ -279,8 +279,8 @@ static int browseIPInterfaceTWAMPReflectorInst(struct dmctx *dmctx, DMNODE *pare
 
 	uci_foreach_option_eq("twamp", "twamp_reflector", "interface", section_name(((struct ip_args *)prev_data)->ip_sec), s) {
 
-		inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 5,
-			   s, "twamp_inst", "twamp_alias", "twamp", "twamp_reflector");
+		inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 3,
+			   s, "twamp_inst", "twamp_alias");
 
 		if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)s, inst) == DM_STOP)
 			break;
@@ -290,20 +290,20 @@ static int browseIPInterfaceTWAMPReflectorInst(struct dmctx *dmctx, DMNODE *pare
 
 /* *** Device.IP.Interface. *** */
 DMOBJ tDeviceTWAMPReflectorObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
-{"TWAMPReflector", &DMWRITE, addObjIPInterfaceTWAMPReflector, delObjIPInterfaceTWAMPReflector, NULL, browseIPInterfaceTWAMPReflectorInst, NULL, NULL, NULL, NULL, tIPInterfaceTWAMPReflectorParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "Port", NULL}},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"TWAMPReflector", &DMWRITE, addObjIPInterfaceTWAMPReflector, delObjIPInterfaceTWAMPReflector, NULL, browseIPInterfaceTWAMPReflectorInst, NULL, NULL, tIPInterfaceTWAMPReflectorParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "Port", NULL}},
 {0}
 };
 
 /* *** Device.IP.Interface.{i}.TWAMPReflector.{i}. *** */
 DMLEAF tIPInterfaceTWAMPReflectorParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"Enable", &DMWRITE, DMT_BOOL, get_IPInterfaceTWAMPReflector_Enable, set_IPInterfaceTWAMPReflector_Enable, NULL, NULL, BBFDM_BOTH},
-{"Status", &DMREAD, DMT_STRING, get_IPInterfaceTWAMPReflector_Status, NULL, NULL, NULL, BBFDM_BOTH},
-{"Alias", &DMWRITE, DMT_STRING, get_IPInterfaceTWAMPReflector_Alias, set_IPInterfaceTWAMPReflector_Alias, NULL, NULL, BBFDM_BOTH},
-{"Port", &DMWRITE, DMT_UNINT, get_IPInterfaceTWAMPReflector_Port, set_IPInterfaceTWAMPReflector_Port, NULL, NULL, BBFDM_BOTH},
-{"MaximumTTL", &DMWRITE, DMT_UNINT, get_IPInterfaceTWAMPReflector_MaximumTTL, set_IPInterfaceTWAMPReflector_MaximumTTL, NULL, NULL, BBFDM_BOTH},
-{"IPAllowedList", &DMWRITE, DMT_STRING, get_IPInterfaceTWAMPReflector_IPAllowedList, set_IPInterfaceTWAMPReflector_IPAllowedList, NULL, NULL, BBFDM_BOTH},
-{"PortAllowedList", &DMWRITE, DMT_STRING, get_IPInterfaceTWAMPReflector_PortAllowedList, set_IPInterfaceTWAMPReflector_PortAllowedList, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"Enable", &DMWRITE, DMT_BOOL, get_IPInterfaceTWAMPReflector_Enable, set_IPInterfaceTWAMPReflector_Enable, BBFDM_BOTH},
+{"Status", &DMREAD, DMT_STRING, get_IPInterfaceTWAMPReflector_Status, NULL, BBFDM_BOTH},
+{"Alias", &DMWRITE, DMT_STRING, get_IPInterfaceTWAMPReflector_Alias, set_IPInterfaceTWAMPReflector_Alias, BBFDM_BOTH},
+{"Port", &DMWRITE, DMT_UNINT, get_IPInterfaceTWAMPReflector_Port, set_IPInterfaceTWAMPReflector_Port, BBFDM_BOTH},
+{"MaximumTTL", &DMWRITE, DMT_UNINT, get_IPInterfaceTWAMPReflector_MaximumTTL, set_IPInterfaceTWAMPReflector_MaximumTTL, BBFDM_BOTH},
+{"IPAllowedList", &DMWRITE, DMT_STRING, get_IPInterfaceTWAMPReflector_IPAllowedList, set_IPInterfaceTWAMPReflector_IPAllowedList, BBFDM_BOTH},
+{"PortAllowedList", &DMWRITE, DMT_STRING, get_IPInterfaceTWAMPReflector_PortAllowedList, set_IPInterfaceTWAMPReflector_PortAllowedList, BBFDM_BOTH},
 {0}
 };

udpechoserver/src/datamodel.c

@@ -189,25 +189,25 @@ static int get_IPDiagnosticsUDPEchoConfig_TimeLastPacketReceived(char *refparam,
 
 /* *** Device.IP.Diagnostics. *** */
 DMOBJ tDeviceUDPEchoConfigObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
-{"UDPEchoConfig", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tIPDiagnosticsUDPEchoConfigParams, NULL, BBFDM_BOTH},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"UDPEchoConfig", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, tIPDiagnosticsUDPEchoConfigParams, NULL, BBFDM_BOTH},
 {0}
 };
 
 /* *** Device.IP.Diagnostics.UDPEchoConfig. *** */
 DMLEAF tIPDiagnosticsUDPEchoConfigParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"Enable", &DMWRITE, DMT_BOOL, get_IPDiagnosticsUDPEchoConfig_Enable, set_IPDiagnosticsUDPEchoConfig_Enable, NULL, NULL, BBFDM_BOTH},
-{"Interface", &DMWRITE, DMT_STRING, get_IPDiagnosticsUDPEchoConfig_Interface, set_IPDiagnosticsUDPEchoConfig_Interface, NULL, NULL, BBFDM_BOTH},
-{"SourceIPAddress", &DMWRITE, DMT_STRING, get_IPDiagnosticsUDPEchoConfig_SourceIPAddress, set_IPDiagnosticsUDPEchoConfig_SourceIPAddress, NULL, NULL, BBFDM_BOTH},
-{"UDPPort", &DMWRITE, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_UDPPort, set_IPDiagnosticsUDPEchoConfig_UDPPort, NULL, NULL, BBFDM_BOTH},
-{"EchoPlusEnabled", &DMWRITE, DMT_BOOL, get_IPDiagnosticsUDPEchoConfig_EchoPlusEnabled, set_IPDiagnosticsUDPEchoConfig_EchoPlusEnabled, NULL, NULL, BBFDM_BOTH},
-{"EchoPlusSupported", &DMREAD, DMT_BOOL, get_IPDiagnosticsUDPEchoConfig_EchoPlusSupported, NULL, NULL, NULL, BBFDM_BOTH},
-{"PacketsReceived", &DMREAD, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_PacketsReceived, NULL, NULL, NULL, BBFDM_BOTH},
-{"PacketsResponded", &DMREAD, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_PacketsResponded, NULL, NULL, NULL, BBFDM_BOTH},
-{"BytesReceived", &DMREAD, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_BytesReceived, NULL, NULL, NULL, BBFDM_BOTH},
-{"BytesResponded", &DMREAD, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_BytesResponded, NULL, NULL, NULL, BBFDM_BOTH},
-{"TimeFirstPacketReceived", &DMREAD, DMT_TIME, get_IPDiagnosticsUDPEchoConfig_TimeFirstPacketReceived, NULL, NULL, NULL, BBFDM_BOTH},
-{"TimeLastPacketReceived", &DMREAD, DMT_TIME, get_IPDiagnosticsUDPEchoConfig_TimeLastPacketReceived, NULL, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"Enable", &DMWRITE, DMT_BOOL, get_IPDiagnosticsUDPEchoConfig_Enable, set_IPDiagnosticsUDPEchoConfig_Enable, BBFDM_BOTH},
+{"Interface", &DMWRITE, DMT_STRING, get_IPDiagnosticsUDPEchoConfig_Interface, set_IPDiagnosticsUDPEchoConfig_Interface, BBFDM_BOTH},
+{"SourceIPAddress", &DMWRITE, DMT_STRING, get_IPDiagnosticsUDPEchoConfig_SourceIPAddress, set_IPDiagnosticsUDPEchoConfig_SourceIPAddress, BBFDM_BOTH},
+{"UDPPort", &DMWRITE, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_UDPPort, set_IPDiagnosticsUDPEchoConfig_UDPPort, BBFDM_BOTH},
+{"EchoPlusEnabled", &DMWRITE, DMT_BOOL, get_IPDiagnosticsUDPEchoConfig_EchoPlusEnabled, set_IPDiagnosticsUDPEchoConfig_EchoPlusEnabled, BBFDM_BOTH},
+{"EchoPlusSupported", &DMREAD, DMT_BOOL, get_IPDiagnosticsUDPEchoConfig_EchoPlusSupported, NULL, BBFDM_BOTH},
+{"PacketsReceived", &DMREAD, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_PacketsReceived, NULL, BBFDM_BOTH},
+{"PacketsResponded", &DMREAD, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_PacketsResponded, NULL, BBFDM_BOTH},
+{"BytesReceived", &DMREAD, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_BytesReceived, NULL, BBFDM_BOTH},
+{"BytesResponded", &DMREAD, DMT_UNINT, get_IPDiagnosticsUDPEchoConfig_BytesResponded, NULL, BBFDM_BOTH},
+{"TimeFirstPacketReceived", &DMREAD, DMT_TIME, get_IPDiagnosticsUDPEchoConfig_TimeFirstPacketReceived, NULL, BBFDM_BOTH},
+{"TimeLastPacketReceived", &DMREAD, DMT_TIME, get_IPDiagnosticsUDPEchoConfig_TimeLastPacketReceived, NULL, BBFDM_BOTH},
 {0}
 };

uspd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.0.8
+PKG_VERSION:=2.1.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4f42f08b9c4c410ca5170c77472ec6dbbecc85f2
+PKG_SOURCE_VERSION:=1dec7e4bcc8004d142fca195d82a013c1e6dbcb2
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif

uspd/files/uspd.config

@@ -1,3 +1,4 @@
 config uspd 'usp'
 	option granularitylevel  '0'
+	option debug '0'
 	option loglevel  '1'

uspd/files/uspd.init

@@ -6,9 +6,48 @@ STOP=10
 USE_PROCD=1
 PROG=/usr/sbin/uspd
 
+validate_uspd_usp_section()
+{
+	uci_validate_section uspd uspd "usp" \
+		'enabled:bool:true' \
+		'granularitylevel:uinteger' \
+		'debug:bool:false' \
+		'loglevel:uinteger' \
+		'sock:string' \
+		'transaction_timeout:string'
+}
+
+configure_uspd()
+{
+	local enabled debug sock transaction_timeout
+
+	config_load uspd
+
+	validate_uspd_usp_section || {
+		log "Validation of usp section failed"
+		return 1;
+	}
+
+	[ ${enabled} -eq 0 ] && exit 0
+
+	if [ ${debug} -eq 1 ]; then
+		procd_set_param stdout 1
+		procd_set_param stderr 1
+	fi
+
+	if [ -n "${sock}" ]; then
+		procd_append_param command -s ${sock}
+	fi
+
+	if [ -n "${transaction_timeout}" ]; then
+		procd_append_param command -t ${transaction_timeout}
+	fi
+}
+
 start_service() {
-	procd_open_instance
+	procd_open_instance usp
 	procd_set_param command ${PROG}
+	configure_uspd
 	procd_set_param respawn
 	procd_close_instance
 }

wfadatad/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=2.3.0
+PKG_VERSION:=3.0.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=26701fdc83440a748aeff183bad2f67287764fb4
+PKG_SOURCE_VERSION:=d9f4042963118f6786743554f2fc077f0128bd07
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 
@@ -21,7 +21,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/wfadatad
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=WiFi Data Elements-1.0 Agent
+  TITLE:=WiFi Data Elements-1.0 Agent and Collector
   DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl \
 	  +!WFA_DELM_STANDALONE:map-agent +WFA_DELM_MULTIAP_MODE:libmaputils
 endef

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=8.2.9
+PKG_VERSION:=8.3.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ff879d814caba6807f64288de22db6f78c03438c
+PKG_SOURCE_VERSION:=7e1f7b600d93bc3f29fdc624040f4710e0d4623e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

wifimngr/files/wifimngr.init

@@ -19,3 +19,7 @@ reload_service() {
         stop
         start
 }
+
+service_triggers() {
+	procd_add_reload_trigger "wireless"
+}

xmpp/src/datamodel.c

@@ -25,32 +25,31 @@ LIB_MAP_OBJ tRootDynamicObj[] = {
 
 static int add_xmpp_connection(char *refparam, struct dmctx *ctx, void *data, char **instance)
 {
-	struct uci_section *xmpp_con, *xmpp_con_srv, *dmmap_xmpp;
-	char *con_name, *con_srv_name, *last_inst, *v, *id;
+	struct uci_section *xmpp_con = NULL, *xmpp_con_srv = NULL, *dmmap_xmpp = NULL;
+	char id[16];
 
-	check_create_dmmap_package("dmmap_xmpp");
-	last_inst = get_last_instance_bbfdm("dmmap_xmpp", "connection", "con_inst");
-	dmasprintf(&id, "%d", (last_inst) ? atoi(last_inst) + 1 : 1);
+	char *last_inst = get_last_instance_bbfdm("dmmap_xmpp", "connection", "con_inst");
+	snprintf(id, sizeof(id), "%d", (last_inst) ? atoi(last_inst) + 1 : 1);
 
-	dmuci_add_section("xmpp", "connection", &xmpp_con, &con_name);
+	dmuci_add_section("xmpp", "connection", &xmpp_con);
 	dmuci_set_value_by_section(xmpp_con, "xmpp_id", id);
 	dmuci_set_value_by_section(xmpp_con, "enable", "0");
 	dmuci_set_value_by_section(xmpp_con, "interval", "30");
 	dmuci_set_value_by_section(xmpp_con, "attempt", "16");
 	dmuci_set_value_by_section(xmpp_con, "serveralgorithm", "DNS-SRV");
 
-	dmuci_add_section("xmpp", "connection_server", &xmpp_con_srv, &con_srv_name);
+	dmuci_add_section("xmpp", "connection_server", &xmpp_con_srv);
 	dmuci_set_value_by_section(xmpp_con_srv, "con_id", id);
 	dmuci_set_value_by_section(xmpp_con_srv, "enable", "0");
 	dmuci_set_value_by_section(xmpp_con_srv, "port", "5222");
 
-	dmuci_add_section_bbfdm("dmmap_xmpp", "connection_server", &dmmap_xmpp, &v);
+	dmuci_add_section_bbfdm("dmmap_xmpp", "connection_server", &dmmap_xmpp);
 	dmuci_set_value_by_section(dmmap_xmpp, "section_name", section_name(xmpp_con_srv));
 	dmuci_set_value_by_section(dmmap_xmpp, "con_srv_inst", "1");
 
-	dmuci_add_section_bbfdm("dmmap_xmpp", "connection", &dmmap_xmpp, &v);
+	dmuci_add_section_bbfdm("dmmap_xmpp", "connection", &dmmap_xmpp);
 	dmuci_set_value_by_section(dmmap_xmpp, "section_name", section_name(xmpp_con));
-	*instance = update_instance(last_inst, 4, dmmap_xmpp, "con_inst", "dmmap_xmpp", "connection");
+	*instance = update_instance(last_inst, 2, dmmap_xmpp, "con_inst");
 	return 0;
 }
 
@@ -555,8 +554,8 @@ static int browsexmpp_connectionInst(struct dmctx *dmctx, DMNODE *parent_node, v
 	synchronize_specific_config_sections_with_dmmap("xmpp", "connection", "dmmap_xmpp", &dup_list);
 	list_for_each_entry(p, &dup_list, list) {
 
-		inst = handle_update_instance(1, dmctx, &max_inst, update_instance_alias, 5,
-			   p->dmmap_section, "con_inst", "con_alias", "dmmap_xmpp", "connection");
+		inst = handle_update_instance(1, dmctx, &max_inst, update_instance_alias, 3,
+			   p->dmmap_section, "con_inst", "con_alias");
 
 		if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP)
 			break;
@@ -578,8 +577,8 @@ static int browsexmpp_connection_serverInst(struct dmctx *dmctx, DMNODE *parent_
 
 	list_for_each_entry(p, &dup_list, list) {
 
-		inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 5,
-				p->dmmap_section, "con_srv_inst", "con_srv_alias", "xmpp", "connection_server");
+		inst = handle_update_instance(2, dmctx, &max_inst, update_instance_alias, 3,
+			   p->dmmap_section, "con_srv_inst", "con_srv_alias");
 
 		if (DM_LINK_INST_OBJ(dmctx, parent_node, (void *)p->config_section, inst) == DM_STOP)
 			break;
@@ -590,58 +589,58 @@ static int browsexmpp_connection_serverInst(struct dmctx *dmctx, DMNODE *parent_
 
 /* *** Device.XMPP. *** */
 DMOBJ tDeviceXMPPObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
-{"XMPP", &DMREAD, NULL, NULL, NULL, NULL, NULL, NULL, NULL, tXMPPObj, tXMPPParams, NULL, BBFDM_BOTH},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"XMPP", &DMREAD, NULL, NULL, NULL, NULL, NULL, tXMPPObj, tXMPPParams, NULL, BBFDM_BOTH},
 {0}
 };
 
 DMOBJ tXMPPObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
-{"Connection", &DMWRITE, add_xmpp_connection, delete_xmpp_connection, NULL, browsexmpp_connectionInst, NULL, NULL, NULL, tXMPPConnectionObj, tXMPPConnectionParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "Username", "Domain", "Resource", NULL}},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"Connection", &DMWRITE, add_xmpp_connection, delete_xmpp_connection, NULL, browsexmpp_connectionInst, NULL, tXMPPConnectionObj, tXMPPConnectionParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "Username", "Domain", "Resource", NULL}},
 {0}
 };
 
 DMLEAF tXMPPParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"ConnectionNumberOfEntries", &DMREAD, DMT_UNINT, get_xmpp_connection_nbr_entry, NULL, NULL, NULL, BBFDM_BOTH},
-{"SupportedServerConnectAlgorithms", &DMREAD, DMT_STRING, get_xmpp_connection_supported_server_connect_algorithms, NULL, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"ConnectionNumberOfEntries", &DMREAD, DMT_UNINT, get_xmpp_connection_nbr_entry, NULL, BBFDM_BOTH},
+{"SupportedServerConnectAlgorithms", &DMREAD, DMT_STRING, get_xmpp_connection_supported_server_connect_algorithms, NULL, BBFDM_BOTH},
 {0}
 };
 
 /* *** Device.XMPP.Connection.{i}. *** */
 DMOBJ tXMPPConnectionObj[] = {
-/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, forced_inform, notification, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
-{"Server", &DMREAD, NULL, NULL, NULL, browsexmpp_connection_serverInst, NULL, NULL, NULL, NULL, tXMPPConnectionServerParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "ServerAddress", "Port", NULL}},
+/* OBJ, permission, addobj, delobj, checkdep, browseinstobj, nextdynamicobj, nextobj, leaf, linker, bbfdm_type, uniqueKeys*/
+{"Server", &DMREAD, NULL, NULL, NULL, browsexmpp_connection_serverInst, NULL, NULL, tXMPPConnectionServerParams, NULL, BBFDM_BOTH, LIST_KEY{"Alias", "ServerAddress", "Port", NULL}},
 {0}
 };
 
 DMLEAF tXMPPConnectionParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"Enable", &DMWRITE, DMT_BOOL, get_connection_enable, set_connection_enable, NULL, NULL, BBFDM_BOTH},
-{"Alias", &DMWRITE, DMT_STRING, get_xmpp_connection_alias, set_xmpp_connection_alias, NULL, NULL, BBFDM_BOTH},
-{"Username", &DMWRITE, DMT_STRING, get_xmpp_connection_username, set_xmpp_connection_username, NULL, NULL, BBFDM_BOTH},
-{"Password", &DMWRITE, DMT_STRING, get_xmpp_connection_password, set_xmpp_connection_password, NULL, NULL, BBFDM_BOTH},
-{"Domain", &DMWRITE, DMT_STRING, get_xmpp_connection_domain, set_xmpp_connection_domain, NULL, NULL, BBFDM_BOTH},
-{"Resource", &DMWRITE, DMT_STRING, get_xmpp_connection_resource, set_xmpp_connection_resource, NULL, NULL, BBFDM_BOTH},
-{"ServerConnectAlgorithm", &DMWRITE, DMT_STRING, get_xmpp_connection_server_connect_algorithm, set_xmpp_connection_server_connect_algorithm, NULL, NULL, BBFDM_BOTH},
-{"KeepAliveInterval", &DMWRITE, DMT_LONG, get_xmpp_connection_keepalive_interval, set_xmpp_connection_keepalive_interval, NULL, NULL, BBFDM_BOTH},
-{"ServerConnectAttempts", &DMWRITE, DMT_UNINT, get_xmpp_connection_server_attempts, set_xmpp_connection_server_attempts, NULL, NULL, BBFDM_BOTH},
-{"ServerRetryInitialInterval", &DMWRITE, DMT_UNINT, get_xmpp_connection_retry_initial_interval, set_xmpp_connection_retry_initial_interval, NULL, NULL, BBFDM_BOTH},
-{"ServerRetryIntervalMultiplier", &DMWRITE, DMT_UNINT, get_xmpp_connection_retry_interval_multiplier, set_xmpp_connection_retry_interval_multiplier, NULL, NULL, BBFDM_BOTH},
-{"ServerRetryMaxInterval", &DMWRITE, DMT_UNINT, get_xmpp_connection_retry_max_interval, set_xmpp_connection_retry_max_interval, NULL, NULL, BBFDM_BOTH},
-{"UseTLS", &DMWRITE, DMT_BOOL, get_xmpp_connection_server_usetls, set_xmpp_connection_server_usetls, NULL, NULL, BBFDM_BOTH},
-{"JabberID", &DMREAD, DMT_STRING, get_xmpp_connection_jabber_id, NULL, NULL, NULL, BBFDM_BOTH},
-{"Status", &DMREAD, DMT_STRING, get_xmpp_connection_status, NULL, NULL, NULL, BBFDM_BOTH},
-{"ServerNumberOfEntries", &DMREAD, DMT_UNINT, get_xmpp_connection_server_number_of_entries, NULL, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"Enable", &DMWRITE, DMT_BOOL, get_connection_enable, set_connection_enable, BBFDM_BOTH},
+{"Alias", &DMWRITE, DMT_STRING, get_xmpp_connection_alias, set_xmpp_connection_alias, BBFDM_BOTH},
+{"Username", &DMWRITE, DMT_STRING, get_xmpp_connection_username, set_xmpp_connection_username, BBFDM_BOTH},
+{"Password", &DMWRITE, DMT_STRING, get_xmpp_connection_password, set_xmpp_connection_password, BBFDM_BOTH},
+{"Domain", &DMWRITE, DMT_STRING, get_xmpp_connection_domain, set_xmpp_connection_domain, BBFDM_BOTH},
+{"Resource", &DMWRITE, DMT_STRING, get_xmpp_connection_resource, set_xmpp_connection_resource, BBFDM_BOTH},
+{"ServerConnectAlgorithm", &DMWRITE, DMT_STRING, get_xmpp_connection_server_connect_algorithm, set_xmpp_connection_server_connect_algorithm, BBFDM_BOTH},
+{"KeepAliveInterval", &DMWRITE, DMT_LONG, get_xmpp_connection_keepalive_interval, set_xmpp_connection_keepalive_interval, BBFDM_BOTH},
+{"ServerConnectAttempts", &DMWRITE, DMT_UNINT, get_xmpp_connection_server_attempts, set_xmpp_connection_server_attempts, BBFDM_BOTH},
+{"ServerRetryInitialInterval", &DMWRITE, DMT_UNINT, get_xmpp_connection_retry_initial_interval, set_xmpp_connection_retry_initial_interval, BBFDM_BOTH},
+{"ServerRetryIntervalMultiplier", &DMWRITE, DMT_UNINT, get_xmpp_connection_retry_interval_multiplier, set_xmpp_connection_retry_interval_multiplier, BBFDM_BOTH},
+{"ServerRetryMaxInterval", &DMWRITE, DMT_UNINT, get_xmpp_connection_retry_max_interval, set_xmpp_connection_retry_max_interval, BBFDM_BOTH},
+{"UseTLS", &DMWRITE, DMT_BOOL, get_xmpp_connection_server_usetls, set_xmpp_connection_server_usetls, BBFDM_BOTH},
+{"JabberID", &DMREAD, DMT_STRING, get_xmpp_connection_jabber_id, NULL, BBFDM_BOTH},
+{"Status", &DMREAD, DMT_STRING, get_xmpp_connection_status, NULL, BBFDM_BOTH},
+{"ServerNumberOfEntries", &DMREAD, DMT_UNINT, get_xmpp_connection_server_number_of_entries, NULL, BBFDM_BOTH},
 {0}
 };
 
 /* *** Device.XMPP.Connection.{i}.Server.{i}. *** */
 DMLEAF tXMPPConnectionServerParams[] = {
-/* PARAM, permission, type, getvalue, setvalue, forced_inform, notification, bbfdm_type*/
-{"Enable", &DMWRITE, DMT_BOOL, get_xmpp_connection_server_enable, set_xmpp_connection_server_enable, NULL, NULL, BBFDM_BOTH},
-{"Alias", &DMWRITE, DMT_STRING, get_xmpp_connection_server_alias, set_xmpp_connection_server_alias, NULL, NULL, BBFDM_BOTH},
-{"ServerAddress", &DMWRITE, DMT_STRING, get_xmpp_connection_server_server_address, set_xmpp_connection_server_server_address, NULL, NULL, BBFDM_BOTH},
-{"Port", &DMWRITE, DMT_UNINT, get_xmpp_connection_server_port, set_xmpp_connection_server_port, NULL, NULL, BBFDM_BOTH},
+/* PARAM, permission, type, getvalue, setvalue, bbfdm_type*/
+{"Enable", &DMWRITE, DMT_BOOL, get_xmpp_connection_server_enable, set_xmpp_connection_server_enable, BBFDM_BOTH},
+{"Alias", &DMWRITE, DMT_STRING, get_xmpp_connection_server_alias, set_xmpp_connection_server_alias, BBFDM_BOTH},
+{"ServerAddress", &DMWRITE, DMT_STRING, get_xmpp_connection_server_server_address, set_xmpp_connection_server_server_address, BBFDM_BOTH},
+{"Port", &DMWRITE, DMT_UNINT, get_xmpp_connection_server_port, set_xmpp_connection_server_port, BBFDM_BOTH},
 {0}
 };