evoice :include Json-c for linking/ json files added for platforms brcm and airoha

2025-12-26 12:03:44 +08:00 · 2022-09-22 15:19:21 +02:00
126 changed files with 592 additions and 4881 deletions
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.9
+PKG_VERSION:=6.8.33

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=4ad900a9bb6b4a0dd38edc1d14e1b6cbfeaa8e9b
+PKG_SOURCE_VERSION:=9bdcb1ac188c44fc2274bf01dd9dce46f572b967
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

@@ -25,8 +25,7 @@ define Package/libbbf_api
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
-  TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
-  ABI_VERSION:=1.0
+  TITLE:=Library for libbbfdm API
 endef

 define Package/libbbfdm/default
@@ -34,7 +33,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 +libcurl +libbbf_api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
 endef

 define Package/libbbfdm
@@ -67,17 +66,6 @@ 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
@@ -149,15 +137,13 @@ 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
 endef

 define Package/libbbfdm/default/prerm
@@ -166,18 +152,6 @@ 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)
@@ -195,9 +169,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))
--- a/bbf/files/etc/bbfdm/json/UserInterface.json
+++ b/bbf/files/etc/bbfdm/json/UserInterface.json
@@ -1,112 +0,0 @@
-{
-	"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": "string",
-				"read": true,
-				"write": true,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"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"
-							}
-						}
-					}
-				]
-			}
-		}
-	}
-}
--- a/bbf/files/etc/config/userinterface
+++ b/bbf/files/etc/config/userinterface
@@ -1,6 +0,0 @@
-config userinterface 'remote_access'
-	option enable '0'
-	option interface 'wan'
-	option port '80'
-	option protocol 'HTTP'
-
--- a/bbf/files/etc/firewall.userinterface
+++ b/bbf/files/etc/firewall.userinterface
@@ -1,88 +0,0 @@
-#!/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
--- a/bbf/files/etc/init.d/userinterface
+++ b/bbf/files/etc/init.d/userinterface
@@ -1,27 +0,0 @@
-#!/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"
-}
--- a/bbf/files/etc/uci-defaults/93-userinterface-firewall
+++ b/bbf/files/etc/uci-defaults/93-userinterface-firewall
@@ -1,12 +0,0 @@
-#!/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
-
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.9
+PKG_VERSION:=2.0.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=6e85d2032e66df581fae7c72cd83cc89367b8fc8
+PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -25,6 +25,8 @@ 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)
@@ -48,8 +50,8 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.so $(1)/usr/lib/bbfdm
 	$(CP) ./files/* $(1)/
 endef

--- a/bulkdata/files/etc/init.d/bulkdatad
+++ b/bulkdata/files/etc/init.d/bulkdatad
@@ -7,19 +7,22 @@ USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"

 start_service() {
-	local enable
+	local enable=$(uci -q get bulkdata.bulkdata.enable)

-	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"
+	[ "$enable" != "1" ] && {
+		return 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 
--- a/dectmngr/Makefile
+++ b/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:=cf4e91ffe0a1d83140fef5b41d16e581e5341cec
+PKG_SOURCE_VERSION:=c5695bc92f7f22089c9a85d3e1f4dac7c12ca900
 PKG_MIRROR_HASH:=skip
 endif

--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -26,7 +26,7 @@ PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk

-ifeq ($(CONFIG_TARGET_brcmbca),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
  TARGET_PLATFORM=BROADCOM
 else
  $(info Unexpected CONFIG_TARGET)
--- a/easy-qos/Makefile
+++ b/easy-qos/Makefile
@@ -19,7 +19,7 @@ define Package/easy-qos
  SECTION:=net
  CATEGORY:=Network
  TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_brcmbca||TARGET_airoha)
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
 endef

 define Package/easy-qos/description
--- a/easy-soc-events/Makefile
+++ b/easy-soc-events/Makefile
@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk

 -include $(TOPDIR)/.config

-ifneq ($(CONFIG_TARGET_brcmbca),)
+ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
  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_brcmbca),)
+ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
 define KernelPackage/easy-soc-events/install-extra
 	cp $(PKG_BUILD_DIR)/easyevent.ko $(FS_DIR)/lib/modules/$(LINUX_VERSION)/extra
 endef
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.8.0
+PKG_VERSION:=6.6.0
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ddc7b272bec5e3b5c2a216a1f86cd5589a1a4a19
+PKG_SOURCE_VERSION:=c8c406568822b170e373a54fbf32323e960259ff
 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_brcmbca),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),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_airoha),y)
+else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
  TARGET_PLATFORM=ECONET
  TARGET_WIFI_TYPE=MAC80211
  TARGET_CFLAGS +=-DIOPSYS_ECONET
--- a/easy-soc-libs/ethernet.mk
+++ b/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_airoha:ecnt_api
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_econet:ecnt_api
 endef

 define Package/libethernet/config
--- a/easy-soc-libs/wifi.mk
+++ b/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_brcmbca:bcmkernel
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_brcm63xx_arm:bcmkernel
 endef

 define Package/libwifi/config
--- a/endptmngr/Makefile
+++ b/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:=dc12712af8c4088f7873502ca845e51c68a1ada9
+PKG_SOURCE_VERSION:=0901382048bb7ce01fc1767fef75e54692f56743
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/evoice/Makefile
+++ b/evoice/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=evoice
-PKG_VERSION:=0.2.39
+PKG_VERSION:=0.2.29

 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:=30d65330de0368f73ecf4a2e804c39a2ee280454
+PKG_SOURCE_VERSION:=ee4e9e00ec1c54b41e15a3de38f6a733634622dd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,6 +21,7 @@ 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
@@ -32,10 +33,10 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	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
+	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
 endef

 define Package/$(PKG_NAME)/description
@@ -56,7 +57,7 @@ endif
 IDIR = $(STAGING_DIR)/usr/include
 TONES_INI_REQUIRED=

-ifeq ($(CONFIG_TARGET_brcmbca),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	TARGET_PLATFORM=BROADCOM
 	BDIR = bcm963xx/userspace/private/apps/voice
 	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
@@ -64,7 +65,7 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
 		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
 	TRG=SVrgBcmFxs
 	JSONFILE=codecs_brcm.json
-else ifeq ($(CONFIG_TARGET_airoha),y)
+else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
 	TARGET_PLATFORM=ECONET
 	TONES_INI_REQUIRED=y
 	TRG=SVrgMtekOwrt
--- a/evoice/files/etc/config/voice
+++ b/evoice/files/etc/config/voice
@@ -22,7 +22,6 @@ 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'
@@ -34,12 +33,6 @@ 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'
--- a/evoice/files/etc/evoice/voicedm
+++ b/evoice/files/etc/evoice/voicedm
@@ -48,23 +48,16 @@ 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 Accept_From_Registered 'voice.Network@.AcceptFromProxyOnly'
-   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 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 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'
+   option Reg_Failure_Interval 'voice.Network@.TimerRegistrationFailed'
+   option T1 'voice.Network@.TimerT1'
+   option UserAgentDomain 'voice.Network@.UserAgentDomain'

 config VoIPProfile 'map_voip'
   option Enable 'voice.VoIPProfile@.Enable'
--- a/evoice/files/etc/evoice/voicero
+++ b/evoice/files/etc/evoice/voicero
@@ -22,6 +22,7 @@ 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 ' '
--- a/evoice/files/lib/voice/codecs_airoha.json
+++ b/evoice/files/lib/voice/codecs_airoha.json
@@ -1,50 +1,28 @@
 {
-	"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
-		}
-	]
+        "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
+        }
 }

--- a/evoice/files/lib/voice/codecs_brcm.json
+++ b/evoice/files/lib/voice/codecs_brcm.json
@@ -1,140 +1,28 @@
 {
-	"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
-		}
-	]
+        "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
+        }
 }

--- a/gryphon-led-module/Makefile
+++ b/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_brcmbca):bcmkernel
+  DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):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_brcmbca),y)
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),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
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=9.1.2
+PKG_VERSION:=9.0.3

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=b964edb3570797286584793dbadfbef323cddbeb
+PKG_SOURCE_VERSION:=304db5eb064d89cf4e4df0bb81fa22b88933d602
 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 +libuuid
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
 endef

 define Package/icwmp-openssl
@@ -83,7 +83,6 @@ 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
@@ -93,7 +92,6 @@ 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)
--- a/icwmp/files/etc/icwmpd/update.sh
+++ b/icwmp/files/etc/icwmpd/update.sh
@@ -14,18 +14,15 @@ handle_icwmp_update() {
 		return 0
 	fi

-	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
+	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
 		fi
-	else
-		log "Restarting icwmp tr069 object"
-		/etc/init.d/icwmpd restart
 	fi
 }

--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -77,7 +77,7 @@ convert_to_hex() {
 	OPTIND=1
 	while getopts ":" opt "-$optval"
 	do
-		temp=$(printf "%02X" "'${OPTARG:-:}")
+		temp=$(printf "%X" "'${OPTARG:-:}")
 		val="${val}:${temp}"
 	done

@@ -133,14 +133,14 @@ configure_send_op125() {
 		opt125_len=$((opt125_len + 4))
 	fi

-	hex_opt125_len=$(printf "%02X" "${opt125_len}")
+	hex_opt125_len=$(printf "%X" "${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 "%02X" "${oui_len}")
+	hex_oui_len=$(printf "%X" "${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 "%02X" "${serial_len}")
+	hex_serial_len=$(printf "%X" "${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 "%02X" "${class_len}")
+		hex_class_len=$(printf "%X" "${class_len}")
 		if [ "${uci}" = "network" ]; then
 			opt125="${opt125}:03:${hex_class_len}${hex_class}"
 		else
@@ -313,8 +313,6 @@ 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

@@ -462,11 +460,6 @@ service_stopped()
 	copy_cwmp_varstate_files_to_etc
 }

-stop_service()
-{
-	copy_cwmp_varstate_files_to_etc
-}
-
 reload_service() {
 	local ret

@@ -480,14 +473,7 @@ reload_service() {
 		return 0
 	fi

-	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')"
+	status="$(ubus -t 1 call tr069 status |jsonfilter -qe '@.cwmp.status')"
 	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'
--- a/icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp.user
+++ b/icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp.user
@@ -1,122 +0,0 @@
-#!/bin/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
-}
-
-wan_intf=$(uci -q get cwmp.cpe.default_wan_interface)
-if [ -n "${wan_intf}" ] && [ "${wan_intf}" == "${INTERFACE}" ]; then
-	if [ -n "$opt125" ]; then
-		len=$(printf "$opt125"|wc -c)
-		get_vivsoi "$opt125" "$len"
-	fi
-
-	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
--- a/ieee1905/Config.in
+++ b/ieee1905/Config.in
@@ -1,6 +1,6 @@
 if (PACKAGE_ieee1905)

-menu "Configuration"
+menu "Configurations"

 config IEEE1905_EXTENSION_ALLOWED
 	bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
@@ -10,18 +10,5 @@ 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
--- a/ieee1905/Config.map-plugin.in
+++ b/ieee1905/Config.map-plugin.in
@@ -0,0 +1,14 @@
+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
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ieee1905
-PKG_VERSION:=6.0.16
+PKG_VERSION:=4.10.7

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3b12bdd1b0e75f4e5b744e18f00ab5ac703382e6
+PKG_SOURCE_VERSION:=b50f79061a95840d89a6129aa0a95aff82b5a1b7
 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,21 +35,31 @@ define Package/ieee1905/config
 endef

 define Package/libieee1905
-  $(call Package/ieee1905/Default)
-  TITLE:=libieee1905.so (library for CMDU and TLV handling)
+$(call Package/ieee1905/Default,$(1))
+  TITLE+= (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)
-  TITLE:=ieee1905d (daemon implementing 1905.1 and provides cli)
+$(call Package/ieee1905/Default,$(1))
+  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

-include $(wildcard plugins/*.mk)
+
+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

 define Package/ieee1905/description
 This package provides IEEE Std 1905.1 stack.
@@ -59,16 +69,8 @@ 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
@@ -77,20 +79,10 @@ ifeq ($(CONFIG_IEEE1905_PLATFORM_HAS_WIFI),y)
 TARGET_CFLAGS += -DHAS_WIFI
 endif

-ifeq ($(CONFIG_IEEE1905_CMDU_SA_IS_ALMAC),y)
-TARGET_CFLAGS += -DCMDU_SA_IS_ALMAC
+ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
+TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
 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

@@ -109,6 +101,25 @@ 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
@@ -126,7 +137,7 @@ endef

 define Build/InstallDev
 	$(call Build/InstallDev/libieee1905,$(1),$(2))
-	$(foreach p,$(ppkg),$(call Build/InstallDev/$(p),$(1),$(2)))
+	$(call Build/InstallDev/map-plugin,$(1),$(2))
 endef

 ifeq ($(LOCAL_DEV),1)
@@ -137,4 +148,4 @@ endif

 $(eval $(call BuildPackage,ieee1905))
 $(eval $(call BuildPackage,libieee1905))
-$(eval $(foreach p,$(ppkg),$(call BuildPackage,$(p))))
+$(eval $(call BuildPackage,map-plugin))
--- a/ieee1905/files/etc/init.d/ieee1905
+++ b/ieee1905/files/etc/init.d/ieee1905
@@ -82,10 +82,8 @@ start_service() {
 	validate_ieee1905_config || return 1;

 	procd_open_instance
-        procd_set_param command "/usr/sbin/ieee1905d" "-o"  "/tmp/ieee1905.log" "-f"
+        procd_set_param command "/usr/sbin/ieee1905d"
 	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
--- a/ieee1905/plugins/map.mk
+++ b/ieee1905/plugins/map.mk
@@ -1,51 +0,0 @@
-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
--- a/ieee1905/plugins/snoop.mk
+++ b/ieee1905/plugins/snoop.mk
@@ -1,12 +0,0 @@
-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
--- a/ieee1905/plugins/topology.mk
+++ b/ieee1905/plugins/topology.mk
@@ -1,12 +0,0 @@
-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
--- a/iop/config
+++ b/iop/config
@@ -18,21 +18,8 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 # /etc/banner and /etc/device_info #
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="IOPSYS"
+CONFIG_VERSION_MANUFACTURER="iopsysWrt"
 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
@@ -57,6 +44,7 @@ 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

@@ -76,7 +64,6 @@ 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
@@ -153,7 +140,7 @@ CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables-zz-legacy=y
+CONFIG_PACKAGE_iptables-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
--- a/iop/scripts/genconfig.sh
+++ b/iop/scripts/genconfig.sh
@@ -13,13 +13,12 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	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"
+	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"

 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -109,23 +108,21 @@ function genconfig {
 			return
 		fi

-		[ -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)
+		[ -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)

 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -134,10 +131,10 @@ function genconfig {
 			return
 	    fi

-	    for p in $brcmbca; do
+	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
+		    target="iopsys_brcm63xx_arm"
+			target_config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
@@ -145,15 +142,15 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips_feed/config"
+			target_config_path="$ramips/config"
 		    return
 		fi
 	    done

-	    for p in $airoha; do
+	    for p in $iopsys_econet; do
 		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
+		    target="iopsys_econet"
+			target_config_path="$econet/config"
 		    return
 		fi
 	    done
@@ -161,7 +158,7 @@ function genconfig {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86_feed/config"
+			target_config_path="$x86/config"
 		    return
 		fi
 	    done
@@ -169,7 +166,7 @@ function genconfig {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt_feed/config"
+			target_config_path="$armvirt/config"
 		    return
 		fi
 	    done
@@ -177,15 +174,7 @@ function genconfig {
 	    for p in $iopsys_mediatek; do
 		if [ $p == $profile ]; then
 		    target="iopsys_mediatek"
-			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"
+			target_config_path="$mediatek/config"
 		    return
 		fi
 	    done
@@ -342,7 +331,7 @@ function genconfig {

 		# Special handling for targets which use TARGET_DEVICES 
 		case "$target" in
-		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
+		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
 			# 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)"
@@ -388,15 +377,12 @@ function genconfig {
 		fi

 		# Set target version
-		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
+		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
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config

 		# Enable Package source tree override if selected
--- a/iop/scripts/genconfig_min.sh
+++ b/iop/scripts/genconfig_min.sh
@@ -12,13 +12,12 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	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"
+	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"

 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -108,23 +107,21 @@ function genconfig_min {
 			return
 		fi

-		[ -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)
+		[ -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)

 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -133,10 +130,10 @@ function genconfig_min {
 			return
 	    fi

-	    for p in $brcmbca; do
+	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
+		    target="iopsys_brcm63xx_arm"
+			target_config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
@@ -144,15 +141,15 @@ function genconfig_min {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips_feed/config"
+			target_config_path="$ramips/config"
 		    return
 		fi
 	    done

-	    for p in $airoha; do
+	    for p in $iopsys_econet; do
 		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
+		    target="iopsys_econet"
+			target_config_path="$econet/config"
 		    return
 		fi
 	    done
@@ -160,7 +157,7 @@ function genconfig_min {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86_feed/config"
+			target_config_path="$x86/config"
 		    return
 		fi
 	    done
@@ -168,7 +165,7 @@ function genconfig_min {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt_feed/config"
+			target_config_path="$armvirt/config"
 		    return
 		fi
 	    done
@@ -176,15 +173,7 @@ function genconfig_min {
 	    for p in $iopsys_mediatek; do
 		if [ $p == $profile ]; then
 		    target="iopsys_mediatek"
-			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"
+			target_config_path="$mediatek/config"
 		    return
 		fi
 	    done
@@ -333,7 +322,7 @@ function genconfig_min {

 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
+		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
 			# 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)"
@@ -379,15 +368,12 @@ function genconfig_min {
 		fi

 		# Set target version
-		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
+		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
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config

 		# Enable Package source tree override if selected
--- a/iop/scripts/install_key.sh
+++ b/iop/scripts/install_key.sh
@@ -48,10 +48,7 @@ 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 \
-        -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
-        root@$host \
-        "echo '$keys' >> '$DROPBEAR_AUTHORIZED_KEYS_FILE'" && echo ok
+    ssh 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"
--- a/iop/scripts/iopupgrade.sh
+++ b/iop/scripts/iopupgrade.sh
@@ -274,10 +274,9 @@ 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" "-t <host> -f <file> [opts]  Install firmware on remote host with SSH"
+register_command "ssh_upgrade" "-h <host> -f <file> [opts]  Install firmware on remote host with SSH"
--- a/libvoice-broadcom/Makefile
+++ b/libvoice-broadcom/Makefile
@@ -1,61 +0,0 @@
-#
-# 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)))
-
--- a/libvoice-d2/Makefile
+++ b/libvoice-d2/Makefile
@@ -1,58 +0,0 @@
-#
-# 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)))
-
--- a/map-agent/Config.in
+++ b/map-agent/Config.in
@@ -13,9 +13,6 @@ 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"
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.4.11
+PKG_VERSION:=2.10.3.14
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=0852c7803475f7fb919f680d02437ba9672c42fc
+PKG_SOURCE_VERSION:=449eb907b121b7224cbfedcf51246e438f2b30d6
 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 +ip-bridge
+	  +map-plugin
 endef


@@ -59,8 +59,6 @@ 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
@@ -75,7 +73,6 @@ 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


--- a/map-agent/files/etc/config/mapagent
+++ b/map-agent/files/etc/config/mapagent
@@ -7,7 +7,6 @@ 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'
--- a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
+++ b/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="/var/run/multiap/multiap.backhaul"
+map_bh_file="/tmp/multiap.backhaul"
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
 al_brnet="${al_bridge:3}"
--- a/map-agent/files/etc/init.d/mapagent
+++ b/map-agent/files/etc/init.d/mapagent
@@ -10,9 +10,56 @@ 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 /var/run/multiap/multiap.backhaul
+	rm -f /tmp/multiap.backhaul
 	procd_open_instance
 	procd_set_param command "/usr/sbin/dynbhd"
 	procd_set_param respawn
@@ -34,8 +81,7 @@ validate_agent_section() {
 		'resend_num:uinteger:0' \
 		'dyn_cntlr_sync:bool:true' \
 		'island_prevention:bool:false' \
-		'eth_onboards_wifi_bhs:bool:false' \
-		'scan_on_boot_only:bool:false'
+		'eth_onboards_wifi_bhs:bool:false'


 	[ "$?" -ne 0 ] && {
@@ -92,7 +138,7 @@ validate_radio_section() {

 	uci_validate_section mapagent $section "${1}" \
 			'device:string' \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'configured:bool:false' \
 			'onboarded:bool:false' \
 			'dedicated_backhaul:bool:false' \
@@ -187,6 +233,10 @@ 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"
@@ -196,6 +246,10 @@ start_service() {
 	procd_close_instance
 }

+#stop_service() {
+#	remove_map
+#}
+
 service_triggers()
 {
 	procd_add_reload_trigger "mapagent"
--- a/map-controller/Config.in
+++ b/map-controller/Config.in
@@ -14,10 +14,6 @@ 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
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.20
+PKG_VERSION:=2.11.0.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5ff7f037c040d337982a1e3a51693fb8e0682046
+PKG_SOURCE_VERSION:=a4a626539ede73c1c4eb1ad768331524a8ee9ce8

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -45,15 +45,12 @@ 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
@@ -61,8 +58,6 @@ 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)
--- a/map-controller/files/etc/config/mapcontroller
+++ b/map-controller/files/etc/config/mapcontroller
@@ -2,22 +2,14 @@ config controller 'controller'
 	option enabled '1'
 	option registrar '2 5'
 	option debug '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'
+	option primary_vid '0'
+	option primary_pcp '0'
+	option allow_bgdfs '0'
+	option channel_plan '0'

 config ap
 	option band '2'
@@ -68,8 +60,8 @@ config ap
 #	option report_sta_assocfails_rate '0'
 #	option report_metric_periodic '0'
 #	option report_scan '0'
-#	list steer_exclude 'e0:d4:e8:79:c4:ee'
-#	list steer_exclude_btm 'e0:d4:e8:79:c4:11'
+#	option steer_exclude '0'
+#	option steer_exclude_btm '0'
 #	option steer_disallow '0'
 #	option coordinated_cac '0'
 #	option traffic_separation '0'
@@ -115,8 +107,8 @@ config ap
 #	option report_sta_assocfails_rate '0'
 #	option report_metric_periodic '0'
 #	option report_scan '0'
-#	list steer_exclude 'e0:d4:e8:79:c4:ee'
-#	list steer_exclude_btm 'e0:d4:e8:79:c4:11'
+#	option steer_exclude '0'
+#	option steer_exclude_btm '0'
 #	option steer_disallow '0'
 #	option coordinated_cac '0'
 #	option traffic_separation '0'
--- a/map-controller/files/etc/init.d/mapcontroller
+++ b/map-controller/files/etc/init.d/mapcontroller
@@ -19,9 +19,11 @@ 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'
@@ -34,27 +36,6 @@ 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"

@@ -112,7 +93,7 @@ validate_radio_section() {
 	uci_validate_section mapcontroller $section "${1}" \
 			'agent_id:macaddr' \
 			'macaddr:macaddr' \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'steer_policy:range(0,2)' \
 			'util_threshold:range(0,255)' \
 			'rcpi_threshold:range(0,255)' \
@@ -135,7 +116,6 @@ 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
--- a/map-topology/Makefile
+++ b/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.13
+PKG_VERSION:=2.5.1.4

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=aaa55a72e719184af32d57a9b40bec1c440774a9
+PKG_SOURCE_VERSION:=488ce1ce576b57c9b3c4d7c034969bf65e66216f
 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
--- a/obuspa/Config.in
+++ b/obuspa/Config.in
@@ -20,7 +20,7 @@ config OBUSPA_MTP_ENABLE_STOMP

 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
-	default y
+	default n

 config OBUSPA_CONTROLLER_MTP_VERIFY
 	bool "Enable verification of MQTT response topic before processing the message"
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=6.0.0.11
+PKG_VERSION:=5.0.0.21

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
-PKG_SOURCE_VERSION:=668748cd4801aa5af12d61d9b0837064b9f933cc
+PKG_SOURCE_VERSION:=c71da7f9b66f4d7fd240e6eb7078044c6b43b72b
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -91,7 +91,6 @@ endif
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
        $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
-        $(Build/Patch)
 endef
 endif

--- a/obuspa/files/etc/config/obuspa
+++ b/obuspa/files/etc/config/obuspa
@@ -2,7 +2,7 @@ config obuspa 'global'
 	option enabled '1'
 	option debug '1'
 	option log_level '1'
-	option prototrace '0'
+	option prototrace '1'
 	option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -1,14 +1,14 @@
 #!/bin/sh /etc/rc.common

 START=99
-STOP=02
+STOP=2
 USE_PROCD=1

 PROG=/usr/sbin/obuspa
 CONFIGURATION=obuspa

 ENV_PROFILE="/root/.profile"
-KEEP_FILE="/lib/upgrade/keep.d/obuspa"
+KEEP_FILES="/lib/upgrade/keep.d/obuspa"

 RESET_FILE="/tmp/obuspa/obuspa_param_reset.txt"
 SQL_DB_FILE="/tmp/obuspa/usp.db"
@@ -59,17 +59,6 @@ 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
@@ -81,14 +70,6 @@ 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
@@ -131,8 +112,8 @@ get_refrence_path()
 	value="${2}"
 	path=""

-	if [ -f "${DB_DUMP}" ]; then
-		path=$(grep "${dmref}\d.Alias " ${DB_DUMP}|grep -w "${value}")
+	if [ -f "${SQL_DB_FILE}" ]; then
+		path=$(${PROG} -f ${SQL_DB_FILE} -c show database |grep "${dmref}\d.Alias "|grep -w "${value}")
 	elif [ -f "${RESET_FILE}" ]; then
 		path=$(grep "${dmref}\d.Alias " ${RESET_FILE}|grep -w "${value}")
 	fi
@@ -142,18 +123,14 @@ get_refrence_path()

 update_keep()
 {
-	file=${1}
+	keep_file=${1}

-	if [ -z "${file}" ]; then
+	if [ -z "${keep_file}" ]; then
 		return;
 	fi

-	if [ ! -f "${KEEP_FILE}" ]; then
-		touch "${KEEP_FILE}"
-	fi
-
-	if ! grep -q "${file}" ${KEEP_FILE}; then
-		echo "${file}" >> ${KEEP_FILE}
+	if ! grep -q "${keep_file}" ${KEEP_FILES}; then
+		echo "${keep_file}" >> ${KEEP_FILES}
 	fi
 }

@@ -223,15 +200,13 @@ 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:string' \
+		'Host:host' \
 		'Port:port' \
 		'Path:string' \
 		'EnableEncryption:bool'
@@ -243,7 +218,7 @@ validate_subscription_section()
 		'Enable:bool:1' \
 		'NotifType:or("ValueChange","ObjectCreation","ObjectDeletion","OperationComplete","Event")' \
 		'ReferenceList:list(string)' \
-		'Recipient:string' \
+		'Persistent:bool:1' \
 		'controller:string'
 }

@@ -258,7 +233,6 @@ validate_mtp_section()
 		'Path:string' \
 		'mqtt:string' \
 		'stomp:string' \
-		'Reference:string' \
 		'EnableEncryption:bool'
 }

@@ -266,7 +240,7 @@ validate_stomp_connection_section()
 {
 	uci_validate_section ${CONFIGURATION} stomp "${1}" \
 		'Enable:bool:1' \
-		'Host:string' \
+		'Host:host' \
 		'Port:port:61613' \
 		'Username:string' \
 		'Password:string' \
@@ -279,7 +253,7 @@ validate_mqtt_client_section()
 {
 	uci_validate_section ${CONFIGURATION} mqtt "${1}" \
 		'Enable:bool:1' \
-		'BrokerAddress:string' \
+		'BrokerAddress:host' \
 		'BrokerPort:port:1883' \
 		'Username:string' \
 		'Password:string' \
@@ -315,6 +289,7 @@ publish_endpoint()
 	local AgentEndpointID serial oui user pass

 	if ! uci -q get obuspa.localmqtt; then
+		log "Remote mqtt broker configured, skip publishing endpoint"
 		return 0;
 	fi

@@ -360,7 +335,6 @@ configure_localagent()
 	}

 	db_set Device.LocalAgent.EndpointID "${EndpointID}"
-	update_db_dump
 }

 update_reset_reason()
@@ -376,18 +350,16 @@ configure_controller()
 {
 	local EndpointID Enable 
 	local Protocol Destination
-	local Topic mqtt stomp assigned_role_name AssignedRole ParameterName
-	local Host Port Path EnableEncryption Reference
-	local dm_ref sec
+	local Topic mqtt stomp assigned_role_name ParameterName
+	local Host Port Path EnableEncryption
+	local dm_ref

-	sec="${1}"
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
 		return 1;
 	}

-	sec="${sec/controller_/cpe-}"
-	get_base_path "Device.LocalAgent.Controller." "${sec}"
+	get_base_path "Device.LocalAgent.Controller." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
@@ -399,30 +371,21 @@ configure_controller()
 	fi

 	dm_ref=""
-	if [ -z "${Reference}" ]; then
-		if [ "${Protocol}" = "STOMP" ]; then
-			stomp="${stomp/stomp_/cpe-}"
-			dm_ref=$(get_refrence_path "Device.STOMP.Connection." "${stomp}")
-		elif [ "${Protocol}" = "MQTT" ]; then
-			mqtt="${mqtt/mqtt_/cpe-}"
-			dm_ref=$(get_refrence_path "Device.MQTT.Client." "${mqtt}")
-		fi
-	else
-		dm_ref="${Reference}"
+	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}")
 	fi

-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	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" "${sec}"
+	db_set "${BASEPATH}.MTP.1.Alias" "uci-${1}"
 	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
@@ -449,41 +412,36 @@ configure_controller()

 	for param in ${ParameterName}
 	do
-		db_set "${BASEPATH}.BootParameter.${_pnum}.Alias" "${sec}_boot_${_pnum}"
+		db_set "${BASEPATH}.BootParameter.${_pnum}.Alias" "uci-${1}-${_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 controller
+	local Enable NotifType ReferenceList Persistent controller
 	local dm_ref
-	local sec

-	sec="${1}"
 	validate_subscription_section "${1}" || {
 		log "Validation of subscription section failed"
 		return 1;
 	}

-	sec="${sec/sub_/cpe-}"
-	get_base_path "Device.LocalAgent.Subscription." "sub_${1}"
+	get_base_path "Device.LocalAgent.Subscription." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
 	fi

 	if [ -n "${controller}" ]; then
-		controller="${controller/controller_/cpe-}"
-		dm_ref=$(get_refrence_path "Device.LocalAgent.Controller." "${controller}")
+		dm_ref=$(get_refrence_path "Device.LocalAgent.Controller." "uci-${controller}")
 	fi

-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.ID" "uci-${1}"
 	db_set "${BASEPATH}.CreationDate" "$(date -I'seconds')"
 	db_set "${BASEPATH}.Enable" "${Enable}"
@@ -492,10 +450,8 @@ configure_subscription()
 		ReferenceList=${ReferenceList// /,}
 		db_set "${BASEPATH}.ReferenceList" "${ReferenceList}"
 	fi
-	db_set "${BASEPATH}.Persistent" "1"
+	db_set "${BASEPATH}.Persistent" "${Persistent}"
 	db_set "${BASEPATH}.Recipient" "${dm_ref}"
-	# Entry updated in db, remove uci entry
-	uci_remove obuspa "${1}"
 }

 check_json_load()
@@ -532,7 +488,8 @@ get_role_index()
 	 *)
 		local ji=0

-		if check_json_load; then
+		check_json_load
+		if [ "$?" -eq "0" ]; then
 			ji=$(get_role_index_from_json "${role_name}" "${role_def_file}")
 		fi
 		idx=$(( ji + 2 )) # Add predefined roles
@@ -544,16 +501,13 @@ 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;
 	}

-	sec="${sec/challenge_/cpe-}"
-	get_base_path "Device.LocalAgent.ControllerTrust.Challenge." "${sec}"
+	get_base_path "Device.LocalAgent.ControllerTrust.Challenge." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
@@ -564,7 +518,7 @@ configure_challenges()
 		return 1;
 	fi

-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.Description" "${Description}"

@@ -576,22 +530,19 @@ 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 sec
+	local stomp mqtt dm_ref

-	sec="${1}"
 	validate_mtp_section "${1}" || {
 		log "Validation of mtp section failed"
 		return 1;
 	}
-	sec="${sec/mtp_/cpe-}"
-	get_base_path "Device.LocalAgent.MTP." "${sec}"
+
+	get_base_path "Device.LocalAgent.MTP." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
@@ -603,19 +554,13 @@ configure_mtp() {
 	fi

 	dm_ref=""
-	if [ -z "${Reference}" ]; then
-		if [ "${Protocol}" = "STOMP" ]; then
-			stomp="${stomp/stomp_/cpe-}"
-			dm_ref=$(get_refrence_path "Device.STOMP.Connection." "${stomp}")
-		elif [ "${Protocol}" = "MQTT" ]; then
-			mqtt="${mqtt/mqtt_/cpe-}"
-			dm_ref=$(get_refrence_path "Device.MQTT.Client." "${mqtt}")
-		fi
-	else
-		dm_ref="${Reference}"
+	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}")
 	fi

-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.Protocol" "${Protocol}"
 	if [ "${Protocol}" = "MQTT" ]; then
@@ -633,28 +578,24 @@ 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;
 	}

-	sec="${sec/stomp_/cpe-}"
-	get_base_path "Device.STOMP.Connection." "${sec}"
+	get_base_path "Device.STOMP.Connection." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
 	fi

-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.Host" "${Host}"
 	db_set "${BASEPATH}.Username" "${Username}"
 	db_set "${BASEPATH}.Password" "${Password}"
@@ -665,28 +606,24 @@ 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;
 	}

-	sec="${sec/mqtt_/cpe-}"
-	get_base_path "Device.MQTT.Client." "${sec}"
+	get_base_path "Device.MQTT.Client." "uci-${1}"
 	if [ -z "${BASEPATH}" ]; then
 		log "Failed to get path [$BASEPATH]"
 		return 1;
 	fi

-	db_set "${BASEPATH}.Alias" "${sec}"
+	db_set "${BASEPATH}.Alias" "uci-${1}"
 	db_set "${BASEPATH}.Enable" "${Enable}"
 	db_set "${BASEPATH}.BrokerAddress" "${BrokerAddress}"
 	db_set "${BASEPATH}.BrokerPort" "${BrokerPort}"
@@ -697,7 +634,6 @@ configure_mqtt_client() {
 	db_set "${BASEPATH}.ClientID" "${ClientID}"

 	db_set
-	update_db_dump
 }


@@ -769,277 +705,21 @@ 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 |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
+		${PROG} -f ${SQL_DB_FILE} -c show database > ${DB_DUMP}
 	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
@@ -1056,9 +736,6 @@ 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}

@@ -1094,7 +771,7 @@ start_service() {
 	fi

 	mkdir -p /tmp/obuspa/
-	db_init "${1}"
+	db_init
 	register_service
 }

@@ -1104,7 +781,7 @@ stop_service() {

 reload_service() {
 	stop
-	start update
+	start
 }

 service_triggers() {
@@ -1124,7 +801,7 @@ service_triggers() {
 				json_add_array
 					json_add_string "" "run_script"
 					json_add_string "" "/etc/init.d/obuspa"
-					json_add_string "" "restart"
+					json_add_string "" "reload"
 				json_close_array
 			json_close_array
 			json_add_int "" "2000"
--- a/obuspa/files/etc/obuspa/dmcaching_exclude.json
+++ b/obuspa/files/etc/obuspa/dmcaching_exclude.json
@@ -1,8 +1,7 @@
 {
  "dmcaching_exclude": [
-    "Device.InterfaceStack.",
+    "Device.DeviceInfo.ProcessStatus.Process.",
    "Device.Hosts.Host.",
-    "Device.IEEE1905.",
    "Device.WiFi.DataElements."
  ]
 }
--- a/obuspa/patches/0001-validate-mtp-topic.patch
+++ b/obuspa/patches/0001-validate-mtp-topic.patch
@@ -1,140 +0,0 @@
-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;
- }
--- a/obuspa/patches/0002-supress-group-get-error.patch
+++ b/obuspa/patches/0002-supress-group-get-error.patch
@@ -1,49 +0,0 @@
-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);
-+	}
-     }
- }
--- a/obuspa/patches/0003-set-internal-role-fix.patch
+++ b/obuspa/patches/0003-set-internal-role-fix.patch
@@ -1,43 +0,0 @@
--- 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
--- a/owsd/Makefile
+++ b/owsd/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=owsd
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.4
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/owsd.git
-PKG_SOURCE_VERSION:=d866ee2a96f5b75b3f45b0e1d655431184e8032d
+PKG_SOURCE_VERSION:=e37c6f9d708c454c802eede814cc51fb89c919e9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
--- a/periodicstats/Makefile
+++ b/periodicstats/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=periodicstats
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.0

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -20,13 +20,15 @@ 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 +libbbf_api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef

 define Package/periodicstats/description
--- a/ponmngr/Makefile
+++ b/ponmngr/Makefile
@@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/ponmngr
 	CATEGORY:=Utilities
 	TITLE:=PON Manager
-	DEPENDS:=@(TARGET_brcmbca||TARGET_airoha)
+	DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
 endef

 define Package/ponmngr/description
@@ -34,9 +34,9 @@ endef

 define Package/ponmngr/install
 	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_brcmbca),)
+ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
 	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_airoha),)
+else ifneq ($(CONFIG_TARGET_iopsys_econet),)
 	$(CP) ./files/airoha/* $(1)/
 endif
 endef
--- a/ponmngr/files/airoha/lib/xpon/airoha.sh
+++ b/ponmngr/files/airoha/lib/xpon/airoha.sh
@@ -10,9 +10,6 @@ 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
--- a/ponmngr/files/common/etc/init.d/xpon
+++ b/ponmngr/files/common/etc/init.d/xpon
@@ -9,16 +9,14 @@ 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
-		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
+		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
+		vendor_id="IOPS"
+		vssn="${macaddr:4:8}"
 	fi

 	set_serial_number $vendor_id $vssn
--- a/ponmngr/files/common/etc/uci-defaults/60-xpon-generate
+++ b/ponmngr/files/common/etc/uci-defaults/60-xpon-generate
@@ -1,34 +1,17 @@
 #!/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
-                # 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
+                # return if there is any valid content
                exit                                  
        else                                          
                rm -f /etc/config/xpon
        fi                           
 fi                                   
 touch /etc/config/xpon
-
+                     
+                          
 uci set xpon.ani=ani
 uci set xpon.ani.enable="1"
-configure_serial_number
-
+                                           
+uci commit xpon  
--- a/qosmngr/Makefile
+++ b/qosmngr/Makefile
@@ -27,7 +27,7 @@ define Package/qosmngr
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=QoS Manager
-  DEPENDS:=@(TARGET_brcmbca||TARGET_airoha) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
 endef

 define Package/qosmngr/description
@@ -40,24 +40,11 @@ define Build/Prepare
 endef
 endif

-define Package/qosmngr/install/common
-	$(CP) ./files/common/* $(1)/
+define Package/qosmngr/install
+	$(CP) ./files/* $(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
 $(eval $(call BuildPackage,qosmngr))
--- a/qosmngr/files/airoha/etc/uci-defaults/60-qos_queue_generate
+++ b/qosmngr/files/airoha/etc/uci-defaults/60-qos_queue_generate
@@ -1,48 +0,0 @@
-#!/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
--- a/qosmngr/files/airoha/lib/qos/airoha.sh
+++ b/qosmngr/files/airoha/lib/qos/airoha.sh
@@ -1,190 +0,0 @@
-#!/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} \
-                            ${shape_rate:+uplink-bandwidth} $shape_rate \
-                            queuemask $queue_mask
-    else
-        /userfs/bin/qosrule discpline off
-    fi
-}
--- a/qosmngr/files/airoha/lib/qos/common/chains.ebtables.sh
+++ b/qosmngr/files/airoha/lib/qos/common/chains.ebtables.sh
@@ -1,453 +0,0 @@
-#!/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
-}
-
--- a/qosmngr/files/airoha/lib/qos/common/chains.iptables.sh
+++ b/qosmngr/files/airoha/lib/qos/common/chains.iptables.sh
@@ -1,240 +0,0 @@
-#!/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
-}
--- a/qosmngr/files/airoha/lib/qos/common/chains.sh
+++ b/qosmngr/files/airoha/lib/qos/common/chains.sh
@@ -1,12 +0,0 @@
-#!/bin/sh
-# Set up or flush all chains
-
-setup_qos() {
-    create_ebtables_chains
-    create_iptables_chains
-}
-
-flush_chains() {
-    flush_ebtables_chains
-    flush_iptables_chains
-}
--- a/qosmngr/files/airoha/lib/qos/common/classify.sh
+++ b/qosmngr/files/airoha/lib/qos/common/classify.sh
@@ -1,44 +0,0 @@
-#!/bin/sh
-# Common classifier library
-
-# Handle classify section
-handle_classify() {
-    cid="$1" #classify section ID
-
-    config_get is_enable "$cid" "enable"
-    # no need to configure disabled classify rules
-    if [ -z "$is_enable" ] || [ "$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
-}
--- a/qosmngr/files/airoha/lib/qos/common/policer.sh
+++ b/qosmngr/files/airoha/lib/qos/common/policer.sh
@@ -1,132 +0,0 @@
-#!/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"
-
-    # No need to configure disabled policer
-    if [ -z "$is_enable" ] || [ "$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
-}
--- a/qosmngr/files/airoha/lib/qos/common/queue.sh
+++ b/qosmngr/files/airoha/lib/qos/common/queue.sh
@@ -1,50 +0,0 @@
-#!/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"
-
-    # no need to configure disabled queues
-    if [ -z "${is_enable}" ] || [ "${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
-}
--- a/qosmngr/files/airoha/lib/qos/common/shaper.sh
+++ b/qosmngr/files/airoha/lib/qos/common/shaper.sh
@@ -1,46 +0,0 @@
-#!/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"
-    # no need to configure disabled queues
-    if [ -z "${is_enable}" ] || [ "${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
-}
--- a/qosmngr/files/airoha/lib/qos/qos.sh
+++ b/qosmngr/files/airoha/lib/qos/qos.sh
@@ -1,55 +0,0 @@
-#!/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
-}
--- a/qosmngr/files/common/etc/init.d/qos
+++ b/qosmngr/files/common/etc/init.d/qos
@@ -11,8 +11,7 @@ NAME=qosmngr
 PROG=/usr/sbin/qosmngr

 . /lib/functions.sh
-
-. /lib/qos/qos.sh
+include /lib/qos

 start_service() {
 	if [ -f "/etc/config/qos" ]; then
@@ -38,8 +37,3 @@ restart() {
 	setup_qos
 	start
 }
-
-reload_service()
-{
-	reload_qos_service
-}
--- a/qosmngr/files/broadcom/etc/uci-defaults/60-qos_queue_generate
+++ b/qosmngr/files/broadcom/etc/uci-defaults/60-qos_queue_generate
--- a/qosmngr/files/broadcom/lib/qos/qos.sh
+++ b/qosmngr/files/broadcom/lib/qos/qos.sh
@@ -10,12 +10,6 @@ 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() {
@@ -67,37 +61,6 @@ 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
@@ -223,14 +186,6 @@ 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
@@ -652,12 +607,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
@@ -1021,61 +976,19 @@ 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"

-	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"
+	handle_ebtables_rules $cid
+	handle_iptables_rules $cid
+	handle_policer_rules $cid
 }

 configure_shaper() {
@@ -1095,25 +1008,19 @@ 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_order classify
-	sort_classify_by_order
-	handle_classify classify
+	config_foreach handle_classify classify

 	sh /tmp/qos/classify.ebtables
 	sh /tmp/qos/classify.iptables
@@ -1144,15 +1051,6 @@ 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
@@ -1177,7 +1075,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 &>/dev/null
+			ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
 		fi
 	done

@@ -1224,10 +1122,6 @@ 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
@@ -1237,149 +1131,3 @@ 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
-}
--- a/questd/Makefile
+++ b/questd/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=questd
-PKG_VERSION:=5.2.5
+PKG_VERSION:=5.2.4

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

 PKG_NAME:=skopeo
 PKG_VERSION:=1.9.2
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_RELEASE:=1

-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=https://github.com/containers/skopeo/archive/v$(PKG_VERSION)
-PKG_HASH:=9a321ba75f213e5c46cba7f92073c2437137a56d3140c9ab6e723fb92890f9d0
+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_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
--- a/stunc/Makefile
+++ b/stunc/Makefile
@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.14
+PKG_VERSION:=1.1.12

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=06b63878a448b593d907bb3e9c1381dc0e69bca6
+PKG_SOURCE_VERSION:=5b65364709a921db0956bf74a4f126217cfb1775
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -23,6 +23,8 @@ endif
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

+PKG_BUILD_DEPENDS:=bbf
+
 include $(INCLUDE_DIR)/package.mk

 define Package/stunc/default
@@ -30,7 +32,7 @@ define Package/stunc/default
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json
 endef

 define Package/stunc-mbedtls
--- a/sulu-builder/Config.in
+++ b/sulu-builder/Config.in
@@ -13,7 +13,7 @@ menu "SULU_CORE"

 	config SULU_CORE_VERSION
 		string "SULU repo version"
-		default "c7e62f7f7cda1961012e8149d220ac1eb26d362f"
+		default "944f4e2217e478c04f1ef56ae67c66d82ece7994"
 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 "ccd70b399b31530dc1af6a871eee94fbb179d794"
+		default "f8a96f1c55904082c0658ee63aebe1e67a097f42"
 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 "3c79d57bee453e7b62c7b7626e33bf273212bbc9"
+		default "89b4e4b95d3a94b88782f5cdc9d1eafd5728a1f7"
 endmenu

 menu "SULU_THEME_IOPSYS"
--- a/sulu-builder/Makefile
+++ b/sulu-builder/Makefile
@@ -5,25 +5,27 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-builder
-PKG_VERSION:=1.3.16
+PKG_VERSION:=1.1.4

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=81d4bb268914dc3822293e93519ae6adbd6ddbea
+PKG_SOURCE_VERSION:=ca38b2086cee7ba83b41eec56539e9432271a349
 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 +usermngr +jq
-	CONFLICTS:=sulu
+	DEPENDS:=+nginx +mosquitto-auth-shadow
+	MENU:=1
 endef

 define Package/${PKG_NAME}/description
@@ -35,7 +37,7 @@ define Package/${PKG_NAME}/config
 endef

 # Sulu core and other dependent needs to be updated in Config.in
-SULU_DL_FILE:=sulu_core-${CONFIG_SULU_CORE_VERSION}.tar.gz
+SULU_DL_FILE:=sulu-${PKG_VERSION}-${CONFIG_SULU_CORE_VERSION}.tar.gz
 define Download/sulu_core
  FILE:=$(SULU_DL_FILE)
  URL:=$(CONFIG_SULU_CORE_URL)
@@ -142,36 +144,11 @@ 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/*.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/mosquitto/conf.d/
-	$(INSTALL_DATA) ./files/etc/mosquitto/conf.d/obuspa.conf $(1)/etc/mosquitto/conf.d/
-	$(INSTALL_DATA) ./files/etc/mosquitto/conf.d/sulu.conf $(1)/etc/mosquitto/conf.d/
-	$(INSTALL_DATA) ./files/etc/mosquitto/sulu.password $(1)/etc/mosquitto/sulu.password
-
-	$(INSTALL_DIR) $(1)/etc/nginx/conf.d
-	$(INSTALL_DATA) ./files/etc/nginx/conf.d/sulu.conf $(1)/etc/nginx/conf.d/
-
-	$(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_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/uci-defaults/99-fix-sulu-config $(1)/etc/uci-defaults/
+	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/*.json $(1)/sulu/config/
+	$(CP) ./files/* $(1)/
 endef

 $(eval $(call BuildPackage,${PKG_NAME}))
--- a/sulu-builder/files/etc/config/sulu
+++ b/sulu-builder/files/etc/config/sulu
@@ -1,9 +0,0 @@
-config global 'global'
-	option root '/sulu'
-	option port '8080'
-	option ws_port '9001'
-	option enabled '1'
-	option enable_system_credentials '1'
-	option role_based_access '1'
-	list user 'admin'
-	list user 'user'
--- a/sulu-builder/files/etc/init.d/sulu
+++ b/sulu-builder/files/etc/init.d/sulu
@@ -1,42 +1,19 @@
 #!/bin/sh /etc/rc.common

-USE_PROCD=1
-
 START=99
-STOP=01
+STOP=10

-. /lib/functions.sh
-. /etc/sulu/sulu.sh
+USE_PROCD=1

 log() {
 	echo "${@}"|logger -t sulu.init -p debug
 }

-validate_sulu_global_section()
-{
-	uci_validate_section sulu global global \
-		'enabled:bool:1' \
-		'enable_system_credentials:bool:1' \
-		'role_based_access:bool:0'
-}
-
 start_service() {
-	local enabled enable_system_credentials role_based_access
-
-	config_load sulu
 	procd_open_instance sulu
-
-	validate_sulu_global_section || return 0;
 	# append sulu connection injection
-	if [ "${enabled}" -eq "0" ]; then
-		procd_close_instance
-		return 0
-	fi
-
-	configure_sulu "${enable_system_credentials}" "${role_based_access}" 1
-	update_nginx_config "${enabled}" 1
-	update_sulu_connection_port
 	procd_close_instance
+
 }

 reload_service() {
@@ -46,5 +23,5 @@ reload_service() {

 service_triggers()
 {
-	procd_add_reload_trigger "sulu"
+	procd_add_config_trigger "config.change" "obuspa" /etc/init.d/sulu reload
 }
--- a/sulu-builder/files/etc/mosquitto/conf.d/sulu.conf
+++ b/sulu-builder/files/etc/mosquitto/conf.d/sulu.conf
@@ -1,4 +1,5 @@
 listener 9001
 protocol websockets
+plugin /usr/lib/mosquitto_auth_shadow.so
 require_certificate false
 allow_anonymous false
--- a/sulu-builder/files/etc/mosquitto/sulu.password
+++ b/sulu-builder/files/etc/mosquitto/sulu.password
@@ -1 +0,0 @@
-admin:$6$OmM9kU/lYct3KJ9j$iP0WK4ezEtRm8+EAggNp7WbJFoWO0p7IUdI0v/hr1WcVHyfFAC30Pb8Csn7GqwwqI2dcmnDOAITnimo2VNe6ug==
--- a/sulu-builder/files/etc/nginx/conf.d/sulu.conf
+++ b/sulu-builder/files/etc/nginx/conf.d/sulu.conf
@@ -1,27 +0,0 @@
-server {
-        listen 8080;
-        listen [::]:8080;
-        server_name _sulu;
-        root /sulu;
-        location / {
-                autoindex on;
-                expires -1;
-
-                if ($request_method = 'OPTIONS') {
-                        add_header 'Access-Control-Allow-Origin' '*';
-                        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-                        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,Content-Type,Range';
-                        add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
-                        add_header 'Content-Type' 'text/plain; charset=utf-8';
-                        add_header 'Content-Length' 0;
-                        return 204;
-                }
-                if ($request_method = 'GET') {
-                        add_header 'Access-Control-Allow-Origin' '*' always;
-                        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-                        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,Content-Type,Range' always;
-                        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-                        add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
-                }
-        }
-}
--- a/sulu-builder/files/etc/nginx/conf.d/sulu.locations
+++ b/sulu-builder/files/etc/nginx/conf.d/sulu.locations
@@ -0,0 +1,18 @@
+location /config/ {
+	autoindex on;
+	if ($request_method = 'OPTIONS') {
+		add_header 'Access-Control-Allow-Origin' '*';
+		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
+		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
+		add_header 'Access-Control-Max-Age' 1728000;
+		add_header 'Content-Type' 'text/plain; charset=utf-8';
+		add_header 'Content-Length' 0;
+		return 204;
+	}
+	if ($request_method = 'GET') {
+		add_header 'Access-Control-Allow-Origin' '*' always;
+		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
+		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
+		add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
+	}
+}
--- a/sulu-builder/files/etc/sulu/roles.json
+++ b/sulu-builder/files/etc/sulu/roles.json
@@ -1,95 +0,0 @@
-{
-  "roles": [
-    {
-      "name": "admin",
-      "permission": [
-        {
-          "object": "Device.",
-          "perm": [
-            "PERMIT_ALL"
-          ]
-        }
-      ]
-    },
-    {
-      "name": "user",
-      "permission": [
-        {
-          "object": "Device.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object": "Device.LocalAgent.Subscription.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_ADD",
-            "PERMIT_SET",
-            "PERMIT_DEL"
-          ]
-        },
-        {
-          "object": "Device.WiFi.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.DNS.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.IP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        }
-      ]
-    },
-    {
-      "name": "undefined-1"
-    },
-    {
-      "name": "undefined-2"
-    },
-    {
-      "name": "undefined-3"
-    },
-    {
-      "name": "undefined-4"
-    }
-  ]
-}
--- a/sulu-builder/files/etc/sulu/sulu.sh
+++ b/sulu-builder/files/etc/sulu/sulu.sh
@@ -1,439 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-ACL_FILE="/tmp/sulu/mqtt.acl"
-_RESTART_SERVICES="0"
-
-mkdir -p /tmp/sulu/
-
-function slog()
-{
-	echo "$*" |logger -t sulu.init -p debug
-}
-
-function _get_agent_id()
-{
-        local oui serial endpointid
-
-	endpointid="$(uci_get obuspa localagent EndpointID)"
-	if [ -z "${endpointid}" ]; then
-		oui="$(db -q get device.deviceinfo.ManufacturerOUI)"
-		serial="$(db -q get device.deviceinfo.SerialNumber)"
-		echo "${oui}-${serial}"
-	else
-		echo "$(echo "${endpointid/::/,}"|cut -d "," -f 2)"
-	fi
-}
-
-function _get_endpoint_id()
-{
-        local oui serial endpointid
-
-	endpointid="$(uci_get obuspa localagent EndpointID)"
-	if [ -z "${endpointid}" ]; then
-		oui="$(db -q get device.deviceinfo.ManufacturerOUI)"
-		serial="$(db -q get device.deviceinfo.SerialNumber)"
-		echo "os::${oui}-${serial}"
-	else
-		echo "${endpointid}"
-	fi
-}
-
-function _get_sulu_users()
-{
-	echo "$(uci -q get sulu.global.user)"
-}
-
-function _get_sulu_root()
-{
-	local root
-
-	root="$(uci -q get sulu.global.root)"
-	echo "${root:-/sulu}"
-}
-
-function _get_sulu_port()
-{
-	local port
-
-	port="$(uci -q get sulu.global.port)"
-	echo "${port:-8080}"
-}
-
-function _get_sulu_ws_port()
-{
-	local port
-
-	port="$(uci -q get sulu.global.ws_port)"
-	echo "${port:-9001}"
-}
-
-function generate_sulu_conn_config()
-{
-	local rbac users SCONFIG
-
-	rbac="${1}"
-	users="$(_get_sulu_users)"
-	SCONFIG="$(_get_sulu_root)/config/connectionConfig.json"
-
-	json_init;
-	if [ "${rbac}" -eq "1" ]; then
-		json_add_string 'currentConnection' 'rbac';
-	else
-		json_add_string 'currentConnection' 'main';
-	fi
-	json_add_object 'connections';
-		json_add_object 'rbac';
-		json_add_string 'toId' "$(_get_endpoint_id)";
-		json_add_int 'port' "$(_get_sulu_ws_port)";
-		json_add_string 'protocol' 'ws';
-			json_add_array 'auth';
-			json_close_array;
-
-			json_add_object 'overrides';
-			for f in ${users}; do
-				json_add_object "${f}";
-				json_add_string 'fromId' "self::sulu-${f}";
-				json_add_string 'publishEndpoint' "/usp/$(_get_agent_id)/${f}/endpoint";
-				json_add_string 'subscribeEndpoint' "/usp/$(_get_agent_id)/${f}/controller";
-				json_close_object;
-			done
-			json_close_object;
-		json_close_object;
-
-		# add the default connection
-		json_add_object 'main';
-		json_add_string 'fromId' 'proto::interop-usp-controller';
-		json_add_string 'toId' "$(_get_endpoint_id)";
-		json_add_int 'port' "$(_get_sulu_ws_port)";
-		json_add_string 'protocol' 'ws';
-		json_add_string 'publishEndpoint' "/usp/endpoint";
-		json_add_string 'subscribeEndpoint' "/usp/controller";
-			json_add_array 'auth';
-			json_close_array;
-		json_close_object;
-	json_close_object;
-
-	json_dump > ${SCONFIG}
-}
-
-function set_sulu_connection_mode()
-{
-	local rbac profile config SCONFIG
-
-	SCONFIG="$(_get_sulu_root)/config/connectionConfig.json"
-	rbac="${1}"
-
-	profile="$(jq '.currentConnection' ${SCONFIG})"
-	if [ "$rbac" -eq "1" -a "${profile}" == "\"main\"" ]; then
-		config="$(jq '.currentConnection = "rbac"' ${SCONFIG})"
-		echo "${config}" > ${SCONFIG}
-	elif [ "$rbac" -eq "0" -a "${profile}" == "\"rbac\"" ]; then
-		config="$(jq '.currentConnection = "main"' ${SCONFIG})"
-		echo "${config}" > ${SCONFIG}
-	fi
-}
-
-function update_sulu_connection_port()
-{
-	local port ws_port SCONF
-
-	SCONF="$(_get_sulu_root)/config/connectionConfig.json"
-	ws_port="$(_get_sulu_ws_port)"
-
-	port="$(jq '.connections.rbac.port' ${SCONF})"
-	if [ "${port}" -ne "${ws_port}" ]; then
-		jq ".connections.main.port = ${ws_port} | .connections.rbac.port = ${ws_port}" ${SCONF} > /tmp/sulu/ss_port.json
-		mv /tmp/sulu/ss_port.json ${SCONF}
-	fi
-}
-
-function _update_obuspa_config()
-{
-	local restart
-
-	restart=0
-	if ! uci_get obuspa localmqtt >/dev/null 2>&1; then
-		uci_add obuspa mqtt localmqtt
-		uci_set obuspa localmqtt BrokerAddress "127.0.0.1"
-		uci_set obuspa localmqtt BrokerPort "1883"
-		uci_set obuspa localmqtt TransportProtocol "TCP/IP"
-		restart=1
-	fi
-
-	if ! uci_get obuspa agent_mtp >/dev/null 2>&1; then
-		uci_add obuspa mtp agent_mtp
-		uci_set obuspa agent_mtp Protocol "MQTT"
-		uci_set obuspa agent_mtp ResponseTopicConfigured "/usp/endpoint"
-		uci_set obuspa agent_mtp mqtt "localmqtt"
-		restart=1
-	fi
-
-	if ! uci_get obuspa localcontroller >/dev/null 2>&1; then
-		uci_add obuspa controller localcontroller
-		uci_set obuspa localcontroller EndpointID "proto::interop-usp-controller"
-		uci_set obuspa localcontroller Protocol "MQTT"
-		uci_set obuspa localcontroller Topic "/usp/controller"
-		uci_set obuspa localcontroller mqtt "localmqtt"
-		uci_set obuspa localcontroller assigned_role_name "full_access"
-		restart=1
-	fi
-	return "${restart}"
-}
-
-function _remove_obuspa_config()
-{
-	local restart
-
-	restart=0
-	if [ "$(uci_get obuspa localmqtt)" == "mqtt" ]; then
-		uci_remove obuspa localmqtt
-		restart=1
-	fi
-	if [ "$(uci_get obuspa agent_mtp)" == "mtp" ]; then
-		uci_remove obuspa agent_mtp
-		restart=1
-	fi
-	if [ "$(uci_get obuspa localcontroller)" == "controller" ]; then
-		uci_remove obuspa localcontroller
-		restart=1
-	fi
-	return "${restart}"
-}
-
-function _update_obuspa_config_rbac() {
-	local agent users restart
-
-	agent="$(_get_agent_id)"
-	users="$(_get_sulu_users)"
-	restart=0
-
-	for f in ${users}; do
-		local sec
-
-		# Add mqtt
-		sec="mqtt_sulu_${f}"
-		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
-			uci_add obuspa mqtt ${sec}
-			uci_set obuspa ${sec} BrokerAddress "127.0.0.1"
-			uci_set obuspa ${sec} BrokerPort "1883"
-			uci_set obuspa ${sec} TransportProtocol "TCP/IP"
-			restart=1
-		fi
-
-		# Add mtp
-		sec="mtp_sulu_${f}"
-		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
-			uci_add obuspa mtp ${sec}
-			uci_set obuspa ${sec} Protocol "MQTT"
-			uci_set obuspa ${sec} ResponseTopicConfigured "/usp/${agent}/${f}/endpoint"
-			uci_set obuspa ${sec} mqtt "mqtt_sulu_$f"
-			restart=1
-		fi
-
-		# Add controller
-		sec="controller_sulu_${f}"
-		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
-			uci_add obuspa controller ${sec}
-			uci_set obuspa ${sec} EndpointID "self::sulu-${f}"
-			uci_set obuspa ${sec} Protocol "MQTT"
-			uci_set obuspa ${sec} Topic "/usp/${agent}/${f}/controller"
-			uci_set obuspa ${sec} mqtt "mqtt_sulu_$f"
-			uci_set obuspa ${sec} assigned_role_name "$f"
-			restart=1
-		fi
-	done
-	if [ -f "/etc/sulu/roles.json" ]; then
-		uci_set obuspa global role_file "/etc/sulu/roles.json"
-	fi
-	return "${restart}"
-}
-
-function _remove_sulu_sec()
-{
-	local sec
-
-	if [[ "${1}" == *"_sulu_"* ]]; then
-		uci_remove obuspa ${1}
-		return 1
-	fi
-	return 0
-}
-
-function _remove_obuspa_config_rbac()
-{
-	local restart
-
-	restart=0
-	config_foreach _remove_sulu_sec mqtt
-	restart="$(( restart + $? ))"
-	config_foreach _remove_sulu_sec mtp
-	restart="$(( restart + $? ))"
-	config_foreach _remove_sulu_sec controller
-	restart="$(( restart + $? ))"
-	uci_set obuspa global role_file ""
-
-	return "${restart}"
-}
-
-function _create_acl() {
-        local agentid rbac users
-
-	rbac="${1:-0}"
-
-        [ -f "${ACL_FILE}" ] && rm -f "${ACL_FILE}"
-
-	if [ "${rbac}" -eq "0" ]; then
-		return 0;
-	fi
-
-        agentid="$(_get_agent_id)"
-	users="$(_get_sulu_users)"
-        for f in ${users}; do
-                echo "user ${f}" >> ${ACL_FILE}
-                echo "topic read  /usp/${agentid}/${f}/controller/reply-to/#" >> ${ACL_FILE}
-                echo "topic write /usp/${agentid}/${f}/endpoint/#" >> ${ACL_FILE}
-                echo "topic read  /usp/${agentid}/${f}/controller/#" >> ${ACL_FILE}
-                echo "" >> ${ACL_FILE}
-        done
-}
-
-function update_mosquitto_broker_config()
-{
-	local system_cred rbac restart ws_port
-
-	MB_SULU_CONF="/etc/mosquitto/conf.d/sulu.conf"
-	system_cred="${1}"
-	rbac="${2}"
-	restart=0
-	ws_port="$(_get_sulu_ws_port)"
-
-	if [ "${system_cred}" -eq "1" ]; then
-		if grep -q "password_file " ${MB_SULU_CONF}; then
-			sed -i '/password_file /d' ${MB_SULU_CONF}
-			restart=1
-		fi
-		if ! grep -q "plugin .*mosquitto_auth_shadow.so" ${MB_SULU_CONF}; then
-			echo "plugin /usr/lib/mosquitto_auth_shadow.so" >> ${MB_SULU_CONF}
-			restart=1
-		fi
-	else
-		if grep -q 'plugin .*mosquitto_auth_shadow.so' ${MB_SULU_CONF}; then
-			sed -i '/plugin .*mosquitto_auth_shadow.so/d' ${MB_SULU_CONF}
-			restart=1
-		fi
-		if ! grep -q "password_file /etc/mosquitto/sulu.password" ${MB_SULU_CONF}; then
-			echo "password_file /etc/mosquitto/sulu.password" >> ${MB_SULU_CONF}
-			restart=1
-		fi
-	fi
-
-	if [ "${rbac}" -eq "1" ]; then
-		_create_acl "${rbac}"
-		if ! grep -q "acl_file ${ACL_FILE}" ${MB_SULU_CONF}; then
-			echo "acl_file ${ACL_FILE}" >> ${MB_SULU_CONF}
-			restart=1
-		fi
-	else
-		if grep -q "acl_file ${ACL_FILE}" ${MB_SULU_CONF}; then
-			sed -i '/acl_file /d' ${MB_SULU_CONF}
-			restart=1
-		fi
-	fi
-
-	if ! grep -q "listener ${ws_port}" ${MB_SULU_CONF}; then
-		sed -i "s/listener [0-9]\+/listener ${ws_port}/" ${MB_SULU_CONF}
-		restart=1
-	fi
-
-	if [ "${_RESTART_SERVICES}" -eq "1" -a "${restart}" -eq "1" ]; then
-		slog "Restarting mqtt broker..."
-		/etc/init.d/mosquitto restart &
-	fi
-}
-
-function update_obuspa_config()
-{
-	local rbac restart
-
-	rbac="${1}"
-	restart=0
-
-	uci_load obuspa
-	if [ "${rbac}" -eq "1" ]; then
-		_remove_obuspa_config
-		restart="$(( restart + $? ))"
-		_update_obuspa_config_rbac
-		restart="$(( restart + $? ))"
-	else
-		_remove_obuspa_config_rbac
-		restart="$(( restart + $? ))"
-		_update_obuspa_config
-		restart="$(( restart + $? ))"
-	fi
-	uci_commit obuspa
-
-	if [ "${_RESTART_SERVICES}" -eq "1" -a "${restart}" -gt "0" ]; then
-		slog "Restarting obuspa..."
-		ubus call uci commit '{"config":"obuspa"}'
-	fi
-}
-
-function update_nginx_config()
-{
-	local enabled restart port
-
-	NCONF="/etc/nginx/conf.d/sulu.conf"
-	restart=0
-	enabled="${1:-0}"
-	_RESTART_SERVICES="${2:-0}"
-	port="$(_get_sulu_port)"
-	root="$(_get_sulu_root)"
-
-	if [ "${enabled}" -eq "1" ]; then
-		if [ ! -f "${NCONF}" ]; then
-			cp  /etc/sulu/nginx.conf ${NCONF}
-			restart=1
-		fi
-		if ! grep -q "listen ${port}" ${NCONF}; then
-			sed -i "s/listen [0-9]\+/listen ${port}/" ${NCONF}
-			sed -i "s/listen \[::\]:[0-9]\+/listen [::]:${port}/" ${NCONF}
-			restart=1
-		fi
-		if ! grep -q "root ${root}" ${NCONF}; then
-			sed -i "s/root .*;/root ${root//\//\\/};/" ${NCONF}
-			restart=1
-		fi
-	else
-		if [ -f "${NCONF}" ]; then
-			rm -f ${NCONF}
-			restart=1
-		fi
-	fi
-
-	if [  "${_RESTART_SERVICES}" -eq "1" -a "${restart}" -eq "1" ]; then
-		slog "Restarting nginx..."
-		ubus call uci commit '{"config":"nginx"}'
-	fi
-}
-
-function configure_sulu()
-{
-	local sys_cred rbac restart
-
-	sys_cred="${1}"
-	rbac="${2}"
-	restart="${3:-0}"
-
-	if [ -z "${sys_cred}" -o -z "${rbac}" ]; then
-		slog "Invalid inputs"
-		return 0
-	fi
-
-	_RESTART_SERVICES="${restart}"
-
-	update_mosquitto_broker_config "${sys_cred}" "${rbac}"
-	set_sulu_connection_mode "${rbac}"
-	update_obuspa_config "${rbac}"
-}
--- a/sulu-builder/files/etc/uci-defaults/90-sulu-set-nginx-conf
+++ b/sulu-builder/files/etc/uci-defaults/90-sulu-set-nginx-conf
@@ -0,0 +1,10 @@
+mkdir -p /tmp/sulu
+
+uci -q get nginx._sulu && exit 0
+
+uci -q set nginx._sulu=server
+uci -q add_list nginx._sulu.listen='8080'
+uci -q add_list nginx._sulu.listen='[::]:8080'
+uci -q set nginx._sulu.root='/sulu'
+uci -q set nginx._sulu.server_name='_sulu'
+uci -q add_list nginx._sulu.include='conf.d/sulu.locations'
--- a/sulu-builder/files/etc/uci-defaults/99-fix-sulu-config
+++ b/sulu-builder/files/etc/uci-defaults/99-fix-sulu-config
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-. /etc/sulu/sulu.sh
-
-config_load sulu
-config_get enable_system_credentials global enable_system_credentials 1
-config_get role_based_access global role_based_access 0
-config_get enabled global enabled 0
-
-configure_sulu "${enable_system_credentials}" "${role_based_access}" 0
-generate_sulu_conn_config "${role_based_access}"
--- a/sulu/Makefile
+++ b/sulu/Makefile
@@ -1,15 +1,15 @@
 #
-# Copyright (C) 2021-2022 IOPSYS
+# Copyright (C) 2021 IOPSYS
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu
-PKG_VERSION:=1.3.16
+PKG_VERSION:=1.1.4

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=81d4bb268914dc3822293e93519ae6adbd6ddbea
+PKG_SOURCE_VERSION:=ca38b2086cee7ba83b41eec56539e9432271a349

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -26,8 +26,9 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sulu
 	SECTION:=sulu
 	CATEGORY:=Utilities
+	MENU=1
 	TITLE:=SULU-CE ReactJS based Web UI Package
-	DEPENDS:=+nginx +mosquitto-auth-shadow +usermngr +jq
+	DEPENDS:=+nginx +mosquitto-auth-shadow
 endef

 define Package/sulu/description
@@ -35,34 +36,13 @@ define Package/sulu/description
 endef

 define Package/sulu/install
-	$(INSTALL_DIR) $(1)/sulu/config/widgets
-	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
-	$(CP) $(PKG_BUILD_DIR)/config/*.json $(1)/sulu/config
-	$(CP) $(PKG_BUILD_DIR)/config/widgets/diagnostics.json $(1)/sulu/config/widgets/
-	$(CP) $(PKG_BUILD_DIR)/config/widgets/wan.json $(1)/sulu/config/widgets/
-ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy)
-	$(CP) $(PKG_BUILD_DIR)/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)/sulu
+	$(INSTALL_DIR) $(1)/sulu/config
+	$(INSTALL_DIR) $(1)/etc/nginx/
 	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
-	$(INSTALL_DATA) ./files/etc/mosquitto/conf.d/obuspa.conf $(1)/etc/mosquitto/conf.d/
-	$(INSTALL_DATA) ./files/etc/mosquitto/conf.d/sulu.conf $(1)/etc/mosquitto/conf.d/
-	$(INSTALL_DATA) ./files/etc/mosquitto/sulu.password $(1)/etc/mosquitto/sulu.password
-
-	$(INSTALL_DIR) $(1)/etc/nginx/conf.d
-	$(INSTALL_DATA) ./files/etc/nginx/conf.d/sulu.conf $(1)/etc/nginx/conf.d/
-
-	$(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_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/uci-defaults/99-fix-sulu-config $(1)/etc/uci-defaults/
+	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
+	$(CP) $(PKG_BUILD_DIR)/config/* $(1)/sulu/config
+	$(CP) ./files/* $(1)/
 endef

 $(eval $(call BuildPackage,sulu))
--- a/sulu/files/etc/config/sulu
+++ b/sulu/files/etc/config/sulu
@@ -1,9 +0,0 @@
-config global 'global'
-	option root '/sulu'
-	option port '8080'
-	option ws_port '9001'
-	option enabled '1'
-	option enable_system_credentials '1'
-	option role_based_access '1'
-	list user 'admin'
-	list user 'user'
--- a/sulu/files/etc/init.d/sulu
+++ b/sulu/files/etc/init.d/sulu
@@ -1,42 +1,19 @@
 #!/bin/sh /etc/rc.common

-USE_PROCD=1
-
 START=99
-STOP=01
+STOP=10

-. /lib/functions.sh
-. /etc/sulu/sulu.sh
+USE_PROCD=1

 log() {
 	echo "${@}"|logger -t sulu.init -p debug
 }

-validate_sulu_global_section()
-{
-	uci_validate_section sulu global global \
-		'enabled:bool:1' \
-		'enable_system_credentials:bool:1' \
-		'role_based_access:bool:0'
-}
-
 start_service() {
-	local enabled enable_system_credentials role_based_access
-
-	config_load sulu
 	procd_open_instance sulu
-
-	validate_sulu_global_section || return 0;
 	# append sulu connection injection
-	if [ "${enabled}" -eq "0" ]; then
-		procd_close_instance
-		return 0
-	fi
-
-	configure_sulu "${enable_system_credentials}" "${role_based_access}" 1
-	update_nginx_config "${enabled}" 1
-	update_sulu_connection_port
 	procd_close_instance
+
 }

 reload_service() {
@@ -46,5 +23,5 @@ reload_service() {

 service_triggers()
 {
-	procd_add_reload_trigger "sulu"
+	procd_add_config_trigger "config.change" "obuspa" /etc/init.d/sulu reload
 }
--- a/sulu/files/etc/mosquitto/conf.d/sulu.conf
+++ b/sulu/files/etc/mosquitto/conf.d/sulu.conf
@@ -1,4 +1,5 @@
 listener 9001
 protocol websockets
+plugin /usr/lib/mosquitto_auth_shadow.so
 require_certificate false
 allow_anonymous false
--- a/sulu/files/etc/mosquitto/sulu.password
+++ b/sulu/files/etc/mosquitto/sulu.password
@@ -1 +0,0 @@
-admin:$6$OmM9kU/lYct3KJ9j$iP0WK4ezEtRm8+EAggNp7WbJFoWO0p7IUdI0v/hr1WcVHyfFAC30Pb8Csn7GqwwqI2dcmnDOAITnimo2VNe6ug==
--- a/sulu/files/etc/nginx/conf.d/sulu.conf
+++ b/sulu/files/etc/nginx/conf.d/sulu.conf
@@ -1,27 +0,0 @@
-server {
-        listen 8080;
-        listen [::]:8080;
-        server_name _sulu;
-        root /sulu;
-        location / {
-                autoindex on;
-                expires -1;
-
-                if ($request_method = 'OPTIONS') {
-                        add_header 'Access-Control-Allow-Origin' '*';
-                        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-                        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,Content-Type,Range';
-                        add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
-                        add_header 'Content-Type' 'text/plain; charset=utf-8';
-                        add_header 'Content-Length' 0;
-                        return 204;
-                }
-                if ($request_method = 'GET') {
-                        add_header 'Access-Control-Allow-Origin' '*' always;
-                        add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-                        add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,Content-Type,Range' always;
-                        add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-                        add_header Cache-Control 'no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0';
-                }
-        }
-}
--- a/Show More
+++ b/Show More
				`@@ -1 +0,0 @@`
				`admin:$6$OmM9kU/lYct3KJ9j$iP0WK4ezEtRm8+EAggNp7WbJFoWO0p7IUdI0v/hr1WcVHyfFAC30Pb8Csn7GqwwqI2dcmnDOAITnimo2VNe6ug==`