map-agent: change qca prefix

2465b94 Fix getting handset's string after call mode changes
fbdd294 fixup! Handle DECT call modes correctly with call_waiting settings

bbfdm/Config_bbfdm.in

@@ -10,10 +10,6 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
-config BBF_TR104
-	bool "Enable TR-104 Data Model Support"
-	default y
-
 config BBF_TR143
 	bool "Enable TR-143 Data Model Support"
 	default y

bbfdm/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.3.11
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=346c8412a426441fa928b53210d0bd6127ac72e8
+PKG_SOURCE_VERSION:=35f7a1778a635bfabf7ffd6c4f5cf76893f52559
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -99,7 +99,7 @@ define Package/libbbfdm-api/description
 endef
 
 define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR104 and TR143 data models
+ Library contains the data model tree. It includes TR181, TR143 data models
 endef
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -111,11 +111,7 @@ endif
 
 CMAKE_OPTIONS += \
 	-DBBF_TR181=ON
-
-ifeq ($(CONFIG_BBF_TR104),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR104=ON
-endif
+	-DBBF_WIFI_DATAELEMENTS=ON
 
 ifeq ($(CONFIG_BBF_TR143),y)
 CMAKE_OPTIONS += \
@@ -165,7 +161,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
@@ -204,13 +199,16 @@ endef
 
 define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
 	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/src/bbfdmd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/json/input.json $(1)/etc/bbfdm/
+	$(INSTALL_BIN) ./files/etc/bbfdm/bbfdm_services.sh $(1)/etc/bbfdm/
 endef
 
 define Package/userinterface/install
@@ -223,7 +221,9 @@ define Package/userinterface/install
 	$(INSTALL_BIN) ./files/etc/init.d/userinterface $(1)/etc/init.d/userinterface
 	$(INSTALL_BIN) ./files/etc/uci-defaults/93-userinterface-firewall $(1)/etc/uci-defaults/93-userinterface-firewall
 	$(INSTALL_BIN) ./files/etc/uci-defaults/94-userinterface-json $(1)/etc/uci-defaults/94-userinterface-json
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
 	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
+	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
 endef
 
 Package/libbbfdm/prerm = $(Package/libbbfdm/default/prerm)

bbfdm/files/etc/bbfdm/bbfdm_services.sh

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+BBFDMD="/usr/sbin/bbfdmd"
+
+bbfdm_add_service()
+{
+	local name path
+
+	name="${1}"
+	path="${2}"
+
+	if [ -z "${name}" -o -z "$path" ]; then
+		return 0;
+	fi
+
+	ubus call service add "{'name':'bbfdm.services','instances':{'$name':{'command':['$BBFDMD','-m','$path'], 'respawn': [0]}}}"
+}

bbfdm/files/etc/config/bbfdm

@@ -2,6 +2,6 @@
 config bbfdmd 'bbfdmd'
 	option enabled '1'
 	option loglevel '1'
-	option refresh_time '10'
-	option transaction_timeout '10'
+	option refresh_time '0'
+	option transaction_timeout '30'
 

bbfdm/files/etc/firewall.portmap

@@ -0,0 +1,74 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+log() {
+	echo "${@}"|logger -t firewall.dnat -p info
+}
+
+exec_cmd() {
+	if ! eval "$*"; then
+		log "Failed to run [$*]"
+	fi
+}
+
+reorder_dnat_rules() {
+	nat_chains=$(iptables -t nat -S | grep -E "^-N zone[a-zA-Z0-9_]+prerouting$" | cut -d' ' -f 2)
+
+	for chain in ${nat_chains}; do
+		# Collect empty remote host & empty dport rules
+		EMPTY_HOST_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep -v "\-s ")
+		if [ -n "${EMPTY_HOST_PORT}" ]; then
+			echo "${EMPTY_HOST_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
+
+		# Collect empty remote host but non empty dport rules
+		EMPTY_HOST=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep "\-\-dport" | grep -v "\-s ")
+		if [ -n "${EMPTY_HOST}" ]; then
+			echo "${EMPTY_HOST}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
+
+		# Collect non empty remote host but empty dport rules
+		EMPTY_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep "\-s ")
+		if [ -n "${EMPTY_PORT}" ]; then
+			echo "${EMPTY_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
+
+		# Now add rules as per datamodel precedence shown below
+		## Non empty remote host, empty dport
+		## empty remote host, non empty dport
+		## empty remote host, empty dport
+		if [ -n "${EMPTY_PORT}" ]; then
+			echo "${EMPTY_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
+
+		if [ -n "${EMPTY_HOST}" ]; then
+			echo "${EMPTY_HOST}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
+
+		if [ -n "${EMPTY_HOST_PORT}" ]; then
+			echo "${EMPTY_HOST_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
+	done
+}
+
+# Re-order portmapping rules according to precedence hierarchy
+reorder_dnat_rules

bbfdm/files/etc/hotplug.d/iface/85-bbfdm-sysctl

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+[ "$ACTION" = "ifup" ] || exit 0
+
+apply_sysctl_configuration() {
+        local sysctl_conf
+
+        sysctl_conf="/etc/bbfdm/sysctl.conf"
+
+        [ -f "${sysctl_conf}" ] || touch "${sysctl_conf}"
+
+        sysctl -e -p "${sysctl_conf}" >&-
+}
+
+
+ubus -t 10 wait_for network.device
+apply_sysctl_configuration

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,60 +64,17 @@ 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
-
-	procd_append_param command -I "${TMP_JSON_INPUT}"
 }
 
-apply_sysctl_configuration() {
-	local sysctl_conf
-
-	sysctl_conf="/etc/bbfdm/sysctl.conf"
-	
-	[ -f "${sysctl_conf}" ] || touch "${sysctl_conf}"
-
-	sysctl -e -p "${sysctl_conf}" >&-
-}
-
-start_service() {
-	local sysctl_reload
-
-	ubus -t 5 wait_for network.device
-	[ "$?" -eq 0 ] && sysctl_reload=1
-
-	procd_open_instance bbf
+start_service()
+{
+	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn
-	procd_close_instance
-
-	[ "${sysctl_reload}" -eq 1 ] && apply_sysctl_configuration
-}
-
-reload_service() {
-	ubus -t 5 wait_for network.device
-	apply_sysctl_configuration
+	procd_close_instance "bbfdm"
 }
 
 service_triggers()
 {
-	procd_add_reload_trigger "bbfdm" "network"
+	procd_add_reload_trigger "bbfdm"
 }

bbfdm/files/etc/uci-defaults/95-portmap-firewall

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+uci -q batch <<-EOT
+        delete firewall.port_hook
+        set firewall.port_hook=include
+        set firewall.port_hook.path=/etc/firewall.portmap
+        set firewall.port_hook.reload=1
+        commit firewall
+EOT
+
+exit 0
+

bulkdata/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -43,9 +43,9 @@ 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/json
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/	
+	$(INSTALL_DIR) $(1)/etc/bulkdata
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bulkdata
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/bulkdata/input.json

@@ -0,0 +1,15 @@
+{
+	"daemon": {
+		"input": {
+			"type": "JSON",
+			"name": "/etc/bulkdata/bulkdata.json"
+		},
+		"output": {
+			"type": "UBUS",
+			"name": "bbfdm.bulkdata",
+			"parent_dm": "Device.",
+			"object": "BulkData",
+			"root_obj": "bbfdm"
+		}
+	}
+}

bulkdata/files/etc/init.d/bulkdatad

@@ -3,8 +3,11 @@
 START=99
 STOP=10
 
+. /etc/bbfdm/bbfdm_services.sh
+
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
+BULKDATA_JSON_INPUT="/etc/bulkdata/input.json"
 
 start_service() {
 	local enable
@@ -12,12 +15,14 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
-	procd_open_instance bulkdata
 	[ "$enable" -eq "1" ] && {
+		procd_open_instance "bulkdata"
 		procd_set_param command "$PROG"
-		procd_set_param respawn "3" "7" "0"
+		procd_set_param respawn
+		procd_close_instance "bulkdata"
 	}
-	procd_close_instance
+
+	bbfdm_add_service "bbfdm.bulkdata" "${BULKDATA_JSON_INPUT}"
 }
 
 reload_service() {

capiagent/files/etc/init.d/capiagent

@@ -6,13 +6,22 @@ STOP=20
 USE_PROCD=1
 
 start_service() {
-	procd_open_instance
-        procd_set_param command "/usr/sbin/capiagent" "-p 9000"
-	procd_set_param limits core="unlimited"
-#	procd_set_param respawn
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
+	if [ -e "/etc/config/mapagent" -o -e "/etc/config/mapcontroller" ]; then
+		config_load mapagent
+		config_get_bool agent_enabled agent enabled 1
+		config_load mapcontroller
+		config_get_bool controller_enabled controller enabled 1
+
+		if [ $agent_enabled -eq 1 -o $controller_enabled -eq 1 ]; then
+			procd_open_instance
+			procd_set_param command "/usr/sbin/capiagent" "-p 9000"
+			procd_set_param limits core="unlimited"
+			#procd_set_param respawn
+			#procd_set_param stdout 1
+			#procd_set_param stderr 1
+			procd_close_instance
+		fi
+	fi
 }
 
 service_triggers()

decollector/Config.in

@@ -2,6 +2,6 @@ menu "Configuration"
 
 config DECOLLECTOR_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 2
+	default 4
 
 endmenu

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.0.2.0
+PKG_VERSION:=4.1.0.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=162654487bfbff7d68d0c87ae9498a3def738d84
+PKG_SOURCE_VERSION:=39aad7f222eabf781f2bc1181c5ba3b23dc47629
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

decollector/files/decollector.init

@@ -17,10 +17,13 @@ start_service() {
 
 		config_load mapcontroller
 		config_get en controller enabled "0"
+		config_get collect_int controller de_collect_interval
+
+		[ -n "$collect_int" -a $collect_int -lt 30 ] &&  collect_int=""
 
 		[ $en -gt 0 ] && {
 			procd_open_instance
-			procd_set_param command "$PROG" "-d"
+			procd_set_param command "$PROG" "-d" "${collect_int:+-t $collect_int}"
 			#procd_set_param stdout 1
 			#procd_set_param stderr 1
 			procd_set_param respawn

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.8
+PKG_VERSION:=3.5.13
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a9b4e716f5d48b543191ca47b14b4bceafdaa5b4
+PKG_SOURCE_VERSION:=2465b94d72b8d54102c10565e624847d4f0b39ee
 PKG_MIRROR_HASH:=skip
 endif
 

dslmngr/Makefile

@@ -13,7 +13,7 @@ PKG_VERSION:=1.2.0
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bb754ae620a9fc66fd6fc0745f0fead0708c7a17
+PKG_SOURCE_VERSION:=43dec92b1c86be7859521da337e7bd1168848b26
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

ethmngr/Makefile

@@ -23,7 +23,7 @@ define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/ethmngr/description
@@ -37,19 +37,14 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
-ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_mediatek),)
+ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 define Build/Compile
 endef
 endif
 
 define Package/ethmngr/install
-	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_brcmbca),)
-	$(CP) ./files/broadcom/* $(1)/
-else
-	$(CP) ./files/linux/* $(1)/
-endif
-ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_mediatek),)
+	$(CP) ./files/* $(1)/
+ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
 endif

ethmngr/files/broadcom/lib/ethernet/broadcom.sh

@@ -1,149 +0,0 @@
-# arg1: port ifname, ex: eth0
-get_max_port_speed() {
-	if [ -z "$1" ]; then
-		echo 0
-		return
-	fi
-
-	local ifname="$1"
-	local phycap="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Capabilities' | awk '{print$NF}' | cut -d'|' -f1)"
-	local speed=1000
-
-	case "$phycap" in
-		10GFD) speed=10000 ;;
-		5GFD) speed=5000 ;;
-		2.5GFD) speed=2500 ;;
-		1GFD|1GHD) speed=1000 ;;
-		100MFD|100MHD) speed=100 ;;
-		10MFD|10MHD) speed=10 ;;
-	esac
-
-	echo $speed
-}
-
-# arg1: port name, ex: eth0
-get_port_number() {
-	[ -z "$1" ] && return
-	local ports="0 1 2 3 4 5 6 7 8"
-	local units="0 1"
-	local port="$1"
-	local ifname
-
-	for unit in $units; do
-		for prt in $ports; do
-			ifname="$(ethswctl getifname $unit $prt 2>/dev/null | awk '{print$NF}')"
-			if [ "$ifname" == "$port" ]; then
-				echo "$unit $prt"
-				return
-			fi
-		done
-	done
-}
-
-# arg1: port ifname, ex: eth0
-reset_port() {
-        local ifname="$1"
-        ethctl $ifname phy-reset >/dev/null
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-power_updown() {
-	local ifname="$1"
-	local enabled=$2
-
-	local updown="up"
-	[ $enabled -eq 0 ] && updown="down"
-	ethctl $ifname phy-power $updown >/dev/null
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-# arg3: port speed, ex: 1000
-# arg4: port duplex, ex: full
-# arg5: port autoneg, ex: on
-# arg6: port eee, ex: 0
-# arg7: port pause, ex: 0
-set_port_settings() {
-	local ifname="$1"
-	local enabled=$2
-	local speed="$3"
-	local duplex=$4
-	local autoneg=$5
-	local eee=$6
-	local pause=$7
-
-	[ -d /sys/class/net/$ifname ] || return
-
-	local unitport="$(get_port_number $ifname)"
-	local unit=$(echo $unitport | cut -d ' ' -f 1)
-	local port=$(echo $unitport | cut -d ' ' -f 2)
-
-	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
-	[ "$duplex" == "half" ] && duplex=0 || duplex=1
-	[ "$duplex" == 0 ] && dplx="HD" || dplx="FD"
-	[ "$autoneg" == "on" ] && media_type="auto" || media_type="$speed$dplx"
-
-	phycrossbar="$(ethctl $ifname phy-crossbar | head -1)"
-	crossbartype="$(echo $phycrossbar | awk '{print$2$3}')"
-	# Take only the last PHY Endpoint (non-Serdes) into account as Serdes port number precedes
-	[ "$crossbartype" == "oncrossbar" ] && pyhendpoint="$(echo $phycrossbar | awk '{print$NF}')"
-
-	phycaps="$(ethctl $ifname media-type ${pyhendpoint:+ port $pyhendpoint} | awk -F'PHY Capabilities: ' '{print$2}')"
-	numofcaps="$(echo $phycaps | tr '|' ' ' | wc -w)"
-
-        # Reset the port before setting new params
-        reset_port $ifname
-
-	if [ "$numofcaps" == "1" ]; then
-		logger -t "port-management" "$ifname is capable of $phycaps only; not setting speed/duplex"
-	else
-		logger -t "port-management" "$ifname is capable of $phycaps; setting speed/duplex to $media_type"
-		ethctl $ifname media-type $media_type ${pyhendpoint:+ port $pyhendpoint} &>/dev/null
-	fi
-
-	[ $eee -eq 1 ] && eee="on" || eee="off"
-	ethtool --set-eee $ifname eee $eee 2>/dev/null
-
-	case $pause in
-		off|0)
-			pause=0x0
-			auto=off
-			rx=off
-			tx=off
-		;;
-		on|1)
-			pause=0x2
-			auto=off
-			rx=on
-			tx=on
-		;;
-		auto)
-			pause=0x1
-			auto=on
-			rx=on
-			tx=on
-		;;
-		tx)
-			pause=0x3
-			auto=off
-			rx=off
-			tx=on
-		;;
-		rx)
-			pause=0x4
-			auto=off
-			rx=on
-			tx=off
-		;;
-	esac
-	if [ "$auto" == "on" ]; then
-		# Use ethswctl utility to set pause autoneg
-		# as ethtool is not setting it properly
-		ethswctl -c pause -n $unit -p $port -v $pause 2>&1 >/dev/null
-	else
-		ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
-	fi
-
-	power_updown $ifname $enabled
-}

ethmngr/files/common/etc/init.d/ethmngr

@@ -1,50 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=15
-STOP=90
-
-USE_PROCD=1
-PROG=/usr/sbin/ethmngr
-
-. /lib/functions.sh
-include /lib/ethernet
-
-configure_ethernet_port(){
-	local cfg=$1
-	local ifname enabled speed duplex autoneg eee pause
-
-	config_get ifname $cfg ifname
-	[ -d /sys/class/net/$ifname ] || return
-
-	config_get enabled $cfg enabled 1
-	config_get speed $cfg speed 1000
-	config_get duplex $cfg duplex "full"
-	config_get autoneg $cfg autoneg 1
-	config_get eee $cfg eee 0
-	config_get pause $cfg pause 0
-
-	set_port_settings $ifname $enabled $speed $duplex $autoneg $eee $pause
-}
-
-start_service() {
-	if [ -s /etc/config/ports ]; then
-		config_load ports
-		config_foreach configure_ethernet_port ethport
-	fi
-
-	if [ -f $PROG ]; then
-		procd_open_instance
-		procd_set_param command ${PROG}
-		procd_set_param respawn
-		procd_close_instance
-	fi
-}
-
-reload_service() {
-        stop
-        start
-}
-
-service_triggers() {
-	procd_add_reload_trigger ports
-}

ethmngr/files/common/etc/uci-defaults/15-ports-config-generate

@@ -1,81 +0,0 @@
-#!/bin/sh
-
-populate_config_from_db() {
-	. /lib/functions.sh
-	. /lib/network/utils.sh
-	include /lib/ethernet
-
-	portorder="$(db -q get hw.board.ethernetPortOrder)"
-	for port in $portorder; do
-		speed="$(get_max_port_speed $port 2>/dev/null)"
-		speed="${speed:-1000}"
-
-		uci add ports ethport
-		uci rename ports.@ethport[-1]="$(get_port_name $port)"
-		uci set ports.@ethport[-1].enabled=1
-		uci set ports.@ethport[-1].name="$(get_port_name $port)"
-		uci set ports.@ethport[-1].ifname="$port"
-		uci set ports.@ethport[-1].speed="$speed"
-		uci set ports.@ethport[-1].duplex="full"
-		uci set ports.@ethport[-1].autoneg=1
-		uci set ports.@ethport[-1].eee=0
-		if [ "$(db -q get hw.board.ethernetWanPort)" = "$port" ]; then
-			uci set ports.@ethport[-1].pause=1
-			uci set ports.@ethport[-1].uplink=1
-		else
-			uci set ports.@ethport[-1].pause=0
-		fi
-	done
-
-	uci commit ports
-}
-
-populate_config_from_device_tree() {
-	for path in $(find /proc/device-tree/ -name "port@*"); do
-		port="$(cat $path/label)"
-		[ -n "$port" ] || continue
-		[ "$port" = "cpu" ] && continue
-		speed=1000
-		if [ -e "$path/phy-mode" ]; then
-			phymode="$(cat $path/phy-mode)"
-			case "$phymode" in
-				10000*) speed=10000 ;;
-				2500*) speed=2500 ;;
-			esac
-		fi
-		PORT="$(echo $port | tr '[a-z]' '[A-Z]')"
-		uci add ports ethport
-		uci rename ports.@ethport[-1]="$PORT"
-		uci set ports.@ethport[-1].enabled=1
-		uci set ports.@ethport[-1].name="$PORT"
-		uci set ports.@ethport[-1].ifname="$port"
-		uci set ports.@ethport[-1].speed="$speed"
-		uci set ports.@ethport[-1].duplex="full"
-		uci set ports.@ethport[-1].autoneg=1
-		uci set ports.@ethport[-1].eee=0
-		if [ "$port" = "wan" ]; then
-			uci set ports.@ethport[-1].pause=1
-			uci set ports.@ethport[-1].uplink=1
-		else
-			uci set ports.@ethport[-1].pause=0
-		fi
-	done
-	uci commit ports
-}
-
-if [ -s "/etc/config/ports" ]; then
-	if uci -q get ports.@ethport[0] >/dev/null; then
-		# exit if there is any valid content
-		exit 0
-	else
-		rm -f /etc/config/ports
-	fi
-fi
-
-touch /etc/config/ports
-
-if [ -f /sbin/db -a -n "$(db get hw.board.ethernetPortOrder 2>/dev/null)" ]; then
-	populate_config_from_db
-elif [ -d /proc/device-tree/ ]; then
-	populate_config_from_device_tree
-fi

ethmngr/files/etc/init.d/ethmngr

@@ -0,0 +1,28 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+STOP=90
+
+USE_PROCD=1
+PROG=/usr/sbin/ethmngr
+
+. /lib/functions.sh
+include /lib/ethernet
+
+start_service() {
+	if [ -f $PROG ]; then
+		procd_open_instance
+		procd_set_param command ${PROG}
+		procd_set_param respawn
+		procd_close_instance
+	fi
+}
+
+reload_service() {
+        stop
+        start
+}
+
+service_triggers() {
+	procd_add_reload_trigger network
+}

ethmngr/files/linux/lib/ethernet/linux.sh

@@ -1,95 +0,0 @@
-# arg1: port ifname, ex: eth0
-get_max_port_speed() {
-	if [ -z "$1" ]; then
-		echo 0
-		return
-	fi
-
-	local ifname="$1"
-	local phycap="$(ethtool $ifname | grep -A 10 "Supported link modes" | grep 00 | tail -n 1 | awk '{print$NF}')"
-	local speed=1000
-
-	case "$phycap" in
-		10000*) speed=10000 ;;
-		5000*) speed=5000 ;;
-		2500*) speed=2500 ;;
-		1000*) speed=1000 ;;
-		100*) speed=100 ;;
-		10*) speed=10 ;;
-	esac
-
-	echo $speed
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-power_updown() {
-	local ifname="$1"
-	local enabled=$2
-
-	local updown="up"
-	[ $enabled -eq 0 ] && updown="down"
-	ip link set dev $ifname $updown
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-# arg3: port speed, ex: 1000
-# arg4: port duplex, ex: full
-# arg5: port autoneg, ex: on
-# arg6: port eee, ex: 0
-# arg7: port pause, ex: 0
-set_port_settings() {
-	local ifname="$1"
-	local enabled=$2
-	local speed="$3"
-	local duplex=$4
-	local autoneg=$5
-	local eee=$6
-	local pause=$7
-
-	[ -d /sys/class/net/$ifname ] || return
-
-	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
-	ethtool --change $ifname speed $speed duplex $duplex autoneg $autoneg
-
-	[ $eee -eq 1 ] && eee="on" || eee="off"
-	ethtool --set-eee $ifname eee $eee 2>/dev/null
-
-	case $pause in
-		off|0)
-			pause=0x0
-			auto=off
-			rx=off
-			tx=off
-		;;
-		on|1)
-			pause=0x2
-			auto=off
-			rx=on
-			tx=on
-		;;
-		auto)
-			pause=0x1
-			auto=on
-			rx=on
-			tx=on
-		;;
-		tx)
-			pause=0x3
-			auto=off
-			rx=off
-			tx=on
-		;;
-		rx)
-			pause=0x4
-			auto=off
-			rx=on
-			tx=off
-		;;
-	esac
-
-	ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
-
-	power_updown $ifname $enabled
-}

fscryptctl/Makefile

@@ -0,0 +1,42 @@
+# SPDX-License-Identifier: GPL-2.0-only
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=fscryptctl
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/google/fscryptctl.git
+PKG_SOURCE_VERSION:=v$(PKG_VERSION)
+
+PKG_LICENSE:=Apache-2.0
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=Encryption
+  TITLE:=Fscryptctl
+endef
+
+define Package/$(PKG_NAME)/description
+	fscryptctl is a low-level tool written in C that handles raw keys and manages policies for Linux filesystem encryption,
+	specifically the "fscrypt" kernel interface which is supported by the ext4, f2fs, and UBIFS filesystems
+endef
+
+define Build/Compile
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		CC="$(TARGET_CC)" \
+		LDFLAGS="$(TARGET_LDFLAGS)" \
+		fscryptctl
+endef
+
+define Package/$(PKG_NAME)/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fscryptctl $(1)/usr/bin/fscryptctl
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))

hostmngr/Config.in

@@ -0,0 +1,15 @@
+if (PACKAGE_hostmngr)
+
+menu "Configuration"
+
+config HOSTMNGR_HOSTS_HISTORY
+	bool "Keep history of hosts"
+	default y
+
+config HOSTMNGR_PLATFORM_HAS_WIFI
+	bool "Platform has WiFi"
+	default y if PACKAGE_libwifi
+
+endmenu
+
+endif

hostmngr/Makefile

@@ -0,0 +1,70 @@
+#
+# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hostmngr
+PKG_VERSION:=0.21.0
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=0414573a693b4b25d0430c566ea8c3b08b4e9ce3
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
+endif
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define Package/hostmngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Show and manage hosts in the network
+  DEPENDS= +libubox +libuci +libubus +ubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +libnfnetlink +libmnl \
+	   +libnetfilter-conntrack \
+	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi
+endef
+
+define Package/hostmngr/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/hostmngr/description
+ This package provides hostmngr that can detect and show host devices
+ present in the network.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
+	-D_GNU_SOURCE
+
+ifeq ($(CONFIG_HOSTMNGR_PLATFORM_HAS_WIFI),y)
+TARGET_CFLAGS += -DHAS_WIFI
+endif
+
+MAKE_PATH:=src
+
+define Package/hostmngr/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        rsync -r --exclude=.* ~/git/hostmngr/ $(PKG_BUILD_DIR)/
+endef
+endif
+
+$(eval $(call BuildPackage,hostmngr))

hostmngr/files/etc/config/hosts

@@ -0,0 +1,9 @@
+
+config global 'global'
+	option enabled '1'
+	option history '1'
+	option history_file '/etc/hosts_history.json'
+	option history_timeout '604800'
+
+config interface
+	list ifname 'br-lan'

hostmngr/files/etc/init.d/hostmngr

@@ -0,0 +1,26 @@
+#!/bin/sh /etc/rc.common
+
+START=97
+STOP=20
+
+USE_PROCD=1
+
+start_service() {
+	procd_open_instance
+        procd_set_param command "/usr/sbin/hostmngr" "--config hosts" "-o"  "/tmp/hostmngr.log" "-f"
+#	procd_set_param respawn
+	procd_set_param limits core="unlimited"
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "hosts"
+}
+
+reload_service() {
+	stop
+	start
+}

icwmp/Makefile

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

icwmp/files/etc/config/cwmp

@@ -39,6 +39,6 @@ config cpe 'cpe'
 	option active_notif_throttle '0'
 	
 config lwn 'lwn'
-	option enable '1'
+	option enable '0'
 	option hostname ''
 	option port '0'

icwmp/files/etc/firewall.cwmp

@@ -5,46 +5,58 @@ log() {
 	echo "${@}"|logger -t firewall.cwmp -p info
 }
 
-if [ ! -f "/var/state/cwmp" ]; then
+get_firewall_zone() {
+	zone="$(uci show firewall|grep network|grep ${1}|cut -d. -f 2)"
+	zone="${zone:-wan}" # defaults to wan zone
+	echo "$zone"
+}
+
+cleanup_exiting_rules() {
+        while iptables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
+		rule_num="$(iptables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Open_ACS_port" | head -1|awk '{print $1}')"
+		if [ -n "${rule_num}" ]; then
+			iptables -w 1 -D zone_"${1}"_input "${rule_num}";
+		fi
+	done
+        while ip6tables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
+		rule_num="$(ip6tables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Open_ACS_port" | head -1|awk '{print $1}')"
+		if [ -n "${rule_num}" ]; then
+			ip6tables -w 1 -D zone_"${1}"_input "${rule_num}";
+		fi
+	done
+}
+
+enable="$(uci -q get cwmp.cpe.enable)"
+enable="${enable:-1}"
+
+if [ "$enable" -eq 0 ]; then
+	log "CWMP not enabled"
 	exit 0;
 fi
 
-zone_name=$(uci -c /var/state -q get cwmp.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)
-incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
+wan="$(uci -q get cwmp.cpe.default_wan_interface)"
+wan="${wan:-wan}"
 
-if [ -z "${zone_name}" ]; then
-	log "empty firewall zone name"
-	exit 0
-elif [ "$zone_name" = "icwmp" ]; then
-	iptables -nL zone_icwmp_input 2> /dev/null
-	if [ "$?" != 0 ]; then
-		iptables -w 1 -N zone_icwmp_input
-		iptables -w 1 -t filter -A INPUT -j zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport "${port}" -j REJECT
-	else			
-		iptables -w 1 -F zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport "${port}" -j REJECT
-	fi			
-else
-	iptables -w 1 -F zone_icwmp_input 2> /dev/null
-	iptables -w 1 -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
-	iptables -w 1 -X zone_icwmp_input 2> /dev/null
-fi
+zone_name="$(get_firewall_zone $wan)"
+
+port=$(uci -q get cwmp.cpe.port)
+port="${port:-7547}"
+
+incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|awk '{print tolower($0)}')
+incoming_rule="${incoming_rule:-port_only}"
+
+ipaddr=$(uci -c /var/state -q get icwmp.acs.ip)
+ip6addr=$(uci -c /var/state -q get icwmp.acs.ip6)
 
 cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
 cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
 
 # default incoming rule is Port only
-if [ -z "${incoming_rule}" ]; then
-	incoming_rule="port_only"
-fi
-
 if [ "${incoming_rule}" = "ip_only" ]; then
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
+	fi
+	if [ -n "${ip6addr}" ]; then
 		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 elif [ "${incoming_rule}" = "port_only" ]; then
@@ -55,6 +67,9 @@ elif [ "${incoming_rule}" = "port_only" ]; then
 else
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
+	fi
+
+	if [ -n "${ip6addr}" ]; then
 		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 
@@ -64,17 +79,23 @@ else
 	fi
 fi
 
+cleanup_exiting_rules "${zone_name}"
+
 echo "${cmd}"|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd}
+	log "Applied [${cmd}]"
 fi
 
 echo "${cmd6}"|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd6}
+	log "Applied [${cmd6}]"
 fi
 
-uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
-uci -c /var/state -q commit cwmp
+if [ -f "/var/state/icwmp" ]; then
+	uci -c /var/state -q set icwmp.cpe.firewall_restart="init"
+	uci -c /var/state -q commit icwmp
+fi

icwmp/files/etc/icwmpd/update.sh

@@ -14,11 +14,13 @@ handle_icwmp_update() {
 		return 0
 	fi
 
+	# wait for some time to avoid interface fluctuation
+	sleep 10
 	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

icwmp/files/etc/init.d/icwmpd

@@ -98,7 +98,11 @@ configure_send_op125() {
 	if [ "${uci}" = "network" ]; then
 		local opt125="125:00:00:0D:E9"
 	else
-		local opt125="125,00:00:0D:E9"
+		if [ -z "${sendopt}" ]; then
+			local opt125="125,00:00:0D:E9"
+		else
+			local opt125=":00:00:0D:E9"
+		fi
 	fi
 
 	config_get oui cpe manufacturer_oui ""
@@ -178,10 +182,94 @@ configure_send_op125() {
 		new_send_opt="$sendopt $opt125"
 		uci -q set network."${intf}".sendopts="$new_send_opt"
 	else
-		uci -q add_list dhcp."${intf}".dhcp_option="$opt125"
+		new_send_opt="$sendopt$opt125"
+		uci -q add_list dhcp."${intf}".dhcp_option="$new_send_opt"
 	fi
 }
 
+check_for_suboptions() {
+	# Check if option 4 and 5 present inside enterprise id 3561
+	data=$(echo "${1}" | sed 's/://g')
+	len=$(printf "${data}"|wc -c)
+
+	rem_len="${len}"
+	while [ $rem_len -gt 8 ]; do
+		subopt_present=0
+
+		ent_id="${data:0:8}"
+		ent_id=$(printf "%d\n" "0x$ent_id")
+		if [ $ent_id -ne 3561 ]; then
+			len_val=${data:8:2}
+			data_len=$(printf "%d\n" "0x$len_val")
+			# add 4 byte for ent_id and 1 byte for len
+			data_len=$(( data_len * 2 + 10 ))
+			# move ahead data to next enterprise id
+			data=${data:"${data_len}":"${rem_len}"}
+			rem_len=$(( rem_len - data_len ))
+			continue
+		fi
+
+		# read the length of enterprise data
+		len_val=${data:8:2}
+		data_len=$(printf "%d\n" "0x$len_val")
+		# add 4 byte for ent_id and 1 byte for len
+		data_len=$(( data_len * 2 + 10 ))
+
+		len_val=${data:8:2}
+		opt_len=$(printf "%d\n" "0x$len_val")
+		if [ $opt_len -eq 0 ]; then
+			echo ${subopt_present}
+			return 0
+		fi
+
+		# populate the option data of enterprise id
+		sub_data_len=$(( opt_len * 2))
+		# starting 10 means ahead of length field
+		sub_data=${data:10:"${sub_data_len}"}
+
+		# parsing of suboption of option 125
+		while [ $sub_data_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${sub_data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+			case "${sub_opt_id}" in
+			"4") subopt_present=1
+			;;
+			"5") subopt_present=1
+			;;
+			esac
+
+			if [ ${subopt_present} -eq 1 ]; then
+				break;
+			fi
+
+			# get the length of suboption
+			sub_opt_len=${sub_data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+		done
+
+		if [ ${subopt_present} -eq 1 ]; then
+			break;
+		else
+			# move ahead data to next enterprise id
+			rem_len=$(( rem_len - $data_len ))
+			data=${data:"${data_len}":"${rem_len}"}
+		fi
+	done
+
+	echo ${subopt_present}
+}
+
 enable_dnsmasq_option125() {
 	local lan="${1}"
 	local send125_present=0
@@ -190,16 +278,19 @@ enable_dnsmasq_option125() {
 	local proto="$(uci -q get dhcp."${lan}".dhcpv4)"
 	if [ "${proto}" = "server" ]; then
 		opt_list="$(uci -q get dhcp."${lan}".dhcp_option)"
+		base_opt=""
 
 		for sopt in $opt_list; do
 			if [[ "$sopt" == "$opt125"* ]]; then
-				send125_present=1
+				send125_present=$(check_for_suboptions "${sopt:4}")
+				base_opt="${sopt}"
 				break
 			fi
 		done
 
 		if [ ${send125_present} -eq 0 ]; then
-			configure_send_op125 "" "${lan}" "dhcp"
+			uci -q del_list dhcp."${lan}".dhcp_option="${base_opt}"
+			configure_send_op125 "${base_opt}" "${lan}" "dhcp"
 			ubus call uci commit '{"config":"dhcp"}'
 		fi
 	fi
@@ -488,20 +579,17 @@ reload_service() {
 	fi
 }
 
-service_triggers() {
-       procd_add_reload_trigger "cwmp"
-
-       procd_open_trigger
-               json_add_array
-                       json_add_string "" "interface.update"
-                       json_add_array
-                               json_add_array
-                                       json_add_string "" "run_script"
-                                       json_add_string "" "/etc/icwmpd/update.sh"
-                               json_close_array
-                       json_close_array
-                       json_add_int "" "2000"
-               json_close_array
-       procd_close_trigger
+add_interface_trigger() {
+        procd_add_interface_trigger "interface.update" "$1" /etc/icwmpd/update.sh
+}
+
+service_triggers() {
+       local wan_interface
+
+       config_load cwmp
+       config_get wan_interface cpe default_wan_interface "wan"
+
+       procd_add_reload_trigger "cwmp"
+       add_interface_trigger ${default_wan_interface}
 }
 

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.1.10
+PKG_VERSION:=8.2.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=52a11c4969039741f19a9a3d748c26761e702607
+PKG_SOURCE_VERSION:=c03fc4287af3dd17655dcaa02fc37d67425531f7
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -89,6 +89,12 @@ ifeq ($(CONFIG_IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY),y)
 TARGET_CFLAGS += -DIEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 endif
 
+ifeq ($(CONFIG_IEEE1905_EXTENSION_ALLOWED),y)
+TARGET_CFLAGS += -DEXTENSION_ALLOWED
+endif
+
+TARGET_CFLAGS += -DHAS_UBUS
+
 MAKE_FLAGS += \
 	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
 

ieee1905/plugins/map.mk

@@ -12,11 +12,11 @@ define Package/map-plugin/config
 
 		config MULTIAP_EASYMESH_VERSION
 		int "Easymesh version"
-		default 2
+		default 4
 
 		config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 		bool "Sync configuration between dynamic controllers in the network"
-		default n
+		default y
 
 		config MULTIAP_FUZZ_1905_CMDUS
 		bool "Include support to fuzz 1905 CMDUs for testing purpose"

iop/config

@@ -59,13 +59,17 @@ CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_qosmngr=y
 CONFIG_PACKAGE_libwifiutils=y
 CONFIG_PACKAGE_wifimngr=y
+CONFIG_PACKAGE_hostmngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-agent=m
-CONFIG_PACKAGE_map-controller=m
-CONFIG_PACKAGE_map-topology=y
+CONFIG_PACKAGE_topology-plugin=y
 CONFIG_PACKAGE_decollector=y
+CONFIG_PACKAGE_map-agent=y
+CONFIG_PACKAGE_map-controller=y
+CONFIG_PACKAGE_map-topology=y
+
+CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
 
 # Network #
 CONFIG_PACKAGE_netmode=y
@@ -84,12 +88,13 @@ CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=m
-CONFIG_PACKAGE_swmodd=m
-CONFIG_PACKAGE_twamp=m
-CONFIG_PACKAGE_udpecho-client=m
-CONFIG_PACKAGE_udpecho-server=m
-CONFIG_PACKAGE_xmppc=m
+CONFIG_PACKAGE_stunc=y
+CONFIG_PACKAGE_swmodd=y
+CONFIG_PACKAGE_twamp=y
+CONFIG_PACKAGE_udpecho-client=y
+CONFIG_PACKAGE_udpecho-server=y
+CONFIG_PACKAGE_userinterface=y
+CONFIG_PACKAGE_xmppc=y
 
 # WebGUI #
 CONFIG_PACKAGE_sulu=y
@@ -129,11 +134,12 @@ CONFIG_PACKAGE_wwan=y
 CONFIG_PACKAGE_xl2tpd=y
 
 # Services #
-CONFIG_PACKAGE_atftp=m
-CONFIG_PACKAGE_atftpd=m
+CONFIG_PACKAGE_atftp=y
+CONFIG_PACKAGE_atftpd=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_dnsmasq=y
 CONFIG_PACKAGE_ssdpd=y
+CONFIG_PACKAGE_miniupnpd-iptables=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -142,7 +148,7 @@ CONFIG_PACKAGE_openvpn-openssl=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_PACKAGE_qos-scripts is not set
 CONFIG_PACKAGE_rdnssd=y
-CONFIG_PACKAGE_vsftpd-tls=m
+CONFIG_PACKAGE_vsftpd-tls=y
 
 # Tools and Utilities #
 CONFIG_PACKAGE_curl=y
@@ -158,11 +164,17 @@ CONFIG_PACKAGE_ipset=y
 CONFIG_PACKAGE_ip6tables-zz-legacy=y
 CONFIG_PACKAGE_iptables-zz-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
+CONFIG_PACKAGE_iptables-mod-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
+CONFIG_PACKAGE_iptables-mod-ipmark=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
+CONFIG_PACKAGE_iptables-mod-nflog=y
+CONFIG_PACKAGE_iptables-mod-nfqueue=y
 CONFIG_PACKAGE_ndisc6=y
+CONFIG_PACKAGE_nping=y
 CONFIG_PACKAGE_rdisc6=y
 CONFIG_PACKAGE_resolveip=y
+CONFIG_PACKAGE_socat=y
 CONFIG_PACKAGE_tcpdump=y
 CONFIG_PACKAGE_traceroute6=y
 
@@ -172,9 +184,12 @@ CONFIG_PACKAGE_traceroute6=y
 ##########
 
 CONFIG_PACKAGE_at=y
+CONFIG_PACKAGE_ca-certificates=y
+CONFIG_PACKAGE_crun=y
 CONFIG_PACKAGE_getopt=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_jq=y
+CONFIG_PACKAGE_libcap-bin=y
 CONFIG_PACKAGE_libustream-openssl=y
 # CONFIG_PACKAGE_libustream-wolfssl is not set
 CONFIG_PACKAGE_lscpu=y
@@ -182,6 +197,7 @@ CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
 CONFIG_PACKAGE_procd-ujail=m
+CONFIG_PACKAGE_quota=y
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-rpcsys=y
 CONFIG_PACKAGE_rpcd-mod-rrdns=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

@@ -19,6 +19,7 @@ function genconfig {
 	armvirt_feed="target/linux/feeds/armvirt"
 	mediatek_feed="target/linux/feeds/mediatek"
 	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
+	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -41,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)
@@ -74,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
@@ -120,25 +114,20 @@ function genconfig {
 			mediatek=$(cd $mediatek_feed; ./genconfig)
 		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
 			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
+		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
+			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armvirt mediatek ipq95xx; do
+			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"
@@ -178,6 +167,22 @@ function genconfig {
 		    return
 		fi
 	    done
+
+	    for p in $ipq53xx; do
+		if [ $p == $profile ]; then
+		    target="ipq53xx"
+			target_config_path="$qualcomm_ipq53xx_feed/config"
+		    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://)' && {
@@ -357,10 +362,15 @@ function genconfig {
 		    cat $target_config_path/$BOARDTYPE/config >> .config
 		    echo "" >> .config
 		fi
-
+		# hack to support custom-devices until we have deprecated this genconfig-script...
+		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
+			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
+			echo "" >> .config
+		fi
+		
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx)
+		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
@@ -460,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
@@ -497,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

@@ -18,6 +18,7 @@ function genconfig_min {
 	armvirt_feed="target/linux/feeds/armvirt"
 	mediatek_feed="target/linux/feeds/mediatek"
 	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
+	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -40,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)
@@ -73,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
@@ -119,25 +113,20 @@ function genconfig_min {
 			mediatek=$(cd $mediatek_feed; ./genconfig)
 		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
 			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
+		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
+			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armvirt mediatek ipq95xx; do
+			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"
@@ -177,6 +166,22 @@ function genconfig_min {
 		    return
 		fi
 	    done
+
+	    for p in $ipq53xx; do
+		if [ $p == $profile ]; then
+		    target="ipq53xx"
+			target_config_path="$qualcomm_ipq53xx_feed/config"
+		    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://)' && {
@@ -331,10 +336,15 @@ function genconfig_min {
 		    cat $target_config_path/$BOARDTYPE/config >> .config
 		    echo "" >> .config
 		fi
+		# hack to support custom-devices until we have deprecated this genconfig-script...
+		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
+			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
+			echo "" >> .config
+		fi
 
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx)
+		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
@@ -428,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/generate_tarballs.sh

@@ -1,108 +0,0 @@
-#!/bin/bash
-# shellcheck disable=SC2029
-
-build_bcmkernel_consumer() {
-	local tarfile bcmkernelcommith sdkversion serverpath serverlink
-
-	sdkversion="$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')"
-	sdkversion="${sdkversion:0:4}${sdkversion:(-1)}"
-	bcmkernelcommith="$(grep -w "PKG_SOURCE_VERSION:" "$curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}"*".mk" | cut -d'=' -f2)"
-
-	[ -n "$board" ] && [ -n "$bcmkernelcommith" ] || return
-
-	serverpath="$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz"
-	serverlink="$FPATH/bcmopen-$board-$majver.$minver-latest"
-
-	# do not build bcmopen sdk if it was already built before
-	# if it was, check if there's a symlink in place and create it if missing
-	ssh "$SERVER" "test -f '$serverpath' && { test -L '$serverlink' || ln -sf '$serverpath' '$serverlink'; }" && return
-
-	cd "./build_dir/target-"*"/bcmkernel-"*"-${sdkversion:0:4}"*"/bcm963xx/release"
-	bash do_consumer_release -p "$profile" -y -F
-
-	tarfile='out/bcm963xx_*_consumer.tar.gz'
-	[ $(ls -1 $tarfile | wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
-
-	scp -pv $tarfile "$SERVER":"$serverpath"
-	ssh "$SERVER" "test -f '$serverpath' && ln -sf '$serverpath' '$serverlink'"
-	rm -f $tarfile
-
-	cd "$curdir"
-}
-
-build_endptmngr_consumer() {
-	# create endptmngr open version tar file
-	local endptversion endptcommith
-	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
-	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
-	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
-	[ -n "$profile" ] && [ -n "$endptversion" ] && [ -n "$endptcommith" ] || return
-	ssh $SERVER "test -f $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
-	cd ./build_dir/target-*/endptmngr-$endptversion/
-	mkdir endptmngr-open-$endptversion
-	mkdir endptmngr-open-$endptversion/src
-	cp ./src/endptmngr endptmngr-open-$endptversion/src
-	cp -r ./files/ endptmngr-open-$endptversion/
-	tar -czv  endptmngr-open-$endptversion/ -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
-	scp -pv endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
-	cp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $curdir/
-	rm -rf endptmngr-open-$endptversion
-	rm -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
-	cd "$curdir"
-}
-
-function print_usage {
-	echo "Usage: $0 generate_tarballs"
-	echo "  -t <target>"
-}
-
-function generate_tarballs {
-
-    SERVER="god@download.iopsys.eu"
-    FPATH="/var/www/html/iopsys/opensdk"
-
-    set -e
-    git remote -v | grep -q http && return # do not continue if this is an open SDK environment
-
-    board=$(grep CONFIG_TARGET_FAMILY .config | cut -d'=' -f2 | tr -d '"')
-    profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
-    majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
-    minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
-    curdir="$PWD"
-
-
-	# Execute user command
-	while getopts "t:h" opt; do
-		case $opt in
-			t)
-				stk_target=${OPTARG}
-				;;
-			h)
-				print_usage
-				exit 1
-				;;
-			\?)
-				print_usage
-				exit 1
-				;;
-		esac
-	done
-
-	if [ -z "$stk_target" ]; then
-		print_usage
-		exit 1
-	fi
-
-	if [ "$stk_target" == "broadcom" ]; then
-		build_bcmkernel_consumer
-		build_endptmngr_consumer
-	else
-		echo "Invalid target: $stk_target"
-		print_usage
-		exit 1
-	fi
-
-}
-
-register_command "generate_tarballs" "Generate tarballs for Open SDK"
-

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
 }
 

libdsl/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.2.99
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=54d53295b5e4ca74884045d0fa6bb0dc279ace3d
+PKG_SOURCE_VERSION:=f9f3fcd0f4140540db5bd41059bcca7ded083024
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libdsl.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -36,6 +36,18 @@ else ifeq ($(CONFIG_TARGET_armvirt),y)
   TARGET_CFLAGS +=-DIOPSYS_TEST
 endif
 
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	subdirs="$(subdirs)"
+
 define Package/libdsl
   SECTION:=libs
   CATEGORY:=Libraries

libethernet/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.2.104
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a64c8d1db59f6ca70424356186d279cc6e31213c
+PKG_SOURCE_VERSION:=d777636ca43302a95e571ab030ec44ef50905570
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libqos/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.2.101
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4287dbe76dc5c8b85368aa2cd101d9d9a445f968
+PKG_SOURCE_VERSION:=93ca0a66d6f82bca208bbe52b75ed582b20aa094
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.5
 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:=2a6ef141747ad0f7b32a536b5b5bd174834a7af5
+PKG_SOURCE_VERSION:=3f4cdca981b30d54ec5a426775fdcec2a63f83d9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-airoha/files/lib/voice/codecs.json

@@ -21,7 +21,8 @@
 		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
-		"bitrate": 16
+		"bitrate": 16,
+		"rtp_payload": 80
 	},
 	"g723": {
 		"name": "G.723.1",
@@ -48,7 +49,7 @@
 		"bitrate": 15.2
 	},
 	"gsm": {
-		"name": "GSM-AMR",
+		"name": "AMR",
 		"ptime_min": 10,
 		"ptime_max": 30,
 		"ptime_default": 20,

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 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:=401a392a72e2933f527eb92466faaf2907c38730
+PKG_SOURCE_VERSION:=548f8fccc9f8f0b5dd6bb39bdd9cac8659400cb6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-broadcom/files/lib/voice/codecs.json

@@ -48,7 +48,7 @@
 		"bitrate": 15.2
 	},
 	"gsm": {
-		"name": "GSM-AMR",
+		"name": "AMR",
 		"ptime_min": 10,
 		"ptime_max": 30,
 		"ptime_default": 20,

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.6
 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:=7ca102e62fa439a7188f2c5e4c72e3fcfd3fb28a
+PKG_SOURCE_VERSION:=062a265754b93a865cfcd2745f200aa09fb4a668
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-d2/files/lib/voice/codecs.json

@@ -15,14 +15,6 @@
 		"ptime_increment": 10,
 		"bitrate": 64
 	},
-	"g729a": {
-		"name": "G.729a",
-		"ptime_min": 10,
-		"ptime_max": 40,
-		"ptime_default": 20,
-		"ptime_increment": 10,
-		"bitrate": 64
-	},
 	"g729": {
 		"name": "G.729",
 		"ptime_min": 10,

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.2.101
+PKG_VERSION:=7.2.111
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=04b01464cb6d8c7ffcdfded7f8acacba04a5ba4f
+PKG_SOURCE_VERSION:=75bc4789e742584d45fcc2f9261267ed3e5c5492
 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
@@ -44,11 +44,11 @@ else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_CFLAGS +=-DIOPSYS_ECONET
 else ifeq ($(CONFIG_TARGET_ipq95xx),y)
   TARGET_PLATFORM=IPQ95XX
-  TARGET_WIFI_TYPE=MAC80211
+  TARGET_WIFI_TYPE=QUALCOMM MAC80211
   TARGET_CFLAGS +=-DIPQ95XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
   TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MAC80211
+  TARGET_WIFI_TYPE=MEDIATEK MAC80211
   TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)

map-agent/Config.in

@@ -8,28 +8,28 @@ config AGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 
 config AGENT_ISLAND_PREVENTION
 	bool "Support Island Prevention"
-	default y if MULTIAP_AGENT_ISLAND_PREVENTION
+	default y
 
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
 config AGENT_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 2
+	default 4
 
 config AGENT_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"
 	default y
 
 config AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	string
-	default "\\\\x11\\\\x22\\\\x33"
+	hex "Vendor OUI default"
+	default 0xB456FA
 
 config AGENT_EASYMESH_VENDOR_EXT_OUI
-	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
+	hex "Vendor OUI in 0xAABBCC format"
 	default AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	help
-	Extra features not covered by the base Easymesh specification can be
+	Extra features not covered by the base EasyMesh specification can be
 	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.3.2.3
+PKG_VERSION:=4.3.5.6
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d8940d6ecc4b8611c7d2e4bd9a2d5cad302c9c6e
+PKG_SOURCE_VERSION:=c64710581c46b2260a36b59d03cc83d21011d671
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -28,7 +28,7 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	   +map-plugin +ip-bridge +@BUSYBOX_CONFIG_PATCH +@BUSYBOX_CONFIG_DIFF
+	  +map-plugin +ip-bridge
 endef
 
 
@@ -74,7 +74,7 @@ TARGET_CFLAGS += -DEASYMESH_R2_CERT
 endif
 
 ifeq ($(CONFIG_AGENT_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_AGENT_EASYMESH_VENDOR_EXT_OUI)\\\"
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_AGENT_EASYMESH_VENDOR_EXT_OUI)
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 

map-agent/files/etc/config/mapagent

@@ -1,13 +1,15 @@
 config agent 'agent'
-	option enabled '1'
+	option enabled '0'
 	option debug '0'
-	option profile '2'
+	option profile '4'
 	option al_bridge 'br-lan'
 	option netdev 'wlan'
 	option island_prevention '0'
-	option eth_onboards_wifi_bhs '0'
-#	option controller_macaddr '0a:1b:2c:3d:4e:50'
+	option eth_onboards_wifi_bhs '1'
 	option scan_on_boot_only '0'
+	option guest_isolation '1'
+	list map_port 'all'
+#	option controller_macaddr '0a:1b:2c:3d:4e:50'
 
 config dynamic_backhaul
 	option missing_bh_timer '60'
@@ -20,9 +22,9 @@ config controller_select
 	option autostart '1'
 	option local '0'
 
-config radio
-	option device 'phy0'
-	option band '2'
+#config radio
+#	option device 'phy0'
+#	option band '2'
 # options below are auto-generated during onboarding
 #	option steer_policy '0'
 #	option util_threshold '0'
@@ -33,9 +35,9 @@ config radio
 #	option include_sta_stats '1'
 #	option include_sta_metric '1'
 
-config radio
-	option device 'phy1'
-	option band '5'
+#config radio
+#	option device 'phy1'
+#	option band '5'
 # options below are auto-generated during onboarding
 #	option steer_policy '0'
 #	option util_threshold '0'
@@ -46,12 +48,12 @@ config radio
 #	option include_sta_stats '1'
 #	option include_sta_metric '1'
 
-config bsta
-	option enabled '1'
-	option ifname 'wlan0'
-	option band '2'
-	option device 'phy0'
-	option priority '2'
+#config bsta
+#	option enabled '1'
+#	option ifname 'wlan0'
+#	option band '2'
+#	option device 'phy0'
+#	option priority '2'
 # options below are auto-generated during onboarding
 #	option ssid 'MAP-BH-2.4GHz'
 #	option encryption 'sae-mixed'
@@ -60,12 +62,12 @@ config bsta
 #	option bssid '0a:1b:2c:3d:4e:53'
 #	option vid '1'
 
-config bsta
-	option enabled '1'
-	option ifname 'wlan1'
-	option band '5'
-	option device 'phy1'
-	option priority '0'
+#config bsta
+#	option enabled '1'
+#	option ifname 'wlan1'
+#	option band '5'
+#	option device 'phy1'
+#	option priority '0'
 # options below are auto-generated during onboarding
 #	option ssid 'MAP-BH-5GHz'
 #	option encryption 'sae-mixed'

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

@@ -11,6 +11,9 @@ al_brnet="${al_bridge:3}"
 # Exit if the PORT is not member of the AL Bridge
 [ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0
 
+# Exit if the device is not operating in extender/repeater mode
+[ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
+
 ############## Dynamic Backhaul Daemon ##############
 if [ -n "$(which dynbhd)" ]; then
 	pidof dynbhd >/dev/null && exit 0 # dynbhd is managing the links
@@ -47,8 +50,6 @@ if [ -n "$wanport" ]; then
 ########################################################
 else
 #################### DHCP Discovery ####################
-	[ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
-
 	if [ "$LINK" = "up" ]; then
 		brctl delif $al_bridge $PORT
 

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

@@ -179,7 +179,16 @@ create_dir() {
 }
 
 start_service() {
-	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
+	if [ -f /usr/sbin/dynbhd ]; then
+		# Start dynbhd only if the device is operating in extender/repeater mode
+		al_bridge="$(uci -q get mapagent.agent.al_bridge)"
+		if [ "${al_bridge:0:3}" = "br-" ]; then
+			al_brnet="${al_bridge:3}"
+			if [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ]; then
+				start_dynbhd_service
+			fi
+		fi
+	fi
 
 	config_load "mapagent"
 	validate_agent_config || return 1;
@@ -210,3 +219,8 @@ reload_service() {
 	stop
 	start
 }
+
+boot() {
+	/lib/wifi/multiap conf
+	start
+}

map-agent/files/lib/multiap/map_genconfig

@@ -0,0 +1,193 @@
+#!/bin/sh /etc/rc.common
+
+. /lib/functions.sh
+
+generate_mapagent_config=0
+generate_wireless_sta_config=0
+
+network_mode="$(fw_printenv -n netmode)"
+multiap_mode="$(fw_printenv -n multiap_mode)"
+
+is_airoha() {
+	[ -f /proc/device-tree/compatible ] || return
+	strings /proc/device-tree/compatible | grep -qE '^(econet,|airoha,)'; return
+}
+
+is_broadcom() {
+	[ -e /dev/bcm ] && return 0
+	return 1
+}
+
+is_qualcomm() {
+	[ -f /proc/device-tree/compatible ] || return
+	strings /proc/device-tree/compatible | grep -qE '^(qcom,|ipq,)'; return
+}
+
+generate_multiap_config() {
+	devidx=0
+
+	generate_config() {
+		dev="$1"
+
+		[ -n "$dev" ] || continue
+
+		config_get band $dev band
+
+		mode_band=""
+		priority=
+		dpp_chan=
+
+		case "$band" in
+			2g)
+				mode_band=2
+				priority=2
+				dpp_chan="81/1"
+			;;
+			5g)
+				mode_band=5
+				priority=1
+				dpp_chan="128/36"
+			;;
+			6g)
+				mode_band=6
+				priority=0
+				dpp_chan="133/49"
+			;;
+		esac
+
+		[ -n "$mode_band" ] || continue
+
+		devidx=$(echo ${dev} |tr -dc '0-9')
+
+		device="$dev"
+
+		if is_airoha; then
+			ifprefix="wlan%_%"
+			ifname="wlan${devidx}_0"
+			ifname_bh="wlan${devidx}_1"
+		elif is_broadcom; then
+			ifprefix="wl"
+			ifname="wl${devidx}"
+			ifname_bh="$ifname.1"
+			device="wl${devidx}"
+			brcm_setup="1"
+		elif is_qualcomm; then
+			ifprefix="wlan0%-"
+			ifname="wlan${devidx}"
+			ifname_bh="wlan${devidx}-1"
+		else
+			ifprefix="wlan%-%"
+			ifname="wlan$devidx"
+			ifname_bh="$ifname-0"
+		fi
+
+		if [ $generate_mapagent_config -eq 1 ]; then
+			uci set mapagent.agent.ifprefix="$ifprefix"
+			uci set mapagent.agent.brcm_setup="$brcm_setup"
+			uci add mapagent radio
+			uci set mapagent.@radio[-1].device="$device"
+			uci set mapagent.@radio[-1].band="$mode_band"
+
+			if [ "$network_mode" == "extender" ]; then
+				uci add mapagent bsta
+				uci set mapagent.@bsta[-1].device="$device"
+				uci set mapagent.@bsta[-1].ifname="$ifname"
+				uci set mapagent.@bsta[-1].band="$mode_band"
+				uci set mapagent.@bsta[-1].priority="$priority"
+
+				#uci add mapagent dpp_uri
+				#uci set mapagent.@dpp_uri[-1].type="qrcode"
+				#uci set mapagent.@dpp_uri[-1].device="$device"
+				#uci set mapagent.@dpp_uri[-1].ifname="$ifname"
+				#uci set mapagent.@dpp_uri[-1].band="$mode_band"
+				#uci set mapagent.@dpp_uri[-1].chirp_interval="10"
+				#uci add_list mapagent.@dpp_uri[-1].dpp_chan="$dpp_chan"
+
+				if [ $generate_wireless_sta_config -eq 1 ]; then
+					secname="default_sta_${device}"
+					uci set wireless.$secname=wifi-iface
+					uci set wireless.$secname.device="$device"
+					uci set wireless.$secname.mode="sta"
+					uci set wireless.$secname.ifname="$ifname"
+					uci set wireless.$secname.disabled="0"
+					uci set wireless.$secname.default_disabled="1"
+					uci set wireless.$secname.multi_ap="1"
+					uci commit wireless
+				else
+					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
+						\"match\":{\"mode\":\"sta\", \"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null
+				fi
+			else
+				uci add mapagent ap
+				uci set mapagent.@ap[-1].type="fronthaul"
+				uci set mapagent.@ap[-1].device="$device"
+				uci set mapagent.@ap[-1].ifname="$ifname"
+				uci set mapagent.@ap[-1].band="$mode_band"
+				uci add mapagent ap
+				uci set mapagent.@ap[-1].type="backhaul"
+				uci set mapagent.@ap[-1].device="$device"
+				uci set mapagent.@ap[-1].ifname="$ifname_bh"
+				uci set mapagent.@ap[-1].band="$mode_band"
+
+				if [ "$multiap_mode" != "none" ]; then
+					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
+						\"match\":{\"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"2\"}}" 2>/dev/null
+					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
+						\"match\":{\"ifname\":\"$ifname_bh\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null
+				fi
+			fi
+		fi
+	}
+
+	config_load wireless
+	config_foreach generate_config wifi-device
+}
+
+map_genconf () {
+	if [ -f /etc/config/mapagent -a -z "$(uci -q get mapagent.@radio[0].band)" ]; then
+		generate_mapagent_config=1
+	fi
+
+	if [ "$network_mode" == "extender" ]; then
+		if ! uci show wireless | grep -q "mode=.*sta"; then
+			generate_wireless_sta_config=1
+
+			if is_broadcom; then
+				for section in $(uci show wireless | grep wifi-device | cut -d'.' -f2 | cut -d'=' -f1); do
+					uci -q set wireless.$section.apsta="1"
+				done
+			fi
+
+			for section in $(uci show wireless | grep "mode=.*ap" | cut -d'.' -f2); do
+				uci delete wireless.$section
+			done
+		fi
+	fi
+
+	generate_multiap_config
+
+	if [ $generate_mapagent_config -eq 1 ]; then
+		uci set mapagent.agent.enabled="1"
+		if [ "$multiap_mode" == "agent" ]; then
+			uci -q set mapagent.@controller_select[0].autostart=0
+			uci -q set mapagent.@controller_select[0].local=0
+		elif [ "$multiap_mode" == "auto" ]; then
+			uci -q set mapagent.@controller_select[0].autostart=1
+			uci -q set mapagent.@controller_select[0].local=0
+		elif [ "$multiap_mode" == "full" ]; then
+			uci -q set mapagent.@controller_select[0].autostart=1
+			uci -q set mapagent.@controller_select[0].local=1
+		elif [ "$multiap_mode" == "none" ]; then
+			uci set mapagent.agent.enabled="0"
+		fi
+		uci -q commit mapagent
+	fi
+
+
+	if [ "$multiap_mode" == "agent" -o "$multiap_mode" == "none" ]; then
+		uci set mapcontroller.controller.enabled="0"
+	else
+		uci set mapcontroller.controller.enabled="1"
+	fi
+	uci -q commit mapcontroller
+}

map-controller/Config.in

@@ -11,18 +11,18 @@ config CONTROLLER_EASYMESH_VENDOR_EXT
 	default y
 
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	string
-	default "\\\\x11\\\\x22\\\\x33"
+	hex "Vendor OUI default"
+	default 0xB456FA
 
 config CONTROLLER_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 2
+	default 4
 
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
-	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
+	hex "Vendor OUI in 0xAABBCC format"
 	default CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	help
-	Extra features not covered by the base Easymesh specification can be
+	Extra features not covered by the base EasyMesh specification can be
 	enabled through CONTROLLER_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.3.0.3
+PKG_VERSION:=4.3.2.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=fb600940ac54456bcde650ccee7055f7c9bb785b
+PKG_SOURCE_VERSION:=5c57a6e2788b556f3d21ed39b415bc7e8e5db5ab
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0
@@ -53,7 +53,7 @@ TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
 
 ifeq ($(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)\\\"
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 

map-controller/files/etc/config/mapcontroller

@@ -1,13 +1,16 @@
 config controller 'controller'
-	option enabled '1'
-	option registrar '2 5'
+	option enabled '1'	# may be modified by other package start-up scripts (i.e. map-agent)
+	option profile '4'
+	option registrar '2 5 6'
 	option debug '0'
 	option bcn_metrics_max_num '10'
 	option initial_channel_scan '0'
-	option primary_vid '0'
+	option enable_ts '0'
+	option primary_vid '1'
 	option primary_pcp '0'
 	option allow_bgdfs '0'
 	option channel_plan '0'
+	option de_collect_interval '60'
 
 config sta_steering
 	option steer_module 'rcpi'
@@ -18,40 +21,65 @@ config sta_steering
 	option use_usta_metrics '0'
 	option bandsteer '0'
 	option diffsnr '8'
+	option rcpi_threshold_2g '70'
+	option rcpi_threshold_5g '86'
+	option rcpi_threshold_6g '86'
+	option report_rcpi_threshold_2g '80'
+	option report_rcpi_threshold_5g '96'
+	option report_rcpi_threshold_6g '96'
 
-config ap
-	option band '2'
-	option encryption 'sae-mixed'
-	option vid '1'
-	option ssid 'IOWRT-2.4GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
+###################
+# Default AP sections credentials will by updated
+# by uci-defaults script 99-mapcntlr
+###################
 
 config ap
 	option band '5'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option encryption 'sae-mixed'
+	option key '$WIFI_FH_KEY'
+	option vid '1'
 	option type 'fronthaul'
-	option vid '1'
-	option ssid 'IOWRT-5GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
 
 config ap
 	option band '2'
-	option type 'backhaul'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
+	option encryption 'sae-mixed'
+	option key '$WIFI_FH_KEY'
 	option vid '1'
-	list disallow_bsta '0'
-	option ssid 'MAP-BH-2.4GHz'
+	option type 'fronthaul'
+
+config ap
+	option band '6'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
 	option encryption 'sae'
-	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
+	option key '$WIFI_FH_KEY'
+	option vid '1'
+	option type 'fronthaul'
 
 config ap
 	option band '5'
+	option ssid 'MAP-$BASEMAC_ADDR-BH-5GHz'
+	option encryption 'sae'
+	option key '$WIFI_BH_KEY'
 	option type 'backhaul'
 	option vid '1'
-	list disallow_bsta '0'
-	option ssid 'MAP-BH-5GHz'
+
+config ap
+	option band '2'
+	option ssid 'MAP-$BASEMAC_ADDR-BH-2.4GHz'
 	option encryption 'sae'
-	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
+	option key '$WIFI_BH_KEY'
+	option type 'backhaul'
+	option vid '1'
+
+config ap
+	option band '6'
+	option ssid 'MAP-$BASEMAC_ADDR-BH-6GHz'
+	option encryption 'sae'
+	option key '$WIFI_BH_KEY'
+	option type 'backhaul'
+	option vid '1'
 
 # node and radio sections (per node) are auto
 # generated per Multi-AP Agent in the network
@@ -62,8 +90,6 @@ config ap
 #	option backhaul_ul_macaddr '00:00:00:00:00:00'
 #	option backhaul_dl_macaddr '00:00:00:00:00:00'
 #	option backhaul_type 'none'
-#	option primary_vid '1'
-#	option primary_pcp '0'
 #	option report_sta_assocfails '0'
 #	option report_sta_assocfails_rate '0'
 #	option report_metric_periodic '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' \
@@ -156,6 +155,10 @@ validate_controller_config() {
 	return 0
 }
 
+create_dir() {
+	mkdir -p /etc/multiap
+}
+
 start_service() {
 	local enabled
 
@@ -165,6 +168,8 @@ start_service() {
 	config_get_bool enabled controller enabled 1
 	[ "$enabled" -eq 0 ] && return
 
+	create_dir
+
 	procd_open_instance
 	procd_set_param command "/usr/sbin/mapcontroller" "-d"
 

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

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /etc/device_info
+
+WIFI_BH_KEY=$(openssl rand -rand /dev/urandom -hex 64 2>/dev/null | openssl dgst -hex -sha256 | cut -d " " -f 2)
+WIFI_BH_KEY=${WIFI_BH_KEY::-1}
+
+BASEMAC_ADDR="$(fw_printenv -n ethaddr | tr -d ':')"
+[ ${#BASEMAC_ADDR} -eq 12 ] || BASEMAC_ADDR="$(db -q get device.deviceinfo.BaseMACAddress | tr -d ':')"
+
+WIFI_FH_KEY="$(db get hw.board.wpa_key)"
+WIFI_FH_KEY="${WIFI_FH_KEY:-1234567890}"
+
+sed -i  -e "s/\$BASEMAC_ADDR/$BASEMAC_ADDR/g" \
+	-e "s/\$WIFI_FH_KEY/$WIFI_FH_KEY/g" \
+	-e "s/\$WIFI_BH_KEY/$WIFI_BH_KEY/g" \
+	-e "s/\$DEVICE_MANUFACTURER/$DEVICE_MANUFACTURER/g" \
+	/etc/config/mapcontroller	2>/dev/null

map-topology/Config.in

@@ -7,16 +7,20 @@ config TOPOLOGYD_EASYMESH_VENDOR_EXT
 	default y
 
 config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	string
-	default "\\\\x11\\\\x22\\\\x33"
+	hex "Vendor OUI default"
+	default 0xB456FA
 
 config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI
-	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
+	hex "Vendor OUI in 0xAABBCC format"
 	default TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	help
-	Extra features not covered by the base Easymesh specification can be
+	Extra features not covered by the base EasyMesh specification can be
 	enabled through TOPOLOGYD_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 
+config TOPOLOGYD_HOST_WAN_STATS
+	bool "Enable wan statistics collection per hosts"
+	default y
+
 endmenu
 endif

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.20
+PKG_VERSION:=2.5.2.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=e570731d6544335568a48a5dc4c6e65aed401045
+PKG_SOURCE_VERSION:=914f1ead2e65c1e24ed2d8786aa883730db2208f
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
@@ -49,9 +49,12 @@ endef
 MAKE_PATH:=src
 
 ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)\\\"
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)
 endif
 
+ifeq ($(CONFIG_TOPOLOGYD_HOST_WAN_STATS),y)
+TARGET_CFLAGS += -DHOST_WAN_STATS
+endif
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare

map-topology/files/etc/config/hosts

@@ -1,5 +0,0 @@
-
-config global 'global'
-	option ageing_timer '1440'
-	option reboot_persistent '0'
-	list ifname 'br-lan'

map-topology/files/etc/config/topology

@@ -4,4 +4,4 @@ config topology 'topology'
 	option depth '8'
 	option interval '60'
 	option maxlog '32'
-	option profile '2'
+	option profile '4'

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/common/etc/uci-defaults/61-mcast_config_generate

@@ -97,8 +97,7 @@ interfaces_ok(){
 		# mcast config is outdated, simply generate as per new logic
 		if [ -z "$dev_section" ]; then
 		       # check if the itf is a native interface	&& return 1
-			native=$(ubus call uci get '{"config":"ports", "type":"ethport", "match":{"ifname":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[])
-			[ -z "native" ] && return 1
+			[ -f "/proc/net/vlan/$itf" ] || return 1
 		fi
 	done
 	return 0

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

@@ -1,6 +1,7 @@
 #!/bin/sh
 
 . /lib/mcast/common.sh
+. /lib/functions/network.sh
 
 include /lib/network
 
@@ -9,37 +10,81 @@ PROG_EXE=/usr/sbin/mcproxy
 PROG_PARAMS=
 PROG_PARAMS_SEPARATOR=:
 
-setup_mcast_mode() {
-	 unused(){ :;}
+
+__device_is_bridge() {
+	local device="$2"
+	local devsec__="$(uci show network | grep name=.*$device | cut -d'.' -f2)"
+	local sectype="$(uci -q get network.$devsec__)"
+	local devtype="$(uci -q get network.$devsec__.type)"
+	[ "$sectype" != "device" -o "$devtype" != "bridge" ] && return 1
+	eval "$1=$devsec__"
+}
+
+device_is_bridge() {
+	local device="$1"
+	local devsec=
+	__device_is_bridge devsec "$device" || return 1
+}
+
+device_ports() {
+	local device="$1"
+	local devsec=
+
+	if __device_is_bridge devsec "$device"; then
+		echo "$(uci get network.$devsec.ports)"
+	else
+		echo "$device"
+	fi
+}
+
+device_has_ip() {
+	local protocol="$1"
+	local device="$2"
+
+	# Read the openwrt interface for the device.
+	# Device can have multiple logical interfaces like wan and wan6
+	# but same l3 device
+	# NB. Don't use 'get_network_of' here.
+	# This function fails in some uci configurations for interfaces that refer
+	# to a device indirectly.
+	local ifaces=$(ubus call network.interface dump | jsonfilter -e "@.interface[@.device='$device'].interface")
+	for iface in $ifaces; do
+		local ip=
+		case "$protocol" in
+			"igmp") network_get_ipaddr ip "$iface" ;;
+			"mld") network_get_ipaddr6 ip "$iface" ;;
+		esac
+		[ -n "$ip" ] && return
+	done
+
+	return 1
 }
 
 config_mcproxy_interfaces() {
-	local upstreams="$1"
-	local downstreams="$2"
-	local exceptions="$3"
+	local protocol="$1"
+	local upstreams="$2"
+	local downstreams="$3"
+	local exceptions="$4"
+
+	if [ -z "$upstreams" ] || [ -z "$downstreams" ]; then
+		return 1
+	fi
 
 	local str_up=""
-	if [ -n "$upstreams" ]; then
-		for upstream in $upstreams; do
-			str_up="$str_up \"$upstream\""
-		done
-	fi
+	for upstream in $upstreams; do
+		device_has_ip "$protocol" "$upstream" || continue
+		str_up="$str_up \"$upstream\""
+	done
+	[ -z "$str_up" ] && return 1
 
 	local str_down=""
-	if [ -n "$downstreams" ]; then
-		for downstream in $downstreams; do
-			str_down="$str_down \"$downstream\""
-		done
-	fi
+	for downstream in $downstreams; do
+		device_has_ip "$protocol" "$downstream" || continue
+		str_down="$str_down \"$downstream\""
+	done
+	[ -z "$str_down" ] && return 1
 
-	if [ ! -z $downstream ]; then
-		echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
-	fi
-
-
-	if [ -z "$exceptions" ] || [ -z "$upstreams" ]; then
-		return
-	fi
+	echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
 
 	for excp in $exceptions; do
 		local filter=""
@@ -55,14 +100,59 @@ config_mcproxy_interfaces() {
 			;;
 		esac
 
-		for upstream in $upstreams; do
-			echo "pinstance main upstream \"$upstream\" in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main upstream \"$upstream\" out blacklist table{$filter };" >> $CONFFILE
+		for upstream in $str_up; do
+			echo "pinstance main upstream $upstream in blacklist table{$filter };" >> $CONFFILE
+			echo "pinstance main upstream $upstream out blacklist table{$filter };" >> $CONFFILE
 		done
 
-		for downstream in $downstreams; do
-			echo "pinstance main downstream \"$downstream\" in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main downstream \"$downstream\" out blacklist table{$filter };" >> $CONFFILE
+		for downstream in $str_down; do
+			echo "pinstance main downstream $downstream in blacklist table{$filter };" >> $CONFFILE
+			echo "pinstance main downstream $downstream out blacklist table{$filter };" >> $CONFFILE
+		done
+	done
+}
+
+config_sysfs_mcast_snooping() {
+	local downstreams="$1"
+
+	for downstream in $downstreams; do
+		if device_is_bridge "$downstream"; then
+			echo 1 > /sys/class/net/$downstream/bridge/multicast_snooping
+		fi
+	done
+}
+
+config_sysfs_mcast_fastleave() {
+	local downstreams="$1"
+	local fastleave="$2"
+	local prt
+
+	for downstream in $downstreams; do
+		for prt in $(device_ports $downstream); do
+			if [ -f  /sys/class/net/$prt/brport/multicast_fast_leave ]; then
+				echo $fastleave > /sys/class/net/$prt/brport/multicast_fast_leave
+			fi
+		done
+	done
+}
+
+config_sysfs_mcast_mode() {
+	local downstreams=$1
+	local mcast_mode=$2
+	local prt
+
+	local mcast_flood=
+	if [ $mcast_mode == "2" ]; then # disable mcast flood
+		mcast_flood=0
+	else
+		mcast_flood=1
+	fi
+
+	for downstream in $downstreams; do
+		for prt in $(device_ports $downstream); do
+			if [ -f  /sys/class/net/$prt/brport/multicast_flood ]; then
+				echo $mcast_flood > /sys/class/net/$prt/brport/multicast_flood
+			fi
 		done
 	done
 }
@@ -79,6 +169,7 @@ config_mcproxy_instance() {
 	local exceptions=
 	local upstreams=
 	local downstreams=
+	local mcast_mode=2 # default value 2 is for blocking mode
 
 	CONFFILE=/var/etc/mcproxy_"$protocol".conf
 	rm -f $CONFFILE
@@ -103,6 +194,7 @@ config_mcproxy_instance() {
 
 		upstreams=$igmp_p_up_interfaces
 		downstreams=$igmp_p_down_interfaces
+		mcast_mode=$igmp_p_mode
 	elif [ "$protocol" == "mld" ]; then
 		case "$version" in
 			[1-2])
@@ -122,16 +214,24 @@ config_mcproxy_instance() {
 
 		upstreams=$mld_p_up_interfaces
 		downstreams=$mld_p_down_interfaces
+		mcast_mode=$mld_p_mode
 	fi
 
+	[ -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
 	[ -n "$last_mem_q_int" ] && echo -e "lmqi $last_mem_q_int;" >> $CONFFILE
 	[ -n "$fast_leave" ] && echo -e "fastleave $fast_leave;\n" >> $CONFFILE
 
-	[ -n "$upstreams" ] && [ -n "$downstreams" ] &&
-		config_mcproxy_interfaces "$upstreams" "$downstreams" "$exceptions"
+	config_mcproxy_interfaces "$protocol" "$upstreams" "$downstreams" "$exceptions" || return
+
+	# for snooping to work we should enable it on the bridge, doing it from
+	# here instead of from inside network config
+	config_sysfs_mcast_snooping "$downstreams"
+	[ -n $fast_leave ] &&
+		config_sysfs_mcast_fastleave "$downstreams" "$fast_leave"
+	config_sysfs_mcast_mode "$downstreams" "$mcast_mode"
 
 	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
 }
@@ -149,8 +249,16 @@ config_mcproxy() {
 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
 }

mcastmngr/files/linux/usr/libexec/rpcd/mcast

@@ -0,0 +1,163 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+read_mcast_stats() {
+	local temp_igmp_file='/tmp/igmp_stats_'$$
+	local snooping_stats='/tmp/igmp_snooping_stats'
+	local old_mod_time=$(date +%s 2>/dev/null -r "$snooping_stats")
+
+	# Sending signal to mcproxy to dump multicast data in /tmp/igmp_snooping_stats
+	local mcast_pids=$(pidof mcproxy)
+	for pid in $mcast_pids
+	do
+		$(kill -10 $pid)
+	done
+
+	# Wait for signal is being processed by mcproxy
+	if [ -n "$mcast_pids" ]; then
+		for i in 1 2 3; do
+			local new_mod_time=$(date +%s 2>/dev/null -r "$snooping_stats")
+			[ -n "$new_mod_time" ] && [ "$new_mod_time" != "$old_mod_time" ] && break
+			sleep 0.1
+		done
+	fi
+
+	cat "$snooping_stats" > "$temp_igmp_file"
+
+	local mcast_addrs=""
+	local ifaces=""
+
+	while read line; do
+	# reading each line
+		case $line in
+		br-*)
+			found_iface=0
+			snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+			if [ -z "$ifaces" ]; then
+				ifaces="$snoop_iface"
+				continue
+			fi
+
+			IFS=" "
+			for ifx in $ifaces; do
+				if [ $ifx == $snoop_iface ]; then
+					found_iface=1
+					break
+				fi
+			done
+
+			if [ $found_iface -eq 0 ]; then
+				ifaces="$ifaces $snoop_iface"
+				continue
+			fi
+			;;
+		esac
+	done < "$temp_igmp_file"
+
+	while read line; do
+	# reading each line
+		case $line in
+		br-*)
+			found_ip=0
+			grp_ip="$(echo $line | awk -F ' ' '{ print $2 }')"
+			if [ -z "$mcast_addrs" ]; then
+				mcast_addrs="$grp_ip"
+				continue
+			fi
+
+			IFS=" "
+			for ip_addr in $mcast_addrs; do
+				if [ $ip_addr == $grp_ip ]; then
+					found_ip=1
+					break
+				fi
+			done
+
+			if [ $found_ip -eq 0 ]; then
+				mcast_addrs="$mcast_addrs $grp_ip"
+				continue
+			fi
+			;;
+		esac
+	done < "$temp_igmp_file"
+
+	json_init
+	json_add_array "snooping"
+	json_add_object ""
+	IFS=" "
+	for intf in $ifaces; do
+		while read line; do
+		# reading each line
+			case $line in
+			br-*)
+				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+				if [ "$snoop_iface" != "$intf" ]; then
+					continue
+				fi
+				json_add_string "interface" "$intf"
+				json_add_array "groups"
+				break
+				;;
+			esac
+		done < "$temp_igmp_file"
+		IFS=" "
+		for gip_addr in $mcast_addrs; do
+			grp_obj_added=0
+			while read line; do
+			# reading each line
+				case $line in
+				br-*)
+					snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+					if [ "$snoop_iface" != "$intf" ]; then
+						continue
+					fi
+					grp_ip="$(echo $line | awk -F ' ' '{ print $2 }')"
+					if [ "$grp_ip" != "$gip_addr" ]; then
+						continue
+					fi
+					if [ $grp_obj_added -eq 0 ]; then
+						json_add_object ""
+						gip="$(ipcalc.sh $gip_addr | grep IP | awk '{print substr($0,4)}')"
+						json_add_string "groupaddr" "$gip"
+						json_add_array "clients"
+						grp_obj_added=1
+					fi
+
+					json_add_object ""
+					host_ip="$(echo $line | awk -F ' ' '{ print $3 }')"
+					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
+					json_add_string "ipaddr" "$h_ip"
+					src_port="$(echo $line | awk -F ' ' '{ print $4 }')"
+					json_add_string "device" "$src_port"
+					timeout="$(echo $line | awk -F ' ' '{ print $5 }')"
+					json_add_int "timeout" "$timeout"
+					json_close_object #close the associated device object
+					;;
+				esac
+			done < "$temp_igmp_file"
+			json_close_array #close the associated devices array
+			json_close_object # close the groups object
+		done # close the loop for group addresses
+		json_close_array #close the groups array
+	done # close the loop for interfaces
+	json_close_object # close the snooping object
+	json_close_array # close the snooping array
+	json_dump
+
+	rm -f "$temp_igmp_file"
+}
+
+case "$1" in
+	list)
+		echo '{ "stats":{} }'
+		;;
+	call)
+		case "$2" in
+			stats)
+				read_mcast_stats
+				;;
+		esac
+		;;
+esac

obudpst/Makefile

@@ -6,10 +6,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obudpst
-PKG_VERSION:=7.5.1
+PKG_VERSION:=8.0.0
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/BroadbandForum/obudpst.git
-PKG_SOURCE_VERSION:=a8faf1925ea9189467e7f8d3b9d93c67c8b927bd
+PKG_SOURCE_VERSION:=1d00a6de1147b5fb4280c443a67b7e5ded3a5c97
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

obuspa/Config.in

@@ -1,7 +1,4 @@
 if PACKAGE_obuspa
-
-menu "Configuration"
-
 config OBUSPA_DB_PATH
 	string "Configure path for usp.db file"
 	default "/tmp/"
@@ -23,7 +20,10 @@ 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
+
+config OBUSPA_ENABLE_TEST_CONTROLLER
+	bool "Adds a test controller by default"
 	default n
-endmenu
 endif

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.2.9
+PKG_VERSION:=7.0.2.26
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=0626e449c2d26787a28c40149dee0ddd8a607703
+PKG_SOURCE_VERSION:=7b3a47a4bf4c5e5a92470cb73ce15b09192e5936
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -31,6 +31,7 @@ define Package/obuspa
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=USP agent
+  MENU:=1
   DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
 endef
 
@@ -102,6 +103,7 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/obuspa
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
@@ -110,6 +112,12 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/TransferComplete.json $(1)/etc/bbfdm/json/TransferComplete.json
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/02-obuspa-dhcp-option $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user
+ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y)
+	$(INSTALL_BIN) ./files/etc/init.d/usptest $(1)/etc/init.d/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/55-test-usp-controller $(1)/etc/uci-defaults/
+endif
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,6 +1,8 @@
 config obuspa 'global'
 	option enabled '1'
 	option debug '0'
+	option dhcp_discovery '1'
+	option interface 'wan'
 	option log_level '1'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'

obuspa/files/etc/init.d/obuspa

@@ -12,7 +12,7 @@ KEEP_FILE="/lib/upgrade/keep.d/obuspa"
 
 RESET_FILE="/tmp/obuspa/obuspa_param_reset.txt"
 SQL_DB_FILE="/tmp/obuspa/usp.db"
-DB_DUMP="/tmp/obuspa/usp.dump"
+DB_DUMP="/tmp/obuspa/usp.dump_$(date +%s)"
 
 BASEPATH=""
 INSTANCE_COUNT=0
@@ -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} -v0 -f ${SQL_DB_FILE} -c show database |awk '/^Device./ || /^Internal./ {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)
@@ -206,6 +196,10 @@ validate_obuspa_section()
 		'debug:bool:0' \
 		'prototrace:bool:0' \
 		'log_level:uinteger' \
+		'min_num_to_group:uinteger' \
+		'max_group_sep:uinteger' \
+		'max_cache_time:uinteger' \
+		'ipc_timeout:uinteger' \
 		'log_dest:string' \
 		'db_file:string' \
 		'role_file:file'
@@ -235,7 +229,9 @@ validate_controller_section()
 		'Port:port' \
 		'Path:string' \
 		'EnableEncryption:bool' \
-		'SessionMode:string'
+		'PeriodicNotifInterval:uinteger' \
+		'SessionMode:string:Allow' \
+		'ProvisioningCode:string'
 }
 
 validate_subscription_section()
@@ -260,6 +256,7 @@ validate_mtp_section()
 		'mqtt:string' \
 		'stomp:string' \
 		'Reference:string' \
+		'PublishQoS:uinteger' \
 		'EnableEncryption:bool'
 }
 
@@ -311,7 +308,6 @@ configure_localagent()
 	}
 
 	db_set Device.LocalAgent.EndpointID "${EndpointID}"
-	update_db_dump
 }
 
 update_reset_reason()
@@ -327,8 +323,8 @@ 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 Topic mqtt stomp assigned_role_name AssignedRole ParameterName ProvisioningCode
+	local Host Port Path EnableEncryption Reference SessionMode PeriodicNotifInterval
 	local dm_ref sec
 
 	sec="${1}"
@@ -366,6 +362,14 @@ configure_controller()
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.EndpointID" "${EndpointID}"
 
+	if [ -n "${ProvisioningCode}" ]; then
+		db_set "${BASEPATH}.ProvisioningCode" "${ProvisioningCode}"
+	fi
+
+	if [ -n "${PeriodicNotifInterval}" ]; then
+		db_set "${BASEPATH}.PeriodicNotifInterval" "${PeriodicNotifInterval}"
+	fi
+
 	if [ -n "${SessionMode}" ]; then
 		db_set "${BASEPATH}.E2ESession.SessionMode" "${SessionMode}"
 	fi
@@ -410,9 +414,6 @@ configure_controller()
 		db_set "${BASEPATH}.BootParameter.${_pnum}.ParameterName" "${param}"
 		_pnum=$(( _pnum + 1 ))
 	done
-
-	db_set
-	update_db_dump
 }
 
 configure_subscription()
@@ -505,7 +506,6 @@ configure_challenges()
 	sec="${1}"
 	validate_challenge_section "${1}" || {
 		log "Validation of challenge section failed"
-		exit 1;
 	}
 
 	sec="${sec/challenge_/cpe-}"
@@ -538,7 +538,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 +577,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 +591,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 +621,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 +650,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 +703,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 +750,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 +776,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 +809,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 +925,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 +942,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 +970,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 +1026,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;
 }
@@ -1028,8 +1040,8 @@ register_service()
 
 	configure_obuspa
 	procd_set_param respawn \
-			"${respawn_threshold:-5}" \
-			"${respawn_timeout:-10}" "${respawn_retry:-3}"
+			"${respawn_threshold:-10}" \
+			"${respawn_timeout:-10}" "${respawn_retry:-5}"
 
 	procd_set_param watch bbfdm
 	procd_close_instance

obuspa/files/etc/init.d/usptest

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

obuspa/files/etc/uci-defaults/02-obuspa-dhcp-option

@@ -0,0 +1,59 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+configure_dhcp_options() {
+	local enabled inerface discovery
+	config_load obuspa
+	config_get_bool enabled global enabled 1
+	config_get interface global interface "wan"
+	config_get_bool discovery global dhcp_discovery 1
+
+	if [ "${enabled}" -eq 0 ]; then
+		return 0
+	fi
+
+	if [ "${discovery}" -eq 1 ]; then
+		network_uci_update=0
+		reqopts="$(uci -q get network."${interface}".reqopts)"
+		proto="$(uci -q get network."${interface}".proto)"
+		local req125_present=0
+
+		for ropt in $reqopts; do
+			case $ropt in
+				125) req125_present=1 ;;
+				*) ;;
+			esac
+		done
+
+		sendopts="$(uci -q get network."${interface}".sendopts)"
+		opt124="124:"
+		send124_present=0
+		for sopt in $sendopts; do
+			if [[ "$sopt" == "$opt124"* ]]; then
+				send124_present=1
+				break
+			fi
+		done
+
+		if [ "${proto}" = "dhcp" ]; then
+			if [ ${req125_present} -eq 0 ]; then
+				newreqopts="$reqopts 125"
+				uci -q set network."${interface}".reqopts="$newreqopts"
+				network_uci_update=1
+			fi
+
+			if [ ${send124_present} -eq 0 ]; then
+				newsendopts="${sendopts} 124:00:00:0D:E9:04:03:75:73:70"
+				uci -q set network."${interface}".sendopts="$newsendopts"
+				network_uci_update=1
+			fi
+		fi
+
+		if [ ${network_uci_update} -eq 1 ]; then
+			uci commit network
+		fi
+	fi
+}
+
+configure_dhcp_options

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

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

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)

obuspa/patches/0003-set-internal-role-fix.patch

@@ -10,7 +10,7 @@
      {
 --- a/src/core/data_model.h
 +++ b/src/core/data_model.h
-@@ -324,6 +324,7 @@ void DATA_MODEL_DumpSchema(void);
+@@ -325,6 +325,7 @@ void DATA_MODEL_DumpSchema(void);
  void DATA_MODEL_DumpInstances(void);
  char DATA_MODEL_GetJSONParameterType(char *path);
  int DATA_MODEL_SetParameterInDatabase(char *path, char *value);

obuspa/patches/0004-suppress-notification-logs.patch

@@ -1,6 +1,6 @@
 --- a/src/core/data_model.c
 +++ b/src/core/data_model.c
-@@ -1239,7 +1239,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
+@@ -1242,7 +1242,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
      // Exit if instance already exists - nothing to do
      if (exists)
      {
@@ -9,7 +9,7 @@
          return USP_ERR_CREATION_FAILURE;
      }
  
-@@ -1324,7 +1324,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
+@@ -1327,7 +1327,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
      // Exit if instance does not exist - nothing to do
      if (exists == false)
      {

obuspa/patches/0007-bdc_csv_format.patch

@@ -1,8 +1,6 @@
-diff --git a/src/core/bdc_exec.c b/src/core/bdc_exec.c
-index 3670361..6a6325d 100644
 --- a/src/core/bdc_exec.c
 +++ b/src/core/bdc_exec.c
-@@ -547,11 +547,19 @@ int StartSendingReport(bdc_connection_t *bc)
+@@ -547,11 +547,19 @@ int StartSendingReport(bdc_connection_t
  
      // Set the list of headers
      bc->headers = NULL;
@@ -25,8 +23,6 @@ index 3670361..6a6325d 100644
  
      if (bc->flags & BDC_FLAG_GZIP)
      {
-diff --git a/src/core/bdc_exec.h b/src/core/bdc_exec.h
-index ff37a2d..ee29c85 100644
 --- a/src/core/bdc_exec.h
 +++ b/src/core/bdc_exec.h
 @@ -53,6 +53,9 @@ void BDC_EXEC_ScheduleExit(void);
@@ -40,8 +36,6 @@ index ff37a2d..ee29c85 100644
 +#define BDC_FLAG_HEADER_PER_COL  0x00000040 // If set, report format in header would be csv ParameterPerColumn
  
  #endif
-diff --git a/src/core/device_bulkdata.c b/src/core/device_bulkdata.c
-index a7d1b3e..fab9731 100755
 --- a/src/core/device_bulkdata.c
 +++ b/src/core/device_bulkdata.c
 @@ -67,9 +67,12 @@
@@ -78,7 +72,7 @@ index a7d1b3e..fab9731 100755
  } profile_ctrl_params_t;
  
  //------------------------------------------------------------------------------
-@@ -208,6 +217,7 @@ int Validate_BulkDataEncodingType(dm_req_t *req, char *value);
+@@ -208,6 +217,7 @@ int Validate_BulkDataEncodingType(dm_req
  int Validate_BulkDataReportingInterval(dm_req_t *req, char *value);
  int Validate_BulkDataReference(dm_req_t *req, char *value);
  int Validate_BulkDataReportFormat(dm_req_t *req, char *value);
@@ -86,7 +80,7 @@ index a7d1b3e..fab9731 100755
  int Validate_BulkDataReportTimestamp(dm_req_t *req, char *value);
  int Validate_BulkDataCompression(dm_req_t *req, char *value);
  int Validate_BulkDataHTTPMethod(dm_req_t *req, char *value);
-@@ -236,6 +246,8 @@ bulkdata_profile_t *bulkdata_find_profile(int profile_id);
+@@ -236,6 +246,8 @@ bulkdata_profile_t *bulkdata_find_profil
  int bulkdata_calc_report_map(bulkdata_profile_t *bp, kv_vector_t *report_map);
  int bulkdata_reduce_to_alt_name(char *spec, char *path, char *alt_name, char *out_buf, int buf_len);
  char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp, char *report_format);
@@ -95,7 +89,7 @@ index a7d1b3e..fab9731 100755
  unsigned char *bulkdata_compress_report(profile_ctrl_params_t *ctrl, char *input_buf, int input_len, int *p_output_len);
  int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_profile_t *bp, unsigned char *json_report, int report_len);
  int bulkdata_start_profile(bulkdata_profile_t *bp);
-@@ -250,6 +262,7 @@ char *bulkdata_platform_calc_uri_query_string(kv_vector_t *escaped_map);
+@@ -250,6 +262,7 @@ char *bulkdata_platform_calc_uri_query_s
  int bulkdata_platform_get_param_refs(int profile_id, param_ref_vector_t *param_refs);
  void bulkdata_expand_param_ref(param_ref_entry_t *pr, group_get_vector_t *ggv);
  void bulkdata_append_to_result_map(param_ref_entry_t *pr, group_get_vector_t *ggv, kv_vector_t *report_map);
@@ -135,7 +129,7 @@ index a7d1b3e..fab9731 100755
      // Device.BulkData.Profile.{i}.HTTP
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.URL", "", NULL, NotifyChange_BulkDataURL, DM_STRING);
      err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.Username", "", NULL, NULL, DM_STRING);
-@@ -591,9 +611,10 @@ int Validate_BulkDataProtocol(dm_req_t *req, char *value)
+@@ -591,9 +611,10 @@ int Validate_BulkDataProtocol(dm_req_t *
  int Validate_BulkDataEncodingType(dm_req_t *req, char *value)
  {
      // Exit if trying to set a value outside of the range we accept
@@ -148,12 +142,10 @@ index a7d1b3e..fab9731 100755
          return USP_ERR_INVALID_VALUE;
      }
  
-@@ -674,6 +695,32 @@ int Validate_BulkDataReportFormat(dm_req_t *req, char *value)
-     return USP_ERR_OK;
- }
+@@ -676,6 +697,32 @@ int Validate_BulkDataReportFormat(dm_req
  
-+/*********************************************************************//**
-+**
+ /*********************************************************************//**
+ **
 +** Validate_BulkDataCSVReportFormat
 +**
 +** Validates Device.BulkData.Profile.{i}.CSVEncoding.ReportFormat
@@ -178,10 +170,12 @@ index a7d1b3e..fab9731 100755
 +    return USP_ERR_OK;
 +}
 +
- /*********************************************************************//**
- **
++/*********************************************************************//**
++**
  ** Validate_BulkDataReportTimestamp
-@@ -1970,6 +2017,14 @@ int bulkdata_platform_get_profile_control_params(bulkdata_profile_t *bp, profile
+ **
+ ** Validates Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp
+@@ -1970,6 +2017,14 @@ int bulkdata_platform_get_profile_contro
          return err;
      }
  
@@ -196,7 +190,7 @@ index a7d1b3e..fab9731 100755
      // Exit if unable to get ReportTimestamp
      USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportTimestamp", bp->profile_id);
      err = DATA_MODEL_GetParameterValue(path, ctrl_params->report_timestamp, sizeof(ctrl_params->report_timestamp), 0);
-@@ -1986,6 +2041,46 @@ int bulkdata_platform_get_profile_control_params(bulkdata_profile_t *bp, profile
+@@ -1986,6 +2041,46 @@ int bulkdata_platform_get_profile_contro
          return err;
      }
  
@@ -243,7 +237,7 @@ index a7d1b3e..fab9731 100755
      return USP_ERR_OK;
  }
  
-@@ -2222,7 +2317,7 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+@@ -2222,7 +2317,7 @@ void bulkdata_process_profile_http(bulkd
  {
      int err;
      report_t *cur_report;
@@ -252,7 +246,7 @@ index a7d1b3e..fab9731 100755
      profile_ctrl_params_t ctrl;
      unsigned char *compressed_report;
      int compressed_len;
-@@ -2261,10 +2356,23 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+@@ -2261,10 +2356,23 @@ void bulkdata_process_profile_http(bulkd
      }
  
      // Exit if unable to generate the report
@@ -280,7 +274,7 @@ index a7d1b3e..fab9731 100755
          return;
      }
  
-@@ -2273,14 +2381,14 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+@@ -2273,14 +2381,14 @@ void bulkdata_process_profile_http(bulkd
      USP_LOG_Info("BULK DATA: using compression method=%s", ctrl.compression);
      if (enable_protocol_trace)
      {
@@ -299,7 +293,7 @@ index a7d1b3e..fab9731 100755
      }
      // NOTE: From this point on, only the compressed_report exists
  
-@@ -2310,9 +2418,15 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+@@ -2310,9 +2418,15 @@ void bulkdata_process_profile_usp_event(
      kv_vector_t event_args;
      kv_pair_t kv;
      report_t *cur_report;
@@ -316,7 +310,7 @@ index a7d1b3e..fab9731 100755
  
      // Exit if the MTP has not been connected to successfully after bootup
      // This is to prevent BDC events being enqueued before the Boot! event is sent (the Boot! event is only sent after successfully connecting to the MTP).
-@@ -2321,20 +2435,62 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+@@ -2321,20 +2435,62 @@ void bulkdata_process_profile_usp_event(
          goto exit;
      }
  
@@ -390,7 +384,7 @@ index a7d1b3e..fab9731 100755
      }
  
      // When sending via USP events, only one report is ever sent in each USP event
-@@ -2354,10 +2510,16 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+@@ -2354,10 +2510,16 @@ void bulkdata_process_profile_usp_event(
      bp->num_retained_reports = 1;
  
      // Exit if unable to generate the report
@@ -410,7 +404,7 @@ index a7d1b3e..fab9731 100755
          return;
      }
  
-@@ -2365,15 +2527,15 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+@@ -2365,15 +2527,15 @@ void bulkdata_process_profile_usp_event(
  
      // Construct event_args manually to avoid the overhead of a malloc and copy of the report in KV_VECTOR_Add()
      kv.key = "Data";
@@ -429,12 +423,10 @@ index a7d1b3e..fab9731 100755
  
      // From the point of view of this code, the report(s) have been successfully sent, so don't retain them
      // NOTE: Sending of the reports successfully is delegated to the USP notification retry mechanism
-@@ -2833,6 +2995,219 @@ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timesta
-     return result;
- }
+@@ -2835,6 +2997,219 @@ char *bulkdata_generate_json_report(bulk
  
-+/*********************************************************************//**
-+**
+ /*********************************************************************//**
+ **
 +** append_string_to_target
 +**
 +** concatenates the src string with target string in newly allocated memory
@@ -646,10 +638,12 @@ index a7d1b3e..fab9731 100755
 +    return output;
 +}
 +
- /*********************************************************************//**
- **
++/*********************************************************************//**
++**
  **  bulkdata_compress_report
-@@ -2986,9 +3361,18 @@ int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_
+ **
+ **  Compresses the report to send
+@@ -2986,9 +3361,18 @@ int bulkdata_schedule_sending_http_repor
          flags |= BDC_FLAG_DATE_HEADER;
      }
  

obuspc/Makefile

@@ -0,0 +1,73 @@
+#
+# Copyright (C) 2023 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=obuspc
+PKG_VERSION:=1.0.1.2
+
+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:=2ae29195817e75ada7c030a03662e72dbaae8e77
+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_BIN) ./files/etc/uci-defaults/100-add-mosquitto-listener $(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 '9006'
+	option TransportProtocol 'TCP/IP'
+
+config controller 'controller'
+	option EndpointID 'proto::discovery-usp-controller'
+	option Protocol 'MQTT'
+	option ResponseTopicConfigured '/usp/discovery/controller'
+	option mqtt 'mqtt'
+
+config agent 'agent'
+	option Topic '/usp/endpoint'

obuspc/files/etc/init.d/obuspc

@@ -0,0 +1,610 @@
+#!/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
+. /lib/functions.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}"
+}
+
+convert_to_hex() {
+	local val=""
+	local optval="${1}"
+	OPTIND=1
+	while getopts ":" opt "-$optval"
+	do
+		temp=$(printf "%02X" "'${OPTARG:-:}")
+		val="${val}:${temp}"
+	done
+
+	echo "${val}"
+}
+
+check_for_suboptions() {
+	new_opt=""
+	# Check if option 25 and 29 present inside enterprise id 3561
+	data=$(echo "${1}" | sed 's/://g')
+	len=$(printf "${data}"|wc -c)
+
+	rem_len="${len}"
+	while [ $rem_len -gt 8 ]; do
+		subopt_present=0
+
+		ent_id="${data:0:8}"
+		ent_id=$(printf "%d\n" "0x$ent_id")
+		if [ $ent_id -ne 3561 ]; then
+			len_val=${data:8:2}
+			data_len=$(printf "%d\n" "0x$len_val")
+			# add 4 byte for ent_id and 1 byte for len
+			data_len=$(( data_len * 2 + 10 ))
+
+			opt=${data:0:"${data_len}"}
+			if [ -n "${new_opt}" ]; then
+				new_opt="${new_opt}:$(echo ${opt} | sed 's/../&:/g;s/:$//')"
+			else
+				new_opt="$(echo ${opt} | sed 's/../&:/g;s/:$//')"
+			fi
+
+			# move ahead data to next enterprise id
+			data=${data:"${data_len}":"${rem_len}"}
+			rem_len=$(( rem_len - data_len ))
+			continue
+		fi
+
+		# read the length of enterprise data
+		len_val=${data:8:2}
+		data_len=$(printf "%d\n" "0x$len_val")
+		# add 4 byte for ent_id and 1 byte for len
+		data_len=$(( data_len * 2 + 10 ))
+
+		len_val=${data:8:2}
+		opt_len=$(printf "%d\n" "0x$len_val")
+		if [ $opt_len -eq 0 ]; then
+			echo "${new_opt}"
+			return 0
+		fi
+
+		# populate the option data of enterprise id
+		sub_data_len=$(( opt_len * 2))
+		# starting 10 means ahead of length field
+		sub_data=${data:10:"${sub_data_len}"}
+
+		# parsing of suboption of option 125
+		while [ $sub_data_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${sub_data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+			case "${sub_opt_id}" in
+			"25") subopt_present=1
+			;;
+			"26") subopt_present=1
+			;;
+			"27") subopt_present=1
+			;;
+			"28") subopt_present=1
+			;;
+			"29") subopt_present=1
+			;;
+			esac
+
+			if [ $subopt_present -eq 1 ]; then
+				break;
+			fi
+
+			# get the length of suboption
+			sub_opt_len=${sub_data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+		done
+
+		if [ $subopt_present -eq 1 ]; then
+			# move ahead data to next enterprise id
+			rem_len=$(( rem_len - $data_len ))
+			data=${data:"${data_len}":"${rem_len}"}
+		else
+			opt=${data:0:"${data_len}"}
+			if [ -n "${new_opt}" ]; then
+				new_opt="${new_opt}:$(echo ${opt} | sed 's/../&:/g;s/:$//')"
+			else
+				new_opt="$(echo ${opt} | sed 's/../&:/g;s/:$//')"
+			fi
+
+			# move ahead data to next enterprise id
+			rem_len=$(( rem_len - $data_len ))
+			data=${data:"${data_len}":"${rem_len}"}
+		fi
+	done
+
+	echo "${new_opt}"
+}
+
+configure_dnsmasq_op125() {
+	intf="${1}"
+
+	endpoint=""
+	proto=""
+	address=""
+	port=""
+	topic=""
+	prov_code="obusp-client"
+	interval="5"
+	multiplier="2000"
+
+	config_load ${CONFIGURATION}
+	config_get endpoint controller EndpointID
+	config_get proto controller Protocol
+	if [ -z "${endpoint}" ] || [ -z "${proto}" ]; then
+		return 0
+	fi
+
+	if [ "${proto}" = "MQTT" ]; then
+		config_get port mqtt BrokerPort "1883"
+		config_get topic controller ResponseTopicConfigured
+		proto="mqtt://"
+	else
+		return 0
+	fi
+
+	address=$(ifstatus "${intf}" | jsonfilter -q -e '@["ipv4-address"][0].address')
+	if [ -z "${address}" ] || [ -z "${topic}" ]; then
+		return 0
+	fi
+
+	subop_present=0
+	opt125="125,"
+	base_opt=""
+
+	service="$(uci -q get dhcp."${intf}".dhcpv4)"
+	if [ "${service}" = "server" ]; then
+		opt_list="$(uci -q get dhcp."${intf}".dhcp_option)"
+		for sopt in $opt_list; do
+			if [[ "$sopt" == "$opt125"* ]]; then
+				base_opt=$(check_for_suboptions "${sopt:4}")
+				uci -q del_list dhcp."${intf}".dhcp_option="$sopt"
+				uci -q commit dhcp
+				break
+			fi
+		done
+	else
+		return 0
+	fi
+
+	if [ -z "${base_opt}" ]; then
+		opt125="125,00:00:0D:E9"
+	else
+		opt125="125,${base_opt}:00:00:0D:E9"
+	fi
+
+	url="${proto}${address}:${port}${topic}"
+	url_len=$(echo -n "${url}" | wc -m)
+	prov_code_len=$(echo -n "${prov_code}" | wc -m)
+	endpoint_len=$(echo -n "${endpoint}" | wc -m)
+	interval_len=$(echo -n "${interval}" | wc -m)
+	multiplier_len=$(echo -n "${multiplier}" | wc -m)
+
+	([ ${url_len} -gt 255 ] || [ ${prov_code_len} -gt 255 ] || [ ${endpoint_len} -gt 255 ]) && return 0
+	([ ${interval_len} -gt 255 ] || [ ${multiplier_len} -gt 255 ]) && return 0
+
+	opt125_len=$((url_len + prov_code_len + endpoint_len + interval_len + multiplier_len))
+	opt125_len=$((opt125_len + 10))
+
+	[ $opt125_len -gt 255 ] && return 0
+
+        hex_opt125_len=$(printf "%02X" "${opt125_len}")
+        opt125="${opt125}:${hex_opt125_len}"
+        hex_url=$(convert_to_hex "${url}")
+        if [ -z "${hex_url}" ]; then
+                return 0
+        fi
+
+        hex_url_len=$(printf "%02X" "${url_len}")
+        opt125="${opt125}:19:${hex_url_len}${hex_url}"
+
+        hex_prov_code=$(convert_to_hex "${prov_code}")
+        if [ -z "${hex_prov_code}" ]; then
+                return 0
+        fi
+
+        hex_prov_len=$(printf "%02X" "${prov_code_len}")
+	opt125="${opt125}:1A:${hex_prov_len}${hex_prov_code}"
+
+	hex_interval=$(convert_to_hex "${interval}")
+	if [ -z "${hex_interval}" ]; then
+		return 0
+	fi
+
+	hex_interval_len=$(printf "%02X" "${interval_len}")
+	opt125="${opt125}:1B:${hex_interval_len}${hex_interval}"
+
+	hex_multiplier=$(convert_to_hex "${multiplier}")
+	if [ -z "${hex_multiplier}" ]; then
+		return 0
+	fi
+
+	hex_multiplier_len=$(printf "%02X" "${multiplier_len}")
+	opt125="${opt125}:1C:${hex_multiplier_len}${hex_multiplier}"
+
+	hex_endpoint=$(convert_to_hex "${endpoint}")
+	if [ -z "${hex_endpoint}" ]; then
+		return 0
+	fi
+
+	hex_endpoint_len=$(printf "%02X" "${endpoint_len}")
+	opt125="${opt125}:1D:${hex_endpoint_len}${hex_endpoint}"
+
+	uci -q add_list dhcp."${intf}".dhcp_option="$opt125"
+	ubus call uci commit '{"config":"dhcp"}'
+}
+
+boot() {
+	local enabled
+	local interface
+
+	config_load ${CONFIGURATION}
+	config_get_bool enabled global enabled 0
+	config_get interface global interface "lan"
+
+	if [ "${enabled}" -eq 0 ]; then
+		return 0;
+	fi
+
+	configure_dnsmasq_op125 "${interface}"
+
+	start
+}
+
+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
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "obuspc"
+}

obuspc/files/etc/uci-defaults/100-add-mosquitto-listener

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+section_exist=$(uci -q get mosquitto.obuspc)
+if [ -z "${section_exist}" ]; then
+	section=$(uci -q add mosquitto listener)
+	uci -q rename mosquitto.$section="obuspc"
+fi
+
+port=$(uci -q get obuspc.mqtt.BrokerPort)
+uci -q set mosquitto.obuspc.enabled="1"
+uci -q set mosquitto.obuspc.port=$port
+uci -q set mosquitto.obuspc.allow_anonymous="1"
+uci commit mosquitto

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,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.4.1
+PKG_VERSION:=1.5.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git
-PKG_SOURCE_VERSION:=415b7b59d7cd84cb133b20e27eca63a8cd74a155
+PKG_SOURCE_VERSION:=e68c87c5648182cc08e69c5fd368e8d178f24804
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -42,10 +42,9 @@ define Package/periodicstats/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(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
+	$(INSTALL_DIR) $(1)/etc/periodicstats
+	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/etc/periodicstats
 endef
 
 $(eval $(call BuildPackage,periodicstats))

periodicstats/files/etc/init.d/periodicstats

@@ -3,14 +3,19 @@
 START=99
 STOP=01
 
+. /etc/bbfdm/bbfdm_services.sh
+
 USE_PROCD=1
-PROG=/usr/sbin/periodicstatsd
+PROG="/usr/sbin/periodicstatsd"
+PERIODICSTATS_JSON_INPUT="/etc/periodicstats/input.json"
 
 start_service() {
 	local enable
 
 	config_load periodicstats
 	config_get_bool enable globals enable 1
+	
+	bbfdm_add_service "bbfdm.periodicstats" "${PERIODICSTATS_JSON_INPUT}"
 
 	if [ "${enable}" -ne "1" ]; then
 		return 0;

periodicstats/files/etc/periodicstats/input.json

@@ -0,0 +1,15 @@
+{
+	"daemon": {
+		"input": {
+			"type": "DotSo",
+			"name": "/etc/periodicstats/libperiodicstats.so"
+		},
+		"output": {
+			"type": "UBUS",
+			"name": "bbfdm.periodicstats",
+			"parent_dm": "Device.",
+			"object": "PeriodicStatistics",
+			"root_obj": "bbfdm"
+		}
+	}
+}

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

@@ -11,20 +11,54 @@ set_serial_number() {
 	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
 }
 
+set_equipment_id() {
+	local eqid=$1
+	local eq_id_default="KE2.119.241R2B"
+
+	if [ -z "$eqid"  ]; then
+		return
+	fi
+
+	if [ "$eqid" = "$eq_id_default" ]; then
+		return
+	fi
+
+        /userfs/bin/omcicfgCmd set equipmentId ${eqid}
+}
+
+set_loid_authentication() {
+	local loid=$1
+	local loid_pwd=$2
+
+	[ -z "$loid" ] && return
+
+	/userfs/bin/omcicfgCmd set loid ${loid}
+
+	if [ -n "$loid_pwd" ]; then
+		/userfs/bin/omcicfgCmd set loid_password ${loid_pwd}
+	fi
+}
+
+apply_xpon_uci_config() {
+	configure_loid_authentication
+	configure_equipment_id
+}
+
 init_xpon() {
 	# don't start pon daemons if xpon module is not loaded
 	[ -d /sys/module/xpon ] || return
 
 	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
 }
 

ponmngr/files/broadcom/lib/xpon/broadcom.sh

@@ -12,11 +12,35 @@ set_serial_number() {
 	bs /b/c gpon onu_sn={vendor_id=$vendor_id,vendor_specific=$vssn}
 }
 
-init_xpon() {
-	procd_open_instance pon_msgd
-	procd_set_param command bcm_msgd -c gpon
-	procd_close_instance
+set_equipment_id() {
+	equipment_id=$1
+	[ -z "$equipment_id" ] && return
 
+	json_add_string "equipment_id" $equipment_id
+}
+
+set_loid_authentication() {
+	loid=$1
+	loid_password=$2
+	[ -z "$loid" ] && return
+
+	json_add_string "loid" $loid
+	json_add_string "loid_password" $loid_password
+}
+
+apply_xpon_uci_config() {
+
+	json_init
+	json_add_object 'ani'
+	sn="$(uci -q get xpon.ani.serial_number)"
+	json_add_string "serial_number" $sn
+	configure_loid_authentication
+	configure_equipment_id
+	json_close_object
+	json_dump > /tmp/xpon.json
+}
+
+init_xpon() {
 	procd_open_instance pon_daemon
 	procd_set_param command omcid start -n
 	procd_set_param respawn

ponmngr/files/common/etc/init.d/xpon

@@ -27,6 +27,7 @@ configure_serial_number() {
 start_service() {
 	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
 		configure_serial_number
+		apply_xpon_uci_config
 		init_xpon
 	fi
 }

ponmngr/files/common/etc/uci-defaults/60-xpon-generate

@@ -14,6 +14,28 @@ configure_serial_number() {
 	fi
 }
 
+configure_loid_authentication() {
+	local production_loid
+	local production_loidpwd
+
+	loid="$(uci -q get xpon.ani.loid)"
+	loidpwd="$(uci -q get xpon.ani.loid_password)"
+        if [ -z $loid ]; then
+		production_loid="$(fw_printenv -n gponloid)"
+	fi
+	if [ -z $loidpwd ]; then
+		production_loidpwd="$(fw_printenv -n gponloid_password)"
+	fi
+
+	if [ -n $production_loid ]; then
+		uci set xpon.ani.loid=$production_loid
+	fi
+	if [ -n $production_loidpwd ]; then
+		uci set xpon.ani.loid_password=$production_loidpwd
+	fi
+
+}
+
 if [ -s "/etc/config/xpon" ]; then
         if uci -q get xpon.ani >/dev/null; then
                 # generate serial number in case its not present and return
@@ -21,6 +43,7 @@ if [ -s "/etc/config/xpon" ]; then
 		if [ ${#serial_number} -ne 12 ]; then
 			configure_serial_number
 		fi
+		configure_loid_authentication
                 exit                                  
         else                                          
                 rm -f /etc/config/xpon
@@ -31,4 +54,5 @@ touch /etc/config/xpon
 uci set xpon.ani=ani
 uci set xpon.ani.enable="1"
 configure_serial_number
+configure_loid_authentication
 

ponmngr/files/common/lib/xpon/get_uci_config.sh

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+configure_equipment_id() {                                                      
+        eqid="$(uci -q get xpon.ani.equipment_id)"                              
+        set_equipment_id $eqid                                                  
+}                                                                               
+                                                                                
+configure_loid_authentication() {                                               
+        loid="$(uci -q get xpon.ani.loid)"                                      
+        loid_pwd="$(uci -q get xpon.ani.loid_password)"                         
+        set_loid_authentication $loid $loid_pwd                                 
+}
+

ponmngr/files/etc/bbfdm/json/xpon.json

@@ -587,7 +587,7 @@
 					],
 					"datatype": "string",
 					"enumerations": [
-						"GPON",
+						"G-PON",
 						"XG-PON",
 						"NG-PON2",
 						"XGS-PON"
@@ -858,7 +858,7 @@
 							}
 						]
 					},
-					"ModuleVendor": {
+					"VendorName": {
 						"type": "string",
 						"read": true,
 						"write": false,
@@ -871,11 +871,11 @@
 							{
 								"data": "@Parent",
 								"type": "json",
-								"key": "ModuleVendor"
+								"key": "VendorName"
 							}
 						]
 					},
-					"ModuleName": {
+					"VendorPartNumber": {
 						"type": "string",
 						"read": true,
 						"write": false,
@@ -888,11 +888,11 @@
 							{
 								"data": "@Parent",
 								"type": "json",
-								"key": "ModuleName"
+								"key": "VendorPartNumber"
 							}
 						]
 					},
-					"ModuleVersion": {
+					"VendorRevision": {
 						"type": "string",
 						"read": true,
 						"write": false,
@@ -905,24 +905,7 @@
 							{
 								"data": "@Parent",
 								"type": "json",
-								"key": "ModuleVersion"
-							}
-						]
-					},
-					"ModuleFirmwareVersion": {
-						"type": "string",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"datatype": "string",
-						"mapping": [
-							{
-								"data": "@Parent",
-								"type": "json",
-								"key": "ModuleFirmwareVersion"
+								"key": "VendorRevision"
 							}
 						]
 					},