quickjs-ng

* passwdqc helps us enforce strong passwords policy
* linux-pam helps in managing failed login attempts

bbfdm/Makefile

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

bbfdm/files/etc/init.d/bbf_configd

@@ -10,19 +10,10 @@ log() {
 	echo "${@}"|logger -t bbf.config -p info
 }
 
-create_needed_directories()
-{
-	mkdir -p /tmp/bbfdm/.cwmp
-	mkdir -p /tmp/bbfdm/.usp
-	mkdir -p /tmp/bbfdm/.bbfdm
-}
-
 start_service()
 {
 	local log_level
 
-	create_needed_directories
-
 	config_load bbfdm
 	config_get log_level "reload_handler" log_level 2
 

bridgemngr/Makefile

@@ -5,13 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.0.18.2
+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:=71ed529be038392071b0399bcfe9d46e89d3cb46
+PKG_SOURCE_VERSION:=b6a657e1c83b49f09323b4012ef229c604b82854
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

decollector/Makefile

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

dslmngr/files/airoha/sbin/xdsl_wan

@@ -5,8 +5,6 @@ source "/lib/functions/network.sh"
 source "/lib/functions/system.sh"
 
 PREVLINK=""
-LINK=""
-LINKSPEED=""
 PREVWANMODE=""
 WANMODE=""
 CONFIGURED=0
@@ -62,7 +60,7 @@ create_atm_devices() {
 }
 
 configure_line() {
-	local mode profile bitswap sra us0 sesdrop sos roc ginp gvector mod prof
+	local mode profile bitswap sra us0 sesdrop sos ginp 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
 
@@ -72,9 +70,8 @@ configure_line() {
 	config_get sra $1 sra "1"
 	config_get us0 $1 us0 "1"
 	config_get sos $1 sos "0"
-	config_get roc $1 roc "0"
-	config_get ginp $1 ginp "1"
-	config_get gvector $1 gvector "1"
+	config_get sos $1 roc "0"
+	config_get sos $1 ginp "0"
 
 	for mod in $mode; do
 		[ "$mod" = "gdmt" ] && adsl1_flag=1
@@ -99,7 +96,6 @@ 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))"
@@ -152,12 +148,6 @@ while [ true ]; do
 
 	if [ "$LINK" != "$PREVLINK" -a \( "$LINK" = "down" -o "$LINK" = "up" \) ]; then
 		if [ "$LINK" = "down" ]; then
-			if [ ! -s /tmp/qos/wan_link_shape_rate ]; then
-				rm -rf /tmp/qos/wan_link_shape_rate
-				rm -rf /tmp/qos/wan_link_speed
-				/usr/sbin/qos-uplink-bandwidth
-			fi
-
 			[ "$CONFIGURED" -eq 0 ] && configure_lines # Needs to be done once the slave SoC is in down state and we've not been able to auto-sync.
 			if [ -n "$WANMODE" ]; then
 				if [ "$WANMODE" = "PTM" ]; then
@@ -234,26 +224,6 @@ while [ true ]; do
 
 			call_wan_hotplug "up" "$WANPORT"
 			PREVWANMODE="$WANMODE"
-
-			if [ ! -s /tmp/qos/wan_link_shape_rate ]; then
-				LINKSPEED="$(awk '/far-end interleaved channel bit rate/{print $6}' /proc/tc3162/adsl_stats)"
-				LINKSPEED=$((LINKSPEED))
-				if [ "$LINKSPEED" -eq 0 ]; then
-					LINKSPEED="$(awk '/far-end fast channel bit rate/{print $6}' /proc/tc3162/adsl_stats)"
-					LINKSPEED=$((LINKSPEED))
-				fi
-
-				if [ "$LINKSPEED" -ne 0 ]; then
-					mkdir -p /tmp/qos
-					touch /tmp/qos/wan_link_shape_rate
-
-					/userfs/bin/qosrule discpline Rate uplink-bandwidth ${LINKSPEED}
-					hw_nat -! > /dev/null 2>&1
-				else
-					rm -rf /tmp/qos/wan_link_speed
-					/usr/sbin/qos-uplink-bandwidth
-				fi
-			fi
 		fi
 
 		# Toggle link state

firewallmngr/Config.in

@@ -8,11 +8,5 @@ config FIREWALLMNGR_PORT_TRIGGER
 	help
 	   Set this option to include support for PortTrigger object.
 
-config FIREWALLMNGR_NAT_INTERFACE_SETTING
-	bool "Include Device.NAT.InterfaceSetting"
-	default y
-	help
-	   Set this option to include support for NAT InterfaceSetting object.
-
 endmenu
 endif

firewallmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=firewallmngr
-PKG_VERSION:=1.0.9.2
+PKG_VERSION:=1.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/firewallmngr.git
-PKG_SOURCE_VERSION:=fdabd33cf42ac02adadbdf43bd8bf86a62d7d1e3
+PKG_SOURCE_VERSION:=05ad0d6f7f21520eecd05429c14d1963de2a8463
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -52,10 +52,6 @@ ifeq ($(CONFIG_FIREWALLMNGR_PORT_TRIGGER),y)
 	TARGET_CFLAGS += -DINCLUDE_PORT_TRIGGER
 endif
 
-ifeq ($(CONFIG_FIREWALLMNGR_NAT_INTERFACE_SETTING),y)
-	TARGET_CFLAGS += -DINCLUDE_NAT_IF_SETTING
-endif
-
 define Package/firewallmngr/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/uci-defaults

fluent-bit/patches/0002-add_hostname_to_log_dump.patch

@@ -0,0 +1,45 @@
+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

@@ -1,27 +0,0 @@
-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

@@ -0,0 +1,32 @@
+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

@@ -1,73 +0,0 @@
-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);
- 

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.3.3
+PKG_VERSION:=1.3.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fee5bd0067fc1f30498bc2b81e893d170796b459
+PKG_SOURCE_VERSION:=3663ca4d001508509774115d6797b932f9ed4f69
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

icwmp/Makefile

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

icwmp/files/etc/config/cwmp

@@ -28,7 +28,6 @@ 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'

ieee1905/Makefile

@@ -11,7 +11,7 @@ PKG_VERSION:=8.7.33
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f28f1c04cae008d7d6448ba02b992506af28448c
+PKG_SOURCE_VERSION:=cb5b8f76c854b89607cd1750d3a4052ecd71ac9d
 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
@@ -116,7 +116,7 @@ MAKE_PATH:=src
 
 
 define Package/ieee1905/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/etc $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(INSTALL_DIR) $(1)/usr/sbin

ieee1905/files/datamodel_description.json

@@ -0,0 +1,23 @@
+{
+	"Device.IEEE1905.AL.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": false,
+		"{BBF_VENDOR_PREFIX}LocalOnlyMode": {
+			"type": "boolean",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"description": "Enable or disable interfaces from ieee1905.",
+			"datatype": "boolean"
+		}
+	}
+}
+

iopsys-analytics/Makefile

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

libdpp/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdpp
-PKG_VERSION:=2.1.2
+PKG_VERSION:=2.1.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5f1184c52be19f3bfd3bc7e9bc582ef09b0a2b1c
+PKG_SOURCE_VERSION:=6024efd3db9dd490c07465ea9b0c15120063165c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/libdpp.git
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

libdsl/Makefile

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

libwifi/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.13.7
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0b3cc45334c167d164c2c79e82522f13698abf92
+PKG_SOURCE_VERSION:=65a7cd643c07e3f0a11d5b20225d4d87b8646513
 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
@@ -61,7 +61,7 @@ else
 endif
 
 ifneq ($(CONFIG_PACKAGE_kmod-mt7915e_en7523),)
-  TARGET_CFLAGS +=-DMT7915_VENDOR_EXT
+  TARGET_CFLAGS=-DMT7915_VENDOR_EXT
 endif
 
 PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e_en7523:mt76_en7523

linux-pam/Makefile

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

linux-pam/files/pam_faillock.uci_default

@@ -0,0 +1,43 @@
+#!/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

@@ -1,18 +0,0 @@
-#!/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,5 +1,4 @@
 if PACKAGE_logmngr
-
 choice
 	prompt "Select backend for syslog management"
 	default LOGMNGR_BACKEND_FLUENTBIT
@@ -32,5 +31,4 @@ 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.1.4
+PKG_VERSION:=1.0.17
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/logmngr.git
-PKG_SOURCE_VERSION:=62441fdfe14a39bff8fff7c62307bd7b54d7240f
+PKG_SOURCE_VERSION:=ad2636c642d56967e78c0c84bf82cb0e2b6311f2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -52,35 +52,29 @@ endif
 
 define Package/logmngr/install
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_BIN) ./files/logmngr.init $(1)/etc/init.d/logmngr
+
 	$(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/
-	$(INSTALL_DATA) ./files/lib/logmngr/fluent-bit.sh $(1)/lib/logmngr/
-else ifeq ($(CONFIG_LOGMNGR_BACKEND_SYSLOG_NG),y)
+endif
+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

@@ -0,0 +1,26 @@
+#!/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/11-logmngr_logrotate_config_generate

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

logmngr/files/etc/config/logmngr

@@ -1,26 +0,0 @@
-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}[{pid}]: {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

@@ -1,36 +0,0 @@
-#!/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}[{pid}]: {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/lib/logmngr/fluent-bit.sh

@@ -6,37 +6,6 @@
 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}
@@ -51,276 +20,219 @@ 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
-		append_conf "@INCLUDE ${FLUENT_BIT_CONF_DIR}/*"
+		echo "@INCLUDE ${FLUENT_BIT_CONF_DIR}/*" >> ${TMP_CONF_FILE}
 	fi
-	append_conf ""
+	echo "" >> ${TMP_CONF_FILE}
 }
 
 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
-	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 ""
-}
+	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}
 
-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 ""
+	# 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}
 
-	append_conf "[FILTER]"
-	append_conf "    name            sysinfo"
-	append_conf "    match           *"
-	append_conf "    hostname_key    hostname"
-	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}
 }
 
 create_input_section() {
 	local tag="$1"
 
-	[ -z "$tag" ] && return
-
-	# check if this source section has already been processed
-	syslog_tag_already_processed "$tag" && return
-
-	append_conf "[INPUT]"
-	append_conf "    name        syslog"
-	append_conf "    unix_perm   0666"
-	append_conf "    tag         $tag"
-	append_conf "    path        /dev/log"
-	append_conf ""
+	# 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}
 }
 
-populate_allowed_logs() {
-	local facility_level sev_level
-	local section="$1"
+generate_facility_regex() {
+	local facility_level=$1
+	local pri=0
 
-	[ -z "$section" ] && return
-
-	# reset
-	match_pattern=""
-	facilities=""
-	all_facilities=0
-	kern_facility=0
-	severities=""
-	sev_compare=1
-	sev_action=0
-
-	# read config
-	config_get match_pattern $section pattern_match
-
-	config_get facility_level $section facility_level
-	config_get sev_level $section severity_level
-	config_get sev_compare $section severity_compare 1
-	config_get sev_action $section severity_action 0
-
-	# normalize facilities
-	if [ -n "$facility_level" ]; then
-		for f in $facility_level; do
-			if [ "$f" = "24" ]; then
-				all_facilities=1
-				# xargs is used to convert from new line separated numbers to space separated numbers
-				facilities="$(seq 0 23 | xargs)"
-				break
-			fi
-
-			if [ "$f" = "0" ]; then
-				kern_facility=1
-			fi
-		done
-
-		if [ "$all_facilities" -eq 0 ]; then
-			facilities="$facility_level"
-		fi
-	else
-		# default to "all facilities" when unset
-        	all_facilities=1
-	        facilities="$(seq 0 23 | xargs)"
-	fi
-
-	# normalize severities
-	case "$sev_level" in
-		8)  	# all severities
-			severities="$(seq 0 7 | xargs)"
-			;;
-		9)  	# none
-			severities="none"
-			;;
-		"") 	# unset, treat as "all"
-			severities="$(seq 0 7 | xargs)"
-			;;
-		*)
-			if [ "$sev_compare" = "0" ]; then
-				# equal
-				severities="$sev_level"
-			else
-				# equl or higher
-				severities="$(seq 0 $sev_level | xargs)"
-			fi
-			;;
-	esac
-}
-
-create_filter_section() {
-	local match_regex="$1"
-	local pattern="$2"
-
-	[ -z "$match_regex" ] && return
-
-	append_conf "[FILTER]"
-	append_conf "    name        grep"
-	append_conf "    match_regex       $match_regex"
-
-	# we need "logical_op or" only in non-pattern sections
-	if [ "$pattern" = "0" ]; then
-		append_conf "    logical_op  or" # handle multiple filters
-	fi
-}
-
-create_kmsg_input_section() {
-	local tag="$1"
-	local max_sev=7
-
-	[ -z "$tag" ] && return
-	kmsg_tag_already_processed "$tag" && return
-
-	if [ -c "/dev/kmsg" ]; then
-		append_conf "[INPUT]"
-		append_conf "    name       kmsg"
-		append_conf "    tag        $tag"
-
-		# check kern facility (0)
-		if [ "$all_facilities" -eq 1 ] || [ "$kern_facility" -eq 1 ]; then
-			if [ "$severities" != "none" ]; then
-				# severity filtering
-				# only EqualOrHigher is supported by Prio_Level
-				# and only Log action is supported
-				# so set Prio_Level = max severity
-				if [ "$sev_action" = "0" ] && [ "$sev_compare" = "1" ]; then
-					if [ -n "$severities" ]; then
-						max_sev=$(echo $severities | tr ' ' '\n' | sort -n | tail -1)
-					fi
-
-					append_conf "    prio_level $max_sev"
-				fi
-			fi
-		fi
-
-		append_conf ""
-
-		# if severities is none, or
-		# if kern facility has been excluded
-		# then we need to stop kernel logs
-		# sev_action and sev_compare is being checked because we don't want to work with rules that exclude logs
-		if [ "$severities" = "none" ] || { [ "$kern_facility" -eq 0 ] && [ "$all_facilities" -eq 0 ] && [ "$sev_action" = "0" ] && [ "$sev_compare" = "1" ]; }; then
-			# block all
-			# create a filter section that matches on KM* tag
-			# and excludes all messages
-			create_filter_section "KM*" "0"
-			append_conf "    exclude    message ^.*$"
-			append_conf ""
-		fi
-	fi
-}
-
-generate_syslog_filter() {
-	local param="regex"
-
-	[ "$sev_action" = "1" ] && param="exclude"
-
-	# start adding the fluent-bit filter section
-	create_filter_section "SL*" "0"
-
-	if [ "$severities" = "none" ]; then
-		append_conf "    exclude    pri ^.*$"
+	if [ "$facility_level" == "24" ]; then
+		# value 24 means all facility level, which is as good as not
+		# generating a filter section, so return
 		return
 	fi
 
-	for fval in $facilities; do
-		for sval in $severities; do
-			local pri=$((fval * 8 + sval))
-			append_conf "    $param        pri ^${pri}$"
+	# facility_level is a list value, hence, generate regex for
+	# each value
+	IFS=" "
+	for val in $facility_level; do
+		# as per rfc 5424 and 3164, pri in syslog msg is
+		# facility*8+severity. Severity value can range from 0-7 hence
+		# 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}
 		done
 	done
-
-	append_conf ""
 }
 
-generate_pattern_filter() {
-	local match_regex="$1"
-	local match_pattern="$2"
+generate_severity_regex() {
+	local sev_level="$1"
+	local sev_compare="$2"
+	local sev_action="$3"
 
-	[ -z "$match_regex" ] && return
-	[ -z "$match_pattern" ] && return
+	local pri=0
+	local param="exclude"
 
-	# start adding the fluent-bit filter section
-	create_filter_section "$match_regex" "1"
-	append_conf "    regex        message $match_pattern"
-	append_conf ""
+	if [ "$sev_action" == "0" ]; then
+		param="regex"
+	fi
+
+	local fval=0
+	if [ "$sev_compare" == "0" ]; then
+		# 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}
+			fval=$((fval + 1))
+		done
+	elif [ "$sev_compare" == "1" ]; then
+		# generate regex for all severity value greater than or equal to
+		# sev_level. please, lower value have higher precedence, so sev_level
+		# 0 which is emergency has higher precedence than error which is 3
+		while [ $fval -le 23 ] ; do
+			sval=0
+			while [ $sev_level -ge $sval ]; do
+				pri=`expr $fval \* 8 + $sval`
+				echo "    $param        pri $pri" >> ${TMP_CONF_FILE}
+				sval=$((sval + 1))
+			done
+			fval=$((fval + 1))
+		done
+	fi
+}
+
+handle_filter_conf() {
+	local section="$1" # config filter
+	local filter_name="$2"
+	local name
+
+	# no need to proceed if name of filter section is not one of the values
+	# listed in option filter in config action section
+	config_get name $section name
+	if [ "$name" != "$filter_name" ]; then
+		return
+	fi
+
+	# as per data model, at a time either facility_level or severity_level can
+	# be specified along with pattern_match. hence, first process and generate
+	# regex for pattern_match which is common in both condition. Next, we will
+	# process facility_level and return if facility level is defined and not
+	# process severity related params at all.
+
+	local pattern_match
+	config_get pattern_match $section pattern_match
+	if [ -n "$pattern_match" ]; then
+		echo "    regex        $pattern_match" >> ${TMP_CONF_FILE}
+	fi
+
+	local facility_level
+	config_get facility_level $section facility_level
+
+	if [ -n "$facility_level" ]; then
+		generate_facility_regex $facility_level
+		# return from here since if facility_level is defined, then no
+		# need to process severity_level
+		return
+	fi
+
+	local sev_level
+	local sev_compare
+	local sev_action
+	config_get sev_level $section severity_level
+
+	if [ -n "$sev_level" ]; then
+		# value 1 of severity compare corresponds to data model
+		# and system default which is EqualorHigher
+		config_get sev_compare $section severity_compare 1
+		# value 0 of severity action corresponds to data model
+		# and system default that is log
+		config_get sev_action $section severity_action 0
+
+		generate_severity_regex $sev_level $sev_compare $sev_action
+	fi
+}
+
+create_filter_section() {
+	local match="$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
+}
+
+handle_filter_ref() {
+	local filter_name="$1"
+	config_foreach handle_filter_conf filter "$filter_name"
 }
 
 handle_log_file() {
 	local section="$1" # out_file section
-	local linker="$2"
-	local match_regex="$3"
-	local template="$4"
+	local match="$2"
 	local action_ref
 
 	config_get action_ref $section action
-	if [ "$action_ref" != "$linker" ]; then
+	if [ "$action_ref" != "$match" ]; then
 		return
 	fi
 
 	local enabled
-	config_get_bool enabled $section enable
-	if [ "$enabled" = "0" ]; then
+	config_get enabled $section enable
+	if [ "$enabled" == 0 ]; then
 		return
 	fi
 
 	local file
 	config_get file $section file
-	if [ -z "$file" ] || [ -z "$match_regex" ]; then
+	if [ -z "$file" ]; then
 		return
 	fi
 
-	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 ""
+	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}
 }
 
 handle_log_remote() {
 	local section="$1"
-	local linker="$2"
-	local match_regex="$3"
+	local match="$2"
 	local action_ref
 
 	config_get action_ref $section action
-	if [ "$action_ref" != "$linker" ]; then
+	if [ "$action_ref" != "$match" ]; then
 		return
 	fi
 
 	local enabled
-	config_get_bool enabled $section enable
-	if [ "$enabled" = "0" ]; then
+	config_get enabled $section enable
+	if [ "$enabled" == 0 ]; then
 		return
 	fi
 
@@ -330,167 +242,83 @@ handle_log_remote() {
 		return
 	fi
 
-	append_conf "[OUTPUT]"
-	append_conf "    name         syslog"
-	append_conf "    match_regex  $match_regex"
-	append_conf "    host         $address"
+	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 "    syslog_appname_key   ident"
 	append_conf "    syslog_procid_key    pid"
 	append_conf "    syslog_message_key   message"
-	append_conf "    syslog_hostname_key  hostname"
+
+	local hostname="$(uci -q get 'system.@system[0].hostname')"
+	if [ -n "${hostname}" ]; then
+		append_conf "    syslog_hostname_preset    ${hostname}"
+	fi
 
 	local proto # holds value tcp or udp
 	config_get proto ${section} proto
 	if [ -n "$proto" ]; then
 		if [ "$proto" == "tls" ]; then
-			append_conf "    mode         tcp"
-			append_conf "    tls          on"
+			echo "    mode         tcp" >> ${TMP_CONF_FILE}
+			echo "    tls          on" >> ${TMP_CONF_FILE}
 		else
-			append_conf "    mode         $proto"
+			echo "    mode         $proto" >> ${TMP_CONF_FILE}
 		fi
 	fi
 
 	local port
 	config_get port $section port
 	if [ -n "$port" ]; then
-		append_conf "    port         $port"
+		echo "    port         $port" >> ${TMP_CONF_FILE}
 	fi
 
 	local cert
 	local peer_verify
 	config_get cert $section cert
 	if [ -n "$cert" ]; then
-		append_conf "    tls.crt_file $cert"
+		echo "    tls.crt_file $cert" >> ${TMP_CONF_FILE}
 
-		config_get_bool peer_verify $section peer_verify
-		if [ "$peer_verify" = "1" ]; then
-			append_conf "    tls.verify     on"
+		config_get peer_verify $section peer_verify
+		if [ "$peer_verify" == "1" ]; then
+			echo "    tls.verify     on" >> ${TMP_CONF_FILE}
 		fi
 	fi
-	append_conf ""
-}
-
-resolve_source_section() {
-	local src_section="$1"
-	local linker="$2"
-	local src_name syslog_en kernel_en
-
-	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"
-	fi
-
-	if [ "$kernel_en" = "1" ]; then
-		source_tag_kmsg="KM$src_name"
-		create_kmsg_input_section "$source_tag_kmsg"
-	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_filter_conf() {
-	local section="$1" # config filter
-	local filter_name="$2"
-	local name
-
-	config_get name $section name
-	[ "$name" = "$filter_name" ] || return
-
-	populate_allowed_logs "$filter_name"
 }
 
 handle_action() {
-	local tag_regex filter source_ref template_ref source_sec log_template finst
-	local action_section="$1"
-	local source_tag_syslog source_tag_kmsg
+	local section="$1"
 
-	# shared variables set by populate_allowed_logs
-	match_pattern=""
-	facilities=""
-	all_facilities=0
-	kern_facility=1
-	severities=""
-	sev_compare=1
-	sev_action=0
+	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
-
-	# read filter section and populate relevant variables
-	# these variables will be used by create_kmsg_input_section
-	# generate_syslog_filter, and generate_pattern_filter functions
+	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
+		# of FILTER of same kind. Hence, each filter section corresponding
+		# 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
+
+		IFS=" "
 		for finst in $filter; do
-			config_foreach handle_filter_conf filter "$finst"
+			handle_filter_ref $finst
 		done
 	fi
 
-	# 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 "$source_tag_syslog $source_tag_kmsg")
-
-	if [ -n "$filter" ]; then
-		generate_pattern_filter "$tag_regex" "$match_pattern"
-		generate_syslog_filter
-	fi
-
-	# 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
+	# handle output, each action can be associated with a 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 "$action_name" "$tag_regex" "$log_template"
-	config_foreach handle_log_remote log_remote "$action_name" "$tag_regex"
+	config_foreach handle_log_file log_file "$tag"
+	config_foreach handle_log_remote log_remote "$tag"
 }
 
 handle_action_section() {
@@ -506,14 +334,13 @@ 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

@@ -55,10 +55,6 @@ config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
 config AGENT_USE_LIBDPP
 	bool "Depend on libdpp for DPP EasyConnect"
 
-config AGENT_ZEROTOUCH_DPP
-	bool "Enable Zero-touch DPP bootstrapping. Depends on libztdpp.so"
-	default n
-
 config AGENT_CHECK_PARTIAL_WIFI_RELOAD
 	bool "Option that allow SSID/PSK simple reload"
 	default y

map-agent/Makefile

@@ -1,14 +1,13 @@
 #
-# Copyright (C) 2020-2024 IOPSYS Software Solutions AB
-# Copyright (C) 2025 Genexis Sweden AB
+# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.3.7.0
+PKG_VERSION:=6.3.6.7
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ab9fa6ffc6978c84ab9a3b410d31c71c3b185430
+PKG_SOURCE_VERSION:=f611be0c05e3f4fb3d35a5a1ad51f5a4ad6406ca
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -27,7 +26,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/map-agent
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=Wi-Fi Multi-AP Agent (EasyMesh R6)
+  TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
 	   +ieee1905-map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp \
 	   +uuidgen +openssl-util +!TARGET_brcmbca:ebtables-legacy \
@@ -46,12 +45,9 @@ define Package/dynbhd
 	  +ieee1905-map-plugin +map-agent
 endef
 
-ifeq ($(CONFIG_AGENT_ZEROTOUCH_DPP),y)
-  TARGET_CFLAGS += -DZEROTOUCH_DPP
-endif
 
 define Package/map-agent/description
-  This package provides EasyMesh R6 compliant Wi-Fi Multi-AP Agent.
+ This package implements EasyMesh R2 compliant WiFi Agent.
 endef
 
 define Package/dynbhd/description

map-agent/files/lib/multiap/map_genconfig

@@ -44,16 +44,19 @@ generate_multiap_config() {
 			2g)
 				mode_band=2
 				priority=2
+				dpp_chan="81/1"
 				channels="1 6 11"
 			;;
 			5g)
 				mode_band=5
 				priority=1
+				dpp_chan="128/36"
 				channels="36-64 100-112"
 			;;
 			6g)
 				mode_band=6
 				priority=0
+				dpp_chan="133/49"
 			;;
 		esac
 
@@ -155,17 +158,13 @@ generate_multiap_config() {
 				uci set mapagent.@bsta[-1].band="$mode_band"
 				uci set mapagent.@bsta[-1].priority="$priority"
 
-				# add dpp_chirp section for 2.4GHz bSTA
-				if [ $mode_band -eq 2 ]; then
-					uci add mapagent dpp_chirp
-					uci set mapagent.@dpp_chirp[-1].type="qrcode"
-					uci set mapagent.@dpp_chirp[-1].device="$device"
-					uci set mapagent.@dpp_chirp[-1].ifname="$ifname"
-					uci set mapagent.@dpp_chirp[-1].band="$mode_band"
-					for channel in $channels; do
-						uci add_list mapagent.@dpp_chirp[-1].channel="$channel"
-					done
-				fi
+				#uci add mapagent dpp_uri
+				#uci set mapagent.@dpp_uri[-1].type="qrcode"
+				#uci set mapagent.@dpp_uri[-1].device="$device"
+				#uci set mapagent.@dpp_uri[-1].ifname="$ifname"
+				#uci set mapagent.@dpp_uri[-1].band="$mode_band"
+				#uci set mapagent.@dpp_uri[-1].chirp_interval="10"
+				#uci add_list mapagent.@dpp_uri[-1].dpp_chan="$dpp_chan"
 
 				if [ $generate_wireless_sta_config -eq 1 ]; then
 					secname="default_sta_${device}"
@@ -259,6 +258,7 @@ map_genconf () {
 				config_foreach mapcontroller_remove_mld_id ap
 			}
 		fi
-		ubus -t 5 call uci commit '{"config":"mapcontroller"}'
+		uci -q commit mapcontroller
+		ubus send bbfdm.wifidmd.reload
 	fi
 }

map-controller/Config.in

@@ -39,10 +39,6 @@ config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
 config CONTROLLER_USE_LIBDPP
 	bool "Depend on libdpp for DPP EasyConnect"
 
-config CONTROLLER_ZEROTOUCH_DPP
-	bool "Enable Zero-touch DPP bootstrapping via passphrase."
-	default n
-
 config CONTROLLER_PROPAGATE_PROBE_REQ
 	depends on CONTROLLER_EASYMESH_VENDOR_EXT
 	bool "Enable publishing probe requests vendor specific messages as UBUS events"

map-controller/Makefile

@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.4.4.0
+PKG_VERSION:=6.4.0.12
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d2e91ca156dbe0b44f0fc551b0a353137343fdf1
+PKG_SOURCE_VERSION:=ae10f447f8d83ed6b98d2b82da2dda64be2c3183
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>
 
 LOCAL_DEV=0
@@ -36,9 +36,6 @@ ifeq ($(CONFIG_CONTROLLER_USE_LIBDPP),y)
   TARGET_CFLAGS += -DUSE_LIBDPP
 endif
 
-ifeq ($(CONFIG_CONTROLLER_ZEROTOUCH_DPP),y)
-  TARGET_CFLAGS += -DZEROTOUCH_DPP
-endif
 
 define Package/map-controller/description
  This package provides WiFi MultiAP Controller as per the EasyMesh-R2 specs.
@@ -84,7 +81,6 @@ define Build/InstallDev
 	$(CP) $(PKG_BUILD_DIR)/src/cntlr_commands_impl.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/cntlr_commands.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/cntlr_apis.h $(1)/usr/include/map-controller
-	$(CP) $(PKG_BUILD_DIR)/src/cntlr_plugin.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/wifi_opclass.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/steer_module.h $(1)/usr/include/map-controller
 	$(CP) $(PKG_BUILD_DIR)/src/timer.h $(1)/usr/include/map-controller

map-controller/files/etc/config/mapcontroller

@@ -2,7 +2,7 @@ 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 '2'
+	option debug '0'
 	option bcn_metrics_max_num '10'
 	option initial_channel_scan '0'
 	option enable_ts '0'
@@ -10,9 +10,8 @@ config controller 'controller'
 	option primary_pcp '0'
 	option stale_sta_timeout '30d'
 	option de_collect_interval '60'
-	list plugin 'zerotouch'
 
-config sta_steering 'sta_steering'
+config sta_steering
 	option enable_sta_steer '1'
 	option enable_bsta_steer '0'
 	option rcpi_threshold_2g '70'
@@ -24,10 +23,8 @@ config sta_steering 'sta_steering'
 	option plugins_enabled '1'
 	option plugins_policy 'any'
 	list plugins 'rcpi'
-	list plugins 'rate'
-	list plugins 'bsteer'
 
-config channel_plan 'channel_plan'
+config channel_plan
 	option preclear_dfs '0'
 	option acs '0'
 

map-controller/files/etc/uci-defaults/99-mapcntlr-uci-rename-singletons

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-cfg=mapcontroller
-
-# singleton sections
-sections="channel_plan sta_steering"
-
-for sec in $sections; do
-    # find unnamed section of given type, only index 0
-    s=$(uci show $cfg | grep -oE "@${sec}\[0\]" | sort -u)
-    [ "$s" = "" ] && continue
-
-    uci rename $cfg.$s=$sec
-done
-
-uci commit $cfg

map-plugins/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-plugins
-PKG_VERSION:=1.1.2
+PKG_VERSION:=0.0.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a76610182366cf05ed7e8f5fbac26890b709eeb4
+PKG_SOURCE_VERSION:=74bf151851112ecee731d447af016c8dc668adcf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-plugins.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -27,18 +27,11 @@ include $(INCLUDE_DIR)/package.mk
 
 include $(wildcard plugins/*.mk)
 
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS) -Wall"
 
 plugins := \
-	$(if $(CONFIG_PACKAGE_map-plugins-steer-rate),steer-rate)   \
-	$(if $(CONFIG_PACKAGE_map-plugins-bsteer),bsteer) \
-	$(if $(CONFIG_PACKAGE_map-plugins-zero-touch),zero-touch)
+	$(if $(CONFIG_PACKAGE_map-plugins-steer-rate),steer-rate)
 
 ppkg:=$(patsubst plugins/%.mk,map-plugins-%,$(wildcard plugins/*.mk))
 
@@ -59,7 +52,7 @@ define Package/map-plugins
 endef
 
 define Package/map-plugins/description
-	Provides extra Multi-AP services viz. steering, channel-planning, self-organizing network etc.
+	Provides extra Multi-AP services viz. steering, channel-planning etc.
 endef
 
 define Package/map-plugins/install
@@ -67,8 +60,9 @@ define Package/map-plugins/install
 endef
 
 define Build/Compile
-	$(foreach p,$(plugins),$(call Build/Compile/map-plugins-$(p), $(1)))
+	$(foreach p,$(ppkg),$(call Build/Compile/$(p),$(1)))
 endef
 
+
 $(eval $(call BuildPackage,map-plugins))
 $(eval $(foreach p,$(ppkg),$(call BuildPackage,$(p))))

map-plugins/plugins/bsteer.mk

@@ -1,20 +0,0 @@
-define Package/map-plugins-bsteer
-	$(call Package/map-plugins/Default)
-	TITLE:=Wi-Fi backhaul steering plugin based on maximizing backhaul throughput
-	DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-		 +libjson-c +libblobmsg-json +map-controller \
-		 +map-plugins
-endef
-
-define Package/map-plugins-bsteer/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
-	$(CP) $(PKG_BUILD_DIR)/steer/bsteer/bsteer.so $(1)/usr/lib/mapcontroller/bsteer.so
-endef
-
-define Build/Compile/map-plugins-bsteer
-	$(MAKE) -C $(PKG_BUILD_DIR)/steer/bsteer \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)";
-endef

map-plugins/plugins/steer-rate.mk

@@ -16,5 +16,5 @@ define Build/Compile/map-plugins-steer-rate
 	$(MAKE) -C $(PKG_BUILD_DIR)/steer/rate \
 		CC="$(TARGET_CC)" \
 		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)";
+		LDFLAGS="$(TARGET_LDFLAGS)"
 endef

map-plugins/plugins/zero-touch.mk

@@ -1,22 +0,0 @@
-define Package/map-plugins-zero-touch
-	$(call Package/map-plugins/Default)
-	TITLE:=Full Zero-touch bootstrapping of Wi-Fi Repeater device(s)
-	DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-		 +libjson-c +libblobmsg-json +map-controller \
-		 +map-plugins
-endef
-
-define Package/map-plugins-zero-touch/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
-	$(CP) $(PKG_BUILD_DIR)/zero-touch/zerotouch.so $(1)/usr/lib/mapcontroller/zerotouch.so
-	$(CP) $(PKG_BUILD_DIR)/zero-touch/libztdpp.so $(1)/usr/lib/libztdpp.so
-
-endef
-
-define Build/Compile/map-plugins-zero-touch
-	$(MAKE) -C $(PKG_BUILD_DIR)/zero-touch \
-		CC="$(TARGET_CC)" \
-		CFLAGS="$(TARGET_CFLAGS)" \
-		LDFLAGS="$(TARGET_LDFLAGS)";
-endef

mosquitto-auth-shadow/Config.in

@@ -1,7 +0,0 @@
-if PACKAGE_mosquitto-auth-shadow
-
-config MOSQUITTO_AUTH_PAM_SUPPORT
-	bool "Enable support of Linux PAM module for Authentication"
-	default y
-
-endif

mosquitto-auth-shadow/Makefile

@@ -14,13 +14,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mosquitto-auth-shadow
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.0.1
 
 PKG_MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
 PKG_LICENSE:=EPL-2.0
 
 PKG_BUILD_PARALLEL:=1
-PKG_CONFIG_DEPENDS:=CONFIG_MOSQUITTO_AUTH_PAM_SUPPORT
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -28,7 +27,7 @@ define Package/mosquitto-auth-shadow
   SECTION:=net
   CATEGORY:=Network
   TITLE:=mosquitto - /etc/shadow authentication plugin
-  DEPENDS:=+mosquitto-ssl +MOSQUITTO_AUTH_PAM_SUPPORT:libpam
+  DEPENDS:=+mosquitto-ssl
   USERID:=mosquitto=200:mosquitto=200 mosquitto=200:shadow=11
 endef
 
@@ -37,14 +36,6 @@ define Package/mosquitto-auth-shadow/description
   users using /etc/shadow
 endef
 
-define Package/mosquitto-auth-shadow/config
-	source "$(SOURCE)/Config.in"
-endef
-
-ifeq ($(CONFIG_MOSQUITTO_AUTH_PAM_SUPPORT),y)
-TARGET_CFLAGS+=-DENABLE_PAM_SUPPORT
-endif
-
 define Package/mosquitto-auth-shadow/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mosquitto_auth_shadow.so $(1)/usr/lib/

mosquitto-auth-shadow/src/Makefile

@@ -19,7 +19,7 @@ all: $(TARGETS)
 	$(CC) $(CFLAGS) -Wall -Werror -fPIC -c -o $@ $<
 
 mosquitto_auth_shadow.so: mosquitto_auth_shadow.pic.o
-	$(CC) $(LDFLAGS) -shared -o $@ $^ $(if $(filter -DENABLE_PAM_SUPPORT,$(CFLAGS)),-lpam)
+	$(CC) $(LDFLAGS) -shared -o $@ $^
 
 clean:
 	rm -f *.o $(TARGETS)

mosquitto-auth-shadow/src/mosquitto_auth_shadow.c

@@ -15,78 +15,22 @@
 #include <string.h>
 #include <shadow.h>
 #include <crypt.h>
-#include <stdlib.h>
 #include <mosquitto.h>
 #include <mosquitto_broker.h>
 #include <mosquitto_plugin.h>
 
-#ifdef ENABLE_PAM_SUPPORT
-#include <security/pam_appl.h>
-
-static int pam_conversation(int num_msg, const struct pam_message **msg, struct pam_response **resp, void *appdata_ptr)
-{
-	int i;
-	const char *pass = (const char *)appdata_ptr;
-
-	*resp = calloc(num_msg, sizeof(struct pam_response));
-	if (*resp == NULL) {
-		mosquitto_log_printf(MOSQ_LOG_ERR, "pam failed to allocate buffer for validation");
-		return PAM_BUF_ERR;
-	}
-
-	if (pass == NULL)
-		return PAM_SUCCESS;
-
-	for (i = 0; i < num_msg; ++i) {
-		if (msg[i]->msg_style == PAM_PROMPT_ECHO_OFF) {
-			(*resp)[i].resp = strdup(pass);
-			if ((*resp)[i].resp == NULL) {
-				for (int j = 0; j < i ; j++)
-					free((*resp)[j].resp);
-
-				free(*resp);
-				*resp = NULL;
-				mosquitto_log_printf(MOSQ_LOG_ERR, "pam failed in strdup");
-				return PAM_BUF_ERR;
-			}
-		}
-	}
-	return PAM_SUCCESS;
-}
-
-static int process_pam_auth_callback(struct mosquitto_evt_basic_auth *ed)
-{
-	struct pam_conv conv;
-	int retval;
-	pam_handle_t *pamh = NULL;
-
-	conv.conv = pam_conversation;
-	conv.appdata_ptr = (void *)ed->password;
-
-	retval = pam_start("mosquitto", ed->username, &conv, &pamh);
-	if (retval != PAM_SUCCESS) {
-		mosquitto_log_printf(MOSQ_LOG_ERR, "pam start failed: %s", pam_strerror(pamh, retval));
-		return MOSQ_ERR_AUTH;
-	}
-
-	retval = pam_authenticate(pamh, 0);
-	pam_end(pamh, retval);
-	if (retval == PAM_SUCCESS) {
-		mosquitto_log_printf(MOSQ_LOG_NOTICE, "pam user [%s] logged in", ed->username);
-		return MOSQ_ERR_SUCCESS;
-	}
-
-	mosquitto_log_printf(MOSQ_LOG_NOTICE, "pam user [%s] failed authentication, err [%s]", ed->username, pam_strerror(pamh, retval));
-	return MOSQ_ERR_AUTH;
-}
-#else
-static int process_shadow_auth_callback(struct mosquitto_evt_basic_auth *ed)
+static int basic_auth_callback(int event, void *event_data, void *userdata)
 {
+	struct mosquitto_evt_basic_auth *ed = event_data;
 	struct spwd spbuf, *sp = NULL;
 	char buf[256];
 	struct crypt_data data;
 	char *hash;
 
+	/* Let other plugins or broker decide about anonymous login */
+	if (ed->username == NULL)
+		return MOSQ_ERR_PLUGIN_DEFER;
+
 	getspnam_r(ed->username, &spbuf, buf, sizeof(buf), &sp);
 
 	if (sp == NULL || sp->sp_pwdp == NULL)
@@ -110,22 +54,6 @@ static int process_shadow_auth_callback(struct mosquitto_evt_basic_auth *ed)
 
 	return MOSQ_ERR_AUTH;
 }
-#endif
-
-static int basic_auth_callback(int event, void *event_data, void *userdata)
-{
-	struct mosquitto_evt_basic_auth *ed = event_data;
-
-	/* Let other plugins or broker decide about anonymous login */
-	if (ed->username == NULL)
-		return MOSQ_ERR_PLUGIN_DEFER;
-
-#ifdef ENABLE_PAM_SUPPORT
-	return process_pam_auth_callback(ed);
-#else
-	return process_shadow_auth_callback(ed);
-#endif
-}
 
 int mosquitto_plugin_version(int supported_version_count,
 			     const int *supported_versions)

netmode/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.6
 PKG_RELEASE:=1
 PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only

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"
 				}
 			]
 		},

netmode/files/etc/netmodes/routed-dhcp/scripts/10-routed-dhcp

@@ -17,8 +17,6 @@ l3_mcast_config() {
 l3_network_config() {
 	logger -s -p user.info -t "netmode" "Generating L3 network configuration"
 
-	wandev="$(uci -q get network.WAN.ifname)"
-
 	# Configure L3 Network Mode
 	uci -q set network.lan=interface
 	uci -q set network.lan.device='br-lan'
@@ -38,35 +36,11 @@ l3_network_config() {
 	uci -q delete network.wan.disabled
 	uci -q delete network.wan.username
 	uci -q delete network.wan.password
-	uci -q delete network.wan.ipaddr
-	uci -q delete network.wan.gateway
-	uci -q delete network.wan.netmask
 
 	uci -q set network.wan6=interface
 	uci -q set network.wan6.proto='dhcpv6'
 	uci -q delete network.wan6.disabled
 
-	if [ -n "$wandev" ] && echo "$NETMODE_vlanid" | grep -Eq '^[0-9]+$' && [ "$NETMODE_vlanid" -ge 1 ]; then
-		uci -q set network.vlan_${NETMODE_vlanid}=device
-		uci -q set network.vlan_${NETMODE_vlanid}.type="8021q"
-		uci -q set network.vlan_${NETMODE_vlanid}.name="$wandev.$NETMODE_vlanid"
-		uci -q set network.vlan_${NETMODE_vlanid}.ifname="$wandev"
-		uci -q set network.vlan_${NETMODE_vlanid}.vid=$NETMODE_vlanid
-
-		wandev="$wandev.$NETMODE_vlanid"
-	fi
-
-	uci -q set network.wan.device="$wandev"
-	uci -q set network.wan6.device="$wandev"
-
-	uci -q delete network.wan.dns
-	if [ -n "$NETMODE_dns_servers" ]; then
-		dns_servers="$(echo $NETMODE_dns_servers | tr ',' ' ')"
-		for server in $dns_servers; do
-		    uci -q add_list network.wan.dns=$server
-		done
-	fi
-
 	uci -q delete network.br_lan.ports
 	uci -q set network.br_lan.bridge_empty='1'
 
@@ -87,6 +61,12 @@ l3_network_config() {
 			[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
 		fi
 		json_select ..
+		json_select wan 2>/dev/null
+		json_get_var device device
+		if [ -n "$device" ]; then
+			uci -q set network.wan.device="$device"
+			uci -q set network.wan6.device="$device"
+		fi
 		json_cleanup
 	fi
 

netmode/files/etc/netmodes/routed-pppoe/scripts/10-routed-pppoe

@@ -17,8 +17,6 @@ l3_mcast_config() {
 l3_network_pppoe_config() {
 	logger -s -p user.info -t "netmode" "Generating L3 network configuration"
 
-	wandev="$(uci -q get network.WAN.ifname)"
-
 	# Configure L3 Network Mode
 	uci -q set network.lan=interface
 	uci -q set network.lan.device='br-lan'
@@ -38,33 +36,9 @@ l3_network_pppoe_config() {
 	uci -q set network.wan.username="$NETMODE_username"
 	uci -q set network.wan.password="$NETMODE_password"
 	uci -q delete network.wan.disabled
-	uci -q delete network.wan.ipaddr
-	uci -q delete network.wan.gateway
-	uci -q delete network.wan.netmask
 
 	uci -q set network.wan6.disabled='1'
 
-	if [ -n "$wandev" ] && echo "$NETMODE_vlanid" | grep -Eq '^[0-9]+$' && [ "$NETMODE_vlanid" -ge 1 ]; then
-		uci -q set network.vlan_${NETMODE_vlanid}=device
-		uci -q set network.vlan_${NETMODE_vlanid}.type="8021q"
-		uci -q set network.vlan_${NETMODE_vlanid}.name="$wandev.$NETMODE_vlanid"
-		uci -q set network.vlan_${NETMODE_vlanid}.ifname="$wandev"
-		uci -q set network.vlan_${NETMODE_vlanid}.vid=$NETMODE_vlanid
-
-		wandev="$wandev.$NETMODE_vlanid"
-	fi
-
-	uci -q set network.wan.device="$wandev"
-	uci -q set network.wan6.device="$wandev"
-
-	uci -q delete network.wan.dns
-	if [ -n "$NETMODE_dns_servers" ]; then
-		dns_servers="$(echo $NETMODE_dns_servers | tr ',' ' ')"
-		for server in $dns_servers; do
-		    uci -q add_list network.wan.dns=$server
-		done
-	fi
-
 	uci -q delete network.br_lan.ports
 	uci -q set network.br_lan.bridge_empty='1'
 
@@ -85,6 +59,12 @@ l3_network_pppoe_config() {
 			[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
 		fi
 		json_select ..
+		json_select wan 2>/dev/null
+		json_get_var device device
+		if [ -n "$device" ]; then
+			uci -q set network.wan.device="$device"
+			uci -q set network.wan6.device="$device"
+		fi
 		json_cleanup
 	fi
 

netmode/files/etc/netmodes/routed-static/scripts/10-routed-static

@@ -1,127 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-
-source "/etc/device_info"
-
-l3_mcast_config() {
-	# configure L3 mcast config
-	logger -s -p user.info -t "netmode" "Generating L3 mcast configuration"
-
-	rm -f /etc/config/mcast
-	sh /rom/etc/uci-defaults/61-mcast_config_generate
-	uci -q commit mcast
-}
-
-l3_network_config() {
-	logger -s -p user.info -t "netmode" "Generating L3 network configuration"
-
-	wandev="$(uci -q get network.WAN.ifname)"
-
-	# Configure L3 Network Mode
-	uci -q set network.lan=interface
-	uci -q set network.lan.device='br-lan'
-	uci -q set network.lan.proto='static'
-	uci -q set network.lan.ipaddr='192.168.1.1'
-	uci -q set network.lan.netmask='255.255.255.0'
-	uci -q set network.lan.ip6assign='60'
-	uci -q delete network.lan.vendorid
-	uci -q delete network.lan.clientid
-	uci -q delete network.lan.reqopts
-	uci -q delete network.lan.sendopts
-
-	uci -q delete network.lan6	
-
-	uci -q set network.wan=interface
-	uci -q set network.wan.device="$wandev"
-	uci -q set network.wan.proto='static'
-	uci -q set network.wan.ipaddr="$NETMODE_ipaddr"
-	uci -q set network.wan.gateway="$NETMODE_gateway"
-	uci -q set network.wan.netmask="$NETMODE_netmask"
-	uci -q delete network.wan.disabled
-	uci -q delete network.wan.username
-	uci -q delete network.wan.password
-
-	uci -q set network.wan6.disabled='1'
-
-	if [ -n "$wandev" ] && echo "$NETMODE_vlanid" | grep -Eq '^[0-9]+$' && [ "$NETMODE_vlanid" -ge 1 ]; then
-		uci -q set network.vlan_${NETMODE_vlanid}=device
-		uci -q set network.vlan_${NETMODE_vlanid}.type="8021q"
-		uci -q set network.vlan_${NETMODE_vlanid}.name="$wandev.$NETMODE_vlanid"
-		uci -q set network.vlan_${NETMODE_vlanid}.ifname="$wandev"
-		uci -q set network.vlan_${NETMODE_vlanid}.vid=$NETMODE_vlanid
-
-		wandev="$wandev.$NETMODE_vlanid"
-	fi
-
-	uci -q set network.wan.device="$wandev"
-	uci -q set network.wan6.device="$wandev"
-
-	uci -q delete network.wan.dns
-	if [ -n "$NETMODE_dns_servers" ]; then
-		dns_servers="$(echo $NETMODE_dns_servers | tr ',' ' ')"
-		for server in $dns_servers; do
-		    uci -q add_list network.wan.dns=$server
-		done
-	fi
-
-	uci -q delete network.br_lan.ports
-	uci -q set network.br_lan.bridge_empty='1'
-
-	add_port_to_br_lan() {
-		port="$1"
-		[ -n "$port" -a -d /sys/class/net/$port ] || continue
-		uci add_list network.br_lan.ports="$port"
-	}
-
-	if [ -f /etc/board.json ]; then
-		json_load_file /etc/board.json
-		json_select network
-		json_select lan
-		if json_is_a ports array; then
-			json_for_each_item add_port_to_br_lan ports
-		else
-			json_get_var device device
-			[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
-		fi
-		json_select ..
-		json_cleanup
-	fi
-
-	uci -q commit network
-
-	# Enable DHCP Server
-	uci -q set dhcp.lan.ignore=0
-	uci -q set dhcp.wan.ignore=1
-	uci -q commit dhcp
-	/etc/init.d/odhcpd enable
-
-	# Enable SSDPD
-	uci -q set ssdpd.ssdp.enabled="1"
-	uci -q commit ssdpd
-
-	# Update CWMP Agent WAN Interface
-	uci -q set cwmp.cpe.default_wan_interface="wan"
-	uci -q commit cwmp
-
-	# Update gateway WAN Interface
-	uci -q set gateway.global.wan_interface="wan"
-	uci -q commit gateway
-
-	# Enable firewall
-	uci -q set firewall.globals.enabled="1"
-	uci -q commit firewall
-}
-
-l3_network_config
-l3_mcast_config
-
-# If device is already boot-up, assume netmode changed during runtime
-if [ -f /var/run/boot_complete ]; then
-	/etc/init.d/odhcpd restart 2>/dev/null
-	for config in network dhcp ssdpd cwmp gateway firewall mcast; do
-		ubus call uci commit "{\"config\":\"$config\"}"
-		sleep 1
-	done
-fi

netmode/files/etc/netmodes/supported_modes.json

@@ -3,90 +3,25 @@
   "supported_modes": [
     {
       "name": "routed-dhcp",
-      "description": "DHCP",
-      "supported_args": [
-        {
-          "name": "vlanid",
-          "description": "VLAN ID",
-          "required": false,
-          "type": "integer"
-        },
-        {
-          "name": "dns_servers",
-          "description": "DNS Servers",
-          "required": false,
-          "type": "string"
-        }
-      ]
+      "description": "WAN with DHCP proto (Layer 3)"
     },
     {
       "name": "routed-pppoe",
-      "description": "PPPoE",
+      "description": "WAN with PPPoE (Layer 3)",
       "supported_args": [
         {
           "name": "username",
-          "description": "PPPoE Username",
+          "description": "PPPoE username",
           "required": true,
-          "type": "string",
+	  "type": "string",
           "#value": "TestUser"
         },
         {
           "name": "password",
-          "description": "PPPoE Password",
+          "description": "PPPoE password",
           "required": true,
-          "type": "string",
+	  "type": "string",
           "#value": "TestPassword"
-        },
-        {
-          "name": "vlanid",
-          "description": "VLAN ID",
-          "required": false,
-          "type": "integer"
-        },
-        {
-          "name": "dns_servers",
-          "description": "DNS Servers",
-          "required": false,
-          "type": "string"
-        }
-      ]
-    },
-    {
-      "name": "routed-static",
-      "description": "Static",
-      "supported_args": [
-        {
-          "name": "ipaddr",
-          "description": "IP Address",
-          "required": true,
-          "type": "string",
-          "#value": "93.21.0.104"
-        },
-        {
-          "name": "netmask",
-          "description": "Subnet Mask",
-          "required": true,
-          "type": "string",
-          "#value": "255.255.255.0"
-        },
-        {
-          "name": "gateway",
-          "description": "Default Gateway",
-          "required": true,
-          "type": "string",
-          "#value": "93.21.0.1"
-        },
-        {
-          "name": "vlanid",
-          "description": "VLAN ID",
-          "required": false,
-          "type": "integer"
-        },
-        {
-          "name": "dns_servers",
-          "description": "DNS Servers",
-          "required": false,
-          "type": "string"
         }
       ]
     }

netmode/files/etc/uci-defaults/40_netmode_set_default_netmode

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-enabled="$(uci -q get netmode.global.enabled)"
-[ "$enabled" == "1" ] || exit 0
-
-mode="$(uci -q get netmode.global.mode)"
-[ -n "$mode" ] && exit 0
-
-[ -f /etc/netmodes/supported_modes.json ] || exit 0
-
-# NetMode is enabled without a Mode being set
-# Figure out the current mode from network config
-wanproto=$(uci -q get network.wan.proto)
-curmode=""
-case "$wanproto" in
-	dhcp) curmode="routed-dhcp" ;;
-	pppoe) curmode="routed-pppoe" ;;
-	static) curmode="routed-static" ;;
-esac
-
-found=0
-for md in $(jsonfilter -i /etc/netmodes/supported_modes.json -e "@.supported_modes.*.name"); do
-	[ "$md" == "$curmode" ] && found=1
-done
-
-if [ $found -eq 1 ]; then
-	uci -q set netmode.global.mode="$curmode"
-	echo "$curmode" > /etc/netmodes/.last_mode
-fi

obuspa/Config.in

@@ -19,8 +19,13 @@ config OBUSPA_CONTROLLER_MTP_VERIFY
 	bool "Enable verification of controller MTP before processing the message"
 	default n
 
-config OBUSPA_LOCAL_MQTT_LISTENER
-	bool "Configures local mqtt broker for local usp connections"
+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)"
 	default n
 
 config OBUSPA_MAX_CONTROLLERS_NUM

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=10.0.0.17
+PKG_VERSION:=10.0.4.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=8f0f8cfc2c4048bfed674163030d0b06f96f2da1
+PKG_SOURCE_VERSION:=65dabfdb8fbb2f3c2590f3bfb2fabedef8dcd76e
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -32,9 +32,9 @@ define Package/obuspa
   SUBMENU:=TRx69
   TITLE:=USP agent
   MENU:=1
-  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libmosquitto-ssl +libwebsockets-openssl
-  DEPENDS+=+libjson-c +libubox +libubus +libuci +libblobmsg-json
-  DEPENDS+=+ca-certificates +OBUSPA_LOCAL_MQTT_LISTENER:mosquitto-ssl
+  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
   DEPENDS+=+libbbfdm-api +libbbfdm-ubus +dm-service
 endef
 
@@ -132,23 +132,27 @@ 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_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/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_BIN) ./files/etc/firewall.usp $(1)/etc/
-	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user
 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_LOCAL_MQTT_LISTENER),y)
-	$(INSTALL_DATA) ./files/etc/uci-defaults/55-obuspa-local-mqtt-usp-connection $(1)/etc/uci-defaults/
+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/
 endif
 ifeq ($(CONFIG_OBUSPA_OVERRIDE_CT_ROLE),y)
-	$(INSTALL_DATA) ./files/etc/uci-defaults/61-override-ct-roles $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/61-override-ct-roles $(1)/etc/uci-defaults/
 endif
 endef
 

obuspa/files/etc/init.d/obuspa

@@ -6,18 +6,19 @@ USE_PROCD=1
 
 PROG=/usr/sbin/obuspa
 CONFIGURATION=obuspa
+
 ENV_PROFILE="/root/.profile"
 KEEP_FILE="/lib/upgrade/keep.d/obuspa"
 
 RESET_FILE="/tmp/obuspa/fw_defaults"
-
-OBUSPA_BOOT_MARKER="/etc/obuspa/.boot"
+SQL_DB_FILE="/tmp/obuspa/usp.db"
+DB_DUMP="/tmp/obuspa/usp.dump_$(date +%s)"
 
 BASEPATH=""
 INSTANCE_COUNT=0
-CLIENT_ID_PREFIX=""
 
 . /lib/functions/network.sh
+. /usr/share/libubox/jshn.sh
 . /etc/obuspa/usp_utils.sh
 
 global_init()
@@ -29,7 +30,6 @@ global_init()
 log()
 {
 	echo "$*"|logger -t obuspa.init -p debug
-	echo "$*" >/dev/console
 }
 
 db_set_reset_file()
@@ -47,9 +47,37 @@ db_set_reset_file()
 	fi
 }
 
+db_set_sql()
+{
+	local param value
+
+	param="${1}"
+	shift
+	value="$*"
+
+	if [ -n "${param}" ] && [ -n "${value}" ]; then
+		if grep -q "${param} " ${DB_DUMP}; then
+			value="${value//\//\\/}"
+			sed -i "s/${param} .*/${param} \"${value}\"/g" ${DB_DUMP}
+		else
+			echo "${param} \"${value}\"" >> ${DB_DUMP}
+		fi
+	fi
+}
+
 db_set()
 {
-	db_set_reset_file "$@"
+	# if sql db dump file present, update it
+	if [ -f "${DB_DUMP}" ]; then
+		db_set_sql "$@"
+	else
+		db_set_reset_file "$@"
+	fi
+}
+
+dump_db()
+{
+	${PROG} -v0 -f ${SQL_DB_FILE} -c show database |grep "^Internal.\|^Device."|sed '{s/=> /"/g;s/$/"/g}' | sort  > ${DB_DUMP}
 }
 
 # if db present then check if it matches with existing instances
@@ -64,6 +92,21 @@ get_base_path()
 	path=""
 	count=0
 
+	if [ -f "${DB_DUMP}" ]; then
+		path=$(grep -E "${refpath}\d+.Alias \"${value}\"" ${DB_DUMP})
+		path=${path%.*}
+		if [ -z "${path}" ]; then
+			path=$(grep -oE "${refpath}\d+" ${DB_DUMP} |sort -r|head -n 1)
+			if [ -n "${path}" ]; then
+				count=${path##*.}
+				count=$(( count + 1 ))
+			else
+				count=1
+			fi
+			path="${refpath}${count}"
+		fi
+	fi
+
 	if [ -z "${path}" ]; then
 		INSTANCE_COUNT=$(( INSTANCE_COUNT + 1 ))
 		path="${refpath}${INSTANCE_COUNT}"
@@ -79,7 +122,9 @@ get_refrence_path()
 	value="${2}"
 	path=""
 
-	if [ -f "${RESET_FILE}" ]; then
+	if [ -f "${DB_DUMP}" ]; then
+		path=$(grep -E "${dmref}\d+.Alias " ${DB_DUMP}|grep -w "${value}")
+	elif [ -f "${RESET_FILE}" ]; then
 		path=$(grep -E "${dmref}\d+.Alias " ${RESET_FILE}|grep -w "${value}")
 	fi
 	path=${path%.*}
@@ -91,7 +136,7 @@ update_keep()
 	file=${1}
 
 	if [ -z "${file}" ]; then
-		return 0
+		return;
 	fi
 
 	if [ ! -f "${KEEP_FILE}" ]; then
@@ -218,7 +263,7 @@ configure_localagent()
 
 	validate_localagent_section "${1}" || {
 		log "Validation of localagent section failed"
-		return 0
+		return 0;
 	}
 
 	db_set Device.LocalAgent.EndpointID "${EndpointID}"
@@ -226,7 +271,7 @@ configure_localagent()
 
 update_reset_reason()
 {
-	[ -f "/tmp/reset_reason" ] || return 0
+	[ -f "/tmp/reset_reason" ] || return 0;
 
 	if grep -qwi "defaultreset" /tmp/reset_reason; then
 		db_set Internal.Reboot.Cause "FactoryReset"
@@ -265,6 +310,10 @@ get_role_index()
 		val="$(grep "Device.LocalAgent.ControllerTrust.Role.\d.Name" ${CTRUST_RESET_FILE} |grep $name)"
 		val="$(echo ${val/.Name /,}|cut -d, -f 1)"
 		echo "$val"
+	elif [ -f "${DB_DUMP}" ]; then
+		val="$(grep "Device.LocalAgent.ControllerTrust.Role.\d.Name" ${DB_DUMP} |grep $name)"
+		val="$(echo ${val/.Name /,}|cut -d, -f 1)"
+		echo "$val"
 	else
 		log "Not able to get role ${name}, use Untrusted role"
 		echo "${drole}"
@@ -282,19 +331,19 @@ configure_controller()
 	sec="${1}"
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
-		return 1
+		return 1;
 	}
 
 	sec="${sec/controller_/cpe-}"
 	get_base_path "Device.LocalAgent.Controller." "${sec}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
-		return 1
+		return 1;
 	fi
 
 	if [ -z "${Protocol}" ]; then
 		log "controller:: Protocol cannot be empty"
-		return 1
+		return 1;
 	fi
 
 	dm_ref=""
@@ -390,14 +439,14 @@ configure_subscription()
 	sec="${1}"
 	validate_subscription_section "${1}" || {
 		log "Validation of subscription section failed"
-		return 1
+		return 1;
 	}
 
 	sec="${sec/sub_/cpe-}"
 	get_base_path "Device.LocalAgent.Subscription." "sub_${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
-		return 1
+		return 1;
 	fi
 
 	if [ -n "${controller}" ]; then
@@ -434,12 +483,12 @@ configure_challenges()
 	get_base_path "Device.LocalAgent.ControllerTrust.Challenge." "${sec}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
-		return 1
+		return 1;
 	fi
 
 	if [ -z "${role_name}" ] && [ -z "${Role}" ]; then
-		log "Either role_name or Role must defined for a challenge"
-		return 1
+		log "Either role_name or Role must defined for a challenge";
+		return 1;
 	fi
 
 	db_set "${BASEPATH}.Alias" "${sec}"
@@ -466,18 +515,18 @@ configure_mtp() {
 	sec="${1}"
 	validate_mtp_section "${1}" || {
 		log "Validation of mtp section failed"
-		return 1
+		return 1;
 	}
 	sec="${sec/mtp_/cpe-}"
 	get_base_path "Device.LocalAgent.MTP." "${sec}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
-		return 1
+		return 1;
 	fi
 
 	if [ -z "${Protocol}" ]; then
 		log "Protocol not defined for the mtp[${1}] section"
-		return 1
+		return 1;
 	fi
 
 	dm_ref=""
@@ -535,14 +584,14 @@ configure_stomp_connection() {
 	sec="${1}"
 	validate_stomp_connection_section "${1}" || {
 		log "Validation of stomp section failed"
-		return 1
+		return 1;
 	}
 
 	sec="${sec/stomp_/cpe-}"
 	get_base_path "Device.STOMP.Connection." "${sec}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
-		return 1
+		return 1;
 	fi
 
 	db_set "${BASEPATH}.Alias" "${sec}"
@@ -565,18 +614,14 @@ configure_mqtt_client() {
 	sec="${1}"
 	validate_mqtt_client_section "${1}" || {
 		log "Validation of mqtt section failed"
-		return 1
+		return 1;
 	}
 
 	sec="${sec/mqtt_/cpe-}"
 	get_base_path "Device.MQTT.Client." "${sec}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
-		return 1
-	fi
-
-	if [ -z "${ClientID}" ]; then
-		ClientID="${CLIENT_ID_PREFIX}-${sec}"
+		return 1;
 	fi
 
 	db_set "${BASEPATH}.Alias" "${sec}"
@@ -603,9 +648,6 @@ configure_obuspa() {
 	fi
 
 	if [ -n "${log_level}" ]; then
-		if [ "${log_level}" -gt "4" ]; then
-			log_level="4"
-		fi
 		procd_append_param command -v "${log_level}"
 	fi
 
@@ -634,13 +676,13 @@ configure_obuspa() {
 
 	if [ -n "${db_file}" ]; then
 		update_keep "${db_file}"
-		procd_append_param command -f "${db_file}"
-		if [ -f "${db_file}-journal" ]; then
-			log "SQL Journal detected ..."
-		fi
+		procd_append_param command -f "${SQL_DB_FILE}"
 	fi
 
 	if [ -f "${RESET_FILE}" ]; then
+		if [ -f "${SQL_DB_FILE}" ]; then
+			mv ${SQL_DB_FILE} ${SQL_DB_FILE}.old
+		fi
 		procd_append_param command -r ${RESET_FILE}
 	fi
 
@@ -659,34 +701,301 @@ configure_obuspa() {
 	fi
 }
 
-# Create factory reset file
-db_init()
+get_instances_from_db_dump()
 {
-	local reason
+	local obj inst
 
-	reason="${1}"
-	# remove usp.db, in case of reload
-	if [ -f "${OBUSPA_BOOT_MARKER}" ] && [ "${reason}" = "update" ]; then
-		log "Deleting ${OBUSPA_BOOT_MARKER} to enforce values from uci ...."
-		rm -f "${OBUSPA_BOOT_MARKER}"
+	obj="${1}\d+"
+	if [ ! -f "${DB_DUMP}" ]; then
+		echo ""
+		return 0;
 	fi
 
-	if [ -f "${OBUSPA_BOOT_MARKER}" ]; then
+	inst="$(grep -oE "${obj}" "${DB_DUMP}"|uniq)"
+	echo "$inst"
+}
+
+get_param_value_from_dump()
+{
+	local param value
+
+	param="${1}"
+
+	if [ -z "${param}" ] || [ ! -f "${DB_DUMP}" ]; then
+		log "error getting param"
+		echo ""
 		return 0
 	fi
 
-	# Remove reset file if present
-	[ -f "${RESET_FILE}" ] && rm ${RESET_FILE}
+	value="$(grep "^${param} " ${DB_DUMP}|awk '{print $2}')"
 
-	CLIENT_ID_PREFIX="$(db -q get device.deviceinfo.ManufacturerOUI)"
-	CLIENT_ID_PREFIX="${CLIENT_ID_PREFIX}-$(db -q get device.deviceinfo.SerialNumber)"
-	CLIENT_ID_PREFIX="${CLIENT_ID_PREFIX//+/%2b}"
+	echo "${value//\"/}"
+}
+
+update_uci_sec()
+{
+	local sec tmp
+
+	sec="${1}"
+	stype="${2}"
+	if [ -z "$sec" ] || [ -z "$stype" ]; then
+		log "No section name, error"
+		return 0
+	fi
+
+	tmp="$(uci_get obuspa "${sec}")"
+	if [ "$tmp" != "$stype" ]; then
+		uci_add obuspa "${stype}" "${sec}"
+	fi
+}
+
+sync_db_controller()
+{
+	local cntrs copts sec pvalue protocol
+
+	copts="Enable EndpointID PeriodicNotifInterval"
+	popts="Destination Topic Host Port Path EnableEncryption"
+
+	cntrs="$(get_instances_from_db_dump Device.LocalAgent.Controller.)"
+	for cntr in $cntrs; do
+		sec="$(get_param_value_from_dump "${cntr}".Alias)"
+		sec="${sec/cpe-/controller_}"
+		sec="${sec/-/_}"
+
+		update_uci_sec "${sec}" controller
+		for param in ${copts}; do
+			pvalue="$(get_param_value_from_dump "${cntr}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+		uci_set obuspa "${sec}" "_sync" "1"
+
+		protocol="$(get_param_value_from_dump "${cntr}".MTP.1.Protocol)"
+		if [ -z "${protocol}" ]; then
+			break;
+		fi
+		uci_set obuspa "${sec}" "Protocol" "${protocol}"
+		for param in ${popts}; do
+			pvalue="$(get_param_value_from_dump "${cntr}".MTP.1."${protocol}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+	done
+}
+
+sync_db_localagent_mtp()
+{
+	local mtps opts popts sec pvalue protocol
+
+	opts="Enable"
+	popts="ResponseTopicConfigured Destination Port Path EnableEncryption PublishQoS"
+
+	mtps="$(get_instances_from_db_dump Device.LocalAgent.MTP.)"
+	for inst in $mtps; do
+		sec="$(get_param_value_from_dump "${inst}".Alias)"
+		sec="${sec/cpe-/mtp_}"
+		sec="${sec/-/_}"
+		update_uci_sec "${sec}" mtp
+		for param in ${opts}; do
+			pvalue="$(get_param_value_from_dump "${inst}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+		uci_set obuspa "${sec}" "_sync" "1"
+
+		protocol="$(get_param_value_from_dump "${inst}".Protocol)"
+		if [ -z "${protocol}" ]; then
+			break;
+		fi
+		uci_set obuspa "${sec}" "Protocol" "${protocol}"
+		for param in ${popts}; do
+			pvalue="$(get_param_value_from_dump "${inst}"."${protocol}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+	done
+}
+
+
+sync_db_mqtt_client()
+{
+	local mtps copts sec pvalue protocol
+
+	opts="Enable BrokerAddress BrokerPort Username ProtocolVersion TransportProtocol ClientID"
+
+	mtps="$(get_instances_from_db_dump Device.MQTT.Client.)"
+	for inst in $mtps; do
+		sec="$(get_param_value_from_dump "${inst}".Alias)"
+		sec="${sec/cpe-/mqtt_}"
+		sec="${sec/-/_}"
+		update_uci_sec "${sec}" mqtt
+		for param in ${opts}; do
+			pvalue="$(get_param_value_from_dump "${inst}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+		uci_set obuspa "${sec}" "_sync" "1"
+	done
+}
+
+sync_db_stomp_connection()
+{
+	local mtps copts sec pvalue protocol
+
+	opts="Enable Host Port Username EnableEncryption EnableHeartbeats VirtualHost"
+
+	mtps="$(get_instances_from_db_dump Device.STOMP.Connection.)"
+	for inst in $mtps; do
+		sec="$(get_param_value_from_dump "${inst}".Alias)"
+		sec="${sec/cpe-/stomp_}"
+		sec="${sec/-/_}"
+		update_uci_sec "${sec}" stomp
+		for param in ${opts}; do
+			pvalue="$(get_param_value_from_dump "${inst}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+		uci_set obuspa "${sec}" "_sync" "1"
+	done
+}
+
+sync_update_sec()
+{
+	local _sync
+	config_get _sync "${1}" _sync ""
+	if [ -z "${_sync}" ]; then
+		uci_remove obuspa "${1}"
+		log "Deleting obuspa.${1} section ..."
+	else
+		uci_remove obuspa "${1}" _sync
+	fi
+}
+
+sync_uci_with_db()
+{
+	if [ ! -f "${DB_DUMP}" ]; then
+		return 0;
+	fi
+
+	config_load obuspa
+	sync_db_controller
+	sync_db_localagent_mtp
+	sync_db_mqtt_client
+	sync_db_stomp_connection
+	uci_commit obuspa
+
+	config_load obuspa
+	config_foreach sync_update_sec controller
+	config_foreach sync_update_sec mtp
+	config_foreach sync_update_sec mqtt
+	config_foreach sync_update_sec stomp
+	uci_commit obuspa
+}
+
+delete_sql_db_entry_with_pattern()
+{
+	local params pattern
+
+	pattern="${1}"
+	if [ ! -f "${DB_DUMP}" ]; then
+		return 0;
+	fi
+
+	if [ "${#pattern}" -lt 7 ]; then
+		return 0;
+	fi
+
+	#log "Deleting with pattern [${pattern}] from ${DB_DUMP}"
+	sed -i "/${pattern}/d" ${DB_DUMP}
+}
+
+check_n_delete_db()
+{
+	local sec t r path
+
+	sec="${1}"
+	if uci -q get obuspa."${sec}" >/dev/null 2>&1; then
+		return 0
+	fi
+
+	t="${2}"
+	r="${3}"
+	sec="${sec/${t}_/cpe-}"
+
+	path=$(grep -E "${r}\d+.Alias \"${sec}\"" ${DB_DUMP})
+	path=${path%.*}
+
+	delete_sql_db_entry_with_pattern "${path}"
+}
+
+workaround_remove_download_pattern()
+{
+	local inst
+
+	inst="$(cat ${DB_DUMP} |grep -E "Device.DeviceInfo.FirmwareImage.\d.Download()"|grep -oE "Device.LocalAgent.Request.\d.")"
+
+	if [ -n "${inst}" ]; then
+		log "Workaround to remove the old download Request [$inst]"
+		delete_sql_db_entry_with_pattern "${inst}"
+	fi
+}
+
+reverse_update_db_with_uci()
+{
+	if [ ! -f "${DB_DUMP}" ]; then
+		return 0;
+	fi
+
+	export UCI_CONFIG_DIR="/tmp/obuspa"
+	config_load obuspa
+	config_foreach check_n_delete_db controller controller "Device.LocalAgent.Controller."
+	config_foreach check_n_delete_db mtp mtp "Device.LocalAgent.MTP."
+	config_foreach check_n_delete_db mqtt mqtt "Device.MQTT.Client."
+	config_foreach check_n_delete_db stomp stomp "Device.STOMP.Connection."
+	unset UCI_CONFIG_DIR
+}
+
+# Create factory reset file
+db_init()
+{
+	local reason role_file
+
+	reason="${1}"
+	mkdir -p /tmp/obuspa/
+
+	# Load configuration
+	config_load $CONFIGURATION
+	config_get SQL_DB_FILE global db_file "/tmp/obuspa/usp.db"
+	config_get role_file global role_file ""
+
+	if [ -f "${SQL_DB_FILE}.old" ] && [ ! -f "${SQL_DB_FILE}" ]; then
+		log "Copying old db, since new db not present ..."
+		mv ${SQL_DB_FILE}.old ${SQL_DB_FILE}
+	fi
+
+	# Dump datamodel parameters from DB
+	if [ -f "${SQL_DB_FILE}" ]; then
+		dump_db
+	fi
+
+	# In case of Reboot or service restart update the uci
+        # from usp.db file
+	if [ -f "${DB_DUMP}" ] && [ "${reason}" != "update" ]; then
+		# Only do this if db have reasonable data
+		val="$(awk 'END{print NR}' ${DB_DUMP})"
+		if [ "$val" -gt 15 ]; then
+			log "Syncing obuspa uci with usp.db ...."
+			sync_uci_with_db
+		fi
+	fi
+
+	# remove entries from db if deleted from uci, only in case of reload
+	if [ -f "${DB_DUMP}" ] && [ "${reason}" = "update" ] && [ -f "/tmp/obuspa/obuspa" ]; then
+		log "Deleting entries from usp.db if uci not present ...."
+		reverse_update_db_with_uci
+	fi
+
+	# Remove reset file if present
+	[ -f "${RESET_FILE}" ] && mv ${RESET_FILE} ${RESET_FILE}.old
 
 	#log "Create reset file ...."
 	config_load $CONFIGURATION
 	config_get dualstack_pref global dualstack_pref "IPv6"
 
-	log "Enforce uci values, no boot marker"
 	global_init
 	config_foreach configure_localagent localagent
 	global_init
@@ -702,12 +1011,21 @@ db_init()
 	global_init
 	config_foreach configure_challenges challenge
 
-	# enforce ctrust only on upgrades, not on reloads
-	if [ -f "${CTRUST_RESET_FILE}" ] && [ -z "${reason}" ]; then
-		cat ${CTRUST_RESET_FILE} >> ${RESET_FILE}
-	fi
 	update_reset_reason
 	update_dual_stack_pref "${dualstack_pref}"
+
+	uci_commit ${CONFIGURATION}
+
+	cp /etc/config/obuspa /tmp/obuspa/
+	if [ -f "${DB_DUMP}" ]; then
+		workaround_remove_download_pattern
+		mv ${DB_DUMP} ${RESET_FILE}
+	fi
+
+	if [ -f "${CTRUST_RESET_FILE}" ]; then
+		cat ${CTRUST_RESET_FILE} >> ${RESET_FILE}
+		rm ${CTRUST_RESET_FILE}
+	fi
 }
 
 start_service() {
@@ -719,18 +1037,21 @@ start_service() {
 
 	procd_open_instance ${CONFIGURATION}
 	if [ "${enabled}" -eq 1 ]; then
-		procd_set_param command ${PROG}
 		db_init "${1}"
+		procd_set_param command ${PROG}
 		configure_obuspa
 		procd_set_param respawn \
 			"${respawn_threshold:-10}" \
 			"${respawn_timeout:-10}" "${respawn_retry:-5}"
+		#procd_set_param limits core="unlimited"
 	fi
 	procd_close_instance ${CONFIGURATION}
 }
 
 stop_service() {
-	${PROG} -c stop
+	if command -v timeout >/dev/null 2>&1; then
+		timeout 5 ${PROG} -c stop
+	fi
 }
 
 reload_service() {
@@ -739,6 +1060,5 @@ reload_service() {
 }
 
 service_triggers() {
-	export PROCD_RELOAD_DELAY=3000
 	procd_add_reload_trigger "obuspa"
 }

obuspa/files/etc/init.d/usptest

@@ -0,0 +1,75 @@
+#!/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/obuspa/usp_utils.sh

@@ -1,12 +1,10 @@
 #!/bin/sh
 
-CTRUST_RESET_FILE="/etc/obuspa/ctrust_reset"
+CTRUST_RESET_FILE="/tmp/obuspa/ctrust_reset"
 VENDOR_PREFIX_FILE="/etc/obuspa/vendor_prefix"
 FW_DEFAULT_ROLE_DIR="/etc/users/roles"
 SECURE_ROLES=""
 
-CTRUST_RESET_FILE_TEMP="/tmp/obuspa/ctrust_reset"
-
 mkdir -p /tmp/obuspa/
 
 # include jshn.sh
@@ -25,9 +23,9 @@ db_add()
 	value="$*"
 
 	if [ -n "${param}" ] && [ -n "${value}" ]; then
-		echo "${param} \"${value}\"">>${CTRUST_RESET_FILE_TEMP}
+		echo "${param} \"${value}\"">>${CTRUST_RESET_FILE}
 	else
-		echo >>${CTRUST_RESET_FILE_TEMP}
+		echo >>${CTRUST_RESET_FILE}
 	fi
 }
 
@@ -254,10 +252,7 @@ configure_ctrust_role()
 	if [ -n "${SECURE_ROLES}" ]; then
 		db_add Device.LocalAgent.ControllerTrust.SecuredRoles "${SECURE_ROLES}"
 	fi
-
-	if [ -f "${CTRUST_RESET_FILE_TEMP}" ]; then
-		mv -f "${CTRUST_RESET_FILE_TEMP}" "${CTRUST_RESET_FILE}"
-	fi
 }
 
 # configure_ctrust_role "${@}"
+

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

@@ -0,0 +1,20 @@
+#!/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

@@ -1,21 +0,0 @@
-#!/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

@@ -0,0 +1,57 @@
+#!/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/uci-defaults/61-override-ct-roles

@@ -4,3 +4,5 @@
 . /etc/obuspa/usp_utils.sh
 
 configure_ctrust_role
+
+exit 0

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

@@ -8,7 +8,6 @@ RETRY_MIN_INTERVAL="5"
 RETRY_INTERVAL_MUL="2000"
 ENDPOINT_ID=""
 CONTROLLER_DISCOVERED=0
-OBUSPA_BOOT_MARKER="/etc/obuspa/.boot"
 
 log()
 {
@@ -58,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
 
@@ -80,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))
@@ -99,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
@@ -132,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
@@ -147,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"
@@ -175,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}" -eq 0 ] || [ "${dhcp_discovery}" -eq 0 ]; then
+if [ "$enable_obuspa" = "0" ] || [ "$dhcp_discovery" = "0" ]; then
 	return 0
 fi
 
@@ -191,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=$(echo -n "${opt125}"|wc -c)
+		len=$(printf "$opt125"|wc -c)
 		get_vivsoi "$opt125" "$len"
 	fi
 
@@ -229,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
 				;;
@@ -248,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"
@@ -266,46 +265,35 @@ 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
 		fi
 	done
 
-	# Check if any of the existing controller section matches with the endpointid
-	if [ -z "${dhcp_controller}" ] && [ -n "${ENDPOINT_ID}" ]; then
-		for controller in $controllers; do
-			endpointid=$(uci -q get obuspa."${controller}".EndpointID)
-			if [ "${endpointid}" = "${ENDPOINT_ID}" ]; then
-				dhcp_controller="${controller}"
-				break
-			fi
-		done
-	fi
-
 	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
@@ -318,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 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}"
+				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}"
 			else
-				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
+				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=""
 
 				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
@@ -367,37 +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 delete obuspa."${dhcp_mqtt}"
+					uci -q del obuspa.$dhcp_mqtt
 				fi
 
 				if [ -z "${dhcp_mtp}" ]; then
-					uci -q set obuspa.dhcpmtp="mtp"
+					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
@@ -405,135 +394,137 @@ if [ "${wan_intf}" = "${INTERFACE}" ]; then
 					user="$(uci -q get obuspa.global.username)"
 					pass="$(uci -q get obuspa.global.password)"
 
-					uci -q set obuspa.dhcpmqtt="mqtt"
+					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
-					uci -q set obuspa.dhcpmtp="mtp"
+					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 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 -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_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
-		# Only setup a new controller, only if mandatory param present
-		if [ -n "${ENDPOINT_ID}" ] && [ -n "${URL}" ]; then
-			uci -q delete obuspa.dhcpmtp
-			uci -q delete obuspa.dhcpmqtt
+		uci -q del obuspa.dhcpmtp
+		uci -q del obuspa.dhcpmqtt
 
-			uci -q set obuspa.dhcpcontroller="controller"
-			uci -q set obuspa.dhcpcontroller.dhcp_discovered="1"
-			uci -q set obuspa.dhcpcontroller.EndpointID="${ENDPOINT_ID}"
-			uci -q set obuspa.dhcpcontroller.ProvisioningCode="${PROV_CODE}"
-			uci -q set obuspa.dhcpcontroller.Protocol="${offered_proto}"
-			uci -q set obuspa.dhcpcontroller.assigned_role_name="$(get_access_role)"
-			uci -q set obuspa.dhcpcontroller.Enable='1'
+		sec=$(uci -q add obuspa controller)
+		uci -q rename obuspa."${sec}"='dhcpcontroller'
+		uci -q set obuspa.dhcpcontroller.dhcp_discovered="1"
+		uci -q set obuspa.dhcpcontroller.EndpointID="${ENDPOINT_ID}"
+		uci -q set obuspa.dhcpcontroller.ProvisioningCode="${PROV_CODE}"
+		uci -q set obuspa.dhcpcontroller.Protocol="${offered_proto}"
+		uci -q set obuspa.dhcpcontroller.assigned_role_name="$(get_access_role)"
+		uci -q set obuspa.dhcpcontroller.Enable='1'
 
-			if [ -n "${offered_proto}" ]; then
-				if [ "${offered_proto}" = "MQTT" ]; then
-					user="$(uci -q get obuspa.global.username)"
-					pass="$(uci -q get obuspa.global.password)"
+		if [ -n "${offered_proto}" ]; then
+			if [ "${offered_proto}" == "MQTT" ]; then
+				user="$(uci -q get obuspa.global.username)"
+				pass="$(uci -q get obuspa.global.password)"
 
-					uci -q set obuspa.dhcpcontroller.Topic="${topic}"
-					uci -q set obuspa.dhcpcontroller.mqtt='dhcpmqtt'
+				uci -q set obuspa.dhcpcontroller.Topic="${topic}"
+				uci -q set obuspa.dhcpcontroller.mqtt='dhcpmqtt'
 
-					uci -q set obuspa.dhcpmqtt="mqtt"
-					uci -q set obuspa.dhcpmqtt.BrokerAddress="${ip}"
-					uci -q set obuspa.dhcpmqtt.BrokerPort="${port}"
-					uci -q set obuspa.dhcpmqtt.TransportProtocol="${mtp_encrypt}"
-					uci -q set obuspa.dhcpmqtt.Enable='1'
-					uci -q set obuspa.dhcpmqtt.ProtocolVersion='5.0'
-					uci -q set obuspa.dhcpmqtt.Username="${user}"
-					uci -q set obuspa.dhcpmqtt.Password="${pass}"
+				sec=$(uci -q add obuspa mqtt)
+				uci -q rename obuspa."${sec}"='dhcpmqtt'
+				uci -q set obuspa.dhcpmqtt.BrokerAddress="${ip}"
+				uci -q set obuspa.dhcpmqtt.BrokerPort="${port}"
+				uci -q set obuspa.dhcpmqtt.TransportProtocol="${mtp_encrypt}"
+				uci -q set obuspa.dhcpmqtt.Enable='1'
+				uci -q set obuspa.dhcpmqtt.ProtocolVersion='5.0'
+				uci -q set obuspa.dhcpmqtt.Username="${user}"
+				uci -q set obuspa.dhcpmqtt.Password="${pass}"
 
 
-					agent_topic=$(get_agent_topic)
-					uci -q set obuspa.dhcpmtp="mtp"
-					uci -q set obuspa.dhcpmtp.Protocol='MQTT'
-					uci -q set obuspa.dhcpmtp.ResponseTopicConfigured="${agent_topic}"
-					uci -q set obuspa.dhcpmtp.Enable='1'
-					uci -q set obuspa.dhcpmtp.mqtt='dhcpmqtt'
-				else
-					uci -q set obuspa.dhcpcontroller.Path="${topic}"
-					uci -q set obuspa.dhcpcontroller.Host="${ip}"
-					uci -q set obuspa.dhcpcontroller.Port="${port}"
-					uci -q set obuspa.dhcpcontroller.EnableEncryption="${mtp_encrypt}"
+				agent_topic=$(get_agent_topic)
+				sec=$(uci -q add obuspa mtp)
+				uci -q rename obuspa."${sec}"='dhcpmtp'
+				uci -q set obuspa.dhcpmtp.Protocol='MQTT'
+				uci -q set obuspa.dhcpmtp.ResponseTopicConfigured="${agent_topic}"
+				uci -q set obuspa.dhcpmtp.Enable='1'
+				uci -q set obuspa.dhcpmtp.mqtt='dhcpmqtt'
+			else
+				uci -q set obuspa.dhcpcontroller.Path="${topic}"
+				uci -q set obuspa.dhcpcontroller.Host="${ip}"
+				uci -q set obuspa.dhcpcontroller.Port="${port}"
+				uci -q set obuspa.dhcpcontroller.EnableEncryption="${mtp_encrypt}"
 
-					uci -q set obuspa.dhcpmtp="mtp"
-					uci -q set obuspa.dhcpmtp.Protocol='WebSocket'
-					uci -q set obuspa.dhcpmtp.Port="${port}"
-					uci -q set obuspa.dhcpmtp.Enable='1'
-					uci -q set obuspa.dhcpmtp.EnableEncryption="${mtp_encrypt}"
-				fi
+				sec=$(uci -q add obuspa mtp)
+				uci -q rename obuspa."${sec}"='dhcpmtp'
+
+				uci -q set obuspa.dhcpmtp.Protocol='WebSocket'
+				uci -q set obuspa.dhcpmtp.Port="${port}"
+				uci -q set obuspa.dhcpmtp.Enable='1'
+				uci -q set obuspa.dhcpmtp.EnableEncryption="${mtp_encrypt}"
 			fi
-			uci_change=1
 		fi
+
+		uci_change=1
 	fi
 
 	if [ ${uci_change} -eq 1 ]; then
-		if [ -f "${OBUSPA_BOOT_MARKER}" ]; then
-			rm -f "${OBUSPA_BOOT_MARKER}"
-		fi
 		log "# Reloading obuspa as dhcp config changed"
 		ubus call uci commit '{"config":"obuspa"}'
 	fi

obuspa/patches/0002-fix_e2e_session_init.patch

@@ -1,8 +1,8 @@
-Index: obuspa-10.0.0.1/src/core/device_controller.c
+Index: obuspa-10.0.4.0/src/core/device_controller.c
 ===================================================================
---- obuspa-10.0.0.1.orig/src/core/device_controller.c
-+++ obuspa-10.0.0.1/src/core/device_controller.c
-@@ -4211,6 +4211,14 @@ int ProcessControllerAdded(int cont_inst
+--- 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
          goto exit;
      }
  
@@ -17,7 +17,7 @@ Index: obuspa-10.0.0.1/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);
-@@ -4252,14 +4260,6 @@ int ProcessControllerAdded(int cont_inst
+@@ -4255,14 +4263,6 @@ int ProcessControllerAdded(int cont_inst
      DEVICE_MQTT_UpdateControllerTopics();
  #endif
  

obuspa/patches/0004-bulkdata_extn.patch

@@ -1,7 +1,7 @@
-Index: obuspa-10.0.0.1/src/core/bdc_exec.c
+Index: obuspa-10.0.4.0/src/core/bdc_exec.c
 ===================================================================
---- obuspa-10.0.0.1.orig/src/core/bdc_exec.c
-+++ obuspa-10.0.0.1/src/core/bdc_exec.c
+--- obuspa-10.0.4.0.orig/src/core/bdc_exec.c
++++ obuspa-10.0.4.0/src/core/bdc_exec.c
 @@ -549,10 +549,25 @@ int StartSendingReport(bdc_connection_t
  
      // Set the list of headers
@@ -30,10 +30,10 @@ Index: obuspa-10.0.0.1/src/core/bdc_exec.c
          bc->headers = curl_slist_append(bc->headers, "Content-Encoding: gzip");
      }
  
-Index: obuspa-10.0.0.1/src/core/bdc_exec.h
+Index: obuspa-10.0.4.0/src/core/bdc_exec.h
 ===================================================================
---- obuspa-10.0.0.1.orig/src/core/bdc_exec.h
-+++ obuspa-10.0.0.1/src/core/bdc_exec.h
+--- obuspa-10.0.4.0.orig/src/core/bdc_exec.h
++++ obuspa-10.0.4.0/src/core/bdc_exec.h
 @@ -54,6 +54,8 @@ void BDC_EXEC_ScheduleExit(void);
  #define BDC_FLAG_PUT            0x00000001  // If set, HTTP PUT should be used instead of HTTP POST when sending the report to the BDC server
  #define BDC_FLAG_GZIP           0x00000002  // If set, the reports contants are Gzipped
@@ -45,10 +45,10 @@ Index: obuspa-10.0.0.1/src/core/bdc_exec.h
 +#define BDC_FLAG_HEADER_PER_ROW  0x00000020 // If set, report format in header would be csv ParameterPerRow
 +#define BDC_FLAG_HEADER_PER_COL  0x00000040 // If set, report format in header would be csv ParameterPerColumn
  #endif
-Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
+Index: obuspa-10.0.4.0/src/core/device_bulkdata.c
 ===================================================================
---- obuspa-10.0.0.1.orig/src/core/device_bulkdata.c
-+++ obuspa-10.0.0.1/src/core/device_bulkdata.c
+--- obuspa-10.0.4.0.orig/src/core/device_bulkdata.c
++++ obuspa-10.0.4.0/src/core/device_bulkdata.c
 @@ -71,8 +71,12 @@
  
  //------------------------------------------------------------------------------
@@ -95,7 +95,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
  int Validate_BulkDataHTTPMethod(dm_req_t *req, char *value);
 @@ -247,7 +259,8 @@ bulkdata_profile_t *bulkdata_find_free_p
  bulkdata_profile_t *bulkdata_find_profile(int profile_id);
- int bulkdata_calc_report_map(bulkdata_profile_t *bp, kv_vector_t *report_map);
+ int bulkdata_calc_report_map(bulkdata_profile_t *bp, kv_vector_t *report_map, combined_role_t *combined_role);
  int bulkdata_reduce_to_alt_name(char *spec, char *path, char *alt_name, char *out_buf, int buf_len);
 -char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp);
 +char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp, char *report_format);
@@ -103,16 +103,16 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
  unsigned char *bulkdata_compress_report(profile_ctrl_params_t *ctrl, char *input_buf, int input_len, int *p_output_len);
  int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_profile_t *bp, unsigned char *json_report, int report_len);
  int bulkdata_start_profile(bulkdata_profile_t *bp);
-@@ -262,6 +275,8 @@ char *bulkdata_platform_calc_uri_query_s
- int bulkdata_platform_get_param_refs(int profile_id, param_ref_vector_t *param_refs);
- void bulkdata_expand_param_ref(param_ref_entry_t *pr, group_get_vector_t *ggv);
+@@ -263,6 +276,8 @@ int bulkdata_platform_get_param_refs(int
+ int bulkdata_platform_calc_combined_role(int instance, combined_role_t **bulkdata_role, combined_role_t *combined_role, int *cont_instance);
+ void bulkdata_expand_param_ref(param_ref_entry_t *pr, group_get_vector_t *ggv, combined_role_t *combined_role);
  void bulkdata_append_to_result_map(param_ref_entry_t *pr, group_get_vector_t *ggv, kv_vector_t *report_map);
 +void append_string_to_target(char *str, char **output);
 +char *csv_encode(const char *str);
+ int GetAuto_BulkDataController(dm_req_t *req, char *buf, int len);
  #ifdef ENABLE_MQTT
  int Validate_BulkDataMqttReference(dm_req_t *req, char *value);
- void bulkdata_process_profile_mqtt(bulkdata_profile_t *bp);
-@@ -299,7 +314,7 @@ int DEVICE_BULKDATA_Init(void)
+@@ -301,7 +316,7 @@ int DEVICE_BULKDATA_Init(void)
      err |= USP_REGISTER_VendorParam_ReadOnly("Device.BulkData.Status", Get_BulkDataGlobalStatus, DM_STRING);
      err |= USP_REGISTER_Param_Constant("Device.BulkData.MinReportingInterval", BULKDATA_MINIMUM_REPORTING_INTERVAL_STR, DM_UINT);
      err |= USP_REGISTER_Param_SupportedList("Device.BulkData.Protocols", bdc_protocols, NUM_ELEM(bdc_protocols));
@@ -121,7 +121,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
      err |= USP_REGISTER_Param_Constant("Device.BulkData.ParameterWildCardSupported", "true", DM_BOOL);
      err |= USP_REGISTER_Param_Constant("Device.BulkData.MaxNumberOfProfiles", BULKDATA_MAX_PROFILES_STR, DM_INT);
      err |= USP_REGISTER_Param_Constant("Device.BulkData.MaxNumberOfParameterReferences", "-1", DM_INT);
-@@ -314,7 +329,7 @@ int DEVICE_BULKDATA_Init(void)
+@@ -316,7 +331,7 @@ int DEVICE_BULKDATA_Init(void)
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Name", "", NULL, NULL, DM_STRING);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.NumberOfRetainedFailedReports", "0", Validate_NumberOfRetainedFailedReports, NULL, DM_INT);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Protocol", BULKDATA_PROTOCOL_HTTP, Validate_BulkDataProtocol, NULL, DM_STRING);
@@ -129,8 +129,8 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
 +    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.EncodingType", BULKDATA_ENCODING_TYPE_JSON, Validate_BulkDataEncodingType, NULL, DM_STRING);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.ReportingInterval", "86400", Validate_BulkDataReportingInterval, NotifyChange_BulkDataReportingInterval, DM_UINT);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.TimeReference", UNKNOWN_TIME_STR, NULL, NotifyChange_BulkDataTimeReference, DM_DATETIME);
- 
-@@ -326,9 +341,16 @@ int DEVICE_BULKDATA_Init(void)
+     err |= USP_REGISTER_DBParam_ReadOnlyAuto("Device.BulkData.Profile.{i}.Controller", GetAuto_BulkDataController, DM_STRING);
+@@ -329,9 +344,16 @@ int DEVICE_BULKDATA_Init(void)
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Parameter.{i}.Reference", "", Validate_BulkDataReference, NULL, DM_STRING);
  
      // Device.BulkData.Profile.{i}.JSONEncoding
@@ -148,7 +148,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
      // Device.BulkData.Profile.{i}.HTTP
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.URL", "", NULL, NotifyChange_BulkDataURL, DM_STRING);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.Username", "", NULL, NULL, DM_STRING);
-@@ -614,9 +636,10 @@ int Validate_BulkDataProtocol(dm_req_t *
+@@ -687,9 +709,10 @@ int Validate_BulkDataProtocol(dm_req_t *
  int Validate_BulkDataEncodingType(dm_req_t *req, char *value)
  {
      // Exit if trying to set a value outside of the range we accept
@@ -162,7 +162,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
          return USP_ERR_INVALID_VALUE;
      }
  
-@@ -720,9 +743,36 @@ int Validate_BulkDataReference(dm_req_t
+@@ -793,9 +816,36 @@ int Validate_BulkDataReference(dm_req_t
  int Validate_BulkDataReportFormat(dm_req_t *req, char *value)
  {
      // Exit if trying to set a value outside of the range we accept
@@ -201,7 +201,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
          return USP_ERR_INVALID_VALUE;
      }
  
-@@ -2053,6 +2103,14 @@ int bulkdata_platform_get_profile_contro
+@@ -2151,6 +2201,14 @@ int bulkdata_platform_get_profile_contro
          return err;
      }
  
@@ -216,7 +216,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
      // Exit if unable to get ReportTimestamp
      USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportTimestamp", bp->profile_id);
      err = DATA_MODEL_GetParameterValue(path, ctrl_params->report_timestamp, sizeof(ctrl_params->report_timestamp), 0);
-@@ -2061,6 +2119,54 @@ int bulkdata_platform_get_profile_contro
+@@ -2159,6 +2217,54 @@ int bulkdata_platform_get_profile_contro
          return err;
      }
  
@@ -271,7 +271,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
  #ifdef ENABLE_MQTT
  {
      char protocol[32];
-@@ -2334,7 +2440,7 @@ void bulkdata_process_profile_http(bulkd
+@@ -2492,7 +2598,7 @@ void bulkdata_process_profile_http(bulkd
  {
      int err;
      report_t *cur_report;
@@ -280,7 +280,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
      profile_ctrl_params_t ctrl;
      unsigned char *compressed_report;
      int compressed_len;
-@@ -2373,10 +2479,23 @@ void bulkdata_process_profile_http(bulkd
+@@ -2541,26 +2647,39 @@ void bulkdata_process_profile_http(bulkd
      }
  
      // Exit if unable to generate the report
@@ -308,7 +308,9 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
          return;
      }
  
-@@ -2385,14 +2504,14 @@ void bulkdata_process_profile_http(bulkd
+     // Print out the JSON report, if debugging is enabled
+-    USP_LOG_Info("\nBULK DATA: %sing at time %s, to url=%s", ctrl.method, iso8601_cur_time(buf, sizeof(buf)), ctrl.url);
++    USP_LOG_Info("BULK DATA: %sing at time %s, to url=%s", ctrl.method, iso8601_cur_time(buf, sizeof(buf)), ctrl.url);
      USP_LOG_Info("BULK DATA: using compression method=%s", ctrl.compression);
      if (enable_protocol_trace)
      {
@@ -327,7 +329,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
      }
      // NOTE: From this point on, only the compressed_report exists
  
-@@ -2422,8 +2541,15 @@ void bulkdata_process_profile_usp_event(
+@@ -2590,8 +2709,15 @@ void bulkdata_process_profile_usp_event(
      kv_vector_t event_args;
      kv_pair_t kv;
      report_t *cur_report;
@@ -341,11 +343,11 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
 +    char escape_char[10];
 +    char csv_format[20];
 +    char row_timestamp[33];
- 
-     // Exit if the MTP has not been connected to successfully after bootup
-     // This is to prevent BDC events being enqueued before the Boot! event is sent (the Boot! event is only sent after successfully connecting to the MTP).
-@@ -2432,13 +2558,63 @@ void bulkdata_process_profile_usp_event(
-         goto exit;
+     combined_role_t *bulkdata_role;
+     combined_role_t combined_role;
+     int cont_instance;
+@@ -2610,13 +2736,63 @@ void bulkdata_process_profile_usp_event(
+         return;
      }
  
 -    // Exit if unable to get ReportTimestamp
@@ -415,7 +417,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
  
      // When sending via USP events, only one report is ever sent in each USP event
      // So ensure all retained reports are removed. NOTE: Clearing the reports here is only necessary when switching protocol from HTTP to USP event, and where HTTP had some unsent reports
-@@ -2456,11 +2632,17 @@ void bulkdata_process_profile_usp_event(
+@@ -2634,11 +2810,17 @@ void bulkdata_process_profile_usp_event(
      }
      bp->num_retained_reports = 1;
  
@@ -436,7 +438,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
          return;
      }
  
-@@ -2468,15 +2650,15 @@ void bulkdata_process_profile_usp_event(
+@@ -2646,15 +2828,15 @@ void bulkdata_process_profile_usp_event(
  
      // Construct event_args manually to avoid the overhead of a malloc and copy of the report in KV_VECTOR_Add()
      kv.key = "Data";
@@ -446,7 +448,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
      event_args.num_entries = 1;
  
      USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.Push!", bp->profile_id);
-     DEVICE_SUBSCRIPTION_ProcessAllEventCompleteSubscriptions(path, &event_args);
+     DEVICE_SUBSCRIPTION_ProcessAllEventCompleteSubscriptions(path, &event_args, cont_instance);
  
 -    // Free the report. No need to free the event_args as json_report is the only thing dynamically allocated in it
 -    free(json_report);      // The report is not allocated via USP_MALLOC
@@ -455,7 +457,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
  
      // From the point of view of this code, the report(s) have been successfully sent, so don't retain them
      // NOTE: Sending of the reports successfully is delegated to the USP notification retry mechanism
-@@ -2548,11 +2730,24 @@ void bulkdata_process_profile_mqtt(bulkd
+@@ -2736,15 +2918,28 @@ void bulkdata_process_profile_mqtt(bulkd
      }
  
      // Exit if unable to generate the report
@@ -485,7 +487,21 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
      }
  
      // Print out the JSON report, if debugging is enabled
-@@ -2763,7 +2958,7 @@ int bulkdata_reduce_to_alt_name(char *sp
+-    USP_LOG_Debug("\nBULK DATA: Sending at time %s to MQTT topic %s", iso8601_cur_time(buf, sizeof(buf)), ctrl.mqtt_publish_topic);
++    USP_LOG_Debug("BULK DATA: Sending at time %s to MQTT topic %s", iso8601_cur_time(buf, sizeof(buf)), ctrl.mqtt_publish_topic);
+     if (enable_protocol_trace)
+     {
+         USP_LOG_String(kLogLevel_Info, kLogType_Protocol, report);
+@@ -2939,7 +3134,7 @@ int bulkdata_reduce_to_alt_name(char *sp
+ 
+ /*********************************************************************//**
+ **
+-**  bulkdata_generate_json_report
++**  bulkdata_generate_json_name_value_pair_report
+ **
+ **  Generates a JSON name-value pair format report
+ **  NOTE: The report contains all retained failed reports, as well as the current report
+@@ -2951,7 +3146,7 @@ int bulkdata_reduce_to_alt_name(char *sp
  ** \return  pointer to NULL terminated dynamically allocated buffer containing the serialized report to send
  **
  **************************************************************************/
@@ -494,7 +510,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
  {
      JsonNode *top;          // top of report
      JsonNode *array;        // array of reports (retained + current)
-@@ -2868,6 +3063,483 @@ char *bulkdata_generate_json_report(bulk
+@@ -3056,6 +3251,483 @@ char *bulkdata_generate_json_report(bulk
      return result;
  }
  
@@ -978,7 +994,7 @@ Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
  /*********************************************************************//**
  **
  **  bulkdata_compress_report
-@@ -3071,6 +3743,20 @@ int bulkdata_schedule_sending_http_repor
+@@ -3259,6 +3931,20 @@ int bulkdata_schedule_sending_http_repor
          flags |= BDC_FLAG_DATE_HEADER;
      }
  

obuspa/patches/0006-contains-expression.patch

@@ -1,7 +1,7 @@
-Index: obuspa-10.0.0.1/src/core/expr_vector.c
+Index: obuspa-10.0.4.0/src/core/expr_vector.c
 ===================================================================
---- obuspa-10.0.0.1.orig/src/core/expr_vector.c
-+++ obuspa-10.0.0.1/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
 @@ -59,6 +59,7 @@ char *expr_op_2_str[kExprOp_Max] =
      "<",  // kExprOp_LessThan
      ">",  // kExprOp_GreaterThan
@@ -10,7 +10,7 @@ Index: obuspa-10.0.0.1/src/core/expr_vector.c
  };
  
  
-@@ -483,6 +484,15 @@ char *SplitOnOperator(char *buf, expr_op
+@@ -487,6 +488,15 @@ char *SplitOnOperator(char *buf, expr_op
          *op = '\0';
          return &op[2];
      }
@@ -26,10 +26,10 @@ Index: obuspa-10.0.0.1/src/core/expr_vector.c
  
      // Exit if found the "<" operator
      op = strchr(buf, '<');
-Index: obuspa-10.0.0.1/src/core/path_resolver.c
+Index: obuspa-10.0.4.0/src/core/path_resolver.c
 ===================================================================
---- obuspa-10.0.0.1.orig/src/core/path_resolver.c
-+++ obuspa-10.0.0.1/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
 @@ -1088,7 +1088,7 @@ int ResolveUniqueKey(char *resolved, cha
      char temp[MAX_DM_PATH];
      bool is_match;
@@ -107,10 +107,10 @@ Index: obuspa-10.0.0.1/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.0.1/src/include/usp_api.h
+Index: obuspa-10.0.4.0/src/include/usp_api.h
 ===================================================================
---- obuspa-10.0.0.1.orig/src/include/usp_api.h
-+++ obuspa-10.0.0.1/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
 @@ -106,6 +106,7 @@ typedef enum
      kExprOp_LessThan,               // '<'
      kExprOp_GreaterThan,            // '>'

obuspa/patches/1000-SecuredRole-bbfdm.patch

@@ -1,8 +1,8 @@
-Index: obuspa-10.0.0.2/src/core/device.h
+Index: obuspa-10.0.4.0/src/core/device.h
 ===================================================================
---- obuspa-10.0.0.2.orig/src/core/device.h
-+++ obuspa-10.0.0.2/src/core/device.h
-@@ -305,6 +305,8 @@ void DEVICE_CTRUST_ApplyPermissionsToSub
+--- 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
  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);
@@ -11,11 +11,11 @@ Index: obuspa-10.0.0.2/src/core/device.h
  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.0.2/src/core/device_ctrust.c
+Index: obuspa-10.0.4.0/src/core/device_ctrust.c
 ===================================================================
---- obuspa-10.0.0.2.orig/src/core/device_ctrust.c
-+++ obuspa-10.0.0.2/src/core/device_ctrust.c
-@@ -235,6 +235,7 @@ credential_t *FindCredentialByCertInstan
+--- 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
  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);
@@ -23,7 +23,7 @@ Index: obuspa-10.0.0.2/src/core/device_ctrust.c
  
  #ifndef REMOVE_DEVICE_SECURITY
  int InitChallengeTable();
-@@ -354,6 +355,10 @@ int DEVICE_CTRUST_Init(void)
+@@ -355,6 +356,10 @@ int DEVICE_CTRUST_Init(void)
                          challenge_response_input_args, NUM_ELEM(challenge_response_input_args),
                          NULL, 0);
  #endif
@@ -34,7 +34,7 @@ Index: obuspa-10.0.0.2/src/core/device_ctrust.c
      // Exit if any errors occurred
      if (err != USP_ERR_OK)
      {
-@@ -2908,3 +2913,139 @@ exit:
+@@ -2939,3 +2944,139 @@ exit:
      return err;
  }
  #endif // REMOVE_DEVICE_SECURITY

obuspa/patches/1002-mqtt-qos.patch

@@ -1,8 +1,8 @@
-Index: obuspa-10.0.0.1/src/core/device_bulkdata.c
+Index: obuspa-10.0.4.0/src/core/device_bulkdata.c
 ===================================================================
---- obuspa-10.0.0.1.orig/src/core/device_bulkdata.c
-+++ obuspa-10.0.0.1/src/core/device_bulkdata.c
-@@ -375,6 +375,8 @@ int DEVICE_BULKDATA_Init(void)
+--- obuspa-10.0.4.0.orig/src/core/device_bulkdata.c
++++ obuspa-10.0.4.0/src/core/device_bulkdata.c
+@@ -378,6 +378,8 @@ int DEVICE_BULKDATA_Init(void)
      // Device.BulkData.Profile.{i}.MQTT
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.MQTT.Reference", "", Validate_BulkDataMqttReference, NULL, DM_STRING);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.MQTT.PublishTopic", "", NULL, NULL, DM_STRING);

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

@@ -1,8 +1,8 @@
-Index: obuspa-10.0.0.2/src/core/device.h
+Index: obuspa-10.0.4.0/src/core/device.h
 ===================================================================
---- obuspa-10.0.0.2.orig/src/core/device.h
-+++ obuspa-10.0.0.2/src/core/device.h
-@@ -346,6 +346,10 @@ void DEVICE_CONTROLLER_SetInheritedRole(
+--- 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(
  int DEVICE_CONTROLLER_CountEnabledWebsockClientConnections(void);
  #endif
  
@@ -13,10 +13,10 @@ Index: obuspa-10.0.0.2/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.0.2/src/core/device_controller.c
+Index: obuspa-10.0.4.0/src/core/device_controller.c
 ===================================================================
---- obuspa-10.0.0.2.orig/src/core/device_controller.c
-+++ obuspa-10.0.0.2/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
      return USP_ERR_OK;
  }
@@ -96,10 +96,10 @@ Index: obuspa-10.0.0.2/src/core/device_controller.c
  /*********************************************************************//**
  **
  ** DEVICE_CONTROLLER_IsMTPConfigured
-Index: obuspa-10.0.0.2/src/core/msg_handler.c
+Index: obuspa-10.0.4.0/src/core/msg_handler.c
 ===================================================================
---- obuspa-10.0.0.2.orig/src/core/msg_handler.c
-+++ obuspa-10.0.0.2/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
      usp_service_instance = USP_BROKER_GetUspServiceInstance(rec->from_id, 0);
  #endif

obuspa/patches/2005-set-sql-journal-mode.patch

@@ -1,28 +0,0 @@
-diff --git a/src/core/database.c b/src/core/database.c
-index 7ad9dae..edebd7c 100644
---- a/src/core/database.c
-+++ b/src/core/database.c
-@@ -955,6 +955,7 @@ void DATABASE_Dump(void)
- int OpenUspDatabase(char *db_file)
- {
-     int err;
-+    char *err_msg = 0;
- 
-     // Exit if unable to open the database
-     err = sqlite3_open(db_file, &db_handle);
-@@ -965,6 +966,15 @@ int OpenUspDatabase(char *db_file)
-         return USP_ERR_INTERNAL_ERROR;
-     }
- 
-+    // Execute the PRAGMA statement
-+    const char *sql = "PRAGMA journal_mode = MEMORY;";
-+    err = sqlite3_exec(db_handle, sql, 0, 0, &err_msg);
-+    if (err != SQLITE_OK) {
-+        USP_LOG_Error("%s: Failed to set journal_mode: %s", __func__, err_msg);
-+        sqlite3_free(err_msg);
-+        return USP_ERR_INTERNAL_ERROR;
-+    }
-+
-     // Exit if unable to create the data model parameter table (if it does not already exist)
-     #define CREATE_TABLE_STR "create table if not exists data_model (hash integer, instances text, value text, primary key (hash, instances));"
-     err = sqlite3_exec(db_handle, CREATE_TABLE_STR, NULL, NULL, NULL);

obuspa/patches/2006-force-db-update.patch

@@ -1,23 +0,0 @@
-diff --git a/src/core/database.c b/src/core/database.c
-index 7ad9dae..0bf9c90 100644
---- a/src/core/database.c
-+++ b/src/core/database.c
-@@ -1479,3 +1479,7 @@ int GetAllEntriesForParameter(db_hash_t hash, kv_vector_t *kvv)
-     return result;
- }
- 
-+void DATABASE_force_reset_file()
-+{
-+    schedule_factory_reset_init = true;
-+}
-diff --git a/src/core/database.h b/src/core/database.h
-index c88cf3a..376aa7a 100644
---- a/src/core/database.h
-+++ b/src/core/database.h
-@@ -67,5 +67,6 @@ void DATABASE_Dump(void);
- int DATABASE_ReadDataModelInstanceNumbers(bool remove_unknown_params);
- db_hash_t DATABASE_GetMigratedHash(db_hash_t hash);
- 
-+void DATABASE_force_reset_file();
- #endif
- 

parental-control/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=parental-control
-PKG_VERSION:=1.4.1
+PKG_VERSION:=1.2.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:=bd852e8b0a6528893917fb89e2ea27a8920f6280
+PKG_SOURCE_VERSION:=120dbcd6508b817d2ce3d579a1bfbd5bfd1a44cb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -81,20 +81,19 @@ 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/35-migrate_urlfilter.ucidefaults $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/95-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/50-parental_control_add_bundles $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/55-add-default-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_disable_urlfilter $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/50-parental_control_urlfilter $(1)/etc/uci-defaults/
 endif
 endef
 

parental-control/files/etc/config/parentalcontrol

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

parental-control/files/etc/firewall.parentalcontrol

@@ -5,16 +5,19 @@
 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
-		add_iptables_nfqueue_rules
+		# this for internet_access and profile_bedtime_schedule sections
+		add_internet_schedule_rules
 	fi
 else
-	# remove internet_access and profile_bedtime_schedule rules
-	remove_internet_schedule_rules
+	# remove urlfilter daemon 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

@@ -12,9 +12,7 @@ validate_global_section() {
 	uci_validate_section parentalcontrol globals globals \
 	    'enable:bool:1' \
 	    'loglevel:uinteger:3' \
-	    'queue_num:uinteger:53' \
 	    'bundle_path:string' \
-	    'default_wan_interface:string:wan' \
 	    'urlfilter:bool'
 }
 
@@ -26,12 +24,11 @@ remove_fw_rules() {
 }
 
 configure_fw_rules() {
-	local enable urlfilter queue_num
+	local enable urlfilter
 
 	config_load parentalcontrol
 	config_get_bool enable globals enable 0
 	config_get_bool urlfilter globals urlfilter 0
-	config_get queue_num globals queue_num 53
 
 	remove_fw_rules
 
@@ -40,11 +37,6 @@ configure_fw_rules() {
 		return 0
 	fi
 
-	if [ "${queue_num}" -lt 0 ] || [ "${queue_num}" -gt 65535 ]; then
-	        log "ERROR: queue_num not in 0-65535"
-		return 1
-	fi
-
 	if [ "${urlfilter}" -eq "1" ]; then
 		if [ ! -f "${OVERRIDE_JSON}" ]; then
 			# throw error
@@ -52,15 +44,13 @@ configure_fw_rules() {
 		else
 			# Now flush the existing connections, otherwise,
 			# URL filtering cannot be performed on already open sites.
-			if which hw_nat > /dev/null 2>&1; then
-				hw_nat -! > /dev/null 2>&1
-			fi
-			if which conntrack > /dev/null 2>&1; then
-				flush_conntrack_for_hosts
+			if [ -n "$(which conntrack)" ]; then
+				sleep 5
+				conntrack -F
 			fi
 
 			# this is for urlfilter daemon
-			add_iptables_nfqueue_rules "$queue_num"
+			add_iptables_nfqueue_rules
 		fi
 	fi
 
@@ -93,13 +83,14 @@ 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
@@ -109,13 +100,13 @@ 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 across reboots and upgrade (with keep settings)
+	# which will be persistent acrros reboots and upgrade where settings are kept
 	# and will be used as a backup in case /tmp/dhcp.leases is empty
 	copy_dhcp_leases
 
 	procd_open_instance "parentalcontrol"
 	procd_set_param command nice -n 10 "${PROG}"  # Lower priority
-	procd_append_param command -l "${loglevel}"
+	procd_append_param command -l ${loglevel}
 	procd_set_param respawn
 	procd_close_instance
 }
@@ -128,19 +119,11 @@ stop_service() {
 }
 
 reload_service() {
-	local arg="$1"
-
 	ret=$(ubus call service list '{"name":"parentalcontrol"}' | jsonfilter -qe '@.parentalcontrol.instances.parentalcontrol.running')
 	if [ "$ret" != "true" ]; then
 		stop
 		start
 	else
-		if [ "$arg" = "network" ]; then
-			pidof_sync="$(pidof sync_bundles.sh)"
-			[ -n "$pidof_sync" ] && kill "$pidof_sync"
-			sleep 5
-		fi
-
 		configure_fw_rules
 		copy_dhcp_leases
 		ubus send parentalcontrol.reload
@@ -148,19 +131,6 @@ reload_service() {
 }
 
 service_triggers() {
-	local enable urlfilter default_wan_interface
-
-	validate_global_section || {
-		return 1
-	}
-
-	if [ "${urlfilter}" = "1" ] && [ "$enable" = "1" ] && [ -n "$default_wan_interface" ]; then
-		log "Adding interface trigger for $default_wan_interface"
-		procd_open_trigger
-		procd_add_interface_trigger "interface.*.up" "$default_wan_interface" /etc/init.d/parentalcontrol reload "network"
-		procd_close_trigger
-	fi
-
 	procd_add_reload_trigger "parentalcontrol"
 	procd_add_reload_trigger "schedules"
 }

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

@@ -1,38 +0,0 @@
-#!/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

@@ -1,43 +0,0 @@
-#!/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

@@ -1,14 +0,0 @@
-#!/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

@@ -0,0 +1,7 @@
+#!/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

@@ -0,0 +1,40 @@
+#!/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/etc/uci-defaults/95-migrate_urlfilter.ucidefaults

@@ -2,8 +2,6 @@
 
 . /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/lib/parentalcontrol/parentalcontrol.sh

@@ -13,10 +13,7 @@ IP_RULE=""
 ACL_FILE=""
 parentalcontrol_ipv4_forward=""
 parentalcontrol_ipv6_forward=""
-
-bundle_path="$(uci -q get parentalcontrol.globals.bundle_path)"
-
-default_bundle_dir="${bundle_path}/default/"
+default_bundle_dir="/tmp/parentalcontrol/default/"
 bundle_archive="/etc/parentalcontrol/urlbundles.tar.xz"
 
 log() {
@@ -258,9 +255,7 @@ handle_schedule() {
 			schedule_added="1"
 		fi
 
-		# internet_access has been updated to be internet_break
-		# so drop traffic during the schedule, and allow outside the schedule
-		target="DROP"
+		target="ACCEPT"
 
 		config_get local_start_time "$schedule_section" "start_time" "00:00"
 		config_get duration "$schedule_section" "duration"
@@ -367,6 +362,11 @@ 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,118 +438,64 @@ add_internet_schedule_rules() {
 }
 
 add_iptables_nfqueue_rules() {
-    local queue_num="$1"
+	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
 
-    # Check if urlfilter used
-    if ! uci show parentalcontrol | grep -q profile_urlfilter; then
-        return
-    fi
+		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
 
-    # IPv4
-    # FORWARD
-    if ! iptables -w -nL | grep -q "URLFILTER_FORWARD"; then
-        iptables -w -N URLFILTER_FORWARD
-        iptables -w -I FORWARD 1 -j URLFILTER_FORWARD
+		# 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
+		ebtables --concurrent -A FORWARD -p ip --ip-protocol 6 --ip-source-port 53 -j SKIPLOG 2> /dev/null
+		ebtables --concurrent -A FORWARD -p ip --ip-protocol 17 --ip-source-port 53 -j SKIPLOG 2> /dev/null
+	fi
 
-        # capture DNS responses (sport 53)
-        iptables -w -A URLFILTER_FORWARD -p tcp --sport 53 -j NFQUEUE --queue-num $queue_num --queue-bypass
-        iptables -w -A URLFILTER_FORWARD -p udp --sport 53 -j NFQUEUE --queue-num $queue_num --queue-bypass
+	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
 
-        # HTTP/HTTPS flows
-        iptables -w -A URLFILTER_FORWARD -p tcp --match multiport --ports 80,443 -j NFQUEUE --queue-num $queue_num --queue-bypass
-        iptables -w -A URLFILTER_FORWARD -p udp --match multiport --ports 80,443 -j NFQUEUE --queue-num $queue_num --queue-bypass
-    fi
+		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
-    if ! iptables -w -nL | grep -q "URLFILTER_INPUT"; then
-        iptables -w -N URLFILTER_INPUT
-        iptables -w -I INPUT 1 -j URLFILTER_INPUT
-
-        iptables -w -A URLFILTER_INPUT -p tcp --sport 53 ! -i lo -j NFQUEUE --queue-num $queue_num --queue-bypass
-        iptables -w -A URLFILTER_INPUT -p udp --sport 53 ! -i lo -j NFQUEUE --queue-num $queue_num --queue-bypass
-    fi
-
-    # OUTPUT
-    if ! iptables -w -nL | grep -q "URLFILTER_OUTPUT"; then
-        iptables -w -N URLFILTER_OUTPUT
-        iptables -w -I OUTPUT 1 -j URLFILTER_OUTPUT
-
-        iptables -w -A URLFILTER_OUTPUT -p tcp --sport 53 ! -o lo -j NFQUEUE --queue-num $queue_num --queue-bypass
-        iptables -w -A URLFILTER_OUTPUT -p udp --sport 53 ! -o lo -j NFQUEUE --queue-num $queue_num --queue-bypass
-    fi
-
-    # ebtables bypass for IPv4
-    ebtables --concurrent -A FORWARD -p ip --ip-protocol 6  --ip-destination-port 443 -j SKIPLOG 2>/dev/null
-    ebtables --concurrent -A FORWARD -p ip --ip-protocol 6  --ip-source-port 53    -j SKIPLOG 2>/dev/null
-    ebtables --concurrent -A FORWARD -p ip --ip-protocol 17 --ip-source-port 53    -j SKIPLOG 2>/dev/null
-
-    # IPv6
-    # FORWARD
-    if ! ip6tables -w -nL | grep -q "URLFILTER_FORWARD6"; then
-        ip6tables -w -N URLFILTER_FORWARD6
-        ip6tables -w -I FORWARD 1 -j URLFILTER_FORWARD6
-
-        ip6tables -w -A URLFILTER_FORWARD6 -p tcp --sport 53 -j NFQUEUE --queue-num $queue_num --queue-bypass
-        ip6tables -w -A URLFILTER_FORWARD6 -p udp --sport 53 -j NFQUEUE --queue-num $queue_num --queue-bypass
-
-        ip6tables -w -A URLFILTER_FORWARD6 -p tcp --match multiport --ports 80,443 -j NFQUEUE --queue-num $queue_num --queue-bypass
-        ip6tables -w -A URLFILTER_FORWARD6 -p udp --match multiport --ports 80,443 -j NFQUEUE --queue-num $queue_num --queue-bypass
-    fi
-
-    # INPUT
-    if ! ip6tables -w -nL | grep -q "URLFILTER_INPUT6"; then
-        ip6tables -w -N URLFILTER_INPUT6
-        ip6tables -w -I INPUT 1 -j URLFILTER_INPUT6
-
-        ip6tables -w -A URLFILTER_INPUT6 -p tcp --sport 53 ! -i lo -j NFQUEUE --queue-num $queue_num --queue-bypass
-        ip6tables -w -A URLFILTER_INPUT6 -p udp --sport 53 ! -i lo -j NFQUEUE --queue-num $queue_num --queue-bypass
-    fi
-
-    # OUTPUT
-    if ! ip6tables -w -nL | grep -q "URLFILTER_OUTPUT6"; then
-        ip6tables -w -N URLFILTER_OUTPUT6
-        ip6tables -w -I OUTPUT 1 -j URLFILTER_OUTPUT6
-
-        ip6tables -w -A URLFILTER_OUTPUT6 -p tcp --sport 53 ! -o lo -j NFQUEUE --queue-num $queue_num --queue-bypass
-        ip6tables -w -A URLFILTER_OUTPUT6 -p udp --sport 53 ! -o lo -j NFQUEUE --queue-num $queue_num --queue-bypass
-    fi
-
-    # ebtables bypass for IPv6
-    ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6  --ip6-destination-port 443 -j SKIPLOG 2>/dev/null
-    ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6  --ip6-source-port 53    -j SKIPLOG 2>/dev/null
-    ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53    -j SKIPLOG 2>/dev/null
+		# 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
+		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 6 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
+		ebtables --concurrent -A FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
+	fi
 }
 
 remove_iptables_nfqueue_rules() {
-    # IPv4
-    for chain in URLFILTER_FORWARD URLFILTER_INPUT URLFILTER_OUTPUT; do
-        if iptables -w -nL | grep -q "$chain"; then
-            iptables -w -D FORWARD -j $chain 2>/dev/null
-            iptables -w -D INPUT   -j $chain 2>/dev/null
-            iptables -w -D OUTPUT  -j $chain 2>/dev/null
-            iptables -w -F $chain
-            iptables -w -X $chain
-        fi
-    done
+	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
 
-    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
+		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
 
-    # IPv6
-    for chain in URLFILTER_FORWARD6 URLFILTER_INPUT6 URLFILTER_OUTPUT6; do
-        if ip6tables -w -nL | grep -q "$chain"; then
-            ip6tables -w -D FORWARD -j $chain 2>/dev/null
-            ip6tables -w -D INPUT   -j $chain 2>/dev/null
-            ip6tables -w -D OUTPUT  -j $chain 2>/dev/null
-            ip6tables -w -F $chain
-            ip6tables -w -X $chain
-        fi
-    done
+		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
 
-    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
-    ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53    -j SKIPLOG 2>/dev/null
+		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
+
+		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
+		ebtables --concurrent -D FORWARD -p ip6 --ip6-protocol 17 --ip6-source-port 53 -j SKIPLOG 2> /dev/null
+	fi
 }
 
 remove_internet_schedule_rules() {
@@ -567,62 +513,6 @@ remove_internet_schedule_rules() {
 	fi
 }
 
-# Global array for resolved IPs
-URLFILTER_IPS=""
-
-# Resolve hostname or MAC to IP from lease_file
-get_host_ip() {
-	local host="$1"
-	local ip
-	local lease_file="/tmp/dhcp.leases"
-
-	[ -f "$lease_file" ] || lease_file="/etc/parentalcontrol/dhcp.leases"
-	[ -f "$lease_file" ] || { log "Error: get_host_ip(): No DHCP lease file found."; return 1; }
-
-	# try DHCP lease lookup
-	ip="$(awk -v h="$host" '
-	{
-		mac=$2; ipaddr=$3; name=$4
-		if (h == name || h == mac) { print ipaddr; exit }
-	}' "$lease_file")"
-
-	[ -n "$ip" ] && URLFILTER_IPS="$URLFILTER_IPS $ip"
-}
-
-# Process each profile section
-resolve_profile_hosts() {
-	local section="$1"
-	local hostlist
-
-	config_get hostlist "$section" host
-	[ -z "$hostlist" ] && return
-
-	for h in $hostlist; do
-		get_host_ip "$h"
-	done
-}
-
-# Main function to collect IPs and delete conntrack entries
-flush_conntrack_for_hosts() {
-	URLFILTER_IPS=""
-	local count max
-
-	config_foreach resolve_profile_hosts profile
-
-	URLFILTER_IPS="$(echo "$URLFILTER_IPS" | tr ' ' '\n' | sort -u | xargs)"
-	for ip in $URLFILTER_IPS; do
-		count=0
-		max=1000
-		while conntrack -D -s "$ip" >/dev/null 2>&1; do
-			count=$((count+1))
-			if [ $count -ge $max ]; then
-				log "Warning: Forced to stop conntrack delete after $max deletions for $ip (possible loop)"
-				break
-			fi
-		done
-	done
-}
-
 OVERRIDE_JSON="/etc/parentalcontrol/urlbundle_override.json"
 DM_PLUGIN_PATH="/usr/share/bbfdm/micro_services/parentalcontrol/urlbundle_override.json"
 

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

@@ -3,31 +3,12 @@
 . /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
-	return 0
+	bundle_path="/tmp/parentalcontrol"
 fi
 
 stringstore_dir="${bundle_path}/stringstore"
@@ -57,15 +38,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=$((50 * 1024 * 1024)) # 50MB in bytes
+	local max_size=$((10 * 1024 * 1024)) # 10MB in bytes
 
 	if [ "$available_memory" -le "$needed_blocks" ]; then
-		log_info "Error: Not enough disk space for bundle: ${bundle_name}"
+		logger -p info "Error: Not enough disk space for bundle: ${bundle_name}"
 		return 1
 	fi
 
 	if [ "$bundle_file_size" -gt "$max_size" ]; then
-		log_info "update_bundle_file_from_url: Error: File size for ${bundle_name} exceeds 10MB"
+		logger -p info "update_bundle_file_from_url: Error: File size for ${bundle_name} exceeds 10MB"
 		return 1
 	fi
 
@@ -76,7 +57,7 @@ update_bundle_file_from_url() {
 	else
 		# Random delay (0-5s) before starting the download
 		local delay=$((RANDOM % 6))
-		log_info "update_bundle_file_from_url: Waiting ${delay}s before downloading..."
+		logger -p info "update_bundle_file_from_url: Waiting ${delay}s before downloading..."
 		sleep "$delay"
 
 		# Retry logic with exponential backoff
@@ -84,11 +65,12 @@ update_bundle_file_from_url() {
 		local attempt=1
 		local success=0
 		while [ $attempt -le 3 ]; do
-			if curl -s -o "$temp_file" "$download_url"; then
+			curl -s -o "$temp_file" "$download_url"
+			if [ $? -eq 0 ]; then
 				success=1
 				break
 			else
-				log_info "update_bundle_file_from_url: Download failed. Retrying $attempt ..."
+				logger -p info "update_bundle_file_from_url: Download failed. Retrying $attempt ..."
 				local backoff=$(( (2 ** attempt) + (RANDOM % 3) )) # Exponential backoff + 0-2s jitter
 				sleep "$backoff"
 			fi
@@ -96,7 +78,7 @@ update_bundle_file_from_url() {
 		done
 
 		if [ $success -ne 1 ]; then
-			log_info "update_bundle_file_from_url: Failed to download bundle: ${bundle_name}"
+			logger -p info "update_bundle_file_from_url: Failed to download bundle: ${bundle_name}"
 			rm -f "$temp_file"
 			return 1
 		fi
@@ -107,7 +89,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
-			log_info "update_bundle_file_from_url: Decompression failed."
+			logger -p info "update_bundle_file_from_url: Decompression failed."
 			rm -f "$final_path"
 			rm -f "$file_path"
 			return 1
@@ -116,7 +98,7 @@ update_bundle_file_from_url() {
 		rm -f "$file_path"
 	elif [[ "$file_path" =~ \.gz$ ]]; then
 		if ! gzip -dc "$file_path" > "$final_path"; then
-			log_info "update_bundle_file_from_url: Decompression failed."
+			logger -p info "update_bundle_file_from_url: Decompression failed."
 			rm -f "$final_path"
 			rm -f "$file_path"
 			return 1
@@ -152,6 +134,7 @@ 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
@@ -161,23 +144,7 @@ handle_download_url() {
 		# If the URL is HTTP, fetch the file size
 		local bundle_file_size
 		if echo "$sanitized_url" | grep -qE "^https?://"; then
-			bundle_file_header="$(curl -Is --max-time 30 "$sanitized_url" 2>/var/log/urlfilter_curl_err.log)"
-			curl_rc=$?
-
-			case $curl_rc in
-				0)
-					# Success
-					;;
-				6|7|28|35|52|55|56)
-					log_info "handle_download_url: URL not reachable (curl rc=$curl_rc): ${sanitized_url}"
-					return 1
-					;;
-				*)
-					log_info "handle_download_url: unexpected curl rc=$curl_rc for ${sanitized_url}"
-					;;
-			esac
-
-			bundle_file_size="$(echo "$bundle_file_header" | grep -i 'content-length' | cut -d: -f2 | xargs)"
+			bundle_file_size="$(curl -I "$sanitized_url" 2>&1 | grep -i 'content-length' | cut -d: -f2 | xargs)"
 			[ -z "$bundle_file_size" ] && bundle_file_size=0
 		else
 			# If it's a file:// URL, get the file size from the filesystem
@@ -186,7 +153,7 @@ handle_download_url() {
 		fi
 
 		if [ -n "$previous_bundle_size" ] && [ "$bundle_file_size" -eq "$previous_bundle_size" ]; then
-			return 0
+			return
 		fi
 
 		if echo "$sanitized_url" | grep -q "^file://" && ! echo "$sanitized_url" | grep -Eq "\.(xz|gz)$"; then
@@ -194,7 +161,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 0
+			return
 		fi
 
 		# Remove existing entries
@@ -206,9 +173,11 @@ handle_download_url() {
 		update_bundle_file_from_url "$sanitized_url" "$bundle_file_name" "$bundle_file_size" "$bundle_name" "$file_name"
 		return $?
 	else
-		log_info "Error: Unsupported URL format for ${bundle_file_name}"
+		logger -p info "Error: Unsupported URL format for ${bundle_file_name}"
 		return 1
 	fi
+
+	return 0
 }
 
 cleanup_bundle_files() {
@@ -220,7 +189,7 @@ cleanup_bundle_files() {
 	get_download_url() {
 		local section="$1"
 		config_get url "$section" download_url
-		config_get_bool enable "$1" enable 1
+		config_get_bool enable "$1" enable 0
 
 		if [ "${enable}" -eq 0 ]; then
 			# bundle is disabled
@@ -253,56 +222,46 @@ 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
-		log_info "urlfilter feature not enabled"
-		return 0
+		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
 	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
 
-	check_bundle_exists() {
-		local enable download_url name cfg
+	local profile enable bundles bundle_name download_url
 
-		cfg="$1"
+	check_bundle_exists() {
+		local cfg="$1"
 		config_get name "$cfg" name
-		config_get_bool enable "$cfg" enable 1
+		config_get_bool enable "$cfg" enable 0
 		config_get download_url "$cfg" download_url
 
 		if [ "${enable}" -eq 0 ]; then
-			log_info "Skipping bundle ${name} not enabled"
+			# bundle is disabled
 			return 0
 		fi
 
@@ -323,6 +282,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 || { log_info "sync_bundles.sh is already running, exiting."; exit 1; }
+flock -n 200 || { logger -p info "sync_bundles.sh is already running, exiting."; exit 1; }
 
 handle_filter_for_bundles

passwdqc/Makefile

@@ -30,7 +30,7 @@ define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CC="$(TARGET_CC)" \
 		LDFLAGS="$(TARGET_LDFLAGS)" \
-		all_wrapped
+		pam_wrapped
 endef
 
 define Package/$(PKG_NAME)/install
@@ -40,8 +40,8 @@ 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)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/pwqcheck $(1)/usr/sbin/
+	$(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

@@ -0,0 +1,19 @@
+#!/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

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

@@ -434,6 +434,4 @@ hw_commit_all() {
             /userfs/bin/ifc add vip pbit $pbit
         done
     fi
-
-    hw_nat -! > /dev/null 2>&1
 }

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

@@ -22,10 +22,6 @@ ip_rule_get_converted_tos() {
 	echo $con_tos
 }
 
-flush_hw_nat() {
-	hw_nat -! > /dev/null 2>&1
-}
-
 configure_qos() {
     # queue configuration is being done after shaper configuration,
     # If port shapingrate configuration on DISC device is called after queue configuration then
@@ -37,9 +33,8 @@ configure_qos() {
     configure_policer
     configure_classify
     if [ -f "/tmp/qos/classify.ebtables" ]; then
-        sh /tmp/qos/classify.ebtables
+	    sh /tmp/qos/classify.ebtables
     fi
-    flush_hw_nat
 }
 
 reload_qos() {
@@ -70,7 +65,6 @@ reload_qos() {
             ;;
     esac
     hw_commit_all
-    flush_hw_nat
 }
 
 reload_qos_service() {

qosmngr/files/airoha/usr/sbin/qos-uplink-bandwidth

@@ -14,13 +14,11 @@ PREV_LINKSPEED=$(cat ${LINKSPEED_FILE} 2>/dev/null)
 [ -z "${PREV_LINKSPEED}" ] && PREV_LINKSPEED=0
 
 if [ $((LINKSPEED)) -ne $((PREV_LINKSPEED)) -a $((LINKSPEED)) -ne 0 ]; then
-	if [ $((LINKSPEED)) -ge 100 ]; then
+	if [ $((LINKSPEED)) -ge 10000 ]; then
 		/userfs/bin/qosrule discpline Rate uplink-bandwidth $((LINKSPEED*1000*999/1000))
 	else
-		/userfs/bin/qosrule discpline Rate uplink-bandwidth $((LINKSPEED*1000*990/1000))
+		/userfs/bin/qosrule discpline Rate uplink-bandwidth $((LINKSPEED*1000))
 	fi
 	mkdir -p "/tmp/qos"
 	echo ${LINKSPEED} > ${LINKSPEED_FILE}
-
-	hw_nat -! > /dev/null 2>&1
 fi

quickjs-ng/Makefile

@@ -0,0 +1,85 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=quickjs-ng
+PKG_VERSION:=2024-07-22
+PKG_RELEASE:=1
+
+# Fetch the source from the official git repository
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/quickjs-ng/quickjs.git
+PKG_SOURCE_VERSION:=HEAD
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=COPYING
+PKG_MAINTAINER:=QuickJS-NG Maintainers <maintainers@quickjs-ng.org>
+
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += -fPIC
+
+# Configure arguments – QuickJS uses a simple Makefile, no autotools.
+# We only need to make sure the correct toolchain variables are used.
+
+MAKE_FLAGS += \
+	CC="$(TARGET_CC)" \
+	AR="$(TARGET_AR)" \
+	LD="$(TARGET_LD)" \
+	CFLAGS="$(TARGET_CFLAGS)" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	PREFIX="/usr" \
+	DESTDIR="$(PKG_INSTALL_DIR)"
+
+# Package definition
+
+define Package/quickjs-ng
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=QuickJS-NG – Lightweight JavaScript engine
+  URL:=https://github.com/quickjs-ng/quickjs
+  DEPENDS:=+libatomic
+endef
+
+define Package/quickjs-ng/description
+ QuickJS-NG is a modern fork of Fabrice Bellard's QuickJS JavaScript engine.
+ It aims to keep up with the latest ECMAScript features while remaining small
+ and embeddable. This package provides the `qjs` interpreter, the `qjsc`
+ compiler and the shared library that can be linked by third-party software.
+endef
+
+# Overwrite the default compile and install steps – QuickJS ships its own Makefile.
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) all install
+endef
+
+# Install development files into the staging directory so other packages can
+# link against QuickJS-NG at build-time.
+
+define Build/InstallDev
+	# Headers
+	$(INSTALL_DIR) $(1)/usr/include/quickjs
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/include/*.h $(1)/usr/include/quickjs/
+	# Ensure quickjs-libc.h is present (some install targets may omit it)
+	$(CP) $(PKG_BUILD_DIR)/quickjs-libc.h $(1)/usr/include/quickjs/
+
+	# Library
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libqjs.a $(1)/usr/lib/
+endef
+
+# Main runtime package install
+
+define Package/quickjs-ng/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/qjs $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/local/bin/qjsc $(1)/usr/bin/
+
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/local/lib/libqjs.a $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,quickjs-ng))

quickjs-websocket/Makefile

@@ -38,7 +38,7 @@ define Package/quickjs-websocket
   CATEGORY:=Libraries
   TITLE:=WebSocket API for QuickJS
   MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
-  DEPENDS:=+quickjs +libwebsockets-openssl
+  DEPENDS:=+quickjs-ng +libwebsockets-openssl
 endef
 
 define Package/quickjs-websocket/description

quickjs-websocket/src/lws-client.c

@@ -930,7 +930,7 @@ static int js_lws_init(JSContext *ctx, JSModuleDef *m)
 {
     JSValue proto;
 
-    JS_NewClassID(&js_lws_context_class_id);
+    JS_NewClassID(JS_GetRuntime(ctx), &js_lws_context_class_id);
     JS_NewClass(JS_GetRuntime(ctx), js_lws_context_class_id,
                 &js_lws_context_class);
     proto = JS_NewObject(ctx);
@@ -938,7 +938,7 @@ static int js_lws_init(JSContext *ctx, JSModuleDef *m)
                                countof(js_lws_context_proto_funcs));
     JS_SetClassProto(ctx, js_lws_context_class_id, proto);
 
-    JS_NewClassID(&js_lws_wsi_class_id);
+    JS_NewClassID(JS_GetRuntime(ctx), &js_lws_wsi_class_id);
     JS_NewClass(JS_GetRuntime(ctx), js_lws_wsi_class_id, &js_lws_wsi_class);
     proto = JS_NewObject(ctx);
     JS_SetPropertyFunctionList(ctx, proto, js_lws_wsi_proto_funcs,

quickjs/Makefile

@@ -1,53 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=quickjs
-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_MIRROR_HASH:=skip
-PKG_LICENSE:=MIT
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/quickjs
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=QuickJS Javascript engine
-  URL:=https://bellard.org/quickjs/
-  MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
-  DEPENDS:=+libatomic
-endef
-
-define Package/quickjs/description
-  QuickJS is a small and embeddable Javascript engine. It supports
-  the ES2020 specification including modules, asynchronous
-  generators, proxies and BigInt.
-endef
-
-MAKE_FLAGS = \
-	prefix=/usr \
-	CONFIG_SMALL=y \
-	EXTRA_LIBS="-latomic" \
-	CROSS_PREFIX="$(TARGET_CROSS)"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib/quickjs
-	$(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/
-endef
-
-define Package/quickjs/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qjs $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,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/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);
- }
- 

quickjs/patches/002-fix_std_loadFile.patch

@@ -1,126 +0,0 @@
-diff --git a/quickjs-libc.c b/quickjs-libc.c
-index e180dd0..76182d2 100644
---- a/quickjs-libc.c
-+++ b/quickjs-libc.c
-@@ -358,12 +358,89 @@ 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
-+
-+static int readall(FILE *f, JSContext *ctx, uint8_t **dataptr, size_t *sizeptr)
-+{
-+    uint8_t *data = NULL, *temp;
-+    size_t size = 0;
-+    size_t used = 0;
-+    size_t n;
-+
-+    while (1) {
-+        if (used + READALL_CHUNK + 1 > size) {
-+            size = used + READALL_CHUNK + 1;
-+
-+            /* Overflow check. Some ANSI C compilers
-+               may optimize this away, though. */
-+            if (size <= used) {
-+                if (ctx)
-+                    js_free(ctx, data);
-+                else
-+                    free(data);
-+                return -1;
-+            }
-+
-+            if (ctx)
-+                temp = js_realloc(ctx, data, size);
-+            else
-+                temp = realloc(data, size);
-+
-+            if (temp == NULL) {
-+                if (ctx)
-+                    js_free(ctx, data);
-+                else
-+                    free(data);
-+                return -1;
-+            }
-+            data = temp;
-+        }
-+
-+        n = fread(data + used, 1, READALL_CHUNK, f);
-+        if (n == 0)
-+            break;
-+
-+        used += n;
-+    }
-+
-+    if (ferror(f)) {
-+        if (ctx)
-+            js_free(ctx, data);
-+        else
-+            free(data);
-+        return -1;
-+    }
-+
-+    if (ctx)
-+        temp = js_realloc(ctx, data, used + 1);
-+    else
-+        temp = realloc(data, used + 1);
-+
-+    if (temp == NULL) {
-+        if (ctx)
-+            js_free(ctx, data);
-+        else
-+            free(data);
-+        return -1;
-+    }
-+    data = temp;
-+    data[used] = '\0';
-+
-+    *dataptr = data;
-+    *sizeptr = used;
-+
-+    return 0;
-+}
-+
- uint8_t *js_load_file(JSContext *ctx, size_t *pbuf_len, const char *filename)
- {
-     FILE *f;
-     uint8_t *buf;
-     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)
-     if (fseek(f, 0, SEEK_END) < 0)
-         goto fail;
-     lret = ftell(f);
--    if (lret < 0)
-+    if (lret <= 0)
-         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)
-         buf = malloc(buf_len + 1);
-     if (!buf)
-         goto fail;
--    if (fread(buf, 1, buf_len, f) != buf_len) {
--        errno = EIO;
-+    buf_len = fread(buf, 1, buf_len, f);
-+    if (ferror(f)) {
-         if (ctx)
-             js_free(ctx, buf);
-         else
-             free(buf);
-     fail:
-+        // Files in proc and sysfs may not be seekable or may falsely
-+        // appear to be of zero size. Try to read them in another way.
-+        if (lret == 0 && readall(f, ctx, &buf, pbuf_len) == 0) {
-+            fclose(f);
-+            return buf;
-+        }
-         fclose(f);
-         return NULL;
-     }

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

@@ -1,30 +1,11 @@
-. /lib/functions.sh
-
-handle_interface() {
-	local config="${1}"
-	local prefix="${2}"
-
-	config_get ifname "${config}" ifname
-	config_get mode ${config} mode
-
+interfaces=$(uci show wireless | grep "ifname=" |  awk -F'[.,=]' '{print$2}')
+for int in $interfaces; do
+	mode=$(uci get "wireless.${int}.mode")
 	if [ "$mode" = "ap" ] ; then
-		echo "Get assoc list for ${ifname}"
-		ubus call "${prefix}.${ifname}" assoclist
-		echo "Get station info for ${ifname}"
-		ubus call "${prefix}.${ifname}" stations
+		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
 	fi
-}
-
-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
+done

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

@@ -22,4 +22,3 @@ 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

@@ -1,36 +0,0 @@
-. /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,8 +13,7 @@
 		},
 		{
 			"description": "WiFi Status",
-			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_status.sh",
-			"timeout": 10
+			"cmd": "ubus call wifi status"
 		},
 		{
 			"description": "WiFi Radio Status",