qos: enable should be 1 by default

(cherry picked from commit 01819a7f72)

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.33
+PKG_VERSION:=6.8.16
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=9bdcb1ac188c44fc2274bf01dd9dce46f572b967
+PKG_SOURCE_VERSION:=0ef6169d86333b8727ed34c63f379b08254340e3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -25,7 +25,8 @@ define Package/libbbf_api
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Library for libbbfdm API
+  TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
+  ABI_VERSION:=1.0
 endef
 
 define Package/libbbfdm/default
@@ -33,7 +34,7 @@ define Package/libbbfdm/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbf_api
 endef
 
 define Package/libbbfdm
@@ -66,6 +67,17 @@ define Package/libbbfdm-wolfssl
   VARIANT:=wolfssl
 endef
 
+define Package/userinterface
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Package to add Device.UserInterface. datamodel support
+endef
+
+define Package/userinterface/description
+  Package to add Device.UserInterface. datamodel support using libbbf JSON Plugin
+endef
+
 define Package/libbbfdm/config
 	source "$(SOURCE)/Config_bbfdm.in"
 endef
@@ -137,13 +149,19 @@ endef
 
 define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
+	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+ifeq ($(CONFIG_PACKAGE_mosquitto-ssl),y)
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/etc/uci-defaults/01-mosquitto-config $(1)/etc/uci-defaults/
+endif
 endef
 
 define Package/libbbfdm/default/prerm
@@ -152,6 +170,18 @@ define Package/libbbfdm/default/prerm
 	exit 0
 endef
 
+define Package/userinterface/install
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/UserInterface.json $(1)/etc/bbfdm/json/
+	$(INSTALL_DATA) ./files/etc/config/userinterface $(1)/etc/config/userinterface
+	$(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/firewall.userinterface $(1)/etc/firewall.userinterface
+endef
+
 Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
 Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
 Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
@@ -169,9 +199,9 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/usr/lib/
-	touch $(1)/usr/lib/libbbf_api.so
 endef
 
+$(eval $(call BuildPackage,userinterface))
 $(eval $(call BuildPackage,libbbf_api))
 $(eval $(call BuildPackage,libbbfdm))
 $(eval $(call BuildPackage,libbbfdm-openssl))

bbf/files/etc/bbfdm/json/UserInterface.json

@@ -0,0 +1,117 @@
+{
+	"Device.UserInterface.": {
+		"type": "object",
+		"version": "2.0",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": false,
+		"Device.UserInterface.RemoteAccess.": {
+			"type": "object",
+			"version": "2.0",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"access": false,
+			"array": false,
+			"Enable": {
+				"type": "boolean",
+				"read": true,
+				"write": true,
+				"version": "2.0",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"mapping": [
+					{
+						"type": "uci", 
+						"uci": {
+							"file": "userinterface", 
+							"section": {
+								"name": "remote_access"
+							}, 
+							"option": {
+								"name": "enable"
+							}
+						}
+					}
+				]
+			},
+			"Port": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": true,
+				"version": "2.0",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"range": [
+					{
+						"max": 65535
+					}
+				],
+				"mapping": [
+					{
+						"type": "uci", 
+						"uci": {
+							"file": "userinterface", 
+							"section": {
+								"name": "remote_access"
+							}, 
+							"option": {
+								"name": "port"
+							}
+						}
+					}
+				]
+			},
+			"SupportedProtocols": {
+				"type": "string",
+				"read": true,
+				"write": false,
+				"version": "2.0",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"list": {
+					"datatype": "string",
+					"enumerations": [
+						"HTTP",
+						"HTTPS"
+					]
+				},
+				"default": "HTTP"
+			},
+			"Protocol": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"version": "2.0",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"mapping": [
+					{
+						"type": "uci", 
+						"uci": {
+							"file": "userinterface", 
+							"section": {
+								"name": "remote_access"
+							}, 
+							"option": {
+								"name": "protocol"
+							}
+						}
+					}
+				]
+			}
+		}
+	}
+}

bbf/files/etc/config/userinterface

@@ -0,0 +1,6 @@
+config userinterface 'remote_access'
+	option enable '0'
+	option interface 'wan'
+	option port '80'
+	option protocol 'HTTP'
+

bbf/files/etc/firewall.userinterface

@@ -0,0 +1,88 @@
+#!/bin/sh
+
+
+#!/bin/sh
+
+. /lib/functions.sh
+
+IDENTIFIER="REMOTE-ACCESS-WAN"
+
+log() {
+	echo "${@}"|logger -t firewall.userinterface -p info
+}
+
+if [ ! -f "/etc/config/userinterface" ]; then
+	exit 0;
+fi
+
+function exec_cmd()
+{
+	if ! $@; then
+		log "Failed to run [$@]"
+	fi
+}
+
+function configure_firewall_rule()
+{
+	local enable port protocol gui_port
+	local zone interface
+
+	config_load userinterface
+	config_get_bool enable remote_access enable 1
+	config_get port remote_access port
+	config_get interface remote_access interface
+
+	if [ "${enable}" -eq "0" -o -z "${port}" -o -z "${interface}" ]; then
+		return 0;
+	fi
+
+	zone="zone_${interface}_input"
+	iptables -w 1 -t filter -nL ${zone} 2>/dev/null 1>&2
+	if [ "$?" -eq 0 ]; then
+		iptables -w 1 -I ${zone} -p tcp -m multiport --dports ${port} -m conntrack --ctstate NEW,ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
+	fi
+
+	zone="zone_${interface}_output"
+	iptables -w 1 -t filter -nL ${zone} 2>/dev/null 1>&2
+	if [ "$?" -eq 0 ]; then
+		iptables -w 1 -I ${zone} -p tcp -m multiport --dports ${port} -m conntrack --ctstate ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
+	fi
+}
+
+function delete_firewall_rule()
+{
+	local zone interface
+	local CMD
+
+	config_load userinterface
+	config_get interface remote_access interface
+
+	# Clean remote interface rules
+	if [ -z "${interface}" ]; then
+		return 0
+	fi
+
+	zone="zone_${interface}_input"
+	CMD="iptables -w 1 -t filter -L ${zone} --line-numbers"
+	while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
+		rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
+		if [ -n "${rule_num}" ]; then
+			exec_cmd iptables -w 1 -t filter -D ${zone} ${rule_num};
+		fi
+	done
+
+	zone="zone_${interface}_output"
+	CMD="iptables -w 1 -t filter -L ${zone} --line-numbers"
+	while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
+		rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
+		if [ -n "${rule_num}" ]; then
+			exec_cmd iptables -w 1 -t filter -D ${zone} ${rule_num};
+		fi
+	done
+}
+
+# Delete existing remote access rules
+delete_firewall_rule
+
+# Configure the User Interface rule
+configure_firewall_rule

bbf/files/etc/init.d/userinterface

@@ -0,0 +1,27 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=01
+
+USE_PROCD=1
+
+start_service() {
+	local enable
+
+	procd_open_instance usp
+
+	config_load userinterface
+	config_get_bool enable global enable 1
+
+	# Inject firewall rules
+	if [ "${enable}" -eq "1" ]; then
+		/etc/firewall.userinterface
+	fi
+
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "userinterface"
+}

bbf/files/etc/uci-defaults/01-mosquitto-config

@@ -0,0 +1,46 @@
+#!/bin/sh
+
+config_mosquitto_owrt() {
+	sec=$(uci -q get mosquitto.owrt)
+	if [ -z "${sec}" ]; then
+		sec=$(uci -q add mosquitto owrt)
+		uci -q rename mosquitto."${sec}"="owrt"
+	fi
+
+	uci -q set mosquitto.owrt.use_uci="1"
+	uci -q set mosquitto.owrt.write_pid="1"
+	uci -q commit mosquitto
+}
+
+config_mosquitto_general() {
+	sec=$(uci -q get mosquitto.mosquitto)
+	if [ -z "${sec}" ]; then
+		sec=$(uci -q add mosquitto mosquitto)
+		uci -q rename mosquitto."${sec}"="mosquitto"
+	fi
+
+	uci -q set mosquitto.mosquitto.log_dest="syslog"
+	uci -q set mosquitto.mosquitto.log_facility="5"
+	uci -q set mosquitto.mosquitto.log_timestamp="1"
+	uci -q set mosquitto.mosquitto.log_types="error warning notice"
+	uci -q set mosquitto.mosquitto.per_listener_settings="1"
+	uci -q commit mosquitto
+}
+
+config_mosquitto_persistence() {
+	sec=$(uci -q get mosquitto.persistence)
+	if [ -z "${sec}" ]; then
+		sec=$(uci -q add mosquitto persistence)
+		uci -q rename mosquitto."${sec}"="persistence"
+	fi
+
+	uci -q set mosquitto.persistence.persistence="0"
+	uci -q set mosquitto.persistence.location="/var/run"
+	uci -q commit mosquitto
+}
+
+if [ -f "/etc/config/mosquitto" ]; then 
+	config_mosquitto_owrt
+	config_mosquitto_general
+	config_mosquitto_persistence
+fi

bbf/files/etc/uci-defaults/93-userinterface-firewall

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

bulkdata/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.5
+PKG_VERSION:=2.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
+PKG_SOURCE_VERSION:=6e85d2032e66df581fae7c72cd83cc89367b8fc8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -25,8 +25,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -50,8 +48,8 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.so $(1)/usr/lib/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/init.d/bulkdatad

@@ -7,22 +7,19 @@ USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
 start_service() {
-	local enable=$(uci -q get bulkdata.bulkdata.enable)
+	local enable
 
-	[ "$enable" != "1" ] && {
-		return 0
+	config_load bulkdata
+	config_get_bool enable bulkdata enable 1
+
+	procd_open_instance bulkdata
+	[ "$enable" -eq "1" ] && {
+		procd_set_param command "$PROG"
+		procd_set_param respawn "3" "7" "0"
 	}
-
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_set_param respawn "3" "7" "0"
 	procd_close_instance
 }
 
-boot() {
-	start
-}
-
 reload_service() {
 	stop
 	start 

dectmngr/Makefile

@@ -14,7 +14,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c5695bc92f7f22089c9a85d3e1f4dac7c12ca900
+PKG_SOURCE_VERSION:=cf4e91ffe0a1d83140fef5b41d16e581e5341cec
 PKG_MIRROR_HASH:=skip
 endif
 

dslmngr/Makefile

@@ -26,7 +26,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
 else
   $(info Unexpected CONFIG_TARGET)

easy-qos/Makefile

@@ -19,7 +19,7 @@ define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
+  DEPENDS:=@(TARGET_brcmbca||TARGET_airoha)
 endef
 
 define Package/easy-qos/description

easy-soc-events/Makefile

@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk
 
 -include $(TOPDIR)/.config
 
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
+ifneq ($(CONFIG_TARGET_brcmbca),)
   LINUX_DIR=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.1
   LINUX_VERSION := 4.1.52
   LINUXINCLUDE=-Iarch/$(LINUX_KARCH)/mach-bcm963xx/include
@@ -85,7 +85,7 @@ define Build/Compile
 endef
 
 
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
+ifneq ($(CONFIG_TARGET_brcmbca),)
 define KernelPackage/easy-soc-events/install-extra
 	cp $(PKG_BUILD_DIR)/easyevent.ko $(FS_DIR)/lib/modules/$(LINUX_VERSION)/extra
 endef

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.6.0
+PKG_VERSION:=6.8.0
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c8c406568822b170e373a54fbf32323e960259ff
+PKG_SOURCE_VERSION:=ddc7b272bec5e3b5c2a216a1f86cd5589a1a4a19
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -36,7 +36,7 @@ define Package/easy-soc-libs
   MENU:=1
 endef
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
   TARGET_WIFI_TYPE=BROADCOM
   CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
@@ -55,7 +55,7 @@ else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
   TARGET_PLATFORM=TEST
   TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
+else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_PLATFORM=ECONET
   TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_ECONET

easy-soc-libs/ethernet.mk

@@ -2,7 +2,7 @@
 define Package/libethernet
   $(call Package/easy-soc-libs)
   TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_econet:ecnt_api
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_airoha:ecnt_api
 endef
 
 define Package/libethernet/config

easy-soc-libs/wifi.mk

@@ -2,7 +2,7 @@
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_brcm63xx_arm:bcmkernel
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_brcmbca:bcmkernel
 endef
 
 define Package/libwifi/config

endptmngr/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=0901382048bb7ce01fc1767fef75e54692f56743
+PKG_SOURCE_VERSION:=dc12712af8c4088f7873502ca845e51c68a1ada9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

evoice/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=evoice
-PKG_VERSION:=0.2.29
+PKG_VERSION:=0.2.39
 
 LOCAL_DEV=0
 LOCAL_DEV_EVOICE_DIR=~/voip/evoice
@@ -13,7 +13,7 @@ LOCAL_DEV_EVOICE_DIR=~/voip/evoice
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=ee4e9e00ec1c54b41e15a3de38f6a733634622dd
+PKG_SOURCE_VERSION:=30d65330de0368f73ecf4a2e804c39a2ee280454
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,7 +21,6 @@ endif
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
 # All config variable that are passed to the make invocation, directly or
 # indirectly. This ensures that the package is rebuilt on config-changes.
 #PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
@@ -33,10 +32,10 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c\
-		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
-		+TARGET_iopsys_econet:kmod-voip_driver\
-		+TARGET_iopsys_econet:voip_app
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c +libblobmsg-json\
+		+TARGET_brcmbca:bcmkernel\
+		+TARGET_airoha:kmod-voip_driver\
+		+TARGET_airoha:voip_app +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description
@@ -57,7 +56,7 @@ endif
 IDIR = $(STAGING_DIR)/usr/include
 TONES_INI_REQUIRED=
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_brcmbca),y)
 	TARGET_PLATFORM=BROADCOM
 	BDIR = bcm963xx/userspace/private/apps/voice
 	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
@@ -65,7 +64,7 @@ ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
 	TRG=SVrgBcmFxs
 	JSONFILE=codecs_brcm.json
-else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
+else ifeq ($(CONFIG_TARGET_airoha),y)
 	TARGET_PLATFORM=ECONET
 	TONES_INI_REQUIRED=y
 	TRG=SVrgMtekOwrt

evoice/files/etc/config/voice

@@ -22,6 +22,7 @@ config SIPClient 'Client2'
 config SIPNetwork 'Network1'
 	option Enable '1'
 	option ProxyServer 'sip-proxy.iopsys.eu'
+	option AcceptFromProxyOnly '0'
 	option ProxyServerPort '5060'
 	option ProxyServerTransport 'UDP'
 	option RegistrarServer 'sip-proxy.iopsys.eu'
@@ -33,6 +34,12 @@ config SIPNetwork 'Network1'
 	option TimerRegistrationFailed '120'
 	option TimerT1 '500'
 	option VoIPProfile 'VoIPProfile1'
+	option SIPSessionTimerEnable '0'
+	option SIPSessionExpireInterval '1800'
+	option SIPSessionMinimumTimer '90'
+	option SIPSessionRefresher 'NONE'
+	option SIPSessionTimerMode 'REQUEST'
+	option SIPSessionRefreshRequest 'UPDATE'
 	list CodecList '1CodecProfile1'
 	list CodecList '1CodecProfile2'
 	list CodecList '1CodecProfile3'

evoice/files/etc/evoice/voicedm

@@ -48,16 +48,23 @@ config account 'map_account'
 # Network stuff associated with an account.
 # All parameters in this table are written to internal configuration
 config network 'map_net'
-   option Enable 'voice.Network@.Enable'
-   option Registration_Server 'voice.Network@.RegistrarServer'
-   option Outbound_Proxy 'voice.Network@.ProxyServer'
-   option SIP_Port 'voice.Network@.RegistrarServerPort'
-   option SIP_Transport 'voice.Network@.RegistrarServerTransport'
-   option RegistrationPeriod 'voice.Network@.RegistrationPeriod'
+   option Enable                'voice.Network@.Enable'
+   option Registration_Server   'voice.Network@.RegistrarServer'
+   option Outbound_Proxy        'voice.Network@.ProxyServer'
+   option Accept_From_Registered 'voice.Network@.AcceptFromProxyOnly'
+   option SIP_Port              'voice.Network@.RegistrarServerPort'
+   option SIP_Transport         'voice.Network@.RegistrarServerTransport'
+   option RegistrationPeriod    'voice.Network@.RegistrationPeriod'
    option Registration_Interval 'voice.Network@.RegisterExpires'
-   option Reg_Failure_Interval 'voice.Network@.TimerRegistrationFailed'
-   option T1 'voice.Network@.TimerT1'
-   option UserAgentDomain 'voice.Network@.UserAgentDomain'
+   option Reg_Failure_Interval  'voice.Network@.TimerRegistrationFailed'
+   option T1                    'voice.Network@.TimerT1'
+   option UserAgentDomain       'voice.Network@.UserAgentDomain'
+   option SIP_SessTmrEnable     'voice.Network@.SIPSessionTimerEnable'
+   option SIP_SessTmrMode       'voice.Network@.SIPSessionTimerMode'
+   option SIP_SessTmrMsg        'voice.Network@.SIPSessionRefreshRequest'
+   option SIP_SessTmrRefresher  'voice.Network@.SIPSessionRefresher'
+   option SIP_MinSE             'voice.Network@.SIPSessionMinimumTimer'
+   option SIP_SessInterval      'voice.Network@.SIPSessionExpireInterval'
 
 config VoIPProfile 'map_voip'
    option Enable 'voice.VoIPProfile@.Enable'

evoice/files/etc/evoice/voicero

@@ -22,7 +22,6 @@ config static_prm 'defaults'
    option Tone_On_Hangup '1'
    option BusyTone_On_Hangup '1'
    option Enable_Analouge_Conf '0'
-   option SIP_SessTmrEnable '0'
    option PrackUsage '1'
    option SIP_SupportedPath '0'
    option IMS_Access_Network_Info ' '

evoice/files/lib/voice/codecs_airoha.json

@@ -1,28 +1,50 @@
 {
-        "G.711ALaw": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        },
-        "G.711MuLaw": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        },
-        "G.726": {
-                "BitRate": 32000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        },
-        "G.729": {
-                "BitRate": 8000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        },
-        "G.722": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        }
+	"G.711ALaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.711MuLaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.722": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.726": [
+		{
+			"BitRate": 32000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		},
+		{
+			"BitRate": 24000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"G.729": [
+		{
+			"BitRate": 8000,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	],
+	"AMR": [
+		{
+			"BitRate": 7400,
+			"PacketizationPeriod": "20",
+			"SilenceSuppression": false
+		}
+	]
 }
 

evoice/files/lib/voice/codecs_brcm.json

@@ -1,28 +1,140 @@
 {
-        "G.711ALaw": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        },
-        "G.711MuLaw": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        },
-        "G.726": {
-                "BitRate": 32000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        },
-        "G.729": {
-                "BitRate": 8000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        },
-        "G.722": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        }
+	"G.711MuLaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.711ALaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.726": [
+		{
+			"BitRate": 16000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 24000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 32000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 40000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.723.1": [
+		{
+			"BitRate": 5300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 6300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.729": [
+		{
+			"BitRate": 8000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"iLBC": [
+		{
+			"BitRate": 15200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 13300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.722": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"AMR": [
+		{
+			"BitRate": 12200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 10200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 7950,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 7400,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 6700,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 5900,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 5150,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 4750,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-EFR": [
+		{
+			"BitRate": 12200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-FR": [
+		{
+			"BitRate": 13200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-HR": [
+		{
+			"BitRate": 5600,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	]
 }
 

gryphon-led-module/Makefile

@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):bcmkernel
+  DEPENDS:= +(TARGET_brcmbca):bcmkernel
   PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef
@@ -42,7 +42,7 @@ EXTRA_KCONFIG:= CONFIG_RGB_LED=m
 MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
 
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_brcmbca),y)
 	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
 	# This assumes that the MODULES_SUBDIR set by OpenWrt is of the form
 	# lib/modules/4.19.235-abcdef where 4.19.235 is the version of our fake bcmlinux kernel

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.0.3
+PKG_VERSION:=9.1.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=304db5eb064d89cf4e4df0bb81fa22b88933d602
+PKG_SOURCE_VERSION:=fb8b5b9da6cadd53a3d12e27af0ed800b149a9f2
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -29,7 +29,7 @@ define Package/icwmp/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid
 endef
 
 define Package/icwmp-openssl
@@ -83,6 +83,7 @@ define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
+	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
@@ -92,6 +93,7 @@ define Package/icwmp/default/install
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp.user
 endef
 
 Package/icwmp-openssl/install = $(Package/icwmp/default/install)

icwmp/files/etc/icwmpd/update.sh

@@ -14,15 +14,18 @@ handle_icwmp_update() {
 		return 0
 	fi
 
-	status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.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
-		# Handle timeout or tr069 object not found
-		if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
-			log "Restarting icwmp tr069 object"
-			/etc/init.d/icwmpd restart
+	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)
+		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
 		fi
+	else
+		log "Restarting icwmp tr069 object"
+		/etc/init.d/icwmpd restart
 	fi
 }
 

icwmp/files/etc/init.d/icwmpd

@@ -77,7 +77,7 @@ convert_to_hex() {
 	OPTIND=1
 	while getopts ":" opt "-$optval"
 	do
-		temp=$(printf "%X" "'${OPTARG:-:}")
+		temp=$(printf "%02X" "'${OPTARG:-:}")
 		val="${val}:${temp}"
 	done
 
@@ -133,14 +133,14 @@ configure_send_op125() {
 		opt125_len=$((opt125_len + 4))
 	fi
 
-	hex_opt125_len=$(printf "%X" "${opt125_len}")
+	hex_opt125_len=$(printf "%02X" "${opt125_len}")
 	opt125="${opt125}:${hex_opt125_len}"
 	hex_oui=$(convert_to_hex "${oui}")
 	if [ -z "${hex_oui}" ]; then
 		return 0
 	fi
 
-	hex_oui_len=$(printf "%X" "${oui_len}")
+	hex_oui_len=$(printf "%02X" "${oui_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
 	else
@@ -152,7 +152,7 @@ configure_send_op125() {
 		return 0
 	fi
 
-	hex_serial_len=$(printf "%X" "${serial_len}")
+	hex_serial_len=$(printf "%02X" "${serial_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
 	else
@@ -165,7 +165,7 @@ configure_send_op125() {
 			return 0
 		fi
 
-		hex_class_len=$(printf "%X" "${class_len}")
+		hex_class_len=$(printf "%02X" "${class_len}")
 		if [ "${uci}" = "network" ]; then
 			opt125="${opt125}:03:${hex_class_len}${hex_class}"
 		else
@@ -290,8 +290,9 @@ copy_cwmp_etc_files_to_varstate() {
 
 	if [ -f /etc/icwmpd/cwmp ]; then
 		uci -q -c /etc/icwmpd delete cwmp.acs
+		uci -q -c /etc/icwmpd delete cwmp.gatewayinfo
 		uci -q -c /etc/icwmpd commit cwmp
-		cp -f /etc/icwmpd/cwmp /var/state/cwmp
+		cat /etc/icwmpd/cwmp >> /var/state/cwmp
 	fi
 
 	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
@@ -313,6 +314,8 @@ copy_cwmp_varstate_files_to_etc() {
 	fi
 
 	if [ -f /var/state/cwmp ]; then
+		uci -q -c /var/state delete cwmp.sess_status
+		uci -q -c /var/state commit cwmp
 		cp -f /var/state/cwmp /etc/icwmpd/
 	fi
 
@@ -419,6 +422,9 @@ boot() {
 		regenerate_ssl_link "${ssl_capath}"
 	fi
 
+	# Copy backup data so that if it restart latter on it gets the info
+	copy_cwmp_etc_files_to_varstate
+
 	start
 }
 
@@ -441,9 +447,6 @@ start_service() {
 		return 1;
 	}
 
-	# Copy backup data so that if it restart latter on it gets the info
-	copy_cwmp_etc_files_to_varstate
-
 	procd_open_instance icwmp
 	procd_set_param command "$PROG"
 	procd_append_param command -b
@@ -460,6 +463,11 @@ service_stopped()
 	copy_cwmp_varstate_files_to_etc
 }
 
+stop_service()
+{
+	copy_cwmp_varstate_files_to_etc
+}
+
 reload_service() {
 	local ret
 
@@ -473,7 +481,14 @@ reload_service() {
 		return 0
 	fi
 
-	status="$(ubus -t 1 call tr069 status |jsonfilter -qe '@.cwmp.status')"
+	tr069_status="$(ubus -t 1 call tr069 status)"
+	ret="$?"
+	if [ "$ret" = "7" ]; then
+		# ubus timed out may be due to uloop is busy in some task so returning
+		return 0
+	fi
+
+	status="$(echo $tr069_status | jsonfilter -qe '@.cwmp.status')"
 	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'

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

@@ -0,0 +1,133 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+CLASS=""
+OUI=""
+SERIAL=""
+
+get_vivsoi() {
+	# opt125 environment variable has data in below format
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |	 enterprise-number1	  |
+	# |				  |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |   data-len1   |		  |
+	# +-+-+-+-+-+-+-+-+ option-data1  |
+	# /				  /
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+	# |	 enterprise-number2	  |   ^
+	# |				  |   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# |   data-len2   |		  | optional
+	# +-+-+-+-+-+-+-+-+ option-data2  |   |
+	# /				  /   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# ~	       ...		  ~   V
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+
+	#  Enterprise Id  Len  Sub Op  SLen  Data Sub Op  SLen Data	  Sub Op  SLen Data
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+	# |	id    |  n  |	1  |  n1  | D1 |   2  |  n2 | D2 | ... |   6  |  n6 | D6 |
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+
+	local opt125="$1"
+	local len="$2"
+	local ent_id
+
+	#hex-string 2 character=1 Byte
+	# length in hex string will be twice of actual Byte length
+	[ "$len" -gt "8" ] || return
+
+	data="${opt125}"
+	rem_len="${len}"
+	while [ $rem_len -gt 0 ]; do
+		ent_id=${data:0:8}
+		ent_id=$(printf "%d\n" "0x$ent_id")
+
+		if [ $ent_id -ne  3561 ]; then
+			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}
+		opt_len=$(printf "%d\n" "0x$len_val")
+		[ $opt_len -eq 0 ] && return
+
+		# 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")
+
+			# 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 ))
+
+			# get the value of sub option starting 4 means starting after length
+			sub_opt_val=${sub_data:4:${sub_opt_len}}
+
+			# assign the value found in sub option
+			case "${sub_opt_id}" in
+				"4") OUI=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"5") SERIAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"6") CLASS=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+			esac
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+		done
+
+		break
+	done
+}
+
+config_load cwmp
+config_get_bool enable_cwmp cpe enable 1
+config_get wan_intf cpe default_wan_interface "wan"
+
+if [ "$enable_cwmp" = "0" ]; then
+	return 0
+fi
+
+if [ "${wan_intf}" == "${INTERFACE}" ]; then
+	if [ -n "$opt125" ]; then
+		len=$(printf "$opt125"|wc -c)
+		get_vivsoi "$opt125" "$len"
+	fi
+
+	mkdir -p /var/state
+	touch /var/state/cwmp
+	sec=$(uci -q -c /var/state get cwmp.gatewayinfo)
+	if [ -z "${sec}" ]; then
+		sec=$(uci -q -c /var/state add cwmp gatewayinfo)
+		uci -q -c /var/state rename cwmp."${sec}"="gatewayinfo"
+	fi
+
+	uci -q -c /var/state set cwmp.gatewayinfo.class="$CLASS"
+	uci -q -c /var/state set cwmp.gatewayinfo.oui="$OUI"
+	uci -q -c /var/state set cwmp.gatewayinfo.serial="$SERIAL"
+	uci -q -c /var/state commit cwmp
+fi

ieee1905/Config.in

@@ -1,6 +1,6 @@
 if (PACKAGE_ieee1905)
 
-menu "Configurations"
+menu "Configuration"
 
 config IEEE1905_EXTENSION_ALLOWED
 	bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
@@ -10,5 +10,18 @@ config IEEE1905_PLATFORM_HAS_WIFI
 	bool "Platform has WiFi"
 	default y if PACKAGE_libwifi
 
+config IEEE1905_CMDU_SA_IS_ALMAC
+	bool "Send CMDUs with SA set to 1905 AL-macaddress instead of interface macaddress"
+	default n
+
+config IEEE1905_WIFI_EASYMESH
+	bool "Include WiFi-Alliance's Easymesh updates"
+	default y
+
+config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
+	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
+	default y
+
 endmenu
+
 endif

ieee1905/Config.map-plugin.in

@@ -1,14 +0,0 @@
-if (PACKAGE_map-plugin)
-
-menu "Configurations"
-
-config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
-	bool "Sync configuration between dynamic controllers in the network"
-	default n
-
-config MULTIAP_FUZZ_1905_CMDUS
-	bool "Include support to fuzz 1905 CMDUs for testing purpose"
-	default n
-
-endmenu
-endif

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.10.7
+PKG_VERSION:=6.0.21
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b50f79061a95840d89a6129aa0a95aff82b5a1b7
+PKG_SOURCE_VERSION:=29f58120eea9bf3c48fae98a74f0f4c9d3d902a8
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -35,31 +35,21 @@ define Package/ieee1905/config
 endef
 
 define Package/libieee1905
-$(call Package/ieee1905/Default,$(1))
-  TITLE+= (library for CMDU and TLV handling)
+  $(call Package/ieee1905/Default)
+  TITLE:=libieee1905.so (library for CMDU and TLV handling)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json
 endef
 
 define Package/ieee1905
-$(call Package/ieee1905/Default,$(1))
-  TITLE+= ieee1905d (daemon implementing 1905.1 and provides cli)
+  $(call Package/ieee1905/Default)
+  TITLE:=ieee1905d (daemon implementing 1905.1 and provides cli)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
 	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
 endef
 
-
-define Package/map-plugin
-$(call Package/ieee1905/Default,$(1))
-  TITLE:=Multi-AP (Easymesh) plugin
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
-endef
-
-define Package/map-plugin/config
-  source "$(SOURCE)/Config.map-plugin.in"
-endef
+include $(wildcard plugins/*.mk)
 
 define Package/ieee1905/description
  This package provides IEEE Std 1905.1 stack.
@@ -69,8 +59,16 @@ define Package/libieee1905/description
  This package provides library functions for IEEE Std 1905.1 stack.
 endef
 
+plugins := \
+	$(if $(CONFIG_PACKAGE_map-plugin),map) \
+	$(if $(CONFIG_PACKAGE_snoop-plugin),snoop) \
+	$(if $(CONFIG_PACKAGE_topology-plugin),topology)
+
+
+ppkg:=$(patsubst plugins/%.mk,%-plugin,$(wildcard plugins/*.mk))
+
+
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
@@ -79,10 +77,20 @@ ifeq ($(CONFIG_IEEE1905_PLATFORM_HAS_WIFI),y)
 TARGET_CFLAGS += -DHAS_WIFI
 endif
 
-ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
-TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
+ifeq ($(CONFIG_IEEE1905_CMDU_SA_IS_ALMAC),y)
+TARGET_CFLAGS += -DCMDU_SA_IS_ALMAC
 endif
 
+ifeq ($(CONFIG_IEEE1905_WIFI_EASYMESH),y)
+TARGET_CFLAGS += -DWIFI_EASYMESH
+endif
+
+ifeq ($(CONFIG_IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY),y)
+TARGET_CFLAGS += -DIEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
+endif
+
+MAKE_FLAGS += \
+	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
 
 MAKE_PATH:=src
 
@@ -101,25 +109,6 @@ define Package/libieee1905/install
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
 endef
 
-define Package/map-plugin/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
-endef
-
-define Build/InstallDev/map-plugin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map2.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
-endef
-
-
 define Build/InstallDev/libieee1905
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -137,7 +126,7 @@ endef
 
 define Build/InstallDev
 	$(call Build/InstallDev/libieee1905,$(1),$(2))
-	$(call Build/InstallDev/map-plugin,$(1),$(2))
+	$(foreach p,$(ppkg),$(call Build/InstallDev/$(p),$(1),$(2)))
 endef
 
 ifeq ($(LOCAL_DEV),1)
@@ -148,4 +137,4 @@ endif
 
 $(eval $(call BuildPackage,ieee1905))
 $(eval $(call BuildPackage,libieee1905))
-$(eval $(call BuildPackage,map-plugin))
+$(eval $(foreach p,$(ppkg),$(call BuildPackage,$(p))))

ieee1905/files/etc/init.d/ieee1905

@@ -44,7 +44,8 @@ validate_ap_section() {
 	uci_validate_section ieee1905 $section "${1}" \
 			'band:or("2", "5", "60", "6")' \
 			'ssid:string' \
-			'encryption:or("psk2", "sae-mixed", "sae", string)' \
+			'encryption:or("psk2", "sae-mixed", "sae",
+				"psk", "psk-mixed", "none", string)' \
 			'key:string' \
 			'uuid:string' \
 			'manufacturer:string' \
@@ -82,8 +83,10 @@ start_service() {
 	validate_ieee1905_config || return 1;
 
 	procd_open_instance
-        procd_set_param command "/usr/sbin/ieee1905d"
+        procd_set_param command "/usr/sbin/ieee1905d" "-o"  "/tmp/ieee1905.log" "-f"
 	procd_set_param respawn
+	procd_set_param limits core="unlimited"
+#	procd_set_param env IEEE1905_LOG_CMDU=1
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1
 	procd_close_instance

ieee1905/files/etc/uci-defaults/31-ifname-option-to-list

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+config_load ieee1905
+
+ifname_to_list() {
+	local section=$1
+
+	config_get ifname $section ifname	# get list or option as space separated values
+	ifname=${ifname//,/\ }			# convert csv with space separation
+	uci del ieee1905.${section}.ifname	# delete entry
+	for i in ${ifname}; do
+		uci add_list ieee1905.${section}.ifname="$i"	# writeback entry as list
+	done
+}
+
+config_foreach ifname_to_list al-iface

ieee1905/plugins/map.mk

@@ -0,0 +1,51 @@
+define Package/map-plugin
+  $(call Package/ieee1905/Default)
+  TITLE:=Multi-AP plugin supporting WiFi-Alliance Easymesh standard
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+endef
+
+define Package/map-plugin/config
+	if (PACKAGE_map-plugin)
+
+		menu "Configuration"
+
+		config MULTIAP_EASYMESH_VERSION
+		int "Easymesh version"
+		default 2
+
+		config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
+		bool "Sync configuration between dynamic controllers in the network"
+		default n
+
+		config MULTIAP_FUZZ_1905_CMDUS
+		bool "Include support to fuzz 1905 CMDUs for testing purpose"
+		default n
+
+		endmenu
+	endif
+endef
+
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_MULTIAP_EASYMESH_VERSION)
+
+ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
+TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
+endif
+
+define Build/InstallDev/map-plugin
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/easymesh.h $(1)/usr/include/easymesh.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
+endef
+
+define Package/map-plugin/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
+endef

ieee1905/plugins/snoop.mk

@@ -0,0 +1,12 @@
+define Package/snoop-plugin
+  $(call Package/ieee1905/Default)
+  TITLE:=Show all received 1905 CMDUs over UBUS
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+endef
+
+define Package/snoop-plugin/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/snoop/snoop.so $(1)/usr/lib/ieee1905/snoop.so
+endef

ieee1905/plugins/topology.mk

@@ -0,0 +1,12 @@
+define Package/topology-plugin
+  $(call Package/ieee1905/Default)
+  TITLE:=Build full network topology of the 1905 nodes only
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+endef
+
+define Package/topology-plugin/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/topology/topology.so $(1)/usr/lib/ieee1905/topology.so
+endef

iop/config

@@ -18,8 +18,21 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 # /etc/banner and /etc/device_info #
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="iopsysWrt"
+CONFIG_VERSION_MANUFACTURER="IOPSYS"
 CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
+CONFIG_VERSION_DIST="IOWRT"
+
+# OpenWrt is given by CONFIG_VERSION_NUMBER which we do not want to override.
+# disabling CONFIG_VERSION_FILENAMES will hide the OpenWrt version from the image filename
+# CONFIG_VERSION_FILENAMES is not set
+
+# CONFIG_VERSION_CODE is set to the IOWRT version instead by the genconfig-script and
+# CONFIG_VERSION_CODE_FILENAMES will put it into the image filename.
+CONFIG_VERSION_CODE_FILENAMES=y
+
+CONFIG_VERSION_HOME_URL="https://iopsys.eu"
+CONFIG_VERSION_BUG_URL="https://iopsys.eu"
+CONFIG_VERSION_SUPPORT_URL="https://iopsys.eu"
 
 # /lib/preinit #
 CONFIG_PREINITOPT=y
@@ -44,7 +57,6 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 # EasySoC HAL #
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_wifimngr=y
 
@@ -64,6 +76,7 @@ CONFIG_PACKAGE_urlfilter=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
+CONFIG_PACKAGE_usermngr=y
 
 # TR-x69 #
 CONFIG_PACKAGE_uspd-mbedtls=y
@@ -140,7 +153,8 @@ CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables-legacy=y
+CONFIG_PACKAGE_ip6tables-zz-legacy=y
+CONFIG_PACKAGE_iptables-zz-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y

iop/scripts/genconfig.sh

@@ -13,12 +13,13 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
-	mediatek="target/linux/feeds/iopsys-mediatek"
+	brcmbca_feed="target/linux/feeds/brcmbca"
+	ramips_feed="target/linux/feeds/iopsys-ramips"
+	airoha_feed="target/linux/feeds/airoha"
+	x86_feed="target/linux/feeds/iopsys-x86"
+	armvirt_feed="target/linux/feeds/iopsys-armvirt"
+	mediatek_feed="target/linux/feeds/iopsys-mediatek"
+	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -108,21 +109,23 @@ function genconfig {
 			return
 		fi
 
-		[ -e $brcm63xx_arm/genconfig ] &&
-			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
-		[ -e $ramips/genconfig ] &&
-			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $econet/genconfig ] &&
-			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $x86/genconfig ] &&
-			iopsys_x86=$(cd $x86; ./genconfig)
-		[ -e $armvirt/genconfig ] &&
-			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
+		[ -e $brcmbca_feed/genconfig ] &&
+			brcmbca=$(cd $brcmbca_feed; ./genconfig)
+		[ -e $ramips_feed/genconfig ] &&
+			iopsys_ramips=$(cd $ramips_feed; ./genconfig)
+		[ -e $airoha_feed/genconfig ] &&
+			airoha=$(cd $airoha_feed; ./genconfig)
+		[ -e $x86_feed/genconfig ] &&
+			iopsys_x86=$(cd $x86_feed; ./genconfig)
+		[ -e $armvirt_feed/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt_feed; ./genconfig)
+		[ -e $mediatek_feed/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek_feed; ./genconfig)
+		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
+			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
+			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -131,10 +134,10 @@ function genconfig {
 			return
 	    fi
 
-	    for p in $iopsys_brcm63xx_arm; do
+	    for p in $brcmbca; do
 		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_arm"
-			target_config_path="$brcm63xx_arm/config"
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
 		    return
 		fi
 	    done
@@ -142,15 +145,15 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
+			target_config_path="$ramips_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_econet; do
+	    for p in $airoha; do
 		if [ $p == $profile ]; then
-		    target="iopsys_econet"
-			target_config_path="$econet/config"
+		    target="airoha"
+			target_config_path="$airoha_feed/config"
 		    return
 		fi
 	    done
@@ -158,7 +161,7 @@ function genconfig {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86/config"
+			target_config_path="$x86_feed/config"
 		    return
 		fi
 	    done
@@ -166,7 +169,7 @@ function genconfig {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt/config"
+			target_config_path="$armvirt_feed/config"
 		    return
 		fi
 	    done
@@ -174,7 +177,15 @@ function genconfig {
 	    for p in $iopsys_mediatek; do
 		if [ $p == $profile ]; then
 		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
+			target_config_path="$mediatek_feed/config"
+		    return
+		fi
+	    done
+
+	    for p in $ipq95xx; do
+		if [ $p == $profile ]; then
+		    target="ipq95xx"
+			target_config_path="$qualcomm_ipq95xx_feed/config"
 		    return
 		fi
 	    done
@@ -331,7 +342,7 @@ function genconfig {
 
 		# Special handling for targets which use TARGET_DEVICES 
 		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
+		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
@@ -377,12 +388,15 @@ function genconfig {
 		fi
 
 		# Set target version
-		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		local GIT_REV=$(git rev-parse --short HEAD)
-		local GIT_VER="$GIT_TAG"
-		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
-		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
+		local git_version
+		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+			echo "ERROR: Failed getting version via git describe, exiting." >&2
+			return 1
+		fi
+		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
+		local version_lower="${version,,}"
+		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Package source tree override if selected

iop/scripts/genconfig_min.sh

@@ -12,12 +12,13 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
-	mediatek="target/linux/feeds/iopsys-mediatek"
+	brcmbca_feed="target/linux/feeds/brcmbca"
+	ramips_feed="target/linux/feeds/iopsys-ramips"
+	airoha_feed="target/linux/feeds/airoha"
+	x86_feed="target/linux/feeds/iopsys-x86"
+	armvirt_feed="target/linux/feeds/iopsys-armvirt"
+	mediatek_feed="target/linux/feeds/iopsys-mediatek"
+	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -107,21 +108,23 @@ function genconfig_min {
 			return
 		fi
 
-		[ -e $brcm63xx_arm/genconfig ] &&
-			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
-		[ -e $ramips/genconfig ] &&
-			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $econet/genconfig ] &&
-			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $x86/genconfig ] &&
-			iopsys_x86=$(cd $x86; ./genconfig)
-		[ -e $armvirt/genconfig ] &&
-			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
+		[ -e $brcmbca_feed/genconfig ] &&
+			brcmbca=$(cd $brcmbca_feed; ./genconfig)
+		[ -e $ramips_feed/genconfig ] &&
+			iopsys_ramips=$(cd $ramips_feed; ./genconfig)
+		[ -e $airoha_feed/genconfig ] &&
+			airoha=$(cd $airoha_feed; ./genconfig)
+		[ -e $x86_feed/genconfig ] &&
+			iopsys_x86=$(cd $x86_feed; ./genconfig)
+		[ -e $armvirt_feed/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt_feed; ./genconfig)
+		[ -e $mediatek_feed/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek_feed; ./genconfig)
+		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
+			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
+			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -130,10 +133,10 @@ function genconfig_min {
 			return
 	    fi
 
-	    for p in $iopsys_brcm63xx_arm; do
+	    for p in $brcmbca; do
 		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_arm"
-			target_config_path="$brcm63xx_arm/config"
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
 		    return
 		fi
 	    done
@@ -141,15 +144,15 @@ function genconfig_min {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
+			target_config_path="$ramips_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_econet; do
+	    for p in $airoha; do
 		if [ $p == $profile ]; then
-		    target="iopsys_econet"
-			target_config_path="$econet/config"
+		    target="airoha"
+			target_config_path="$airoha_feed/config"
 		    return
 		fi
 	    done
@@ -157,7 +160,7 @@ function genconfig_min {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86/config"
+			target_config_path="$x86_feed/config"
 		    return
 		fi
 	    done
@@ -165,7 +168,7 @@ function genconfig_min {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt/config"
+			target_config_path="$armvirt_feed/config"
 		    return
 		fi
 	    done
@@ -173,7 +176,15 @@ function genconfig_min {
 	    for p in $iopsys_mediatek; do
 		if [ $p == $profile ]; then
 		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
+			target_config_path="$mediatek_feed/config"
+		    return
+		fi
+	    done
+
+	    for p in $ipq95xx; do
+		if [ $p == $profile ]; then
+		    target="ipq95xx"
+			target_config_path="$qualcomm_ipq95xx_feed/config"
 		    return
 		fi
 	    done
@@ -322,7 +333,7 @@ function genconfig_min {
 
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
+		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
@@ -368,12 +379,15 @@ function genconfig_min {
 		fi
 
 		# Set target version
-		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		local GIT_REV=$(git rev-parse --short HEAD)
-		local GIT_VER="$GIT_TAG"
-		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
-		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
+		local git_version
+		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+			echo "ERROR: Failed getting version via git describe, exiting." >&2
+			return 1
+		fi
+		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
+		local version_lower="${version,,}"
+		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Package source tree override if selected

iop/scripts/install_key.sh

@@ -48,7 +48,10 @@ function ssh_install_key {
     local keys="$(get_ssh_public_keys)"
     echo "Adding the following keys to $DROPBEAR_AUTHORIZED_KEYS_FILE on $host:"
     echo "$keys"
-    ssh root@$host "echo '$keys' >> '$DROPBEAR_AUTHORIZED_KEYS_FILE'" && echo ok
+    ssh \
+        -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+        root@$host \
+        "echo '$keys' >> '$DROPBEAR_AUTHORIZED_KEYS_FILE'" && echo ok
 }
 
 register_command "ssh_install_key" "Install the users public ssh key on host running dropbear"

iop/scripts/iopupgrade.sh

@@ -274,9 +274,10 @@ function ssh_upgrade {
 	pv "$upd_fw" |
 		ssh \
 			-o ConnectTimeout=60 \
+			-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
 			root@"$upd_host" \
 			sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" ||
 		echo "Sysupgrade failed" >&2 && return 1
 }
 
-register_command "ssh_upgrade" "-h <host> -f <file> [opts]  Install firmware on remote host with SSH"
+register_command "ssh_upgrade" "-t <host> -f <file> [opts]  Install firmware on remote host with SSH"

libvoice-broadcom/Makefile

@@ -0,0 +1,61 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvoice-broadcom
+PKG_VERSION:=0.1
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
+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:=b53e93ca1a2fdda56ca9caffb6020e158e684f3d
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
+
+export CONFIG_BRCM_SDK_VER_504040
+export CONFIG_BCM_CHIP_ID
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += -Wall -Werror
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Utilities
+	TITLE:=IOPSYS libvoice for Broadcom
+	URL:=
+	DEPENDS:=
+endef
+
+define Package/$(PKG_NAME)/description
+	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/$(PKG_NAME)/install
+	# Although there is nothing needs to be installed, but the install section must NOT be empty. Otherwise the package will be skipped as below.
+	# WARNING: skipping libvoice-broadcom -- package has no install section
+	$(INSTALL_DIR) $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
+

libvoice-d2/Makefile

@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvoice-d2
+PKG_VERSION:=0.1
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
+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:=45e7d35f97f258f5e13c3afa0542db724bf59828
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += -Wall -Werror
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Utilities
+	TITLE:=IOPSYS libvoice for D2 which is software DSP
+	URL:=
+	DEPENDS:=
+endef
+
+define Package/$(PKG_NAME)/description
+	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/$(PKG_NAME)/install
+	# Although there is nothing needs to be installed, but the install section must NOT be empty. Otherwise the package will be skipped as below.
+	# WARNING: skipping libvoice-d2 -- package has no install section
+	$(INSTALL_DIR) $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
+

map-agent/Config.in

@@ -13,6 +13,9 @@ config AGENT_ISLAND_PREVENTION
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
+config AGENT_EASYMESH_VERSION
+	int "Support Easymesh version"
+	default 2
 
 config AGENT_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.3.14
+PKG_VERSION:=2.10.4.17
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=449eb907b121b7224cbfedcf51246e438f2b30d6
+PKG_SOURCE_VERSION:=098fef903c1e746776f88df3706337b8fc3899ac
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@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
+	  +map-plugin +ip-bridge
 endef
 
 
@@ -59,6 +59,8 @@ TARGET_CFLAGS += \
 	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_AGENT_EASYMESH_VERSION)
+
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
@@ -73,6 +75,7 @@ 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
 endif
 
 

map-agent/files/etc/config/mapagent

@@ -7,6 +7,7 @@ config agent 'agent'
 	option island_prevention '0'
 	option eth_onboards_wifi_bhs '0'
 #	option controller_macaddr '0a:1b:2c:3d:4e:50'
+	option scan_on_boot_only '0'
 
 config dynamic_backhaul
 	option missing_bh_timer '60'

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

@@ -3,7 +3,7 @@
 . /lib/network/utils.sh
 
 conn_ports_file="/tmp/map.connected.ports"
-map_bh_file="/tmp/multiap.backhaul"
+map_bh_file="/var/run/multiap/multiap.backhaul"
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
 al_brnet="${al_bridge:3}"

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

@@ -10,56 +10,9 @@ IS_CFG_VALID=1
 MAP_DEV="map_dev"
 MAP_IF="map"
 
-create_map() {
-	ip link add lei type veth peer name lei_map 2>/dev/null
-	ip link add link lei name lei_lan type vlan id 1 2>/dev/null
-
-	uci -q set network.${MAP_DEV}=device
-	uci -q set network.${MAP_DEV}.name=br-map
-	uci -q set network.${MAP_DEV}.type=bridge
-
-	uci -q show network.${MAP_DEV}.ports | grep -q lei_map || {
-		uci -q add_list network.${MAP_DEV}.ports='lei_map'
-	}
-
-	uci -q set network.${MAP_IF}=interface
-	uci -q set network.${MAP_IF}.device=br-map
-	uci -q set network.${MAP_IF}.is_lan=1
-
-	uci -q show network.br_lan.ports | grep -q lei_lan || {
-		uci -q add_list network.br_lan.ports="lei_lan"
-	}
-
-	uci -q set mapagent.agent.al_bridge=br-map
-
-	uci -q commit
-
-	ubus call network reload
-	ubus -t 5 wait_for network.interface.map
-
-	brctl addif br-map lei_map 2>/dev/null
-	brctl addif br-lan lei_lan 2>/dev/null
-
-	ip link set lei up 2>/dev/null
-	ip link set lei_map up 2>/dev/null
-	ip link set lei_lan up 2>/dev/null
-}
-
-remove_map() {
-	ip link delete ${MAP_VETH} &>/dev/null
-
-	uci -q delete network.${MAP_DEV}
-	uci -q delete network.${MAP_IF}
-
-	uci -q set mapagent.agent.al_bridge=br-lan
-
-	uci -q commit
-
-	ubus call network reload
-}
 
 start_dynbhd_service() {
-	rm -f /tmp/multiap.backhaul
+	rm -f /var/run/multiap/multiap.backhaul
 	procd_open_instance
 	procd_set_param command "/usr/sbin/dynbhd"
 	procd_set_param respawn
@@ -81,7 +34,8 @@ validate_agent_section() {
 		'resend_num:uinteger:0' \
 		'dyn_cntlr_sync:bool:true' \
 		'island_prevention:bool:false' \
-		'eth_onboards_wifi_bhs:bool:false'
+		'eth_onboards_wifi_bhs:bool:false' \
+		'scan_on_boot_only:bool:false'
 
 
 	[ "$?" -ne 0 ] && {
@@ -138,7 +92,7 @@ validate_radio_section() {
 
 	uci_validate_section mapagent $section "${1}" \
 			'device:string' \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'configured:bool:false' \
 			'onboarded:bool:false' \
 			'dedicated_backhaul:bool:false' \
@@ -150,7 +104,11 @@ validate_radio_section() {
 			'include_sta_metric:bool:false' \
 			'rcpi_hysteresis_margin:range(0,255)' \
 			'report_util_threshold:range(0,255)' \
-			'encryption:or("sae", "psk2", "sae-mixed")'
+			'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")' \
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of radio section failed"
@@ -233,10 +191,6 @@ start_service() {
 	config_get_bool enabled agent enabled 1
 	[ "$enabled" -eq 0 ] && return 1
 
-	local ts
-	config_get_bool ts agent vlan_segregation 0
-	[ "$ts" -eq 1 ] && create_map #|| remove_map
-
 	procd_open_instance
 	create_dir
 	procd_set_param command "/usr/sbin/mapagent" "-d"
@@ -246,10 +200,6 @@ start_service() {
 	procd_close_instance
 }
 
-#stop_service() {
-#	remove_map
-#}
-
 service_triggers()
 {
 	procd_add_reload_trigger "mapagent"

map-controller/Config.in

@@ -14,6 +14,10 @@ config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	string
 	default "\\\\x11\\\\x22\\\\x33"
 
+config CONTROLLER_EASYMESH_VERSION
+	int "Support Easymesh version"
+	default 2
+
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
 	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
 	default CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.4
+PKG_VERSION:=2.11.0.24
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a4a626539ede73c1c4eb1ad768331524a8ee9ce8
+PKG_SOURCE_VERSION:=8944352f648643fa5c72cd216a76695a021b7851
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -45,12 +45,15 @@ TARGET_CFLAGS += \
 
 MAKE_PATH:=src
 
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_CONTROLLER_EASYMESH_VERSION)
+
 ifeq ($(CONFIG_CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 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
 endif
 
 define Package/map-controller/install
@@ -58,6 +61,8 @@ define Package/map-controller/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
+	$(CP) $(PKG_BUILD_DIR)/src/plugins/steer/rcpi/rcpi.so $(1)/usr/lib/mapcontroller/rcpi.so
 endef
 
 ifeq ($(LOCAL_DEV),1)

map-controller/files/etc/config/mapcontroller

@@ -2,15 +2,23 @@ config controller 'controller'
 	option enabled '1'
 	option registrar '2 5'
 	option debug '0'
-	option enable_sta_steer '0'
-	option enable_bsta_steer '0'
-	option use_bcn_metrics '0'
-	option use_usta_metrics '0'
+	option bcn_metrics_max_num '10'
+	option initial_channel_scan '0'
 	option primary_vid '0'
 	option primary_pcp '0'
 	option allow_bgdfs '0'
 	option channel_plan '0'
 
+config sta_steering
+	option steer_module 'rcpi'
+	option enabled '1'
+	option enable_sta_steer '0'
+	option enable_bsta_steer '0'
+	option use_bcn_metrics '0'
+	option use_usta_metrics '0'
+	option bandsteer '0'
+	option diffsnr '8'
+
 config ap
 	option band '2'
 	option encryption 'sae-mixed'
@@ -60,8 +68,8 @@ config ap
 #	option report_sta_assocfails_rate '0'
 #	option report_metric_periodic '0'
 #	option report_scan '0'
-#	option steer_exclude '0'
-#	option steer_exclude_btm '0'
+#	list steer_exclude 'e0:d4:e8:79:c4:ee'
+#	list steer_exclude_btm 'e0:d4:e8:79:c4:11'
 #	option steer_disallow '0'
 #	option coordinated_cac '0'
 #	option traffic_separation '0'
@@ -107,8 +115,8 @@ config ap
 #	option report_sta_assocfails_rate '0'
 #	option report_metric_periodic '0'
 #	option report_scan '0'
-#	option steer_exclude '0'
-#	option steer_exclude_btm '0'
+#	list steer_exclude 'e0:d4:e8:79:c4:ee'
+#	list steer_exclude_btm 'e0:d4:e8:79:c4:11'
 #	option steer_disallow '0'
 #	option coordinated_cac '0'
 #	option traffic_separation '0'

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

@@ -19,11 +19,9 @@ validate_controller_section() {
 		'enabled:bool:true' \
 		'registrar:string' \
 		'debug:range(0,16)' \
+		'bcn_metrics_max_num:range(1,256)' \
+		'initial_channel_scan:bool:true' \
 		'resend_num:uinteger:0' \
-		'enable_sta_steer:bool:false' \
-		'enable_bsta_steer:bool:false' \
-		'use_bcn_metrics:bool:false' \
-		'use_usta_metrics:bool:false' \
 		'allow_bgdfs:range(0,2629744)' \
 		'channel_plan:range(0,2629744)' \
 		'enable_ts:bool:false'
@@ -36,6 +34,27 @@ validate_controller_section() {
 	return 0
 }
 
+validate_sta_steering_section() {
+	local section="$1"
+
+	uci_validate_section mapcontroller $section "${1}" \
+		'steer_module:string' \
+		'enabled:bool:true' \
+		'enable_sta_steer:bool:false' \
+		'enable_bsta_steer:bool:false' \
+		'use_bcn_metrics:bool:false' \
+		'use_usta_metrics:bool:false' \
+		'bandsteer:bool:false' \
+		'diffsnr:range(0,100)'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapcontroller" "Validation of sta_steering section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
 validate_ap_section() {
 	local section="$1"
 
@@ -43,7 +62,10 @@ validate_ap_section() {
 			'band:or("2", "5", "6")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
-				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
+				"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' \
 			'type:or("backhaul", "fronthaul", "combined")' \
@@ -93,7 +115,7 @@ validate_radio_section() {
 	uci_validate_section mapcontroller $section "${1}" \
 			'agent_id:macaddr' \
 			'macaddr:macaddr' \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'steer_policy:range(0,2)' \
 			'util_threshold:range(0,255)' \
 			'rcpi_threshold:range(0,255)' \
@@ -116,6 +138,7 @@ validate_controller_config() {
 	IS_CFG_VALID=1
 
 	validate_controller_section &&
+		config_foreach validate_sta_steering_section sta_steering &&
 		config_foreach validate_ap_section ap &&
 		config_foreach validate_node_section node &&
 		config_foreach validate_radio_section radio

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.4
+PKG_VERSION:=2.5.1.14
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=488ce1ce576b57c9b3c4d7c034969bf65e66216f
+PKG_SOURCE_VERSION:=bacbffccabdc1a388a135daad58db4ca60676b05
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

map-topology/files/etc/firewall.hosts

@@ -0,0 +1,126 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+day=""
+IP_RULE=""
+
+process_ac_schedule() {
+	local acs_id="$1"
+	local is_enabled
+	local access_control
+	local start_time=""
+	local stop_time=""
+	local mac=""
+
+	handle_day_list() {
+		local value=$1
+
+		val=$(echo $value | cut -c 1-3)
+		if [ -z $day ]; then
+			day="$val"
+		else
+			day="$day,$val"
+		fi
+	}
+
+	config_list_foreach "$acs_id" "day" handle_day_list
+	config_get is_enabled "$acs_id" "enable" 1
+	config_get access_control "$acs_id" "dm_parent"
+
+	if [ "$is_enabled" == "0" ] || [ -z "$access_control" ]; then
+		return
+	fi
+
+	IP_RULE=""
+
+	mac=$(uci -q get hosts.$access_control.macaddr)
+	access_policy=$(uci -q get hosts.$access_control.access_policy)
+
+	config_get start_time "$acs_id" "start_time"
+	config_get duration "$acs_id" "duration"
+
+	if [ -z "$mac" ] && [ -z "$start_time" ] && [ -z "$duration" ] && [ -z "$day" ] && [ -z "$access_policy" ]; then
+		return
+	fi
+	if [ -n "$mac" ]; then
+		IP_RULE="$IP_RULE -m mac --mac-source $mac"
+	fi
+
+	# as per iptables manual default starttime is 00:00
+	# default stoptime is 23:59
+	if [ -z "$start_time" ]; then
+		start_time="0:0"
+	fi
+
+        if [ -n "$duration" ]; then
+		hh=$(echo $start_time | awk -F: '{ print $1 }')
+                mm=$(echo $start_time | awk -F: '{ print $2 }')
+                hh_s=`expr $hh \* 3600`
+                mm_s=`expr $mm \* 60`
+                ss=$(( hh_s + mm_s ))
+
+                stop_ss=$(( ss + duration ))
+                hh=$(( stop_ss / 3600 ))
+                if [ $hh -lt 24 ]; then
+                	rem_ss=$(( stop_ss % 3600 ))
+                	mm=$(( rem_ss / 60 ))
+                	ss=$(( rem_ss % 60 ))
+                	stop_time="$hh:$mm:$ss"
+                else
+                	stop_time="23:59"
+                fi
+        else
+        	stop_time="23:59"
+        fi
+
+	# conversion to utc
+	zone=$(date +%z | cut -c 1)
+	utc_h=$(date -u -d @$(date "+%s" -d "$start_time") +%H)
+	local_h=$(echo $start_time | awk -F: '{ print $1 }')
+	if [ "$zone" == "+" ] && [ $utc_h -gt $local_h ]; then
+		start_utc="0:0"
+	else
+		start_utc=$(date -u -d @$(date "+%s" -d "$start_time") +%H:%M)
+	fi
+
+	utc_h=$(date -u -d @$(date "+%s" -d "$stop_time") +%H)
+	local_h=$(echo $stop_time | awk -F: '{ print $1 }')
+	if [ "$zone" == "-" ] && [ $utc_h -lt $local_h ]; then
+		stop_utc="23:59"
+	else
+		stop_utc=$(date -u -d @$(date "+%s" -d "$stop_time") +%H:%M)
+	fi
+
+
+	IP_RULE="$IP_RULE -m time --timestart $start_utc --timestop $stop_utc"
+	if [ -n "$day" ]; then
+		IP_RULE="$IP_RULE --weekdays $day"
+	fi
+
+	if [ "$access_policy" == "Deny" ]; then
+		IP_RULE="$IP_RULE -j DROP"
+	else
+		IP_RULE="$IP_RULE -j ACCEPT"
+	fi
+
+	iptables -w -A hosts_forward ${IP_RULE}
+	ip6tables -w -A hosts_forward ${IP_RULE}
+
+	day=""
+}
+
+iptables -w -F hosts_forward
+ip6tables -w -F hosts_forward
+
+iptables -w -t filter -N hosts_forward
+ret=$?                        
+[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
+ip6tables -w -t filter -N hosts_forward
+ret=$?                        
+[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
+
+# Load /etc/config/hosts UCI file
+config_load hosts
+config_foreach process_ac_schedule ac_schedule
+

map-topology/files/etc/uci-defaults/992-firewall_host.ucidefaults

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -f /etc/firewall.hosts ]; then
+	uci -q get firewall.hosts || {
+		uci -q set firewall.hosts=include
+		uci -q set firewall.hosts.path="/etc/firewall.hosts"
+		uci -q set firewall.hosts.reload=1
+	}
+fi
+
+
+exit 0

obuspa/Config.in

@@ -20,7 +20,7 @@ config OBUSPA_MTP_ENABLE_STOMP
 
 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
-	default n
+	default y
 
 config OBUSPA_CONTROLLER_MTP_VERIFY
 	bool "Enable verification of MQTT response topic before processing the message"

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.21
+PKG_VERSION:=6.0.0.14
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
-PKG_SOURCE_VERSION:=c71da7f9b66f4d7fd240e6eb7078044c6b43b72b
+PKG_SOURCE_VERSION:=3df3346238a9eef2168fddadcef01ebe311053e4
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -91,6 +91,7 @@ endif
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
+        $(Build/Patch)
 endef
 endif
 
@@ -109,6 +110,7 @@ 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/50-add-mqtt-usp-test $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -2,7 +2,7 @@ config obuspa 'global'
 	option enabled '1'
 	option debug '1'
 	option log_level '1'
-	option prototrace '1'
+	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
@@ -11,54 +11,22 @@ config obuspa 'global'
 	#option log_dest '/var/log/obuspa'
 
 # Adds Device.LocalAgent.MTP.
-config mtp 'agent_mtp'
+config mtp 'test_mtp'
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
-	option mqtt 'localmqtt'
+	option mqtt 'testmqtt'
 
 # Adds Device.MQTT.Client.
-config mqtt 'localmqtt'
+config mqtt 'testmqtt'
 	option BrokerAddress '127.0.0.1'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
 
 # Adds Device.LocalAgent.Controller.
-config controller 'localcontroller'
+config controller 'testcontroller'
 	option EndpointID 'proto::interop-usp-controller'
 	option Protocol 'MQTT'
 	option Topic '/usp/controller'
-	option mqtt 'localmqtt'
+	option mqtt 'testmqtt'
 	option assigned_role_name 'full_access'
 
-# Add Device.LocalAgent.Subscription.
-#config subscription 'sub_event'
-#    option ID 'uci-sub-events'
-#    option NotifType 'Event'
-#    list ReferenceList 'Device.Boot!'
-#    list ReferenceList 'Device.LocalAgent.TransferComplete!'
-#    option Persistent 'true'
-#    option controller 'localcontroller'
-
-#config subscription 'sub_op_comp'
-#   option ID 'uci-sub-op_complete'
-#   option NotifType 'OperationComplete'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Download()'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Activate()'
-#   option Persistent 'true'
-#   option controller 'localcontroller'
-
-#config challenge 'admin'
-#	option Description 'Request to get Administrative access'
-#	option role_name 'full_access'
-#	option Enable '1'
-#	option Value 'YWRtaW4='
-#	option Retries 2
-#	option LockoutPeriod 60
-
-#config challenge 'user'
-#	option Description 'Request to get User access'
-#	option role_name 'user'
-#	option Enable '1'
-#	option Value 'dXNlcg=='
-#	option Retries 3
-#	option LockoutPeriod 30

obuspa/files/etc/init.d/obuspa

@@ -1,14 +1,14 @@
 #!/bin/sh /etc/rc.common
 
 START=99
-STOP=2
+STOP=02
 USE_PROCD=1
 
 PROG=/usr/sbin/obuspa
 CONFIGURATION=obuspa
 
 ENV_PROFILE="/root/.profile"
-KEEP_FILES="/lib/upgrade/keep.d/obuspa"
+KEEP_FILE="/lib/upgrade/keep.d/obuspa"
 
 RESET_FILE="/tmp/obuspa/obuspa_param_reset.txt"
 SQL_DB_FILE="/tmp/obuspa/usp.db"
@@ -59,6 +59,17 @@ db_set_sql()
 	fi
 }
 
+db_del_sql()
+{
+	local param
+
+	param="${1}"
+
+	if [ -n "${param}" ]; then
+		${PROG} -f ${SQL_DB_FILE} -c dbdel "${param}" >/dev/null 2>&1
+	fi
+}
+
 db_set()
 {
 	# if sql db present, update sql db
@@ -70,6 +81,14 @@ db_set()
 	fi
 }
 
+update_db_dump()
+{
+	if [ -f "${DB_DUMP}" ]; then
+		rm ${DB_DUMP}
+		${PROG} -f ${SQL_DB_FILE} -c show database |sort > ${DB_DUMP}
+	fi
+}
+
 # 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
@@ -112,8 +131,8 @@ get_refrence_path()
 	value="${2}"
 	path=""
 
-	if [ -f "${SQL_DB_FILE}" ]; then
-		path=$(${PROG} -f ${SQL_DB_FILE} -c show database |grep "${dmref}\d.Alias "|grep -w "${value}")
+	if [ -f "${DB_DUMP}" ]; then
+		path=$(grep "${dmref}\d.Alias " ${DB_DUMP}|grep -w "${value}")
 	elif [ -f "${RESET_FILE}" ]; then
 		path=$(grep "${dmref}\d.Alias " ${RESET_FILE}|grep -w "${value}")
 	fi
@@ -123,14 +142,18 @@ get_refrence_path()
 
 update_keep()
 {
-	keep_file=${1}
+	file=${1}
 
-	if [ -z "${keep_file}" ]; then
+	if [ -z "${file}" ]; then
 		return;
 	fi
 
-	if ! grep -q "${keep_file}" ${KEEP_FILES}; then
-		echo "${keep_file}" >> ${KEEP_FILES}
+	if [ ! -f "${KEEP_FILE}" ]; then
+		touch "${KEEP_FILE}"
+	fi
+
+	if ! grep -q "${file}" ${KEEP_FILE}; then
+		echo "${file}" >> ${KEEP_FILE}
 	fi
 }
 
@@ -200,13 +223,15 @@ validate_controller_section()
 		'Enable:bool:1' \
 		'EndpointID:string' \
 		'assigned_role_name:string' \
+		'AssignedRole:string' \
 		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
 		'Destination:string' \
 		'Topic:string' \
 		'ParameterName:list(string)' \
+		'Reference:string' \
 		'mqtt:string' \
 		'stomp:string' \
-		'Host:host' \
+		'Host:string' \
 		'Port:port' \
 		'Path:string' \
 		'EnableEncryption:bool'
@@ -218,7 +243,7 @@ validate_subscription_section()
 		'Enable:bool:1' \
 		'NotifType:or("ValueChange","ObjectCreation","ObjectDeletion","OperationComplete","Event")' \
 		'ReferenceList:list(string)' \
-		'Persistent:bool:1' \
+		'Recipient:string' \
 		'controller:string'
 }
 
@@ -233,6 +258,7 @@ validate_mtp_section()
 		'Path:string' \
 		'mqtt:string' \
 		'stomp:string' \
+		'Reference:string' \
 		'EnableEncryption:bool'
 }
 
@@ -240,7 +266,7 @@ validate_stomp_connection_section()
 {
 	uci_validate_section ${CONFIGURATION} stomp "${1}" \
 		'Enable:bool:1' \
-		'Host:host' \
+		'Host:string' \
 		'Port:port:61613' \
 		'Username:string' \
 		'Password:string' \
@@ -253,7 +279,7 @@ validate_mqtt_client_section()
 {
 	uci_validate_section ${CONFIGURATION} mqtt "${1}" \
 		'Enable:bool:1' \
-		'BrokerAddress:host' \
+		'BrokerAddress:string' \
 		'BrokerPort:port:1883' \
 		'Username:string' \
 		'Password:string' \
@@ -288,8 +314,7 @@ publish_endpoint()
 {
 	local AgentEndpointID serial oui user pass
 
-	if ! uci -q get obuspa.localmqtt; then
-		log "Remote mqtt broker configured, skip publishing endpoint"
+	if ! uci -q get obuspa.testmqtt; then
 		return 0;
 	fi
 
@@ -305,11 +330,11 @@ publish_endpoint()
 	if [ -z "${AgentEndpointID}" ]; then
 		serial=$(get_serial_from_db)
 		oui=$(get_oui_from_db)
-		AgentEndpointID="os::${oui}-${serial}"
+		AgentEndpointID="os::${oui}-${serial//+/%2B}"
 	fi
 
-	config_get user localmqtt Username
-	config_get pass localmqtt Password
+	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
@@ -335,6 +360,7 @@ configure_localagent()
 	}
 
 	db_set Device.LocalAgent.EndpointID "${EndpointID}"
+	update_db_dump
 }
 
 update_reset_reason()
@@ -350,16 +376,18 @@ configure_controller()
 {
 	local EndpointID Enable 
 	local Protocol Destination
-	local Topic mqtt stomp assigned_role_name ParameterName
-	local Host Port Path EnableEncryption
-	local dm_ref
+	local Topic mqtt stomp assigned_role_name AssignedRole ParameterName
+	local Host Port Path EnableEncryption Reference
+	local dm_ref sec
 
+	sec="${1}"
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
 		return 1;
 	}
 
-	get_base_path "Device.LocalAgent.Controller." "uci-${1}"
+	sec="${sec/controller_/cpe-}"
+	get_base_path "Device.LocalAgent.Controller." "${sec}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
@@ -371,21 +399,30 @@ configure_controller()
 	fi
 
 	dm_ref=""
-	if [ "${Protocol}" = "STOMP" ]; then
-		dm_ref=$(get_refrence_path "Device.STOMP.Connection." "uci-${stomp}")
-	elif [ "${Protocol}" = "MQTT" ]; then
-		dm_ref=$(get_refrence_path "Device.MQTT.Client." "uci-${mqtt}")
+	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" "uci-${1}"
+	db_set "${BASEPATH}.Alias" "${sec}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.EndpointID" "${EndpointID}"
 	if [ -n "${assigned_role_name}" ]; then
 		AssignedRole=$(get_role_index "${assigned_role_name}")
+	fi
+
+	if [ -n "${AssignedRole}" ]; then
 		db_set "${BASEPATH}.AssignedRole" "${AssignedRole}"
 	fi
 
-	db_set "${BASEPATH}.MTP.1.Alias" "uci-${1}"
+	db_set "${BASEPATH}.MTP.1.Alias" "${sec}"
 	db_set "${BASEPATH}.MTP.1.Enable" "${Enable}"
 	db_set "${BASEPATH}.MTP.1.Protocol" "${Protocol}"
 	# only support configuration of one mtp path per controller using uci
@@ -412,36 +449,41 @@ configure_controller()
 
 	for param in ${ParameterName}
 	do
-		db_set "${BASEPATH}.BootParameter.${_pnum}.Alias" "uci-${1}-${_pnum}"
+		db_set "${BASEPATH}.BootParameter.${_pnum}.Alias" "${sec}_boot_${_pnum}"
 		db_set "${BASEPATH}.BootParameter.${_pnum}.Enable" "${Enable}"
 		db_set "${BASEPATH}.BootParameter.${_pnum}.ParameterName" "${param}"
 		_pnum=$(( _pnum + 1 ))
 	done
 
 	db_set
+	update_db_dump
 }
 
 configure_subscription()
 {
-	local Enable NotifType ReferenceList Persistent controller
+	local Enable NotifType ReferenceList controller
 	local dm_ref
+	local sec
 
+	sec="${1}"
 	validate_subscription_section "${1}" || {
 		log "Validation of subscription section failed"
 		return 1;
 	}
 
-	get_base_path "Device.LocalAgent.Subscription." "uci-${1}"
+	sec="${sec/sub_/cpe-}"
+	get_base_path "Device.LocalAgent.Subscription." "sub_${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
 	fi
 
 	if [ -n "${controller}" ]; then
-		dm_ref=$(get_refrence_path "Device.LocalAgent.Controller." "uci-${controller}")
+		controller="${controller/controller_/cpe-}"
+		dm_ref=$(get_refrence_path "Device.LocalAgent.Controller." "${controller}")
 	fi
 
-	db_set "${BASEPATH}.Alias" "uci-${1}"
+	db_set "${BASEPATH}.Alias" "${sec}"
 	db_set "${BASEPATH}.ID" "uci-${1}"
 	db_set "${BASEPATH}.CreationDate" "$(date -I'seconds')"
 	db_set "${BASEPATH}.Enable" "${Enable}"
@@ -450,8 +492,10 @@ configure_subscription()
 		ReferenceList=${ReferenceList// /,}
 		db_set "${BASEPATH}.ReferenceList" "${ReferenceList}"
 	fi
-	db_set "${BASEPATH}.Persistent" "${Persistent}"
+	db_set "${BASEPATH}.Persistent" "1"
 	db_set "${BASEPATH}.Recipient" "${dm_ref}"
+	# Entry updated in db, remove uci entry
+	uci_remove obuspa "${1}"
 }
 
 check_json_load()
@@ -488,8 +532,7 @@ get_role_index()
 	 *)
 		local ji=0
 
-		check_json_load
-		if [ "$?" -eq "0" ]; then
+		if check_json_load; then
 			ji=$(get_role_index_from_json "${role_name}" "${role_def_file}")
 		fi
 		idx=$(( ji + 2 )) # Add predefined roles
@@ -501,13 +544,16 @@ get_role_index()
 configure_challenges()
 {
 	local Enable Description role_name Role Value Retries LockoutPeriod
+	local sec
 
+	sec="${1}"
 	validate_challenge_section "${1}" || {
 		log "Validation of challenge section failed"
 		exit 1;
 	}
 
-	get_base_path "Device.LocalAgent.ControllerTrust.Challenge." "uci-${1}"
+	sec="${sec/challenge_/cpe-}"
+	get_base_path "Device.LocalAgent.ControllerTrust.Challenge." "${sec}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
@@ -518,7 +564,7 @@ configure_challenges()
 		return 1;
 	fi
 
-	db_set "${BASEPATH}.Alias" "uci-${1}"
+	db_set "${BASEPATH}.Alias" "${sec}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.Description" "${Description}"
 
@@ -530,19 +576,22 @@ configure_challenges()
 	db_set "${BASEPATH}.Value" "${Value}"
 	db_set "${BASEPATH}.Retries" "${Retries}"
 	db_set "${BASEPATH}.LockoutPeriod" "${LockoutPeriod}"
+	# Entry updated in db, remove uci entry
+	uci_remove obuspa "${1}"
 }
 
 configure_mtp() {
 	local Enable Protocol ResponseTopicConfigured
 	local Path Port EnableEncryption
-	local stomp mqtt dm_ref
+	local stomp mqtt dm_ref sec
 
+	sec="${1}"
 	validate_mtp_section "${1}" || {
 		log "Validation of mtp section failed"
 		return 1;
 	}
-
-	get_base_path "Device.LocalAgent.MTP." "uci-${1}"
+	sec="${sec/mtp_/cpe-}"
+	get_base_path "Device.LocalAgent.MTP." "${sec}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
@@ -554,13 +603,19 @@ configure_mtp() {
 	fi
 
 	dm_ref=""
-	if [ "${Protocol}" = "STOMP" ]; then
-		dm_ref=$(get_refrence_path "Device.STOMP.Connection." "uci-${stomp}")
-	elif [ "${Protocol}" = "MQTT" ]; then
-		dm_ref=$(get_refrence_path "Device.MQTT.Client." "uci-${mqtt}")
+	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" "uci-${1}"
+	db_set "${BASEPATH}.Alias" "${sec}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.Protocol" "${Protocol}"
 	if [ "${Protocol}" = "MQTT" ]; then
@@ -578,24 +633,28 @@ configure_mtp() {
 		db_set "${BASEPATH}.WebSocket.EnableEncryption" "${EnableEncryption}"
 	fi
 	db_set
+	update_db_dump
 }
 
 configure_stomp_connection() {
 	local Host Username Password Enable Port VirtualHost
 	local EnableEncryption EnableHeartbeats
+	local sec
 
+	sec="${1}"
 	validate_stomp_connection_section "${1}" || {
 		log "Validation of stomp section failed"
 		return 1;
 	}
 
-	get_base_path "Device.STOMP.Connection." "uci-${1}"
+	sec="${sec/stomp_/cpe-}"
+	get_base_path "Device.STOMP.Connection." "${sec}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
 	fi
 
-	db_set "${BASEPATH}.Alias" "uci-${1}"
+	db_set "${BASEPATH}.Alias" "${sec}"
 	db_set "${BASEPATH}.Host" "${Host}"
 	db_set "${BASEPATH}.Username" "${Username}"
 	db_set "${BASEPATH}.Password" "${Password}"
@@ -606,24 +665,28 @@ configure_stomp_connection() {
 	db_set "${BASEPATH}.EnableHeartbeats" "${EnableHeartbeats}"
 	db_set "${BASEPATH}.VirtualHost" "${VirtualHost}"
 	db_set
+	update_db_dump
 }
 
-configure_mqtt_client(){
+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;
 	}
 
-	get_base_path "Device.MQTT.Client." "uci-${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" "uci-${1}"
+	db_set "${BASEPATH}.Alias" "${sec}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.BrokerAddress" "${BrokerAddress}"
 	db_set "${BASEPATH}.BrokerPort" "${BrokerPort}"
@@ -634,6 +697,7 @@ configure_mqtt_client(){
 	db_set "${BASEPATH}.ClientID" "${ClientID}"
 
 	db_set
+	update_db_dump
 }
 
 
@@ -705,21 +769,277 @@ configure_obuspa() {
 	fi
 }
 
+get_instances_from_db_dump()
+{
+	local obj inst
+
+	obj="${1}\d"
+	if [ ! -f "${DB_DUMP}" ]; then
+		echo ""
+		return 0;
+	fi
+
+	inst="$(grep -oe "${obj}" "${DB_DUMP}"|uniq)"
+	echo "$inst"
+}
+
+get_param_value_from_dump()
+{
+	local param value
+
+	param="${1}"
+
+	if [ -z "${param}" ] || [ ! -f "${DB_DUMP}" ]; then
+		log "error getting param"
+		echo ""
+		return 0
+	fi
+
+	value="$(grep "^${param} " ${DB_DUMP}|awk '{print $3}')"
+
+	echo "$value"
+}
+
+update_uci_sec()
+{
+	local sec tmp
+
+	sec="${1}"
+	stype="${2}"
+	if [ -z "$sec" ] || [ -z "$stype" ]; then
+		log "No section name, error"
+		return 0
+	fi
+
+	tmp="$(uci_get obuspa "${sec}")"
+	if [ "$tmp" != "$stype" ]; then
+		uci_add obuspa "${stype}" "${sec}"
+	fi
+}
+
+sync_db_controller()
+{
+	local cntrs copts sec pvalue protocol
+
+	copts="Enable EndpointID AssignedRole"
+	popts="Destination Topic Reference Host Port Path EnableEncryption"
+
+	cntrs="$(get_instances_from_db_dump Device.LocalAgent.Controller.)"
+	for cntr in $cntrs; do
+		sec="$(get_param_value_from_dump "${cntr}".Alias)"
+		sec="${sec/cpe-/controller_}"
+		sec="${sec/-/_}"
+
+		update_uci_sec "${sec}" controller
+		for param in ${copts}; do
+			pvalue="$(get_param_value_from_dump "${cntr}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+		uci_set obuspa "${sec}" "_sync" "1"
+
+		protocol="$(get_param_value_from_dump "${cntr}".MTP.1.Protocol)"
+		if [ -z "${protocol}" ]; then
+			break;
+		fi
+		uci_set obuspa "${sec}" "Protocol" "${protocol}"
+		for param in ${popts}; do
+			pvalue="$(get_param_value_from_dump "${cntr}".MTP.1."${protocol}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+	done
+}
+
+sync_db_localagent_mtp()
+{
+	local mtps opts popts sec pvalue protocol
+
+	opts="Enable"
+	popts="ResponseTopicConfigured Destination Port Path Reference EnableEncryption"
+	ropts="mqtt stomp"
+
+	mtps="$(get_instances_from_db_dump Device.LocalAgent.MTP.)"
+	for inst in $mtps; do
+		sec="$(get_param_value_from_dump "${inst}".Alias)"
+		sec="${sec/cpe-/mtp_}"
+		sec="${sec/-/_}"
+		update_uci_sec "${sec}" mtp
+		for param in ${opts}; do
+			pvalue="$(get_param_value_from_dump "${inst}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+		uci_set obuspa "${sec}" "_sync" "1"
+
+		protocol="$(get_param_value_from_dump "${inst}".Protocol)"
+		if [ -z "${protocol}" ]; then
+			break;
+		fi
+		uci_set obuspa "${sec}" "Protocol" "${protocol}"
+		for param in ${popts}; do
+			pvalue="$(get_param_value_from_dump "${inst}"."${protocol}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+		for param in ${ropts}; do
+			uci_set obuspa "${sec}" "${param}" ""
+		done
+	done
+}
+
+
+sync_db_mqtt_client()
+{
+	local mtps copts sec pvalue protocol
+
+	opts="Enable BrokerAddress BrokerPort Username ProtocolVersion TransportProtocol ClientID"
+
+	mtps="$(get_instances_from_db_dump Device.MQTT.Client.)"
+	for inst in $mtps; do
+		sec="$(get_param_value_from_dump "${inst}".Alias)"
+		sec="${sec/cpe-/mqtt_}"
+		sec="${sec/-/_}"
+		update_uci_sec "${sec}" mqtt
+		for param in ${opts}; do
+			pvalue="$(get_param_value_from_dump "${inst}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+		uci_set obuspa "${sec}" "_sync" "1"
+	done
+}
+
+sync_db_stomp_connection()
+{
+	local mtps copts sec pvalue protocol
+
+	opts="Enable Host Port Username EnableEncryption EnableHeartbeats VirtualHost"
+
+	mtps="$(get_instances_from_db_dump Device.STOMP.Connection.)"
+	for inst in $mtps; do
+		sec="$(get_param_value_from_dump "${inst}".Alias)"
+		sec="${sec/cpe-/stomp_}"
+		sec="${sec/-/_}"
+		update_uci_sec "${sec}" stomp
+		for param in ${opts}; do
+			pvalue="$(get_param_value_from_dump "${inst}"."${param}")"
+			uci_set obuspa "${sec}" "${param}" "${pvalue}"
+		done
+		uci_set obuspa "${sec}" "_sync" "1"
+	done
+}
+
+sync_update_sec()
+{
+	local _sync
+	config_get _sync "${1}" _sync ""
+	if [ -z "${_sync}" ]; then
+		uci_remove obuspa "${1}"
+	else
+		uci_remove obuspa "${1}" _sync
+	fi
+}
+
+sync_uci_with_db()
+{
+	if [ ! -f "${DB_DUMP}" ]; then
+		return 0;
+	fi
+
+	config_load obuspa
+	sync_db_controller
+	sync_db_localagent_mtp
+	sync_db_mqtt_client
+	sync_db_stomp_connection
+	uci_commit obuspa
+
+	config_load obuspa
+	config_foreach sync_update_sec controller
+	config_foreach sync_update_sec mtp
+	config_foreach sync_update_sec mqtt
+	config_foreach sync_update_sec stomp
+	uci_commit obuspa
+}
+
+delete_sql_db_entry_with_pattern()
+{
+	local params pattern
+
+	pattern="${1}"
+	if [ ! -f "${DB_DUMP}" ]; then
+		return 0;
+	fi
+
+	if [ "${#pattern}" -lt 7 ]; then
+		return 0;
+	fi
+
+	params="$(grep ${pattern} ${DB_DUMP}|awk '{print $1}')"
+	for p in ${params}; do
+		db_del_sql "${p}"
+	done
+}
+
+check_n_delete_db()
+{
+	local sec t r path
+
+	sec="${1}"
+	if uci -q get obuspa.${sec} >/dev/null 2>&1; then
+		return 0
+	fi
+
+	t="${2}"
+	r="${3}"
+	sec="${sec/${t}_/cpe-}"
+
+	path=$(grep "${r}\d.Alias => ${sec}" ${DB_DUMP})
+	path=${path%.*}
+
+	delete_sql_db_entry_with_pattern "${path}"
+}
+
+reverse_update_db_with_uci()
+{
+	if [ ! -f "${DB_DUMP}" ]; then
+		return 0;
+	fi
+
+	export UCI_CONFIG_DIR="/tmp/obuspa"
+	config_load obuspa
+	config_foreach check_n_delete_db controller controller "Device.LocalAgent.Controller."
+	config_foreach check_n_delete_db mtp mtp "Device.LocalAgent.MTP."
+	config_foreach check_n_delete_db mqtt mqtt "Device.MQTT.Client."
+	config_foreach check_n_delete_db stomp stomp "Device.STOMP.Connection."
+	unset UCI_CONFIG_DIR
+}
+
 # Create factory reset file
 db_init()
 {
+	local reason
+
+	reason="${1}"
+	mkdir -p /tmp/obuspa/
 	# Load configuration
 	config_load $CONFIGURATION
 	config_get SQL_DB_FILE global db_file "/tmp/obuspa/usp.db"
 
 	# Dump datamodel parameters from DB
 	if [ -f "${SQL_DB_FILE}" ]; then
-		${PROG} -f ${SQL_DB_FILE} -c show database > ${DB_DUMP}
+		${PROG} -f ${SQL_DB_FILE} -c show database |sort > ${DB_DUMP}
+	fi
+
+	# Only sync uci with db in case of non service triggers
+	if [ -f "${DB_DUMP}" ] && [ "${reason}" != "update" ]; then
+		sync_uci_with_db
+	fi
+
+	# remove entries from db if deleted from uci
+	if [ -f "${DB_DUMP}" ] && [ "${reason}" == "update" ] && [ -f "/tmp/obuspa/obuspa" ]; then
+		reverse_update_db_with_uci
 	fi
 
 	# Remove reset file if present
 	[ -f "${RESET_FILE}" ] && rm -f ${RESET_FILE}
 
+	config_load $CONFIGURATION
 	global_init
 	config_foreach configure_localagent localagent
 	global_init
@@ -736,6 +1056,9 @@ db_init()
 	config_foreach configure_challenges challenge
 	global_init
 	update_reset_reason
+	uci_commit ${CONFIGURATION}
+
+	cp /etc/config/obuspa /tmp/obuspa/
 
 	[ -f "${DB_DUMP}" ] && rm -f ${DB_DUMP}
 
@@ -771,7 +1094,7 @@ start_service() {
 	fi
 
 	mkdir -p /tmp/obuspa/
-	db_init
+	db_init "${1}"
 	register_service
 }
 
@@ -781,7 +1104,7 @@ stop_service() {
 
 reload_service() {
 	stop
-	start
+	start update
 }
 
 service_triggers() {
@@ -801,7 +1124,7 @@ service_triggers() {
 				json_add_array
 					json_add_string "" "run_script"
 					json_add_string "" "/etc/init.d/obuspa"
-					json_add_string "" "reload"
+					json_add_string "" "restart"
 				json_close_array
 			json_close_array
 			json_add_int "" "2000"

obuspa/files/etc/obuspa/dmcaching_exclude.json

@@ -1,7 +1,8 @@
 {
   "dmcaching_exclude": [
-    "Device.DeviceInfo.ProcessStatus.Process.",
+    "Device.InterfaceStack.",
     "Device.Hosts.Host.",
+    "Device.IEEE1905.",
     "Device.WiFi.DataElements."
   ]
 }

obuspa/files/etc/uci-defaults/50-add-mqtt-usp-test

@@ -0,0 +1,14 @@
+add_usp_test()
+{
+        if ! uci_get mosquitto usptest >/dev/null 2>&1; then
+                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'
+        fi
+}
+
+uci_load mosquitto
+add_usp_test

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

@@ -0,0 +1,140 @@
+diff --git a/src/core/device.h b/src/core/device.h
+index adf8fa6..072f953 100644
+--- a/src/core/device.h
++++ b/src/core/device.h
+@@ -111,6 +111,7 @@ typedef struct
+     // Following member variables only set if USP message was received over MQTT
+     int mqtt_instance;
+     char *mqtt_topic;           // only set if reply_to was specified in the received MQTT packet
++    char *mqtt_topic_recv;
+ 
+ 
+     // Following member variables only set if USP message was received over CoAP
+@@ -252,7 +253,7 @@ void DEVICE_MTP_NotifyMqttConnDeleted(int mqtt_instance);
+ int DEVICE_MTP_ValidateMqttReference(dm_req_t *req, char *value);
+ void DEVICE_CONTROLLER_SetRolesFromMqtt(int mqtt_instance, ctrust_role_t role);
+ char *DEVICE_CONTROLLER_GetControllerTopic(int mqtt_instance);
+-
++int validate_controller_topic_by_endpointid(char *endpointid, mtp_protocol_t proto, char *recv_topic);
+ //------------------------------------------------------------------------------
+ // Tables used to convert to/from an enumeration to/from a string
+ extern const enum_entry_t mtp_protocols[kMtpProtocol_Max];
+diff --git a/src/core/device_controller.c b/src/core/device_controller.c
+index 62c803f..103388d 100755
+--- a/src/core/device_controller.c
++++ b/src/core/device_controller.c
+@@ -239,6 +239,41 @@ int Async_E2ESessionReset(dm_req_t *req, kv_vector_t *input_args, int request);
+ extern const enum_entry_t e2e_session_modes[kE2EMode_Max];
+ #endif
+ 
++
++int validate_controller_topic_by_endpointid(char *endpointid, mtp_protocol_t proto, char *recv_topic)
++{
++    controller_t *cont = FindEnabledControllerByEndpointId(endpointid);
++    if (cont == NULL)
++    {
++        USP_LOG_Error("not able to find the controller from endpointid [%s]", endpointid);
++        return USP_ERR_PERMISSION_DENIED;
++    }
++#ifdef ENABLE_MQTT
++    if (proto == kMtpProtocol_MQTT)
++    {
++        controller_mtp_t *mtp = FindFirstEnabledMtp(cont, proto);
++
++        if (mtp == NULL) {
++            USP_LOG_Error("Not able to find mtp[%d] for endpointid [%s]", proto, endpointid);
++            return USP_ERR_REQUEST_DENIED;
++        }
++
++        if (mtp->protocol != proto) {
++            USP_LOG_Error("No matching mtp[%d] for endpointid [%s]", proto, endpointid);
++            return USP_ERR_REQUEST_DENIED;
++        }
++
++        char *response_topic = DEVICE_MTP_GetAgentMqttResponseTopic(mtp->mqtt_connection_instance);
++        if (response_topic && strcmp(response_topic, recv_topic) != 0 ) {
++            USP_LOG_Error("Controller response topic[%s] and recv topic[%s] mismatch, probably a spoof message", response_topic, recv_topic);
++            return USP_ERR_PERMISSION_DENIED;
++        }
++    }
++#endif
++
++    return USP_ERR_OK;
++}
++
+ /*********************************************************************//**
+ **
+ ** DEVICE_CONTROLLER_Init
+diff --git a/src/core/dm_exec.c b/src/core/dm_exec.c
+index c0b95d8..6eb51e2 100755
+--- a/src/core/dm_exec.c
++++ b/src/core/dm_exec.c
+@@ -624,6 +624,7 @@ void DM_EXEC_PostUspRecord(unsigned char *pbuf, int pbuf_len, ctrust_role_t role
+     pur->mtp_reply_to.coap_encryption = mrt->coap_encryption;
+     pur->mtp_reply_to.coap_reset_session_hint = mrt->coap_reset_session_hint;
+     pur->mtp_reply_to.mqtt_topic = USP_STRDUP(mrt->mqtt_topic);
++    pur->mtp_reply_to.mqtt_topic_recv = USP_STRDUP(mrt->mqtt_topic_recv);
+     pur->mtp_reply_to.mqtt_instance = mrt->mqtt_instance;
+     pur->mtp_reply_to.wsclient_cont_instance = mrt->wsclient_cont_instance;
+     pur->mtp_reply_to.wsclient_mtp_instance = mrt->wsclient_mtp_instance;
+@@ -1144,6 +1145,7 @@ void ProcessMessageQueueSocketActivity(socket_set_t *set)
+             USP_SAFE_FREE(mrt->coap_resource);
+             USP_SAFE_FREE(mrt->mqtt_topic);
+             USP_SAFE_FREE(mrt->cont_endpoint_id);
++            USP_SAFE_FREE(mrt->mqtt_topic_recv);
+             break;
+ 
+ #ifndef DISABLE_STOMP
+diff --git a/src/core/mqtt.c b/src/core/mqtt.c
+index 7dba9f4..3ee9c97 100644
+--- a/src/core/mqtt.c
++++ b/src/core/mqtt.c
+@@ -3141,6 +3141,7 @@ void ReceiveMqttMessage(mqtt_client_t *client, const struct mosquitto_message *m
+         mrt.mqtt_topic = response_topic;
+     }
+ 
++    mrt.mqtt_topic_recv = message->topic;
+     // Message may not be valid USP
+     DM_EXEC_PostUspRecord(message->payload, message->payloadlen, client->role, &mrt);
+ }
+diff --git a/src/core/msg_handler.c b/src/core/msg_handler.c
+index ce67626..4af9ade 100644
+--- a/src/core/msg_handler.c
++++ b/src/core/msg_handler.c
+@@ -118,7 +118,7 @@ static enum_entry_t mtp_content_types[] = {
+ //------------------------------------------------------------------------------
+ // Forward declarations. Note these are not static, because we need them in the symbol table for USP_LOG_Callstack() to show them
+ int HandleUspMessage(Usp__Msg *usp, char *controller_endpoint, mtp_reply_to_t *mrt);
+-int ValidateUspRecord(UspRecord__Record *rec);
++int ValidateUspRecord(UspRecord__Record *rec, mtp_reply_to_t *mrt);
+ char *MtpSendItemToString(mtp_send_item_t *msi);
+ void CacheControllerRoleForCurMsg(char *endpoint_id, ctrust_role_t role, mtp_protocol_t protocol);
+ int QueueUspNoSessionRecord(usp_send_item_t *usi, char *endpoint_id, char *usp_msg_id, mtp_reply_to_t *mrt, time_t expiry_time);
+@@ -172,7 +172,7 @@ int MSG_HANDLER_HandleBinaryRecord(unsigned char *pbuf, int pbuf_len, ctrust_rol
+ #endif
+ 
+     // Exit if USP record failed validation
+-    err = ValidateUspRecord(rec);
++    err = ValidateUspRecord(rec, mrt);
+     if (err != USP_ERR_OK)
+     {
+         goto exit;
+@@ -725,7 +725,7 @@ exit:
+ ** \return  USP_ERR_OK if record is valid
+ **
+ **************************************************************************/
+-int ValidateUspRecord(UspRecord__Record *rec)
++int ValidateUspRecord(UspRecord__Record *rec, mtp_reply_to_t *mrt)
+ {
+     char *endpoint_id;
+ 
+@@ -806,6 +806,9 @@ int ValidateUspRecord(UspRecord__Record *rec)
+         return USP_ERR_REQUEST_DENIED;
+     }
+ 
++#if OBUSPA_CONTROLLER_MTP_VERIFY
++    return validate_controller_topic_by_endpointid(rec->from_id, mrt->protocol, mrt->mqtt_topic_recv);
++#endif
+     // If the code gets here, then the USP record passed validation, and the encapsulated USP message may be processed
+     return USP_ERR_OK;
+ }

obuspa/patches/0002-supress-group-get-error.patch

@@ -0,0 +1,49 @@
+diff --git a/src/core/cli_server.c b/src/core/cli_server.c
+index 701cbd9..103361e 100644
+--- a/src/core/cli_server.c
++++ b/src/core/cli_server.c
+@@ -733,10 +733,6 @@ int ExecuteCli_Get(char *arg1, char *arg2, char *usage)
+             USP_ASSERT(gge->value != NULL);
+             SendCliResponse("%s => %s\n", gge->path, gge->value);
+         }
+-        else
+-        {
+-            SendCliResponse("ERROR: %d retrieving %s (%s)\n", gge->err_code, gge->path, gge->err_msg);
+-        }
+     }
+ 
+     GROUP_GET_VECTOR_Destroy(&ggv);
+diff --git a/src/core/handle_get.c b/src/core/handle_get.c
+index e1055e0..16b9ceb 100755
+--- a/src/core/handle_get.c
++++ b/src/core/handle_get.c
+@@ -260,26 +260,16 @@ void FormPathExprResponse(int get_expr_index, char *path_expr, get_expr_info_t *
+         return;
+     }
+ 
+-    // If there was an error in getting any of the parameters associated with the path expression,
+-    // then just add the first error, without any of the parameter values, for this path expression result
+-    for (i=0; i < gi->num_entries; i++)
+-    {
+-        gge = &ggv->vector[gi->index + i];
+-        if (gge->err_code != USP_ERR_OK)
+-        {
+-            (void)AddGetResp_ReqPathRes(resp, path_expr, gge->err_code, gge->err_msg);
+-            return;
+-        }
+-    }
+-
+     // If the code gets here, then the value of all parameters were retrieved successfully, so add their values to the result_params
+     req_path_result = AddGetResp_ReqPathRes(resp, path_expr, USP_ERR_OK, "");
+     for (i=0; i < gi->num_entries; i++)
+     {
+         gge = &ggv->vector[gi->index + i];
+ 
+-        // Simple format contains a resolved_path_result for every object (and sub object)
+-        AddResolvedPathResult(req_path_result, gge->path, gge->value);
++        if (gge->err_code == USP_ERR_OK) {
++            // Simple format contains a resolved_path_result for every object (and sub object)
++            AddResolvedPathResult(req_path_result, gge->path, gge->value);
++	}
+     }
+ }

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

@@ -0,0 +1,43 @@
+--- a/src/core/cli_server.c
++++ b/src/core/cli_server.c
+@@ -787,6 +787,7 @@ int ExecuteCli_Set(char *arg1, char *arg
+         goto exit;
+     }
+ 
++    SetControllerRoleForInternal();
+     // Iterate over all objects to set
+     for (i=0; i < objects.num_entries; i++)
+     {
+--- a/src/core/data_model.h
++++ b/src/core/data_model.h
+@@ -324,6 +324,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);
++void SetControllerRoleForInternal();
+ 
+ int DM_PRIV_InitSetRequest(dm_req_t *req, dm_node_t *node, char *path, dm_instances_t *inst, char *new_value);
+ void DM_PRIV_RequestInit(dm_req_t *req, dm_node_t *node, char *path, dm_instances_t *inst);
+--- a/src/core/msg_handler.c
++++ b/src/core/msg_handler.c
+@@ -839,6 +839,20 @@ char *MtpSendItemToString(mtp_send_item_
+ 
+ /*********************************************************************//**
+ **
++** SetControllerRoleForInternal
++**
++** Sets the role for internal user
++**
++**
++**************************************************************************/
++void SetControllerRoleForInternal()
++{
++    cur_msg_combined_role.inherited = kCTrustRole_Untrusted;
++    cur_msg_combined_role.assigned = kCTrustRole_FullAccess;
++}
++
++/*********************************************************************//**
++**
+ ** CacheControllerRoleForCurMsg
+ **
+ ** Retrieves the role to use for the specified controller, and caches it locally, so that

owsd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=owsd
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.5
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=e37c6f9d708c454c802eede814cc51fb89c919e9
+PKG_SOURCE_VERSION:=d866ee2a96f5b75b3f45b0e1d655431184e8032d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}

periodicstats/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.2.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -20,15 +20,13 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/periodicstats
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Periodic Statistics Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbf_api
 endef
 
 define Package/periodicstats/description

ponmngr/Makefile

@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ponmngr
 	CATEGORY:=Utilities
 	TITLE:=PON Manager
-	DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
+	DEPENDS:=@(TARGET_brcmbca||TARGET_airoha)
 endef
 
 define Package/ponmngr/description
@@ -34,11 +34,13 @@ endef
 
 define Package/ponmngr/install
 	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
+ifneq ($(CONFIG_TARGET_brcmbca),)
 	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_iopsys_econet),)
+else ifneq ($(CONFIG_TARGET_airoha),)
 	$(CP) ./files/airoha/* $(1)/
 endif
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(CP) ./files/etc/bbfdm/json/* $(1)/etc/bbfdm/json/
 endef
 
 $(eval $(call BuildPackage,ponmngr))

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

@@ -10,6 +10,9 @@ set_serial_number() {
 }
 
 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_close_instance

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

@@ -9,14 +9,16 @@ USE_PROCD=1
 include /lib/xpon
 
 configure_serial_number() {
+	# serial number generation is taken care in the uci defaults, so if
+	# serial number is not found here its a misconfig
 	serial_number="$(uci -q get xpon.ani.serial_number)"
 	if [ ${#serial_number} -eq 12 ]; then
 		vendor_id="${serial_number:0:4}"
 		vssn="${serial_number:4:8}"
 	else
-		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-		vendor_id="IOPS"
-		vssn="${macaddr:4:8}"
+		logger -s -t "xpon" "Serial number not found in uci, ont will probably not be registered at the olt"
+		logger -s -t "xpon" "Please configure a valid serial number"
+		return
 	fi
 
 	set_serial_number $vendor_id $vssn

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

@@ -1,17 +1,34 @@
 #!/bin/sh
 
+
+configure_serial_number() {
+	# check if serial number is present in the production data
+	production_sn="$(fw_printenv -n gponsn)"
+	if [ ${#production_sn} -eq 12 ]; then
+		uci set xpon.ani.serial_number=$production_sn
+	else
+		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
+		vendor_id="IOPS"
+		vssn="${macaddr:4:8}"
+		uci set xpon.ani.serial_number=$vendor_id$vssn
+	fi
+}
+
 if [ -s "/etc/config/xpon" ]; then
         if uci -q get xpon.ani >/dev/null; then
-                # return if there is any valid content
+                # generate serial number in case its not present and return
+		serial_number="$(uci -q get xpon.ani.serial_number)"
+		if [ ${#serial_number} -ne 12 ]; then
+			configure_serial_number
+		fi
                 exit                                  
         else                                          
                 rm -f /etc/config/xpon
         fi                           
 fi                                   
 touch /etc/config/xpon
-                     
-                          
+
 uci set xpon.ani=ani
 uci set xpon.ani.enable="1"
-                                           
-uci commit xpon  
+configure_serial_number
+

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

@@ -0,0 +1,656 @@
+{
+	"json_plugin_version": 1,
+	"Device.XPON.": {
+		"type": "object",
+		"protocols": [
+			"usp"
+		],
+		"access": false,
+		"array": false,
+		"dependency": "file:/etc/config/xpon",
+		"ONUNumberOfEntries": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"usp"
+			],
+			"datatype": "unsignedInt",
+			"mapping": [
+				{
+					"type": "ubus",
+					"ubus": {
+						"object": "xpon",
+						"method": "status",
+						"args": {},
+						"key": "ONU.@Count"
+					}
+				}
+			]
+		},
+		"Device.XPON.ONU.{i}.": {
+			"type": "object",
+			"protocols": [
+				"usp"
+			],
+			"access": false,
+			"array": true,
+			"mapping": [
+				{
+					"type": "ubus",
+					"ubus": {
+						"object": "xpon",
+						"method": "status",
+						"args": {},
+						"key": "ONU"
+					}
+				}
+			],
+			"Enable": {
+				"type": "boolean",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"usp"
+				],
+				"datatype": "boolean",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "json",
+						"key": "Enable"
+					}
+				]
+			},
+			"Version": {
+				"type": "string",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"usp"
+				],
+				"datatype": "string",
+				"range": [
+					{
+						"max": 14
+					}
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "json",
+						"key": "Version"
+					}
+				]
+			},
+			"EquipmentID": {
+				"type": "string",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"usp"
+				],
+				"datatype": "string",
+				"range": [
+					{
+						"max": 20
+					}
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "json",
+						"key": "EquipmentID"
+					}
+				]
+			},
+			"SoftwareImageNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].softwareImage.@Count"
+						}
+					}
+				]
+			},
+			"EthernetUNINumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].EthernetUNI.@Count"
+						}
+					}
+				]
+			},
+			"ANINumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].ANI.@Count"
+						}
+					}
+				]
+			},
+			"Device.XPON.ONU.{i}.SoftwareImage.{i}.": {
+				"type": "object",
+				"protocols": [
+					"usp"
+				],
+				"access": false,
+				"array": true,
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].softwareImage"
+						}
+					}
+				],
+				"ID": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 0,
+							"max": 1
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "ID"
+						}
+					]
+				},
+				"Version": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 14
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Version"
+						}
+					]
+				},
+				"IsCommitted": {
+					"type": "boolean",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "IsCommitted"
+						}
+					]
+				},
+				"IsActive": {
+					"type": "boolean",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "IsActive"
+						}
+					]
+				},
+				"IsValid": {
+					"type": "boolean",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "IsValid"
+						}
+					]
+				}
+			},
+			"Device.XPON.ONU.{i}.EthernetUNI.{i}.": {
+				"type": "object",
+				"protocols": [
+					"usp"
+				],
+				"access": false,
+				"array": true,
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].EthernetUNI"
+						}
+					}
+				],
+				"Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Enable"
+						}
+					]
+				},
+				"Status": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"Up",
+						"Down",
+						"unknown",
+						"Dormant",
+						"NotPresent",
+						"LowerLayerDown",
+						"Error"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Status"
+						}
+					]
+				},
+				"ANIs": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 1024
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "ANIs"
+						}
+					]
+				},
+				"InterdomainID": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "InterDomainID"
+						}
+					]
+				},
+				"InterdomainName": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 25
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "InterDomainName"
+						}
+					]
+				},
+				"Device.XPON.ONU.{i}.EthernetUNI.{i}.Stats.": {
+					"type": "object",
+					"protocols": [
+						"usp"
+					],
+					"access": false,
+					"array": false,
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Stats"
+						}
+					],
+					"BytesSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"datatype": "unsignedLong",
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "json",
+								"key": "Stats.BytesSent"
+							}
+						]
+					},
+					"BytesReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"datatype": "unsignedLong",
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "json",
+								"key": "Stats.BytesReceived"
+							}
+						]
+					},
+					"PacketsSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"datatype": "unsignedLong",
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "json",
+								"key": "Stats.PacketsSent"
+							}
+						]
+					},
+					"PacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"datatype": "unsignedLong",
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "json",
+								"key": "Stats.PacketsReceived"
+							}
+						]
+					}
+				}
+			},
+			"Device.XPON.ONU.{i}.ANI.{i}.": {
+				"type": "object",
+				"protocols": [
+					"usp"
+				],
+				"access": false,
+				"array": true,
+				"mapping": [
+					{
+						"type": "ubus",
+						"ubus": {
+							"object": "xpon",
+							"method": "status",
+							"args": {},
+							"key": "ONU[@index].ANI"
+						}
+					}
+				],
+				"Enable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"rpc": "get",
+							"data": "@Parent",
+							"type": "json",
+							"key": "Enable"
+						},
+						{
+							"rpc": "set",
+							"type": "uci",
+							"uci": {
+								"file": "xpon",
+								"section": {
+									"name": "ani"
+								},
+								"option": {
+									"name": "enable"
+								}
+							}
+						}
+					]
+				},
+				"Status": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"Up",
+						"Down",
+						"Dormant",
+						"Unknown",
+						"NotPresent",
+						"Error"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Status"
+						}
+					]
+				},
+				"PONMode": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"GPON",
+						"XG-PON",
+						"NG-PON2",
+						"XGS-PON"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "PONMode"
+						}
+					]
+				},
+				"Device.XPON.ONU.{i}.ANI.{i}.Stats.": {
+					"type": "object",
+					"protocols": [
+						"usp"
+					],
+					"access": false,
+					"array": false,
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "json",
+							"key": "Stats"
+						}
+					],
+					"BytesSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"datatype": "unsignedLong",
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "json",
+								"key": "Stats.BytesSent"
+							}
+						]
+					},
+					"BytesReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"datatype": "unsignedLong",
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "json",
+								"key": "Stats.BytesReceived"
+							}
+						]
+					},
+					"PacketsSent": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"datatype": "unsignedLong",
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "json",
+								"key": "Stats.PacketsSent"
+							}
+						]
+					},
+					"PacketsReceived": {
+						"type": "unsignedLong",
+						"read": true,
+						"write": false,
+						"protocols": [
+							"usp"
+						],
+						"datatype": "unsignedLong",
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "json",
+								"key": "Stats.PacketsReceived"
+							}
+						]
+					}
+				}
+			}
+		}
+	}
+}
+

qosmngr/Makefile

@@ -27,7 +27,7 @@ define Package/qosmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=QoS Manager
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
+  DEPENDS:=@(TARGET_brcmbca||TARGET_airoha||TARGET_iopsys_mediatek) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
 endef
 
 define Package/qosmngr/description
@@ -40,11 +40,32 @@ define Build/Prepare
 endef
 endif
 
-define Package/qosmngr/install
-	$(CP) ./files/* $(1)/
+define Package/qosmngr/install/common
+	$(CP) ./files/common/* $(1)/
 	$(INSTALL_DIR) $(1)/usr
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qosmngr $(1)/usr/sbin
 endef
 
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+define Package/qosmngr/install
+	$(CP) ./files/broadcom/* $(1)/
+	$(call Package/qosmngr/install/common,$(1))
+endef
+endif
+
+ifeq ($(CONFIG_TARGET_airoha),y)
+define Package/qosmngr/install
+	$(CP) ./files/airoha/* $(1)/
+	$(call Package/qosmngr/install/common,$(1))
+endef
+endif
+
+ifeq ($(CONFIG_TARGET_iopsys_mediatek),y)
+define Package/qosmngr/install
+	$(CP) ./files/linux/* $(1)/
+	echo "Honoring the flag mediatek"
+	$(call Package/qosmngr/install/common,$(1))
+endef
+endif
 $(eval $(call BuildPackage,qosmngr))

qosmngr/files/airoha/etc/uci-defaults/60-qos_queue_generate

@@ -0,0 +1,48 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+ethwan="$(db -q get hw.board.ethernetWanPort)"
+
+generate_queue(){
+    section="$1"
+
+    config_get ifname "$section" "ifname"
+
+    if [ "$ifname" != "$ethwan" ]; then
+        return 0
+    fi
+
+    # guaranteed number of queues
+    no_of_q="0 1 2 3"
+
+    i=0
+    local total_q=$((${no_of_q##* } + 1))
+    for i in $no_of_q; do
+        order=$((total_q - i))
+        uci add qos queue
+        uci rename qos.@queue[-1]="q_${i}_${ifname}"
+        uci set qos.@queue[-1].enable="1"
+        uci set qos.@queue[-1].ifname="$ifname"
+        uci set qos.@queue[-1].precedence="$order"
+        uci set qos.@queue[-1].scheduling="SP"
+        uci set qos.@queue[-1].rate="0"
+        uci set qos.@queue[-1].burst_size="0"
+        uci set qos.@queue[-1].weight="1"
+    done
+
+    uci commit qos
+}
+
+if [ -s "/etc/config/qos" ]; then
+    if uci -q get qos.@queue[0] >/dev/null; then
+        # return if there is any valid content
+        exit
+    else
+        rm -f /etc/config/qos
+    fi
+fi
+touch /etc/config/qos
+
+config_load ports
+config_foreach generate_queue ethport

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

@@ -0,0 +1,190 @@
+#!/bin/sh
+# Implementation of QoS setup for Econet platform.
+
+errmsg() {
+    echo "$@" >&2
+    return 0
+}
+
+get_var() {
+    local varname="$1"
+    eval echo \$\{${varname}\}
+    return 0
+}
+
+# Initialized queues
+# (Not needed on Econet)
+hw_queue_init_all() {
+    return 0
+}
+
+# Initialize all interfaces
+# (Not needed on Econet)
+hw_intf_init() {
+    return 0
+}
+
+# Initialize the hardware setup library
+hw_init_all() {
+    export TMP_HW_QUEUE_LIST=""
+    export TMP_HW_QUEUE_MASK="0"
+    return 0
+}
+
+# Remember selected queue options. They will be committed
+# during hw_commit_all()
+hw_queue_set() {
+    local ifname="$1"
+    local q_count="$2"
+    local order="$3"
+    local qsize="$4"
+    local wgt="$5"
+    local sc_alg="$6"
+    local rate="$7"
+    local burstsize="$8"
+    local index="$((order - 1))"
+    local ethwan="$(db -q get hw.board.ethernetWanPort)"
+
+    #if [ "${ifname}" != "${ethwan}" ] ; then
+    #   return 2
+    #fi
+
+    export TMP_HW_QUEUE_${order}_no="${q_count}"
+    export TMP_HW_QUEUE_${order}_ifname="${ifname}"
+    export TMP_HW_QUEUE_${order}_order="${order}"
+    export TMP_HW_QUEUE_${order}_qsize="${qsize}"
+    export TMP_HW_QUEUE_${order}_wgt="${wgt}"
+    export TMP_HW_QUEUE_${order}_sc_alg="${sc_alg}"
+    export TMP_HW_QUEUE_${order}_rate="${rate}"
+    export TMP_HW_QUEUE_${order}_burstsize="${burstsize}"
+    export TMP_HW_QUEUE_LIST="${TMP_HW_QUEUE_LIST} ${order}"
+    export TMP_HW_QUEUE_MASK="$((TMP_HW_QUEUE_MASK | 1 << index))"
+
+    return 0
+}
+
+# Set policer options. In fact, they are not supported.
+hw_policer_set() {
+    local action="$1"
+    local dir="$2"
+    local policer_no="$3"
+
+    shift 3
+
+    case "$action" in
+        add)
+            meter="$1"
+            cir="$2"
+            cbs="$3"
+            ebs="$4"
+            pir="$5"
+            pbs="$6"
+
+            ;;
+        del)
+            ;;
+    esac
+    errmsg "Policer (action $action, direction $dir) is not implemented"
+    return $?
+}
+
+# Set ingress rate. In fact, it is not supported
+hw_policer_set_ingress_rate() {
+    local ifname="$1"
+    local ingress_rate="$2"
+    local in_burst_size="$3"
+
+    errmsg "Policer (action set_ingress_rate) is not implemented"
+}
+
+# Configure shaper rate that will be committed during hw_commit_all()
+hw_shaper_set() {
+    local ifname="$1"
+    local action="$2"
+    local rate="$3"
+    local burstsize="$4"
+
+    case "${action}" in
+        add)
+            export TMP_HW_SHAPE_RATE="$rate"
+            export TMP_HW_SHAPE_BURSTSIZE="$burstsize"
+            ;;
+        del)
+            export TMP_HW_SHAPE_RATE=""
+            export TMP_HW_SHAPE_BURSTSIZE=""
+            ;;
+        *)
+            return 1
+            ;;
+    esac
+
+    return 0
+}
+
+# Convert shaper in UCI terms to Econet terms
+hw_sc_alg2str() {
+    local sc_alg="$1"
+
+    case "${sc_alg}" in
+        SP)
+            echo "PQ"
+            ;;
+        WRR)
+            echo "WRR"
+            ;;
+        *)
+            echo ""
+            return 1
+    esac
+
+    return 0
+}
+
+# Commit all options preserved during
+hw_commit_all() {
+    local sorted_list="$(echo $TMP_HW_QUEUE_LIST | tr ' ' '\n' | sort | xargs)"
+    local weight_list=""
+    local glob_alg=""
+    local shape_rate="$TMP_HW_SHAPE_RATE"
+    local queue_mask="$TMP_HW_QUEUE_MASK"
+    local q_count="0"
+
+    # Reorder queues
+    for q in ${sorted_list} ; do
+        local sc_alg="$(get_var TMP_HW_QUEUE_${q}_sc_alg)"
+        local wgt="$(get_var TMP_HW_QUEUE_${q}_wgt)"
+
+        if [ "$glob_alg" != "" ] && [ "$sc_alg" != "$glob_alg" ] ; then
+            errmsg "Not matching scheduling algorithm: $sc_alg vs $glob_alg"
+            return 1
+        fi
+
+        glob_alg="$sc_alg"
+
+        case "${sc_alg}" in
+            WRR)
+                if [ $(($q_count >= 4)) != 0 ] ; then
+                    errmsg "Too many queues, next queues will be ignored"
+                else
+                    weight_list="$weight_list $wgt"
+                fi
+                q_count=$((q_count + 1))
+                ;;
+        esac
+    done
+
+    if [ "${glob_alg}" == "WRR" ] ; then
+        while [ $((q_count < 4)) != 0 ] ; do
+            weight_list="$weight_list 1"
+            q_count=$((q_count + 1))
+        done
+    fi
+
+    if [ "${glob_alg}" != "" ] ; then
+        /userfs/bin/qosrule discpline $(hw_sc_alg2str ${glob_alg}) ${weight_list} \
+                            uplink-bandwidth ${shape_rate:-0} \
+                            queuemask $queue_mask
+    else
+        /userfs/bin/qosrule discpline Enable 0
+    fi
+}

qosmngr/files/airoha/lib/qos/common/chains.ebtables.sh

@@ -0,0 +1,453 @@
+#!/bin/sh
+# Install ebtables rules
+
+BR_RULE=""
+BR6_RULE=""
+
+init_broute_rule() {
+    BR_RULE=""
+    BR6_RULE=""
+}
+
+broute_filter_on_src_if() {
+    BR_RULE="$BR_RULE --in-if $1"
+}
+
+broute_filter_on_src_mac() {
+    BR_RULE="$BR_RULE --src $1"
+}
+
+broute_filter_on_dst_mac() {
+    BR_RULE="$BR_RULE --dst $1"
+}
+
+broute_filter_on_pcp() {
+    case "$BR_RULE" in
+    *proto*)
+        BR_RULE="$BR_RULE --vlan-prio $1"
+        ;;
+    *)
+        BR_RULE="$BR_RULE --proto 802_1Q --vlan-prio $1"
+        ;;
+    esac
+}
+
+broute_filter_on_ether_type() {
+    BR_RULE="$BR_RULE --proto $1"
+}
+
+broute_filter_on_ether_type6() {
+    BR6_RULE="$BR6_RULE --proto IPv6"
+}
+
+ebt_match_src_ip() {
+    BR_RULE="$BR_RULE --ip-src $1"
+}
+
+ebt_match_dst_ip() {
+    BR_RULE="$BR_RULE --ip-dst $1"
+}
+
+ebt_match_ipv6_src_ip() {
+    BR_RULE="$BR_RULE --ip6-src $1"
+}
+
+ebt_match_ipv6_dst_ip() {
+    BR_RULE="$BR_RULE --ip6-dst $1"
+}
+
+ebt_match_ip_src_port() {
+    BR_RULE="$BR_RULE --ip-source-port $1"
+}
+
+ebt_match_ip_dst_port() {
+    BR_RULE="$BR_RULE --ip-destination-port $1"
+}
+
+ebt_match_ipv6_src_port() {
+    if [ -n "$BR6_RULE" ]; then
+        BR6_RULE="$BR6_RULE --ip6-source-port $1"
+    else
+        BR_RULE="$BR_RULE --ip6-source-port $1"
+    fi
+}
+
+ebt_match_ipv6_dst_port() {
+    if [ -n "$BR6_RULE" ]; then
+        BR6_RULE="$BR6_RULE --ip6-destination-port $1"
+    else
+        BR_RULE="$BR_RULE --ip6-destination-port $1"
+    fi
+}
+
+ebt_match_ip_protocol() {
+        BR_RULE="$BR_RULE --ip-proto $1"
+}
+
+ebt_match_ipv6_protocol() {
+    if [ -n "$BR6_RULE" ]; then
+        BR6_RULE="$BR6_RULE --ip6-proto $1"
+    else
+        BR_RULE="$BR_RULE --ip6-proto $1"
+    fi
+}
+
+ebt_match_ipv6_dscp() {
+    if [ -n "$BR6_RULE" ]; then
+        BR6_RULE="$BR6_RULE --ip6-tclass $1"
+    else
+        BR_RULE="$BR_RULE --ip6-tclass $1"
+    fi
+}
+
+broute_filter_on_vid() {
+
+    if [ -z "$1" ] || [ "$1" -lt 0 ]; then
+        return
+    fi
+
+    case "$BR_RULE" in
+    *proto*)
+        BR_RULE="$BR_RULE --vlan-id $1"
+        ;;
+    *)
+        BR_RULE="$BR_RULE --proto 802_1Q --vlan-id $1"
+        ;;
+    esac
+}
+
+broute_rule_set_traffic_class() {
+    BR_RULE="$BR_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
+    if [ -n "$BR6_RULE" ]; then
+        BR6_RULE="$BR6_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
+    fi
+}
+
+broute_append_rule() {
+    echo "ebtables -t broute -A qos $BR_RULE" >> /tmp/qos/classify.ebtables
+    if [ -n "$BR6_RULE" ]; then
+        echo "ebtables -t broute -A qos $BR6_RULE" >> /tmp/qos/classify.ebtables
+    fi
+}
+
+set_ip_addr()
+{
+    local cid="$1"
+    local match_src_ip_func="$2"
+    local match_dst_ip_func="$3"
+
+    config_get src_ip "$cid" "src_ip"
+    config_get dst_ip "$cid" "dest_ip"
+
+    if [ -n "$src_ip" ]; then
+        $match_src_ip_func "$src_ip"
+    fi
+
+    if [ -n "$dst_ip" ]; then
+        $match_dst_ip_func "$dst_ip"
+    fi
+}
+
+set_ports()
+{
+    local cid="$1"
+    local match_src_port_func="$2"
+    local match_dst_port_func="$3"
+    local src_port=""
+    local dst_port=""
+    local src_port_range=""
+    local dst_port_range=""
+
+    config_get src_port "$cid" "src_port"
+    config_get dst_port "$cid" "dest_port"
+    config_get src_port_range "$cid" "src_port_range"
+    config_get dst_port_range "$cid" "dest_port_range"
+
+    if [ -n "$src_port" ] && [ -n "$src_port_range" ] ; then
+        $match_src_port_func "$src_port:$src_port_range"
+    elif [ -n "$src_port" ] ; then
+        $match_src_port_func "$src_port"
+    fi
+
+    if [ -n "$dst_port" ] && [ -n "$dst_port_range" ] ; then
+        $match_dst_port_func "$dst_port:$dst_port_range"
+    elif [ -n "$dst_port" ] ; then
+        $match_dst_port_func "$dst_port"
+    fi
+}
+
+protocol_string_to_num()
+{
+    local value="-1"
+
+    case "$1" in
+    *[0-9]*)
+        value="$1"
+        ;;
+    TCP|tcp)
+        value=6
+        ;;
+    UDP|udp)
+        value=17
+        ;;
+    ICMP|icmp)
+        value=1
+        ;;
+    ICMPv6|icmpv6)
+        value=58
+        ;;
+    IGMP|igmp)
+        value=2
+        ;;
+    SCTP|sctp)
+        value=132
+        ;;
+    *)
+        value=-1
+        ;;
+    esac
+    echo $value
+}
+
+broute_ipv4_rule_options()
+{
+    local cid="$1"
+    config_get protocol "$cid" "proto"
+    config_get dscp_filter "$cid" "dscp_filter"
+
+    set_ip_addr "$cid" ebt_match_src_ip ebt_match_dst_ip
+
+    if [ -n "$dscp_filter" ]; then
+        echo "DSCP filter is not supporter"
+    fi
+
+    if [ -n "$protocol" ]; then
+        local proto_num="$(protocol_string_to_num "$protocol")"
+        ebt_match_ip_protocol "$proto_num"
+
+        if [ "$proto_num" == "6" ] || [ "$proto_num" == "17" ] || [ "$proto_num" = "132" ] ; then
+            set_ports "$cid" ebt_match_ip_src_port ebt_match_ip_dst_port
+        fi
+    fi
+}
+
+broute_ipv6_rule_options()
+{
+    local cid="$1"
+
+    config_get protocol "$cid" "proto"
+    config_get dscp_filter "$cid" "dscp_filter"
+
+    set_ip_addr "$cid" ebt_match_ipv6_src_ip ebt_match_ipv6_dst_ip
+
+    if [ -n "$dscp_filter" ]; then
+        local tos_val
+        local tos_hex
+
+        tos_val=$((dscp_filter<<2))
+        tos_hex=$(printf "%x" $tos_val)
+        ebt_match_ipv6_dscp "$tos_hex"
+    fi
+
+    if [ -n "$protocol" ]; then
+        local proto_num="$(protocol_string_to_num "$protocol")"
+        ebt_match_ipv6_protocol "$proto_num"
+
+        if [ "$proto_num" = "6" ] || [ "$proto_num" = "17" ] || [ "$proto_num" = "132" ] ; then
+            set_ports "$cid" ebt_match_ipv6_src_port ebt_match_ipv6_dst_port
+        fi
+    fi
+}
+
+handle_ebtables_rules() {
+    local sid="$1"
+    local is_l2_rule=0
+    local src_dhcp_options=""
+    local dst_dhcp_options=""
+    local protocol=""
+    local ip_version=""
+
+    init_broute_rule
+
+    config_get src_if "$sid" "ifname"
+    config_get src_mac "$sid" "src_mac"
+    config_get dst_mac "$sid" "dst_mac"
+    config_get dscp_filter "$sid" "dscp_filter"
+    config_get pcp_check "$sid" "pcp_check"
+    config_get eth_type "$sid" "ethertype"
+    config_get vid "$sid" "vid_check"
+    config_get dhcp_type "$sid" "dhcp_type" # dhcpv4 or v6
+    config_get src_vcid "$sid" "src_vendor_class_id" # dhcp option 60
+    config_get dst_vcid "$sid" "dst_vendor_class_id" # dhcp option 60
+    config_get src_clid "$sid" "src_client_id" # dhcp option 61
+    config_get dst_clid "$sid" "dst_client_id" # dhcp option 61
+    config_get src_ucid "$sid" "src_user_class_id" # dhcp option 77
+    config_get dst_ucid "$sid" "dst_user_class_id" # dhcp option 77
+    config_get traffic_class "$sid" "traffic_class"
+    config_get protocol "$sid" "proto"
+
+    if [ -n "$src_if" ]; then
+        for interf in $(db -q get hw.board.ethernetPortOrder); do
+            if [ "$src_if" == "$interf" ]; then
+                src_if="$src_if+"
+                broute_filter_on_src_if "$src_if"
+                is_l2_rule=1
+            fi
+        done
+    fi
+
+    if [ -n "$src_mac" ]; then
+        broute_filter_on_src_mac "$src_mac"
+        is_l2_rule=1
+    fi
+
+    if [ -n "$dst_mac" ]; then
+        broute_filter_on_dst_mac "$dst_mac"
+        is_l2_rule=1
+    fi
+
+    if [ -n "$pcp_check" ]; then
+        broute_filter_on_pcp "$pcp_check"
+        is_l2_rule=1
+    fi
+
+    if [ -n "$eth_type" ]; then
+        broute_filter_on_ether_type "$eth_type"
+        is_l2_rule=1
+    fi
+
+    if [ -n "$vid" ]; then
+        broute_filter_on_vid "$vid"
+        is_l2_rule=1
+    fi
+
+    case $eth_type in
+    IPv4|IPV4|0800)
+        ip_version=4
+        ;;
+    IPv6|IPV6|86DD)
+        ip_version=6
+        ;;
+    *)
+        if [ -z "$eth_type" ]; then
+            case "$src_ip$dst_ip" in
+            *.*)
+                ip_version=4
+                broute_filter_on_ether_type "IPv4"
+                ;;
+            *:*)
+                ip_version=6
+                broute_filter_on_ether_type "IPv6"
+                ;;
+            *)
+                if [ -n "$protocol" ] || [ -n "$dscp_filter" ]; then
+                    # Neither ether_type nor ip address used,
+                    # ethertype is not configured by user, so install
+                    # both proto IPv4 and IPv6 rule (version 1)
+                    ip_version=1
+                    BR6_RULE="$BR_RULE"
+                    broute_filter_on_ether_type "IPv4"
+                    broute_filter_on_ether_type6 "IPv6"
+                fi
+            esac
+        fi
+    esac
+
+    if [ "$ip_version" == "4" ] || [ "$ip_version" == "1" ]; then
+        broute_ipv4_rule_options "$sid"
+        is_l2_rule=1
+    fi
+
+    if [ "$ip_version" == "6" ] || [ "$ip_version" == "1" ]; then
+        broute_ipv6_rule_options "$sid"
+        is_l2_rule=1
+    fi
+
+    # first process options that will help figure our source mac address
+    # dhcp option for "vendor class id"
+    if [ -n "$src_vcid" ]; then
+        src_dhcp_options="$src_dhcp_options vcid=$src_vcid"
+        is_l2_rule=1
+    fi
+
+    # dhcp option for "client id"
+    if [ -n "$src_clid" ]; then
+        src_dhcp_options="$src_dhcp_options clid=$src_clid"
+        is_l2_rule=1
+    fi
+
+    # dhcp option for "user class id"
+    if [ -n "$src_ucid" ]; then
+        src_dhcp_options="$src_dhcp_options ucid=$src_ucid"
+        is_l2_rule=1
+    fi
+
+    # if src mac is already a classification criteria, then it
+    # does not really make sense to add it as a criteria to
+    # filter packets again based on source mac
+    if [ -n "$src_dhcp_options" ] && [ -z "$src_mac" ]; then
+        comp="$(grep -i "$src_dhcp_options" /tmp/dhcp.client.options)"
+        if [ -n "$comp" ]; then
+            s_mac_add="$(echo $comp | head -n1 | awk '{print $1;}')"
+            if [ -n "$s_mac_add" ]; then
+                broute_filter_on_src_mac "$s_mac_add"
+            fi
+        fi
+    fi
+
+    # Now process options that will help figure our destination mac address
+    # dhcp option for "vendor class id"
+    if [ -n "$dst_vcid" ]; then
+        dst_dhcp_options="$dst_dhcp_options vcid=$dst_vcid"
+        is_l2_rule=1
+    fi
+
+    # dhcp option for "client id"
+    if [ -n "$dst_clid" ]; then
+        dst_dhcp_options="$dst_dhcp_options clid=$dst_clid"
+        is_l2_rule=1
+    fi
+
+    # dhcp option for "user class id"
+    if [ -n "$dst_ucid" ]; then
+        dst_dhcp_options="$dst_dhcp_options ucid=$dst_ucid"
+        is_l2_rule=1
+    fi
+
+    # if dst mac is already a classification criteria, then it
+    # does not really make sense to add it as a criteria to
+    # filter packets again based on destination mac
+    if [ -n "$dst_dhcp_options" ] && [ -z "$dst_mac" ] ; then
+        comp="$(grep -i "$dst_dhcp_options" /tmp/dhcp.client.options)"
+        if [ -n "$comp" ]; then
+            d_mac_add="$(echo $comp | head -n1 | awk '{print $1;}')"
+            if [ -n "$d_mac_add" ]; then
+                broute_filter_on_dst_mac "$d_mac_add"
+            fi
+        fi
+    fi
+
+    if [ $is_l2_rule -eq 0 ]; then
+        return
+    fi
+
+    [ -n "$traffic_class" ] && broute_rule_set_traffic_class "$traffic_class"
+
+    [ -n "$BR_RULE" ] && broute_append_rule
+}
+
+create_ebtables_chains() {
+    ebtables -t broute -N qos
+    ret=$?
+    if [ $ret -eq 0 ]; then
+        ebtables -t broute -I BROUTING -j qos
+    else
+        ebtables -t broute -D BROUTING -j qos
+        ebtables -t broute -I BROUTING -j qos
+    fi
+}
+
+flush_ebtables_chains() {
+    echo "ebtables -t broute -F qos" > /tmp/qos/classify.ebtables
+}
+

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

@@ -0,0 +1,240 @@
+#!/bin/sh
+# Install iptables rules
+
+IP_RULE=""
+
+init_iptables_rule() {
+    IP_RULE=""
+}
+
+iptables_filter_intf() {
+    IP_RULE="$IP_RULE -i $1"
+}
+
+iptables_filter_proto() {
+    IP_RULE="$IP_RULE -p $1"
+}
+
+iptables_filter_ip_src() {
+    IP_RULE="$IP_RULE -s $1"
+}
+
+iptables_filter_ip_dest() {
+    IP_RULE="$IP_RULE -d $1"
+}
+
+iptables_filter_port_dest() {
+    IP_RULE="$IP_RULE --dport $1"
+}
+
+iptables_filter_port_src() {
+    IP_RULE="$IP_RULE --sport $1"
+}
+
+iptables_filter_port_dest_range() {
+    IP_RULE="$IP_RULE --dport $1:$2"
+}
+
+iptables_filter_port_src_range() {
+    IP_RULE="$IP_RULE --sport $1:$2"
+}
+
+iptables_filter_dscp_filter() {
+    IP_RULE="$IP_RULE -m dscp --dscp $1"
+}
+
+iptables_filter_ip_len_min() {
+    IP_RULE="$IP_RULE -m length --length $1"
+}
+
+iptables_filter_ip_len_max() {
+    IP_RULE="$IP_RULE:$1"
+}
+
+iptables_set_dscp_mark() {
+    IP_RULE="$IP_RULE -j DSCP --set-dscp $1"
+}
+
+iptables_set_traffic_class() {
+    IP_RULE="$IP_RULE -j MARK --set-xmark 0x${1}0/0xF0"
+}
+
+append_rule_to_mangle_table() {
+    if [ "$2" == 4 ]; then
+        echo "iptables -w -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
+    elif [ "$2" == 6 ]; then
+        echo "ip6tables -w -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
+    elif [ "$2" == 1 ]; then
+        echo "iptables -w -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
+        echo "ip6tables -w -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
+    fi
+}
+
+handle_iptables_rules() {
+    local cid="$1"
+    local ip_version=0
+    local is_l3_rule=0
+
+    init_iptables_rule
+    config_get proto "$cid" "proto"
+    config_get traffic_class "$cid" "traffic_class"
+    config_get dscp_mark "$cid" "dscp_mark"
+    config_get dscp_filter "$cid" "dscp_filter"
+    config_get dest_port "$cid" "dest_port"
+    config_get dest_port_range "$cid" "dest_port_range"
+    config_get src_port "$cid" "src_port"
+    config_get src_port_range "$cid" "src_port_range"
+    config_get dest_ip "$cid" "dest_ip"
+    config_get src_ip "$cid" "src_ip"
+    config_get ip_len_min "$cid" "ip_len_min"
+    config_get ip_len_max "$cid" "ip_len_max"
+    config_get ifname "$cid" "ifname"
+
+    #check version of ip
+    case $src_ip$dest_ip in
+        *.*)
+            ip_version=4
+            ;;
+        *:*)
+            ip_version=6
+            ;;
+        *)
+            ip_version=1 #ip address not used
+    esac
+
+    #filter interface
+    if [ -n "$ifname" ]; then
+        if [ "$ifname" != "lo" ]; then
+            iptables_filter_intf "$ifname"
+        fi
+    fi
+
+    # filter proto
+    if [ -n "$proto" ]; then
+        iptables_filter_proto "$proto"
+        is_l3_rule=1
+    fi
+
+    #filter src. ip
+    if [ -n "$src_ip" ]; then
+        iptables_filter_ip_src "$src_ip"
+        is_l3_rule=1
+    fi
+
+    #filter dest. ip
+    if [ -n "$dest_ip" ]; then
+        iptables_filter_ip_dest "$dest_ip"
+        is_l3_rule=1
+    fi
+
+    #filter dest. port
+    if [ -n "$dest_port" ] && [ -z "$dest_port_range" ]; then
+        iptables_filter_port_dest "$dest_port"
+        is_l3_rule=1
+    fi
+
+    #filter src. port
+    if [ -n "$src_port" ] && [ -z "$src_port_range" ]; then
+        iptables_filter_port_src "$src_port"
+        is_l3_rule=1
+    fi
+
+    #filter dest. port range
+    if [ -n "$dest_port" ] && [ -n "$dest_port_range" ]; then
+
+        if [ "$dest_port_range" == "-1" ] ; then
+            dest_port_range="$dest_port"
+        fi
+
+        iptables_filter_port_dest_range "$dest_port" "$dest_port_range"
+        is_l3_rule=1
+    fi
+
+    #filter src. port range
+    if [ -n "$src_port" ] && [ -n "$src_port_range" ]; then
+
+        if [ "$src_port_range" == "-1" ] ; then
+            src_port_range="$src_port"
+        fi
+
+        iptables_filter_port_src_range "$src_port" "$src_port_range"
+        is_l3_rule=1
+    fi
+
+    #filter dscp
+    if [ -n "$dscp_filter" ]; then
+        iptables_filter_dscp_filter "$dscp_filter"
+        is_l3_rule=1
+    fi
+
+    #filter min. IP packet len.
+    if [ -n "$ip_len_min" ]; then
+        iptables_filter_ip_len_min "$ip_len_min"
+        is_l3_rule=1
+    fi
+
+    #filter max. IP packet len.
+    if [ -n "$ip_len_max" ]; then
+        iptables_filter_ip_len_max "$ip_len_max"
+        is_l3_rule=1
+    fi
+
+    if [ -z "$is_l3_rule" ] || [ "$is_l3_rule" -eq 0 ] ; then
+        return
+    fi
+
+    #set dscp mark
+    [ -n "$dscp_mark" ] && iptables_set_dscp_mark "$dscp_mark"
+
+    #set packet queue mark
+    [ -n "$traffic_class" ] && iptables_set_traffic_class  "$traffic_class"
+
+    #write iptables rule for dscp marking
+    [ -n "$IP_RULE" ] && [ -n "$dscp_mark" ] && append_rule_to_mangle_table "qos_forward" $ip_version
+
+    if [ -n "$IP_RULE" ] && [ -n "$traffic_class" ]; then
+        if [ "$ifname" == "lo" ]; then
+            #write iptables rule for putting WAN directed internal packets in different queue
+            append_rule_to_mangle_table "qos_output" $ip_version
+        else
+            #write iptables rule for putting WAN directed LAN packets in different queue
+            append_rule_to_mangle_table "qos_prerouting" $ip_version
+        fi
+    fi
+}
+
+create_iptables_chains() {
+    iptables -w -t mangle -N qos_forward
+    ret=$?
+    [ $ret -eq 0 ] && iptables -w -t mangle -I FORWARD -j qos_forward
+
+    iptables -w -t mangle -N qos_prerouting
+    ret=$?
+    [ $ret -eq 0 ] && iptables -w -t mangle -I PREROUTING -j qos_prerouting
+
+    iptables -w -t mangle -N qos_output
+    ret=$?
+    [ $ret -eq 0 ] && iptables -w -t mangle -I OUTPUT -j qos_output
+
+    ip6tables -t mangle -N qos_forward
+    ret=$?
+    [ $ret -eq 0 ] && ip6tables -t mangle -I FORWARD -j qos_forward
+
+    ip6tables -t mangle -N qos_prerouting
+    ret=$?
+    [ $ret -eq 0 ] && ip6tables -t mangle -I PREROUTING -j qos_prerouting
+
+    ip6tables -t mangle -N qos_output
+    ret=$?
+    [ $ret -eq 0 ] && ip6tables -t mangle -I OUTPUT -j qos_output
+}
+
+flush_iptables_chains() {
+    echo "iptables -w -t mangle -F qos_forward" > /tmp/qos/classify.iptables
+    echo "iptables -w -t mangle -F qos_prerouting" >> /tmp/qos/classify.iptables
+    echo "iptables -w -t mangle -F qos_output" >> /tmp/qos/classify.iptables
+
+    echo "ip6tables -w -t mangle -F qos_forward" > /tmp/qos/classify.ip6tables
+    echo "ip6tables -w -t mangle -F qos_prerouting" >> /tmp/qos/classify.ip6tables
+    echo "ip6tables -w -t mangle -F qos_output" >> /tmp/qos/classify.ip6tables
+}

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

@@ -0,0 +1,12 @@
+#!/bin/sh
+# Set up or flush all chains
+
+setup_qos() {
+    create_ebtables_chains
+    create_iptables_chains
+}
+
+flush_chains() {
+    flush_ebtables_chains
+    flush_iptables_chains
+}

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

@@ -0,0 +1,44 @@
+#!/bin/sh
+# Common classifier library
+
+# Handle classify section
+handle_classify() {
+    cid="$1" #classify section ID
+
+    config_get is_enable "$cid" "enable" 1
+    # no need to configure disabled classify rules
+    if [ "$is_enable" == "0" ]; then
+        return
+    fi
+
+    handle_ebtables_rules "$cid"
+    handle_iptables_rules "$cid"
+    handle_policer_rules "$cid"
+}
+
+
+# Configure classifier based on UCI subtree 'qos.classify'
+configure_classify() {
+    # Processing classify section
+    # First remove old files
+    rm -f /tmp/qos/classify.ebtables
+    rm -f /tmp/qos/classify.iptables
+    rm -f /tmp/qos/classify.ip6tables
+
+    # Create files that will contain the rules if not present already
+    mkdir -p /tmp/qos/
+    touch /tmp/qos/classify.iptables
+    touch /tmp/qos/classify.ip6tables
+    touch /tmp/qos/classify.ebtables
+
+    # Add flush chain rules
+    flush_chains
+
+    # Load UCI file
+    config_load qos
+    config_foreach handle_classify classify
+
+    sh /tmp/qos/classify.ebtables
+    sh /tmp/qos/classify.iptables
+    sh /tmp/qos/classify.ip6tables
+}

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

@@ -0,0 +1,132 @@
+#!/bin/sh
+# Common policer library
+
+POLICER_COUNT=0
+
+# Function invoked
+handle_policer_rules() {
+    local c_sec="$1"
+    local policer_name
+    local ifname
+    local pname
+    local pindex=-1
+    local ingress_rate=0
+    local in_burst_size=0
+
+    config_get policer_name "$c_sec" "policer"
+    if [ -z "$policer_name" ];then
+        # no need to apply policer if policer not present in this
+        # classification rule
+        return
+    fi
+
+    config_get ifname "$c_sec" "ifname"
+    if [ -z "$ifname" ]; then
+        # cannot associate policer as interface is not mentioned
+        return
+    fi
+
+    local i=0
+    local max_policer_inst="$(cat /tmp/qos/max_policer_inst)"
+    while :
+    do
+        if [ "${i}" -eq "$max_policer_inst" ]; then
+            break
+        fi
+
+        pname="$(uci -q get qos.@policer[$i].name)"
+        if [ "$policer_name" == "$pname" ]; then
+            pindex=$i
+            ingress_rate="$(uci -q get qos.@policer[$i].committed_rate)"
+            in_burst_rate="$(uci -q get qos.@policer[$i].committed_burst_size)"
+            break
+        fi
+        i=$((i + 1))
+    done
+
+    if [ -z "$pindex" ] || [ "$pindex" -lt 0 ]; then
+        # policer not found, no need to proceed further
+        return
+    fi
+
+    config_ingress_rate_limit "$ifname" "$ingress_rate" "$in_burst_size"
+
+}
+
+# Configure ingress rate limit
+config_ingress_rate_limit() {
+    local ifname="$1"
+    local ingress_rate="$2"
+    local in_burst_size="$3"
+    local port=""
+
+    if [ -z "$ingress_rate" ] || [ "$ingress_rate" -lt 1000 ] ; then
+        return
+    fi
+
+    ingress_rate=$((ingress_rate / 1000))
+
+    if [ "$in_burst_size" -eq 0 ]; then
+        in_burst_size="$ingress_rate"
+    else
+        in_burst_size="$((in_burst_size / 1000))"
+    fi
+
+    hw_policer_set_ingress_rate "$ifname" "$port" "$ingress_rate" "$in_burst_size"
+}
+
+# Function invoked for handling policer section in UCI
+handle_policer() {
+    local p_sec="$1" # policer section ID
+    local dir=1 # default direction, upstream
+
+    config_get is_enable "$p_sec" "enable" 1
+
+    # No need to configure disabled policer
+    if [ "$is_enable" == "0" ] ; then
+        return
+    fi
+
+    config_get cir "$p_sec" "committed_rate"
+    config_get cbs "$p_sec" "committed_burst_size" -1
+    config_get ebs "$p_sec" "excess_burst_size" 0
+    config_get pir "$p_sec" "peak_rate" 0
+    config_get pbs "$p_sec" "peak_burst_size" 0
+    config_get meter "$p_sec" "meter_type" 0
+
+    hw_policer_set add "$dir" "$POLICER_COUNT" "$meter" "$cir" "$cbs" "$ebs" "$pir" "$pbs"
+
+    POLICER_COUNT=$((POLICER_COUNT + 1))
+}
+
+# Configure policer based on UCI subtree 'qos.policer'
+configure_policer() {
+    for intf in $(db get hw.board.ethernetPortOrder); do
+        if [ -n "${intf}" ] ; then
+            hw_policer_set_ingress_rate "$intf" 0 0
+        fi
+    done
+
+    # Delete policer
+    local i=0
+    local max_p_inst=0
+    if [ -f "/tmp/qos/max_policer_inst" ]; then
+        max_p_inst=$(cat /tmp/qos/max_policer_inst)
+    fi
+
+    while :
+    do
+        if [ "$i" -eq "$max_p_inst" ]; then
+            break
+        fi
+        hw_policer_set del 1 $i
+        i=$((i + 1))
+    done
+
+    # reset the policer counter
+    echo 0 > /tmp/qos/max_policer_inst
+    # Load UCI file
+    config_load qos
+    config_foreach handle_policer policer
+    echo $POLICER_COUNT > /tmp/qos/max_policer_inst
+}

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

@@ -0,0 +1,50 @@
+#!/bin/sh
+# Handle queues and their order
+
+Q_COUNT=0
+
+# Preliminary configuration of a queue
+pre_configure_queue() {
+    # Delete queues
+    hw_queue_init_all
+
+    for intf in $(db get hw.board.ethernetPortOrder); do
+        hw_intf_init "${intf}"
+    done
+}
+
+# UCI queue section handler
+handle_queue() {
+    local qid="$1" #queue section ID
+    local intf_name="$2"
+
+    config_get is_enable "$qid" "enable" 1
+
+    # no need to configure disabled queues
+    if [ "${is_enable}" == "0" ]; then
+        return
+    fi
+
+    config_get ifname "$qid" "ifname"
+    # if ifname is empty that is good enough to break
+    if [ -z "$ifname" ];then
+        return
+    fi
+
+    config_get sc_alg "$qid" "scheduling"
+    config_get wgt "$qid" "weight" 1
+    config_get rate "$qid" "rate"
+    config_get bs "$qid" "burst_size"
+    config_get qsize "$qid" "queue_size" 1024
+    config_get precedence "$qid" "precedence"
+
+    hw_queue_set "${ifname}" "${Q_COUNT}" "${precedence}" "$qsize" "$wgt" "$sc_alg" "$shapingrate" "$rate" "$bs"
+    Q_COUNT=$((Q_COUNT + 1))
+}
+
+# Configure all queues specified in UCI tree 'qos.queue'
+configure_queue() {
+    # Load UCI file
+    config_load qos
+    config_foreach handle_queue queue
+}

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

@@ -0,0 +1,46 @@
+#!/bin/sh
+# Common shaper library
+
+# UCI 'shaper' section handler.
+# It will verify shaper configuration sanity and then invoke
+# hardware-specific functions
+handle_shaper() {
+    sid="$1" #queue section ID
+
+    config_get is_enable "$sid" "enable" 1
+    # no need to configure disabled queues
+    if [ "${is_enable}" == "0" ] ; then
+        return
+    fi
+
+
+    config_get ifname "$sid" "ifname"
+    # if ifname is empty that is good enough to break
+    if [ -z "$ifname" ] ; then
+        return
+    fi
+
+    config_get rate "$sid" "rate"
+    # Convert the rate from bps to kbps.
+    if [ -z "${rate}" ] || [ "${rate}" -lt 1000 ] ; then
+        return
+    fi
+
+    rate=$((rate / 1000))
+    config_get bs "$sid" "burst_size"
+
+    hw_shaper_set "$ifname" add "$rate" "$bs"
+}
+
+# Configure shaper based on options saved to UCI tree 'qos.shaper'
+configure_shaper() {
+    # Delete existing shaper
+    for intf in $(db get hw.board.ethernetPortOrder); do
+        hw_shaper_set "$intf" del
+    done
+
+    # Load UCI file
+    config_load qos
+    # Processing shaper section(s)
+    config_foreach handle_shaper shaper
+}

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

@@ -0,0 +1,55 @@
+#!/bin/sh
+# The entrypoint for the QoS setup library
+
+. /lib/functions.sh
+. /lib/network/port.sh
+
+. /lib/qos/common/chains.sh
+. /lib/qos/common/chains.ebtables.sh
+. /lib/qos/common/chains.iptables.sh
+. /lib/qos/common/classify.sh
+. /lib/qos/common/policer.sh
+. /lib/qos/common/queue.sh
+. /lib/qos/common/shaper.sh
+. /lib/qos/airoha.sh
+
+configure_qos() {
+    # queue configuration is being done after shaper configuration,
+    # If port shapingrate configuration on DISC device is called after queue configuration then
+    # driver overwrites the queue shaping rate with default value of port shaping rate.
+    pre_configure_queue
+    setup_qos
+    configure_shaper
+    configure_queue
+    configure_policer
+    configure_classify
+}
+
+reload_qos() {
+    local service_name="$1"
+
+    hw_init_all
+    case "${service_name}" in
+        shaper)
+            configure_shaper
+            ;;
+        queue)
+            pre_configure_queue
+            configure_queue
+            ;;
+        classify)
+            configure_classify
+            ;;
+        policer)
+            configure_policer
+            ;;
+        "")
+            configure_qos
+            ;;
+    esac
+    hw_commit_all
+}
+
+reload_qos_service() {
+	reload_qos
+}

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

@@ -10,6 +10,12 @@ POLICER_COUNT=0
 Q_COUNT=0
 SP_Q_PRIO=7
 
+#counter variable to assign classify order value if not added in config
+temp_order=1
+
+cfg_name=""
+cfg_type=""
+
 # Function to handle a queue order and
 # update total number of queues
 handle_q_order() {
@@ -61,6 +67,37 @@ sort_by_precedence() {
 	done
 }
 
+# function to handle a queue section shapingrate
+handle_queue_shapingrate() {
+	local qid="$1" #queue section ID
+	local intf_name="$2"
+
+	config_get is_enable "$qid" "enable"
+
+	# no need to configure disabled queues
+	if [ $is_enable == '0' ]; then
+		return
+	fi
+
+	config_get ifname "$qid" "ifname"
+	# if ifname is empty that is good enough to break
+	if [ -z "$ifname" ];then
+		return
+	fi
+
+	# This is to get the qid per interface.
+	if [ "$intf_name" != "$ifname" ]; then
+		return
+	fi
+
+	config_get rate "$qid" "rate"
+	config_get bs "$qid" "burst_size"
+
+	# Call tmctl which is a broadcomm command to configure queues shapingrate.
+	tmctl setqcfg --devtype 0 --if $ifname --qid $Q_COUNT --shapingrate $rate --burstsize $bs &>/dev/null
+	Q_COUNT=$((Q_COUNT + 1))
+}
+
 # function to handle a queue section
 handle_queue() {
 	local qid="$1" #queue section ID
@@ -186,6 +223,14 @@ handle_shaper() {
 }
 
 setup_qos() {
+	if [ ! -d "/tmp/qos" ]; then
+		mkdir -p /tmp/qos
+	fi
+	if [ ! -f "/tmp/qos/qos" ]; then
+		touch /tmp/qos/qos
+		cp /etc/config/qos /tmp/qos/qos
+	fi
+
 	ebtables -t broute -N qos
 	ret=$?
 	if [ $ret -eq 0 ]; then
@@ -607,12 +652,12 @@ handle_ebtables_rules() {
 		fi
 	esac
 
-	if [ $ip_version = "4" ] || [ $ip_version = "1" ]; then
+	if [ "$ip_version" == "4" ] || [ "$ip_version" == "1" ]; then
 		broute_ipv4_rule_options "$sid"
 		is_l2_rule=1
 	fi
 
-	if [ $ip_version = "6" ] || [ $ip_version = "1" ]; then
+	if [ "$ip_version" == "6" ] || [ "$ip_version" == "1" ]; then
 		broute_ipv6_rule_options "$sid"
 		is_l2_rule=1
 	fi
@@ -976,19 +1021,61 @@ config_ingress_rate_limit() {
 	ethswctl -c rxratectrl -n $unit -p $port -x $ingress_rate -y $in_burst_size
 }
 
+# Function to handle a classify order
+handle_classify_order() {
+	local cid="$1" #classify section ID
+
+	config_get is_enable "$cid" "enable" 1
+
+	# No need to configure disabled classify
+	if [ $is_enable == '0' ]; then
+		return
+	fi
+
+	# Create classify file containing classify order
+	local corder_file="/tmp/qos/classify.order"
+
+	config_get c_order "$cid" "order"
+
+        if [ -z "$c_order" ]; then
+           c_order=$temp_order;
+           temp_order=$((temp_order + 1))
+        fi
+
+	value=${c_order}_${cid}
+	echo $value >> $corder_file
+
+}
+
+# Sort classify, lower value in uci means higher precedence, so this
+# function sorts the classify order in assending order
+sort_classify_by_order() {
+	local corder_file="/tmp/qos/classify.order"
+	local tmp_corder_file="/tmp/qos/tmp_classify.order"
+
+	sort -n -k1 $corder_file > $tmp_corder_file
+	cp $tmp_corder_file $corder_file
+	rm -f $tmp_corder_file
+}
+
 #function to handle a classify section
 handle_classify() {
 	cid="$1" #classify section ID
 
 	config_get is_enable "$cid" "enable"
 	# no need to configure disabled classify rules
-	if [ $is_enable == '0' ]; then
+	if [ "$is_enable" == '0' ]; then
 		return
 	fi
+	local corder_file="/tmp/qos/classify.order"
 
-	handle_ebtables_rules $cid
-	handle_iptables_rules $cid
-	handle_policer_rules $cid
+	while read -r line; do
+		line_cid=${line: 2}
+
+	        handle_ebtables_rules $line_cid
+	        handle_iptables_rules $line_cid
+	        handle_policer_rules $line_cid
+	done < "$corder_file"
 }
 
 configure_shaper() {
@@ -1008,19 +1095,25 @@ configure_classify() {
 	rm -f /tmp/qos/classify.ebtables
 	rm -f /tmp/qos/classify.iptables
 	rm -f /tmp/qos/classify.ip6tables
+        rm -f /tmp/qos/classify.order
+        rm -f /tmp/qos/tmp_classify.order
 
 	#create files that will contain the rules if not present already
 	mkdir -p /tmp/qos/
 	touch /tmp/qos/classify.iptables
 	touch /tmp/qos/classify.ip6tables
 	touch /tmp/qos/classify.ebtables
+        touch /tmp/qos/classify.order
+        touch /tmp/qos/tmp_classify.order
 
 	#add flush chain rules
 	flush_chains
 
 	# Load UCI file
 	config_load qos
-	config_foreach handle_classify classify
+	config_foreach handle_classify_order classify
+	sort_classify_by_order
+	handle_classify classify
 
 	sh /tmp/qos/classify.ebtables
 	sh /tmp/qos/classify.iptables
@@ -1051,6 +1144,15 @@ pre_configure_queue() {
 	done
 }
 
+configure_queue_shaping_rate() {
+	# Load UCI file
+	config_load qos
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
+		Q_COUNT=0
+		config_foreach handle_queue_shapingrate queue $interf
+	done
+}
+
 configure_queue() {
 	# Load UCI file
 	config_load qos
@@ -1075,7 +1177,7 @@ configure_policer() {
 		local port=$(echo $unitport | cut -d ' ' -f 2)
 		# setting rate and burst size to 0 disables rate limiting
 		if [ $port != "" -a $unit != "" ]; then
-			ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
+			ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0 &>/dev/null
 		fi
 	done
 
@@ -1122,6 +1224,10 @@ reload_qos() {
 		configure_qos
 	elif [ "$service_name" == "shaper" ]; then
 		configure_shaper
+		# call to configure queue shaping rate as in some platform port shaping rate
+		# configuration overwrites the queue shaping rate in driver to default value
+		# this will restore the queue shping rate
+		configure_queue_shaping_rate
 	elif [ "$service_name" == "queue" ]; then
 		pre_configure_queue
 		configure_queue
@@ -1131,3 +1237,149 @@ reload_qos() {
 		configure_policer
 	fi
 }
+
+get_cfg_added_deleted()
+{
+	# return true if there is difference in number of queue configuration
+	# in /etc/config/qos and /tmp/qos/qos, false is returned if both file
+	# has same count of queue configuration.
+	local queue=0
+	local classify=0
+	local shaper=0
+	local policer=0
+	local old_cfg="false"
+
+        config_cb() {
+		# invoked on the just previous config_load, get the count of
+		# queue configuration in /etc/config/qos and /tmp/qos/qos.
+                cfg_type="$1"
+                cfg_name="$2"
+                if [ -z $cfg_name ] || [ -z $cfg_type ]; then
+                        return
+                fi
+
+                if [ "$old_cfg" == "false" ]; then
+			eval $cfg_type=$(($cfg_type + 1))
+		else
+			eval $cfg_type=$(($cfg_type - 1))
+		fi
+                option_cb() {
+                        local option="$1"
+                        local value="$2"
+                        if [ -z "$option" ] || [ -z "$value" ]; then
+                                return
+                        fi
+                        if [ "$old_cfg" == "false" ]; then
+				eval $cfg_type=$(($cfg_type + 1))
+			else
+				eval $cfg_type=$(($cfg_type - 1))
+			fi
+		}
+	}
+	# config_load will trigger call for config_cb that is getting count
+	# of qos configuration, respective config counts will come.
+	config_load qos
+	# config_load will trigger call for config_cb that is decreasing count
+	# of qos configuration.
+	old_cfg="true"
+	UCI_CONFIG_DIR="/tmp/qos"
+	config_load qos
+	UCI_CONFIG_DIR="/etc/config"
+	reset_cb
+
+        if [ $classify -ne 0 ]; then
+                modified_config="classify"
+	fi
+        if [ $shaper -ne 0 ]; then
+                modified_config="$modified_config shaper"
+	fi
+        if [ $policer -ne  0 ]; then
+                modified_config="$modified_config policer"
+	fi
+	if [ $queue -eq 0 ]; then
+		echo "$modified_config"
+		return
+	else
+		echo "queue"
+		return
+	fi
+}
+
+# reload_qos_service is invoked on qos service reload.
+reload_qos_service() {
+	q_cfg_restart="false"
+	policer="false"
+	classify="false"
+	shaper="false"
+
+	setup_qos
+
+        if ! [[ -f "/etc/config/qos"  && -f "/tmp/qos/qos" ]]; then
+		configure_qos
+		cp /etc/config/qos /tmp/qos/qos
+	fi
+
+        config_cb() {
+		# this is invoked when config_load is called.
+                cfg_type="$1"
+                cfg_name="$2"
+                if [ -z $cfg_name ] || [ -z $cfg_type ]; then
+                        return
+                fi
+                option_cb() {
+                        # checking for if any parameters value is modified in queue cfg
+                        # comparsion is done between /etc/config/qos and /tmp/qos/qos
+                        local option="$1"
+                        local value="$2"
+			local old_value=""
+                        if [ -z "$option" ] || [ -z "$value" ]; then
+                                return
+                        fi
+                        old_value=$(uci -q -c "/tmp/qos" get qos.$cfg_name.$option)
+                        if ! [ "$old_value" == "$value" ]; then
+                                if [ "$cfg_type" == "queue" ]; then
+                                        q_cfg_restart="true"
+                                else
+                                        eval $cfg_type="true"
+                                fi
+                        fi
+                }
+        }
+	# if there is new addition/deletion of queue configuration
+	# then return is queue to trigger restart of qos.
+	# Otehrwise shaper policer classify
+	# respective operation config is invoked that does not change queue statistics
+	cfg_added_deleted=$(get_cfg_added_deleted)
+	if [ "$cfg_added_deleted" == "queue" ]; then
+		configure_qos
+	else
+		q_cfg_restart="false"
+		# config_load will trigger call for config_cb that is checking
+		# for modification in config value of queue config.
+		# if change of value of queue config is there then q_cfg_restart
+		# is set as true, else other qos config flag is set as true.
+		config_load qos
+		reset_cb
+		if [ "$q_cfg_restart" == "true" ]; then
+			configure_qos
+		else
+			for config in $cfg_added_deleted
+			do
+				eval $config="true"
+			done
+			if [ "$shaper" == "true" ]; then
+				reload_qos "shaper"
+			fi
+			if [ "$policer" == "true" ]; then
+				reload_qos "policer"
+				# change in policer config may need reconfiguration 
+				# of classifier
+				reload_qos "classify"
+			fi
+			if [ "$classify" == "true" ]; then
+				reload_qos "classify"
+			fi
+		fi
+	fi
+	cp /etc/config/qos /tmp/qos/qos
+}

qosmngr/files/common/etc/init.d/qos

@@ -11,7 +11,8 @@ NAME=qosmngr
 PROG=/usr/sbin/qosmngr
 
 . /lib/functions.sh
-include /lib/qos
+
+. /lib/qos/qos.sh
 
 start_service() {
 	if [ -f "/etc/config/qos" ]; then
@@ -37,3 +38,8 @@ restart() {
 	setup_qos
 	start
 }
+
+reload_service()
+{
+	reload_qos_service
+}

qosmngr/files/linux/etc/uci-defaults/60-qos_queue_generate

@@ -0,0 +1,43 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+ethwan="$(db -q get hw.board.ethernetWanPort)"
+
+generate_queue(){
+	section="$1"
+
+	config_get ifname "$section" "ifname"
+
+	local no_of_q="0 1 2 3 4 5 6 7"
+
+	i=0
+	local total_q=$((${no_of_q##* } + 1))
+        for i in $no_of_q; do
+		order=$((total_q - i))
+		uci add qos queue
+		uci rename qos.@queue[-1]="q_${i}_${ifname}"
+		uci set qos.@queue[-1].enable="1"
+		uci set qos.@queue[-1].ifname="$ifname"
+		uci set qos.@queue[-1].precedence="$order"
+		uci set qos.@queue[-1].scheduling="SP"
+		uci set qos.@queue[-1].rate="1000000"
+		uci set qos.@queue[-1].burst_size="1500"
+		uci set qos.@queue[-1].weight="1"
+	done
+
+	uci commit qos
+}
+
+if [ -s "/etc/config/qos" ]; then
+	if uci -q get qos.@queue[0] >/dev/null; then
+		# return if there is any valid content
+		exit
+	else
+		rm -f /etc/config/qos
+	fi
+fi
+touch /etc/config/qos
+
+config_load ports
+config_foreach generate_queue ethport

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

@@ -0,0 +1,431 @@
+#!/bin/sh
+. /lib/functions.sh
+#set -x
+
+POLICER_COUNT=0
+Q_COUNT=0
+SP_Q_PRIO=7
+
+#counter variable to assign classify order value if not added in config
+temp_order=1
+
+# Function to handle a queue order and
+# update total number of queues
+handle_q_order() {
+	local qid="$1" #queue section ID
+
+	config_get is_enable "$qid" "enable" 1
+
+	# No need to configure disabled queues
+	if [ $is_enable == '0' ]; then
+		return
+	fi
+
+	config_get ifname "$qid" "ifname"
+	# If ifname is empty that is good enough to break
+	if [ -z "$ifname" ];then
+		return
+	fi
+
+	# Create precedence file containing queue order per
+	# interface.
+	local precedence_file="/tmp/qos/$ifname/q_order"
+	local q_no=$(cat /tmp/qos/$ifname/q_idx)
+
+	config_get precedence "$qid" "precedence"
+	value=${precedence}_q${q_no}
+	echo $value >> $precedence_file
+
+	# Update the number of queues per interface.
+	q_no=$((q_no + 1))
+	echo $q_no > /tmp/qos/$ifname/q_idx
+}
+
+# Sort queue, lower value in uci means higher precedence, so this
+# function sorts the precedence in decending order
+sort_q_by_precedence() {
+	ifname="$1"
+
+	local order_file="/tmp/qos/$ifname/q_order"
+	local tmp_order_file="/tmp/qos/$ifname/q_order.tmp"
+
+	sort -n -k1 $order_file > $tmp_order_file
+	cp $tmp_order_file $order_file
+	rm -f $tmp_order_file
+}
+
+sort_by_precedence() {
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
+		sort_q_by_precedence $interf
+	done
+}
+
+# function to handle a queue section
+handle_queue() {
+	local qid="$1" #queue section ID
+	local port="$2"
+	local port_bw="$3"
+	local root="$4"
+	local port_bs="$5"
+
+	config_get is_enable "$qid" "enable"
+
+	# no need to configure disabled queues
+	if [ "$is_enable" == "0" ]; then
+		return
+	fi
+
+	config_get ifname "$qid" "ifname"
+	# if ifname is empty that is good enough to break
+	if [ -z "$ifname" ];then
+		return
+	fi
+
+	# This is to get the qid per interface.
+	if [ "$port" != "$ifname" ]; then
+		return
+	fi
+
+	local precedence_file="/tmp/qos/$ifname/q_order"
+
+	local temp_order=0
+	while read -r line; do
+		line_qid=${line: -1}
+		if [ "$line_qid" == "$Q_COUNT" ]; then
+			break
+		fi
+		temp_order=$((temp_order + 1))
+	done < "$precedence_file"
+
+	# precedence_file so the order is calculated accordingly.
+	local order=`expr $SP_Q_PRIO - $temp_order`
+
+	config_get sc_alg "$qid" "scheduling"
+	config_get wgt "$qid" "weight" 1
+	config_get rate "$qid" "rate"
+	config_get bs "$qid" "burst_size"
+	config_get qsize "$qid" "queue_size" 1024
+
+	[ "$rate" == "0" ] && rate="$port_bw"
+	[ "$bs" == "0" ] && bs="$port_bs"
+
+	local salg=1
+
+	case "$sc_alg" in
+		"SP") salg=1
+		;;
+		"WRR") salg=2
+		;;
+		"WDRR") salg=3
+		;;
+		"WFQ") salg=4
+		;;
+	esac
+
+	# ignore precedence value in case of WRR, broadcom recommends that WRR queue should
+	# always have precedence value set to 0
+	if [ $salg -eq 2 ]; then
+	       order=0
+	fi
+
+	if [ $salg -eq 2 ]; then
+		tc class add dev $port parent ${root}: classid ${root}:$((order + 1)) cbq allot $bs bandwidth ${port_bw}kbit rate ${rate}kbit prio $order weight $wgt  avpkt 1500 bounded isolated
+	else
+		tc class add dev $port parent ${root}: classid ${root}:$((order + 1)) cbq allot $bs bandwidth ${port_bw}kbit rate ${rate}kbit prio $order  avpkt 1500 bounded isolated
+	fi
+	
+	if [ $order -eq 0 ]; then
+		# By default flowid is targeted to queue 1.
+		tc filter add dev $port parent ${root}:0 protocol ip prio 1 u32 match u32 0 0  flowid ${root}:1
+	fi
+
+	Q_COUNT=$((Q_COUNT + 1))
+}
+
+#function to handle a policer section
+handle_policer() {
+	local p_sec="$1" # policer section ID
+	local dir=1 # default direction, upstream
+
+	config_get is_enable "$p_sec" "enable"
+
+	#no need to configure disabled policer
+	if [ $is_enable == '0' ]; then
+		return
+	fi
+
+	POLICER_COUNT=$((POLICER_COUNT + 1))
+}
+
+setup_qos() {
+	if [ ! -d "/tmp/qos" ]; then
+		mkdir -p /tmp/qos
+	fi
+
+	ebtables -t broute -N qos
+	ret=$?
+	if [ $ret -eq 0 ]; then
+		ebtables -t broute -I BROUTING -j qos
+	else
+		ebtables -t broute -D BROUTING -j qos
+		ebtables -t broute -I BROUTING -j qos
+	fi
+
+	iptables -w -t mangle -N qos_forward
+	ret=$?
+	[ $ret -eq 0 ] && iptables -w -t mangle -I FORWARD -j qos_forward
+
+	iptables -w -t mangle -N qos_prerouting
+	ret=$?
+	[ $ret -eq 0 ] && iptables -w -t mangle -I PREROUTING -j qos_prerouting
+
+	iptables -w -t mangle -N qos_output
+	ret=$?
+	[ $ret -eq 0 ] && iptables -w -t mangle -I OUTPUT -j qos_output
+
+	ip6tables -t mangle -N qos_forward
+	ret=$?
+	[ $ret -eq 0 ] && ip6tables -t mangle -I FORWARD -j qos_forward
+
+	ip6tables -t mangle -N qos_prerouting
+	ret=$?
+	[ $ret -eq 0 ] && ip6tables -t mangle -I PREROUTING -j qos_prerouting
+
+	ip6tables -t mangle -N qos_output
+	ret=$?
+	[ $ret -eq 0 ] && ip6tables -t mangle -I OUTPUT -j qos_output
+}
+
+handle_policer_rules() {
+	local c_sec=$1
+	local policer_name
+	local ifname
+	local pname
+	local pindex=-1
+	local ingress_rate=0
+	local in_burst_size=0
+
+	config_get policer_name "$c_sec" "policer"
+	if [ -z "$policer_name" ];then
+		# no need to apply policer if policer not present in this
+		# classification rule
+		return
+	fi
+
+	config_get ifname "$c_sec" "ifname"
+	if [ -z "$ifname" ]; then
+		# cannot associate policer as interface is not mentioned
+		return
+	fi
+
+	local i=0
+	local max_policer_inst=$(cat /tmp/qos/max_policer_inst)
+	while :
+	do
+		if [ $i -eq $max_policer_inst ]; then
+			break
+		fi
+
+		pname="$(uci -q get qos.@policer[$i].name)"
+		if [ "$policer_name" == "$pname" ]; then
+			pindex=$i
+			ingress_rate=$(uci -q get qos.@policer[$i].committed_rate)
+			in_burst_rate=$(uci -q get qos.@policer[$i].committed_burst_size)
+			break
+		fi
+		i=$((i + 1))
+	done
+
+	if [ $pindex -lt 0 ]; then
+		# policer not found, no need to proceed further
+		return
+	fi
+
+	config_ingress_rate_limit $ifname $ingress_rate $in_burst_size $pindex
+
+}
+
+config_ingress_rate_limit() {
+	local ifname="$1"
+	local ingress_rate=$2
+	local in_burst_size=$3
+	local pindex="$4"
+	local wanport="$(db -q get hw.board.ethernetWanPort)"
+
+	# Unit in uci file is in bps while that accepted by ethswctl is kbits
+	if [ $ingress_rate -lt 1000 ]; then
+		return
+	fi
+
+	ingress_rate=$((ingress_rate / 1000))
+
+	if [ $in_burst_size -eq 0 ]; then
+		in_burst_size=$ingress_rate
+	else
+		in_burst_size=$((in_burst_size / 1000))
+	fi
+
+	tc qdisc add dev $ifname ingress
+
+	tc filter add dev $ifname parent ffff: protocol ip prio $pindex u32 match ip src 0.0.0.0/0 police rate ${ingress_rate}kbit burst $in_burst_size drop flowid :$pindex
+
+}
+
+#function to handle a classify section
+handle_classify() {
+        cid="$1" #classify section ID
+
+        config_get is_enable "$cid" "enable"
+        # no need to configure disabled classify rules
+        if [ "$is_enable" == '0' ]; then
+                return
+        fi
+        handle_policer_rules $cid
+}
+
+configure_classify() {
+        #processing classify section
+
+        # create files that will contain the rules if not present already
+        mkdir -p /tmp/qos/
+
+        # Load UCI file
+        config_load qos
+        config_foreach handle_classify classify
+}
+
+pre_configure_queue() {
+	# Delete queues
+	for intf in $(db get hw.board.ethernetPortOrder); do
+		rm -rf /tmp/qos/$intf
+
+		mkdir -p /tmp/qos/$intf
+		touch /tmp/qos/$intf/q_order
+		touch /tmp/qos/$intf/q_idx
+		echo 0 > /tmp/qos/$intf/q_idx
+
+		tc qdisc del dev $intf root
+		tc qdisc del dev $intf ingress
+	done
+}
+
+get_link_rate() {                     
+        intf="$1"              
+        speed=0   
+        config_load ports               
+        get_speed() {
+                psid="$1"                     
+                iname="$2"
+                config_load ports             
+                config_get ifname "$psid" "ifname"
+                if [ "$ifname" == "$iname" ]; then
+                        config_get speed "$psid" "speed"
+                fi
+        }                                
+        config_foreach get_speed ethport $intf           
+        echo "$speed"           
+}                   
+
+configure_queue() {
+	qdisc_idx=0
+	local bs=1500
+	local rate=0
+	# Load UCI file
+	config_load qos
+	config_foreach handle_q_order queue
+	sort_by_precedence
+
+	get_intf_shaper_config() {
+		local b_size
+		sid="$1" #shaper section ID
+
+		config_get is_enable "$sid" "enable"
+		# no need to configure disabled queues
+		if [ "$is_enable" == "0" ]; then
+			return
+		fi
+
+
+		config_get ifname "$sid" "ifname"
+		# if ifname is empty that is good enough to break
+		if [ -z "$ifname" ] || ! [ "$ifname" == "$2" ];then
+			return
+		fi
+
+		config_get rate "$sid" "rate"
+		# Convert the rate from bps to kbps.
+		if [ $rate -lt 1000 ];then
+			return
+		fi
+
+		rate=$(( rate / 1000 ))
+		config_get b_size "$sid" "burst_size"
+		if [ "$b_size" == "0" ]; then
+			bs="$b_size"
+		fi
+	}
+
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
+		Q_COUNT=0
+		rate=0
+		# sp queue have max priority value = no. of queue configured on the port
+		# hence read and update SP_Q_PRIO here
+		local q_no=$(cat /tmp/qos/$interf/q_idx)
+		SP_Q_PRIO=`expr $q_no - 1`
+		qdisc_idx=`expr $qdisc_idx + 1`
+		# link_rate is in mbps and rate is in kbp
+		link_rate=$(get_link_rate "$interf")
+		# Read the shaper configuration for interface
+		config_foreach get_intf_shaper_config shaper $interf
+		if [ "$rate" == "0" ]; then
+			rate=$(( link_rate * 1000 ))
+		fi
+
+		# TODO using 1500 as allot and avpkt, if shaper config exist for interf get burst_size of shaper for actual value
+		tc qdisc add dev $interf root handle ${qdisc_idx}: cbq allot $bs  avpkt 1500 bandwidth ${rate}kbit
+
+		config_foreach handle_queue queue $interf $rate $qdisc_idx $bs
+	done
+}
+
+configure_policer() {
+
+        # Delete policer
+        local i=0
+        local max_p_inst=0
+        if [ -f "/tmp/qos/max_policer_inst" ]; then
+                max_p_inst=$(cat /tmp/qos/max_policer_inst)
+        fi
+
+        # reset the policer counter
+        echo 0 > /tmp/qos/max_policer_inst
+        # Load UCI file
+        config_load qos
+        config_foreach handle_policer policer
+        echo $POLICER_COUNT > /tmp/qos/max_policer_inst
+}
+
+
+configure_qos() {
+	pre_configure_queue
+	configure_queue
+	configure_policer
+}
+
+reload_qos() {
+	local service_name="$1"
+
+	if [ -z "$service_name" ]; then
+		configure_qos
+	elif [ "$service_name" == "queue" ]; then
+		pre_configure_queue
+		configure_queue
+	elif [ "$service_name" == "policer" ]; then
+		configure_policer
+	fi
+}
+
+reload_qos_service() {
+	reload_qos
+}
+

questd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=5.2.4
+PKG_VERSION:=5.2.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
-PKG_SOURCE_VERSION:=2ca3ae0c29dcbbf01282f6118eb8d5e5bc9a1c45
+PKG_SOURCE_VERSION:=38af3655416c80933f89f5a03638403a7c051a42
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

skopeo/Makefile

@@ -2,14 +2,11 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=skopeo
 PKG_VERSION:=1.9.2
-PKG_RELEASE:=1
+PKG_RELEASE:=$(AUTORELEASE)
 
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_NAME:=skopeo
-PKG_SOURCE_URL:=https://github.com/containers/skopeo.git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION)-$(PKG_RELEASE).tar.gz
-PKG_MIRROR_HASH:=skip
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_URL:=https://github.com/containers/skopeo/archive/v$(PKG_VERSION)
+PKG_HASH:=9a321ba75f213e5c46cba7f92073c2437137a56d3140c9ab6e723fb92890f9d0
 
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE

ssdpd/Makefile

@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2022 OpenWrt.org
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=ssdpd
+PKG_VERSION:=1.0.3
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/miniupnp/miniupnp.git
+PKG_SOURCE_VERSION:=207cf440a22c075cb55fb067a850be4f9c204e6e
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ssdpd
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libnfnetlink +libpthread +libubox +libubus +libblobmsg-json +libcurl +mxml
+  TITLE:=MiniSSDPd - SSDP daemon
+  URL:=https://miniupnp.tuxfamily.org/minissdpd.html
+endef
+
+MAKE_PATH:=minissdpd
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE \
+	-Wall -Wextra -Werror
+
+TARGET_LDFLAGS += \
+	-lpthread -lubox -lubus -lblobmsg_json -lcurl -lmxml
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/sspd/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/ssdpd/install
+	$(INSTALL_DIR) $(1)/etc/upnp
+	$(INSTALL_DIR) $(1)/etc/upnp/description
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_CONF) ./files/etc/config/ssdpd $(1)/etc/config/ssdpd
+	$(INSTALL_BIN) ./files/etc/init.d/ssdpd $(1)/etc/init.d/ssdpd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/minissdpd/minissdpd $(1)/usr/sbin/ssdpd
+endef
+
+$(eval $(call BuildPackage,ssdpd))

ssdpd/files/etc/config/ssdpd

@@ -0,0 +1,9 @@
+
+config ssdpd 'ssdp'
+	option enabled '1'
+	option ipv6_enabled '0'
+	option socket_path '/var/run/minissdpd.sock'
+	option ttl '2'
+	option interface 'br-lan'
+	option debug '0'
+

ssdpd/files/etc/init.d/ssdpd

@@ -0,0 +1,74 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=02
+
+USE_PROCD=1
+PROG=/usr/sbin/ssdpd
+
+log() {
+	echo "${@}"|logger -t ssdpd.init -p info
+}
+
+validate_ssdpd_ssdp_section()
+{
+	uci_validate_section ssdpd ssdpd "ssdp" \
+		'enabled:bool:true' \
+		'debug:bool:false' \
+		'ipv6_enabled:bool:false' \
+		'socket_path:string' \
+		'ttl:uinteger' \
+		'interface:string'
+}
+
+configure_ssdp()
+{
+	local enabled ipv6_enabled socket_path ttl interface
+
+	config_load ssdpd
+
+	validate_ssdpd_ssdp_section || {
+		log "Validation of ssdp section failed"
+		return 1;
+	}
+
+	[ ${enabled} -eq 0 ] && return 0
+
+	procd_set_param command ${PROG}
+
+	if [ ${ipv6_enabled} -eq 1 ]; then
+		procd_append_param command -6
+	fi
+
+	if [ ${debug} -eq 1 ]; then
+		procd_append_param command -d
+	fi
+
+	if [ -n "${socket_path}" ]; then
+		procd_append_param command -s ${socket_path}
+	fi
+
+	if [ -n "${ttl}" ]; then
+		procd_append_param command -t ${ttl}
+	fi
+
+	# If no interface is given defaults for br-lan
+	procd_append_param command -i ${interface:-br-lan}
+}
+
+start_service() {
+	procd_open_instance ssdp
+	configure_ssdp
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "ssdpd"
+}

ssdpd/patches/001-fix-gcc-warnings

@@ -0,0 +1,20 @@
+--- a/minissdpd/openssdpsocket.c
++++ b/minissdpd/openssdpsocket.c
+@@ -11,6 +11,7 @@
+ #include <unistd.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
++#include <sys/time.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <net/if.h>
+--- a/minissdpd/ifacewatch.c
++++ b/minissdpd/ifacewatch.c
+@@ -130,6 +130,7 @@ ProcessInterfaceWatch(int s, int s_ssdp,
+ 		/* case RTM_DELLINK: */
+ 		case RTM_DELADDR:
+ 			is_del = 1;
++			// fall through
+ 		case RTM_NEWADDR:
+ 			/* http://linux-hacks.blogspot.fr/2009/01/sample-code-to-learn-netlink.html */
+ 			ifa = (struct ifaddrmsg *)NLMSG_DATA(nlhdr);

ssdpd/patches/010-add-test-object

@@ -0,0 +1,11 @@
+--- a/minissdpd/Makefile
++++ b/minissdpd/Makefile
+@@ -41,7 +41,7 @@ endif
+ EXECUTABLES = minissdpd testminissdpd testcodelength \
+               showminissdpdnotif
+ MINISSDPDOBJS = minissdpd.o openssdpsocket.o daemonize.o upnputils.o \
+-                ifacewatch.o getroute.o getifaddr.o asyncsendto.o
++                ifacewatch.o getroute.o getifaddr.o asyncsendto.o ssdpd.o
+ TESTMINISSDPDOBJS = testminissdpd.o printresponse.o
+ SHOWMINISSDPDNOTIFOBJS = showminissdpdnotif.o printresponse.o
+ 

ssdpd/patches/011-add-ubus-object

@@ -0,0 +1,629 @@
+--- /dev/null
++++ b/minissdpd/ssdpd.c
+@@ -0,0 +1,626 @@
++/*
++ * Copyright (C) 2022 iopsys Software Solutions AB
++ *
++ * This program is free software; you can redistribute it and/or modify
++ * it under the terms of the GNU Lesser General Public License version 2.1
++ * as published by the Free Software Foundation
++ *
++ *	Author: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
++ */
++
++#include <unistd.h>
++#include <stdio.h>
++#include <stdlib.h>
++#include <stdbool.h>
++#include <string.h>
++#include <sys/types.h>
++#include <sys/socket.h>
++#include <sys/un.h>
++#include <net/if.h>
++#include <syslog.h>
++
++#include <curl/curl.h>
++#include <libubox/uloop.h>
++#include <libubox/blobmsg_json.h>
++#include <libubox/list.h>
++#include <libubus.h>
++#include <mxml.h>
++
++#include "codelength.h"
++
++struct UPNPDev {
++	struct list_head list;
++	char *descURL;
++	char *st;
++	char *usn;
++};
++
++struct desc_list_elt {
++	struct list_head list;
++	char *url;
++	char *desc_path;
++	bool is_device_desc;
++};
++
++#define UPNP_DESC_PATH "/etc/upnp/description"
++#define UPNP_DISCOVER_TIMEOUT (30 * 1000)
++
++#ifndef MIN
++#define MIN(a, b) (((a) < (b)) ? (a) : (b))
++#endif /* MIN */
++
++/* macros used to read from unix socket */
++#define READ_BYTE_BUFFER(c) \
++	if ((int)bufferindex >= n) { \
++		n = read(s, buffer, sizeof(buffer)); \
++		if (n <= 0) break; \
++		bufferindex = 0; \
++	} \
++	c = buffer[bufferindex++];
++
++#define READ_COPY_BUFFER(dst, len) \
++	for (l = len, p = (unsigned char *)dst; l > 0; ) { \
++		unsigned int lcopy; \
++		if ((int)bufferindex >= n) { \
++			n = read(s, buffer, sizeof(buffer)); \
++			if ( n<= 0) break; \
++			bufferindex = 0; \
++		} \
++		lcopy = MIN(l, (n - bufferindex)); \
++		memcpy(p, buffer + bufferindex, lcopy); \
++		l -= lcopy; \
++		p += lcopy; \
++		bufferindex += lcopy; \
++	}
++
++LIST_HEAD(dev_list);
++LIST_HEAD(desc_list);
++
++char *ssdp_sockpath = NULL;
++
++static void upnp_discover_devices(struct uloop_timeout *timeout);
++static struct uloop_timeout upnpdiscover_timer = { .cb = upnp_discover_devices };
++
++static void add_dev_to_dev_list(char *descURL, char *st, char *usn)
++{
++	struct UPNPDev *dev = NULL;
++
++	dev = calloc(1, sizeof(struct UPNPDev));
++	list_add_tail(&dev->list, &dev_list);
++
++	dev->descURL = descURL;
++	dev->st = st;
++	dev->usn = usn;
++}
++
++void free_all_dev_list(void)
++{
++	struct UPNPDev *dev = NULL;
++
++	while (dev_list.next != &dev_list) {
++		dev = list_entry(dev_list.next, struct UPNPDev, list);
++		free(dev->descURL);
++		free(dev->st);
++		free(dev->usn);
++		free(dev);
++		list_del(&dev->list);
++	}
++}
++
++static int connectToMiniSSDPD(void)
++{
++	int s = 0;
++	struct sockaddr_un addr;
++
++	s = socket(AF_UNIX, SOCK_STREAM, 0);
++	if(s < 0)
++		return -1;
++
++	char *ssdp_s = ssdp_sockpath ? ssdp_sockpath : "/var/run/minissdpd.sock";
++
++	memset(&addr, 0, sizeof(addr));
++	addr.sun_family = AF_UNIX;
++
++	strncpy(addr.sun_path, ssdp_s, sizeof(addr.sun_path));
++
++	if(connect(s, (struct sockaddr *)&addr, sizeof(struct sockaddr_un)) < 0) {
++		close(s);
++		return -1;
++	}
++
++	return s;
++}
++
++static int disconnectFromMiniSSDPD(int s)
++{
++	if (close(s) < 0)
++		return -1;
++	return 0;
++}
++
++static int requestDevicesFromMiniSSDPD(int s)
++{
++	unsigned char buffer[256];
++	unsigned char *p = NULL;
++	unsigned int stsize = 0, l = 0;
++	char *devtype = "ssdp:all";
++
++	buffer[0] = 3;	/* request type 3 : everything */
++	stsize = strlen(devtype);
++
++	p = buffer + 1;
++	l = stsize;	CODELENGTH(l, p);
++	if (p + stsize > buffer + sizeof(buffer))
++		return -1;
++
++	memcpy(p, devtype, stsize);
++	p += stsize;
++	if (write(s, buffer, p - buffer) < 0)
++		return -1;
++
++	return 0;
++}
++
++static int receiveDevicesFromMiniSSDPD(int s)
++{
++	unsigned char buffer[256];
++	ssize_t n;
++	unsigned char *p;
++	unsigned int bufferindex;
++	unsigned int i, ndev;
++	unsigned int urlsize, stsize, usnsize, l;
++	char *url, *st, *usn;
++
++	n = read(s, buffer, sizeof(buffer));
++	if (n <= 0)
++		return -1;
++
++	ndev = buffer[0];
++	bufferindex = 1;
++	for (i = 0; i < ndev; i++) {
++		DECODELENGTH_READ(urlsize, READ_BYTE_BUFFER);
++		if (n <= 0)
++			return -1;
++
++		url = (char *)malloc(urlsize);
++		if (url == NULL)
++			return -1;
++
++		READ_COPY_BUFFER(url, urlsize);
++		if (n <= 0)
++			return -1;
++
++		DECODELENGTH_READ(stsize, READ_BYTE_BUFFER);
++		if (n <= 0)
++			goto free_url_and_return;
++
++		st = (char *)malloc(stsize);
++		if (st == NULL)
++			goto free_url_and_return;
++
++		READ_COPY_BUFFER(st, stsize);
++		if (n <= 0)
++			goto free_url_and_st_and_return;
++
++		DECODELENGTH_READ(usnsize, READ_BYTE_BUFFER);
++		if (n <= 0)
++			goto free_url_and_st_and_return;
++
++		usn = (char *)malloc(usnsize);
++		if (usn == NULL)
++			goto free_url_and_st_and_return;
++
++		READ_COPY_BUFFER(usn, usnsize);
++		if (n <= 0)
++			goto free_url_and_st_and_usn_and_return;
++
++		add_dev_to_dev_list(url, st, usn);
++	}
++
++	return 0;
++
++free_url_and_st_and_usn_and_return:
++	free(usn);
++free_url_and_st_and_return:
++	free(st);
++free_url_and_return:
++	free(url);
++	return -1;
++}
++
++static int getDevicesFromMiniSSDPD(void)
++{
++	int s = 0;
++	int res = 0;
++
++	s = connectToMiniSSDPD();
++	if (s < 0)
++		return -1;
++
++	res = requestDevicesFromMiniSSDPD(s);
++	if (res < 0)
++		goto close_socket_and_return;
++
++	res = receiveDevicesFromMiniSSDPD(s);
++
++close_socket_and_return:
++	disconnectFromMiniSSDPD(s);
++
++	return res;
++}
++
++static void download_file(char *file_path, const char *url)
++{
++	CURL *curl = curl_easy_init();
++	if (curl) {
++		curl_easy_setopt(curl, CURLOPT_URL, url);
++		curl_easy_setopt(curl, CURLOPT_TIMEOUT, 500);
++
++		FILE *fp = fopen(file_path, "wb");
++		if (fp) {
++			curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
++			curl_easy_perform(curl);
++			fclose(fp);
++		}
++
++		curl_easy_cleanup(curl);
++	}
++}
++
++static bool is_desc_exist(const char *desc_url)
++{
++	struct desc_list_elt *desc_elt = NULL;
++
++	if (!desc_url)
++		return false;
++
++	list_for_each_entry(desc_elt, &desc_list, list) {
++		if (strcmp(desc_elt->url, desc_url) == 0)
++			return true;
++	}
++
++	return false;
++}
++
++static void get_desc_name(const char *desc_url, char *str, size_t len)
++{
++	if (!desc_url || !str || len == 0)
++		return;
++
++	char *p = strstr(desc_url, "://");
++
++	snprintf(str, len, "%s", p ? p + 3 : desc_url);
++
++	for (int i = 0; str[i]; i++) {
++		if (str[i] == '/')
++			str[i] = '_';
++	}
++}
++
++static void add_desc_to_desc_list(const char *desc_path, const char *url, int is_device_desc)
++{
++	struct desc_list_elt *desc_elt;
++
++	desc_elt = calloc(1, sizeof(struct desc_list_elt));
++	list_add_tail(&desc_elt->list, &desc_list);
++
++	desc_elt->desc_path = strdup(desc_path);
++	desc_elt->url = strdup(url);
++	desc_elt->is_device_desc = is_device_desc;
++}
++
++static void free_all_desc_list(void)
++{
++	struct desc_list_elt *desc_elt = NULL;
++
++	while (desc_list.next != &desc_list) {
++		desc_elt = list_entry(desc_list.next, struct desc_list_elt, list);
++		free(desc_elt->desc_path);
++		free(desc_elt->url);
++		free(desc_elt);
++		list_del(&desc_elt->list);
++	}
++}
++
++static void __upnp_discover_devices(void)
++{
++	struct UPNPDev *dev = NULL;
++	char desc_name[128] = {0};
++	char file_path[256] = {0};
++	int res = 0, is_device_desc = 0;
++
++	/*
++	 * Discover devices
++	 */
++	if (!list_empty(&dev_list))
++		free_all_dev_list();
++
++	res = getDevicesFromMiniSSDPD();
++	if (res)
++		goto end;
++
++	/*
++	 * Download description files
++	 */
++	list_for_each_entry_reverse(dev, &dev_list, list) {
++
++		if (is_desc_exist(dev->descURL))
++			continue;
++
++		get_desc_name(dev->descURL, desc_name, sizeof(desc_name));
++		snprintf(file_path, sizeof(file_path), "%s/%s", UPNP_DESC_PATH, desc_name);
++		is_device_desc = (dev->usn && strstr(dev->usn, ":service:")) ? 0 : 1;
++
++		// Download Description
++		download_file(file_path, dev->descURL);
++
++		// Add description to descriptions list
++		add_desc_to_desc_list(file_path, dev->descURL, is_device_desc);
++	}
++
++end:
++	uloop_timeout_set(&upnpdiscover_timer, UPNP_DISCOVER_TIMEOUT);
++}
++
++static int upnp_discovery_res(struct ubus_context *ctx, struct ubus_object *obj __attribute__((unused)),
++		struct ubus_request_data *req, const char *method __attribute__((unused)), struct blob_attr *msg __attribute__((unused)))
++{
++	struct blob_buf bb = {0};
++	struct UPNPDev *dev = NULL;
++
++	memset(&bb,0,sizeof(struct blob_buf));
++	blob_buf_init(&bb, 0);
++
++	void *devices_array = blobmsg_open_array(&bb, "devices");
++	list_for_each_entry_reverse(dev, &dev_list, list) {
++		// Parse Root device and devices
++		if ((dev->st && strstr(dev->st, ":rootdevice") != NULL) || (dev->usn && strstr(dev->usn, ":device:") != NULL)) {
++			void *device_obj = blobmsg_open_table(&bb, NULL);
++			blobmsg_add_string(&bb, "descurl", dev->descURL);
++			blobmsg_add_string(&bb, "st", dev->st);
++			blobmsg_add_string(&bb, "usn", dev->usn);
++			blobmsg_add_string(&bb, "is_root_device", dev->st && strstr(dev->st, ":rootdevice") ? "1" : "0");
++			blobmsg_close_table(&bb, device_obj);
++		}
++	}
++	blobmsg_close_array(&bb, devices_array);
++
++	void *services_array = blobmsg_open_array(&bb, "services");
++	list_for_each_entry_reverse(dev, &dev_list, list) {
++		// Parse Services
++		if (dev->usn && strstr(dev->usn, ":service:") != NULL) {
++			void *service_obj = blobmsg_open_table(&bb, NULL);
++			blobmsg_add_string(&bb, "descurl", dev->descURL);
++			blobmsg_add_string(&bb, "st", dev->st);
++			blobmsg_add_string(&bb, "usn", dev->usn);
++			blobmsg_close_table(&bb, service_obj);
++		}
++	}
++	blobmsg_close_array(&bb, services_array);
++
++	ubus_send_reply(ctx, req, bb.head);
++	blob_buf_free(&bb);
++	return 0;
++}
++
++static void fill_device_instances(struct blob_buf *bb, mxml_node_t *device)
++{
++	void *device_obj = NULL;
++	mxml_node_t *b = device;
++	char buf[64] = {0};
++	bool new_device_discovery = false;
++
++	while (b) {
++
++		if (mxmlGetType(b) != MXML_ELEMENT) {
++			b = mxmlWalkNext(b, device, MXML_DESCEND);
++			continue;
++		}
++
++		const char *elm_name = mxmlGetElement(b);
++		const char *elm_val = mxmlGetOpaque(b);
++
++		if (elm_name && strcmp(elm_name, "device") == 0) {
++
++			if (new_device_discovery && device_obj)
++				blobmsg_close_table(bb, device_obj);
++
++			device_obj = blobmsg_open_table(bb, NULL);
++			blobmsg_add_string(bb, "parent_dev", buf);
++			new_device_discovery = true;
++		}
++
++		if (elm_name && strcmp(elm_name, "deviceType") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "deviceType", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "friendlyName") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "friendlyName", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "manufacturer") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "manufacturer", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "manufacturerURL") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "manufacturerURL", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "modelDescription") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "modelDescription", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "modelName") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "modelName", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "modelNumber") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "modelNumber", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "modelURL") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "modelURL", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "serialNumber") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "serialNumber", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "UDN") == 0 && new_device_discovery) {
++			snprintf(buf, sizeof(buf), "%s", elm_val ? elm_val : "");
++			blobmsg_add_string(bb, "UDN", buf);
++		}
++
++		if (elm_name && strcmp(elm_name, "UPC") == 0 && new_device_discovery)
++			blobmsg_add_string(bb, "UPC", elm_val ? elm_val : "");
++
++		b = mxmlWalkNext(b, device, MXML_DESCEND);
++	}
++
++	if (new_device_discovery && device_obj)
++		blobmsg_close_table(bb, device_obj);
++}
++
++static void fill_service_element(struct blob_buf *bb, mxml_node_t *service)
++{
++	mxml_node_t *b = service;
++	void *service_obj = NULL;
++	char buf[64] = {0};
++	bool new_srv_discovery = false;
++
++	while (b) {
++
++		if (mxmlGetType(b) != MXML_ELEMENT) {
++			b = mxmlWalkNext(b, service, MXML_DESCEND);
++			continue;
++		}
++
++		const char *elm_name = mxmlGetElement(b);
++		const char *elm_val = mxmlGetOpaque(b);
++
++		if (elm_name && strcmp(elm_name, "UDN") == 0)
++			snprintf(buf, sizeof(buf), "%s", elm_val ? elm_val : "");
++
++
++		if (elm_name && strcmp(elm_name, "service") == 0) {
++
++			if (new_srv_discovery && service_obj)
++				blobmsg_close_table(bb, service_obj);
++
++			service_obj = blobmsg_open_table(bb, NULL);
++			blobmsg_add_string(bb, "parent_dev", buf);
++			new_srv_discovery = true;
++		}
++
++		if (elm_name && strcmp(elm_name, "serviceType") == 0 && new_srv_discovery)
++			blobmsg_add_string(bb, "serviceType", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "serviceId") == 0 && new_srv_discovery)
++			blobmsg_add_string(bb, "serviceId", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "SCPDURL") == 0 && new_srv_discovery)
++			blobmsg_add_string(bb, "SCPDURL", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "controlURL") == 0 && new_srv_discovery)
++			blobmsg_add_string(bb, "controlURL", elm_val ? elm_val : "");
++
++		if (elm_name && strcmp(elm_name, "eventSubURL") == 0 && new_srv_discovery)
++			blobmsg_add_string(bb, "eventSubURL", elm_val ? elm_val : "");
++
++		b = mxmlWalkNext(b, service, MXML_DESCEND);
++	}
++
++	if (new_srv_discovery && service_obj)
++		blobmsg_close_table(bb, service_obj);
++}
++
++static int upnp_description_res(struct ubus_context *ctx, struct ubus_object *obj __attribute__((unused)),
++		struct ubus_request_data *req, const char *method __attribute__((unused)), struct blob_attr *msg __attribute__((unused)))
++{
++	struct desc_list_elt *desc_elt = NULL;
++	struct blob_buf bb = {0};
++
++	memset(&bb,0,sizeof(struct blob_buf));
++	blob_buf_init(&bb, 0);
++
++	void *desc_array = blobmsg_open_array(&bb, "descriptions");
++	list_for_each_entry(desc_elt, &desc_list, list) {
++		void *device_obj = blobmsg_open_table(&bb, NULL);
++		blobmsg_add_string(&bb, "desc_url", desc_elt->url);
++		blobmsg_add_u32(&bb, "is_device_desc", desc_elt->is_device_desc);
++		blobmsg_close_table(&bb, device_obj);
++
++	}
++	blobmsg_close_array(&bb, desc_array);
++
++	list_for_each_entry(desc_elt, &desc_list, list) {
++
++		FILE *fp = fopen(desc_elt->desc_path, "r");
++		if (!fp)
++			continue;
++
++		mxml_node_t *tree = mxmlLoadFile(NULL, fp, MXML_OPAQUE_CALLBACK);
++		fclose(fp);
++
++		if (tree) {
++			void *devices_array = blobmsg_open_array(&bb, "devices");
++	 		mxml_node_t *device = mxmlFindElement(tree, tree, "device", NULL, NULL, MXML_DESCEND);
++			fill_device_instances(&bb, device);
++			blobmsg_close_array(&bb, devices_array);
++
++			void *services_array = blobmsg_open_array(&bb, "services");
++	 		mxml_node_t *service = mxmlFindElement(tree, tree, "device", NULL, NULL, MXML_DESCEND);
++			fill_service_element(&bb, service);
++			blobmsg_close_array(&bb, services_array);
++
++			mxmlDelete(tree);
++		}
++	}
++
++	ubus_send_reply(ctx, req, bb.head);
++	blob_buf_free(&bb);
++	return 0;
++}
++
++static struct ubus_method upnp_methods[] = {
++	UBUS_METHOD_NOARG("discovery", upnp_discovery_res),
++	UBUS_METHOD_NOARG("description", upnp_description_res),
++};
++
++static struct ubus_object_type upnp_type = UBUS_OBJECT_TYPE("upnp", upnp_methods);
++
++static void upnp_discover_devices(struct uloop_timeout *timeout __attribute__((unused)))
++{
++	__upnp_discover_devices();
++}
++
++static struct ubus_object upnp_object = {
++	.name = "upnp",
++	.type = &upnp_type,
++	.methods = upnp_methods,
++	.n_methods = ARRAY_SIZE(upnp_methods),
++};
++
++void upnp_thread_discover_devices(void)
++{
++	struct ubus_context *ctx = NULL;
++	const char *ubus_socket = NULL;
++	int ret = 0;
++
++	uloop_init();
++
++	ctx = ubus_connect(ubus_socket);
++	if (!ctx) {
++		syslog(LOG_ERR, "Failed to connect to ubus\n");
++		return;
++	}
++
++	ubus_add_uloop(ctx);
++
++	__upnp_discover_devices();
++
++	ret = ubus_add_object(ctx, &upnp_object);
++	if (ret) {
++		syslog(LOG_ERR, "Failed to add 'upnp' ubus object: %s\n", ubus_strerror(ret));
++		goto end;
++	}
++
++	uloop_run();
++
++end:
++	free_all_desc_list();
++	free_all_dev_list();
++	uloop_done();
++	ubus_free(ctx);
++}

ssdpd/patches/012-ubus-runner-thread-hook

@@ -0,0 +1,95 @@
+--- a/minissdpd/minissdpd.c
++++ b/minissdpd/minissdpd.c
+@@ -32,6 +32,8 @@
+ #include <pwd.h>
+ #include <grp.h>
+ #endif
++/* for uloop thread */
++#include <pthread.h>
+ 
+ /* LOG_PERROR does not exist on Solaris */
+ #ifndef LOG_PERROR
+@@ -52,6 +54,10 @@
+ #define MIN(x,y) (((x)<(y))?(x):(y))
+ #endif
+ 
++extern char *ssdp_sockpath;
++void upnp_thread_discover_devices(void);
++void ssdpd_ubus_stop(void);
++
+ /* current request management structure */
+ struct reqelem {
+ 	int socket;
+@@ -1220,6 +1226,12 @@ static void ssdpDiscover(int s, int ipv6
+ 	}
+ }
+ 
++static void *thread_discover_devices(void *args __attribute__((unused)))
++{
++	upnp_thread_discover_devices();
++	return NULL;
++}
++
+ /* main(): program entry point */
+ int main(int argc, char * * argv)
+ {
+@@ -1264,6 +1276,7 @@ int main(int argc, char * * argv)
+ 	unsigned char ttl = 2;	/* UDA says it should default to 2 */
+ 	const char * searched_device = NULL;	/* if not NULL, search/filter a specific device type */
+ 	int opt;
++	pthread_t upnp_thread;
+ 
+ 	LIST_INIT(&reqlisthead);
+ 	LIST_INIT(&servicelisthead);
+@@ -1309,6 +1322,7 @@ int main(int argc, char * * argv)
+ 			break;
+ 		case 's':
+ 			sockpath = optarg;
++			ssdp_sockpath = optarg;
+ 			break;
+ #ifndef NO_BACKGROUND_NO_PIDFILE
+ 		case 'p':
+@@ -1496,6 +1510,11 @@ int main(int argc, char * * argv)
+ 	if(s_ssdp6 >= 0)
+ 		ssdpDiscover(s_ssdp6, 1, searched_device);
+ 
++	int err = pthread_create(&upnp_thread, NULL, &thread_discover_devices, NULL);
++	if (err < 0) {
++		syslog(LOG_ERR, "Error when creating upnp thread");
++	}
++
+ 	/* Main loop */
+ 	while(!quitting) {
+ 		/* fill readfds fd_set */
+@@ -1704,6 +1723,8 @@ quit:
+ 	if(unlink(pidfilename) < 0)
+ 		syslog(LOG_ERR, "unlink(%s): %m", pidfilename);
+ #endif
++	ssdpd_ubus_stop();
++	pthread_join(upnp_thread, NULL);
+ 	closelog();
+ 	return ret;
+ }
+--- a/minissdpd/ssdpd.c
++++ b/minissdpd/ssdpd.c
+@@ -624,3 +624,8 @@ end:
+ 	uloop_done();
+ 	ubus_free(ctx);
+ }
++
++void ssdpd_ubus_stop(void)
++{
++	uloop_end();
++}
++
+--- a/minissdpd/config.h
++++ b/minissdpd/config.h
+@@ -32,7 +32,7 @@
+ 
+ /* When NO_BACKGROUND_NO_PIDFILE is defined, minissdpd does not go to
+  * background and does not create any pidfile */
+-/*#define NO_BACKGROUND_NO_PIDFILE*/
++#define NO_BACKGROUND_NO_PIDFILE
+ 
+ /* define HAVE_IP_MREQN to use struct ip_mreqn instead of struct ip_mreq
+  * for setsockopt(IP_MULTICAST_IF). Available with Linux 2.4+,

stunc/Makefile

@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.12
+PKG_VERSION:=1.1.14
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=5b65364709a921db0956bf74a4f126217cfb1775
+PKG_SOURCE_VERSION:=06b63878a448b593d907bb3e9c1381dc0e69bca6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -23,8 +23,6 @@ endif
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/stunc/default
@@ -32,7 +30,7 @@ define Package/stunc/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
 endef
 
 define Package/stunc-mbedtls

sulu-builder/Config.in

@@ -13,7 +13,7 @@ menu "SULU_CORE"
 
 	config SULU_CORE_VERSION
 		string "SULU repo version"
-		default "944f4e2217e478c04f1ef56ae67c66d82ece7994"
+		default "80815db11f7b0c1913ae551ff50ed2c89676f489"
 endmenu
 
 menu "SULU_PLUGIN_LCM"
@@ -35,7 +35,7 @@ menu "SULU_PLUGIN_LCM"
 	config SULU_PLUGIN_LCM_VERSION
 		depends on SULU_PLUGIN_LCM_ENABLE
 		string "Version"
-		default "f8a96f1c55904082c0658ee63aebe1e67a097f42"
+		default "ccd70b399b31530dc1af6a871eee94fbb179d794"
 endmenu
 
 menu "SULU_PLUGIN_MULTIAP"
@@ -57,7 +57,7 @@ menu "SULU_PLUGIN_MULTIAP"
 	config SULU_PLUGIN_MULTIAP_VERSION
 		depends on SULU_PLUGIN_MULTIAP_ENABLE
 		string "Version"
-		default "89b4e4b95d3a94b88782f5cdc9d1eafd5728a1f7"
+		default "3e662d50c5a14225354f6287d1c6a47414b694a6"
 endmenu
 
 menu "SULU_THEME_IOPSYS"

sulu-builder/Makefile

@@ -5,27 +5,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.3.25
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=ca38b2086cee7ba83b41eec56539e9432271a349
+PKG_SOURCE_VERSION:=696ef814e0b16345f2e8ee0104f3ee1eeaeea5dc
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=node-yarn/host
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/${PKG_NAME}
 	SECTION:=utils
 	CATEGORY:=Utilities
 	TITLE:=Build sulu from source
-	DEPENDS:=+nginx +mosquitto-auth-shadow
-	MENU:=1
+	DEPENDS:=+nginx +mosquitto-auth-shadow +usermngr +jq
+	CONFLICTS:=sulu
 endef
 
 define Package/${PKG_NAME}/description
@@ -37,12 +35,12 @@ define Package/${PKG_NAME}/config
 endef
 
 # Sulu core and other dependent needs to be updated in Config.in
-SULU_DL_FILE:=sulu-${PKG_VERSION}-${CONFIG_SULU_CORE_VERSION}.tar.gz
+SULU_DL_FILE:=sulu_core-${CONFIG_SULU_CORE_VERSION}.tar.gz
 define Download/sulu_core
   FILE:=$(SULU_DL_FILE)
   URL:=$(CONFIG_SULU_CORE_URL)
   PROTO:=git
-  SUBDIR:=core
+  SUBDIR:=sulu
   VERSION:=${CONFIG_SULU_CORE_VERSION}
   HASH:=skip
 endef
@@ -141,14 +139,39 @@ ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y)
 endif
 endef
 
+define Build/Compile
+	VERSION="v${PKG_VERSION}" $(MAKE) -C $(PKG_BUILD_DIR)/
+endef
+
 define Package/${PKG_NAME}/install
 	$(INSTALL_DIR) $(1)/sulu
 	$(INSTALL_DIR) $(1)/sulu/config
+	$(INSTALL_DIR) $(1)/sulu/config/widgets
 	$(INSTALL_DIR) $(1)/etc/nginx/
 	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
 	$(CP) $(PKG_BUILD_DIR)/build/dist/* $(1)/sulu
-	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/*.json $(1)/sulu/config/
-	$(CP) ./files/* $(1)/
+	$(CP) $(PKG_BUILD_DIR)/build/src/config/*.json $(1)/sulu/config/
+	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/diagnostics.json $(1)/sulu/config/widgets/
+	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/wan.json $(1)/sulu/config/widgets/
+ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy)
+	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/lcm-store.json $(1)/sulu/config/widgets/
+endif
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_BIN) ./files/etc/config/sulu $(1)/etc/config/sulu
+
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_BIN) ./files/etc/init.d/sulu $(1)/etc/init.d/sulu
+
+	$(INSTALL_DIR) $(1)/etc/sulu
+	$(INSTALL_DATA) ./files/etc/sulu/roles.json $(1)/etc/sulu/
+	$(INSTALL_BIN) ./files/etc/sulu/sulu.sh $(1)/etc/sulu/
+	$(INSTALL_DATA) ./files/etc/sulu/nginx.locations $(1)/etc/sulu/
+
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) ./files/etc/uci-defaults/99-fix-sulu-config $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/40-add-sulu-nginx-config $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/01-update-nginx-uci-template $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/10-add-mqtt-config $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,${PKG_NAME}))

sulu-builder/files/etc/config/sulu

@@ -0,0 +1,4 @@
+config global 'global'
+	option role_based_access '1'
+	list user 'admin'
+	list user 'user'