uci-defaults: l2mode dedicated wanport

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>

bbfdm/Makefile

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

bbfdm/files/etc/bbfdm/critical_services.json

@@ -8,13 +8,16 @@
 			"ieee1905",
 			"mapcontroller",
 			"mosquitto",
-			"nginx"
+			"nginx",
+			"netmode"
 	],
 	"cwmp": [
 			"firewall",
 			"network",
 			"dhcp",
+			"mapcontroller",
 			"wireless",
-			"time"
+			"time",
+			"netmode"
 	]
 }

bridgemngr/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bridgemngr
-PKG_VERSION:=1.0.14
+PKG_VERSION:=1.0.16
 
 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:=99bc3a3a0a2571917eda7085c21952f779fdb471
+PKG_SOURCE_VERSION:=3947502c81bab2b4e4f5b2c0f8ead41be99488a2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

ddnsmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.11
+PKG_VERSION:=1.0.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
-PKG_SOURCE_VERSION:=9f2f4dabc71c4f405b1c5df576d20d793d299e94
+PKG_SOURCE_VERSION:=44af9a7b3fec3929f8554af9633a5b8068189b48
 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.2
+PKG_VERSION:=6.2.1.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a5c381b2855bd88f09dedb00f76040f1a4662079
+PKG_SOURCE_VERSION:=2f2beb0e9f27ebebe47cfcc982b8c1a5460e987b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/files/etc/init.d/dectmngr

@@ -57,13 +57,53 @@ get_dcx81_device() {
 			device_name_line="$(grep '^DEVNAME=' "$uevent_file")" || return 1
 			readonly device="/dev/${device_name_line##DEVNAME=}"
 			[ -c "$device" ] || return 1
-			printf "%s" "$device"
+			printf "%s" "$(basename $device)"
 			return 0
 		fi
 	done
 	return 1
 }
 
+check_dcx81_firmware() {
+	local dcx81_uart=$1
+	local fw_link="/lib/firmware/dcx81_firmware"
+	local fw_file
+
+	[ -L "$fw_link" ] || return
+
+	fw_file=$(readlink -f $fw_link)
+	[ -f "$fw_file" ] || return
+
+	# the symbolic link is not needed
+	rm -f $fw_link
+
+	eval $(/sbin/cmbs_tcx -comname "$dcx81_uart" -fw_version |grep DCX81_FW_Version)
+	[ -n "$DCX81_FW_Version" ] || return
+
+	if echo $(basename $fw_file) | grep -qi "$DCX81_FW_Version" ; then
+		logger -t "$PROG" "DCX81 running expected $DCX81_FW_Version"
+		return;
+	fi
+
+	logger -t "$PROG" "DCX81 firmware upgrading to $fw_file"
+	/sbin/cmbs_tcx -comname "$dcx81_uart" -fwu "$fw_file" 2>&1 >/dev/null &
+
+	echo -n "Updrading DCX81 firmware.." >/dev/console
+	local wait_time=0
+	while pidof cmbs_tcx >/dev/null && [ "$wait_time" -lt "200" ] ; do
+		sleep 5
+		wait_time=$(($wait_time + 5))
+		echo -n "." >/dev/console
+	done
+
+	if pidof cmbs_tcx >/dev/null ; then
+		killall -9 cmbs_tcx
+		logger -t "$PROG" "DCX81 firmware upgrade timeout"
+	else
+		logger -t "$PROG" "DCX81 firmware upgrade done"
+	fi
+}
+
 start_service() {
 	local opt_ext=
 	local rfpi=
@@ -75,14 +115,16 @@ start_service() {
 		return 0
 	fi
 
-	opt_ext="-extensionShift $(get_extension_shift)"
-
 	local dcx81_uart_device
 	if ! dcx81_uart_device="$(get_dcx81_device)"; then
 		logger -t "$PROG" -p daemon.warning "Could not determine DCX81 UART device. Falling back to default ttyH0."
-		dcx81_uart_device=/dev/ttyH0
+		dcx81_uart_device="ttyH0"
 	fi
 
+	check_dcx81_firmware $dcx81_uart_device
+
+	opt_ext="-extensionShift $(get_extension_shift)"
+
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
 
@@ -106,21 +148,19 @@ start_service() {
 
 	procd_open_instance
 
-	# dectmngr takes expects device without /dev
-	readonly dcx81_uart_device_wo_dev="${dcx81_uart_device##/dev/}"
 	case "$log_dect_cmbs" in
 	none)
 		echo "Starting dectmngr with cmbs logging disabled"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device" $opt_ext
 		rm -f $LOG_PATH/*
 		;;
 	file)
 		echo "Starting dectmngr with cmbs logging enabled to file"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -log $LOG_PATH/dect-cmbs.log $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device" -log $LOG_PATH/dect-cmbs.log $opt_ext
 		;;
 	*)
 		echo "Starting dectmngr with cmbs logging enabled to syslog"
-		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -syslog $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device" -syslog $opt_ext
 		rm -f $LOG_PATH/*
 		;;
 	esac

fluent-bit/Makefile

@@ -65,6 +65,7 @@ CMAKE_OPTIONS += \
 	-DFLB_IN_DISK=Yes \
 	-DFLB_IN_EXEC=Yes \
 	-DFLB_IN_HEAD=Yes \
+	-DFLB_IN_TAIL=Yes \
 	-DFLB_IN_FORWARD=No \
 	-DFLB_IN_KMSG=No \
 	-DFLB_IN_PROC=No \
@@ -73,7 +74,6 @@ CMAKE_OPTIONS += \
 	-DFLB_IN_MQTT=No \
 	-DFLB_IN_STDIN=No \
 	-DFLB_IN_SYSTEMD=No \
-	-DFLB_IN_TAIL=No \
 	-DFLB_IN_TCP=No \
 	-DFLB_IN_THERMAL=No \
 	-DFLB_IN_UDP=No \
@@ -170,6 +170,7 @@ CMAKE_OPTIONS += \
 define Package/fluent-bit/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/fluent-bit
+	$(INSTALL_DIR) $(1)/etc/fluent-bit/conf.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/fluent-bit $(1)/usr/sbin/
 	$(INSTALL_DATA) ./files/fluent-bit.conf $(1)/etc/fluent-bit/fluent-bit.conf
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/conf/parsers.conf $(1)/etc/fluent-bit/parsers.conf

fluent-bit/patches/0003-prepend_length_in_syslog_output.patch

@@ -0,0 +1,47 @@
+diff --git a/plugins/out_syslog/syslog.c b/plugins/out_syslog/syslog.c
+index 4ecc7c4ac..cfe568245 100644
+--- a/plugins/out_syslog/syslog.c
++++ b/plugins/out_syslog/syslog.c
+@@ -776,12 +776,42 @@ static flb_sds_t syslog_format(struct flb_syslog *ctx, msgpack_object *o,
+         }
+ 
+         if (ctx->parsed_mode != FLB_SYSLOG_UDP) {
++            unsigned int msg_len = 0;
++
++            /* Create new SDS for length prefix */
++            flb_sds_t prefix = flb_sds_create_size(ctx->maxsize + 32);
++            if (!prefix) {
++                ret_sds = NULL;
++                goto clean;
++            }
++
++            /* Add newline also to make behaviour similar to syslog-ng */
+             tmp = flb_sds_cat(*s, "\n", 1);
+             if (!tmp) {
++                flb_sds_destroy(prefix);
+                 ret_sds = NULL;
+                 goto clean;
+             }
+             *s = tmp;
++
++            msg_len = flb_sds_len(*s);
++            tmp = flb_sds_printf(&prefix, "%u ", msg_len);
++            if (!tmp) {
++                flb_sds_destroy(prefix);
++                ret_sds = NULL;
++                goto clean;
++            }
++            prefix = tmp;
++
++            tmp = flb_sds_cat(prefix, *s, msg_len);
++            if (!tmp) {
++                flb_sds_destroy(prefix);
++                ret_sds = NULL;
++                goto clean;
++            }
++
++            flb_sds_destroy(*s);
++            *s = tmp;
+         }
+     }
+     else {

icwmp/Makefile

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

libvoice-airoha/files/etc/uci-defaults/991-libvoice-airoha

@@ -17,6 +17,11 @@ SLIC=$(cat /proc/device-tree/airoha-voice/slic-type)
 hasDect=$(db -q get hw.board.hasDect)
 [ "$hasDect" = "1" ] || exit 0
 
+# Set the DECT RFPI
+. /lib/functions/iopsys-environment.sh
+db set hw.board.dect_rfpi=$(get_dect_rfpi)
+db commit
+
 # configure the PCM for DECT/DCX81
 [ -f "/proc/device-tree/aliases/dcx81-uart" ] && {
     uci set dect.global.pcm_fsync='SHORT_LF'

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.12.9
+PKG_VERSION:=7.13.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0877163a9653a9f83c8244aa24f762a131ae02a6
+PKG_SOURCE_VERSION:=c3bd60c0b23a6bdb2280693bd7784d25a70090ca
 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

logmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=logmngr
-PKG_VERSION:=1.0.15
+PKG_VERSION:=1.0.16
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

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

@@ -5,6 +5,7 @@
 
 CONF_FILE=/etc/fluent-bit/fluent-bit.conf
 TMP_CONF_FILE=/tmp/fluent-bit/fluent-bit.conf
+CONF_DIR=/etc/fluent-bit/conf.d
 
 append_conf() {
 	echo "$*" >> ${TMP_CONF_FILE}
@@ -14,6 +15,14 @@ create_config_file() {
 	mkdir -p /tmp/fluent-bit
 	rm -f ${TMP_CONF_FILE}
 	touch ${TMP_CONF_FILE}
+	# include all files placed in CONF_DIR directory
+	# fluent-bit does not support using directory in include directive
+	# also, if no file is found then fluent-bit aborts
+	# so only add include if any file is present in the CONF_DIR
+        if [ -d "$CONF_DIR" ] && [ "$(ls -A "$CONF_DIR")" ]; then
+		echo "@INCLUDE ${CONF_DIR}/*" >> ${TMP_CONF_FILE}
+	fi
+	echo "" >> ${TMP_CONF_FILE}
 }
 
 create_service_section() {
@@ -25,6 +34,7 @@ create_service_section() {
 	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}
 }
 

logmngr/files/lib/logmngr/logrotate.sh

@@ -4,11 +4,14 @@
 
 LOGROTATE_FILE=/etc/logrotate.conf
 LOGROTATE_TMP_FILE=/tmp/logrotate/logrotate.conf
+CONF_DIR=/etc/logrotate.d
 
 create_logrotate_file() {
 	mkdir -p /tmp/logrotate
 	rm -f ${LOGROTATE_TMP_FILE}
 	touch ${LOGROTATE_TMP_FILE}
+	echo -e "include ${CONF_DIR}" >> ${LOGROTATE_TMP_FILE}
+	echo -e "" >> ${LOGROTATE_TMP_FILE}
 }
 
 handle_logrotate() {

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.3.5.3
+PKG_VERSION:=6.3.5.8
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a2cc8dde8da330c2e78e186174db45ba36681b6a
+PKG_SOURCE_VERSION:=53bd2c211f495029377105a2b76490784fff9538
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

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

@@ -17,12 +17,6 @@ for port_bridge_sec in $port_bridge_sec_list; do
 	fi
 done
 
-# Exit if the PORT Bridge Name is empty
-[ -z "$port_bridge_name" ]  && exit 0
-
-# Exit if the PORT is not member of the AL Bridge
-[ "$port_bridge_name" = "$al_bridge" ] || exit 0
-
 # Exit if the device is not operating in extender/repeater mode
 al_brnet="${al_bridge:3}"
 [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
@@ -36,9 +30,16 @@ fi
 ################ Dedicated ETH WAN Port ################
 wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
 if [ -n "$wanport" ]; then
+	# Don't require wanport to be part of port bridge
 	[ "$wanport" = "$PORT" ] || exit 0
 ########################################################
 else
+	# Exit if the PORT Bridge Name is empty
+	[ -z "$port_bridge_name" ]  && exit 0
+
+	# Exit if the PORT is not member of the AL Bridge
+	[ "$port_bridge_name" = "$al_bridge" ] || exit 0
+
 #################### DHCP Discovery ####################
 	if [ "$LINK" = "up" ]; then
 		brctl delif $al_bridge $PORT
@@ -61,6 +62,14 @@ remove_from_bridge() {
 	[ -n "$ifname" ] && brctl delif ${al_bridge} ${ifname}
 }
 
+get_network_id() {
+	local ifname=$1
+
+	[ -n "$ifname" ] || return
+	network_id=$(wpa_cli -i $ifname list_n|tail -n 1 | awk '{print $1}')
+	echo ${network_id}
+}
+
 update_bstas() {
 	section="$1"
 	action="$2"
@@ -68,16 +77,19 @@ update_bstas() {
 	config_get ifname "$section" ifname
 	config_get_bool enabled "$section" enabled 0
 
+	network_id=$(get_network_id $ifname)
 	if [ "$action" = "down" ]; then
 		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" disable_network 0  > /dev/null 2>&1
+		wpa_cli -i "$ifname" disable_network $network_id  > /dev/null 2>&1
 #		wpa_cli -i "$ifname" save_config  > /dev/null 2>&1
 	elif [ "$action" = "up" ]; then
 		[ "$enabled" -eq 0 ] && return
 		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" enable_network 0  > /dev/null 2>&1
+		wpa_cli -i "$ifname" enable_network $network_id  > /dev/null 2>&1
 #		wpa_cli -i "$ifname" save_config  > /dev/null 2>&1
 	fi
+
+	echo "wpa_cli -i $ifname $action id $network_id" > /dev/console
 }
 
 if [ "$LINK" = "up" ]; then
@@ -86,8 +98,12 @@ if [ "$LINK" = "up" ]; then
 	config_foreach remove_from_bridge bsta
 	config_foreach update_bstas bsta down
 
+	brctl addif $al_bridge $PORT
+	echo "brctl addif $al_bridge $PORT" > /dev/console
 	/lib/wifi/multiap set_uplink "eth" "$PORT"
 else
+	brctl delif $al_bridge $PORT
+	echo "brctl delif $al_bridge $PORT" > /dev/console
 	/lib/wifi/multiap unset_uplink "eth"
 	#rm -f "$map_bh_file"
 	config_load "mapagent"

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

@@ -203,7 +203,7 @@ start_service() {
 
 	procd_open_instance
 	create_dir
-	procd_set_param command "/usr/sbin/mapagent" "-d"
+	procd_set_param command "/usr/sbin/mapagent" "-d" "-o" "/tmp/mapagent.log" "-f"
 	procd_set_param respawn
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1

map-controller/Makefile

@@ -6,9 +6,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.3.0.17
+PKG_VERSION:=6.3.0.19
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=7f55e5705fee1b879d651bbba872ec5d7152d5ab
+PKG_SOURCE_VERSION:=1b7df5906c9953e1b2fea793b17ff29b2ccc9445
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@genexis.eu>
 
 LOCAL_DEV=0

netmngr/Makefile

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

netmode/Makefile

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

netmode/files/datamodel.json

@@ -207,6 +207,23 @@
 						}
 					]
 				},
+				"Type": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"description": "Datatype for this argument",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"mapping": [
+						{
+							"type": "uci_sec",
+							"data": "@Parent",
+							"key": "type"
+						}
+					]
+				},
 				"Description": {
 					"type": "string",
 					"read": true,

netmode/files/etc/netmodes/bridged/scripts/10-bridged

@@ -0,0 +1,127 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+source "/etc/device_info"
+
+l2_mcast_config() {
+	# configure L2 mcast config for snooping
+	logger -s -p user.info -t "netmode" "Generating L2 mcast configuration"
+
+	# remove proxy sections
+	uci -q delete mcast.igmp_proxy_1
+	uci -q delete mcast.mc_proxy_MLD
+
+	# add igmp_snooping section
+	uci -q set mcast.igmp_snooping_1=snooping
+	uci -q set mcast.igmp_snooping_1.enable='1'
+	uci -q set mcast.igmp_snooping_1.proto='igmp'
+	uci -q set mcast.igmp_snooping_1.version='2'
+	uci -q set mcast.igmp_snooping_1.robustness='2'
+	uci -q set mcast.igmp_snooping_1.query_interval='125'
+	uci -q set mcast.igmp_snooping_1.query_response_interval='100'
+	uci -q set mcast.igmp_snooping_1.last_member_query_interval='10'
+	uci -q set mcast.igmp_snooping_1.fast_leave='1'
+	uci -q set mcast.igmp_snooping_1.snooping_mode='2'
+	uci -q set mcast.igmp_snooping_1.interface='br-lan'
+	uci -q add_list mcast.igmp_snooping_1.filter='239.0.0.0/8'
+
+	# add mld_snooping section
+	uci -q set mcast.mld_snooping_1=snooping
+	uci -q set mcast.mld_snooping_1.enable='1'
+	uci -q set mcast.mld_snooping_1.proto='mld'
+	uci -q set mcast.mld_snooping_1.version='2'
+	uci -q set mcast.mld_snooping_1.robustness='2'
+	uci -q set mcast.mld_snooping_1.query_interval='125'
+	uci -q set mcast.mld_snooping_1.query_response_interval='100'
+	uci -q set mcast.mld_snooping_1.last_member_query_interval='10'
+	uci -q set mcast.mld_snooping_1.fast_leave='1'
+	uci -q set mcast.mld_snooping_1.snooping_mode='2'
+	uci -q set mcast.mld_snooping_1.interface='br-lan'
+
+	uci -q commit mcast
+}
+
+l2_network_config() {
+	logger -s -p user.info -t "netmode" "Generating L2 network configuration"
+
+	# Configure L2 Network Mode
+	uci -q set network.lan=interface
+	uci -q set network.lan.proto='dhcp'
+	uci -q set network.lan.vendorid="$(uci -q get network.wan.vendorid)"
+	uci -q set network.lan.clientid="$(uci -q get network.wan.clientid)"
+	uci -q set network.lan.reqopts="$(uci -q get network.wan.reqopts)"
+	uci -q set network.lan.sendopts="$(uci -q get network.wan.sendopts)"
+	uci -q set network.lan.device='br-lan'
+	uci -q set network.lan.force_link='1'
+
+	uci -q set network.lan6=interface
+	uci -q set network.lan6.proto='dhcpv6'
+	uci -q set network.lan6.device='@lan'
+	uci -q set network.lan6.reqprefix='no'
+
+	uci -q set network.wan.disabled='1'
+	uci -q set network.wan6.disabled='1'
+
+	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_select wan 2>/dev/null
+		json_get_var device device
+		[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
+		json_cleanup
+	fi
+
+	uci -q commit network
+
+	# Disable DHCP Server
+	uci -q set dhcp.lan.ignore=1
+	uci -q commit dhcp
+	/etc/init.d/odhcpd disable
+
+	# Disable SSDPD
+	uci -q set ssdpd.ssdp.enabled="0"
+	uci -q commit ssdpd
+
+	# Update CWMP Agent WAN Interface
+	uci -q set cwmp.cpe.default_wan_interface="lan"
+	uci -q commit cwmp
+
+	# Update gateway WAN Interface
+	uci -q set gateway.global.wan_interface="lan"
+	uci -q commit gateway
+
+	# disable firewall
+	uci -q set firewall.globals.enabled="0"
+	uci -q commit firewall
+}
+
+l2_network_config
+l2_mcast_config
+
+# If device is already boot-up, assume netmode changed during runtime
+if [ -f /var/run/boot_complete ]; then
+	/etc/init.d/odhcpd stop 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/routed-dhcp/scripts/10-routed-dhcp

@@ -0,0 +1,108 @@
+#!/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"
+
+	# 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.proto='dhcp'
+	uci -q delete network.wan.disabled
+	uci -q delete network.wan.username
+	uci -q delete network.wan.password
+
+	uci -q set network.wan6=interface
+	uci -q set network.wan6.proto='dhcpv6'
+	uci -q delete network.wan6.disabled
+
+	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_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
+
+	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/routed-pppoe/scripts/10-routed-pppoe

@@ -0,0 +1,106 @@
+#!/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_pppoe_config() {
+	logger -s -p user.info -t "netmode" "Generating L3 network configuration"
+
+	# 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.proto='pppoe'
+	uci -q set network.wan.username="$NETMODE_username"
+	uci -q set network.wan.password="$NETMODE_password"
+	uci -q delete network.wan.disabled
+
+	uci -q set network.wan6.disabled='1'
+
+	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_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
+
+	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_pppoe_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

@@ -13,12 +13,14 @@
           "name": "username",
           "description": "PPoE username",
           "required": true,
+	  "type": "string",
           "#value": "TestUser"
         },
         {
           "name": "password",
           "description": "PPoE password",
           "required": true,
+	  "type": "string",
           "#value": "TestPassword"
         }
       ]

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

@@ -17,7 +17,7 @@ fi
 
 configure_supp_modes_args()
 {
-	local obj inst name description required value parent
+	local obj inst name description required value parent type
 
 	obj="${1}"
 	inst="${2}"
@@ -32,12 +32,14 @@ configure_supp_modes_args()
 	json_get_var description description
 	json_get_var value value
 	json_get_var required required
+	json_get_var type type
 
 	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}=supported_args
 	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.name="${name}"
 	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.description="${description}"
 	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.required="${required}"
 	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.value="${value}"
+	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.type="${type}"
 	uci -q set netmode.${parent}_supprted_args_${SUPP_ARGS}.dm_parent="${parent}"
 
 	json_select ..

netmode/files/etc/uci-defaults/62-netmode.l2mode

@@ -80,7 +80,11 @@ l2_network_config() {
 		json_select ..
 		json_select wan 2>/dev/null
 		json_get_var device device
-		[ -n "$device" ] && uci add_list network.br_lan.ports="$device"
+		[ -n "$device" ] && {
+			# dedicated wan port - create uplink device
+			uci -q set network.l2wan=interface
+			uci -q set network.l2wan.device="$device"
+		}
 		json_cleanup
 	fi
 

netmode/files/lib/netmode/post/datamodel_init.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+
+# This script is to cleanup dmmap and restart datamodel related services
+# when wan mode changes
+
+if [ -d "/etc/bbfdm/dmmap/" ]; then
+	rm -rf /etc/bbfdm/dmmap/*
+fi
+
+# If device is booting up, no need to restart services
+if [ ! -f /var/run/boot_complete ]; then
+	return 0
+fi
+
+if [ -x "/etc/init.d/bbfdm.services" ]; then
+	/etc/init.d/bbfdm.services restart
+fi
+
+if [ -x "/etc/init.d/bbfdmd" ]; then
+	/etc/init.d/bbfdmd restart
+fi
+
+if [ -x "/etc/init.d/obuspa" ]; then
+	/etc/init.d/obuspa restart
+fi

obuspa/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=10.0.0.8
+PKG_VERSION:=10.0.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

obuspa/files/etc/init.d/obuspa

@@ -241,7 +241,8 @@ validate_mqtt_client_section()
 		'Password:string' \
 		'ProtocolVersion:or("3.1", "3.1.1","5.0"):5.0' \
 		'TransportProtocol:or("TCP/IP","TLS"):TCP/IP' \
-		'ClientID:string'
+		'ClientID:string' \
+		'RequestResponseInfo:bool:1'
 }
 
 validate_challenge_section()
@@ -602,7 +603,7 @@ configure_stomp_connection() {
 
 configure_mqtt_client() {
 	local BrokerAddress BrokerPort Enable Username Password ProtocolVersion
-	local TransportProtocol ClientID
+	local TransportProtocol ClientID RequestResponseInfo
 	local sec
 
 	sec="${1}"
@@ -627,6 +628,7 @@ configure_mqtt_client() {
 	db_set "${BASEPATH}.ProtocolVersion" "${ProtocolVersion}"
 	db_set "${BASEPATH}.TransportProtocol" "${TransportProtocol}"
 	db_set "${BASEPATH}.ClientID" "${ClientID}"
+	db_set "${BASEPATH}.RequestResponseInfo" "${RequestResponseInfo}"
 }
 
 

parental-control/Config.in

@@ -1,12 +1,10 @@
 if PACKAGE_parental-control
 
-config PARENTAL_CONTROL_INCLUDE_URLFILTER_BUNDLES
-	bool "Include default bundle files"
-	default n
+config PARENTAL_CONTROL_URLFILTERING
+	bool "Enables URL Filter functions and datamodel"
+	default y
 	help
-	   Set this option to include bundle files by default,
-	   they are also included in the UCI, urlfilter
-	   still needs to be enabled though.
+	   Set this option to include url filter feature
 
 config PARENTAL_CONTROL_VENDOR_PREFIX
 	string "Package specific datamodel Vendor Prefix for TR181 extensions"

parental-control/Makefile

@@ -1,17 +1,17 @@
 #
-# Copyright (C) 2021-2024 IOPSYS
+# Copyright (C) 2021-2025 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=parental-control
-PKG_VERSION:=1.1.6
+PKG_VERSION:=1.2.0
 
 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:=5128498a36c8f1ac48d320850c292c7e66256884
+PKG_SOURCE_VERSION:=5d931642e1d46b8cfe24e37054ffd2885e354c2c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -49,8 +49,11 @@ endif
 
 TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(VENDOR_PREFIX)\\\"
 
-TARGET_LDFLAGS += \
-	-lcmph
+ifeq ($(CONFIG_PARENTAL_CONTROL_URLFILTERING),y)
+	TARGET_CFLAGS+=-DPARENTAL_CONTROL_ULRFILTER
+endif
+
+TARGET_LDFLAGS += -lcmph
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -85,8 +88,12 @@ define Package/parental-control/install
 
 	$(BBFDM_REGISTER_SERVICES) -v ${VENDOR_PREFIX} ./bbfdm_service.json $(1) parentalcontrol
 
-ifeq ($(CONFIG_PARENTAL_CONTROL_INCLUDE_URLFILTER_BUNDLES),y)
-	$(INSTALL_DATA) ./files/etc/parentalcontrol/urlbundles.tar.xz $(1)/etc/parentalcontrol/
+ifeq ($(CONFIG_PARENTAL_CONTROL_URLFILTERING),y)
+	$(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_urlfilter $(1)/etc/uci-defaults/
 endif
 endef
 

parental-control/files/etc/config/parentalcontrol

@@ -1,93 +1,4 @@
 config globals 'globals'
     option enable '0'
     option loglevel '3'
-
-config urlbundle 'urlbundle_1'
-    option enable '0'
-    option name 'Abuse'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/abuse-nl.txt'
-
-config urlbundle 'urlbundle_2'
-    option enable '0'
-    option name 'Ads'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/ads-nl.txt'
-
-config urlbundle 'urlbundle_3'
-    option enable '0'
-    option name 'Crypto'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/crypto-nl.txt'
-
-config urlbundle 'urlbundle_4'
-    option enable '1'
-    option name 'Drugs'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/drugs-nl.txt'
-
-config urlbundle 'urlbundle_5'
-    option enable '0'
-    option name 'Everything else'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/everything-nl.txt'
-
-config urlbundle 'urlbundle_6'
-    option enable '1'
-    option name 'Facebook/Instagram'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/facebook-nl.txt'
-
-config urlbundle 'urlbundle_7'
-    option enable '1'
-    option name 'Fraud'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/fraud-nl.txt'
-
-config urlbundle 'urlbundle_8'
-    option enable '1'
-    option name 'Gambling'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/gambling-nl.txt'
-
-config urlbundle 'urlbundle_9'
-    option enable '0'
-    option name 'Malware'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/malware-nl.txt'
-
-config urlbundle 'urlbundle_10'
-    option enable '1'
-    option name 'Phishing'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/phishing-nl.txt'
-
-config urlbundle 'urlbundle_11'
-    option enable '1'
-    option name 'Piracy'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/piracy-nl.txt'
-
-config urlbundle 'urlbundle_12'
-    option enable '0'
-    option name 'Porn'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/porn-nl.txt'
-
-config urlbundle 'urlbundle_13'
-    option enable '1'
-    option name 'Ransomware'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/ransomware-nl.txt'
-
-config urlbundle 'urlbundle_14'
-    option enable '0'
-    option name 'Redirect'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/redirect-nl.txt'
-
-config urlbundle 'urlbundle_15'
-    option enable '1'
-    option name 'Scam'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/scam-nl.txt'
-
-config urlbundle 'urlbundle_16'
-    option enable '0'
-    option name 'TikTok'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/tiktok-nl.txt'
-
-config urlbundle 'urlbundle_17'
-    option enable '0'
-    option name 'Torrent'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/torrent-nl.txt'
-
-config urlbundle 'urlbundle_18'
-    option enable '0'
-    option name 'Tracking'
-    option download_url 'https://blocklistproject.github.io/Lists/alt-version/tracking-nl.txt'
+    option urlfilter '1'

parental-control/files/etc/firewall.parentalcontrol

@@ -2,15 +2,22 @@
 
 . /lib/parentalcontrol/parentalcontrol.sh
 
+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 [ "$(uci -q get parentalcontrol.globals.enable)" == "1" ]; then
+if [ "${enabled}" -eq "1" ]; then
 	# this is for urlfilter daemon
 	add_iptables_nfqueue_rules
-	# this for internet_access and profile_bedtime_schedule sections
-	add_internet_schedule_rules
+	if [ "${urlfilter}" -eq "1" ]; then
+		# this for internet_access and profile_bedtime_schedule sections
+		add_internet_schedule_rules
+	fi
 else
 	# remove urlfilter daemon rules
 	remove_iptables_nfqueue_rules
-	# remove internet_access and profile_bedtime_schedule rules
-	remove_internet_schedule_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,7 +12,8 @@ validate_global_section() {
 	uci_validate_section parentalcontrol globals globals \
 	    'enable:bool:1' \
 	    'loglevel:uinteger:3' \
-	    'bundle_path:string'
+	    'bundle_path:string' \
+	    'urlfilter:bool'
 }
 
 remove_fw_rules() {
@@ -23,27 +24,36 @@ remove_fw_rules() {
 }
 
 configure_fw_rules() {
-	local enable
-
-	remove_fw_rules
+	local enable urlfilter
 
 	config_load parentalcontrol
 	config_get_bool enable globals enable 0
+	config_get_bool urlfilter globals urlfilter 0
+
+	remove_fw_rules
 
 	if [ "${enable}" -eq "0" ]; then
 		# Parental control is disabled
 		return 0
 	fi
 
-	# Now flush the existing connections, otherwise,
-	# URL filtering cannot be performed on already open sites.
-	if [ -n "$(which conntrack)" ]; then
-		sleep 5
-		conntrack -F
+	if [ "${urlfilter}" -eq "1" ]; then
+		if [ ! -f "${DM_PLUGIN_PATH}" ]; then
+			# throw error
+	                log "ERROR: urlfiltering disabled at compile time but enabled in config"
+		else
+			# Now flush the existing connections, otherwise,
+			# URL filtering cannot be performed on already open sites.
+			if [ -n "$(which conntrack)" ]; then
+				sleep 5
+				conntrack -F
+			fi
+
+			# this is for urlfilter daemon
+			add_iptables_nfqueue_rules
+		fi
 	fi
 
-	# this is for urlfilter daemon
-	add_iptables_nfqueue_rules
 	# this for internet_access and profile_bedtime_schedule sections
 	add_internet_schedule_rules
 }
@@ -68,7 +78,7 @@ copy_dhcp_leases() {
 }
 
 start_service() {
-	local enable loglevel bundle_path
+	local enable loglevel bundle_path urlfilter
 
 	config_load parentalcontrol
 	validate_global_section
@@ -80,6 +90,12 @@ start_service() {
 	# add firewall rules
 	configure_fw_rules
 
+	if [ "${urlfilter}" -eq "1" ]; then
+		enable_urlfilter_dm
+	else
+		disable_urlfilter_dm
+	fi
+
 	# if the router is, for example, upgraded and then it boots up
 	# 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,
@@ -88,7 +104,7 @@ start_service() {
 	# and will be used as a backup in case /tmp/dhcp.leases is empty
 	copy_dhcp_leases
 
-	procd_open_instance "parentalcontrol_dm"
+	procd_open_instance "parentalcontrol"
 	procd_set_param command nice -n 10 "${PROG}"  # Lower priority
 	procd_append_param command -l ${loglevel}
 	procd_set_param respawn

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/lib/parentalcontrol/parentalcontrol.sh

@@ -311,6 +311,9 @@ parse_macs_or_hostnames() {
 	local input="$1"
 	local lease_file="/tmp/dhcp.leases"
 
+	[ -f "$lease_file" ] || lease_file="/etc/parentalcontrol/dhcp.leases"
+	[ -f "$lease_file" ] || { log "Error: No DHCP lease file found."; return 1; }
+
 	for item in $input; do
 		case "$item" in
 			??:??:??:??:??:??)
@@ -509,3 +512,25 @@ remove_internet_schedule_rules() {
 		ip6tables -w -X parentalcontrol_forward
 	fi
 }
+
+OVERRIDE_JSON="/etc/parentalcontrol/urlbundle_override.json"
+DM_PLUGIN_PATH="/usr/share/bbfdm/micro_services/parentalcontrol/urlbundle_override.json"
+
+enable_urlfilter_dm() {
+	if [ -f "${DM_PLUGIN_PATH}" ]; then
+		rm ${DM_PLUGIN_PATH}
+		echo "Please restart to apply"
+	fi
+}
+
+disable_urlfilter_dm() {
+	mkdir -p "$(dirname ${DM_PLUGIN_PATH})"
+
+	if [ ! -f "${DM_PLUGIN_PATH}" ]; then
+		if [ -f "${OVERRIDE_JSON}" ]; then
+			cp "${OVERRIDE_JSON}" "${DM_PLUGIN_PATH}"
+			echo "Please restart to apply"
+
+		fi
+	fi
+}

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

@@ -224,6 +224,14 @@ cleanup_bundle_files() {
 
 # Main handler for all profile URL bundles
 handle_filter_for_bundles() {
+	local urlfilter
+
+	urlfilter="$(uci -q get parentalcontrol.globals.urlfilter)"
+	if [ "${urlfilter}" -ne "1" ]; then
+		logger -p info "urlbundle not supported"
+		return
+	fi
+
 	ubus -t 20 wait_for bbfdm.parentalcontrol
 
 	if [ "$?" -ne 0 ]; then

parental-control/files/urlbundle_override.json

@@ -0,0 +1,89 @@
+{
+    "json_plugin_version": 2,
+    "Device.X_IOWRT_EU_ParentalControl.": {
+        "type": "object",
+        "protocols": [
+            "cwmp",
+            "usp"
+        ],
+        "access": false,
+        "array": false,
+        "DefaultBundles": {
+            "type": "string",
+            "protocols": [
+                "none"
+            ],
+            "read": true,
+            "write": false
+        },
+        "MaxBlockHistory": {
+            "type": "unsignedInt",
+            "protocols": [
+                "none"
+            ],
+            "read": true,
+            "write": true,
+            "datatype": "unsignedInt"
+        },
+        "BlockHistoryNumberOfEntries": {
+            "type": "unsignedInt",
+            "read": true,
+            "write": false,
+            "protocols": [
+                "none"
+            ],
+            "datatype": "unsignedInt"
+        },
+        "URLBundleNumberOfEntries": {
+            "type": "unsignedInt",
+            "read": true,
+            "write": false,
+            "protocols": [
+                "none"
+            ],
+            "datatype": "unsignedInt"
+        },
+        "Device.X_IOWRT_EU_ParentalControl.BlockHistory.": {
+            "type": "object",
+            "protocols": [
+                "none"
+            ],
+            "access": false,
+            "array": true
+        },
+        "Device.X_IOWRT_EU_ParentalControl.URLBundle.": {
+            "type": "object",
+            "protocols": [
+                "none"
+            ],
+            "access": true,
+            "array": true
+        }
+    },
+    "Device.X_IOWRT_EU_ParentalControl.Profile.{i}.": {
+        "type": "object",
+        "protocols": [
+            "cwmp",
+            "usp"
+        ],
+        "access": true,
+        "array": true,
+        "URLFilterNumberOfEntries": {
+            "type": "unsignedInt",
+            "read": true,
+            "write": false,
+            "protocols": [
+                "none"
+            ],
+            "datatype": "unsignedInt"
+        },	
+	"Device.X_IOWRT_EU_ParentalControl.Profile.{i}.URLFilter.": {
+            "type": "object",
+            "protocols": [
+                "none"
+            ],
+            "access": true,
+            "array": true
+        }
+    }
+}

sulu/sulu-builder/files/etc/users/roles/admin.json

@@ -556,7 +556,7 @@
         ]
       },
       {
-        "object": "Device.LEDs.LED.{i}.X_GENEXIS_EU_Brightness",
+        "object": "Device.LEDs.LED.{i}.CycleElement.{i}.Brightness",
         "perm": ["PERMIT_GET", "PERMIT_SET", "PERMIT_GET_INST"]
       }
     ]

sulu/sulu-builder/files/etc/users/roles/user.json

@@ -531,7 +531,7 @@
         "perm": ["PERMIT_NONE"]
       },
       {
-        "object": "Device.LEDs.LED.{i}.X_GENEXIS_EU_Brightness",
+        "object": "Device.LEDs.LED.{i}.CycleElement.{i}.Brightness",
         "perm": ["PERMIT_GET", "PERMIT_SET", "PERMIT_GET_INST"]
       }
     ]

sysmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sysmngr
-PKG_VERSION:=1.0.24
+PKG_VERSION:=1.0.26
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/system/sysmngr.git
-PKG_SOURCE_VERSION:=15d055064699574917bb6f3c6f3c3807d8d01484
+PKG_SOURCE_VERSION:=968b35ed7d5f60524c758fe4ed763f07ba86e0b8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

sysmngr/files/etc/sysmngr/fwbank

@@ -174,7 +174,7 @@ case "$1" in
 
 				# Fail if any of the above sanity checks fail.
 				[ ${ret} -eq 1 ] && {
-					echo '{}'
+					echo "{ \"result\": \"failure\" }"
 					exit 0
 				}
 

wifi-services/Makefile

@@ -1,19 +1,19 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifi-services
-PKG_VERSION:=0.0.2
+PKG_VERSION:=0.0.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b895f4e2dd5271d89ff37e16347bfd81dbe40ffa
+PKG_SOURCE_VERSION:=2a40bda6a6bb55af82de4eda37e636ba44c0f198
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/wifi-services.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE:=PROPRIETARY GENEXIS
 
 PKG_CONFIG_DEPENDS := \
 		     CONFIG_PACKAGE_libwifiutils \
@@ -22,6 +22,7 @@ PKG_CONFIG_DEPENDS := \
 PKG_BUILD_DEPENDS := libwifi
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 MAKE_FLAGS += \
 	CFLAGS="$(TARGET_CFLAGS) -Wall"
@@ -47,6 +48,7 @@ endef
 define Package/wifi-services/install
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(CP) $(PKG_BUILD_DIR)/sta-ratings/libwifi-sta-ratings.so $(1)/usr/lib/
+	$(BBFDM_INSTALL_MS_PLUGIN) ./files/QoERating_Extension.json $(1) wifidmd
 endef
 
 $(eval $(call BuildPackage,wifi-services))

wifi-services/files/QoERating_Extension.json

@@ -0,0 +1,85 @@
+{
+	"json_plugin_version": 2,
+	"Device.WiFi.AccessPoint.{i}.AssociatedDevice.{i}.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": true,
+		"{BBF_VENDOR_PREFIX}QoERating": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "-1.0",
+			"datatype": "string",
+			"mapping": [
+				{
+					"data": "@Parent",
+					"type": "json",
+					"key": "rating"
+				}
+			]
+		}
+	},
+	"Device.WiFi.DataElements.Network.Device.{i}.Radio.{i}.BSS.{i}.STA.{i}.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": true,
+		"{BBF_VENDOR_PREFIX}QoERating": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "-1.0",
+			"datatype": "string",
+			"mapping": [
+				{
+					"data": "@Parent",
+					"type": "json",
+					"key": "Rating"
+				}
+			]
+		}
+	},
+	"Device.WiFi.DataElements.Network.Device.{i}.APMLD.{i}.STAMLD.{i}.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": true,
+		"{BBF_VENDOR_PREFIX}QoERating": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "-1.0",
+			"datatype": "string",
+			"mapping": [
+				{
+					"data": "@Parent",
+					"type": "json",
+					"key": "Rating"
+				}
+			]
+		}
+	}
+}
+

wifidmd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifidmd
-PKG_VERSION:=1.1.15
+PKG_VERSION:=1.1.22
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/wifidmd.git
-PKG_SOURCE_VERSION:=83ea5ac77b1a4427b4fd7cf5054ec66cbf13542a
+PKG_SOURCE_VERSION:=5176bea80b91ad89d989c71cb769e889b6a3f506
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wifimngr/Config.in

@@ -0,0 +1,10 @@
+if (PACKAGE_wifimngr)
+
+menu "Configurations"
+
+config WIFIMNGR_CACHE_SCANRESULTS
+	bool "Cache scan results"
+	default y
+
+endmenu
+endif

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=17.7.1
+PKG_VERSION:=17.7.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9a7c168b00900d5a8a7eb272996381d175c0392f
+PKG_SOURCE_VERSION:=ec83dbdd4a538b004af72290997573dd36d37969
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -48,6 +48,10 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
+ifeq ($(CONFIG_WIFIMNGR_CACHE_SCANRESULTS),y)
+TARGET_CFLAGS += -DWIFI_CACHE_SCANRESULTS
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
   rsync -r --exclude=.* ~/git/wifimngr/ $(PKG_BUILD_DIR)/
@@ -60,4 +64,8 @@ define Package/wifimngr/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/wifimngr $(1)/usr/sbin/
 endef
 
+define Package/wifimngr/config
+        source "$(SOURCE)/Config.in"
+endef
+
 $(eval $(call BuildPackage,wifimngr))