swmodd: Run lxc as du

Setting '/proc/sys/net/ipv4/igmp_max_memberships' is not enough.
We must pass the max_groups parameter to the mcproxy to prevent MFC
entries from being added to mr_table and packet forwarding for extra
groups.

We also need to increase max_groups, since mcproxy always subscribe
two service groups - ALL-ROUTERS (224.0.0.2) and
ALL-IGMPv3-MC-ROUTERS (224.0.0.22).

bbfdm/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.0.13
+PKG_VERSION:=1.0.20
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=a50855795e7e7eadb7c653552e1debec39840d4a
+PKG_SOURCE_VERSION:=4a8d286201efdff814f106e92147c697c32a94a9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -166,7 +166,6 @@ CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif
 
 ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
-CMAKE_OPTIONS += -DBBFDMD_ENABLED=ON
 CMAKE_OPTIONS += \
 	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
 endif

bbfdm/files/etc/config/bbfdm

@@ -4,5 +4,4 @@ config bbfdmd 'bbfdmd'
 	option loglevel '1'
 	option refresh_time '10'
 	option transaction_timeout '10'
-	option enable_plugins '1'
 

bbfdm/files/etc/init.d/bbfdmd

@@ -7,7 +7,6 @@ USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
 BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-TMP_JSON_INPUT="/tmp/bbfdm_input.json"
 
 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
@@ -38,6 +37,24 @@ configure_bbfdmd()
 
 	[ "${enabled}" -eq 0 ] && return 0
 
+	[ ! -f "${BBFDM_JSON_INPUT}" ] && return 0
+
+	if [ -n "${loglevel}" ]; then
+		echo "$(jq --arg res ${loglevel} '.daemon.config += {"loglevel": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${refresh_time}" ]; then
+		echo "$(jq --arg res ${refresh_time} '.daemon.config += {"refresh_time": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${transaction_timeout}" ]; then
+		echo "$(jq --arg res ${transaction_timeout} '.daemon.config += {"transaction_timeout": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${subprocess_level}" ]; then
+		echo "$(jq --arg res ${subprocess_level} '.daemon.config += {"subprocess_level": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
 	procd_set_param command ${PROG}
 	if [ "${debug}" -eq 1 ]; then
 		procd_set_param stdout 1
@@ -47,41 +64,14 @@ configure_bbfdmd()
 	if [ -f "${sock}" ]; then
 		procd_append_param command -s "${sock}"
 	fi
-
-	[ ! -f "${BBFDM_JSON_INPUT}" ] && return 0
-	
-	cp -f ${BBFDM_JSON_INPUT} ${TMP_JSON_INPUT} 2>/dev/null
-
-	if [ -n "${loglevel}" ]; then
-		echo "$(jq --arg res ${loglevel} '.daemon.config += {"loglevel": $res}' ${TMP_JSON_INPUT})" > ${TMP_JSON_INPUT}
-	fi
-
-	if [ -n "${refresh_time}" ]; then
-		echo "$(jq --arg res ${refresh_time} '.daemon.config += {"refresh_time": $res}' ${TMP_JSON_INPUT})" > ${TMP_JSON_INPUT}
-	fi
-
-	if [ -n "${transaction_timeout}" ]; then
-		echo "$(jq --arg res ${transaction_timeout} '.daemon.config += {"transaction_timeout": $res}' ${TMP_JSON_INPUT})" > ${TMP_JSON_INPUT}
-	fi
-
-	if [ -n "${subprocess_level}" ]; then
-		echo "$(jq --arg res ${subprocess_level} '.daemon.config += {"subprocess_level": $res}' ${TMP_JSON_INPUT})" > ${TMP_JSON_INPUT}
-	fi
-
-	if [ -n "${enable_plugins}" ]; then
-		echo "$(jq --arg res ${enable_plugins} '.daemon.config += {"enable_plugins": $res}' ${TMP_JSON_INPUT})" > ${TMP_JSON_INPUT}
-	fi
-
-	procd_append_param command -I "${TMP_JSON_INPUT}"
 }
 
-start_service() {
-
-	procd_open_instance bbf
+start_service()
+{
+	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn
-	procd_close_instance
-
+	procd_close_instance "bbfdm"
 }
 
 service_triggers()

bulkdata/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -44,9 +44,8 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/bbfdm/services
-	$(INSTALL_DIR) $(1)/etc/bbfdm/services/bulkdata
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/services/bulkdata
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/bbfdm/services/bulkdata/input.json

@@ -1,30 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"refresh_time": 3600,
-			"enable_plugins": 0
-		},
-		"input": {
-			"type": "JSON",
-			"name": "/etc/bbfdm/services/bulkdata/bulkdata.json"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.bulkdata"
-		}
-	},
-	"client": {
-		"config": {
-			"proto": "both",
-			"instance_mode": 0,
-			"enable_plugins": 0
-		},
-		"input": {
-			"type": "UBUS",
-			"name": "bbfdm.bulkdata"
-		},
-		"output": {
-			"type": "CLI"
-		}
-	}
-}

bulkdata/files/etc/init.d/bulkdatad

@@ -5,8 +5,6 @@ STOP=10
 
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
-BBFDMD_PROG="/usr/sbin/bbfdmd"
-BULKDATA_JSON_INPUT="/etc/bbfdm/services/bulkdata/input.json"
 
 start_service() {
 	local enable
@@ -14,18 +12,12 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
-	procd_open_instance "bbfdm.bulkdata"
-	procd_set_param command "$BBFDMD_PROG"
-	procd_append_param command -I "${BULKDATA_JSON_INPUT}"
-	procd_set_param respawn
-	procd_close_instance "bbfdm.bulkdata"
-
+	procd_open_instance bulkdata
 	[ "$enable" -eq "1" ] && {
-		procd_open_instance "bulkdata"
 		procd_set_param command "$PROG"
-		procd_set_param respawn
-		procd_close_instance "bulkdata"
-	}	
+		procd_set_param respawn "3" "7" "0"
+	}
+	procd_close_instance
 }
 
 reload_service() {

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.3.4
+PKG_VERSION:=9.3.5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=74d10bef9770da4a8f5bfdcdccdcba7720ec36b7
+PKG_SOURCE_VERSION:=caa4ac86b91b698e73e09a3ba8b60add36ea4b62
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

icwmp/files/etc/firewall.cwmp

@@ -5,14 +5,14 @@ log() {
 	echo "${@}"|logger -t firewall.cwmp -p info
 }
 
-if [ ! -f "/var/state/cwmp" ]; then
+if [ ! -f "/var/state/icwmp" ]; then
 	exit 0;
 fi
 
-zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
+zone_name=$(uci -c /var/state -q get icwmp.acs.zonename)
 port=$(uci -q get cwmp.cpe.port)
-ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
-ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
+ipaddr=$(uci -c /var/state -q get icwmp.acs.ip)
+ip6addr=$(uci -c /var/state -q get icwmp.acs.ip6)
 incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
 
 if [ -z "${zone_name}" ]; then
@@ -76,5 +76,5 @@ if [ "$?" -eq 0 ]; then
 	${cmd6}
 fi
 
-uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
-uci -c /var/state -q commit cwmp
+uci -c /var/state -q set icwmp.cpe.firewall_restart="init"
+uci -c /var/state -q commit icwmp

icwmp/files/etc/icwmpd/update.sh

@@ -17,8 +17,8 @@ handle_icwmp_update() {
 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 
 	if [ "$ret" = "true" ]; then
-		# read status from var/state/cwmp
-		status=$(uci -q -c /var/state get cwmp.sess_status.current_status)
+		# read status from var/state/icwmp
+		status=$(uci -q -c /var/state get icwmp.sess_status.current_status)
 		if [ "$status" != "running" ]; then
 			log "Trigger out of bound inform, since last inform status was failure"
 			ubus -t 10 call tr069 inform >/dev/null 2>&1

iop/config

@@ -67,6 +67,8 @@ CONFIG_PACKAGE_map-controller=m
 CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_decollector=y
 
+CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
+
 # Network #
 CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_urlfilter=y

iop/scripts/feeds_update.sh

@@ -1,15 +1,26 @@
-#! /bin/bash
+#!/bin/bash
 
 function feeds_update {
-
+	heads=1
 	developer=0
 	override=1
-	start=$(date -u +'%s')
-	while getopts "n" opt; do
+	while getopts "inh" opt; do
 		case $opt in
+		i)
+			heads=0
+			;;
 		n)
 			override=0
 			;;
+		h|\?)
+			echo "Usage: ./iop feeds_update [-i] [-n] [-h]"
+			echo
+			echo "OPTIONS:"
+			echo "  -i - Only update index. Do not change HEAD in feeds."
+			echo "  -n - Do not replace core packages with iopsys versions."
+			echo "  -h - Display this help message and exit."
+			exit 1
+			;;
 		esac
 	done
 
@@ -17,41 +28,42 @@ function feeds_update {
 
 	cp .config .genconfig_config_bak
 
-	#if -d argument is passed, clone feeds with ssh instead of http
-	if [ $developer == 1 ]; then
-		./scripts/feeds update -g
-	else
-		./scripts/feeds update
+	if [ $heads == 1 ]; then
+		if [ $developer == 1 ]; then
+			./scripts/feeds update -g
+		else
+			./scripts/feeds update
+		fi
 	fi
-	./scripts/feeds update -ai
+	./scripts/feeds update -ai || exit 1
 
 	# replace core packages with iopsys versions
 	if [ $override == 1 ]; then
-		./scripts/feeds install -f -p openwrt_core -a
+		./scripts/feeds install -f -p openwrt_core -a || exit 1
 	fi
 
 	(
 		echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update'
 		echo 'FEED_DEVICES_DIRS:='
 		find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h'
-	) > target/linux/feed-devices/feed-devices-list.mk
+	) > target/linux/feed-devices/feed-devices-list.mk || exit 1
 
 	# targets need to be installed explicitly
 	for target in $(ls ./feeds/targets); do
-		./scripts/feeds install -f -p targets $target
+		./scripts/feeds install -f -p targets $target || exit 1
 	done
 
 	# install all packages
-	./scripts/feeds install -a
+	./scripts/feeds install -a || exit 1
 
 	# remove broken symlinks ( for packages that are no longer in the feed )
-	find -L package/feeds -maxdepth 2 -type l -delete
+	find -L package/feeds -maxdepth 2 -type l -delete || exit 1
 
 	cp .genconfig_config_bak .config
-	make defconfig
+	make defconfig || exit 1
 
 	# record when we last run this script
-	touch tmp/.iop_bootstrap
+	touch tmp/.iop_bootstrap || exit 1
 
 	# always return true
 	exit 0

iop/scripts/genconfig.sh

@@ -42,19 +42,13 @@ function genconfig {
 	}
 
 	function verify_config {
-	    IFS=$'\n'
-	    org=$(<.genconfig.config)
-	    unset IFS
-	    local num
 	    local conf_opt
 	    local conf_org
 	    local conf_new
 
-	    #echo "lines to check $tot_lines"
-	    num=0
-	    for line in $org
+	    while read -r line
 	    do
-		conf_opt=$(echo $line | grep CONFIG_ | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
+		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
 		if [ -n "${conf_opt}" ]
 		then
 		    conf_org=$(find_last ${conf_opt} .genconfig.config)
@@ -75,8 +69,7 @@ function genconfig {
 			#echo -e "wanted [$conf_org] got [$conf_new]"
 		    fi
 		fi
-		num=$((num+1))
-	    done
+	    done < .genconfig.config
 	}
 
 	# Takes a board name and returns the target name in global var $target
@@ -127,21 +120,14 @@ function genconfig {
 	    if [ "$profile" == "LIST" ]; then
 			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
-				for b in ${!list}; do
+				a=$(echo "${!list}" | sort)
+				for b in $a; do
 					echo -e "\t$b"
 				done
 			done
 			return
 	    fi
 
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-
 	    for p in $airoha; do
 		if [ $p == $profile ]; then
 		    target="airoha"
@@ -189,6 +175,14 @@ function genconfig {
 		    return
 		fi
 	    done
+
+	    for p in $brcmbca; do
+		if [ $p == $profile ]; then
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
+		    return
+		fi
+	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -476,7 +470,7 @@ function genconfig {
 	if [ ! -e tmp/.iop_bootstrap ]; then
 		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
 		echo "Run: iop feeds_update"
-		exit 0
+		exit 1
 	fi
 
 	if [ $# -eq 0 ]; then
@@ -513,7 +507,7 @@ function genconfig {
 		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
 
 		setup_dirs
-		create_and_copy_files "$@"
+		create_and_copy_files "$@" || exit 1
 	fi
 }
 

iop/scripts/genconfig_min.sh

@@ -41,19 +41,13 @@ function genconfig_min {
 	}
 
 	function verify_config {
-	    IFS=$'\n'
-	    org=$(<.genconfig.config)
-	    unset IFS
-	    local num
 	    local conf_opt
 	    local conf_org
 	    local conf_new
 
-	    #echo "lines to check $tot_lines"
-	    num=0
-	    for line in $org
+	    while read -r line
 	    do
-		conf_opt=$(echo $line | grep CONFIG_ | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
+		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
 		if [ -n "${conf_opt}" ]
 		then
 		    conf_org=$(find_last ${conf_opt} .genconfig.config)
@@ -74,8 +68,7 @@ function genconfig_min {
 			#echo -e "wanted [$conf_org] got [$conf_new]"
 		    fi
 		fi
-		num=$((num+1))
-	    done
+	    done < .genconfig.config
 	}
 
 	# Takes a board name and returns the target name in global var $target
@@ -126,21 +119,14 @@ function genconfig_min {
 	    if [ "$profile" == "LIST" ]; then
 			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
-				for b in ${!list}; do
+				a=$(echo "${!list}" | sort)
+				for b in $a; do
 					echo -e "\t$b"
 				done
 			done
 			return
 	    fi
 
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-
 	    for p in $airoha; do
 		if [ $p == $profile ]; then
 		    target="airoha"
@@ -188,6 +174,14 @@ function genconfig_min {
 		    return
 		fi
 	    done
+
+	    for p in $brcmbca; do
+		if [ $p == $profile ]; then
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
+		    return
+		fi
+	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -444,7 +438,7 @@ function genconfig_min {
 	if [ ! -e tmp/.iop_bootstrap ]; then
 		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
 		echo "Run: iop feeds_update"
-		exit 0
+		exit 1
 	fi
 
 	if [ $# -eq 0 ]; then

iop/scripts/update_package.sh

@@ -449,7 +449,7 @@ insert_feed_hash_in_feeds_config()
     local feed=$1
     local TO=$(cd feeds/${feed}; git rev-parse HEAD)
 
-    sed -i feeds.conf -e "/ ${feed}/ s/\(.*\)[;^].*/\1^${TO}/"
+    sed -i feeds.conf -e "/ ${feed} / s/\(.*\)[;^].*/\1^${TO}/"
     git add feeds.conf
 }
 

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.3
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=0dd7195c935f3a787b45ad72acd7971adf139a70
+PKG_SOURCE_VERSION:=3043d53818166ce02644d53f99b5830d228f78dd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-broadcom/Makefile

@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=9e73f949fe00e6804eddbcec8a2c5caa1b80d24a
+PKG_SOURCE_VERSION:=dc227982c48ee6d722f3fe18dc9db71495ce9758
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=a0d0c8d2ffd534684718302131f69c25391f7ac6
+PKG_SOURCE_VERSION:=f2134d372b3f5e5810e18f34d64d5486d17fca64
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.2.102
+PKG_VERSION:=7.2.104
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fdc70f59ce6f5c121facbf133f844da7469a185c
+PKG_SOURCE_VERSION:=a246bf9fd92a1a8c107ffff3eb3428a4174a67df
 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

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.3.3.0
+PKG_VERSION:=4.3.3.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=84b447dc1e8e851032765988f8acda09baabc926
+PKG_SOURCE_VERSION:=6b1347b33333f3ef9884de0745aa862a0a1dabc8
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.3.0.5
+PKG_VERSION:=4.3.0.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=2e88092c5b54d12bc77aca6239a6e3f9aeb8e411
+PKG_SOURCE_VERSION:=cadbccc7654a40f16f96f2c48e584b998c03620e
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0

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

@@ -70,7 +70,6 @@ validate_ap_section() {
 			'encryption:or("sae", "sae+aes", "psk2",
 				"psk2+aes", "sae-mixed", "sae-mixed+aes",
 				"none", "psk-mixed", "psk-mixed+aes",
-				"wpa", "wpa+aes", "wpa2", "wpa2+aes",
 				"psk", "psk+aes")' \
 			'key:string' \
 			'vid:range(1,65535):1' \

mcastmngr/files/common/etc/hotplug.d/iface/mcast.hotplug

@@ -20,7 +20,12 @@ compare_mcast_proxy_upstream() {
 
 	for dev in $upstream; do
 		if [ "$l3device" == "$dev" ]; then
-			ubus call uci commit '{"config":"mcast"}'
+			running=$(ubus call service list '{"name": "mcast"}' | jsonfilter -e '@.mcast.instances')
+			if [ -z "${running}" ];then
+				/etc/init.d/mcast start
+			else
+				ubus call uci commit '{"config":"mcast"}'
+			fi
 			exit
 		fi
 	done

mcastmngr/files/linux/lib/mcast/linux.sh

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 . /lib/mcast/common.sh
+. /lib/functions/network.sh
 
 include /lib/network
 
@@ -95,6 +96,7 @@ config_mcproxy_instance() {
 	local exceptions=
 	local upstreams=
 	local downstreams=
+	local intf_has_ip=
 
 	CONFFILE=/var/etc/mcproxy_"$protocol".conf
 	rm -f $CONFFILE
@@ -144,6 +146,7 @@ config_mcproxy_instance() {
 	# here instead of from inside network config
 	config_sysfs_mcast_snooping
 
+	[ -n "$max_groups" ] && echo -e "max_groups $max_groups;" >> $CONFFILE
 	[ -n "$robustness" ] && echo -e "rv $robustness;" >> $CONFFILE
 	[ -n "$query_interval" ] && echo -e "qi $query_interval;" >> $CONFFILE
 	[ -n "$q_resp_interval" ] && echo -e "qri $q_resp_interval;" >> $CONFFILE
@@ -156,7 +159,40 @@ config_mcproxy_instance() {
 	[ -n "$upstreams" ] && [ -n "$downstreams" ] &&
 		config_mcproxy_interfaces "$upstreams" "$downstreams" "$exceptions"
 
-	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
+	# In case on proxy, upstreams is a list. Iterating and running the mcproxy
+	# for each valid upstream interface
+	for upstream_device in $upstreams;
+	do
+		# Read the upstream interface for the upstream device
+		# upstream device can have multiple logical interfaces like wan and wan6
+		# but same l3 device
+		local upstream_ifaces=$(get_network_of $upstream_device)
+
+		for iface in $upstream_ifaces;
+		do
+			if [ "$protocol" == "igmp" ]; then
+				network_get_ipaddr upstream_ip $iface
+				if [ ! -z "${upstream_ip}" ]; then
+					intf_has_ip=1
+					break
+				fi
+			fi
+
+			if [ "$protocol" == "mld" ]; then
+				network_get_ipaddr6 upstream_ip $iface
+				if [ ! -z "${upstream_ip}" ]; then
+					intf_has_ip=1
+					break
+				fi
+			fi
+		done
+
+		if [ -z "${intf_has_ip}" ]; then
+			continue
+		fi
+
+		PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
+	done
 }
 
 config_mcproxy() {
@@ -194,7 +230,16 @@ config_sysfs_mcast_fastleave() {
 configure_mcast() {
 	config_global_params "set_max_groups_and_sources"
 
+	# mcproxy reserves two multicast subscriptions for igmp router service groups
+	local mg=$(cat /proc/sys/net/ipv4/igmp_max_memberships)
+	mg=$((mg+2))
+	echo $mg > /proc/sys/net/ipv4/igmp_max_memberships
+
 	read_mcast_snooping_params
 	read_mcast_proxy_params
 	config_mcproxy
+
+	if [ -z "${PROG_PARAMS}" ]; then
+		exit 0
+	fi
 }

obuspa/Config.in

@@ -23,7 +23,7 @@ config OBUSPA_MTP_ENABLE_COAP
 	default y
 
 config OBUSPA_CONTROLLER_MTP_VERIFY
-	bool "Enable verification of MQTT response topic before processing the message"
+	bool "Enable verification of controller MTP before processing the message"
 	default n
 endmenu
 endif

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.2.13
+PKG_VERSION:=7.0.2.16
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=85e8ea54f65ea7ce9d99d008d97157614bfc18eb
+PKG_SOURCE_VERSION:=312a739dc9106e8ff490288ba22270f4ce7e1fed
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

obuspa/files/etc/init.d/obuspa

@@ -55,38 +55,28 @@ db_set_sql()
 	value="$*"
 
 	if [ -n "${param}" ] && [ -n "${value}" ]; then
-		${PROG} -f ${SQL_DB_FILE} -c dbset "${param}" "${value}" >/dev/null 2>&1
-	fi
-}
-
-db_del_sql()
-{
-	local param
-
-	param="${1}"
-
-	if [ -n "${param}" ]; then
-		${PROG} -f ${SQL_DB_FILE} -c dbdel "${param}" >/dev/null 2>&1
+		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()
 {
-	# if sql db present, update sql db
-	# else update reset file
-	if [ -f "${SQL_DB_FILE}" ]; then
+	# if sql db dump file present, update it
+	if [ -f "${DB_DUMP}" ]; then
 		db_set_sql "$@"
 	else
 		db_set_reset_file "$@"
 	fi
 }
 
-update_db_dump()
+dump_db()
 {
-	if [ -f "${DB_DUMP}" ]; then
-		rm ${DB_DUMP}
-		${PROG} -f ${SQL_DB_FILE} -c show database |sort > ${DB_DUMP}
-	fi
+	${PROG} -f ${SQL_DB_FILE} -c show database |awk 'NR>1 {print $1 " \"" $3 "\""}' | sort  > ${DB_DUMP}
 }
 
 # if db present then check if it matches with existing instances
@@ -102,7 +92,7 @@ get_base_path()
 	count=0
 
 	if [ -f "${DB_DUMP}" ]; then
-		path=$(grep "${refpath}\d.Alias => ${value}" ${DB_DUMP})
+		path=$(grep "${refpath}\d.Alias \"${value}\"" ${DB_DUMP})
 		path=${path%.*}
 		if [ -z "${path}" ]; then
 			path=$(grep -o "${refpath}\d" ${DB_DUMP} |sort -r|head -n 1)
@@ -235,7 +225,9 @@ validate_controller_section()
 		'Port:port' \
 		'Path:string' \
 		'EnableEncryption:bool' \
-		'SessionMode:string'
+		'PeriodicNotifInterval:uinteger' \
+		'SessionMode:string:Allow'
+
 }
 
 validate_subscription_section()
@@ -260,6 +252,7 @@ validate_mtp_section()
 		'mqtt:string' \
 		'stomp:string' \
 		'Reference:string' \
+		'PublishQoS:uinteger' \
 		'EnableEncryption:bool'
 }
 
@@ -311,7 +304,6 @@ configure_localagent()
 	}
 
 	db_set Device.LocalAgent.EndpointID "${EndpointID}"
-	update_db_dump
 }
 
 update_reset_reason()
@@ -328,7 +320,7 @@ configure_controller()
 	local EndpointID Enable 
 	local Protocol Destination
 	local Topic mqtt stomp assigned_role_name AssignedRole ParameterName
-	local Host Port Path EnableEncryption Reference SessionMode
+	local Host Port Path EnableEncryption Reference SessionMode PeriodicNotifInterval
 	local dm_ref sec
 
 	sec="${1}"
@@ -366,6 +358,10 @@ configure_controller()
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.EndpointID" "${EndpointID}"
 
+	if [ -n "${PeriodicNotifInterval}" ]; then
+		db_set "${BASEPATH}.PeriodicNotifInterval" "${PeriodicNotifInterval}"
+	fi
+
 	if [ -n "${SessionMode}" ]; then
 		db_set "${BASEPATH}.E2ESession.SessionMode" "${SessionMode}"
 	fi
@@ -410,9 +406,6 @@ configure_controller()
 		db_set "${BASEPATH}.BootParameter.${_pnum}.ParameterName" "${param}"
 		_pnum=$(( _pnum + 1 ))
 	done
-
-	db_set
-	update_db_dump
 }
 
 configure_subscription()
@@ -505,7 +498,6 @@ configure_challenges()
 	sec="${1}"
 	validate_challenge_section "${1}" || {
 		log "Validation of challenge section failed"
-		exit 1;
 	}
 
 	sec="${sec/challenge_/cpe-}"
@@ -538,7 +530,7 @@ configure_challenges()
 
 configure_mtp() {
 	local Enable Protocol ResponseTopicConfigured
-	local Path Port EnableEncryption
+	local Path Port EnableEncryption PublishQoS
 	local stomp mqtt dm_ref sec
 
 	sec="${1}"
@@ -577,6 +569,9 @@ configure_mtp() {
 	if [ "${Protocol}" = "MQTT" ]; then
 		db_set "${BASEPATH}.MQTT.Reference" "${dm_ref}"
 		db_set "${BASEPATH}.MQTT.ResponseTopicConfigured" "${ResponseTopicConfigured}"
+		if [ -n "${PublishQoS}" ]; then
+			db_set "${BASEPATH}.MQTT.PublishQoS" "${PublishQoS}"
+		fi
 	elif [ "${Protocol}" = "STOMP" ]; then
 		db_set "${BASEPATH}.STOMP.Reference" "${dm_ref}"
 		db_set "${BASEPATH}.STOMP.Destination" "${Destination}"
@@ -588,8 +583,6 @@ configure_mtp() {
 		db_set "${BASEPATH}.WebSocket.Port" "${Port}"
 		db_set "${BASEPATH}.WebSocket.EnableEncryption" "${EnableEncryption}"
 	fi
-	db_set
-	update_db_dump
 }
 
 configure_stomp_connection() {
@@ -620,8 +613,6 @@ configure_stomp_connection() {
 	db_set "${BASEPATH}.EnableEncryption" "${EnableEncryption}"
 	db_set "${BASEPATH}.EnableHeartbeats" "${EnableHeartbeats}"
 	db_set "${BASEPATH}.VirtualHost" "${VirtualHost}"
-	db_set
-	update_db_dump
 }
 
 configure_mqtt_client() {
@@ -651,9 +642,6 @@ configure_mqtt_client() {
 	db_set "${BASEPATH}.ProtocolVersion" "${ProtocolVersion}"
 	db_set "${BASEPATH}.TransportProtocol" "${TransportProtocol}"
 	db_set "${BASEPATH}.ClientID" "${ClientID}"
-
-	db_set
-	update_db_dump
 }
 
 
@@ -707,6 +695,9 @@ configure_obuspa() {
 	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
 
@@ -751,9 +742,9 @@ get_param_value_from_dump()
 		return 0
 	fi
 
-	value="$(grep "^${param} " ${DB_DUMP}|awk '{print $3}')"
+	value="$(grep "^${param} " ${DB_DUMP}|awk '{print $2}')"
 
-	echo "$value"
+	echo "${value//\"/}"
 }
 
 update_uci_sec()
@@ -777,7 +768,7 @@ sync_db_controller()
 {
 	local cntrs copts sec pvalue protocol
 
-	copts="Enable EndpointID AssignedRole"
+	copts="Enable EndpointID AssignedRole PeriodicNotifInterval"
 	popts="Destination Topic Reference Host Port Path EnableEncryption"
 
 	cntrs="$(get_instances_from_db_dump Device.LocalAgent.Controller.)"
@@ -810,7 +801,7 @@ sync_db_localagent_mtp()
 	local mtps opts popts sec pvalue protocol
 
 	opts="Enable"
-	popts="ResponseTopicConfigured Destination Port Path Reference EnableEncryption"
+	popts="ResponseTopicConfigured Destination Port Path Reference EnableEncryption PublishQoS"
 	ropts="mqtt stomp"
 
 	mtps="$(get_instances_from_db_dump Device.LocalAgent.MTP.)"
@@ -926,10 +917,8 @@ delete_sql_db_entry_with_pattern()
 		return 0;
 	fi
 
-	params="$(grep "${pattern}" ${DB_DUMP}|awk '{print $1}')"
-	for p in ${params}; do
-		db_del_sql "${p}"
-	done
+	#log "Deleting with pattern [${pattern}] from ${DB_DUMP}"
+	sed -i "/${pattern}/d" ${DB_DUMP}
 }
 
 check_n_delete_db()
@@ -945,7 +934,7 @@ check_n_delete_db()
 	r="${3}"
 	sec="${sec/${t}_/cpe-}"
 
-	path=$(grep "${r}\d.Alias => ${sec}" ${DB_DUMP})
+	path=$(grep "${r}\d.Alias \"${sec}\"" ${DB_DUMP})
 	path=${path%.*}
 
 	delete_sql_db_entry_with_pattern "${path}"
@@ -973,28 +962,42 @@ db_init()
 
 	reason="${1}"
 	mkdir -p /tmp/obuspa/
+
 	# Load configuration
 	config_load $CONFIGURATION
 	config_get SQL_DB_FILE global db_file "/tmp/obuspa/usp.db"
 
+	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
-		${PROG} -f ${SQL_DB_FILE} -c show database |sort > ${DB_DUMP}
+		dump_db
 	fi
 
-	# Only sync uci with db in case of non service triggers
+	# In case of Reboot or service restart update the uci
+        # from usp.db file
 	if [ -f "${DB_DUMP}" ] && [ "${reason}" != "update" ]; then
-		sync_uci_with_db
+		# 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
+	# 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}" ] && rm -f ${RESET_FILE}
+	[ -f "${RESET_FILE}" ] && mv ${RESET_FILE} ${RESET_FILE}.old
 
+	#log "Create reset file ...."
 	config_load $CONFIGURATION
 	global_init
 	config_foreach configure_localagent localagent
@@ -1015,8 +1018,9 @@ db_init()
 	uci_commit ${CONFIGURATION}
 
 	cp /etc/config/obuspa /tmp/obuspa/
-
-	[ -f "${DB_DUMP}" ] && rm -f ${DB_DUMP}
+	if [ -f "${DB_DUMP}" ]; then
+		mv ${DB_DUMP} ${RESET_FILE}
+	fi
 
 	return 0;
 }

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

@@ -0,0 +1,117 @@
+diff --git a/src/core/device.h b/src/core/device.h
+index 5ca0782..ee6d88c 100644
+--- a/src/core/device.h
++++ b/src/core/device.h
+@@ -157,6 +157,9 @@ int DEVICE_CONTROLLER_Start(void);
+ void DEVICE_CONTROLLER_Stop(void);
+ int DEVICE_CONTROLLER_FindInstanceByEndpointId(char *endpoint_id);
+ int DEVICE_CONTROLLER_QueueBinaryMessage(mtp_send_item_t *msi, char *endpoint_id, char *usp_msg_id, mtp_reply_to_t *mtp_reply_to, time_t expiry_time);
++#ifdef OBUSPA_CONTROLLER_MTP_VERIFY
++bool DEVICE_CONTROLLER_IsMTPAllowed(char *endpoint_id, mtp_reply_to_t *mrt);
++#endif
+ bool DEVICE_CONTROLLER_IsMTPConfigured(char *endpoint_id, mtp_protocol_t protocol);
+ char *DEVICE_CONTROLLER_FindEndpointIdByInstance(int instance);
+ char *DEVICE_CONTROLLER_FindEndpointByMTP(mtp_reply_to_t *mrt);
+diff --git a/src/core/device_controller.c b/src/core/device_controller.c
+index ae609f5..a6335f5 100644
+--- a/src/core/device_controller.c
++++ b/src/core/device_controller.c
+@@ -900,6 +900,78 @@ int DEVICE_CONTROLLER_QueueBinaryMessage(mtp_send_item_t *msi, char *endpoint_id
+     return USP_ERR_OK;
+ }
+ 
++#ifdef OBUSPA_CONTROLLER_MTP_VERIFY
++/*********************************************************************//**
++**
++** DEVICE_CONTROLLER_IsMTPAllowed
++**
++** Determines whether an MTP is allowed to be used by the specified controller
++** This function is used by ValidateUspRecord() to determine whether to process a received USP message
++**
++** \param   endpoint_id - Endpoint ID of controller that sent a USP message
++** \param   mrt - pointer to structure specifying on which MTP the message was received
++**
++** \return  true if the MTP is allowed, false otherwise
++**
++**************************************************************************/
++bool DEVICE_CONTROLLER_IsMTPAllowed(char *endpoint_id, mtp_reply_to_t *mrt)
++{
++    controller_t *cont = FindEnabledControllerByEndpointId(endpoint_id);
++    controller_mtp_t *mtp;
++
++    // Disallow if no controller instance is found
++    if (cont == NULL)
++    {
++        return false;
++    }
++
++    mtp = FindFirstEnabledMtp(cont, mrt->protocol);
++
++#ifdef ENABLE_WEBSOCKETS
++    // Allow websocket server if no other MTP is configured
++    if ((mrt->protocol == kMtpProtocol_WebSockets) && (mrt->wsserv_conn_id != INVALID))
++    {
++        return mtp == NULL;
++    }
++#endif
++
++    // Disallow if there is no MTP configured with matching protocol
++    if ((mtp == NULL) || (mtp->protocol != mrt->protocol))
++    {
++        return false;
++    }
++
++    // Check that the configured MTP matches the MTP on which the message was received
++    switch(mtp->protocol)
++    {
++#ifndef DISABLE_STOMP
++        case kMtpProtocol_STOMP:
++            return mtp->stomp_connection_instance == mrt->stomp_instance;
++#endif
++
++#ifdef ENABLE_COAP
++        case kMtpProtocol_CoAP:
++            return true;  // More detailed checks are not implemented for CoAP
++#endif
++
++#ifdef ENABLE_MQTT
++        case kMtpProtocol_MQTT:
++            return mtp->mqtt_connection_instance == mrt->mqtt_instance;
++#endif
++
++#ifdef ENABLE_WEBSOCKETS
++        case kMtpProtocol_WebSockets:
++            return (mrt->wsclient_cont_instance == cont->instance) && (mrt->wsclient_mtp_instance == mtp->instance);
++#endif
++        default:
++            TERMINATE_BAD_CASE(mtp->protocol);
++            break;
++    }
++
++    return false;
++}
++#endif
++
+ /*********************************************************************//**
+ **
+ ** DEVICE_CONTROLLER_IsMTPConfigured
+diff --git a/src/core/msg_handler.c b/src/core/msg_handler.c
+index 8313342..a953562 100644
+--- a/src/core/msg_handler.c
++++ b/src/core/msg_handler.c
+@@ -759,6 +759,15 @@ int ValidateUspRecord(UspRecord__Record *rec, mtp_reply_to_t *mrt)
+         return USP_ERR_RECORD_FIELD_INVALID;
+     }
+ 
++#ifdef OBUSPA_CONTROLLER_MTP_VERIFY
++    // Exit if the controller is not allowed to use the MTP on which the message was received
++    if (DEVICE_CONTROLLER_IsMTPAllowed(rec->from_id, mrt) == false)
++    {
++        USP_ERR_SetMessage("%s: Ignoring message from endpoint_id=%s (unauthorized MTP)", __FUNCTION__, rec->from_id);
++        return USP_ERR_PERMISSION_DENIED;
++    }
++#endif
++
+     // Exit if the controller is unknown
+     cur_msg_controller_instance = DEVICE_CONTROLLER_FindInstanceByEndpointId(rec->from_id);
+     if (cur_msg_controller_instance == INVALID)

obuspc/Makefile

@@ -0,0 +1,72 @@
+#
+# Copyright (C) 2023 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=obuspc
+PKG_VERSION:=1.0.1.1
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa-test-controller.git
+PKG_SOURCE_VERSION:=f1f721bc1a4feaf63c7f7837eb7b0c86111e2f71
+PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_FIXUP:=autoreconf
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/obuspc
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=USP Controller
+  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
+endef
+
+define Package/obuspc/description
+ OB-USP-Controller is a local usp controller based on User Services Platform (USP).
+endef
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE \
+	-Wall \
+	-Werror
+
+CONFIGURE_ARGS += \
+        --localstatedir="/tmp/" \
+	--enable-stomp \
+	--enable-coap \
+	--enable-mqtt \
+	--enable-websockets
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ~/git/obuspa-test-controller/* $(PKG_BUILD_DIR)/
+        $(Build/Patch)
+endef
+endif
+
+define Package/obuspc/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspc $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/etc/init.d/obuspc $(1)/etc/init.d/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/99-fix-agent-endpoint $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/etc/config/obuspc $(1)/etc/config/
+endef
+
+$(eval $(call BuildPackage,obuspc))

obuspc/files/etc/config/obuspc

@@ -0,0 +1,19 @@
+config obuspc 'global'
+	option enabled '1'
+	option debug '1'
+	option log_level '1'
+	option prototrace '1'
+
+config mqtt 'mqtt'
+	option BrokerAddress '127.0.0.1'
+	option BrokerPort '1883'
+	option TransportProtocol 'TCP/IP'
+
+config controller 'controller'
+	option EndpointID 'proto::interop-usp-controller'
+	option Protocol 'MQTT'
+	option ResponseTopicConfigured '/usp/controller'
+	option mqtt 'mqtt'
+
+config agent 'agent'
+	option Topic '/usp/endpoint'

obuspc/files/etc/init.d/obuspc

@@ -0,0 +1,349 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=01
+USE_PROCD=1
+
+PROG=/usr/sbin/obuspc
+CONFIGURATION=obuspc
+
+RESET_FILE="/tmp/usp/obuspc_param_reset.txt"
+SQL_DB_FILE="/tmp/usp/uspc.db"
+
+BASEPATH=""
+INSTANCE_COUNT=0
+
+. /usr/share/libubox/jshn.sh
+
+global_init()
+{
+	BASEPATH=""
+	INSTANCE_COUNT=0
+}
+
+log()
+{
+	echo "$*"|logger -t obuspc.init -p debug
+}
+
+db_set_reset_file()
+{
+	local param value
+
+	param="${1}"
+	shift
+	value="$*"
+
+	if [ -n "${param}" ] && [ -n "${value}" ]; then
+		echo "${param} \"${value}\"">>${RESET_FILE}
+	else
+		echo >>${RESET_FILE}
+	fi
+}
+
+db_set()
+{
+	db_set_reset_file "$@"
+}
+
+# if db present then check if it matches with existing instances
+# fallback to max instance present + 1
+# In case of no db get the count
+get_base_path()
+{
+	local refpath value path count
+
+	refpath="${1}"
+	value="${2}"
+	path=""
+	count=0
+
+	if [ -z "${path}" ]; then
+		INSTANCE_COUNT=$(( INSTANCE_COUNT + 1 ))
+		path="${refpath}${INSTANCE_COUNT}"
+	fi
+	BASEPATH="${path}"
+}
+
+get_refrence_path()
+{
+	local dmref value path
+
+	dmref="${1}"
+	value="${2}"
+	path=""
+
+	path=$(grep "${dmref}\d.Alias " ${RESET_FILE}|grep -w "${value}")
+	path=${path%.*}
+	echo "${path}"
+}
+
+validate_global_section()
+{
+	uci_validate_section ${CONFIGURATION} obuspc "${1}" \
+		'enabled:bool:1' \
+		'debug:bool:0' \
+		'prototrace:bool:0' \
+		'log_level:uinteger' \
+		'log_dest:string' \
+		'db_file:string'
+}
+
+validate_mqtt_client_section()
+{
+	uci_validate_section ${CONFIGURATION} mqtt "${1}" \
+		'Enable:bool:1' \
+		'BrokerAddress:string' \
+		'BrokerPort:port:1883' \
+		'Username:string' \
+		'Password:string' \
+		'ProtocolVersion:or("3.1", "3.1.1","5.0"):5.0' \
+		'TransportProtocol:or("TCP/IP","TLS"):TCP/IP' \
+		'ClientID:string'
+}
+
+validate_controller_section()
+{
+	uci_validate_section ${CONFIGURATION} mtp "${1}" \
+		'EndpointID:string' \
+		'Protocol:or("MQTT", "WebSocket")' \
+		'ResponseTopicConfigured:string' \
+		'Destination:string' \
+		'Port:port' \
+		'Path:string' \
+		'mqtt:string' \
+		'stomp:string' \
+		'Reference:string' \
+		'EnableEncryption:bool:0'
+}
+
+configure_controller() {
+	local EndpointID Protocol ResponseTopicConfigured
+	local Destination Path Port EnableEncryption Reference
+	local stomp mqtt dm_ref sec
+
+	sec="${1}"
+	validate_controller_section "${1}" || {
+		log "Validation of mtp section failed"
+		return 1;
+	}
+
+	if [ -z "${EndpointID}" ]; then
+		log "EndpointID not defined for controller"
+		return 1;
+	fi
+
+	db_set Device.LocalAgent.EndpointID "${EndpointID}"
+
+	sec="${sec/mtp_/cpe-}"
+	get_base_path "Device.LocalAgent.MTP." "${sec}"
+	if [ -z "${BASEPATH}" ]; then
+		log "Failed to get path [$BASEPATH]"
+		return 1;
+	fi
+
+	if [ -z "${Protocol}" ]; then
+		log "Protocol not defined for the mtp[${1}] section"
+		return 1;
+	fi
+
+	dm_ref=""
+	if [ -z "${Reference}" ]; then
+		if [ "${Protocol}" = "STOMP" ]; then
+			stomp="${stomp/stomp_/cpe-}"
+			dm_ref=$(get_refrence_path "Device.STOMP.Connection." "${stomp}")
+		elif [ "${Protocol}" = "MQTT" ]; then
+			mqtt="${mqtt/mqtt_/cpe-}"
+			dm_ref=$(get_refrence_path "Device.MQTT.Client." "${mqtt}")
+		fi
+	else
+		dm_ref="${Reference}"
+	fi
+
+	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Enable" "1"
+	db_set "${BASEPATH}.Protocol" "${Protocol}"
+	if [ "${Protocol}" = "MQTT" ]; then
+		db_set "${BASEPATH}.MQTT.Reference" "${dm_ref}"
+		db_set "${BASEPATH}.MQTT.ResponseTopicConfigured" "${ResponseTopicConfigured}"
+	elif [ "${Protocol}" = "STOMP" ]; then
+		db_set "${BASEPATH}.STOMP.Reference" "${dm_ref}"
+		db_set "${BASEPATH}.STOMP.Destination" "${Destination}"
+	elif [ "${Protocol}" = "CoAP" ]; then
+		db_set "${BASEPATH}.CoAP.Path" "${Path}"
+		db_set "${BASEPATH}.CoAP.Port" "${Port}"
+	elif [ "${Protocol}" = "WebSocket" ]; then
+		db_set "${BASEPATH}.WebSocket.Path" "${Path}"
+		db_set "${BASEPATH}.WebSocket.Port" "${Port}"
+		db_set "${BASEPATH}.WebSocket.EnableEncryption" "${EnableEncryption}"
+	fi
+	db_set
+}
+
+validate_agent_section()
+{
+	uci_validate_section ${CONFIGURATION} agent "${1}" \
+		'name:string' \
+		'EndpointID:string' \
+		'Topic:string'
+}
+
+configure_agent() {
+	local EndpointID Topic name
+	local stomp mqtt dm_ref sec
+
+	sec="${1}"
+	validate_agent_section "${1}" || {
+		log "Validation of agent section failed"
+		return 1;
+	}
+
+	if [ -z "${EndpointID}" ]; then
+		log "EndpointID not defined for agent"
+		return 1;
+	fi
+
+	if [ -z "${Topic}" ]; then
+		log "Topic not defined for agent"
+		return 1;
+	fi
+
+
+	sec="${sec/mtp_/cpe-}"
+	get_base_path "Device.LocalAgent.Controller." "${sec}"
+	if [ -z "${BASEPATH}" ]; then
+		log "Failed to get path [$BASEPATH]"
+		return 1;
+	fi
+
+	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Enable" "1"
+	db_set "${BASEPATH}.EndpointID" "${EndpointID}"
+	db_set "${BASEPATH}.MTP.1.Enable" "1"
+	db_set "${BASEPATH}.MTP.1.Protocol" "MQTT"
+	db_set "${BASEPATH}.MTP.1.MQTT.Reference" "Device.MQTT.Client.1"
+	db_set "${BASEPATH}.MTP.1.MQTT.Topic" "${Topic}"
+	db_set
+}
+
+configure_mqtt_client() {
+	local BrokerAddress BrokerPort Enable Username Password ProtocolVersion
+	local TransportProtocol ClientID
+	local sec
+
+	sec="${1}"
+	validate_mqtt_client_section "${1}" || {
+		log "Validation of mqtt section failed"
+		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
+
+	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Enable" "${Enable}"
+	db_set "${BASEPATH}.BrokerAddress" "${BrokerAddress}"
+	db_set "${BASEPATH}.BrokerPort" "${BrokerPort}"
+	db_set "${BASEPATH}.Username" "${Username}"
+	db_set "${BASEPATH}.Password" "${Password}"
+	db_set "${BASEPATH}.ProtocolVersion" "${ProtocolVersion}"
+	db_set "${BASEPATH}.TransportProtocol" "${TransportProtocol}"
+	db_set "${BASEPATH}.ClientID" "${ClientID}"
+
+	db_set
+}
+
+configure_obuspc() {
+	local enabled trust_cert ifname interface debug prototrace log_level db_file log_dest
+	local client_cert
+
+	validate_global_section "global"
+
+	if [ "${debug}" -ne "0" ]; then
+		# Forward stdout of the command to logd
+		procd_set_param stdout 1
+		# Same for stderr
+		procd_set_param stderr 1
+	fi
+
+	procd_append_param command -u
+	if [ "${prototrace}" -eq 1 ]; then
+		procd_append_param command -p
+	fi
+
+	if [ -n "${log_level}" ]; then
+		procd_append_param command -v "${log_level}"
+	fi
+
+	if [ -n "${log_dest}" ]; then
+		procd_append_param command -l "${log_dest}"
+	fi
+
+	if [ -f "${RESET_FILE}" ]; then
+		procd_append_param command -r ${RESET_FILE}
+	fi
+}
+
+# Create factory reset file
+db_init()
+{
+	# Load configuration
+	config_load $CONFIGURATION
+	config_get SQL_DB_FILE global db_file "/tmp/usp/uspc.db"
+
+	# Remove DB and generate from uci
+	[ -f "${SQL_DB_FILE}" ] && rm -f "${SQL_DB_FILE}"
+
+	# Remove reset file if present
+	[ -f "${RESET_FILE}" ] && rm -f ${RESET_FILE}
+
+	config_load $CONFIGURATION
+	global_init
+	config_foreach configure_mqtt_client mqtt
+	global_init
+	config_foreach configure_controller controller
+	global_init
+	config_foreach configure_agent agent
+
+	return 0;
+}
+
+register_service()
+{
+	procd_open_instance ${CONFIGURATION}
+	procd_set_param command ${PROG}
+
+	configure_obuspc
+	procd_set_param respawn \
+			"${respawn_threshold:-5}" \
+			"${respawn_timeout:-10}" "${respawn_retry:-3}"
+
+	procd_close_instance
+}
+
+start_service() {
+	local enabled
+
+	config_load ${CONFIGURATION}
+	config_get_bool enabled global enabled 0
+
+	if [ "${enabled}" -eq 0 ]; then
+		return 0;
+	fi
+
+	mkdir -p /tmp/usp/
+	db_init
+	register_service
+}
+
+stop_service() {
+	${PROG} -c stop >/dev/null 2>&1
+}
+
+service_triggers() {
+	procd_add_reload_trigger "obuspc"
+}

obuspc/files/etc/uci-defaults/99-fix-agent-endpoint

@@ -0,0 +1,31 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+get_oui_from_db()
+{
+	db -q get device.deviceinfo.ManufacturerOUI
+}
+
+get_serial_from_db()
+{
+	db -q get device.deviceinfo.SerialNumber
+}
+
+fix_agent_endpoint()
+{
+	local AgentEndpointID serial oui user pass
+
+	# 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
+
+	uci -q set obuspc.agent.EndpointID="${AgentEndpointID}"
+}
+
+fix_agent_endpoint

periodicstats/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.4.2
+PKG_VERSION:=1.4.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -42,9 +42,9 @@ define Package/periodicstats/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/bbfdm/services
-	$(INSTALL_DIR) $(1)/etc/bbfdm/services/periodicstats
-	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/etc/bbfdm/services/periodicstats
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/periodicstatsd $(1)/usr/sbin
 endef
 

periodicstats/files/etc/bbfdm/services/periodicstats/input.json

@@ -1,30 +0,0 @@
-{
-	"daemon": {
-		"config": {
-			"refresh_time": 3600,
-			"enable_plugins": 0
-		},
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/bbfdm/services/periodicstats/libperiodicstats.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.periodicstats"
-		}
-	},
-	"client": {
-		"config": {
-			"proto": "both",
-			"instance_mode": 0,
-			"enable_plugins": 0
-		},
-		"input": {
-			"type": "UBUS",
-			"name": "bbfdm.periodicstats"
-		},
-		"output": {
-			"type": "CLI"
-		}
-	}
-}

periodicstats/files/etc/init.d/periodicstats

@@ -4,9 +4,7 @@ START=99
 STOP=01
 
 USE_PROCD=1
-PROG="/usr/sbin/periodicstatsd"
-BBFDMD_PROG="/usr/sbin/bbfdmd"
-PERIODICSTATS_JSON_INPUT="/etc/bbfdm/services/periodicstats/input.json"
+PROG=/usr/sbin/periodicstatsd
 
 start_service() {
 	local enable
@@ -14,18 +12,14 @@ start_service() {
 	config_load periodicstats
 	config_get_bool enable globals enable 1
 
-	procd_open_instance "bbfdm.periodicstats"
-	procd_set_param command "$BBFDMD_PROG"
-	procd_append_param command -I "${PERIODICSTATS_JSON_INPUT}"
-	procd_set_param respawn
-	procd_close_instance "bbfdm.periodicstats"
-
-	if [ "${enable}" -eq "1" ]; then
-		procd_open_instance "periodicstatsd"
-		procd_set_param command ${PROG}
-		procd_set_param respawn
-		procd_close_instance "periodicstatsd"
+	if [ "${enable}" -ne "1" ]; then
+		return 0;
 	fi
+
+	procd_open_instance periodicstatsd
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
 }
 
 service_triggers() {

ponmngr/files/airoha/lib/xpon/airoha.sh

@@ -17,14 +17,15 @@ init_xpon() {
 
 	procd_open_instance ponmgr_cfg
 	procd_set_param command /userfs/bin/ponmgr_cfg
+	procd_set_param respawn
 	procd_close_instance
 	procd_open_instance omci
 	procd_set_param command /userfs/bin/omci
+	procd_set_param respawn
 	procd_close_instance
 }
 
 deinit_xpon() {
-	killall -9 omci 2>/dev/null
-	killall -9 ponmgr_cfg 2>/dev/null
+	return
 }
 

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

@@ -23,6 +23,13 @@ get_burst_size_per_queue() {
 	echo "0"
 }
 
+# marking value be decimal for linux target as it uses set-mark whereas other
+# targets uses set-xmark, hence this function can't make it common
+ip_rule_get_converted_tos() {
+	con_tos=$(printf %x $1)
+	echo $con_tos
+}
+
 configure_qos() {
     # queue configuration is being done after shaper configuration,
     # If port shapingrate configuration on DISC device is called after queue configuration then

qosmngr/files/broadcom/lib/qos/qos.sh

@@ -180,6 +180,13 @@ iptables_set_traffic_class() {
 	IP_RULE="$IP_RULE -j MARK --set-xmark 0x$1/0x$1"
 }
 
+# marking value be decimal for linux target as it uses set-mark whereas other
+# targets uses set-xmark, hence this function can't make it common
+ip_rule_get_converted_tos() {
+	con_tos=$(printf %x $1)
+	echo $con_tos
+}
+
 ebt_match_ipv6_dscp() {
 	#when ethertype is not configured by user then both proto rules of ipv4
 	#and ipv6 to be installed so update BR6_RULE string as well otherwise

qosmngr/files/common/lib/qos/ip_rule.sh

@@ -1,52 +1,65 @@
 #!/bin/sh
 # add ip rule from qos uci
 
-IP_RULE=""
+FWD_POLICY=""
 
 init_ip_rule() {
-        IP_RULE=""
+        FWD_POLICY=""
 }
 
 ip_rule_match_inif() {
-        IP_RULE="$IP_RULE iif $1"
+        FWD_POLICY="$FWD_POLICY iif $1"
 }
 
 ip_rule_match_proto() {
-        IP_RULE="$IP_RULE ipproto $1"
+        FWD_POLICY="$FWD_POLICY ipproto $1"
 }
 
 ip_rule_match_dest_port() {
-        IP_RULE="$IP_RULE dport $1"
+        FWD_POLICY="$FWD_POLICY dport $1"
 }
 
 ip_rule_match_src_port() {
-        IP_RULE="$IP_RULE sport $1"
+        FWD_POLICY="$FWD_POLICY sport $1"
 }
 
 ip_rule_match_dest_ip() {
-        IP_RULE="$IP_RULE to $1"
+        FWD_POLICY="$FWD_POLICY to $1"
 }
 
 ip_rule_match_src_ip() {
-        IP_RULE="$IP_RULE from $1"
+        FWD_POLICY="$FWD_POLICY from $1"
 }
 
 ip_rule_match_dest_port_range() {
-        IP_RULE="$IP_RULE dport $1-$2"
+        FWD_POLICY="$FWD_POLICY dport $1-$2"
 }
 
 ip_rule_match_src_port_range() {
-        IP_RULE="$IP_RULE sport $1-$2"
-}
-
-ip_rule_match_tos() {
-        dscp_filter=$1
-        tos_val=$((dscp_filter<<2))
-        IP_RULE="$IP_RULE tos 0x$tos_val"
+        FWD_POLICY="$FWD_POLICY sport $1-$2"
 }
 
 ip_rule_match_fwmark() {
-        IP_RULE="$IP_RULE fwmark $1"
+        FWD_POLICY="$FWD_POLICY fwmark $1"
+}
+
+ip_rule_handle_match_tos() {
+	local dscp="$2"
+	local IPTOS_LOWDELAY="0x10"
+	local tos_val="$((dscp<<2))"
+
+	# ip rule not accept beyond 0x10, to handle further value mark the tos
+	# value through iptable and route with that marked value by fwmark
+	# in ip rule
+	if [ "$((tos_val))" -gt "$((IPTOS_LOWDELAY))" ]; then
+		handle_iptables_rules $1 $(ip_rule_get_converted_tos $tos_val)
+		ip_rule_match_fwmark  $(printf 0x%x $tos_val)
+	else
+		FWD_POLICY="$FWD_POLICY tos $(printf %x $tos_val)"
+		if [ -n "$3" ]; then
+			ip_rule_match_fwmark  $3
+		fi
+	fi
 }
 
 handle_ip_rule() {
@@ -60,7 +73,7 @@ handle_ip_rule() {
 	config_get src_ip "$cid" "src_ip"
 	config_get ifname "$cid" "ifname"
 	config_get proto "$cid" "proto"
-	config_get tos "$cid" "dscp_filter"
+	config_get dscp "$cid" "dscp_filter"
 	config_get fwmark "$cid" "traffic_class"
 	config_get dest_port "$cid" "dest_port"
 	config_get dest_port_range "$cid" "dest_port_range"
@@ -92,14 +105,20 @@ handle_ip_rule() {
 		ip_rule_match_src_port_range $src_port $src_port_range
 	fi
 
-	[ -n "$tos" ] && ip_rule_match_tos $tos
-
-	[ -n "$fwmark" ] && ip_rule_match_fwmark  $fwmark
+	if [ -n "$dscp" ]; then
+		# If tos and fwmark configured then fwmark be igroned/skipped
+		# in the case of tos value greater than 0x10 and if tos value
+	        # less than 0x10 then both tos and fwmark then both configuration
+		#considered/applied for ip rule.
+		ip_rule_handle_match_tos $cid $dscp $fwmark
+	elif [ -n "$fwmark" ]; then
+		ip_rule_match_fwmark  $fwmark
+	fi
 
 	# forming full ip rule
-	if [ -n "$IP_RULE" ]; then
-		echo "ip rule add $IP_RULE table $fwding_policy" >> /tmp/qos/classify.iprule
-		echo "ip rule del $IP_RULE table $fwding_policy" >> /tmp/qos/classify.del_iprule
+	if [ -n "$FWD_POLICY" ]; then
+		echo "ip rule add $FWD_POLICY table $fwding_policy" >> /tmp/qos/classify.iprule
+		echo "ip rule del $FWD_POLICY table $fwding_policy" >> /tmp/qos/classify.del_iprule
 	fi
 }
 

qosmngr/files/common/lib/qos/iptables.sh

@@ -70,10 +70,18 @@ handle_iptables_rules() {
     local cid="$1"
     local ip_version=0
     local is_l3_rule=0
+    traffic_class=$2
 
     init_iptables_rule
+
+    # If traffic class non empty/zero then function call for handling fowrwarding
+    # policy in the case of tos greater than 0x10.
+    # In this case, traffic class should not be read from config and use value in arg
+    if [ -z "$traffic_class" ]; then
+	    config_get traffic_class "$cid" "traffic_class"
+    fi
+
     config_get proto "$cid" "proto"
-    config_get traffic_class "$cid" "traffic_class"
     config_get dscp_mark "$cid" "dscp_mark"
     config_get dscp_filter "$cid" "dscp_filter"
     config_get dest_port "$cid" "dest_port"

qosmngr/files/linux/lib/qos/qos.sh

@@ -155,6 +155,12 @@ iptables_set_traffic_class() {
 	IP_RULE="$IP_RULE -j MARK --set-mark $1"
 }
 
+# marking value be decimal for linux target as it uses set-mark whereas other
+# targets uses set-xmark, hence this function can't make it common
+ip_rule_get_converted_tos() {
+	echo $1
+}
+
 ebt_match_ipv6_dscp() {
 	#when ethertype is not configured by user then both proto rules of ipv4
 	#and ipv6 to be installed so update BR6_RULE string as well otherwise

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=2.2.0
+PKG_VERSION:=2.2.5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=1edef130673d186c9ffe030b9a1a3614974c1fad
+PKG_SOURCE_VERSION:=2964b4263ee25fe16a0a74e833e269889dc8375f
 PKG_MIRROR_HASH:=skip
 
 SULU_MOD:=core

sulu/sulu-builder/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=2.2.0
+PKG_VERSION:=2.2.5
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=8797cb3efffdfac3d27a6d665f271b13d07d8335
+PKG_SOURCE_VERSION:=046bb209b4650564cc07d288112f3eb367aabca2
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(PKG_VERSION)/sulu-builder-$(PKG_SOURCE_VERSION)

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

@@ -1,4 +1,5 @@
 config global 'global'
 	option role_based_access '1'
+	option SessionMode 'Require'
 	list user 'admin'
 	list user 'user'

sulu/sulu-builder/files/etc/sulu/nginx.locations

@@ -8,7 +8,7 @@ location /sitemap.xml {
 	return 200 "User-agent: *\nDisallow: /\n";
 }
 
-location /ws {
+location /wss {
 	proxy_pass_request_headers      on;
 	proxy_cache        off;
 	proxy_http_version 1.1;
@@ -29,13 +29,11 @@ location /ws {
 
 location / {
 	autoindex on;
-	expires -1;
 
 	if ($request_method = 'OPTIONS') {
 		add_header 'Access-Control-Allow-Origin' '*';
 		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
 		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,Content-Type,Range';
-		add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
 		add_header 'Content-Type' 'text/plain; charset=utf-8';
 		add_header 'Content-Length' 0;
 		return 204;
@@ -45,6 +43,7 @@ location / {
 		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
 		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,Content-Type,Range' always;
 		add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-		add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
 	}
+	expires -1;
+	add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
 }

sulu/sulu-builder/files/etc/sulu/sulu.sh

@@ -53,6 +53,11 @@ function _get_sulu_root()
 	echo "${root:-/sulu}"
 }
 
+function _get_sulu_session_mode()
+{
+	echo "$(uci -q get sulu.global.SessionMode)"
+}
+
 function _get_usp_upstream_port()
 {
 	local port
@@ -94,10 +99,11 @@ function update_nginx_template()
 
 function generate_sulu_conn_config()
 {
-	local rbac users SCONFIG
+	local rbac users SCONFIG session
 
 	rbac="${1}"
 	users="$(_get_sulu_users)"
+	session="$(_get_sulu_session_mode)"
 	SCONFIG="$(_get_sulu_root)/config/connectionConfig.json"
 
 	json_init;
@@ -110,8 +116,12 @@ function generate_sulu_conn_config()
 		json_add_object 'rbac';
 		json_add_string 'toId' "$(_get_endpoint_id)";
 		json_add_int 'port' "$(_get_sulu_tls_port)";
-		json_add_string 'path' "/ws";
-		json_add_boolean 'useSession' 1;
+		json_add_string 'path' "/wss";
+
+		if [ "${session}" = "Require" ]; then
+			json_add_boolean 'useSession' 1;
+		fi
+
 		json_add_string 'protocol' 'wss';
 			json_add_array 'auth';
 			json_close_array;
@@ -132,7 +142,7 @@ function generate_sulu_conn_config()
 		json_add_string 'fromId' 'proto::interop-usp-controller';
 		json_add_string 'toId' "$(_get_endpoint_id)";
 		json_add_int 'port' "$(_get_sulu_tls_port)";
-		json_add_string 'path' "/ws";
+		json_add_string 'path' "/wss";
 		json_add_string 'protocol' 'wss';
 		json_add_string 'publishEndpoint' "/usp/endpoint";
 		json_add_string 'subscribeEndpoint' "/usp/controller";
@@ -210,7 +220,7 @@ function _update_obuspa_config()
 
 function _remove_obuspa_config()
 {
-	local restart
+	local restart session
 
 	restart=0
 	if [ "$(uci_get obuspa localmqtt)" == "mqtt" ]; then
@@ -229,10 +239,11 @@ function _remove_obuspa_config()
 }
 
 function _update_obuspa_config_rbac() {
-	local agent users restart
+	local agent users restart session
 
 	agent="$(_get_agent_id)"
 	users="$(_get_sulu_users)"
+	session="$(_get_sulu_session_mode)"
 	restart=0
 
 	for f in ${users}; do
@@ -267,11 +278,12 @@ function _update_obuspa_config_rbac() {
 			uci_set obuspa ${sec} Topic "/usp/${agent}/${f}/controller"
 			uci_set obuspa ${sec} mqtt "mqtt_sulu_$f"
 			uci_set obuspa ${sec} assigned_role_name "$f"
-			uci_set obuspa ${sec} SessionMode "Require"
 			restart=1
 		fi
-		if ! uci_get obuspa ${sec} SessionMode >/dev/null 2>&1; then
-			uci_set obuspa ${sec} SessionMode "Require"
+
+		obMode="$(uci_get obuspa ${sec} SessionMode)"
+		if [ "${session}" != "${obMode}" ]; then
+			uci_set obuspa ${sec} SessionMode "${session}"
 			restart=1
 		fi
 	done

sulu/sulu-lcm/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-lcm
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.2.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
-PKG_SOURCE_VERSION:=29515d3a3031d528cb603a8931156bf617fee885
+PKG_SOURCE_VERSION:=46975426ffa53ffcc3b0d9e9160f6b3d4b6d82fd
 PKG_MIRROR_HASH:=skip
 
 SULU_PLUGIN_INSTALL:=1

sulu/sulu-multi-ap/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=2.1.5
+PKG_VERSION:=2.2.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=26ab5ba51ea54b805d848ccd698b5d099bc57322
+PKG_SOURCE_VERSION:=d77f19d8d964c9ecf8ab6d2cc3c8ddc369135d7e
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

sulu/sulu-parental-control/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-parental-control
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.2.3
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=26192753a5580746210c32583f6c09ea995e425f
+PKG_SOURCE_VERSION:=27f3859e30efbbed211c033f923f35974b3619fd
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

swmodd/Config.in

@@ -1,53 +1,83 @@
-menu "Configuration"
+config SWMODD_REGISTRY_PULL_SUPPORT
+	bool "Add support to pull images from container image registries (i.e: docker.io, quay.io)"
 	depends on PACKAGE_swmodd
+	default n
+	select PACKAGE_skopeo
+	select PACKAGE_umoci
 
-	config SWMODD_LXC_SUPPORT
-		bool "Handles LXC based containers"
-		default y
+config SWMODD_LXC_SUPPORT
+	bool "Handles LXC based containers"
+	depends on PACKAGE_swmodd
+	default y
+	select PACKAGE_lxc
+	select PACKAGE_lxc-attach
+	select PACKAGE_lxc-auto
+	select PACKAGE_lxc-cgroup
+	select PACKAGE_lxc-checkconfig
+	select PACKAGE_lxc-common
+	select PACKAGE_lxc-config
+	select PACKAGE_lxc-configs
+	select PACKAGE_lxc-console
+	select PACKAGE_lxc-create
+	select PACKAGE_lxc-destroy
+	select PACKAGE_lxc-execute
+	select PACKAGE_lxc-freeze
+	select PACKAGE_lxc-hooks
+	select PACKAGE_lxc-info
+	select PACKAGE_lxc-init
+	select PACKAGE_lxc-ls
+	select PACKAGE_lxc-device
+	select PACKAGE_lxc-start
+	select PACKAGE_lxc-stop
+	select PACKAGE_lxc-templates
+	select PACKAGE_lxc-top
+	select PACKAGE_lxc-unfreeze
+	select PACKAGE_lxc-unprivileged
+	select PACKAGE_lxc-unshare
+	select PACKAGE_lxc-user-nic
+	select PACKAGE_lxc-usernsexec
+	select PACKAGE_lxc-wait
 
-	config SWMODD_OCI_SUPPORT
-		bool "Handles OCI containers"
-		default y
-		depends on PACKAGE_swmodd
-		select PACKAGE_crun
+config SWMODD_OCI_SUPPORT
+	bool "Handles OCI containers"
+	depends on PACKAGE_swmodd
+	default y
+	select PACKAGE_crun
 
-	config SWMODD_REGISTRY_PULL_SUPPORT
-		bool "Add support to pull images from container image registries (i.e: docker.io, quay.io)"
-		default n
-		depends on PACKAGE_swmodd
-		select PACKAGE_skopeo
-		select PACKAGE_umoci
+config SWMODD_KERNEL_OPTIONS
+	bool "Enable kernel support for LXC and OCI containers"
+	depends on PACKAGE_swmodd
+	default y
+	select LXC_KERNEL_OPTIONS
+	select LXC_BUSYBOX_OPTIONS
+	select LXC_SECCOMP
+	select LXC_NETWORKING
+	select KERNEL_CGROUPS
+	select KERNEL_CGROUP_SCHED
+	select KERNEL_CGROUP_DEVICE
+	select KERNEL_CGROUP_FREEZER
+	select KERNEL_CGROUP_CPUACCT
+	select KERNEL_CGROUP_NET_PRIO
+	select KERNEL_NET_CLS_CGROUP
+	select KERNEL_NAMESPACES
+	select KERNEL_DEVPTS_MULTIPLE_INSTANCES
+	select KERNEL_POSIX_MQUEUE
+	select KERNEL_FAIR_GROUP_SCHED
+	select KERNEL_RT_GROUP_SCHED
+	select KERNEL_MEMCG
+	select KERNEL_MEMCG_KMEM
+	select KERNEL_CPUSETS
+	select PACKAGE_kmod-ikconfig
+	help
+	  Select needed kernel options for LXC and CRUN related utilities. Options
+	  include cgroups, namespaces and other miscellaneous options. These
+	  options unfortunately can not be installed as a module.
 
-	config SWMODD_KERNEL_OPTIONS
-		bool "Enable kernel support for LXC and OCI containers"
-		default y
-		select KERNEL_CGROUPS
-		select KERNEL_CGROUP_SCHED
-		select KERNEL_CGROUP_DEVICE
-		select KERNEL_CGROUP_FREEZER
-		select KERNEL_CGROUP_CPUACCT
-		select KERNEL_CGROUP_NET_PRIO
-		select KERNEL_NET_CLS_CGROUP
-		select KERNEL_NAMESPACES
-		select KERNEL_DEVPTS_MULTIPLE_INSTANCES
-		select KERNEL_POSIX_MQUEUE
-		select KERNEL_FAIR_GROUP_SCHED
-		select KERNEL_RT_GROUP_SCHED
-		select KERNEL_MEMCG
-		select KERNEL_MEMCG_KMEM
-		select KERNEL_CPUSETS
-		select PACKAGE_kmod-ikconfig
-		help
-		  Select needed kernel options for LXC and CRUN related utilities. Options
-		  include cgroups, namespaces and other miscellaneous options. These
-		  options unfortunately can not be installed as a module.
-
-	config SWMODD_NETWORKING
-		bool "Enable networking support for LXC/OCI containers"
-		default y
-		select PACKAGE_kmod-veth
-		select PACKAGE_kmod-macvlan
-		help
-		  Enable "veth pair device" and "macvlan"
-
-endmenu
+config SWMODD_NETWORKING
+	bool "Enable networking support for LXC/OCI containers"
+	depends on PACKAGE_swmodd
+	default y
+	select PACKAGE_kmod-veth
+	select PACKAGE_kmod-macvlan
+	help
+	  Enable "veth pair device" and "macvlan"

swmodd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.2.4
+PKG_VERSION:=2.3.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/swmodd.git
-PKG_SOURCE_VERSION:=25cbdf268e803eeed4f840419825512724df055d
+PKG_SOURCE_VERSION:=d29418d26e630894079de73fae66bf04b5db0ab3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,8 +28,9 @@ define Package/swmodd
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:= Software Modules Daemon
+  MENU:=1
   DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
-	    +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
+	    +PACKAGE_lxc:lxc +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
 	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
 	    +swmodd-cgroup +jq +libbbfdm-api
 endef
@@ -54,12 +55,12 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
-ifeq ($(CONFIG_PACKAGE_crun),y)
+ifeq ($(CONFIG_SWMODD_OCI_SUPPORT),y)
 MAKE_FLAGS += \
 	SWMOD_CRUN="yes"
 endif
 
-ifeq ($(CONFIG_PACKAGE_liblxc),y)
+ifeq ($(CONFIG_SWMODD_LXC_SUPPORT),y)
 MAKE_FLAGS += \
 	SWMOD_LXC="yes"
 endif
@@ -76,23 +77,24 @@ define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/share/swmodd/
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/etc/init.d/swmodd $(1)/etc/init.d/swmodd
 	$(INSTALL_BIN) ./files/etc/config/swmodd $(1)/etc/config/swmodd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swmodd $(1)/usr/sbin/swmodd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libswmodd.so $(1)/usr/lib/bbfdm/libswmodd.so
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/opkg_offline.sh $(1)/usr/share/swmodd/opkg_offline
+	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-bundle-path $(1)/etc/uci-defaults/01-fix-bundle-path
 ifeq ($(CONFIG_PACKAGE_liblxc),y)
 	$(INSTALL_DIR) $(1)/usr/share/lxc/templates/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/templates/lxc-iopsys $(1)/usr/share/lxc/templates/lxc-iopsys
+	$(INSTALL_BIN) ./files/etc/uci-defaults/02-migrate-lxc $(1)/etc/uci-defaults/02-migrate-lxc
 endif
 ifeq ($(CONFIG_PACKAGE_crun),y)
 	$(INSTALL_DIR) $(1)/etc/swmodd
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) ./files/etc/swmodd/run.sh $(1)/etc/swmodd/run.sh
 	$(INSTALL_BIN) ./files/etc/init.d/crun $(1)/etc/init.d/crun
 	$(INSTALL_BIN) ./files/etc/config/crun $(1)/etc/config/crun
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/crun_create $(1)/usr/sbin/crun_create
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-bundle-path $(1)/etc/uci-defaults/01-fix-bundle-path
 endif
 endef
 

swmodd/files/etc/init.d/crun

@@ -14,6 +14,34 @@ is_container_running() {
 	return $?
 }
 
+
+configure_lxc_container() {
+	local requested_state name ctype du_status BUNDLE
+
+	ctype="${1}"
+	name="${2}"
+	requested_state="${3}"
+	du_state="${4}"
+	BUNDLE="${5}"
+
+	if [ "${ctype}" != "lxc" ]; then
+		return 0;
+	fi
+
+	if [ "${du_status}" = "Uninstalling" ]; then
+		lxc-stop -q -k "${name}"
+		if [ -d "${BUNDLE:?}/${name:?}" ]; then
+			rm -rf "${BUNDLE:?}/${name:?}"
+		fi
+	fi
+
+	if [ "${requested_state}" = "Idle" ]; then
+		lxc-stop -q -k "${name}"
+	elif [ "${requested_state}" = "Active" ]; then
+		lxc-start -q "${name}" >/dev/null 2>&1
+	fi
+}
+
 configure_crun_container() {
 	local name type autostart du_status requested_state url username password
 	local BRIDGE BUNDLE BOOT
@@ -38,6 +66,7 @@ configure_crun_container() {
 	fi
 
 	if [ "${type}" != "crun" ]; then
+		configure_lxc_container "${type}" "${name}" "${requested_state}" "${du_status}" "${BUNDLE}"
 		return 0;
 	fi
 

swmodd/files/etc/init.d/swmodd

@@ -6,6 +6,11 @@ STOP=01
 USE_PROCD=1
 PROG=/usr/sbin/swmodd
 
+log()
+{
+        logger -t swmodd.init "$*"
+}
+
 validate_globals_section()
 {
 	uci_validate_section swmodd swmodd "globals" \
@@ -18,15 +23,23 @@ validate_globals_section()
 }
 
 start_lxc_container() {
+	local root
+
 	config_get name "${1}" name ""
 	config_get type "${1}" type ""
 	config_get autostart "${1}" autostart "0"
 	config_get timeout "${1}" timeout "300"
+	root="${2}"
 
 	if [ -z "${name}" ] || [ -z "${type}" ]; then
 		return 0;
 	fi
 
+	# workaround to install lxc container with installdu and autostart them
+	if [ -f "${root}/$name/config" ]; then
+		type=lxc
+	fi
+
 	if [ "${type}" != "lxc" ]; then
 		return 0;
 	fi
@@ -39,12 +52,12 @@ start_lxc_container() {
 	if [ "${autostart}" == "0" ]; then
 		if [ "${state}" == "RUNNING" ]; then
 			# stop the container if running
-			lxc-stop -n "${name}" -t "${timeout}" &
+			lxc-stop -k -n "${name}" &
 			return 0;
 		elif [ "${state}" == "FROZEN" ]; then
 			# first unfreeze then stop
 			lxc-unfreeze -n "${name}"
-			lxc-stop -n "${name}" -t "${timeout}" &
+			lxc-stop -k -n "${name}" &
 			return 0;
 		fi
 	else
@@ -59,6 +72,12 @@ start_lxc_container() {
 	fi
 }
 
+stop_lxc_containers() {
+	for f in `lxc-ls`; do
+		lxc-stop -k -n $f >/dev/null 2>&1;
+	done
+}
+
 start_service() {
 	local enabled debug log_level sock lxc_bundle_root oci_bundle_root
 
@@ -70,9 +89,15 @@ start_service() {
 
 	[ "${enabled}" -eq 0 ] && return 0
 
-	# Create the bundle paths if not present
-	[ -n "${lxc_bundle_root}" ] && mkdir -p "${lxc_bundle_root}"
-	[ -n "${oci_bundle_root}" ] && mkdir -p "${oci_bundle_root}"
+        if [ ! -d "${lxc_bundle_root}" ]; then
+                log "# Not staring lxc [${lxc_bundle_root}] not present/defined"
+                return 1
+        fi
+
+        if [ ! -d "${oci_bundle_root}" ]; then
+                log "# Not staring oci [${oci_bundle_root}] not present/defined"
+                return 1
+        fi
 
 	procd_open_instance swmodd
 	procd_set_param command ${PROG}
@@ -94,8 +119,17 @@ start_service() {
 	if [ -f "${lxc_bundle_root}/lxccontainer" ]; then
 		UCI_CONFIG_DIR="${lxc_bundle_root}"
 		config_load lxccontainer
-		config_foreach start_lxc_container container
+		config_foreach start_lxc_container container ${lxc_bundle_root}
 	fi
+	if [ -f "${oci_bundle_root}/ocicontainer" ]; then
+		UCI_CONFIG_DIR="${oci_bundle_root}"
+		config_load ocicontainer
+		config_foreach start_lxc_container du_eu_assoc ${oci_bundle_root}
+	fi
+}
+
+stop_service() {
+	stop_lxc_containers
 }
 
 reload_service() {

swmodd/files/etc/uci-defaults/01-fix-bundle-path

@@ -21,23 +21,18 @@ if [ -n "${lxc_bundle}" ]; then
 elif [ -n "${lxc}" ]; then
 	# if lxc_bundle_root not define in swmodd, update it with lxc path
 	uci_set swmodd globals lxc_bundle_root ${lxc}
-	uci_commit
 else
 	mkdir -p /etc/lxc
 	echo "lxc.lxcpath = /srv/" > /etc/lxc/lxc.conf
 	uci_set swmodd globals lxc_bundle_root "/srv/"
-	uci_commit
 fi
 
 if [ -z "${oci_bundle}" ] && [ -n "${lxc_bundle}" ]; then
 	# if oci_bundle_root not defined in swmodd, update it with lxc_bundle_root if defined
 	uci_set swmodd globals oci_bundle_root ${lxc_bundle}
-	uci_commit
 elif [ -z "${oci_bundle}" ] && [ -n "${lxc}" ]; then
 	# if oci_bundle_root not defined in swmodd, update it with lxc path
 	uci_set swmodd globals oci_bundle_root ${lxc}
-	uci_commit
 elif [ -z "${oci_bundle}" ]; then
 	uci_set swmodd globals oci_bundle_root "/srv/"
-	uci_commit
 fi

swmodd/files/etc/uci-defaults/02-migrate-lxc

@@ -0,0 +1,47 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+config_change=0
+
+migrate_lxc() {
+	config_get name "${1}" name ""
+
+	if [ -z "${name}" ]; then
+		return 0;
+	fi
+
+	# Now lets check if already present in lxccontainer
+	exist=$(uci -q -c "${2}" show lxccontainer | grep ".name='$name'")
+	if [ -z "${exist}" ]; then
+		# Not present, need to migrate
+		sec=$(uci -q -c "${2}" add lxccontainer container)
+		if [ -n "${sec}" ]; then
+			uci -q -c "${2}" set lxccontainer."${sec}".name="${name}"
+			uci -q -c "${2}" set lxccontainer."${sec}".type='lxc'
+			uci -q -c "${2}" set lxccontainer."${sec}".autostart='1'
+			uci -q -c "${2}" set lxccontainer."${sec}".timeout='300'
+			config_change=1			
+		fi
+	fi
+}
+
+config_load swmodd
+config_get lxc_bundle globals lxc_bundle_root ""
+
+if [ -z "${lxc_bundle}" ]; then
+	return 0
+fi
+
+if [ ! -d "${lxc_bundle}" ]; then
+	return 0
+fi
+
+touch "${lxc_bundle}"/lxccontainer
+
+config_load lxc-auto
+config_foreach migrate_lxc container "${lxc_bundle}"
+
+if [ $config_change -eq 1 ]; then
+	uci -q -c "${lxc_bundle}" commit lxccontainer
+fi

urlfilter/Makefile

@@ -12,7 +12,7 @@ LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
-PKG_SOURCE_VERSION:=76334ea7d3c01908760fb48608328f6a91cdd973
+PKG_SOURCE_VERSION:=a726e4ce9fa3322e135cb0dd961f31b4fd7ae22a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=a1324993295d49023649456d90797e8f43a0c36a
+PKG_SOURCE_VERSION:=2285d198a535e0dc05f5fb78e80442d7a2ccf5f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,7 +27,7 @@ define Package/usermngr
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  DEPENDS:= +shadow-utils +libbbfdm-api +libcrypt
+  DEPENDS:= +shadow-utils +libbbfdm-api
   TITLE:=Package to add Device.Users. datamodel support
 endef
 

voicemngr/Makefile

@@ -19,7 +19,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=b9933ef78fee574e410a4247e5cc765a632b0822
+PKG_SOURCE_VERSION:=11b27a3bbf80f87ddfe10ed984d2945655ce3ba1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif