fluent-bit: convert kmsg pri field from char to string

In order to support filtering based on serverity and facility in
logmngr config, we need to be able to configure regex on the
priority field, but kmsg input plugin sends the priority field as
char, on which regex does not work. We also cannot use the type
converter filter which is present in fluent bit, because it does
not support the source data type to be char. Therefore, we change
priority from a char to a string field.

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.16.8
+PKG_VERSION:=1.17.6
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=1615b42e405faceceac825f9c0387a58b90785ae
+PKG_SOURCE_VERSION:=c9af4e50cef5336e7842578d3d10f1f7bce2d8b0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

bbfdm/files/etc/init.d/bbfdm.services

@@ -5,7 +5,6 @@ STOP=05
 
 USE_PROCD=1
 PROG=/usr/sbin/dm-service
-DM_AGENT_PROG=/usr/sbin/dm-agent
 
 BBFDM_MICROSERVICE_DIR="/etc/bbfdm/services"
 
@@ -25,8 +24,7 @@ validate_bbfdm_micro_service_section()
 _add_microservice()
 {
 	local name path loglevel
-	local enable enable_core unified_daemon dm_framework
-	local daemon_prog
+	local enable enable_core unified_daemon
 
 	# Check enable from micro-service
 	path="${1}"
@@ -49,25 +47,14 @@ _add_microservice()
 		return 0
 	fi
 
-	json_get_var dm_framework dm-framework 0
-	if [ "${dm_framework}" -eq "1" ] || [ "${dm_framework}" = "true" ]; then
-		daemon_prog="${DM_AGENT_PROG}"
-	else
-		daemon_prog="${PROG}"
-	fi
-
 	json_select config
 	json_get_var loglevel loglevel 4
 
 	procd_open_instance "${name}"
 
-	procd_set_param command ${daemon_prog}
-
-	# Only add parameters for dm-service, not for dm-agent
-	if [ "${daemon_prog}" = "${PROG}" ]; then
-		procd_append_param command -m "${name}"
-		procd_append_param command -l "${loglevel}"
-	fi
+	procd_set_param command ${PROG}
+	procd_append_param command -m "${name}"
+	procd_append_param command -l "${loglevel}"
 
 	if [ "${enable_core}" -eq "1" ]; then
 		procd_set_param limits core="unlimited"

bridgemngr/Config.in

@@ -0,0 +1,17 @@
+if PACKAGE_bridgemngr
+
+config BRIDGEMNGR_BRIDGE_VLAN
+	bool "Use bridge-vlan backend"
+	help
+	   Set this option to use bridge-vlan as backend for VLAN objects.
+
+config BRIDGEMNGR_BRIDGE_VENDOR_EXT
+	bool "Use bridge BBF vendor extensions"
+	default y
+	help
+	   Set this option to use bridge BBF vendor extensions.
+
+config BRIDGEMNGR_BRIDGE_VENDOR_PREFIX
+	string "Package specific datamodel Vendor Prefix for TR181 extensions"
+	default ""
+endif

bridgemngr/Makefile

@@ -0,0 +1,76 @@
+#
+# Copyright (C) 2020-2024 iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bridgemngr
+PKG_VERSION:=1.1.1
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/bridgemngr
+PKG_SOURCE_VERSION:=b6a657e1c83b49f09323b4012ef229c604b82854
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+define Package/bridgemngr
+ CATEGORY:=Utilities
+ TITLE:=Bridge Manager
+ DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
+ DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
+endef
+
+define Package/bridgemngr/description
+	Package to add Device.Bridging. data model support.
+endef
+
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
+MAKE_PATH:=src
+
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX),"")
+VENDOR_PREFIX = $(CONFIG_BBF_VENDOR_PREFIX)
+else
+VENDOR_PREFIX = $(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_PREFIX)
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
+
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VLAN),y)
+	TARGET_CFLAGS += -DBRIDGE_VLAN_BACKEND
+endif
+
+define Package/bridgemngr/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+
+	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libbridgemngr.so $(1) $(PKG_NAME)
+ifeq ($(CONFIG_BRIDGEMNGR_BRIDGE_VENDOR_EXT), y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/src/libbridgeext.so $(1) $(PKG_NAME) 10
+	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/VLAN_Filtering_Extension.json $(1) $(PKG_NAME) 11
+endif
+
+	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/config/bridging $(1)/etc/config/
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) ~/git/bridgemngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+$(eval $(call BuildPackage,bridgemngr))

bridgemngr/bbfdm_service.json

@@ -2,7 +2,6 @@
   "daemon": {
     "enable": "1",
     "service_name": "bridgemngr",
-    "dm-framework": true,
     "unified_daemon": false,
     "services": [
       {

bridgemngr/files/VLAN_Filtering_Extension.json

@@ -0,0 +1,31 @@
+{
+	"json_plugin_version": 2,
+	"Device.Bridging.Bridge.{i}.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": true,
+		"array": true,
+		"{BBF_VENDOR_PREFIX}VLANFiltering": {
+			"type": "boolean",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "boolean",
+			"description": "Enable or disable VLAN Filtering on this bridge.",
+			"mapping": [
+				{
+					"data": "@Parent",
+					"type": "uci_sec",
+					"key": "vlan_filtering"
+				}
+			]
+		}
+	}
+}
+

bridgemngr/files/etc/init.d/bridging

@@ -77,7 +77,6 @@ handle_ebtables_rule() {
 }
 
 start_service() {
-	ubus -t 30 wait_for network.device uci
 	config_load bridging
 	config_foreach handle_ebtables_chain chain
 	config_foreach handle_ebtables_rule rule

decollector/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=6.2.1.7
+PKG_VERSION:=6.2.1.10
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ca92325ece080389ffb405c95048b64071eda653
+PKG_SOURCE_VERSION:=c9fad0fafad290bc19b7ad1a8e6c7e2cc4f55ad1
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.7.10
+PKG_VERSION:=3.7.11
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1f851980a6ba616df54f79930225f8bcd563b711
+PKG_SOURCE_VERSION:=815ee44808169b8e1efa2cac44bd7d238ad33cdc
 PKG_MIRROR_HASH:=skip
 endif
 

dm-framework/Makefile

@@ -1,207 +0,0 @@
-#
-# Copyright (c) 2023 Genexis B.V. All rights reserved.
-# This Software and its content are protected by the Dutch Copyright Act
-# ('Auteurswet'). All and any copying and distribution of the software
-# and its content without authorization by Genexis B.V. is
-# prohibited. The prohibition includes every form of reproduction and
-# distribution.
-#
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=dm-framework
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/dm-framework.git
-PKG_SOURCE_VERSION:=e9978675399c5fdc7233645a9192443e41c41904
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-# Build directories for each component
-DATAMODELS_BUILD_DIR:=$(PKG_BUILD_DIR)/datamodels-build
-DMAPI_BUILD_DIR:=$(PKG_BUILD_DIR)/dm-api-build
-DMAGENT_BUILD_DIR:=$(PKG_BUILD_DIR)/dm-agent-build
-
-include $(INCLUDE_DIR)/package.mk
--include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
-
-#
-# Datamodels Package Definition
-#
-define Package/datamodels
-  SECTION:=utils
-  CATEGORY:=Genexis
-  TITLE:=dm-framework Datamodel
-  URL:=http://www.genexis.eu
-  PKG_LICENSE:=GENEXIS
-  PKG_LICENSE_URL:=
-endef
-
-define Package/datamodels/description
- This package contains dm-framework datamodel.
-endef
-
-#
-# DM-API Package Definition
-#
-define Package/dm-api
-  CATEGORY:=Genexis
-  TITLE:=dm-api
-  PKG_BUILD_DEPENDS:=datamodels
-  DEPENDS:=+libsqlite3 \
-        +libjson-c +libstdcpp +quickjs \
-        +libubus +libubox +libuci
-  URL:=http://www.genexis.eu
-  PKG_LICENSE:=GENEXIS
-  PKG_LICENSE_URL:=
-endef
-
-define Package/dm-api/description
- This package contains api for the dm-framework
-endef
-
-#
-# DM-Agent Package Definition
-#
-define Package/dm-agent
-  DEPENDS:=+dm-api +datamodels +libubox +libubus +ubus
-  CATEGORY:=Genexis
-  TITLE:=dm-framework agent
-  URL:=http://www.genexis.eu
-  PKG_LICENSE:=GENEXIS
-  PKG_LICENSE_URL:=
-endef
-
-define Package/dm-agent/description
- This package contains dm-framework agent.
-endef
-
-#
-# Build Preparation
-#
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	
-	# Prepare datamodels
-	mkdir -p $(DATAMODELS_BUILD_DIR)
-	$(CP) -rf $(PKG_BUILD_DIR)/datamodels/* $(DATAMODELS_BUILD_DIR)/
-	# Copy scripts from top-level scripts directory
-	mkdir -p $(DATAMODELS_BUILD_DIR)/scripts
-	$(CP) -rf $(PKG_BUILD_DIR)/scripts/* $(DATAMODELS_BUILD_DIR)/scripts/
-	cd $(DATAMODELS_BUILD_DIR); \
-	  npm install better-sqlite3 quickjs && \
-	  node ./scripts/json2code.js && \
-	  node ./scripts/qjs-handlers-validate.js
-
-	# Prepare dm-api
-	mkdir -p $(DMAPI_BUILD_DIR)
-	$(CP) -rf $(PKG_BUILD_DIR)/dm-api/* $(DMAPI_BUILD_DIR)/
-
-	# Prepare dm-agent
-	mkdir -p $(DMAGENT_BUILD_DIR)
-	$(CP) -rf $(PKG_BUILD_DIR)/dm-agent/* $(DMAGENT_BUILD_DIR)/
-endef
-
-TARGET_CFLAGS += $(FPIC)
-
-#
-# Build Compilation
-#
-define Build/Compile
-	# Build datamodels first (dependency for others)
-	$(MAKE) -C $(DATAMODELS_BUILD_DIR)\
-		PROJECT_ROOT="$(DATAMODELS_BUILD_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(DATAMODELS_BUILD_DIR)" \
-		all
-
-	# Build dm-api (depends on datamodels)
-	$(MAKE) -C $(DMAPI_BUILD_DIR)\
-		PROJECT_ROOT="$(DMAPI_BUILD_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(DMAPI_BUILD_DIR)" \
-		all
-
-	# Build dm-agent (depends on both)
-	$(MAKE) -C $(DMAGENT_BUILD_DIR)\
-		PROJECT_ROOT="$(DMAGENT_BUILD_DIR)" \
-		CROSS_COMPILE="$(TARGET_CROSS)" \
-		ARCH="$(LINUX_KARCH)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS) -I$(DMAGENT_BUILD_DIR)" \
-		all
-endef
-
-#
-# Development Installation (headers and libraries)
-#
-define Build/InstallDev
-	# Datamodels development files
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(DATAMODELS_BUILD_DIR)/dm.h $(1)/usr/include/
-	$(CP) $(DATAMODELS_BUILD_DIR)/libdm.so $(1)/usr/lib/
-
-	# DM-API development files - headers are now in dm-api/include/
-	$(CP) $(DMAPI_BUILD_DIR)/include/dm_types.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/include/dm_node.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/core/dm_api.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/core/dm_linker.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/core/dbmgr.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/include/dm_log.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/utils/dm_list.h $(1)/usr/include/
-	$(CP) $(DMAPI_BUILD_DIR)/libdmapi.so $(1)/usr/lib/
-endef
-
-#
-# Package Installation - Datamodels
-#
-define Package/datamodels/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/usr/lib/dmf_handlers
-	$(INSTALL_BIN) $(DATAMODELS_BUILD_DIR)/default.db $(1)/etc/bbfdm/default_dm.db
-	$(INSTALL_BIN) $(DATAMODELS_BUILD_DIR)/libdm.so $(1)/usr/lib/
-	# Copy handler files from datamodels directory (new structure)
-	# Copy .js files from root datamodels directory
-	( cd $(DATAMODELS_BUILD_DIR); \
-	  find . -maxdepth 1 -type f -name '*.js' -not -path './.*' -exec $(INSTALL_BIN) {} $(1)/usr/lib/dmf_handlers/{} \; )
-	# Copy .js files from subdirectories, preserving folder structure (skip hidden files/folders)
-	( cd $(DATAMODELS_BUILD_DIR); \
-	  find . -type d -mindepth 1 -not -path './.*' -not -path './scripts*' -exec $(INSTALL_DIR) $(1)/usr/lib/dmf_handlers/{} \; ; \
-	  find . -type f -name '*.js' -mindepth 2 -not -path './.*' -not -path './scripts*' -exec $(INSTALL_BIN) {} $(1)/usr/lib/dmf_handlers/{} \; )
-endef
-
-#
-# Package Installation - DM-API
-#
-define Package/dm-api/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/sbin/
-	$(INSTALL_BIN) $(DMAPI_BUILD_DIR)/libdmapi.so $(1)/usr/lib/
-endef
-
-#
-# Package Installation - DM-Agent
-#
-define Package/dm-agent/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_BIN) ./files/etc/init.d/bridging $(1)/etc/init.d/
-	$(INSTALL_DATA) ./files/etc/config/bridging $(1)/etc/config/
-	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) dm-agent
-	$(INSTALL_BIN) $(DMAGENT_BUILD_DIR)/dm-agent $(1)/usr/sbin
-endef
-
-# Register all three packages
-$(eval $(call BuildPackage,datamodels))
-$(eval $(call BuildPackage,dm-api))
-$(eval $(call BuildPackage,dm-agent))

dslmngr/files/airoha/sbin/xdsl_wan

@@ -60,7 +60,7 @@ create_atm_devices() {
 }
 
 configure_line() {
-	local mode profile bitswap sra us0 sesdrop sos ginp mod prof
+	local mode profile bitswap sra us0 sesdrop sos roc ginp gvector mod prof
 	local adsl1_flag=0 issue2_flag=0 Glite_flag=0 adsl2_flag=0 adsl2p_flag=0 vdsl2_flag=0
 	local pro_8a_flag=0 pro_8b_flag=0 pro_8c_flag=0 pro_8d_flag=0 pro_12a_flag=0 pro_12b_flag=0 pro_17a_flag=0 pro_30a_flag=0 pro_35b_flag=0
 
@@ -70,8 +70,9 @@ configure_line() {
 	config_get sra $1 sra "1"
 	config_get us0 $1 us0 "1"
 	config_get sos $1 sos "0"
-	config_get sos $1 roc "0"
-	config_get sos $1 ginp "0"
+	config_get roc $1 roc "0"
+	config_get ginp $1 ginp "1"
+	config_get gvector $1 gvector "1"
 
 	for mod in $mode; do
 		[ "$mod" = "gdmt" ] && adsl1_flag=1
@@ -96,6 +97,7 @@ configure_line() {
 
 	/userfs/bin/blapi_cmd xdsl set_adsl_profile "$pro_8a_flag" "$pro_8b_flag" "$pro_8c_flag" "$pro_8d_flag" "$pro_12a_flag" "$pro_12b_flag" "$pro_17a_flag" "$pro_30a_flag" "$pro_35b_flag"
 	/userfs/bin/blapi_cmd xdsl set_adsl_mode "$adsl1_flag" "$issue2_flag" "$Glite_flag" "$adsl2_flag" "$adsl2p_flag" "$vdsl2_flag"
+	/userfs/bin/blapi_cmd xdsl set_adsl_gvector "$((!gvector))"
 	/userfs/bin/blapi_cmd xdsl set_adsl_ginp "$((!ginp))"
 	/userfs/bin/blapi_cmd xdsl set_adsl_sos_roc "$((!sos))" "$((!roc))"
 	/userfs/bin/blapi_cmd xdsl set_adsl_us0 "$((!us0))"

ethmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=3.0.8
+PKG_VERSION:=3.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
-PKG_SOURCE_VERSION:=c73e5b15718ca40b2740bbe6151dfbb2bcca16df
+PKG_SOURCE_VERSION:=da6b25430123f03a74b59369b36dc4a777207d3f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

fluent-bit/patches/0002-add_hostname_to_log_dump.patch

@@ -1,45 +0,0 @@
-diff --git a/plugins/out_file/file.c b/plugins/out_file/file.c
-index 2e47c9666..95d28e438 100644
---- a/plugins/out_file/file.c
-+++ b/plugins/out_file/file.c
-@@ -27,6 +27,7 @@
- #include <msgpack.h>
- 
- #include <stdio.h>
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <fcntl.h>
-@@ -55,6 +56,7 @@ struct flb_file_conf {
-     int csv_column_names;
-     int mkdir;
-     struct flb_output_instance *ins;
-+    char hostname[256];
- };
- 
- static char *check_delimiter(const char *str)
-@@ -141,6 +143,9 @@ static int cb_file_init(struct flb_output_instance *ins,
-         }
-     }
- 
-+    if (gethostname(ctx->hostname, sizeof(ctx->hostname)) != 0)
-+	    snprintf(ctx->hostname, sizeof(ctx->hostname), "%s", "localhost");
-+
-     tmp = flb_output_get_property("delimiter", ins);
-     ret_str = check_delimiter(tmp);
-     if (ret_str != NULL) {
-@@ -233,12 +238,8 @@ static int template_output_write(struct flb_file_conf *ctx,
-     int i;
-     msgpack_object_kv *kv;
- 
--    /*
--     * Right now we treat "{time}" specially and fill the placeholder
--     * with the metadata timestamp (formatted as float).
--     */
--    if (!strncmp(key, "time", size)) {
--        fprintf(fp, "%f", flb_time_to_double(tm));
-+    if (!strncmp(key, "hostname", size)) {
-+        fprintf(fp, "%s", ctx->hostname);
-         return 0;
-     }
- 

fluent-bit/patches/0002-file_out_time.patch

@@ -0,0 +1,27 @@
+diff --git a/plugins/out_file/file.c b/plugins/out_file/file.c
+index 77baf6be8..04c519d5a 100644
+--- a/plugins/out_file/file.c
++++ b/plugins/out_file/file.c
+@@ -238,10 +238,20 @@ static int template_output_write(struct flb_file_conf *ctx,
+ 
+     /*
+      * Right now we treat "{time}" specially and fill the placeholder
+-     * with the metadata timestamp (formatted as float).
++     * with the metadata timestamp.
+      */
+     if (!strncmp(key, "time", size)) {
+-        fprintf(fp, "%f", flb_time_to_double(tm));
++        struct tm tm_local;
++        char buf[32];
++        if (localtime_r(&tm->tm.tv_sec, &tm_local) == NULL) {
++            flb_plg_error(ctx->ins, "localtime_r failed");
++            return -1;
++        }
++        if (strftime(buf, sizeof(buf), "%b %d %H:%M:%S", &tm_local) == 0) {
++            flb_plg_error(ctx->ins, "strftime failed");
++            return -1;
++        }
++        fputs(buf, fp);
+         return 0;
+     }
+ 

fluent-bit/patches/0005-kmsg_log.patch

@@ -1,32 +0,0 @@
-diff --git a/plugins/in_kmsg/in_kmsg.c b/plugins/in_kmsg/in_kmsg.c
-index cd5c4cd17..9524cf194 100644
---- a/plugins/in_kmsg/in_kmsg.c
-+++ b/plugins/in_kmsg/in_kmsg.c
-@@ -165,6 +165,15 @@ static inline int process_line(const char *line,
- 
-     flb_time_set(&ts, ctx->boot_time.tv_sec + tv.tv_sec, tv.tv_usec * 1000);
- 
-+    /* Format syslog timestamp: "Jul 03 10:31:53" */
-+    time_t real_time = ctx->boot_time.tv_sec + tv.tv_sec;
-+    struct tm tm_info;
-+    char syslog_ts[32];
-+
-+    localtime_r(&real_time, &tm_info);
-+    strftime(syslog_ts, sizeof(syslog_ts), "%b %d %H:%M:%S", &tm_info);
-+    int syslog_ts_len = strlen(syslog_ts);
-+
-     /* Now process the human readable message */
-     p = strchr(p, ';');
-     if (!p) {
-@@ -198,7 +207,10 @@ static inline int process_line(const char *line,
-                 FLB_LOG_EVENT_UINT64_VALUE(tv.tv_usec),
- 
-                 FLB_LOG_EVENT_CSTRING_VALUE("msg"),
--                FLB_LOG_EVENT_STRING_VALUE((char *) p, line_len - 1));
-+                FLB_LOG_EVENT_STRING_VALUE((char *) p, line_len - 1),
-+
-+                FLB_LOG_EVENT_CSTRING_VALUE("syslog_ts"),
-+                FLB_LOG_EVENT_STRING_VALUE(syslog_ts, syslog_ts_len));
-     }
- 
-     if (ret == FLB_EVENT_ENCODER_SUCCESS) {

fluent-bit/patches/0020-fix_kmsg.patch

@@ -0,0 +1,73 @@
+diff --git a/plugins/in_kmsg/in_kmsg.c b/plugins/in_kmsg/in_kmsg.c
+index cd5c4cd17..15f105451 100644
+--- a/plugins/in_kmsg/in_kmsg.c
++++ b/plugins/in_kmsg/in_kmsg.c
+@@ -36,7 +36,6 @@
+ #include <sys/stat.h>
+ #include <sys/time.h>
+ #include <inttypes.h>
+-#include <time.h>
+ 
+ #include "in_kmsg.h"
+ 
+@@ -123,12 +122,17 @@ static inline int process_line(const char *line,
+     ctx->buffer_id++;
+ 
+     errno = 0;
+-    val = strtol(p, &end, 10);
+-    if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
++    val = strtoul(p, &end, 10);
++    if ((errno == ERANGE && val == ULONG_MAX)
+         || (errno != 0 && val == 0)) {
+         goto fail;
+     }
+ 
++    /* ensure something was consumed */
++    if (end == p) {
++        goto fail;
++    }
++
+     /* Priority */
+     priority = FLB_KLOG_PRI(val);
+ 
+@@ -144,24 +148,35 @@ static inline int process_line(const char *line,
+     }
+     p++;
+ 
+-    val = strtoul(p, &end, 10);
+-    if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
++    val = strtoull(p, &end, 10);
++    if ((errno == ERANGE && val == ULLONG_MAX)
+         || (errno != 0 && val == 0)) {
+         goto fail;
+     }
+ 
++    /* make sure strtoull consumed something */
++    /* after the sequence number, the next char must be ',' */
++    if (end == p || *end != ',') {
++        goto fail;
++    }
++
+     sequence = val;
+     p = ++end;
+ 
+     /* Timestamp */
+-    val = strtoul(p, &end, 10);
+-    if ((errno == ERANGE && (val == INT_MAX || val == INT_MIN))
++    val = strtoull(p, &end, 10);
++    if ((errno == ERANGE && val == ULLONG_MAX)
+         || (errno != 0 && val == 0)) {
+         goto fail;
+     }
+ 
++    /* ensure something was consumed */
++    if (end == p) {
++        goto fail;
++    }
++
+     tv.tv_sec  = val/1000000;
+-    tv.tv_usec = val - (tv.tv_sec * 1000000);
++    tv.tv_usec = val - ((uint64_t)tv.tv_sec * 1000000);
+ 
+     flb_time_set(&ts, ctx->boot_time.tv_sec + tv.tv_sec, tv.tv_usec * 1000);
+ 

fluent-bit/patches/0030-kmsg_pri_as_string.patch

@@ -0,0 +1,20 @@
+diff --git a/plugins/in_kmsg/in_kmsg.c b/plugins/in_kmsg/in_kmsg.c
+index cd5c4cd17..04bbe2b2e 100644
+--- a/plugins/in_kmsg/in_kmsg.c
++++ b/plugins/in_kmsg/in_kmsg.c
+@@ -182,11 +182,14 @@ static inline int process_line(const char *line,
+                 &ts);
+     }
+ 
++    char priority_str[4] = {0}; /* enough for "255" + NUL */
++    snprintf(priority_str, sizeof(priority_str), "%u", (unsigned char) priority);
++
+     if (ret == FLB_EVENT_ENCODER_SUCCESS) {
+         ret = flb_log_event_encoder_append_body_values(
+                 &ctx->log_encoder,
+                 FLB_LOG_EVENT_CSTRING_VALUE("priority"),
+-                FLB_LOG_EVENT_CHAR_VALUE(priority),
++                FLB_LOG_EVENT_STRING_VALUE(priority_str, strlen(priority_str)),
+ 
+                 FLB_LOG_EVENT_CSTRING_VALUE("sequence"),
+                 FLB_LOG_EVENT_UINT64_VALUE(sequence),

gateway-info/files/etc/udhcpc.user.d/udhcpc_gateway_info.user

@@ -40,22 +40,22 @@ get_vivsoi() {
 
 	#hex-string 2 character=1 Byte
 	# length in hex string will be twice of actual Byte length
-	[ "$len" -gt "8" ] || return
+	[ "${len}" -gt 8 ] || return
 
 	data="${opt125}"
 	rem_len="${len}"
-	while [ $rem_len -gt 0 ]; do
+	while [ "${rem_len}" -gt 0 ]; do
 		ent_id=${data:0:8}
 		ent_id=$(printf "%d\n" "0x$ent_id")
 
-		if [ $ent_id -ne  3561 ]; then
+		if [ "${ent_id}" -ne  3561 ]; then
 			len_val=${data:8:2}
 			data_len=$(printf "%d\n" "0x$len_val")
 			# add 4 byte for ent_id and 1 byte for len
 			data_len=$(( data_len * 2 + 10 ))
 			# move ahead data to next enterprise id
 			data=${data:"${data_len}":"${rem_len}"}
-			rem_len=$(( rem_len - $data_len ))
+			rem_len=$(( rem_len - data_len ))
 			continue
 		fi
 
@@ -66,7 +66,7 @@ get_vivsoi() {
 		data_len=$(( data_len * 2 + 10 ))
 
 		opt_len=$(printf "%d\n" "0x$len_val")
-		[ $opt_len -eq 0 ] && return
+		[ "${opt_len}" -eq 0 ] && return
 
 		# populate the option data of enterprise id
 		sub_data_len=$(( opt_len * 2))
@@ -74,7 +74,7 @@ get_vivsoi() {
 		sub_data=${data:10:"${sub_data_len}"}
 
 		# parsing of suboption of option 125
-		while [ $sub_data_len -gt 0 ]; do
+		while [ "${sub_data_len}" -gt 0 ]; do
 			# get the suboption id
 			sub_opt_id=${sub_data:0:2}
 			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
@@ -85,20 +85,20 @@ get_vivsoi() {
 			sub_opt_len=$(( sub_opt_len * 2 ))
 
 			# get the value of sub option starting 4 means starting after length
-			sub_opt_val=${sub_data:4:${sub_opt_len}}
+			sub_opt_val=${sub_data:4:"${sub_opt_len}"}
 
 			# assign the value found in sub option
 			case "${sub_opt_id}" in
 				"4")
-				OUI=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				OUI=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 				GW_DISCOVERED=1
 				;;
 				"5")
-				SERIAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				SERIAL=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 				GW_DISCOVERED=1
 				;;
 				"6")
-				CLASS=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				CLASS=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 				GW_DISCOVERED=1
 				;;
 			esac
@@ -110,7 +110,7 @@ get_vivsoi() {
 			sub_data_len=$((sub_data_len - sub_opt_end))
 
 			# fetch next sub option hex string
-			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+			sub_data=${sub_data:"${sub_opt_end}":"${sub_data_len}"}
 		done
 
 		# move ahead data to next enterprise id
@@ -131,15 +131,13 @@ send_host_query() {
 		sleep 5
 
 		json_load "$(ubus call umdns browse)"
-		json_select discovered_services
-		if [ "${?}" -ne 0 ]; then
+		if ! json_select discovered_services; then
 			json_cleanup
 			loop=$(( loop - 1 ))
 			continue
 		fi
 
-		json_select _usp-agt-mqtt._tcp
-		if [ "${?}" -ne 0 ]; then
+		if ! json_select _usp-agt-mqtt._tcp; then
 			json_cleanup
 			loop=$(( loop - 1 ))
 			continue
@@ -156,7 +154,7 @@ send_host_query() {
 
 	json_get_keys keys
 	for key in $keys; do
-		json_select $key
+		json_select "${key}"
 		json_get_var _host host ""
 
 		if [ -z "${_host}" ] || [[ "${sent_host}" =~ " ${_host}" ]]; then
@@ -166,9 +164,10 @@ send_host_query() {
 
 		sent_host="${sent_host} ${_host}"
 		cmd="ubus call umdns query '{\"question\":\"$_host\",\"interface\":\"$intf\"}'"
-		eval $cmd
+		sh -c "${cmd}"
 		resp=0
 		json_select ..
+		sleep 2 # umdns query sometime takes time to resolve so adding some sleep
 	done
 
 	json_cleanup
@@ -185,32 +184,29 @@ get_usp_agent_id() {
 	fi
 
 	json_load "$(ubus call umdns browse)"
-	json_select discovered_services
-	if [ "${?}" -ne 0 ]; then
+	if ! json_select discovered_services; then
 		json_cleanup
-		echo ${ID}
+		echo "${ID}"
 		return 0
 	fi
 
-	json_select _usp-agt-mqtt._tcp
-	if [ "${?}" -ne 0 ]; then
+	if ! json_select _usp-agt-mqtt._tcp; then
 		json_cleanup
-		echo ${ID}
+		echo "${ID}"
 		return 0
 	fi
 
 	json_get_keys keys
 	for key in $keys; do
-		json_select $key
-		json_select $family
-		if [ "${?}" -ne 0 ]; then
+		json_select "${key}"
+		if ! json_select "${family}"; then
 			json_select ..
 			continue
 		fi
 
 		json_get_keys ips
 		for ip in $ips; do
-			json_get_var ip_val $ip
+			json_get_var ip_val "${ip}"
 			if [ "${ip_val}" != "${dhcp_ip}" ]; then
 				continue
 			fi
@@ -219,8 +215,8 @@ get_usp_agent_id() {
 			json_select txt
 			json_get_keys txts
 			for _txt in $txts; do
-				json_get_var text_val $_txt
-				if [[ "${text_val:0:3}" == "ID=" ]]; then
+				json_get_var text_val "${_txt}"
+				if [[ "${text_val:0:3}" = "ID=" ]]; then
 					ID="${text_val:3}"
 					break
 				fi
@@ -238,16 +234,16 @@ get_usp_agent_id() {
 	done
 
 	json_cleanup
-	echo ${ID}
+	echo "${ID}"
 }
 
 get_mac_address() {
 	ip="${1}"
 	device="${2}"
 
-	mac="$(cat /proc/net/arp | grep $ip | awk '{print $4}')"
+	mac=$(grep "${ip}" /proc/net/arp | awk '{print $4}')
 	if [ -z "${mac}" ]; then
-		arp_resp="$(arping -b -f -c 5 -I $device $ip | grep 'Unicast reply from' | awk '{print $5}')"
+		arp_resp=$(arping -b -f -c 5 -I "${device}" "${ip}" | grep 'Unicast reply from' | awk '{print $5}')
 		if [ -n "${arp_resp}" ]; then
 			mac=${arp_resp:1:-1}
 		fi
@@ -260,7 +256,7 @@ send_unknown_gw_event() {
 	mac="${1}"
 
 	cmd="ubus -t 5 send gateway-info.gateway.unknown '{\"hwaddr\":\"$mac\"}'"
-	eval $cmd
+	sh -c "${cmd}"
 }
 
 send_cwmp_gw_event() {
@@ -269,14 +265,14 @@ send_cwmp_gw_event() {
 	serial="${3}"
 
 	cmd="ubus -t 5 send gateway-info.gateway.cwmp '{\"oui\":\"$oui\",\"class\":\"$class\",\"serial\":\"$serial\"}'"
-	eval $cmd
+	sh -c "${cmd}"
 }
 
 send_usp_gw_event() {
 	endpoint="${1}"
 
 	cmd="ubus -t 5 send gateway-info.gateway.usp '{\"endpoint\":\"$endpoint\"}'"
-	eval $cmd
+	sh -c "${cmd}"
 }
 
 config_load gateway
@@ -287,13 +283,13 @@ if [ "${enable}" -eq 0 ]; then
 	return 0
 fi
 
-if [ "${wan_intf}" == "${INTERFACE}" ]; then
-	if [ "${1}" == "deconfig" ]; then
+if [ "${wan_intf}" = "${INTERFACE}" ]; then
+	if [ "${1}" = "deconfig" ]; then
 		rm -rf /var/state/gwinfo
 		return 0
 	fi
 
-	json_load "$(ifstatus ${INTERFACE})"
+	json_load "$(ifstatus "${INTERFACE}")"
 	json_get_var dev_name device ""
 	json_select data
 	json_get_var dhcp_ip dhcpserver ""
@@ -303,7 +299,7 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 		return 0
 	fi
 
-	MAC="$(get_mac_address $dhcp_ip $dev_name)"
+	MAC=$(get_mac_address "${dhcp_ip}" "${dev_name}")
 
 	mkdir -p /var/state
 	touch /var/state/gwinfo
@@ -326,8 +322,8 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 		return 0
 	fi
 
-	len=$(printf "$opt125"|wc -c)
-	get_vivsoi "$opt125" "$len"
+	len=$(echo -n "${opt125}" | wc -c)
+	get_vivsoi "${opt125}" "${len}"
 
 	if [ "${GW_DISCOVERED}" -eq 0 ]; then
 		send_unknown_gw_event "${MAC}"
@@ -341,19 +337,18 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 	uci -q -c /var/state commit gwinfo
 
 	# Check for USP parameters
-	ubus -t 15 wait_for umdns
-	if [ "${?}" -ne 0 ]; then
+	if ! ubus -t 15 wait_for umdns; then
 		send_cwmp_gw_event "${OUI}" "${CLASS}" "${SERIAL}"
 		return 0
 	fi
 
-	resp=$(send_host_query $dev_name)
+	resp=$(send_host_query "${dev_name}")
 	if [ "${resp}" -ne 0 ]; then
 		send_cwmp_gw_event "${OUI}" "${CLASS}" "${SERIAL}"
 		return 0
 	fi
 
-	ID="$(get_usp_agent_id $dhcp_ip)"
+	ID=$(get_usp_agent_id "${dhcp_ip}")
 	if [ -z "${ID}" ]; then
 		send_cwmp_gw_event "${OUI}" "${CLASS}" "${SERIAL}"
 		return 0

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.9.10
+PKG_VERSION:=9.10.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=1a842e0a3836f616973e6a92f0b0b6ca82ec39bb
+PKG_SOURCE_VERSION:=b4db243c1d057d0242a4badae53e9c57e442d27a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

icwmp/files/etc/config/cwmp

@@ -28,9 +28,9 @@ config cpe 'cpe'
 	option log_severity 'WARNING'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
+	option bind_retries '5'
 	option userid '' #$OUI-$SER
 	option passwd ''
-	option port '7547'
 	option provisioning_code ''
 	option amd_version '5'
 	# compression possible configs: InstanceNumber, InstanceAlias

icwmp/files/etc/icwmpd/firewall.cwmp

@@ -133,9 +133,56 @@ add_firewall_rule() {
 	fi
 }
 
+remove_port_protection() {
+	local enabled chain rule rule_num
+
+	config_get enabled "${1}" "${2}"
+
+	if [ "${enabled}" -eq 1 ]; then
+		config_get zonename "$1" name
+		[ -n "$zonename" ] || return 0
+
+		chain='prerouting_'$zonename'_rule'
+
+		while rule=$(iptables -w -t nat -nL "$chain" --line-numbers | grep -m 1 -w CWMP_Port_protection); do
+			rule_num=${rule%%[$' \t']*}
+			iptables -w -t nat -D "$chain" "$rule_num"
+		done
+	fi
+}
+
+cleanup_port_protection() {
+	config_load firewall
+	config_foreach remove_port_protection zone masq
+}
+
+install_port_protection() {
+	local PORT="${3}"
+	local enabled zonename chain
+
+	config_get enabled "${1}" "${2}"
+
+	if [ "${enabled}" -eq 1 ]; then
+		config_get zonename "${1}" name
+		[ -n "$zonename" ] || return 0
+
+		chain='prerouting_'$zonename'_rule'
+
+		iptables -w -t nat -I "$chain" -p tcp --dport "$PORT" -j ACCEPT -m comment --comment=CWMP_Port_protection
+		iptables -w -t nat -I "$chain" -p udp --dport "$PORT" -j ACCEPT -m comment --comment=CWMP_Port_protection
+	fi
+}
+
+add_port_protection() {
+	config_load firewall
+	config_foreach install_port_protection zone masq "${1}"
+}
+
 configure_connection_req_rules() {
 	app="${1}"
 
+	cleanup_port_protection
+
 	wan="$(uci -q get cwmp.cpe.default_wan_interface)"
 	wan="${wan:-wan}"
 
@@ -175,8 +222,11 @@ configure_connection_req_rules() {
 		fi
 	fi
 
-	port=$(uci -q get cwmp.cpe.port)
-	port="${port:-7547}"
+	port=$(uci -q -c /var/state get icwmp.cpe.port)
+	if [ -z "${port}" ]; then
+		log "cwmp cpe port not configured"
+		exit 0
+	fi
 
 	ipaddr=$(uci -q get cwmp.cpe.allowed_cr_ip)
 	if [ -n "${ipaddr}" ]; then
@@ -197,6 +247,8 @@ configure_connection_req_rules() {
 		# Close the ACS port at Lan side
 		close_downstream_acs_port "${lan}" "${port}"
 	fi
+
+	add_port_protection "${port}"
 }
 
 load_zone_names

icwmp/files/etc/uci-defaults/90-cwmpfirewall

@@ -5,7 +5,6 @@ uci -q batch <<-EOT
         set firewall.cwmp=include
         set firewall.cwmp.path=/etc/icwmpd/firewall.cwmp
         set firewall.cwmp.reload=1
-        commit firewall
 EOT
 
 exit 0

icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user

@@ -16,12 +16,12 @@ get_opt43() {
 	local opt43="$1"
 	local len="$2"
 
-	[ "$len" -gt "2" ] || return
+	[ "${len}" -gt 2 ] || return
 
 	first_byte=${opt43:0:2}
 	first_byte=$(printf "%d\n" "0x$first_byte")
 
-	if [ $len -ge 4 ] && [ $first_byte -ge 1 ] && [ $first_byte -le 4 ]; then
+	if [ "${len}" -ge 4 ] && [ "${first_byte}" -ge 1 ] && [ "${first_byte}" -le 4 ]; then
 		# it is in encapsulated form
 		# opt43 encapsulated vendor-specific option has data in below format
 		#  Code   Len   Data item        Code   Len   Data item        Code
@@ -35,7 +35,7 @@ get_opt43() {
 		data="${opt43}"
 		rem_len="${len}"
 		# parsing of suboption of option 43
-		while [ $rem_len -gt 0 ]; do
+		while [ "${rem_len}" -gt 0 ]; do
 			# get the suboption id
 			sub_opt_id=${data:0:2}
 			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
@@ -50,13 +50,13 @@ get_opt43() {
 
 			# assign the value found in sub option
 			case "${sub_opt_id}" in
-				"1") DHCP_ACS_URL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				"1") DHCP_ACS_URL=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 				;;
-				"2") DHCP_PROV_CODE=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				"2") DHCP_PROV_CODE=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 				;;
-				"3") MIN_WAIT_INVL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				"3") MIN_WAIT_INVL=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 				;;
-				"4") INVL_MULTIPLIER=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				"4") INVL_MULTIPLIER=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 				;;
 			esac
 
@@ -70,7 +70,7 @@ get_opt43() {
 			rem_len=$((rem_len - sub_opt_end))
 		done
 	else
-		DHCP_ACS_URL=$(echo -n $opt43 | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+		DHCP_ACS_URL=$(echo -n "${opt43}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 	fi
 }
 
@@ -92,9 +92,9 @@ if [ "$discovery_enable" = "0" ]; then
 	return 0
 fi
 
-if [ "${wan_intf}" == "${INTERFACE}" ]; then
+if [ "${wan_intf}" = "${INTERFACE}" ]; then
 	if [ -n "$opt43" ]; then
-		len=$(printf "$opt43"|wc -c)
+		len=$(echo -n "$opt43"|wc -c)
 		get_opt43 "$opt43" "$len"
 	fi
 

ieee1905/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.7.33
+PKG_VERSION:=8.7.34
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cb5b8f76c854b89607cd1750d3a4052ecd71ac9d
+PKG_SOURCE_VERSION:=81c99af824bd5bd217213e4e731798a6469157b8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iopsys-analytics/Makefile

@@ -33,6 +33,7 @@ define Package/$(PKG_NAME)
   DEPENDS+=                                             \
     +@PACKAGE_syslog-ng:SYSLOGNG_LOGROTATE              \
     +PACKAGE_fluent-bit:logrotate                       \
+    +@DMCLI_REMOTE_CONNECTION
 
 endef
 

libdsl/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdsl
-PKG_VERSION:=7.3.0
+PKG_VERSION:=7.3.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libdsl.git
-PKG_SOURCE_VERSION:=2a7a49fac35c3d8078ffe051594c0425d355cacd
+PKG_SOURCE_VERSION:=1aa9c40f9503311652e562617b1e15533257adcc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

libeasy/Makefile

@@ -1,32 +1,28 @@
 #
-# Copyright (C) 2020-2023 Iopsys
+# Copyright (C) 2025 Genexis Sweden AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libeasy
-PKG_VERSION:=7.4.6
+PKG_VERSION:=7.5.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ca7b20068c9d373e41045a2e899a9c697576262c
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libeasy.git
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_SOURCE_VERSION:=18f93677bb4d33ebb6249324a5043294f0eae16c
+PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/libeasy.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=LGPL-2.1-only
-PKG_LICENSE_FILES:=LICENSE
+PKG_LICENSE_FILES:=
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@genexis.eu>
 
 include $(INCLUDE_DIR)/package.mk
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/openssl \
-	-I$(STAGING_DIR)/usr/include/libnl3
+include $(INCLUDE_DIR)/cmake.mk
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -34,9 +30,6 @@ define Build/Prepare
 endef
 endif
 
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall"
-
 define Package/libeasy
   SECTION:=libs
   CATEGORY:=Libraries
@@ -47,7 +40,7 @@ define Package/libeasy
 endef
 
 define Package/libeasy/description
-  Library provides common utility functions
+  This package provides libeasy.so for common utility functions.
 endef
 
 define Build/InstallDev/libeasy
@@ -67,6 +60,7 @@ define Build/InstallDev/libeasy
 endef
 
 define Build/InstallDev
+	$(call Build/InstallDev/cmake,$(1))
 	$(call Build/InstallDev/libeasy,$(1),$(2))
 endef
 

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.13.7
+PKG_VERSION:=7.14.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=65a7cd643c07e3f0a11d5b20225d4d87b8646513
+PKG_SOURCE_VERSION:=b4b8f524a93d03fd1f89d4c32b8eaca90d9ccc1a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -22,6 +22,7 @@ PKG_LICENSE:=LGPL-2.1-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
@@ -42,10 +43,14 @@ else ifeq ($(CONFIG_TARGET_armvirt),y)
 else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_PLATFORM=ECONET
   TARGET_WIFI_TYPE=MEDIATEK
-  TARGET_CFLAGS +=-DIOPSYS_ECONET
+  TARGET_CFLAGS +=-DIOPSYS_ECONET -I$(LINUX_DIR)/include/uapi/linux/mtk_nl80211_inc
   ifeq ($(CONFIG_TARGET_airoha_an7581),y)
     TARGET_CFLAGS +=-DCONFIG_MTK
   endif
+else ifeq ($(CONFIG_TARGET_mediatek),y)
+  TARGET_PLATFORM=MEDIATEK
+  TARGET_WIFI_TYPE=MEDIATEK
+  TARGET_CFLAGS +=-DCONFIG_MTK -I$(LINUX_DIR)/include/uapi/linux/mtk_nl80211_inc
 else ifeq ($(CONFIG_TARGET_ipq95xx),y)
   TARGET_PLATFORM=IPQ95XX
   TARGET_WIFI_TYPE=QUALCOMM

linux-pam/Makefile

@@ -31,8 +31,8 @@ MESON_ARGS += \
 
 define Package/linux-pam/install
 	$(INSTALL_DIR) $(1)/usr/lib/security
-	$(INSTALL_DIR) $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/pam_faillock.uci_default $(1)/etc/uci-defaults/99-add_pam_faillock
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./linux_pam.init $(1)/etc/init.d/linux_pam
 endef
 
 $(eval $(call BuildPackage,linux-pam))

linux-pam/files/pam_faillock.uci_default

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-create_faillock_files()
-{
-	# also create files needed by pam_faillock
-	touch /var/log/faillock
-	chmod 700 /var/log/faillock
-	touch /var/log/btmp
-	chmod 700 /var/log/btmp
-}
-
-update_pam_common_auth()
-{
-	local file="/etc/pam.d/common-auth"
-	local deny=6
-	local unlock_time=300
-
-	# update pam_unix.so line
-	sed -i -E 's|^.*pam_unix\.so.*|auth\t sufficient\tpam_unix.so nullok_secure|' "$file"
-
-	# Insert pam_faillock lines before and after pam_unix.so
-	sed -i -E "/pam_unix.so nullok_secure/i auth     required       pam_faillock.so preauth deny=$deny even_deny_root unlock_time=$unlock_time" "$file"
-	sed -i -E "/pam_unix.so nullok_secure/a auth     [default=die]  pam_faillock.so authfail audit deny=$deny even_deny_root unlock_time=$unlock_time" "$file"
-}
-
-update_pam_common_account()
-{
-	# update account file
-	sed -i "/pam_unix.so/ i account  required       pam_faillock.so" /etc/pam.d/common-account
-}
-
-if [ -f "/usr/lib/security/pam_faillock.so" ]; then
-	update_pam_common_auth
-	update_pam_common_account
-	create_faillock_files
-fi
-
-if [ -f /etc/config/sshd ]; then
-	uci -q set sshd.@sshd[0].UsePAM=1
-	uci commit sshd
-fi
-
-exit 0

linux-pam/linux_pam.init

@@ -0,0 +1,18 @@
+#!/bin/sh /etc/rc.common
+
+START=11
+STOP=90
+USE_PROCD=1
+
+create_faillock_files()
+{
+	# also create files needed by pam_faillock
+	touch /var/log/faillock
+	chmod 700 /var/log/faillock
+	touch /var/log/btmp
+	chmod 700 /var/log/btmp
+}
+
+boot() {
+	create_faillock_files
+}

logmngr/Config.in

@@ -1,4 +1,5 @@
 if PACKAGE_logmngr
+
 choice
 	prompt "Select backend for syslog management"
 	default LOGMNGR_BACKEND_FLUENTBIT
@@ -31,4 +32,5 @@ config LOGMNGR_VENDOR_LOG_FILE
 	default y
 	help
 		It adds support for Device.DeviceInfo.VendorLogFile. Object.
+
 endif

logmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=logmngr
-PKG_VERSION:=1.0.17
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
-PKG_SOURCE_VERSION:=ad2636c642d56967e78c0c84bf82cb0e2b6311f2
+PKG_SOURCE_VERSION:=ad043d5d2e96c1b203a9c5b22ad6e6e1488ad8f2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -52,29 +52,35 @@ endif
 
 define Package/logmngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/logmngr.init $(1)/etc/init.d/logmngr
-
+	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/10-logmngr_config_generate $(1)/etc/uci-defaults/
 
+	$(INSTALL_BIN) ./files/etc/init.d/logmngr $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/config/logmngr $(1)/etc/config/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/10-logmngr_config_migrate $(1)/etc/uci-defaults/
+
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1) core 10
+
+	# Install logmngr service backend
 	$(INSTALL_DIR) $(1)/lib/logmngr
 ifeq ($(CONFIG_LOGMNGR_BACKEND_FLUENTBIT),y)
-	$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) ./files/logread $(1)/sbin/
-endif
-ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
+	$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/
+else ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
 	$(INSTALL_DATA) ./files/lib/logmngr/syslog-ng.sh $(1)/lib/logmngr/
 endif
-	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfsyslog.so $(1) core 10
+
 ifeq ($(CONFIG_LOGMNGR_LOGROTATE),y)
-	$(INSTALL_BIN) ./files/11-logmngr_logrotate_config_generate $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/logmngr/logrotate.sh $(1)/lib/logmngr/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/11-logmngr_logrotate_syslog $(1)/etc/uci-defaults/
 	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbflogrotate.so $(1) sysmngr 11
 endif
+
 ifeq ($(CONFIG_LOGMNGR_VENDOR_LOG_FILE),y)
 	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/bbf_plugin/libbbfvendorlog.so $(1) sysmngr 12
 endif
+
 endef
 
 $(eval $(call BuildPackage,logmngr))

logmngr/files/10-logmngr_config_generate

@@ -1,26 +0,0 @@
-#!/bin/sh
-
-if uci -q get logmngr.@globals[0] >/dev/null; then
-	# return if there is any valid content
-	exit 0
-else
-	rm -f /etc/config/logmngr
-fi
-
-touch /etc/config/logmngr
-
-uci set logmngr.globals=globals
-uci set logmngr.globals.enable=1
-
-uci set logmngr.a1=action
-uci set logmngr.a1.name="ac1"
-
-uci set logmngr.lf1=log_file
-uci set logmngr.lf1.enable=1
-uci set logmngr.lf1.action="ac1"
-uci set logmngr.lf1.file="/var/log/messages"
-
-uci set logmngr.lr1=log_remote
-uci set logmngr.lr1.enable=0
-uci set logmngr.lr1.action="ac1"
-uci set logmngr.lr1.port="514"

logmngr/files/etc/config/logmngr

@@ -0,0 +1,26 @@
+config globals 'globals'
+	option enable '1'
+
+config source 'default_source'
+	option name 'default_source'
+	option system_messages '1'
+	option kernel_messages '1'
+
+config template 'default_template'
+	option name 'default_template'
+	option expression '{time} {hostname} {ident}: {message}'
+
+config action 'default_action'
+	option name 'default_action'
+	list source 'default_source'
+	option template 'default_template'
+
+config log_file 'lf1'
+	option enable '1'
+	option action 'default_action'
+	option file '/var/log/messages'
+
+config log_remote 'lr1'
+	option enable '0'
+	option action 'default_action'
+	option port '514'

logmngr/files/etc/uci-defaults/10-logmngr_config_migrate

@@ -0,0 +1,36 @@
+#!/bin/sh
+
+# check if this is a new type UCI or old type UCI
+if ! uci -q get logmngr.default_source > /dev/null; then
+	uci -q set logmngr.default_source=source
+	uci -q set logmngr.default_source.name='default_source'
+	uci -q set logmngr.default_source.system_messages='1'
+	uci -q set logmngr.default_source.kernel_messages='1'
+fi
+
+if ! uci -q get logmngr.default_template > /dev/null; then
+	uci -q set logmngr.default_template=template
+	uci -q set logmngr.default_template.name='default_template'
+	uci -q set logmngr.default_template.expression='{time} {hostname} {ident}: {message}'
+fi
+
+if uci -q get logmngr.a1 >/dev/null; then
+	uci -q rename logmngr.a1='default_action'
+	uci -q set logmngr.default_action.name='default_action'
+	uci -q set logmngr.default_action.template='default_template'
+
+	uci -q delete logmngr.default_action.source
+	uci -q add_list logmngr.default_action.source='default_source'
+fi
+
+if uci -q get logmngr.lf1 >/dev/null; then
+	uci -q rename logmngr.lf1='default_logfile'
+	uci -q set logmngr.default_logfile.action='default_action'
+fi
+
+if uci -q get logmngr.lr1 >/dev/null; then
+	uci -q rename logmngr.lr1='default_logremote'
+	uci -q set logmngr.default_logremote.action='default_action'
+fi
+
+exit 0

logmngr/files/etc/uci-defaults/11-logmngr_logrotate_syslog

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Adds a default log rotate policy if none exists
-if uci -q get logmngr.@log_rotate[0] >/dev/null; then
+if uci -q get logmngr.lro1 >/dev/null; then
 	# return if there is any valid content
 	exit 0
 fi

logmngr/files/lib/logmngr/fluent-bit.sh

@@ -6,6 +6,37 @@
 CONF_FILE=/etc/fluent-bit/fluent-bit.conf
 TMP_CONF_FILE=/tmp/fluent-bit/fluent-bit.conf
 FLUENT_BIT_CONF_DIR=/etc/fluent-bit/conf.d
+PROCESSED_SYSLOG_TAGS=""
+PROCESSED_KMSG_TAGS=""
+
+# check if syslog source section is already processed
+# and add it to the list of processed source sections
+syslog_tag_already_processed() {
+	local tag="$1"
+
+	for t in $PROCESSED_SYSLOG_TAGS; do
+		[ "$t" = "$tag" ] && return 0
+	done
+
+	PROCESSED_SYSLOG_TAGS="$tag $PROCESSED_SYSLOG_TAGS"
+
+	return 1
+}
+
+# check if kmsg source section is already processed
+# and add it to the list of processed source sections
+# two separate functions used because we want to populate
+# appropriate PROCESSED variable
+kmsg_tag_already_processed() {
+	local tag="$1"
+	for t in $PROCESSED_KMSG_TAGS; do
+		[ "$t" = "$tag" ] && return 0
+	done
+
+	PROCESSED_KMSG_TAGS="$tag $PROCESSED_KMSG_TAGS"
+
+	return 1
+}
 
 append_conf() {
 	echo "$*" >> ${TMP_CONF_FILE}
@@ -20,49 +51,71 @@ create_config_file() {
 	# also, if no file is found then fluent-bit aborts
 	# so only add include if any file is present in the FLUENT_BIT_CONF_DIR
 	if [ -d "$FLUENT_BIT_CONF_DIR" ] && [ "$(ls -A "$FLUENT_BIT_CONF_DIR")" ]; then
-		echo "@INCLUDE ${FLUENT_BIT_CONF_DIR}/*" >> ${TMP_CONF_FILE}
+		append_conf "@INCLUDE ${FLUENT_BIT_CONF_DIR}/*"
 	fi
-	echo "" >> ${TMP_CONF_FILE}
+	append_conf ""
 }
 
 create_service_section() {
 	# the service section of the fluent-bit.conf file has hardcoded values,
 	# no need to lookup any uci section to configure this section
-	echo "[SERVICE]" >> ${TMP_CONF_FILE}
-	echo "    flush        1" >> ${TMP_CONF_FILE}
-	echo "    daemon       off" >> ${TMP_CONF_FILE}
-	echo "    log_level    info" >> ${TMP_CONF_FILE}
-	echo "    coro_stack_size    24576" >> ${TMP_CONF_FILE}
-	echo "    parsers_file /etc/fluent-bit/parsers.conf" >> ${TMP_CONF_FILE}
-	echo "    hot_reload        on" >> ${TMP_CONF_FILE}
-	echo "" >> ${TMP_CONF_FILE}
+	append_conf "[SERVICE]"
+	append_conf "    flush        1"
+	append_conf "    daemon       off"
+	append_conf "    log_level    info"
+	append_conf "    coro_stack_size    24576"
+	append_conf "    parsers_file /etc/fluent-bit/parsers.conf"
+	append_conf "    hot_reload        on"
+	append_conf ""
+}
 
-	# Generate default input for kmsg
-	echo "[INPUT]" >> ${TMP_CONF_FILE}
-	echo "    name       kmsg" >> ${TMP_CONF_FILE}
-	echo "    Tag        KMSG"  >> ${TMP_CONF_FILE}
-	echo "" >> ${TMP_CONF_FILE}
+create_default_filters() {
+	append_conf "[FILTER]"
+	append_conf "    name            modify"
+	append_conf "    match           KM*"
+	append_conf "    add             ident   kernel"
+	append_conf "    rename          msg     message"
+	append_conf ""
 
-	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
-	echo "    name         file" >> ${TMP_CONF_FILE}
-	echo "    match        KMSG" >> ${TMP_CONF_FILE}
-	echo "    file         /var/log/messages" >> ${TMP_CONF_FILE}
-	echo "    format       template" >> ${TMP_CONF_FILE}
-	echo "    template     {syslog_ts} {hostname} kernel: {msg}" >> ${TMP_CONF_FILE}
-	echo "" >> ${TMP_CONF_FILE}
+	append_conf "[FILTER]"
+	append_conf "    name            sysinfo"
+	append_conf "    match           *"
+	append_conf "    hostname_key    hostname"
+	append_conf ""
 }
 
 create_input_section() {
 	local tag="$1"
 
+	[ -z "$tag" ] && return
+
+	# check if this source section has already been processed
+	syslog_tag_already_processed "$tag" && return
+
 	# the input in our case is always syslog, hence, this section of the
 	# fluent-bit.conf file has hardcoded values as well that do not depend
 	# on any uci value
-	echo "[INPUT]" >> ${TMP_CONF_FILE}
-	echo "    name        syslog" >> ${TMP_CONF_FILE}
-	echo "    tag         $tag" >> ${TMP_CONF_FILE}
-	echo "    path        /dev/log" >> ${TMP_CONF_FILE}
-	echo "" >> ${TMP_CONF_FILE}
+	append_conf "[INPUT]"
+	append_conf "    name        syslog"
+	append_conf "    tag         $tag"
+	append_conf "    path        /dev/log"
+	append_conf ""
+}
+
+create_kmsg_input_section() {
+	local tag="$1"
+
+	[ -z "$tag" ] && return
+
+	# check if this source section has already been processed
+	kmsg_tag_already_processed "$tag" && return
+
+	if [ -c "/dev/kmsg" ]; then
+		append_conf "[INPUT]"
+		append_conf "    name       kmsg"
+		append_conf "    tag        $tag"
+		append_conf ""
+	fi
 }
 
 generate_facility_regex() {
@@ -84,7 +137,7 @@ generate_facility_regex() {
 		# generate regex for each.
 		for sval in 0 1 2 3 4 5 6 7; do
 			pri=`expr $val \* 8 + $sval`
-			echo "    regex        pri $pri" >> ${TMP_CONF_FILE}
+			append_conf "    regex        pri $pri"
 		done
 	done
 }
@@ -106,7 +159,7 @@ generate_severity_regex() {
 		# generate regex for all facility values, with severity=sev_level
 		while [ $fval -le 23 ] ; do
 			pri=`expr $fval \* 8 + $sev_level`
-			echo "    $param        pri $pri" >> ${TMP_CONF_FILE}
+			append_conf "    $param        pri $pri"
 			fval=$((fval + 1))
 		done
 	elif [ "$sev_compare" == "1" ]; then
@@ -117,7 +170,7 @@ generate_severity_regex() {
 			sval=0
 			while [ $sev_level -ge $sval ]; do
 				pri=`expr $fval \* 8 + $sval`
-				echo "    $param        pri $pri" >> ${TMP_CONF_FILE}
+				append_conf "    $param        pri $pri"
 				sval=$((sval + 1))
 			done
 			fval=$((fval + 1))
@@ -146,7 +199,7 @@ handle_filter_conf() {
 	local pattern_match
 	config_get pattern_match $section pattern_match
 	if [ -n "$pattern_match" ]; then
-		echo "    regex        $pattern_match" >> ${TMP_CONF_FILE}
+		append_conf "    regex        $pattern_match"
 	fi
 
 	local facility_level
@@ -177,12 +230,14 @@ handle_filter_conf() {
 }
 
 create_filter_section() {
-	local match="$1"
+	local match_regex="$1"
 
-	echo "[FILTER]" >> ${TMP_CONF_FILE}
-	echo "    name        grep" >> ${TMP_CONF_FILE}
-	echo "    match       $match" >> ${TMP_CONF_FILE}
-	echo "    logical_op  or" >> ${TMP_CONF_FILE} # handle multiple filters
+	[ -z "$match_regex" ] && return
+
+	append_conf "[FILTER]"
+	append_conf "    name        grep"
+	append_conf "    match_regex       $match_regex"
+	append_conf "    logical_op  or" # handle multiple filters
 }
 
 handle_filter_ref() {
@@ -192,47 +247,56 @@ handle_filter_ref() {
 
 handle_log_file() {
 	local section="$1" # out_file section
-	local match="$2"
+	local linker="$2"
+	local match_regex="$3"
+	local template="$4"
 	local action_ref
 
 	config_get action_ref $section action
-	if [ "$action_ref" != "$match" ]; then
+	if [ "$action_ref" != "$linker" ]; then
 		return
 	fi
 
 	local enabled
-	config_get enabled $section enable
-	if [ "$enabled" == 0 ]; then
+	config_get_bool enabled $section enable
+	if [ "$enabled" = "0" ]; then
 		return
 	fi
 
 	local file
 	config_get file $section file
-	if [ -z "$file" ]; then
+	if [ -z "$file" ] || [ -z "$match_regex" ]; then
 		return
 	fi
 
-	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
-	echo "    name         file" >> ${TMP_CONF_FILE}
-	echo "    match        $match" >> ${TMP_CONF_FILE}
-	echo "    file         $file" >> ${TMP_CONF_FILE}
-	echo "    format       template" >> ${TMP_CONF_FILE}
-	echo "    template     {time} {hostname} {ident}: {message}" >> ${TMP_CONF_FILE}
+	append_conf "[OUTPUT]"
+	append_conf "    name         file"
+	append_conf "    workers      2"
+	append_conf "    match_regex  $match_regex"
+	append_conf "    file         $file"
+
+	if [ -n "$template" ]; then
+		append_conf "    format       template"
+		append_conf "    template     ${template}"
+	fi
+
+	append_conf ""
 }
 
 handle_log_remote() {
 	local section="$1"
-	local match="$2"
+	local linker="$2"
+	local match_regex="$3"
 	local action_ref
 
 	config_get action_ref $section action
-	if [ "$action_ref" != "$match" ]; then
+	if [ "$action_ref" != "$linker" ]; then
 		return
 	fi
 
 	local enabled
-	config_get enabled $section enable
-	if [ "$enabled" == 0 ]; then
+	config_get_bool enabled $section enable
+	if [ "$enabled" = "0" ]; then
 		return
 	fi
 
@@ -242,63 +306,127 @@ handle_log_remote() {
 		return
 	fi
 
-	echo "[OUTPUT]" >> ${TMP_CONF_FILE}
-	echo "    name         syslog" >> ${TMP_CONF_FILE}
-	echo "    match        $match" >> ${TMP_CONF_FILE}
-	echo "    host         $address" >> ${TMP_CONF_FILE}
+	append_conf "[OUTPUT]"
+	append_conf "    name         syslog"
+	append_conf "    match_regex  $match_regex"
+	append_conf "    host         $address"
 	append_conf "    syslog_appname_key   ident"
 	append_conf "    syslog_procid_key    pid"
 	append_conf "    syslog_message_key   message"
-
-	local hostname="$(uci -q get 'system.@system[0].hostname')"
-	if [ -n "${hostname}" ]; then
-		append_conf "    syslog_hostname_preset    ${hostname}"
-	fi
+	append_conf "    syslog_hostname_key  hostname"
 
 	local proto # holds value tcp or udp
 	config_get proto ${section} proto
 	if [ -n "$proto" ]; then
 		if [ "$proto" == "tls" ]; then
-			echo "    mode         tcp" >> ${TMP_CONF_FILE}
-			echo "    tls          on" >> ${TMP_CONF_FILE}
+			append_conf "    mode         tcp"
+			append_conf "    tls          on"
 		else
-			echo "    mode         $proto" >> ${TMP_CONF_FILE}
+			append_conf "    mode         $proto"
 		fi
 	fi
 
 	local port
 	config_get port $section port
 	if [ -n "$port" ]; then
-		echo "    port         $port" >> ${TMP_CONF_FILE}
+		append_conf "    port         $port"
 	fi
 
 	local cert
 	local peer_verify
 	config_get cert $section cert
 	if [ -n "$cert" ]; then
-		echo "    tls.crt_file $cert" >> ${TMP_CONF_FILE}
+		append_conf "    tls.crt_file $cert"
 
-		config_get peer_verify $section peer_verify
-		if [ "$peer_verify" == "1" ]; then
-			echo "    tls.verify     on" >> ${TMP_CONF_FILE}
+		config_get_bool peer_verify $section peer_verify
+		if [ "$peer_verify" = "1" ]; then
+			append_conf "    tls.verify     on"
 		fi
 	fi
+	append_conf ""
+}
+
+resolve_source_section() {
+	local src_section="$1"
+	local linker="$2"
+	local src_name syslog_en kernel_en source_tag_syslog source_tag_kmsg
+
+	config_get src_name "$src_section" name
+	[ "$src_name" = "$linker" ] || return
+
+	config_get_bool syslog_en "$src_section" system_messages 1
+	config_get_bool kernel_en "$src_section" kernel_messages 1
+
+	# create an input section using /dev/log or kmsg
+	# and store the tag in a variable
+	# so that later a regex can be made to match this tag
+	# which will be used in output section
+	if [ "$syslog_en" = "1" ]; then
+		source_tag_syslog="SL$src_name"
+		create_input_section "$source_tag_syslog"
+		action_tags="$source_tag_syslog $action_tags"
+	fi
+
+	if [ "$kernel_en" = "1" ]; then
+		source_tag_kmsg="KM$src_name"
+		create_kmsg_input_section "$source_tag_kmsg"
+		action_tags="$source_tag_kmsg $action_tags"
+	fi
+}
+
+# get the value of option expression from the relevant section
+resolve_template_section() {
+	local tmpl_section="$1"
+	local tmpl_name
+
+	config_get tmpl_name "$tmpl_section" name
+	[ "$tmpl_name" = "$template_ref" ] || return
+
+	config_get template_expr "$tmpl_section" expression
+
+	[ -n "$template_expr" ] && echo "$template_expr"
+}
+
+# loop over template sections and get the value of option expression from the relevant section
+get_template_expression() {
+	local template_ref="$1"
+	[ -n "$template_ref" ] && config_foreach resolve_template_section template
+}
+
+# build a regex that will match all the tags supplied to this function
+build_match_regex() {
+	local tags="$1"
+	local first=1
+	local regex="^("
+	for tag in $tags; do
+		[ "$first" -eq 1 ] && first=0 || regex="$regex|"
+		regex="$regex$tag"
+	done
+	regex="$regex)\$"
+	echo "$regex"
 }
 
 handle_action() {
-	local section="$1"
+	local tag_regex filter source_ref template_ref source_sec log_template
+	local action_section="$1"
+	local action_tags=""
 
-	local filter
-	config_get filter $section filter
+	config_get action_name "$action_section" name
+	config_get filter "$action_section" filter
+	config_get source_ref "$action_section" source
+	config_get template_ref "$action_section" template
 
-	# use config action option name as tag for input
-	local tag
-	config_get tag $section name
-	if [ -z "$tag" ]; then
-		return
-	fi
+	[ -z "$action_name" ] && return
+	[ -z "$source_ref" ] && return
+
+	# Resolve referenced source sections
+	for source_sec in $source_ref; do
+		config_foreach resolve_source_section source "$source_sec"
+	done
+
+	# build a regex that will match all the sources for this action
+	tag_regex=$(build_match_regex "$action_tags")
 
-	create_input_section $tag
 	if [ -n "$filter" ]; then
 		# the only fluentbit filter that is useful for the datamodel is
 		# grep. Also, fluentbit does not seem to handle multiple instances
@@ -306,7 +434,7 @@ handle_action() {
 		# to an action entry in the uci would translate for us into a set of
 		# regex/exclude values instead of individual FILTER section per uci
 		# section filter is a list, treat according
-		create_filter_section $tag
+		create_filter_section "$tag_regex"
 
 		IFS=" "
 		for finst in $filter; do
@@ -314,11 +442,14 @@ handle_action() {
 		done
 	fi
 
-	# handle output, each action can be associated with a out_log and out_syslog
+	# get the template expression if any is present
+	log_template="$(get_template_expression "$template_ref")"
+
+	# handle output, each action can be associated with an out_log and out_syslog
 	# section so figure out if any out_log or out_syslog section is associated
 	# with this and action and setup output accordingly.
-	config_foreach handle_log_file log_file "$tag"
-	config_foreach handle_log_remote log_remote "$tag"
+	config_foreach handle_log_file log_file "$action_name" "$tag_regex" "$log_template"
+	config_foreach handle_log_remote log_remote "$action_name" "$tag_regex"
 }
 
 handle_action_section() {
@@ -334,13 +465,14 @@ logmngr_init() {
 
 	create_config_file
 	create_service_section
+	create_default_filters
 	handle_action_section
 
 	if [ -f /lib/logmngr/logrotate.sh ]; then
 		logrotate_init
 	fi
 
-	if [ "$enabled" == "0" ]; then
+	if [ "$enabled" = "0" ]; then
 		return
 	fi
 

map-agent/Config.in

@@ -59,8 +59,12 @@ config AGENT_CHECK_PARTIAL_WIFI_RELOAD
 	bool "Option that allow SSID/PSK simple reload"
 	default y
 
-config DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER
-	bool "Let dynbhd through AP-Autoconfiguration Search and DHCP Discovery determine the controller or agent role"
+config DYNBH
+	bool "Enable map-agent dynamic Ethernet backhaul management"
+	default n
+
+config DYNBH_DYNAMICALLY_PERSIST_CONTROLLER
+	bool "Let map-agent through AP-Autoconfiguration Search and DHCP Discovery determine the controller or agent role"
 
 config AGENT_UNASSOC_STA_CONT_MONITOR
 	bool "Enable continuos monitoring of unassociated clients"

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.3.6.7
+PKG_VERSION:=6.4.1.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f611be0c05e3f4fb3d35a5a1ad51f5a4ad6406ca
+PKG_SOURCE_VERSION:=ed2e65007c2a0bacb642b0e72b803df64ef826ed
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -37,23 +37,10 @@ ifeq ($(CONFIG_AGENT_USE_LIBDPP),y)
   TARGET_CFLAGS += -DUSE_LIBDPP
 endif
 
-define Package/dynbhd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Dynamic Backhaul Daemon
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +ieee1905-map-plugin +map-agent
-endef
-
-
 define Package/map-agent/description
  This package implements EasyMesh R2 compliant WiFi Agent.
 endef
 
-define Package/dynbhd/description
- Dyanmic LAN/WAN port detection and loop avoidance.
-endef
-
 define Package/map-agent/config
 	source "$(SOURCE)/Config.in"
 endef
@@ -111,7 +98,11 @@ ifeq ($(CONFIG_AGENT_CHECK_PARTIAL_WIFI_RELOAD),y)
 TARGET_CFLAGS += -DCHECK_PARTIAL_WIFI_RELOAD
 endif
 
-ifeq ($(CONFIG_DYNBHD_DYNAMICALLY_PERSIST_CONTROLLER),y)
+ifeq ($(CONFIG_DYNBH),y)
+TARGET_CFLAGS += -DDYNBH
+endif
+
+ifeq ($(CONFIG_DYNBH_DYNAMICALLY_PERSIST_CONTROLLER),y)
 TARGET_CFLAGS += -DPERSIST_CONTROLLER
 endif
 
@@ -124,6 +115,10 @@ MAKE_PATH:=src
 define Package/map-agent/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/
+ifeq ($(CONFIG_DYNBH),y)
+	$(RM) $(1)/etc/hotplug.d/ethernet/map-dynamic-backhaul
+	$(RM) $(1)/etc/hotplug.d/ethernet/map-topology-discovery
+endif
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/lib/wifi
@@ -131,15 +126,6 @@ define Package/map-agent/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef
 
-define Package/dynbhd/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/lib/wifi/dynbhd
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/ethernet
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/dynbhd $(1)/usr/sbin/dynbhd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/api $(1)/lib/wifi/dynbhd/api
-#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/map-dynamic-backhaul $(1)/etc/hotplug.d/ethernet/map-dynamic-backhaul
-endef
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -148,4 +134,3 @@ endef
 endif
 
 $(eval $(call BuildPackage,map-agent))
-$(eval $(call BuildPackage,dynbhd))

map-agent/files/etc/config/mapagent

@@ -17,7 +17,7 @@ config dynamic_backhaul
 	option missing_bh_reconfig_timer '1800'
 
 config controller_select
-	option id 'auto'
+	option mode 'auto'
 	option probe_int '20'
 	option retry_int '9'
 	option autostart '1'

map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul

@@ -27,11 +27,6 @@ done
 al_brnet="${al_bridge:3}"
 [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
 
-############## Dynamic Backhaul Daemon ##############
-if [ -n "$(which dynbhd)" ]; then
-	exit 0
-fi
-########################################################
 
 ################ Dedicated ETH WAN Port ################
 wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
@@ -95,7 +90,8 @@ if [ "$LINK" = "up" ]; then
 	config_foreach remove_from_bridge bsta
 	config_foreach update_bstas bsta down
 
-	/lib/wifi/multiap set_uplink "eth" "$PORT"
+	hwaddr="$(ifconfig $PORT | grep -i hwaddr | awk '{print $5}' | awk '{print tolower($0)}')"
+	/lib/wifi/multiap set_uplink "eth" "$PORT" "$hwaddr"
 else
 	/lib/wifi/multiap unset_uplink "eth"
 	#rm -f "$map_bh_file"

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

@@ -7,20 +7,6 @@ USE_PROCD=1
 
 IS_CFG_VALID=1
 
-MAP_DEV="map_dev"
-MAP_IF="map"
-
-
-start_dynbhd_service() {
-	rm -f /var/run/multiap/multiap.backhaul
-	procd_open_instance
-	procd_set_param command "/usr/sbin/dynbhd"
-	procd_set_param respawn
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
-}
-
 validate_agent_section() {
 	uci_validate_section mapagent agent "agent" \
 		'enabled:bool:true' \
@@ -51,7 +37,7 @@ validate_cs_section() {
 
 	uci_validate_section mapagent $section "${section}" \
 		'local:bool:false' \
-		'id:string' \
+		'mode:string' \
 		'probe_int:range(0,1000):20' \
 		'retry_int:range(0,255):3' \
 		'autostart:bool:false'
@@ -179,17 +165,6 @@ create_dir() {
 }
 
 start_service() {
-	if [ -f /usr/sbin/dynbhd ]; then
-		# Start dynbhd only if the device is operating in extender/repeater mode
-		al_bridge="$(uci -q get mapagent.agent.al_bridge)"
-		if [ "${al_bridge:0:3}" = "br-" ]; then
-			al_brnet="${al_bridge:3}"
-			if [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ]; then
-				start_dynbhd_service
-			fi
-		fi
-	fi
-
 	config_load "mapagent"
 	validate_agent_config || return 1;
 

map-agent/files/etc/uci-defaults/994-map-set-cntlr-sel-mode

@@ -0,0 +1,15 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+adapt_cntlr_sel() {
+	local section=$1
+        id=$(uci -q get mapagent.@controller_select[0].id)
+
+        uci -q del mapagent.@controller_select[0].id
+
+        # re-apply any custom value
+        [ -z "${id}" ] || uci -q set mapagent.@controller_select[0].mode="${id}"
+}
+
+adapt_cntlr_sel

map-agent/files/lib/multiap/map_genconfig

@@ -10,6 +10,11 @@ network_mode="$(fw_printenv -n netmode)" # default is layer3
 multiap_mode="$(fw_printenv -n multiap_mode)" # default is full
 disable_mlo="$(fw_printenv -n disable_mlo)"
 
+is_logan() {
+	[ -d /sys/module/mt_wifi ] && return 0
+	return 1
+}
+
 is_airoha() {
 	[ -f /proc/device-tree/compatible ] || return
 	strings /proc/device-tree/compatible | grep -qE '^(econet,|airoha,)'; return
@@ -67,45 +72,44 @@ generate_multiap_config() {
 		device="$dev"
 
 		ifprefix_radio=""
-		if is_airoha; then
+		if is_logan; then
+			uci set mapagent.agent.mld_prefix="bss"
+			ifname_sta=""
+			case "$band" in
+				2g)
+					ifprefix="ra%"
+					ifname="ra0"
+					ifname_bh="ra1"
+					ifname_sta="apcli0"
+				;;
+				5g)
+					ifprefix="rai%"
+					ifname="rai0"
+					ifname_bh="rai1"
+					ifname_sta="apclii0"
+				;;
+				6g)
+					ifprefix="rax%"
+					ifname="rax0"
+					ifname_bh="rax1"
+					ifname_sta="apclix0"
+				;;
+			esac
+			ifprefix_radio="${ifprefix}"
+			if [ "${network_mode}" == "extender" ]; then
+				ifname="${ifname_sta}"
+			fi
+
+			[ "$disable_mlo" == "1" ] || {
+				uci set wireless.$dev.mlo="1"
+				uci set wireless.$dev.mlo_capable="1"
+			}
+		elif is_airoha; then
 			if [ -d "/sys/module/mt76" ]; then
 				ifprefix="wlan%_%"
 				ifname="wlan${devidx}_0"
 				ifname_bh="wlan${devidx}_1"
-			else
-				uci set mapagent.agent.mld_prefix="bss"
-				ifname_sta=""
-				case "$band" in
-					2g)
-						ifprefix="ra%"
-						ifname="ra0"
-						ifname_bh="ra1"
-						ifname_sta="apcli0"
-					;;
-					5g)
-						ifprefix="rai%"
-						ifname="rai0"
-						ifname_bh="rai1"
-						ifname_sta="apclii0"
-					;;
-					6g)
-						ifprefix="rax%"
-						ifname="rax0"
-						ifname_bh="rax1"
-						ifname_sta="apclix0"
-					;;
-				esac
-				ifprefix_radio="${ifprefix}"
-				if [ "${network_mode}" == "extender" ]; then
-					ifname="${ifname_sta}"
-				fi
-
-				[ "$disable_mlo" == "1" ] || {
-					uci set wireless.$dev.mlo="1"
-					uci set wireless.$dev.mlo_capable="1"
-				}
 			fi
-
 			uci set wireless.$dev.channels="$channels"
 			uci commit wireless
 		elif is_broadcom; then
@@ -258,6 +262,6 @@ map_genconf () {
 				config_foreach mapcontroller_remove_mld_id ap
 			}
 		fi
-		uci -q commit mapcontroller
+		ubus -t 5 call uci commit '{"config":"mapcontroller"}'
 	fi
 }

map-controller/Makefile

@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.4.0.12
+PKG_VERSION:=6.4.1.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ae10f447f8d83ed6b98d2b82da2dda64be2c3183
+PKG_SOURCE_VERSION:=45355bd49d9260c666b4d1e629184878cec3f72d
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>
 
 LOCAL_DEV=0

map-controller/files/etc/config/mapcontroller

@@ -2,13 +2,13 @@ config controller 'controller'
 	option enabled '1'	# may be modified by other package start-up scripts (i.e. map-agent)
 	option profile '3'
 	option registrar '2 5 6'
-	option debug '0'
+	option debug '2'
 	option bcn_metrics_max_num '10'
 	option initial_channel_scan '0'
 	option enable_ts '0'
 	option primary_vid '1'
 	option primary_pcp '0'
-	option stale_sta_timeout '30d'
+	option stale_sta_timeout '20d'
 	option de_collect_interval '60'
 
 config sta_steering

mcastmngr/Makefile

@@ -32,7 +32,7 @@ define Package/mcastmngr
  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json
  DEPENDS+=+!TARGET_brcmbca:mcproxy +!TARGET_brcmbca:sipcalc
  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +!TARGET_brcmbca:kmod-ebt-igmpsnooping +!TARGET_brcmbca:kmod-ebt-mldsnooping
- DEPENDS+=+!TARGET_brcmbca:ebtables-legacy +dm-agent
+ DEPENDS+=+!TARGET_brcmbca:ebtables-legacy +bridgemngr
 endef
 
 define Package/mcastmngr/description

netmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmngr
-PKG_VERSION:=1.1.8
+PKG_VERSION:=1.2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/netmngr.git
-PKG_SOURCE_VERSION:=6310f32b80f8abeccbf99ad55ce88792b19342d6
+PKG_SOURCE_VERSION:=ff08a8cc5c860056a022e5376a973dee5a323595
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

netmode/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.7
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
@@ -18,6 +18,7 @@ include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 define Package/netmode
   CATEGORY:=Utilities
   TITLE:=Network Modes and Utils
+  DEPENDS:=+dm-service
 endef
 
 define Package/netmode/description

netmode/files/datamodel.json

@@ -58,7 +58,7 @@
 							"name": "mode"
 						}
 					},
-					"linker_obj": "Device.{BBF_VENDOR_PREFIX}NetMode.SupportedModes.[Name==@key]."
+					"linker_obj": "Device.{BBF_VENDOR_PREFIX}NetMode.SupportedModes.*.Name"
 				}
 			]
 		},

obuspa/Config.in

@@ -19,13 +19,8 @@ config OBUSPA_CONTROLLER_MTP_VERIFY
 	bool "Enable verification of controller MTP before processing the message"
 	default n
 
-config OBUSPA_ENABLE_TEST_CONTROLLER
-	bool "Adds a test controller by default"
-	default n
-	select OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL
-
-config OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL
-	bool "Adds a test controller by default (local access only)"
+config OBUSPA_LOCAL_MQTT_LISTENER
+	bool "Configures local mqtt broker for local usp connections"
 	default n
 
 config OBUSPA_MAX_CONTROLLERS_NUM

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=10.0.4.1
+PKG_VERSION:=10.0.7.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=6b888812299de0d836a8dcf33bc899ec8ff16030
+PKG_SOURCE_VERSION:=6584b9f8facf0e688b80ca40d5961bad3f4922f8
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -33,8 +33,7 @@ define Package/obuspa
   TITLE:=USP agent
   MENU:=1
   DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl +ca-certificates \
-		+OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL:mosquitto-ssl +OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL:mosquitto-client-ssl \
-		+OBUSPA_ENABLE_TEST_CONTROLLER:mosquitto-auth-shadow +libjson-c
+		+OBUSPA_LOCAL_MQTT_LISTENER:mosquitto-ssl +libjson-c
   DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 
@@ -132,27 +131,23 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/users/roles/*.json $(1)/etc/users/roles/
 	$(INSTALL_DATA) ./files/etc/obuspa/usp_utils.sh $(1)/etc/obuspa/
 	echo "$(VENDOR_PREFIX)" > $(1)/etc/obuspa/vendor_prefix
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/60-generate-ctrust-defaults $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/obuspa-set-dhcp-option $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/92-obuspa_firewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/93-obuspa_mdns_adv $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/94-obuspa_set_credential $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/60-generate-ctrust-defaults $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/obuspa-set-dhcp-option $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/92-obuspa_firewall $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/93-obuspa_mdns_adv $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/94-obuspa_set_credential $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/firewall.usp $(1)/etc/
-	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/
 ifeq ($(CONFIG_OBUSPA_CWMP_DATAMODEL_SUPPORT),y)
 	$(BBFDM_REGISTER_SERVICES) ./bbfdm_service.json $(1) $(PKG_NAME)
 	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libuspagentdm.so $(1) $(PKG_NAME)
 endif
-ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y)
-	$(INSTALL_BIN) ./files/etc/uci-defaults/54-test-usp-remote $(1)/etc/uci-defaults/
-endif
-ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER_LOCAL),y)
-	$(INSTALL_BIN) ./files/etc/init.d/usptest $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/55-test-usp-controller $(1)/etc/uci-defaults/
+ifeq ($(CONFIG_OBUSPA_LOCAL_MQTT_LISTENER),y)
+	$(INSTALL_DATA) ./files/etc/uci-defaults/55-obuspa-local-mqtt-usp-connection $(1)/etc/uci-defaults/
 endif
 ifeq ($(CONFIG_OBUSPA_OVERRIDE_CT_ROLE),y)
-	$(INSTALL_BIN) ./files/etc/uci-defaults/61-override-ct-roles $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/61-override-ct-roles $(1)/etc/uci-defaults/
 endif
 endef
 

obuspa/files/etc/init.d/usptest

@@ -1,75 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-USE_PROCD=1
-
-log()
-{
-	echo "$*"|logger -t usptest -p debug
-}
-
-get_oui_from_db()
-{
-	db -q get device.deviceinfo.ManufacturerOUI
-}
-
-get_serial_from_db()
-{
-	db -q get device.deviceinfo.SerialNumber
-}
-
-publish_endpoint()
-{
-	local AgentEndpointID serial oui user pass
-
-	if ! uci -q get obuspa.testmqtt; then
-		return 0;
-	fi
-
-	# return if mosquitto_pub is not present
-	if [ ! "$(command -v mosquitto_pub)" ]; then
-		log "mosquitto_pub not present can't publish EndpointID"
-		return 0;
-	fi
-
-	sleep 2
-	# Get endpoint id from obuspa config first
-	config_load obuspa
-	config_get AgentEndpointID localagent EndpointID ""
-	if [ -z "${AgentEndpointID}" ]; then
-		serial=$(get_serial_from_db)
-		oui=$(get_oui_from_db)
-		AgentEndpointID="os::${oui}-${serial//+/%2B}"
-	fi
-
-	config_get user testmqtt Username ""
-	config_get pass testmqtt Password ""
-
-	# publish Agent's EndpointID in mosquito broker for discovery by usp-js
-	# This is a work around till obuspa adds supports for mDNS discovery
-	if [ -n "${user}" ] && [ -n "${pass}" ]; then
-		log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker with username, password"
-		mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" -u "${user}" -P "${pass}"
-	elif [ -n "${user}" ]; then
-		log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker with username only"
-		mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" -u "${user}"
-	else
-		log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
-		mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}"
-	fi
-}
-
-start_service() {
-	procd_open_instance usptest
-	publish_endpoint
-	procd_close_instance
-}
-
-reload_service() {
-	publish_endpoint
-}
-
-service_triggers() {
-	procd_add_reload_trigger "mosquitto" "obuspa"
-}

obuspa/files/etc/uci-defaults/54-test-usp-remote

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-if [ ! -f "/etc/config/mosquitto" ]; then
-	echo "Local mosquitto broker not available"
-	return 0
-fi
-
-add_usp_test()
-{
-	uci_add mosquitto listener usptest
-	uci_set mosquitto usptest enabled 1
-	uci_set mosquitto usptest port '9004'
-	uci_set mosquitto usptest protocol 'websockets'
-	uci_set mosquitto usptest auth_plugin '/usr/lib/mosquitto_auth_shadow.so'
-}
-
-# Install test MQTT over WS listener
-add_usp_test

obuspa/files/etc/uci-defaults/55-obuspa-local-mqtt-usp-connection

@@ -0,0 +1,21 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+if [ ! -f "/etc/config/mosquitto" ]; then
+	echo "Local mosquitto broker not available"
+	return 0
+fi
+
+add_mqtt_obuspa_listener()
+{
+	uci_add mosquitto listener obuspa
+	uci_set mosquitto obuspa enabled 1
+	uci_set mosquitto obuspa port '1883'
+	uci_set mosquitto obuspa no_remote_access '1'
+	uci_set mosquitto obuspa allow_anonymous '1'
+}
+
+# Add mosquitto listener for obuspa connection
+# apps/controller should add controller definitions separately
+add_mqtt_obuspa_listener

obuspa/files/etc/uci-defaults/55-test-usp-controller

@@ -1,57 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-if [ ! -f "/etc/config/obuspa" ]; then
-	echo "Local obuspa not available"
-	return 0
-fi
-
-if [ ! -f "/etc/config/mosquitto" ]; then
-	echo "Local mosquitto broker not available"
-	return 0
-fi
-
-add_obuspa_test_mtp()
-{
-	uci_add obuspa mtp test_mtp
-	uci_set obuspa test_mtp Protocol 'MQTT'
-	uci_set obuspa test_mtp ResponseTopicConfigured '/usp/endpoint'
-	uci_set obuspa test_mtp mqtt 'testmqtt'
-}
-
-add_obuspa_test_mqtt()
-{
-	# Adds Device.MQTT.Client.
-	uci_add obuspa mqtt testmqtt
-	uci_set obuspa testmqtt BrokerAddress '127.0.0.1'
-	uci_set obuspa testmqtt BrokerPort '1883'
-	uci_set obuspa testmqtt TransportProtocol 'TCP/IP'
-}
-
-add_obuspa_test_controller()
-{
-	# Adds Device.LocalAgent.Controller.
-	uci_add obuspa controller testcontroller
-	uci_set obuspa testcontroller EndpointID 'proto::interop-usp-controller'
-	uci_set obuspa testcontroller Protocol 'MQTT'
-	uci_set obuspa testcontroller Topic '/usp/controller'
-	uci_set obuspa testcontroller mqtt 'testmqtt'
-	uci_set obuspa testcontroller assigned_role_name 'full_access'
-}
-
-add_obuspa_config()
-{
-	uci_add mosquitto listener obuspa
-	uci_set mosquitto obuspa enabled 1
-	uci_set mosquitto obuspa port '1883'
-	uci_set mosquitto obuspa no_remote_access '1'
-	uci_set mosquitto obuspa allow_anonymous '1'
-}
-
-# Install test usp controller config
-add_obuspa_config
-
-add_obuspa_test_mtp
-add_obuspa_test_mqtt
-add_obuspa_test_controller

obuspa/files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user

@@ -57,18 +57,18 @@ get_vivsoi() {
 
 	data="${opt125}"
 	rem_len="${len}"
-	while [ $rem_len -gt 0 ]; do
+	while [ "${rem_len}" -gt 0 ]; do
 		ent_id=${data:0:8}
 		ent_id=$(printf "%d\n" "0x$ent_id")
 
-		if [ $ent_id -ne  3561 ]; then
+		if [ "${ent_id}" -ne  3561 ]; then
 			len_val=${data:8:2}
 			data_len=$(printf "%d\n" "0x$len_val")
 			# add 4 byte for ent_id and 1 byte for len
 			data_len=$(( data_len * 2 + 10 ))
 			# move ahead data to next enterprise id
 			data=${data:"${data_len}":"${rem_len}"}
-			rem_len=$(( rem_len - $data_len ))
+			rem_len=$(( rem_len - data_len ))
 			continue
 		fi
 
@@ -79,7 +79,7 @@ get_vivsoi() {
 		data_len=$(( data_len * 2 + 10 ))
 
 		opt_len=$(printf "%d\n" "0x$len_val")
-		[ $opt_len -eq 0 ] && return
+		[ "${opt_len}" -eq 0 ] && return
 
 		# populate the option data of enterprise id
 		sub_data_len=$(( opt_len * 2))
@@ -98,28 +98,28 @@ get_vivsoi() {
 			sub_opt_len=$(( sub_opt_len * 2 ))
 
 			# get the value of sub option starting 4 means starting after length
-			sub_opt_val=${sub_data:4:${sub_opt_len}}
+			sub_opt_val=${sub_data:4:"${sub_opt_len}"}
 
 			# assign the value found in sub option
 			case "${sub_opt_id}" in
 				"25")
-					URL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+					URL=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 					CONTROLLER_DISCOVERED=1
 				;;
 				"26")
-					PROV_CODE=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+					PROV_CODE=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 					CONTROLLER_DISCOVERED=1
 				;;
 				"27")
-					RETRY_MIN_INTERVAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+					RETRY_MIN_INTERVAL=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 					CONTROLLER_DISCOVERED=1
 				;;
 				"28")
-					RETRY_INTERVAL_MUL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+					RETRY_INTERVAL_MUL=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 					CONTROLLER_DISCOVERED=1
 				;;
 				"29")
-					ENDPOINT_ID=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+					ENDPOINT_ID=$(echo -n "${sub_opt_val}" | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
 					CONTROLLER_DISCOVERED=1
 				;;
 			esac
@@ -131,7 +131,7 @@ get_vivsoi() {
 			sub_data_len=$((sub_data_len - sub_opt_end))
 
 			# fetch next sub option hex string
-			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+			sub_data=${sub_data:"${sub_opt_end}":"${sub_data_len}"}
 		done
 
 		# move ahead data to next enterprise id
@@ -146,7 +146,7 @@ get_access_role()
 
 	lan_proto="$(uci -q get network.lan.proto)"
 
-	if [ "${lan_proto}" == "dhcp" ]; then
+	if [ "${lan_proto}" = "dhcp" ]; then
 		mode="extender"
 	else
 		mode="full_access"
@@ -174,7 +174,7 @@ config_get_bool enable_obuspa global enabled 1
 config_get wan_intf global interface
 config_get_bool dhcp_discovery global dhcp_discovery 1
 
-if [ "$enable_obuspa" = "0" ] || [ "$dhcp_discovery" = "0" ]; then
+if [ "${enable_obuspa}" -eq 0 ] || [ "${dhcp_discovery}" -eq 0 ]; then
 	return 0
 fi
 
@@ -190,9 +190,9 @@ if [ -z "${wan_intf}" ]; then
 	fi
 fi
 
-if [ "${wan_intf}" == "${INTERFACE}" ]; then
+if [ "${wan_intf}" = "${INTERFACE}" ]; then
 	if [ -n "$opt125" ]; then
-		len=$(printf "$opt125"|wc -c)
+		len=$(echo -n "${opt125}"|wc -c)
 		get_vivsoi "$opt125" "$len"
 	fi
 
@@ -228,10 +228,10 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 				;;
 			*)
 				# This is an FQDN, perform DNS query
-				nslookup $URL > /tmp/fqdn_ip
-				nslookup -type=ptr $URL > /tmp/fqdn_ptr
-				nslookup -type=srv $URL > /tmp/fqdn_srv
-				nslookup -type=txt $URL > /tmp/fqdn_srv
+				nslookup "${URL}" > /tmp/fqdn_ip
+				nslookup -type=ptr "${URL}" > /tmp/fqdn_ptr
+				nslookup -type=srv "${URL}" > /tmp/fqdn_srv
+				nslookup -type=txt "${URL}" > /tmp/fqdn_srv
 
 				# TODO extend to collect information from dns-sd records
 				;;
@@ -247,16 +247,16 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 		fi
 	fi
 
-	if [ "${proto}" == "mqtt" ] || [ "${proto}" == "mqtts" ]; then
+	if [ "${proto}" = "mqtt" ] || [ "${proto}" = "mqtts" ]; then
 		offered_proto="MQTT"
-		if [ "${proto}" == "mqtt" ]; then
+		if [ "${proto}" = "mqtt" ]; then
 			mtp_encrypt="TCP/IP"
 		else
 			mtp_encrypt="TLS"
 		fi
-	elif [ "${proto}" == "ws" ] || [ "${proto}" == "wss" ]; then
+	elif [ "${proto}" = "ws" ] || [ "${proto}" = "wss" ]; then
 		offered_proto="WebSocket"
-		if [ "${proto}" == "wss" ]; then
+		if [ "${proto}" = "wss" ]; then
 			mtp_encrypt="1"
 		else
 			mtp_encrypt="0"
@@ -265,7 +265,7 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 
 	controllers=$(uci -q show obuspa | grep "=controller" | cut -d'=' -f1 | cut -d'.' -f2)
 	for controller in $controllers; do
-		dhcp_disc=$(uci -q get obuspa.$controller.dhcp_discovered)
+		dhcp_disc=$(uci -q get obuspa."${controller}".dhcp_discovered)
 		if [ "${dhcp_disc}" -eq 1 ]; then
 			dhcp_controller="${controller}"
 			break
@@ -273,27 +273,27 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 	done
 
 	if [ -n "${dhcp_controller}" ]; then
-		cont_proto="$(uci -q get obuspa.$dhcp_controller.Protocol)"
-		if [ "${cont_proto}" == "MQTT" ]; then
-			dhcp_mqtt="$(uci -q get obuspa.$dhcp_controller.mqtt)"
+		cont_proto=$(uci -q get obuspa."${dhcp_controller}".Protocol)
+		if [ "${cont_proto}" = "MQTT" ]; then
+			dhcp_mqtt=$(uci -q get obuspa."${dhcp_controller}".mqtt)
 
 			mtps=$(uci -q show obuspa | grep "=mtp" | cut -d'=' -f1 | cut -d'.' -f2)
 			for mtp in $mtps; do
-				mtp_mqtt="$(uci -q get obuspa.$mtp.mqtt)"
-				if [ "${mtp_mqtt}" == "${dhcp_mqtt}" ]; then
+				mtp_mqtt=$(uci -q get obuspa."${mtp}".mqtt)
+				if [ "${mtp_mqtt}" = "${dhcp_mqtt}" ]; then
 					dhcp_mtp="${mtp}"
 					break
 				fi
 			done
-		elif [ "${cont_proto}" == "WebSocket" ]; then
-			cont_port="$(uci -q get obuspa.$dhcp_controller.Port)"
-			cont_encr="$(uci -q get obuspa.$dhcp_controller.EnableEncryption)"
+		elif [ "${cont_proto}" = "WebSocket" ]; then
+			cont_port=$(uci -q get obuspa."${dhcp_controller}".Port)
+			cont_encr=$(uci -q get obuspa."${dhcp_controller}".EnableEncryption)
 
 			mtps=$(uci -q show obuspa | grep "=mtp" | cut -d'=' -f1 | cut -d'.' -f2)
 			for mtp in $mtps; do
-				mtp_port="$(uci -q get obuspa.$mtp.Port)"
-				mtp_encr="$(uci -q get obuspa.$mtp.EnableEncryption)"
-				if [ "${mtp_port}" == "${cont_port}" ] && [ "${mtp_encr}" == "${cont_encr}" ]; then
+				mtp_port=$(uci -q get obuspa."${mtp}".Port)
+				mtp_encr=$(uci -q get obuspa."${mtp}".EnableEncryption)
+				if [ "${mtp_port}" = "${cont_port}" ] && [ "${mtp_encr}" = "${cont_encr}" ]; then
 					dhcp_mtp="${mtp}"
 					break
 				fi
@@ -306,43 +306,43 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 
 	if [ -n "${dhcp_controller}" ]; then
 		## Handling of controller section
-		ct_endpoint=$(uci -q get obuspa.$dhcp_controller.EndpointID)
-		ct_proto=$(uci -q get obuspa.$dhcp_controller.Protocol)
-		ct_prov=$(uci -q get obuspa.$dhcp_controller.ProvisioningCode)
+		ct_endpoint=$(uci -q get obuspa."${dhcp_controller}".EndpointID)
+		ct_proto=$(uci -q get obuspa."${dhcp_controller}".Protocol)
+		ct_prov=$(uci -q get obuspa."${dhcp_controller}".ProvisioningCode)
 
 		if [ "${ct_proto}" = "MQTT" ]; then
-			ct_topic=$(uci -q get obuspa.$dhcp_controller.Topic)
+			ct_topic=$(uci -q get obuspa."${dhcp_controller}".Topic)
 		else
-			ct_topic=$(uci -q get obuspa.$dhcp_controller.Path)
+			ct_topic=$(uci -q get obuspa."${dhcp_controller}".Path)
 		fi
 
 		if [ -n "${ENDPOINT_ID}" ] && [ "${ct_endpoint}" != "${ENDPOINT_ID}" ]; then
-			uci -q set obuspa.$dhcp_controller.EndpointID="${ENDPOINT_ID}"
+			uci -q set obuspa."${dhcp_controller}".EndpointID="${ENDPOINT_ID}"
 			uci_change=1
 		fi
 
 		if [ -n "${offered_proto}" ] && [ "${ct_proto}" != "${offered_proto}" ]; then
-			uci -q set obuspa.$dhcp_controller.Protocol="${offered_proto}"
+			uci -q set obuspa."${dhcp_controller}".Protocol="${offered_proto}"
 			if [ "${offered_proto}" != "MQTT" ]; then
-				uci -q set obuspa.$dhcp_controller.mqtt=""
-				uci -q set obuspa.$dhcp_controller.Topic=""
-				uci -q set obuspa.$dhcp_controller.Host="${ip}"
-				uci -q set obuspa.$dhcp_controller.Port="${port}"
-				uci -q set obuspa.$dhcp_controller.Path="${ct_topic}"
-				uci -q set obuspa.$dhcp_controller.EnableEncryption="${mtp_encrypt}"
+				uci -q delete obuspa."${dhcp_controller}".mqtt
+				uci -q delete obuspa."${dhcp_controller}".Topic
+				uci -q set obuspa."${dhcp_controller}".Host="${ip}"
+				uci -q set obuspa."${dhcp_controller}".Port="${port}"
+				uci -q set obuspa."${dhcp_controller}".Path="${ct_topic}"
+				uci -q set obuspa."${dhcp_controller}".EnableEncryption="${mtp_encrypt}"
 			else
-				uci -q set obuspa.$dhcp_controller.EnableEncryption=""
-				uci -q set obuspa.$dhcp_controller.Path=""
-				uci -q set obuspa.$dhcp_controller.Host=""
-				uci -q set obuspa.$dhcp_controller.Port=""
+				uci -q delete obuspa."${dhcp_controller}".EnableEncryption
+				uci -q delete obuspa."${dhcp_controller}".Path
+				uci -q delete obuspa."${dhcp_controller}".Host
+				uci -q delete obuspa."${dhcp_controller}".Port
 
 				if [ -z "${dhcp_mqtt}" ]; then
-					uci -q set obuspa.$dhcp_controller.mqtt='dhcpmqtt'
+					uci -q set obuspa."${dhcp_controller}".mqtt='dhcpmqtt'
 				else
-					uci -q set obuspa.$dhcp_controller.mqtt="${dhcp_mqtt}"
+					uci -q set obuspa."${dhcp_controller}".mqtt="${dhcp_mqtt}"
 				fi
 
-				uci -q set obuspa.$dhcp_controller.Topic="${ct_topic}"
+				uci -q set obuspa."${dhcp_controller}".Topic="${ct_topic}"
 			fi
 
 			proto_changed=1
@@ -355,38 +355,38 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 				protocol="${offered_proto}"
 			fi
 
-			if [ "${protocol}" == "MQTT" ]; then
-				uci -q set obuspa.$dhcp_controller.Topic="${topic}"
+			if [ "${protocol}" = "MQTT" ]; then
+				uci -q set obuspa."${dhcp_controller}".Topic="${topic}"
 			else
-				uci -q set obuspa.$dhcp_controller.Path="${topic}"
+				uci -q set obuspa."${dhcp_controller}".Path="${topic}"
 			fi
 
 			uci_change=1
 		fi
 
 		if [ -n "${PROV_CODE}" ] && [ "${ct_prov}" != "${PROV_CODE}" ]; then
-			uci -q set obuspa.$dhcp_controller.ProvisioningCode="${PROV_CODE}"
+			uci -q set obuspa."${dhcp_controller}".ProvisioningCode="${PROV_CODE}"
 			uci_change=1
 		fi
 
 		if [ "${proto_changed}" -eq 1 ]; then
-			if [ "${offered_proto}" == "WebSocket" ]; then
+			if [ "${offered_proto}" = "WebSocket" ]; then
 				if [ -n "${dhcp_mqtt}" ]; then
-					uci -q del obuspa.$dhcp_mqtt
+					uci -q delete obuspa."${dhcp_mqtt}"
 				fi
 
 				if [ -z "${dhcp_mtp}" ]; then
 					sec=$(uci -q add obuspa mtp)
 					uci -q rename obuspa."${sec}"='dhcpmtp'
 					dhcp_mtp="dhcpmtp"
-					uci -q set obuspa.$dhcp_mtp.Enable='1'
+					uci -q set obuspa."${dhcp_mtp}".Enable='1'
 				fi
 
-				uci -q set obuspa.$dhcp_mtp.mqtt=''
-				uci -q set obuspa.$dhcp_mtp.ResponseTopicConfigured=''
-				uci -q set obuspa.$dhcp_mtp.Protocol='WebSocket'
-				uci -q set obuspa.$dhcp_mtp.Port="${port}"
-				uci -q set obuspa.$dhcp_mtp.EnableEncryption="${mtp_encrypt}"
+				uci -q set obuspa."${dhcp_mtp}".mqtt=''
+				uci -q set obuspa."${dhcp_mtp}".ResponseTopicConfigured=''
+				uci -q set obuspa."${dhcp_mtp}".Protocol='WebSocket'
+				uci -q set obuspa."${dhcp_mtp}".Port="${port}"
+				uci -q set obuspa."${dhcp_mtp}".EnableEncryption="${mtp_encrypt}"
 
 				uci_change=1
 			else
@@ -397,78 +397,78 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 					sec=$(uci -q add obuspa mqtt)
 					uci -q rename obuspa."${sec}"='dhcpmqtt'
 					dhcp_mqtt="dhcpmqtt"
-					uci -q set obuspa.$dhcp_mqtt.Enable='1'
-					uci -q set obuspa.$dhcp_mqtt.Username="${user}"
-					uci -q set obuspa.$dhcp_mqtt.Password="${pass}"
+					uci -q set obuspa."${dhcp_mqtt}".Enable='1'
+					uci -q set obuspa."${dhcp_mqtt}".Username="${user}"
+					uci -q set obuspa."${dhcp_mqtt}".Password="${pass}"
 				fi
 
-				uci -q set obuspa.$dhcp_mqtt.BrokerAddress="${ip}"
-				uci -q set obuspa.$dhcp_mqtt.BrokerPort="${port}"
-				uci -q set obuspa.$dhcp_mqtt.TransportProtocol="${mtp_encrypt}"
-				uci -q set obuspa.$dhcp_mqtt.ProtocolVersion='5.0'
+				uci -q set obuspa."${dhcp_mqtt}".BrokerAddress="${ip}"
+				uci -q set obuspa."${dhcp_mqtt}".BrokerPort="${port}"
+				uci -q set obuspa."${dhcp_mqtt}".TransportProtocol="${mtp_encrypt}"
+				uci -q set obuspa."${dhcp_mqtt}".ProtocolVersion='5.0'
 
 				if [ -z "${dhcp_mtp}" ]; then
 					sec=$(uci -q add obuspa mtp)
 					uci -q rename obuspa."${sec}"='dhcpmtp'
 					dhcp_mtp="dhcpmtp"
-					uci -q set obuspa.$dhcp_mtp.Enable='1'
+					uci -q set obuspa."${dhcp_mtp}".Enable='1'
 				fi
 
 				agent_topic=$(get_agent_topic)
-				uci -q set obuspa.$dhcp_mtp.Port=""
-				uci -q set obuspa.$dhcp_mtp.EnableEncryption=""
-				uci -q set obuspa.$dhcp_mtp.Protocol='MQTT'
-				uci -q set obuspa.$dhcp_mtp.ResponseTopicConfigured="${agent_topic}"
-				uci -q set obuspa.$dhcp_mtp.mqtt="${dhcp_mqtt}"
+				uci -q delete obuspa."${dhcp_mtp}".Port
+				uci -q delete obuspa."${dhcp_mtp}".EnableEncryption
+				uci -q set obuspa."${dhcp_mtp}".Protocol='MQTT'
+				uci -q set obuspa."${dhcp_mtp}".ResponseTopicConfigured="${agent_topic}"
+				uci -q set obuspa."${dhcp_mtp}".mqtt="${dhcp_mqtt}"
 
 				uci_change=1
 			fi
 		else
-			if [ "${ct_proto}" == "WebSocket" ]; then
-				conf_ip="$(uci -q get obuspa.$dhcp_controller.Host)"
-				conf_port="$(uci -q get obuspa.$dhcp_mtp.Port)"
-				conf_encr="$(uci -q get obuspa.$dhcp_mtp.EnableEncryption)"
+			if [ "${ct_proto}" = "WebSocket" ]; then
+				conf_ip="$(uci -q get obuspa."${dhcp_controller}".Host)"
+				conf_port="$(uci -q get obuspa."${dhcp_mtp}".Port)"
+				conf_encr="$(uci -q get obuspa."${dhcp_mtp}".EnableEncryption)"
 
 				if [ -n "${ip}" ] && [ "${conf_ip}" != "${ip}" ]; then
-					uci -q set obuspa.$dhcp_controller.Host="${ip}"
+					uci -q set obuspa."${dhcp_controller}".Host="${ip}"
 					uci_change=1
 				fi
 
 				if [ -n "${port}" ] && [ "${conf_port}" != "${port}" ]; then
-					uci -q set obuspa.$dhcp_mtp.Port="${port}"
-					uci -q set obuspa.$dhcp_controller.Port="${port}"
+					uci -q set obuspa."${dhcp_mtp}".Port="${port}"
+					uci -q set obuspa."${dhcp_controller}".Port="${port}"
 					uci_change=1
 				fi
 
 				if [ -n "${mtp_encrypt}" ] && [ "${conf_encr}" != "${mtp_encrypt}" ]; then
-					uci -q set obuspa.$dhcp_mtp.EnableEncryption="${mtp_encrypt}"
-					uci -q set obuspa.$dhcp_controller.EnableEncryption="${mtp_encrypt}"
+					uci -q set obuspa."${dhcp_mtp}".EnableEncryption="${mtp_encrypt}"
+					uci -q set obuspa."${dhcp_controller}".EnableEncryption="${mtp_encrypt}"
 					uci_change=1
 				fi
 			else
-				conf_ip="$(uci -q get obuspa.$dhcp_mqtt.BrokerAddress)"
-				conf_port="$(uci -q get obuspa.$dhcp_mqtt.BrokerPort)"
-				conf_encr="$(uci -q get obuspa.$dhcp_mqtt.TransportProtocol)"
+				conf_ip=$(uci -q get obuspa."${dhcp_mqtt}".BrokerAddress)
+				conf_port=$(uci -q get obuspa."${dhcp_mqtt}".BrokerPort)
+				conf_encr=$(uci -q get obuspa."${dhcp_mqtt}".TransportProtocol)
 
 				if [ -n "${port}" ] && [ "${conf_port}" != "${port}" ]; then
-					uci -q set obuspa.$dhcp_mqtt.BrokerPort="${port}"
+					uci -q set obuspa."${dhcp_mqtt}".BrokerPort="${port}"
 					uci_change=1
 				fi
 
 				if [ -n "${mtp_encrypt}" ] && [ "${conf_encr}" != "${mtp_encrypt}" ]; then
-					uci -q set obuspa.$dhcp_mqtt.TransportProtocol="${mtp_encrypt}"
+					uci -q set obuspa."${dhcp_mqtt}".TransportProtocol="${mtp_encrypt}"
 					uci_change=1
 				fi
 
 				if [ -n "${ip}" ] && [ "${conf_ip}" != "${ip}" ]; then
-					uci -q set obuspa.$dhcp_mqtt.BrokerAddress="${ip}"
+					uci -q set obuspa."${dhcp_mqtt}".BrokerAddress="${ip}"
 					uci_change=1
 				fi
 			fi
 		fi
 	else
-		uci -q del obuspa.dhcpmtp
-		uci -q del obuspa.dhcpmqtt
+		uci -q delete obuspa.dhcpmtp
+		uci -q delete obuspa.dhcpmqtt
 
 		sec=$(uci -q add obuspa controller)
 		uci -q rename obuspa."${sec}"='dhcpcontroller'
@@ -480,7 +480,7 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 		uci -q set obuspa.dhcpcontroller.Enable='1'
 
 		if [ -n "${offered_proto}" ]; then
-			if [ "${offered_proto}" == "MQTT" ]; then
+			if [ "${offered_proto}" = "MQTT" ]; then
 				user="$(uci -q get obuspa.global.username)"
 				pass="$(uci -q get obuspa.global.password)"
 

obuspa/patches/0002-fix_e2e_session_init.patch

@@ -1,8 +1,8 @@
-Index: obuspa-10.0.4.0/src/core/device_controller.c
+Index: obuspa-10.0.5.0/src/core/device_controller.c
 ===================================================================
---- obuspa-10.0.4.0.orig/src/core/device_controller.c
-+++ obuspa-10.0.4.0/src/core/device_controller.c
-@@ -4214,6 +4214,14 @@ int ProcessControllerAdded(int cont_inst
+--- obuspa-10.0.5.0.orig/src/core/device_controller.c
++++ obuspa-10.0.5.0/src/core/device_controller.c
+@@ -4223,6 +4223,14 @@ int ProcessControllerAdded(int cont_inst
          goto exit;
      }
  
@@ -17,7 +17,7 @@ Index: obuspa-10.0.4.0/src/core/device_controller.c
      // Exit if unable to get the object instance numbers present in this controller's MTP table
      USP_SNPRINTF(path, sizeof(path), "%s.%d.MTP", device_cont_root, cont_instance);
      err = DATA_MODEL_GetInstances(path, &iv);
-@@ -4255,14 +4263,6 @@ int ProcessControllerAdded(int cont_inst
+@@ -4264,14 +4272,6 @@ int ProcessControllerAdded(int cont_inst
      DEVICE_MQTT_UpdateControllerTopics();
  #endif
  

obuspa/patches/0006-contains-expression.patch

@@ -1,7 +1,7 @@
-Index: obuspa-10.0.4.0/src/core/expr_vector.c
+Index: obuspa-10.0.5.0/src/core/expr_vector.c
 ===================================================================
---- obuspa-10.0.4.0.orig/src/core/expr_vector.c
-+++ obuspa-10.0.4.0/src/core/expr_vector.c
+--- obuspa-10.0.5.0.orig/src/core/expr_vector.c
++++ obuspa-10.0.5.0/src/core/expr_vector.c
 @@ -59,6 +59,7 @@ char *expr_op_2_str[kExprOp_Max] =
      "<",  // kExprOp_LessThan
      ">",  // kExprOp_GreaterThan
@@ -26,10 +26,10 @@ Index: obuspa-10.0.4.0/src/core/expr_vector.c
  
      // Exit if found the "<" operator
      op = strchr(buf, '<');
-Index: obuspa-10.0.4.0/src/core/path_resolver.c
+Index: obuspa-10.0.5.0/src/core/path_resolver.c
 ===================================================================
---- obuspa-10.0.4.0.orig/src/core/path_resolver.c
-+++ obuspa-10.0.4.0/src/core/path_resolver.c
+--- obuspa-10.0.5.0.orig/src/core/path_resolver.c
++++ obuspa-10.0.5.0/src/core/path_resolver.c
 @@ -1088,7 +1088,7 @@ int ResolveUniqueKey(char *resolved, cha
      char temp[MAX_DM_PATH];
      bool is_match;
@@ -38,7 +38,7 @@ Index: obuspa-10.0.4.0/src/core/path_resolver.c
 +    expr_op_t valid_ops[] = {kExprOp_Equal, kExprOp_NotEqual, kExprOp_LessThanOrEqual, kExprOp_GreaterThanOrEqual, kExprOp_LessThan, kExprOp_GreaterThan, kExprOp_Contains};
  
      // Exit if unable to find the end of the unique key
-     p = strchr(unresolved, ']');
+     p = TEXT_UTILS_StrStr(unresolved, "]");
 @@ -1754,6 +1754,67 @@ int DoUniqueKeysMatch(int index, search_
          }
          USP_ASSERT(gge->value != NULL);     // GROUP_GET_VECTOR_GetValues() should have set an error message if the vendor hook didn't set a value for the parameter
@@ -107,10 +107,10 @@ Index: obuspa-10.0.4.0/src/core/path_resolver.c
          // Determine the function to call to perform the comparison
          if (type_flags & (DM_INT | DM_UINT | DM_ULONG | DM_LONG | DM_DECIMAL))
          {
-Index: obuspa-10.0.4.0/src/include/usp_api.h
+Index: obuspa-10.0.5.0/src/include/usp_api.h
 ===================================================================
---- obuspa-10.0.4.0.orig/src/include/usp_api.h
-+++ obuspa-10.0.4.0/src/include/usp_api.h
+--- obuspa-10.0.5.0.orig/src/include/usp_api.h
++++ obuspa-10.0.5.0/src/include/usp_api.h
 @@ -106,6 +106,7 @@ typedef enum
      kExprOp_LessThan,               // '<'
      kExprOp_GreaterThan,            // '>'

obuspa/patches/1000-SecuredRole-bbfdm.patch

@@ -1,40 +1,40 @@
-Index: obuspa-10.0.4.0/src/core/device.h
+Index: obuspa-10.0.5.0/src/core/device.h
 ===================================================================
---- obuspa-10.0.4.0.orig/src/core/device.h
-+++ obuspa-10.0.4.0/src/core/device.h
-@@ -310,6 +310,8 @@ void DEVICE_CTRUST_ApplyPermissionsToSub
+--- obuspa-10.0.5.0.orig/src/core/device.h
++++ obuspa-10.0.5.0/src/core/device.h
+@@ -311,6 +311,9 @@ int DEVICE_CTRUST_InstSelToRoleInstance(
  char *DEVICE_CTRUST_InstSelToPermTarget(int role_index, void *is, int *perm_instance);
  int DEVICE_CTRUST_SetRoleParameter(int instance, char *param_name, char *new_value);
  int DEVICE_CTRUST_SetPermissionParameter(int instance1, int instance2, char *param_name, char *new_value);
++
 +bool DEVICE_CTRUST_IsControllerSecured(void);
 +
+ int DEVICE_CTRUST_DumpPermissionSelectors(int role_instance, char *path);
  int DEVICE_REQUEST_Init(void);
  int DEVICE_REQUEST_Add(char *path, char *command_key, int *instance);
- void DEVICE_REQUEST_OperationComplete(int instance, int err_code, char *err_msg, kv_vector_t *output_args);
-Index: obuspa-10.0.4.0/src/core/device_ctrust.c
+Index: obuspa-10.0.5.0/src/core/device_ctrust.c
 ===================================================================
---- obuspa-10.0.4.0.orig/src/core/device_ctrust.c
-+++ obuspa-10.0.4.0/src/core/device_ctrust.c
-@@ -236,6 +236,7 @@ credential_t *FindCredentialByCertInstan
+--- obuspa-10.0.5.0.orig/src/core/device_ctrust.c
++++ obuspa-10.0.5.0/src/core/device_ctrust.c
+@@ -246,6 +246,7 @@ credential_t *FindCredentialByCertInstan
  int Get_CredentialRole(dm_req_t *req, char *buf, int len);
  int Get_CredentialCertificate(dm_req_t *req, char *buf, int len);
  int Get_CredentialNumEntries(dm_req_t *req, char *buf, int len);
 +int Validate_SecuredRoles(dm_req_t *req, char *value);
+ void ApplySearchExpressionPermissions(char *path, inst_sel_t *sel);
+ bool ValidateDataModelPathSegment(char *segment, bool is_last, char *path);
+ 
+@@ -293,6 +294,9 @@ int DEVICE_CTRUST_Init(void)
+     // Create a timer which will be used to apply all modified permissions to the data model, after processing a USP Message
+     SYNC_TIMER_Add(ApplyModifiedPermissions, 0, END_OF_TIME);
  
- #ifndef REMOVE_DEVICE_SECURITY
- int InitChallengeTable();
-@@ -355,6 +356,10 @@ int DEVICE_CTRUST_Init(void)
-                         challenge_response_input_args, NUM_ELEM(challenge_response_input_args),
-                         NULL, 0);
- #endif
-+
 +    // Register Device.LocalAgent.ControllerTrust.SecuredRoles parameter
 +    err |= USP_REGISTER_DBParam_ReadWrite(DEVICE_CTRUST_ROOT ".SecuredRoles", "", Validate_SecuredRoles, NULL, DM_STRING);
 +
-     // Exit if any errors occurred
-     if (err != USP_ERR_OK)
-     {
-@@ -2939,3 +2944,139 @@ exit:
+     // Register parameters implemented by this component
+     // Device.LocalAgent.ControllerTrust.Role.{i}
+     err |= USP_REGISTER_Object(DEVICE_ROLE_ROOT, ValidateAdd_CTrustRole, NULL, Notify_CTrustRoleAdded,
+@@ -3533,3 +3537,139 @@ exit:
      return err;
  }
  #endif // REMOVE_DEVICE_SECURITY

obuspa/patches/1000-suppress-logs.patch

@@ -1,8 +1,8 @@
-Index: obuspa-10.0.0.2/src/core/cli_server.c
+Index: obuspa-10.0.7.0/src/core/cli_server.c
 ===================================================================
---- obuspa-10.0.0.2.orig/src/core/cli_server.c
-+++ obuspa-10.0.0.2/src/core/cli_server.c
-@@ -724,10 +724,6 @@ int ExecuteCli_Get(str_vector_t *args)
+--- obuspa-10.0.7.0.orig/src/core/cli_server.c
++++ obuspa-10.0.7.0/src/core/cli_server.c
+@@ -726,10 +726,6 @@ int ExecuteCli_Get(str_vector_t *args)
              USP_ASSERT(gge->value != NULL);
              SendCliResponse("%s => %s\n", gge->path, gge->value);
          }
@@ -13,11 +13,11 @@ Index: obuspa-10.0.0.2/src/core/cli_server.c
      }
  
      GROUP_GET_VECTOR_Destroy(&ggv);
-Index: obuspa-10.0.0.2/src/core/data_model.c
+Index: obuspa-10.0.7.0/src/core/data_model.c
 ===================================================================
---- obuspa-10.0.0.2.orig/src/core/data_model.c
-+++ obuspa-10.0.0.2/src/core/data_model.c
-@@ -1321,7 +1321,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
+--- obuspa-10.0.7.0.orig/src/core/data_model.c
++++ obuspa-10.0.7.0/src/core/data_model.c
+@@ -1398,7 +1398,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
      // Exit if instance already exists - nothing to do
      if (exists)
      {
@@ -26,7 +26,7 @@ Index: obuspa-10.0.0.2/src/core/data_model.c
          return USP_ERR_CREATION_FAILURE;
      }
  
-@@ -1409,7 +1409,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
+@@ -1486,7 +1486,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
      // Exit if instance does not exist - nothing to do
      if (exists == false)
      {
@@ -35,11 +35,11 @@ Index: obuspa-10.0.0.2/src/core/data_model.c
          return USP_ERR_OBJECT_DOES_NOT_EXIST;
      }
  
-diff --git a/src/core/mqtt.c b/src/core/mqtt.c
-index 388697a..444b4da 100644
---- a/src/core/mqtt.c
-+++ b/src/core/mqtt.c
-@@ -4020,7 +4020,7 @@ void MessageV5Callback(struct mosquitto *mosq, void *userdata, const struct mosq
+Index: obuspa-10.0.7.0/src/core/mqtt.c
+===================================================================
+--- obuspa-10.0.7.0.orig/src/core/mqtt.c
++++ obuspa-10.0.7.0/src/core/mqtt.c
+@@ -4070,7 +4070,7 @@ void MessageV5Callback(struct mosquitto
      if (mosquitto_property_read_string(props, RESPONSE_TOPIC,
              &response_info_ptr, false) == NULL)
      {

obuspa/patches/1001-use-datamodel-caching.patch

@@ -4,11 +4,11 @@ Date:   Wed Apr 30 17:18:27 2025 +0530
 
     1001-use-datamodel-caching.patch
 
-diff --git a/src/core/cli_server.c b/src/core/cli_server.c
-index da61c6f..abac7cb 100644
---- a/src/core/cli_server.c
-+++ b/src/core/cli_server.c
-@@ -511,6 +511,7 @@ int CLI_SERVER_ExecuteCliCommand(char *cmd_line)
+Index: obuspa-10.0.7.0/src/core/cli_server.c
+===================================================================
+--- obuspa-10.0.7.0.orig/src/core/cli_server.c
++++ obuspa-10.0.7.0/src/core/cli_server.c
+@@ -513,6 +513,7 @@ int CLI_SERVER_ExecuteCliCommand(char *c
          SendCliResponse("WARNING: Discarding unused args: %s\n", args.vector[cli_cmd->max_args+1]);
      }
  
@@ -16,7 +16,7 @@ index da61c6f..abac7cb 100644
      // Process command
      err = cli_cmd->exec_cmd(&args);
      print_help = false;
-@@ -670,6 +671,11 @@ int ExecuteCli_Version(str_vector_t *args)
+@@ -672,6 +673,11 @@ int ExecuteCli_Version(str_vector_t *arg
  int ExecuteCli_Get(str_vector_t *args)
  {
      combined_role_t *combined_role;
@@ -28,22 +28,22 @@ index da61c6f..abac7cb 100644
  #ifndef REMOVE_USP_BROKER
      char *arg1;
  
-diff --git a/src/core/data_model.h b/src/core/data_model.h
-index 7564127..2736d7c 100755
---- a/src/core/data_model.h
-+++ b/src/core/data_model.h
-@@ -405,5 +405,6 @@ int DM_PRIV_ReRegister_DBParam_Default(char *path, char *value);
+Index: obuspa-10.0.7.0/src/core/data_model.h
+===================================================================
+--- obuspa-10.0.7.0.orig/src/core/data_model.h
++++ obuspa-10.0.7.0/src/core/data_model.h
+@@ -417,5 +417,6 @@ int DM_PRIV_ReRegister_DBParam_Default(c
  bool DM_PRIV_IsChildNodeOf(dm_node_t *node, dm_node_t *parent_node);
  void DM_PRIV_GetAllEventsAndCommands(dm_node_t *node, str_vector_t *events, str_vector_t *commands);
  
 +int vendor_create_dm_cache(char *paths[], int num_paths);
  #endif
  
-diff --git a/src/core/handle_get.c b/src/core/handle_get.c
-index d9d3e9e..c263978 100644
---- a/src/core/handle_get.c
-+++ b/src/core/handle_get.c
-@@ -129,6 +129,7 @@ void MSG_HANDLER_HandleGet(Usp__Msg *usp, char *controller_endpoint, mtp_conn_t
+Index: obuspa-10.0.7.0/src/core/handle_get.c
+===================================================================
+--- obuspa-10.0.7.0.orig/src/core/handle_get.c
++++ obuspa-10.0.7.0/src/core/handle_get.c
+@@ -129,6 +129,7 @@ void MSG_HANDLER_HandleGet(Usp__Msg *usp
          goto exit;
      }
  
@@ -51,11 +51,11 @@ index d9d3e9e..c263978 100644
      // Calculate the number of hierarchical levels to traverse in the data model when performing partial path resolution
      // NOTE: protocol buffer has depth as an unsigned quantity, but internally we use a signed number, so limit range to that of a signed number
      depth = usp->body->request->get->max_depth;
-diff --git a/src/core/msg_handler.c b/src/core/msg_handler.c
-index 647591d..b7498d8 100755
---- a/src/core/msg_handler.c
-+++ b/src/core/msg_handler.c
-@@ -863,6 +863,8 @@ int HandleUspMessage(Usp__Msg *usp, char *endpoint_id, mtp_conn_t *mtpc)
+Index: obuspa-10.0.7.0/src/core/msg_handler.c
+===================================================================
+--- obuspa-10.0.7.0.orig/src/core/msg_handler.c
++++ obuspa-10.0.7.0/src/core/msg_handler.c
+@@ -987,6 +987,8 @@ int HandleUspMessage(Usp__Msg *usp, char
                  MSG_HANDLER_UspMsgTypeToString(usp->header->msg_type),
                  iso8601_cur_time(buf, sizeof(buf)) );
  

obuspa/patches/1003-ct-full-access-rename.patch

@@ -1,8 +1,8 @@
-Index: obuspa-10.0.0.2/src/core/data_model.c
+Index: obuspa-10.0.7.0/src/core/data_model.c
 ===================================================================
---- obuspa-10.0.0.2.orig/src/core/data_model.c
-+++ obuspa-10.0.0.2/src/core/data_model.c
-@@ -5347,7 +5347,7 @@ int RegisterDefaultControllerTrust(void)
+--- obuspa-10.0.7.0.orig/src/core/data_model.c
++++ obuspa-10.0.7.0/src/core/data_model.c
+@@ -5519,7 +5519,7 @@ int RegisterDefaultControllerTrust(void)
      int err = USP_ERR_OK;
  
      // Register 'Full Access' role

obuspa/patches/2001-validate-controller-mtp.patch

@@ -1,8 +1,8 @@
-Index: obuspa-10.0.4.0/src/core/device.h
+Index: obuspa-10.0.6.0/src/core/device.h
 ===================================================================
---- obuspa-10.0.4.0.orig/src/core/device.h
-+++ obuspa-10.0.4.0/src/core/device.h
-@@ -352,6 +352,10 @@ void DEVICE_CONTROLLER_SetInheritedRole(
+--- obuspa-10.0.6.0.orig/src/core/device.h
++++ obuspa-10.0.6.0/src/core/device.h
+@@ -355,6 +355,10 @@ void DEVICE_CONTROLLER_SetInheritedRole(
  int DEVICE_CONTROLLER_CountEnabledWebsockClientConnections(void);
  #endif
  
@@ -13,11 +13,11 @@ Index: obuspa-10.0.4.0/src/core/device.h
  #ifndef REMOVE_USP_BROKER
  int DEVICE_SUBSCRIPTION_RouteNotification(Usp__Msg *usp, int instance, char *subscribed_path);
  bool DEVICE_SUBSCRIPTION_MarkVendorLayerSubs(int broker_instance, subs_notify_t notify_type, char *path, int group_id);
-Index: obuspa-10.0.4.0/src/core/device_controller.c
+Index: obuspa-10.0.6.0/src/core/device_controller.c
 ===================================================================
---- obuspa-10.0.4.0.orig/src/core/device_controller.c
-+++ obuspa-10.0.4.0/src/core/device_controller.c
-@@ -968,6 +968,78 @@ int DEVICE_CONTROLLER_QueueBinaryMessage
+--- obuspa-10.0.6.0.orig/src/core/device_controller.c
++++ obuspa-10.0.6.0/src/core/device_controller.c
+@@ -969,6 +969,78 @@ int DEVICE_CONTROLLER_QueueBinaryMessage
      return USP_ERR_OK;
  }
  
@@ -96,11 +96,11 @@ Index: obuspa-10.0.4.0/src/core/device_controller.c
  /*********************************************************************//**
  **
  ** DEVICE_CONTROLLER_IsMTPConfigured
-Index: obuspa-10.0.4.0/src/core/msg_handler.c
+Index: obuspa-10.0.6.0/src/core/msg_handler.c
 ===================================================================
---- obuspa-10.0.4.0.orig/src/core/msg_handler.c
-+++ obuspa-10.0.4.0/src/core/msg_handler.c
-@@ -1220,6 +1220,15 @@ int ValidateUspRecord(UspRecord__Record
+--- obuspa-10.0.6.0.orig/src/core/msg_handler.c
++++ obuspa-10.0.6.0/src/core/msg_handler.c
+@@ -1344,6 +1344,15 @@ int ValidateUspRecord(UspRecord__Record
      usp_service_instance = USP_BROKER_GetUspServiceInstance(rec->from_id, 0);
  #endif
  

obuspa/patches/2002-max_controllers.patch

@@ -1,8 +1,8 @@
-Index: obuspa-10.0.0.1/src/core/mqtt.c
+Index: obuspa-10.0.6.0/src/core/mqtt.c
 ===================================================================
---- obuspa-10.0.0.1.orig/src/core/mqtt.c
-+++ obuspa-10.0.0.1/src/core/mqtt.c
-@@ -259,6 +259,8 @@ void MqttSubscriptionDestroy(mqtt_subscr
+--- obuspa-10.0.6.0.orig/src/core/mqtt.c
++++ obuspa-10.0.6.0/src/core/mqtt.c
+@@ -265,6 +265,8 @@ void SaveMqttPublishErrMsg(const char *f
  #define DEFINE_MQTT_TrustCertVerifyCallbackIndex(index) \
  int MQTT_TrustCertVerifyCallback_##index (int preverify_ok, X509_STORE_CTX *x509_ctx) \
  {\
@@ -11,7 +11,7 @@ Index: obuspa-10.0.0.1/src/core/mqtt.c
      return DEVICE_SECURITY_TrustCertVerifyCallbackWithCertChain(preverify_ok, x509_ctx, &mqtt_clients[index].cert_chain);\
  }
  
-@@ -269,6 +271,11 @@ DEFINE_MQTT_TrustCertVerifyCallbackIndex
+@@ -275,6 +277,11 @@ DEFINE_MQTT_TrustCertVerifyCallbackIndex
  DEFINE_MQTT_TrustCertVerifyCallbackIndex(2);
  DEFINE_MQTT_TrustCertVerifyCallbackIndex(3);
  DEFINE_MQTT_TrustCertVerifyCallbackIndex(4);
@@ -23,7 +23,7 @@ Index: obuspa-10.0.0.1/src/core/mqtt.c
  // Add more, with incrementing indexes here, if you change MAX_MQTT_CLIENTS
  
  //------------------------------------------------------------------------------------
-@@ -279,10 +286,15 @@ ssl_verify_callback_t* mqtt_verify_callb
+@@ -285,10 +292,15 @@ ssl_verify_callback_t* mqtt_verify_callb
      MQTT_TrustCertVerifyCallbackIndex(2),
      MQTT_TrustCertVerifyCallbackIndex(3),
      MQTT_TrustCertVerifyCallbackIndex(4),

obuspa/patches/2004-mqtt-dualstack-fallback.patch

@@ -1,7 +1,7 @@
-diff --git a/src/core/mqtt.c b/src/core/mqtt.c
-index 70978501b1..96119fe080 100644
---- a/src/core/mqtt.c
-+++ b/src/core/mqtt.c
+Index: obuspa-10.0.7.0/src/core/mqtt.c
+===================================================================
+--- obuspa-10.0.7.0.orig/src/core/mqtt.c
++++ obuspa-10.0.7.0/src/core/mqtt.c
 @@ -53,6 +53,7 @@
  #include <openssl/bio.h>
  #include <openssl/err.h>
@@ -10,7 +10,7 @@ index 70978501b1..96119fe080 100644
  #include <mosquitto.h>
  
  #include "mqtt.h"
-@@ -201,8 +202,9 @@ int EnableMosquitto(mqtt_client_t *client);
+@@ -206,8 +207,9 @@ int EnableMosquitto(mqtt_client_t *clien
  void SetupCallbacks(mqtt_client_t *client);
  void QueueUspConnectRecord_MQTT(mqtt_client_t *client, mtp_send_item_t *msi, char *controller_topic, time_t expiry_time);
  int SendQueueHead(mqtt_client_t *client);
@@ -21,7 +21,7 @@ index 70978501b1..96119fe080 100644
  int ConnectSetEncryption(mqtt_client_t *client);
  void ConnectCallback(struct mosquitto *mosq, void *userdata, int result);
  void ConnectV5Callback(struct mosquitto *mosq, void *userdata, int result, int flags, const mosquitto_property *props);
-@@ -245,7 +247,7 @@ void HandleMqttReconnect(mqtt_client_t *client);
+@@ -250,7 +252,7 @@ void HandleMqttReconnect(mqtt_client_t *
  void HandleMqttReconnectAfterDisconnect(mqtt_client_t *client);
  void HandleMqttDisconnect(mqtt_client_t *client);
  void DisconnectIfAllSubscriptionsFailed(mqtt_client_t *client);
@@ -30,7 +30,7 @@ index 70978501b1..96119fe080 100644
  void RemoveMqttQueueItem(mqtt_client_t *client, mqtt_send_item_t *queued_msg);
  void RemoveExpiredMqttMessages(mqtt_client_t *client);
  void ParseSubscribeTopicsFromConnack(mqtt_client_t *client, mosquitto_property *prop);
-@@ -2350,6 +2352,143 @@ int SendQueueHead(mqtt_client_t *client)
+@@ -2380,6 +2382,143 @@ int SendQueueHead(mqtt_client_t *client)
      return err;
  }
  
@@ -174,7 +174,7 @@ index 70978501b1..96119fe080 100644
  /*********************************************************************//**
  **
  ** IsMqttBrokerUp
-@@ -2364,109 +2503,92 @@ int SendQueueHead(mqtt_client_t *client)
+@@ -2394,109 +2533,92 @@ int SendQueueHead(mqtt_client_t *client)
  ** \return  true if the MQTT Broker is up, false otherwise
  **
  **************************************************************************/
@@ -343,7 +343,7 @@ index 70978501b1..96119fe080 100644
      }
  
      return result;
-@@ -2487,18 +2609,20 @@ void Connect(mqtt_client_t *client)
+@@ -2517,18 +2639,20 @@ void Connect(mqtt_client_t *client)
  {
      int err = USP_ERR_OK;
      bool is_up;
@@ -367,7 +367,7 @@ index 70978501b1..96119fe080 100644
  
      // Exit if failed to connect
      if (err != USP_ERR_OK)
-@@ -2531,7 +2655,7 @@ exit:
+@@ -2561,7 +2685,7 @@ exit:
  ** \return  USP_ERR_INTERNAL_ERROR if failed to connect (and should retry)
  **
  **************************************************************************/
@@ -376,7 +376,7 @@ index 70978501b1..96119fe080 100644
  {
      int version;
      mosquitto_property *proplist = NULL;
-@@ -2601,19 +2725,19 @@ int PerformMqttClientConnect(mqtt_client_t *client)
+@@ -2631,19 +2755,19 @@ int PerformMqttClientConnect(mqtt_client
      // We do this to prevent the data model thread from potentially being blocked, whilst the connect call is taking place
      OS_UTILS_UnlockMutex(&mqtt_access_mutex);
  

parental-control/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=parental-control
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.3.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/parental-control.git
-PKG_SOURCE_VERSION:=120dbcd6508b817d2ce3d579a1bfbd5bfd1a44cb
+PKG_SOURCE_VERSION:=b1e5b3f81f08271bdaf9cb4bda8a7696a27be3c6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -81,19 +81,20 @@ define Package/parental-control/install
 
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DATA) ./files/etc/uci-defaults/95-firewall_parentalcontrol.ucidefaults $(1)/etc/uci-defaults/
-	$(INSTALL_DATA) ./files/etc/uci-defaults/95-migrate_urlfilter.ucidefaults $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/35-migrate_urlfilter.ucidefaults $(1)/etc/uci-defaults/
 
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/parentalcontrol $(1)/lib/upgrade/keep.d/parentalcontrol
 
 	$(BBFDM_REGISTER_SERVICES) -v ${VENDOR_PREFIX} ./bbfdm_service.json $(1) parentalcontrol
 
+	$(INSTALL_DATA) ./files/etc/uci-defaults/40-parental_control_update_bundle_path $(1)/etc/uci-defaults/
 ifeq ($(CONFIG_PARENTAL_CONTROL_URLFILTERING),y)
-	$(INSTALL_DATA) ./files/etc/uci-defaults/55-add-default-bundles $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/50-parental_control_add_bundles $(1)/etc/uci-defaults/
 	$(CP) ./files/urlbundle_override.json $(1)/etc/parentalcontrol/
 else
 	$(BBFDM_INSTALL_MS_PLUGIN) -v ${VENDOR_PREFIX} ./files/urlbundle_override.json $(1) parentalcontrol
-	$(INSTALL_DATA) ./files/etc/uci-defaults/50-parental_control_urlfilter $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/50-parental_control_disable_urlfilter $(1)/etc/uci-defaults/
 endif
 endef
 

parental-control/files/etc/config/parentalcontrol

@@ -1,4 +1,3 @@
 config globals 'globals'
-    option enable '0'
+    option enable '1'
     option loglevel '3'
-    option urlfilter '1'

parental-control/files/etc/firewall.parentalcontrol

@@ -5,19 +5,16 @@
 enabled="$(uci -q get parentalcontrol.globals.enable)"
 urlfilter="$(uci -q get parentalcontrol.globals.urlfilter)"
 
-# if parentalcontrol is  enabled, add the rules, else remove them
+# if parentalcontrol is enabled, add the rules, else remove them
 if [ "${enabled}" -eq "1" ]; then
+	# this is for internet_access and profile_bedtime_schedule sections
+	add_internet_schedule_rules
 	# this is for urlfilter daemon
-	add_iptables_nfqueue_rules
 	if [ "${urlfilter}" -eq "1" ]; then
-		# this for internet_access and profile_bedtime_schedule sections
-		add_internet_schedule_rules
+		add_iptables_nfqueue_rules
 	fi
 else
-	# remove urlfilter daemon rules
+	# remove internet_access and profile_bedtime_schedule rules
+	remove_internet_schedule_rules
 	remove_iptables_nfqueue_rules
-	if [ "${urlfilter}" -eq "1" ]; then
-		# remove internet_access and profile_bedtime_schedule rules
-		remove_internet_schedule_rules
-	fi
 fi

parental-control/files/etc/init.d/parentalcontrol

@@ -44,9 +44,11 @@ configure_fw_rules() {
 		else
 			# Now flush the existing connections, otherwise,
 			# URL filtering cannot be performed on already open sites.
-			if [ -n "$(which conntrack)" ]; then
-				sleep 5
-				conntrack -F
+			if which hw_nat > /dev/null 2>&1; then
+				hw_nat -! > /dev/null 2>&1
+			fi
+			if which conntrack > /dev/null 2>&1; then
+				conntrack -F > /dev/null 2>&1
 			fi
 
 			# this is for urlfilter daemon
@@ -83,14 +85,13 @@ start_service() {
 	config_load parentalcontrol
 	validate_global_section
 
-	[ -n "${bundle_path}" ] && mkdir -p ${bundle_path}
-
-	# add default bundles
-	process_default_bundles
 	# add firewall rules
 	configure_fw_rules
 
 	if [ "${urlfilter}" -eq "1" ]; then
+		# add default bundles
+		[ -n "${bundle_path}" ] && mkdir -p ${bundle_path}
+		process_default_bundles
 		enable_urlfilter_dm
 	else
 		disable_urlfilter_dm
@@ -100,7 +101,7 @@ start_service() {
 	# then /tmp/dhcp.leases will be empty until clients try to get a lease,
 	# in that case, hostnames will not be processed by the daemon,
 	# for this we copy /tmp/dhcp.leases to /etc/parentalcontrol/dhcp.leases
-	# which will be persistent acrros reboots and upgrade where settings are kept
+	# which will be persistent across reboots and upgrade (with keep settings)
 	# and will be used as a backup in case /tmp/dhcp.leases is empty
 	copy_dhcp_leases
 

parental-control/files/etc/uci-defaults/35-migrate_urlfilter.ucidefaults

@@ -2,6 +2,8 @@
 
 . /lib/functions.sh
 
+[ ! -f "/etc/config/urlfilter" ] && exit 0
+
 # Convert URL filter to parental control format
 urlfilter_config="/etc/config/urlfilter"
 parentalcontrol_config="/etc/config/parentalcontrol"

parental-control/files/etc/uci-defaults/40-parental_control_update_bundle_path

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+[ ! -f "/etc/config/parentalcontrol" ] && exit 0
+
+APPS_DIR="/apps"
+
+check_mounted_app_partition() {
+	local free
+
+	if [ ! -d "${APPS_DIR}" ]; then
+		return 1
+	fi
+
+	# Check free space in disk
+	free="$(df -P "${APPS_DIR}"|tail -n 1|awk '{print $4}')"
+
+	# disable if free storage is less then 300M
+	if [ "${free}" -lt 307200 ]; then
+		return 1
+	fi
+
+	return 0
+}
+
+
+if check_mounted_app_partition; then
+	uci -q set parentalcontrol.globals.bundle_path="${APPS_DIR}/parentalcontrol"
+
+	# configure the urlfilter if not configured
+	urlfilter="$(uci -q get parentalcontrol.globals.urlfilter)"
+	if [ -z "${urlfilter}" ]; then
+		uci -q set parentalcontrol.globals.urlfilter='1'
+	fi
+else
+	uci -q set parentalcontrol.globals.urlfilter='0'
+fi
+
+exit 0

parental-control/files/etc/uci-defaults/50-parental_control_add_bundles

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+[ ! -f "/etc/config/parentalcontrol" ] && exit 0
+
+COUNT=1
+
+add_urlbundle()
+{
+	local name url
+
+	url="${1}"; shift
+	name="$*"
+
+	uci -q set parentalcontrol.urlbundle_${COUNT}=urlbundle
+	uci -q set parentalcontrol.urlbundle_${COUNT}.name="${name}"
+	uci -q set parentalcontrol.urlbundle_${COUNT}.download_url="${url}"
+
+	COUNT="$((COUNT+1))"
+}
+
+urlfilter="$(uci -q get parentalcontrol.globals.urlfilter)"
+if [ "${urlfilter}" -eq "1" ]; then
+	add_urlbundle "https://blocklistproject.github.io/Lists/alt-version/abuse-nl.txt" "Abuse"
+	add_urlbundle "https://blocklistproject.github.io/Lists/alt-version/ads-nl.txt" "Ads"
+	add_urlbundle "https://blocklistproject.github.io/Lists/alt-version/crypto-nl.txt" "Crypto"
+	add_urlbundle "https://blocklistproject.github.io/Lists/alt-version/drugs-nl.txt" "Drugs"
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/everything-nl.txt' "Everything else"
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/facebook-nl.txt' 'Facebook/Instagram'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/fraud-nl.txt' 'Fraud'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/gambling-nl.txt' 'Gambling'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/malware-nl.txt' 'Malware'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/phishing-nl.txt' 'Phishing'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/piracy-nl.txt' 'Piracy'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/porn-nl.txt' 'Porn'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/ransomware-nl.txt' 'Ransomware'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/redirect-nl.txt' 'Redirect'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/scam-nl.txt' 'Scam'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/tiktok-nl.txt' 'TikTok'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/torrent-nl.txt' 'Torrent'
+	add_urlbundle 'https://blocklistproject.github.io/Lists/alt-version/tracking-nl.txt' 'Tracking'
+fi
+
+exit 0

parental-control/files/etc/uci-defaults/50-parental_control_disable_urlfilter

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+[ ! -f "/etc/config/parentalcontrol" ] && exit 0
+
+uci -q set parentalcontrol.globals.urlfilter='0'
+
+_delete_urlbundle() {
+	uci_remove parentalcontrol "${1}"
+}
+
+config_load "parentalcontrol"
+config_foreach _delete_urlbundle urlbundle

parental-control/files/etc/uci-defaults/50-parental_control_urlfilter

@@ -1,7 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-[ ! -f "/etc/config/parentalcontrol" ] && exit 0
-
-uci -q set parentalcontrol.globals.urlfilter='0'

parental-control/files/etc/uci-defaults/55-add-default-bundles

@@ -1,40 +0,0 @@
-#!/bin/sh
-
-COUNT=1
-
-add_urlbundle()
-{
-	local enabled name url
-
-	enabled="${1}"; shift
-	url="${1}"; shift
-	name="${@}"
-
-	uci -q set parentalcontrol.urlbundle_${COUNT}=urlbundle
-	uci -q set parentalcontrol.urlbundle_${COUNT}.enable="${enabled}"
-	uci -q set parentalcontrol.urlbundle_${COUNT}.name="${name}"
-	uci -q set parentalcontrol.urlbundle_${COUNT}.download_url="${url}"
-
-	COUNT="$((COUNT+1))"
-}
-
-add_urlbundle "0" "https://blocklistproject.github.io/Lists/alt-version/abuse-nl.txt" "Abuse"
-add_urlbundle "0" "https://blocklistproject.github.io/Lists/alt-version/ads-nl.txt" "Ads"
-add_urlbundle "0" "https://blocklistproject.github.io/Lists/alt-version/crypto-nl.txt" "Crypto"
-add_urlbundle "1" "https://blocklistproject.github.io/Lists/alt-version/drugs-nl.txt" "Drugs"
-add_urlbundle "0" 'https://blocklistproject.github.io/Lists/alt-version/everything-nl.txt' "Everything else"
-add_urlbundle "1" 'https://blocklistproject.github.io/Lists/alt-version/facebook-nl.txt' 'Facebook/Instagram'
-add_urlbundle "1" 'https://blocklistproject.github.io/Lists/alt-version/fraud-nl.txt' 'Fraud'
-add_urlbundle "1" 'https://blocklistproject.github.io/Lists/alt-version/gambling-nl.txt' 'Gambling'
-add_urlbundle "0" 'https://blocklistproject.github.io/Lists/alt-version/malware-nl.txt' 'Malware'
-add_urlbundle "1" 'https://blocklistproject.github.io/Lists/alt-version/phishing-nl.txt' 'Phishing'
-add_urlbundle "1" 'https://blocklistproject.github.io/Lists/alt-version/piracy-nl.txt' 'Piracy'
-add_urlbundle "0" 'https://blocklistproject.github.io/Lists/alt-version/porn-nl.txt' 'Porn'
-add_urlbundle "1" 'https://blocklistproject.github.io/Lists/alt-version/ransomware-nl.txt' 'Ransomware'
-add_urlbundle "0" 'https://blocklistproject.github.io/Lists/alt-version/redirect-nl.txt' 'Redirect'
-add_urlbundle "1" 'https://blocklistproject.github.io/Lists/alt-version/scam-nl.txt' 'Scam'
-add_urlbundle "0" 'https://blocklistproject.github.io/Lists/alt-version/tiktok-nl.txt' 'TikTok'
-add_urlbundle "0" 'https://blocklistproject.github.io/Lists/alt-version/torrent-nl.txt' 'Torrent'
-add_urlbundle "0" 'https://blocklistproject.github.io/Lists/alt-version/tracking-nl.txt' 'Tracking'
-
-exit 0

parental-control/files/lib/parentalcontrol/parentalcontrol.sh

@@ -13,7 +13,10 @@ IP_RULE=""
 ACL_FILE=""
 parentalcontrol_ipv4_forward=""
 parentalcontrol_ipv6_forward=""
-default_bundle_dir="/tmp/parentalcontrol/default/"
+
+bundle_path="$(uci -q get parentalcontrol.globals.bundle_path)"
+
+default_bundle_dir="${bundle_path}/default/"
 bundle_archive="/etc/parentalcontrol/urlbundles.tar.xz"
 
 log() {
@@ -255,7 +258,9 @@ handle_schedule() {
 			schedule_added="1"
 		fi
 
-		target="ACCEPT"
+		# internet_access has been updated to be internet_break
+		# so drop traffic during the schedule, and allow outside the schedule
+		target="DROP"
 
 		config_get local_start_time "$schedule_section" "start_time" "00:00"
 		config_get duration "$schedule_section" "duration"
@@ -362,11 +367,6 @@ handle_internet_break() {
 			config_load "schedules"
 			config_foreach handle_schedule schedule "schedule" "$schedule_ref"
 		fi
-
-		# for access rule to work, need to have default drop rule as last rule
-		if [ "$schedule_added" = "1" ]; then
-			add_access_rule "$ACCESS_RULE" "" "" "" "DROP"
-		fi
 	done
 }
 
@@ -438,15 +438,31 @@ add_internet_schedule_rules() {
 }
 
 add_iptables_nfqueue_rules() {
-	iptables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -ne 0 ]; then
-		# setup netfilter queue 0, use queue bypass so that if no application is
-		# listening to this queue then traffic is unaffected.
-		iptables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I FORWARD 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+	local filter_used
 
-		iptables -w -I INPUT 1 -p tcp --match multiport --ports 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -I INPUT 1 -p udp --match multiport --ports 53 -j NFQUEUE --queue-num 0 --queue-bypass
+	# Check if urlfilter used
+	if ! uci show parentalcontrol | grep -q profile_urlfilter; then
+		return
+	fi
+
+	# IPv4 rules
+	iptables -w -nL FORWARD | grep -iqE "NFQUEUE"
+	if [ "$?" -ne 0 ]; then
+		# capture DNS responses (UDP/TCP sport 53) in FORWARD
+		iptables -w -I FORWARD 1 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -I FORWARD 1 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+
+		# INPUT: DNS replies to router, skip loopback
+		iptables -w -I INPUT 1 -p tcp --sport 53 ! -i lo -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -I INPUT 1 -p udp --sport 53 ! -i lo -j NFQUEUE --queue-num 0 --queue-bypass
+
+		# OUTPUT: DNS replies from router, skip loopback
+		iptables -w -I OUTPUT 1 -p tcp --sport 53 ! -o lo -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -I OUTPUT 1 -p udp --sport 53 ! -o lo -j NFQUEUE --queue-num 0 --queue-bypass
+
+		# HTTP/HTTPS flows for urlfilter
+		iptables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -I FORWARD 1 -p udp --match multiport --ports 80,443 -j NFQUEUE --queue-num 0 --queue-bypass
 
 		# disable acceleration for https packet so that they can be read by urlfilter
 		ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
@@ -454,14 +470,24 @@ add_iptables_nfqueue_rules() {
 		ebtables --concurrent -A FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
 	fi
 
-	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
+	# IPv6 rules
+	ip6tables -w -nL FORWARD | grep -iqE "NFQUEUE"
 	if [ "$?" -ne 0 ]; then
-		#ip6table rules
-		ip6tables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I FORWARD 1 -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+		# capture DNS responses (UDP/TCP sport 53) in FORWARD
+		ip6tables -w -I FORWARD 1 -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -I FORWARD 1 -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
 
-		ip6tables -w -I INPUT 1 -p tcp --match multiport --ports 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -I INPUT 1 -p udp --match multiport --ports 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		# INPUT: DNS replies to router, skip loopback
+		ip6tables -w -I INPUT 1 -p tcp --sport 53 ! -i lo -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -I INPUT 1 -p udp --sport 53 ! -i lo -j NFQUEUE --queue-num 0 --queue-bypass
+
+		# OUTPUT: DNS replies from router, skip loopback
+		ip6tables -w -I OUTPUT 1 -p tcp --sport 53 ! -o lo -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -I OUTPUT 1 -p udp --sport 53 ! -o lo -j NFQUEUE --queue-num 0 --queue-bypass
+
+		# HTTP/HTTPS flows for urlfilter
+		ip6tables -w -I FORWARD 1 -p tcp --match multiport --ports 80,443 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -I FORWARD 1 -p udp --match multiport --ports 80,443 -j NFQUEUE --queue-num 0 --queue-bypass
 
 		# disable acceleration for https packet so that they can be read by urlfilter
 		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
@@ -471,26 +497,38 @@ add_iptables_nfqueue_rules() {
 }
 
 remove_iptables_nfqueue_rules() {
-	iptables -w -nL FORWARD|grep -iqE "NFQUEUE"
+	iptables -w -nL FORWARD | grep -iqE "NFQUEUE"
 	if [ "$?" -eq 0 ]; then
-		iptables -w -D FORWARD -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D FORWARD -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
+		# DNS response rules
+		iptables -w -D FORWARD -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D FORWARD -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D INPUT  -p tcp --sport 53 ! -i lo -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D INPUT  -p udp --sport 53 ! -i lo -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D OUTPUT -p tcp --sport 53 ! -o lo -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D OUTPUT -p udp --sport 53 ! -o lo -j NFQUEUE --queue-num 0 --queue-bypass
 
-		iptables -w -D INPUT -p tcp --match multiport --ports 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		iptables -w -D INPUT -p udp --match multiport --ports 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		# HTTP/HTTPS
+		iptables -w -D FORWARD -p tcp --match multiport --ports 80,443 -j NFQUEUE --queue-num 0 --queue-bypass
+		iptables -w -D FORWARD -p udp --match multiport --ports 80,443 -j NFQUEUE --queue-num 0 --queue-bypass
 
 		ebtables --concurrent -D FORWARD -p ip --ip-protocol 6 --ip-destination-port 443 -j SKIPLOG 2> /dev/null
 		ebtables --concurrent -D FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
 		ebtables --concurrent -D FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
 	fi
-	ip6tables -w -nL FORWARD|grep -iqE "NFQUEUE"
-	if [ "$?" -eq 0 ]; then
-		#ip6table rules
-		ip6tables -w -D FORWARD -p tcp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D FORWARD -p udp --match multiport --ports 80,443,53 -j NFQUEUE --queue-num 0 --queue-bypass
 
-		ip6tables -w -D INPUT -p tcp --match multiport --ports 53 -j NFQUEUE --queue-num 0 --queue-bypass
-		ip6tables -w -D INPUT -p udp --match multiport --ports 53 -j NFQUEUE --queue-num 0 --queue-bypass
+	ip6tables -w -nL FORWARD | grep -iqE "NFQUEUE"
+	if [ "$?" -eq 0 ]; then
+		# DNS response rules
+		ip6tables -w -D FORWARD -p tcp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D FORWARD -p udp --sport 53 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D INPUT  -p tcp --sport 53 ! -i lo -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D INPUT  -p udp --sport 53 ! -i lo -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D OUTPUT -p tcp --sport 53 ! -o lo -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D OUTPUT -p udp --sport 53 ! -o lo -j NFQUEUE --queue-num 0 --queue-bypass
+
+		# HTTP/HTTPS
+		ip6tables -w -D FORWARD -p tcp --match multiport --ports 80,443 -j NFQUEUE --queue-num 0 --queue-bypass
+		ip6tables -w -D FORWARD -p udp --match multiport --ports 80,443 -j NFQUEUE --queue-num 0 --queue-bypass
 
 		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 6 --ip6-destination-port 443 -j SKIPLOG 2> /dev/null
 		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null

parental-control/files/lib/parentalcontrol/sync_bundles.sh

@@ -3,12 +3,31 @@
 . /lib/functions.sh
 
 LOCKFILE="/tmp/sync_bundles.lock"
+log_level="$(uci -q get parentalcontrol.globals.loglevel)"
+log_level="${log_level:-1}"
+DEBUG=0
+
+log_err() {
+	logger -t urlfilter.sync -p error "$*"
+	if [ "${DEBUG}" -eq "1" ]; then
+		echo "#ERR# $* #" >/dev/console
+	fi
+}
+
+log_info() {
+	if [ "${log_level}" -gt 3 ]; then
+		logger -t urlfilter.sync -p info "$*"
+	fi
+	if [ "${DEBUG}" -eq "1" ]; then
+		echo "#INFO# $* #" >/dev/console
+	fi
+}
 
 # this script handles syncing bundles
 # if its a remote file, then it would be downloaded and placed in bundle_dir
 bundle_path="$(uci -q get parentalcontrol.globals.bundle_path)"
 if [ -z "${bundle_path}" ]; then
-	bundle_path="/tmp/parentalcontrol"
+	return 0
 fi
 
 stringstore_dir="${bundle_path}/stringstore"
@@ -38,15 +57,15 @@ update_bundle_file_from_url() {
 
 	available_memory=$(df "$bundle_dir" | tail -n 1 | awk '{print $(NF-2)}') # Available memory in 1K blocks
 	local needed_blocks=$((bundle_file_size / 1024)) # Convert bundle_file_size to 1K blocks
-	local max_size=$((10 * 1024 * 1024)) # 10MB in bytes
+	local max_size=$((50 * 1024 * 1024)) # 50MB in bytes
 
 	if [ "$available_memory" -le "$needed_blocks" ]; then
-		logger -p info "Error: Not enough disk space for bundle: ${bundle_name}"
+		log_info "Error: Not enough disk space for bundle: ${bundle_name}"
 		return 1
 	fi
 
 	if [ "$bundle_file_size" -gt "$max_size" ]; then
-		logger -p info "update_bundle_file_from_url: Error: File size for ${bundle_name} exceeds 10MB"
+		log_info "update_bundle_file_from_url: Error: File size for ${bundle_name} exceeds 10MB"
 		return 1
 	fi
 
@@ -57,7 +76,7 @@ update_bundle_file_from_url() {
 	else
 		# Random delay (0-5s) before starting the download
 		local delay=$((RANDOM % 6))
-		logger -p info "update_bundle_file_from_url: Waiting ${delay}s before downloading..."
+		log_info "update_bundle_file_from_url: Waiting ${delay}s before downloading..."
 		sleep "$delay"
 
 		# Retry logic with exponential backoff
@@ -65,12 +84,11 @@ update_bundle_file_from_url() {
 		local attempt=1
 		local success=0
 		while [ $attempt -le 3 ]; do
-			curl -s -o "$temp_file" "$download_url"
-			if [ $? -eq 0 ]; then
+			if curl -s -o "$temp_file" "$download_url"; then
 				success=1
 				break
 			else
-				logger -p info "update_bundle_file_from_url: Download failed. Retrying $attempt ..."
+				log_info "update_bundle_file_from_url: Download failed. Retrying $attempt ..."
 				local backoff=$(( (2 ** attempt) + (RANDOM % 3) )) # Exponential backoff + 0-2s jitter
 				sleep "$backoff"
 			fi
@@ -78,7 +96,7 @@ update_bundle_file_from_url() {
 		done
 
 		if [ $success -ne 1 ]; then
-			logger -p info "update_bundle_file_from_url: Failed to download bundle: ${bundle_name}"
+			log_info "update_bundle_file_from_url: Failed to download bundle: ${bundle_name}"
 			rm -f "$temp_file"
 			return 1
 		fi
@@ -89,7 +107,7 @@ update_bundle_file_from_url() {
 	local final_path="${bundle_dir}/${bundle_file_name}"
 	if [[ "$file_path" =~ \.xz$ ]]; then
 		if ! xz -dc "$file_path" > "$final_path"; then
-			logger -p info "update_bundle_file_from_url: Decompression failed."
+			log_info "update_bundle_file_from_url: Decompression failed."
 			rm -f "$final_path"
 			rm -f "$file_path"
 			return 1
@@ -98,7 +116,7 @@ update_bundle_file_from_url() {
 		rm -f "$file_path"
 	elif [[ "$file_path" =~ \.gz$ ]]; then
 		if ! gzip -dc "$file_path" > "$final_path"; then
-			logger -p info "update_bundle_file_from_url: Decompression failed."
+			log_info "update_bundle_file_from_url: Decompression failed."
 			rm -f "$final_path"
 			rm -f "$file_path"
 			return 1
@@ -134,7 +152,6 @@ handle_download_url() {
 	local file_name="${sanitized_url##*/}" # Get everything after the last '/'
 
 	local bundle_file_name="${file_name}.urlbundle"
-	local unprocessed_file=0
 	local file_path="${sanitized_url#file://}"
 
 	if echo "$sanitized_url" | grep -qE "^https?://|^file://"; then
@@ -153,7 +170,7 @@ handle_download_url() {
 		fi
 
 		if [ -n "$previous_bundle_size" ] && [ "$bundle_file_size" -eq "$previous_bundle_size" ]; then
-			return
+			return 0
 		fi
 
 		if echo "$sanitized_url" | grep -q "^file://" && ! echo "$sanitized_url" | grep -Eq "\.(xz|gz)$"; then
@@ -161,7 +178,7 @@ handle_download_url() {
 			sed -i "/^${bundle_file_name} /d" "$bundle_sizes"
 			echo "$bundle_file_name $bundle_file_size" >> "$bundle_sizes"
 			ubus send "parentalcontrol.bundle.update" "{\"bundle_file_path\":\"${file_path}\",\"bundle_name\":\"${bundle_name}\"}"
-			return
+			return 0
 		fi
 
 		# Remove existing entries
@@ -173,11 +190,9 @@ handle_download_url() {
 		update_bundle_file_from_url "$sanitized_url" "$bundle_file_name" "$bundle_file_size" "$bundle_name" "$file_name"
 		return $?
 	else
-		logger -p info "Error: Unsupported URL format for ${bundle_file_name}"
+		log_info "Error: Unsupported URL format for ${bundle_file_name}"
 		return 1
 	fi
-
-	return 0
 }
 
 cleanup_bundle_files() {
@@ -189,7 +204,7 @@ cleanup_bundle_files() {
 	get_download_url() {
 		local section="$1"
 		config_get url "$section" download_url
-		config_get_bool enable "$1" enable 0
+		config_get_bool enable "$1" enable 1
 
 		if [ "${enable}" -eq 0 ]; then
 			# bundle is disabled
@@ -222,46 +237,56 @@ cleanup_bundle_files() {
 	done
 }
 
+cleanup_bundle_sizes() {
+	downloaded_bundle_names="$(cat "$bundle_sizes" | cut -d '.' -f 1)"
+
+	for name in $downloaded_bundle_names; do
+		if ls ${stringstore_dir}/${name}* 2>&1 | grep -qF '.store'; then
+			if ls ${stringstore_dir}/${name}* 2>&1 | grep -q cmph; then
+				continue
+			fi
+		fi
+
+		sed -i "/$name/d" "$bundle_sizes"
+	done
+}
+
 # Main handler for all profile URL bundles
 handle_filter_for_bundles() {
 	local urlfilter
 
 	urlfilter="$(uci -q get parentalcontrol.globals.urlfilter)"
+	# if urlfilter is not enabled, then return
 	if [ "${urlfilter}" -ne "1" ]; then
-		logger -p info "urlbundle not supported"
-		return
-	fi
-
-	ubus -t 20 wait_for bbfdm.parentalcontrol
-
-	if [ "$?" -ne 0 ]; then
-		logger -p error "bbfdm.parentalcontrol object not found"
-		return
+		log_info "urlfilter feature not enabled"
+		return 0
 	fi
 
 	initialize_environment
 
 	cleanup_bundle_files "$bundle_dir"
 	cleanup_bundle_files "$stringstore_dir"
+	cleanup_bundle_sizes
 
 	config_load parentalcontrol
 
 	config_get_bool enable globals enable 0
 	if [ "${enable}" -eq 0 ]; then
+		log_info "parental-control feature not enabled"
 		# Parental control is disabled
 		return 0
 	fi
 
-	local profile enable bundles bundle_name download_url
-
 	check_bundle_exists() {
-		local cfg="$1"
+		local enable download_url name cfg
+
+		cfg="$1"
 		config_get name "$cfg" name
-		config_get_bool enable "$cfg" enable 0
+		config_get_bool enable "$cfg" enable 1
 		config_get download_url "$cfg" download_url
 
 		if [ "${enable}" -eq 0 ]; then
-			# bundle is disabled
+			log_info "Skipping bundle ${name} not enabled"
 			return 0
 		fi
 
@@ -282,6 +307,6 @@ handle_filter_for_bundles() {
 # Open file descriptor 200 for locking
 exec 200>"$LOCKFILE"
 # Try to acquire an exclusive lock; exit if another instance is running
-flock -n 200 || { logger -p info "sync_bundles.sh is already running, exiting."; exit 1; }
+flock -n 200 || { log_info "sync_bundles.sh is already running, exiting."; exit 1; }
 
 handle_filter_for_bundles

passwdqc/Makefile

@@ -39,9 +39,6 @@ define Package/$(PKG_NAME)/install
 
 	$(INSTALL_DIR) $(1)/usr/lib/security
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pam_passwdqc.so $(1)/usr/lib/security/
-
-	$(INSTALL_DIR) $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/passwdqc.uci_default $(1)/etc/uci-defaults/99-add_passwdqc_pam
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

passwdqc/files/passwdqc.uci_default

@@ -1,19 +0,0 @@
-#!/bin/sh
-
-CONFIG_FILE="/etc/pam.d/common-password"
-# for some reason setting to 8 makes passwdqc accept minimum 12 letter password with this configuration
-# if we set it to 12 then we need atleast 16 characters and so on
-# passphrase = 0 means no space separated words
-# rest can be figured out from passwdqc man page
-MODULE_LINE="password requisite pam_passwdqc.so min=disabled,disabled,disabled,disabled,8 max=20 passphrase=0 retry=3 enforce=everyone"
-
-# Ensure the file exists before modifying
-[ -f "$CONFIG_FILE" ] || exit 0
-
-# Check if pam_passwdqc is already in the file
-if ! grep -q "pam_passwdqc.so" "$CONFIG_FILE"; then
-    # Insert before pam_unix.so
-    sed -i "/pam_unix.so/ i\\$MODULE_LINE" "$CONFIG_FILE"
-fi
-
-exit 0

periodicstats/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.5.18
+PKG_VERSION:=1.6.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git
-PKG_SOURCE_VERSION:=2772d77bd477adfdf513499fda11397107996d21
+PKG_SOURCE_VERSION:=63c65f55d00442f5bc1f5a3100abf94e52cd0075
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

qosmngr/Makefile

@@ -32,7 +32,7 @@ define Package/qosmngr
   TITLE:=QoS Manager
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos +!(TARGET_brcmbca||TARGET_airoha):tc-full
   DEPENDS+=+kmod-ebt-vlantranslation +kmod-ebt-dscp2pbit +!(TARGET_brcmbca):ebtables-legacy
-  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +dm-agent
+  DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service +bridgemngr
 endef
 
 define Package/qosmngr/description

qosmngr/files/airoha/lib/qos/airoha.sh

@@ -114,6 +114,7 @@ hw_init_all() {
     export TMP_HW_QUEUE_LIST=""
     echo clear > /proc/ifc_debug
     echo reinit > /proc/ifc_debug
+    echo 'set mode 0 2' 2> /dev/null > /proc/tc3162/fe_acnt_mapping # Accounter #2 is used for meter #0, so we need re-assign IP flow accounting mode (mode 0) to #2.
 
     for tc in $(seq 0 7); do
         rm -rf "/tmp/qos/dscp_values_${tc}_4"

qosmngr/files/airoha/lib/qos/policer.sh

@@ -98,7 +98,7 @@ handle_policer() {
 # Configure policer based on UCI subtree 'qos.policer'
 configure_policer() {
     # initialize ratelimit params
-    /userfs/bin/femgr ratelimit set rx_mode 1 2
+    /userfs/bin/femgr ratelimit set rx_mode 1 2 0
     /userfs/bin/qdmamgr_wan set general_rx_init enable trtcm 8 125
 
     for intf in $(jsonfilter -i /etc/board.json -e @.network.lan.ports[*] -e @.network.lan.device -e @.network.wan.device | xargs); do

qosmngr/files/airoha/lib/qos/shaper.sh

@@ -42,7 +42,7 @@ handle_shaper() {
 # Configure shaper based on options saved to UCI tree 'qos.shaper'
 configure_shaper() {
     # initialize ratelimit params
-    /userfs/bin/femgr ratelimit set rx_mode 0 2
+    /userfs/bin/femgr ratelimit set rx_mode 0 2 0
     /userfs/bin/qdmamgr_lan set general_rx_init enable trtcm 8 125
 
     # Delete existing shaper

quickjs/Makefile

@@ -5,8 +5,8 @@ PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/bellard/quickjs.git
-PKG_SOURCE_DATE:=2022-03-06
-PKG_SOURCE_VERSION:=2788d71e823b522b178db3b3660ce93689534e6d
+PKG_SOURCE_DATE:=2025-07-09
+PKG_SOURCE_VERSION:=1fdc768fdc8571300755cdd3e4654ce99c0255ce
 PKG_MIRROR_HASH:=skip
 PKG_LICENSE:=MIT
 
@@ -15,8 +15,6 @@ PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-TARGET_CFLAGS += -fPIC
-
 define Package/quickjs
   SECTION:=lang
   CATEGORY:=Languages
@@ -33,15 +31,30 @@ define Package/quickjs/description
 endef
 
 MAKE_FLAGS = \
-	prefix=/usr \
-	CONFIG_SMALL=y \
+	PREFIX=/usr \
 	EXTRA_LIBS="-latomic" \
 	CROSS_PREFIX="$(TARGET_CROSS)"
 
+define Build/Compile
+	# The upstream Makefile uses the same CFLAGS for host and target builds,
+	# which breaks cross-compilation. We work around this by first building
+	# the host tools ('host-qjsc', 'unicode_gen') with the host compiler
+	# and flags.
+	# We still pass MAKE_FLAGS so the upstream Makefile knows we're cross-compiling.
+	CFLAGS="$(HOST_CFLAGS)" \
+	LDFLAGS="$(HOST_LDFLAGS)" \
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		$(MAKE_FLAGS) \
+		host-qjsc unicode_gen
+
+	# Then we proceed with the default build process for the target binaries.
+	# Make should not rebuild the host tools as they are already up-to-date.
+	$(call Build/Compile/Default)
+endef
+
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib/quickjs
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_INSTALL_DIR)/usr/lib/quickjs/libquickjs.a $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/quickjs/libquickjs.lto.a $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/include/quickjs
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/quickjs/quickjs.h $(1)/usr/include/quickjs/
 	$(CP) $(PKG_INSTALL_DIR)/usr/include/quickjs/quickjs-libc.h $(1)/usr/include/quickjs/

quickjs/patches/000-build-options.patch

@@ -1,87 +0,0 @@
-diff --git a/Makefile b/Makefile
-index 49b1f6f..2c96eae 100644
---- a/Makefile
-+++ b/Makefile
-@@ -33,6 +33,8 @@ CONFIG_LTO=y
- #CONFIG_WERROR=y
- # force 32 bit build for some utilities
- #CONFIG_M32=y
-+# build with -Os instead of -O2
-+#CONFIG_SMALL=y
- 
- ifdef CONFIG_DARWIN
- # use clang instead of gcc
-@@ -52,6 +54,13 @@ CONFIG_BIGNUM=y
- 
- OBJDIR=.obj
- 
-+CFLAGS_ENV:=$(CFLAGS)
-+LDFLAGS_ENV:=$(LDFLAGS)
-+
-+HOST_BUILD=
-+CFLAGS=$(if $(HOST_BUILD),,$(CFLAGS_ENV))
-+LDFLAGS=$(if $(HOST_BUILD),,$(LDFLAGS_ENV))
-+
- ifdef CONFIG_WIN32
-   ifdef CONFIG_M32
-     CROSS_PREFIX=i686-w64-mingw32-
-@@ -66,7 +75,7 @@ endif
- ifdef CONFIG_CLANG
-   HOST_CC=clang
-   CC=$(CROSS_PREFIX)clang
--  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
-+  CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
-   CFLAGS += -Wextra
-   CFLAGS += -Wno-sign-compare
-   CFLAGS += -Wno-missing-field-initializers
-@@ -87,7 +96,7 @@ ifdef CONFIG_CLANG
- else
-   HOST_CC=gcc
-   CC=$(CROSS_PREFIX)gcc
--  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
-+  CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
-   CFLAGS += -Wno-array-bounds -Wno-format-truncation
-   ifdef CONFIG_LTO
-     AR=$(CROSS_PREFIX)gcc-ar
-@@ -110,9 +119,13 @@ endif
- CFLAGS+=$(DEFINES)
- CFLAGS_DEBUG=$(CFLAGS) -O0
- CFLAGS_SMALL=$(CFLAGS) -Os
-+ifdef CONFIG_SMALL
-+CFLAGS_OPT=$(CFLAGS) -Os
-+else
- CFLAGS_OPT=$(CFLAGS) -O2
-+endif
- CFLAGS_NOLTO:=$(CFLAGS_OPT)
--LDFLAGS=-g
-+LDFLAGS+=-g
- ifdef CONFIG_LTO
- CFLAGS_SMALL+=-flto
- CFLAGS_OPT+=-flto
-@@ -195,6 +208,8 @@ qjsc$(EXE): $(OBJDIR)/qjsc.o $(QJS_LIB_OBJS)
- 
- ifneq ($(CROSS_PREFIX),)
- 
-+$(QJSC): HOST_BUILD=1
-+
- $(QJSC): $(OBJDIR)/qjsc.host.o \
-     $(patsubst %.o, %.host.o, $(QJS_LIB_OBJS))
- 	$(HOST_CC) $(LDFLAGS) -o $@ $^ $(HOST_LIBS)
-@@ -262,6 +277,8 @@ run-test262-32: $(patsubst %.o, %.m32.o, $(OBJDIR)/run-test262.o $(QJS_LIB_OBJS)
- $(OBJDIR)/%.o: %.c | $(OBJDIR)
- 	$(CC) $(CFLAGS_OPT) -c -o $@ $<
- 
-+$(OBJDIR)/%.host.o: HOST_BUILD=1
-+
- $(OBJDIR)/%.host.o: %.c | $(OBJDIR)
- 	$(HOST_CC) $(CFLAGS_OPT) -c -o $@ $<
- 
-@@ -286,6 +303,8 @@ $(OBJDIR)/%.check.o: %.c | $(OBJDIR)
- regexp_test: libregexp.c libunicode.c cutils.c
- 	$(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ libregexp.c libunicode.c cutils.c $(LIBS)
- 
-+unicode_gen: HOST_BUILD=1
-+
- unicode_gen: $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o libunicode.c unicode_gen_def.h
- 	$(HOST_CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o
- 

quickjs/patches/000-fix_std_loadFile.patch

@@ -1,15 +1,12 @@
 diff --git a/quickjs-libc.c b/quickjs-libc.c
-index e180dd0..76182d2 100644
+index 54a7a15..a64c4d6 100644
 --- a/quickjs-libc.c
 +++ b/quickjs-libc.c
-@@ -358,12 +358,89 @@ fail:
+@@ -385,12 +385,86 @@ fail:
      return JS_EXCEPTION;
  }
  
-+// For reading files that are not seekable, per second answer from stackoverflow:
-+// https://stackoverflow.com/questions/14002954/c-programming-how-to-read-the-whole-file-contents-into-a-buffer
-+
-+#define  READALL_CHUNK  10*1024
++#define READALL_CHUNK (10*1024)
 +
 +static int readall(FILE *f, JSContext *ctx, uint8_t **dataptr, size_t *sizeptr)
 +{
@@ -90,10 +87,10 @@ index e180dd0..76182d2 100644
      size_t buf_len;
 -    long lret;
 +    long lret = 0;
-     
+ 
      f = fopen(filename, "rb");
      if (!f)
-@@ -371,7 +448,7 @@ uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename)
+@@ -398,7 +472,7 @@ uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename)
      if (fseek(f, 0, SEEK_END) < 0)
          goto fail;
      lret = ftell(f);
@@ -102,7 +99,7 @@ index e180dd0..76182d2 100644
          goto fail;
      /* XXX: on Linux, ftell() return LONG_MAX for directories */
      if (lret == LONG_MAX) {
-@@ -387,13 +464,19 @@ uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename)
+@@ -414,13 +488,19 @@ uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename)
          buf = malloc(buf_len + 1);
      if (!buf)
          goto fail;

quickjs/patches/001-no-fenv-dtoa-libbf.patch

@@ -1,106 +0,0 @@
-diff --git a/quickjs.c b/quickjs.c
-index 7916013..3936eec 100644
---- a/quickjs.c
-+++ b/quickjs.c
-@@ -67,6 +67,16 @@
- #define CONFIG_PRINTF_RNDN
- #endif
- 
-+#ifdef CONFIG_PRINTF_RNDN
-+#if !defined(FE_DOWNWARD) || !defined(FE_UPWARD)
-+#ifdef CONFIG_BIGNUM
-+#define CONFIG_DTOA_LIBBF
-+#else
-+#error "CONFIG_BIGNUM required if printf is RNDN and there is no fenv support"
-+#endif
-+#endif
-+#endif
-+
- /* define to include Atomics.* operations which depend on the OS
-    threads */
- #if !defined(EMSCRIPTEN)
-@@ -11299,6 +11309,11 @@ static char *i64toa(char *buf_end, int64_t n, unsigned int base)
-     return q;
- }
- 
-+/* maximum buffer size for js_dtoa */
-+#define JS_DTOA_BUF_SIZE 128
-+
-+#ifndef CONFIG_DTOA_LIBBF
-+
- /* buf1 contains the printf result */
- static void js_ecvt1(double d, int n_digits, int *decpt, int *sign, char *buf,
-                      int rounding_mode, char *buf1, int buf1_size)
-@@ -11318,9 +11333,6 @@ static void js_ecvt1(double d, int n_digits, int *decpt, int *sign, char *buf,
-     *decpt = atoi(buf1 + n_digits + 2 + (n_digits > 1)) + 1;
- }
- 
--/* maximum buffer size for js_dtoa */
--#define JS_DTOA_BUF_SIZE 128
--
- /* needed because ecvt usually limits the number of digits to
-    17. Return the number of digits. */
- static int js_ecvt(double d, int n_digits, int *decpt, int *sign, char *buf,
-@@ -11429,6 +11441,8 @@ static void js_fcvt(char *buf, int buf_size, double d, int n_digits)
-     js_fcvt1(buf, buf_size, d, n_digits, rounding_mode);
- }
- 
-+#endif /* CONFIG_DTOA_LIBBF */
-+
- /* radix != 10 is only supported with flags = JS_DTOA_VAR_FORMAT */
- /* use as many digits as necessary */
- #define JS_DTOA_VAR_FORMAT   (0 << 0)
-@@ -11442,8 +11456,10 @@ static void js_fcvt(char *buf, int buf_size, double d, int n_digits)
- /* XXX: slow and maybe not fully correct. Use libbf when it is fast enough.
-    XXX: radix != 10 is only supported for small integers
- */
--static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
-+static JSValue js_dtoa(JSContext *ctx,
-+                       double d, int radix, int n_digits, int flags)
- {
-+    char buf[JS_DTOA_BUF_SIZE];
-     char *q;
- 
-     if (!isfinite(d)) {
-@@ -11465,6 +11481,25 @@ static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
-         ptr = i64toa(buf1 + sizeof(buf1), i64, radix);
-         strcpy(buf, ptr);
-     } else {
-+#ifdef CONFIG_DTOA_LIBBF
-+        bf_flags_t bf_flags;
-+    generic_conv:
-+        bf_flags = BF_RNDNA;
-+        switch (flags & 3) {
-+        case JS_DTOA_VAR_FORMAT:
-+            bf_flags |= BF_FTOA_FORMAT_FREE_MIN;
-+            break;
-+        case JS_DTOA_FIXED_FORMAT:
-+            bf_flags |= BF_FTOA_FORMAT_FIXED;
-+            break;
-+        case JS_DTOA_FRAC_FORMAT:
-+            bf_flags |= BF_FTOA_FORMAT_FRAC;
-+            break;
-+        }
-+        if (flags & JS_DTOA_FORCE_EXP)
-+            bf_flags |= BF_FTOA_FORCE_EXP;
-+        return js_ftoa(ctx, JS_NewFloat64(ctx, d), radix, n_digits, bf_flags);
-+#else /* CONFIG_DTOA_LIBBF */
-         if (d == 0.0)
-             d = 0.0; /* convert -0 to 0 */
-         if (flags == JS_DTOA_FRAC_FORMAT) {
-@@ -11528,14 +11563,8 @@ static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
-                 sprintf(q, "%d", p);
-             }
-         }
-+#endif /* CONFIG_DTOA_LIBBF */
-     }
--}
--
--static JSValue js_dtoa(JSContext *ctx,
--                       double d, int radix, int n_digits, int flags)
--{
--    char buf[JS_DTOA_BUF_SIZE];
--    js_dtoa1(buf, d, radix, n_digits, flags);
-     return JS_NewString(ctx, buf);
- }
- 

self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_assoclist.sh

@@ -1,11 +1,30 @@
-interfaces=$(uci show wireless | grep "ifname=" |  awk -F'[.,=]' '{print$2}')
-for int in $interfaces; do
-	mode=$(uci get "wireless.${int}.mode")
+. /lib/functions.sh
+
+handle_interface() {
+	local config="${1}"
+	local prefix="${2}"
+
+	config_get ifname "${config}" ifname
+	config_get mode ${config} mode
+
 	if [ "$mode" = "ap" ] ; then
-		ap_int=$(uci get "wireless.${int}.ifname")
-		echo "Get assoc list for ${ap_int}"
-		ubus call "wifi.ap.${ap_int}" assoclist
-		echo "Get station info for ${ap_int}"
-		ubus call "wifi.ap.${ap_int}" stations
+		echo "Get assoc list for ${ifname}"
+		ubus call "${prefix}.${ifname}" assoclist
+		echo "Get station info for ${ifname}"
+		ubus call "${prefix}.${ifname}" stations
 	fi
-done
+}
+
+handle_wifi_interface() {
+	handle_interface "$1" "wifi.ap"
+}
+
+handle_mld_interface() {
+	handle_interface "$1" "wifi.apmld"
+}
+
+config_load wireless
+echo "Get associated stations information for non-MLD interfaces"
+config_foreach handle_wifi_interface wifi-iface
+echo "Get associated stations information for MLD interfaces"
+config_foreach handle_mld_interface wifi-mld

self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_sta.sh

@@ -22,3 +22,4 @@ handle_interface() {
 
 config_load wireless
 config_foreach handle_interface wifi-iface
+config_foreach handle_interface wifi-mld

self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_status.sh

@@ -0,0 +1,36 @@
+. /lib/functions.sh
+
+handle_interface() {
+	local config="${1}"
+	local prefix="${2}"
+
+	config_get ifname "${config}" ifname
+	config_get mode ${config} mode
+
+	if [ "$mode" = "ap" ] ; then
+		echo "Get status for ${ifname}"
+		ubus call "${prefix}.${ifname}" status
+	elif [ "$mode" = "sta" ] ; then
+		echo "Get status for bSTA ${ifname}"
+		ubus call "wifi.bsta.${ifname}" status
+	fi
+}
+
+handle_wifi_interface() {
+	handle_interface "$1" "wifi.ap"
+}
+
+handle_mld_interface() {
+	handle_interface "$1" "wifi.apmld"
+}
+
+config_load wireless
+echo "Get wifi status"
+ubus call wifi status
+
+echo "Get wifi status for ap & bsta interfaces"
+config_foreach handle_wifi_interface wifi-iface
+
+echo "Get wifi status for apmld interfaces"
+config_foreach handle_mld_interface wifi-mld
+

self-diagnostics/files/usr/share/self-diagnostics/spec/wifi.json

@@ -13,7 +13,8 @@
 		},
 		{
 			"description": "WiFi Status",
-			"cmd": "ubus call wifi status"
+			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_status.sh",
+			"timeout": 10
 		},
 		{
 			"description": "WiFi Radio Status",

sshmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sshmngr
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/sshmngr.git
-PKG_SOURCE_VERSION:=0c7d58a51d6f5eb4ad33e03630206bbb4e559779
+PKG_SOURCE_VERSION:=dc0e3933231680aec844d587d49fefbc0cc7f8d7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

sulu/sulu-builder/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=5.0.5
+PKG_VERSION:=5.1.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -28,7 +28,8 @@ define Package/sulu/default
 	CATEGORY:=Utilities
 	SUBMENU:=SULU
 	TITLE:=SULU-CE
-	DEPENDS:=+mosquitto-auth-shadow +usermngr +jq +userinterface +obuspa
+	DEPENDS:=+mosquitto-auth-shadow +usermngr +userinterface +obuspa
+	DEPENDS+=+@OBUSPA_LOCAL_MQTT_LISTENER
 	EXTRA_DEPENDS:=nginx
 endef
 
@@ -95,13 +96,8 @@ endef
 
 define Package/sulu/install/Default
 	$(INSTALL_DIR) $(1)/sulu/
-	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_BIN) ./files/etc/config/sulu $(1)/etc/config/sulu
-
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/etc/init.d/sulu $(1)/etc/init.d/sulu
-
 	$(INSTALL_DIR) $(1)/etc/sulu
+
 	$(INSTALL_BIN) ./files/etc/sulu/sulu.sh $(1)/etc/sulu/
 	$(INSTALL_DATA) ./files/etc/sulu/nginx.locations $(1)/etc/sulu/
 
@@ -109,9 +105,9 @@ define Package/sulu/install/Default
 	$(INSTALL_DATA) ./files/etc/users/roles/*.json $(1)/etc/users/roles/
 
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/uci-defaults/40-add-sulu-config $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/40-add-sulu-config $(1)/etc/uci-defaults/
 ifneq ($(CONFIG_SULU_DEFAULT_UI)$(CONFIG_SULU_BUILDER_DEFAULT_UI),)
-	$(INSTALL_BIN) ./files/etc/uci-defaults/41-make-sulu-default-ui $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/41-make-sulu-default-ui $(1)/etc/uci-defaults/
 endif
 endef
 
@@ -128,7 +124,6 @@ define Package/sulu/install
 	$(Package/sulu/install/Post)
 endef
 
-
 define Package/sulu-builder/install
 	$(Package/sulu/install/Default)
 	$(INSTALL_DIR) $(1)/sulu/presets

sulu/sulu-builder/files/etc/config/sulu

@@ -1,2 +0,0 @@
-config global 'global'
-	option enabled '1'

sulu/sulu-builder/files/etc/init.d/sulu

@@ -1,47 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-USE_PROCD=1
-
-START=90
-STOP=01
-
-. /lib/functions.sh
-
-log() {
-	echo "${@}" | logger -t sulu.init -p debug
-}
-
-validate_sulu_global_section() {
-	uci_validate_section sulu global global \
-		'enabled:bool:1'
-}
-
-start_service() {
-	local enabled
-
-	config_load sulu
-	procd_open_instance sulu
-
-	validate_sulu_global_section || return 0
-	# append sulu connection injection
-	if [ "${enabled}" -eq "0" ]; then
-		procd_close_instance
-		return 0
-	fi
-
-	if [ "${1}" = "update" ]; then
-		log "Reloading related services"
-		/etc/sulu/sulu.sh -r
-	fi
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start update
-}
-
-service_triggers() {
-	procd_add_reload_trigger "sulu" "userinterface" "mosquitto"
-	procd_add_reload_trigger "config.change" "mapcontroller" /etc/sulu/sulu.sh -q
-}