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

2025-12-24 11:05:02 +08:00 · 2022-09-22 15:19:21 +02:00
170 changed files with 820 additions and 9413 deletions
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

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

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=670a435f1b3848ce57f9793c7158c05450a77f64
+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,19 +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
-ifeq ($(CONFIG_PACKAGE_mosquitto-ssl),y)
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-mosquitto-config $(1)/etc/uci-defaults/
-endif
 endef

 define Package/libbbfdm/default/prerm
@@ -170,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)
@@ -199,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,117 +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": "unsignedInt",
-				"read": true,
-				"write": true,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"range": [
-					{
-						"max": 65535
-					}
-				],
-				"mapping": [
-					{
-						"type": "uci", 
-						"uci": {
-							"file": "userinterface", 
-							"section": {
-								"name": "remote_access"
-							}, 
-							"option": {
-								"name": "port"
-							}
-						}
-					}
-				]
-			},
-			"SupportedProtocols": {
-				"type": "string",
-				"read": true,
-				"write": false,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"list": {
-					"datatype": "string",
-					"enumerations": [
-						"HTTP",
-						"HTTPS"
-					]
-				},
-				"default": "HTTP"
-			},
-			"Protocol": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci", 
-						"uci": {
-							"file": "userinterface", 
-							"section": {
-								"name": "remote_access"
-							}, 
-							"option": {
-								"name": "protocol"
-							}
-						}
-					}
-				]
-			}
-		}
-	}
-}
--- 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 -nL ${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 -nL ${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/01-mosquitto-config
+++ b/bbf/files/etc/uci-defaults/01-mosquitto-config
@@ -1,46 +0,0 @@
-#!/bin/sh
-
-config_mosquitto_owrt() {
-	sec=$(uci -q get mosquitto.owrt)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q add mosquitto owrt)
-		uci -q rename mosquitto."${sec}"="owrt"
-	fi
-
-	uci -q set mosquitto.owrt.use_uci="1"
-	uci -q set mosquitto.owrt.write_pid="1"
-	uci -q commit mosquitto
-}
-
-config_mosquitto_general() {
-	sec=$(uci -q get mosquitto.mosquitto)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q add mosquitto mosquitto)
-		uci -q rename mosquitto."${sec}"="mosquitto"
-	fi
-
-	uci -q set mosquitto.mosquitto.log_dest="syslog"
-	uci -q set mosquitto.mosquitto.log_facility="5"
-	uci -q set mosquitto.mosquitto.log_timestamp="1"
-	uci -q set mosquitto.mosquitto.log_types="error warning notice"
-	uci -q set mosquitto.mosquitto.per_listener_settings="1"
-	uci -q commit mosquitto
-}
-
-config_mosquitto_persistence() {
-	sec=$(uci -q get mosquitto.persistence)
-	if [ -z "${sec}" ]; then
-		sec=$(uci -q add mosquitto persistence)
-		uci -q rename mosquitto."${sec}"="persistence"
-	fi
-
-	uci -q set mosquitto.persistence.persistence="0"
-	uci -q set mosquitto.persistence.location="/var/run"
-	uci -q commit mosquitto
-}
-
-if [ -f "/etc/config/mosquitto" ]; then 
-	config_mosquitto_owrt
-	config_mosquitto_general
-	config_mosquitto_persistence
-fi
--- 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
@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.6
+PKG_VERSION:=3.5.5

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

--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.1.2

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -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)
@@ -68,10 +68,6 @@ define Build/Compile
 endef

 define Package/dslmngr/install
-	$(CP) ./files/common/* $(1)/
-ifeq ($(CONFIG_TARGET_brcmbca),y)
-	$(CP) ./files/broadcom/* $(1)/
-endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
 endef
--- a/dslmngr/files/broadcom/lib/dsl/broadcom.sh
+++ b/dslmngr/files/broadcom/lib/dsl/broadcom.sh
@@ -1,311 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-# ATM #
-check_pvc() {
-	local vpi=$1
-	local vci=$2
-	local ret
-
-	ret=$(xtmctl operate conn --show | awk -v test="$vpi/$vci" '{if ($3==test ) print $5 }')
-
-	case $ret in
-		''|*[!0-9]*) return 0 ;;
-		*) return $ret ;;
-	esac
-}
-
-check_xtm_list() {
-	local qclass=$1
-	local pcr scr mbs
-	local ret
-
-	case $# in
-		1)
-			pcr=0
-			scr=0
-			mbs=0
-		;;
-		2)
-			pcr=$2
-			scr=0
-			mbs=0
-		;;
-		4)
-			pcr=$2
-			scr=$3
-			mbs=$4
-		;;
-	esac
-
-	ret=$(xtmctl operate tdte --show | awk -v test="$qclass" -v pcr="$pcr" -v scr="$scr" -v mbs="$mbs" '{if ($2==test && $3==pcr && $4==scr && $5==mbs ) print $1 }')
-
-	case $ret in
-		''|*[!0-9]*) return 0 ;;
-		*) return $ret ;;
-	esac
-}
-
-configure_atm_device() {
-	local name vpi vci device link_type encapsulation qos_class pcr mbs scr i
-
-	config_get name $1 name "ATM"
-	config_get vpi $1 vpi "8"
-	config_get vci $1 vci "35"
-	config_get device $1 device "atm0"
-	config_get link_type $1 link_type "eoa"
-	config_get encapsulation $1 encapsulation "llc"
-	config_get qos_class $1 qos_class "ubr"
-	config_get pcr $1 pcr
-	config_get mbs $1 mbs
-	config_get scr $1 scr
-
-	check_pvc $vpi $vci
-	ret=$?
-
-	if [ "$ret" -eq 0 ]; then
-		check_xtm_list $qos_class $pcr $scr $mbs
-		ret=$?
-
-		if [ "$ret" -eq 0 ]; then
-			case $qos_class in # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
-				ubr)
-					xtmctl operate tdte --add "$qos_class"
-				;;
-				ubr_pcr|ubr+)
-					xtmctl operate tdte --add "$qos_class" $pcr
-				;;
-				cbr)
-					xtmctl operate tdte --add "$qos_class" $pcr
-				;;
-				nrtvbr|vbr-nrt)
-					xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
-				;;
-				rtvbr|vbr-rt)
-					xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
-				;;
-				gfr)
-				;;
-				abr)
-				;;
-			esac
-		fi
-
-		case $link_type in # EoA, IPoA, PPPoA, CIP
-			EoA|eoa)
-				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_eth" || encapsulation="llcsnap_eth"
-			;;
-			PPPoA|pppoa)
-				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_pppoa" || encapsulation="llcencaps_ppp"
-			;;
-			IPoA|ipoa)
-				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_ipoa" || encapsulation="llcsnap_rtip"
-			;;
-			CIP|cip)
-			;;
-		esac
-
-		check_xtm_list $qos_class $pcr $scr $mbs
-		ret="$?"
-
-		xtmctl operate conn --add 1.$vpi.$vci aal5 $encapsulation 0 1 $ret
-		for i in `seq 0 7`; do
-			xtmctl operate conn --addq 1.$vpi.$vci $i wrr 1 dt # queue priority 0-7
-		done
-		xtmctl operate conn --createnetdev 1.$vpi.$vci $device
-		xtmctl operate intf --state 1 enable
-	fi
-}
-
-remove_atm_devices() {
-	local vpi vci rest
-	local vpivci=`xtmctl operate conn --show | grep "ATM\|mode" | awk '{if (NR!=1 && $1!="PTM") {print $3}}'`
-
-	for i in $vpivci
-	do
-		rest=${i#\/}
-		vpi=${rest%%\/*}
-		vci=${rest#*\/}
-		echo "xtmctl operate conn --delete 1.$vpi.$vci"
-		xtmctl operate conn --delete 1.$vpi.$vci
-		echo "xtmctl operate conn --deletenetdev 1.$vpi.$vci"
-		xtmctl operate conn --deletenetdev 1.$vpi.$vci
-	done
-}
-
-create_atm_devices() {
-	echo "Creating ATM Device(s)"
-	config_load dsl
-	config_foreach configure_atm_device atm-device
-}
-# ATM END #
-
-# PTM #
-check_ptm() {
-	local ret
-	local ptmprio=$1
-	local dslat=$2
-
-	if [ "$ptmprio" -eq 2 ]; then
-		ptmprio="high"
-	else
-		ptmprio="low"
-	fi
-
-	ret=$(xtmctl operate conn --show | awk -v dslat="$dslat" -v ptmprio="$ptmprio" '{if ($2 == dslat && $3 == ptmprio ) print $2 }')
-
-	case $ret in
-		''|*[!0-9]*) return 0 ;;
-		*) return $ret ;;
-	esac
-}
-
-configure_ptm_device() {
-	local name device priority portid i
-
-	config_get name $1 name "PTM"
-	config_get device $1 device "ptm0"
-	config_get priority $1 priority 1
-	config_get portid $1 portid 1
-
-	check_ptm $priority $portid
-	ret=$?
-
-	if [ "$ret" -eq 0 ]; then
-		xtmctl operate conn --add $portid.$priority
-
-		for i in `seq 0 7`; do
-			xtmctl operate conn --addq $portid.$priority $i wrr 1 dt -1 -1 3000 # queue priority 0-7
-		done
-		echo "xtmctl operate conn --createnetdev $portid.$priority $device"
-		xtmctl operate conn --createnetdev $portid.$priority $device
-		xtmctl operate intf --state 1 enable
-	fi
-}
-
-remove_ptm_devices() {
-	local delptm
-	local x=0
-
-	IFS=$'\n'
-	for i in `xtmctl operate conn --show | grep "PTM\|mode"`
-	do
-		if [ $x -eq 1 ]; then
-			delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$11}')
-			echo "xtmctl operate conn --delete $delptm"
-			xtmctl operate conn --delete $delptm
-			xtmctl operate conn --deletenetdev $delptm
-		fi
-		x=1
-	done
-	unset IFS
-}
-
-create_ptm_devices() {
-	echo "Creating PTM Device(s)"
-	config_load dsl
-	config_foreach configure_ptm_device ptm-device
-}
-# PTM END #
-
-prioritize_arp()
-{
-      ebtables -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
-      ebtables -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
-}
-
-xtm_remove_devices() {
-	remove_atm_devices
-	remove_ptm_devices
-}
-
-xtm_create_devices() {
-	local tpstc="$(xdslctl info --show | grep TPS-TC)"
-	if echo "$tpstc" | grep -q "ATM Mode"; then
-		create_atm_devices
-	elif echo "$tpstc" | grep -q "PTM Mode"; then
-		create_ptm_devices
-	fi
-}
-
-xdsl_configure() {
-	local VDSL=0
-	local GFAST=0
-	local mod=""
-	local modes=""
-	local profile=""
-
-	config_load dsl
-
-	# Modes
-	config_get mode line mode
-	for mod in $mode; do
-		[ $mod == "gdmt" ] && modes="${modes}d"
-		[ $mod == "glite" ] && modes="${modes}l"
-		[ $mod == "t1413" ] && modes="${modes}t"
-		[ $mod == "adsl2" ] && modes="${modes}2"
-		[ $mod == "adsl2p" ] && modes="${modes}p"
-		[ $mod == "annexl" ] && modes="${modes}e"
-		[ $mod == "annexm" ] && modes="${modes}m"
-		[ $mod == "vdsl2" ] && modes="${modes}v" && VDSL=1
-		[ $mod == "gfast" ] && modes="${modes}f" && GFAST=1
-	done
-
-	# VDSL Profiles
-	config_get profile line profile
-	# Capabilities
-	config_get_bool bitswap line bitswap 1
-	[ $bitswap -eq 1 ] && bitswap="on" || bitswap="off"
-	config_get_bool sra line sra 1
-	[ $sra -eq 1 ] && sra="on" || sra="off"
-#	config_get_bool trellis line trellis 1
-	config_get_bool sesdrop line sesdrop 0
-	[ $sesdrop -eq 1 ] && sesdrop="on" || sesdrop="off"
-	# VDSL2 only
-	config_get_bool us0 line us0 1
-	[ $us0 -eq 1 ] && us0="on" || us0="off"
-#	config_get_bool dynamicd line dynamicd 1
-#	config_get_bool dynamicf line dynamicf 1
-	config_get_bool sos line sos 0
-	[ $sos -eq 1 ] && sos="on" || sos="off"
-
-	config_get_bool phyReXmtUs line phyReXmtUs 0
-	config_get_bool phyReXmtDs line phyReXmtDs 1
-	phyReXmt=$(( $((phyReXmtUs<<1)) + phyReXmtDs))
-
-	if [ $VDSL -eq 1 -o $GFAST -eq 1 ]; then
-		echo "xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0 --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt"
-		xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0 --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt
-		# G.Fast hardware to VDSL hardware, to set the driver bit kPhyCfg2EnableGfastVdslMMTimeOut0.
-		# Enable V43 tone for GFAST.
-		echo "xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400"
-		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400
-	else
-		echo "xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt"
-		xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt
-	fi
-
-	if [ $GFAST -eq 1 ]; then
-		# G.Fast hardware to VDSL hardware, to set the driver bit kPhyCfg2EnableGfastVdslMMTimeOut0.
-		# Enable V43 tone for GFAST.
-		echo "xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400"
-		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400
-	fi
-}
-
-xdsl_stop() {
-	# echo "Stopping DSL"
-	# stop causes IRQ issues
-	# xdslctl stop
-	return 0
-}
-
-xdsl_init() {
-	prioritize_arp
-
-	echo "Starting DSL"
-
-	xtmctl start
-	xtmctl operate intf --state 1 enable
-}
--- a/dslmngr/files/common/etc/config/dsl
+++ b/dslmngr/files/common/etc/config/dsl
@@ -1,53 +0,0 @@
-# OEM specific parameters
-config oem-parameters 'oem'
-#	option country_code "0000"   # 2 bytes hex
-#	option vendor_id "IO"        # 4 bytes string
-#	option vendor_suffix "0000"  # 2 bytes hex
-#	option sw_version "iopsys"   # 16 bytes string
-#	option serial_nr "00000000"  # 32 bytes string
-
-# DSL Modes
-config dsl-line line
-	list mode gdmt
-	list mode glite
-	list mode t1413
-	list mode adsl2
-	list mode adsl2p
-	list mode annexl
-	list mode annexm
-	list mode vdsl2
-	# VDSL2 profiles
-	list profile 8a
-	list profile 8b
-	list profile 8c
-	list profile 8d
-	list profile 12a
-	list profile 12b
-	list profile 17a
-	list profile 30a
-	option bitswap 1
-	option sra 1
-	option us0 1 # VDSL2 only
-	option sesdrop 0
-	option sos 0
-	option phyReXmtUs 0
-	option phyReXmtDs 1
-
-config atm-device atm0
-	option name 'ATM'
-	option vpi '8'
-	option vci '35'
-	option device atm0
-	option link_type 'eoa' # EoA, IPoA, PPPoA, CIP
-	option encapsulation 'llc' # llc, vcmux
-	option qos_class 'ubr' # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
-#	option pcr '512'
-#	option scr '256'
-#	option mbs '1024'
-
-config ptm-device ptm0
-	option name 'PTM'
-	option device 'ptm0'
-	option priority '1'
-	option portid '1'
-
--- a/dslmngr/files/common/etc/hotplug.d/dsl/10-devices
+++ b/dslmngr/files/common/etc/hotplug.d/dsl/10-devices
@@ -1,7 +0,0 @@
-[ "$STATUS" == "up" -o "$STATUS" == "down" ] || exit 0
-
-. /lib/functions.sh
-include /lib/dsl
-
-xtm_remove_devices
-xtm_create_devices
--- a/dslmngr/files/common/etc/hotplug.d/dsl/20-leds
+++ b/dslmngr/files/common/etc/hotplug.d/dsl/20-leds
@@ -1,7 +0,0 @@
-if [ "$STATUS" == "up" ]; then
-	ubus call led.dsl set '{"state":"ok"}'
-elif [ "$STATUS" == "down" ]; then
-	ubus call led.dsl set '{"state":"off"}'
-elif [ "$STATUS" == "training" ]; then
-	ubus call led.dsl set '{"state":"alert"}'
-fi
--- a/dslmngr/files/common/etc/init.d/dsl
+++ b/dslmngr/files/common/etc/init.d/dsl
@@ -1,48 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-. /lib/functions.sh
-include /lib/dsl
-
-START=20
-USE_PROCD=1
-
-DSLMNGR=$(which dslmngr)
-
-start_service() {
-	[ -n "$DSLMNGR" ] && {
-		procd_open_instance
-		procd_set_param command "$DSLMNGR"
-		procd_set_param respawn
-		procd_close_instance
-	}
-
-	xdsl_configure
-	xtm_create_devices
-}
-
-stop_service() {
-	[ -n "$DSLMNGR" ] && service_stop $DSLMNGR
-
-	xtm_remove_devices
-	xdsl_stop
-}
-
-boot() {
-	local HASADSL="$(db -q get hw.board.hasAdsl)"
-	local HASVDSL="$(db -q get hw.board.hasVdsl)"
-	[ "$HASADSL" == "1" -o "$HASVDSL" == "1" ] || return
-
-	xdsl_init
-
-	start
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-        procd_add_reload_trigger dsl
-}
-
--- 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:=7.2.7
+PKG_VERSION:=6.6.0
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3d6d1347668408e77c327ddf81602e70af8b3d98
+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,14 +55,10 @@ 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
-else ifeq ($(CONFIG_TARGET_ipq95xx),y)
-  TARGET_PLATFORM=IPQ95XX
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIPQ95XX
 else
  $(info Unexpected CONFIG_TARGET, use default MAC80211)
  TARGET_PLATFORM=MAC80211
@@ -75,27 +71,13 @@ export TARGET_WIFI_TYPE

 subdirs := \
 	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
-	$(if $(CONFIG_PACKAGE_libwifiutils),libwifi) \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
 	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
 	$(if $(CONFIG_PACKAGE_libqos),libqos)

-ifneq ($(CONFIG_PACKAGE_libwifi),)
-TARGET_CFLAGS +=-DHAS_WIFI
-endif
-
-esl-pkgs := \
-	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
-	$(if $(CONFIG_PACKAGE_libwifiutils),libwifiutils) \
-	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
-	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
-	$(if $(CONFIG_PACKAGE_libqos),libqos)
-
-esl-pkgs-all := \
+EASY_SOC_LIBS := \
 	libeasy \
-	libwifiutils \
 	libwifi \
 	libdsl \
 	libethernet \
@@ -145,15 +127,15 @@ define Build/Compile
 	$(Build/Compile/rebuild)
 	touch $(PKG_BUILD_DIR)/.config_$(CONFIG_TARGET_PROFILE)
 	$(call Build/Compile/Default)
-	$(foreach dir,$(esl-pkgs),$(call Build/Compile/$(dir)))
+	$(foreach dir,$(subdirs),$(call Build/Compile/$(dir)))
 endef

 define Build/InstallDev
-	$(foreach dir,$(esl-pkgs),$(call Build/InstallDev/$(dir),$(1),$(2));)
+	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef

 define Package/easy-soc-libs/install
 	:
 endef

-$(eval $(foreach e,$(esl-pkgs-all),$(call BuildPackage,$(e))))
+$(eval $(foreach e,$(EASY_SOC_LIBS),$(call BuildPackage,$(e))))
--- 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
@@ -1,49 +1,29 @@

-define Package/libwifiutils
-  $(call Package/easy-soc-libs)
-  TITLE:= WiFi utility library (libwifiutils.so)
-  DEPENDS+=+libnl +libnl-route +libeasy
-endef
-
-define Build/InstallDev/libwifiutils
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifidefs.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifiutils.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifiutils*.so* $(1)/usr/lib/
-endef
-
-define Package/libwifiutils/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifiutils*.so* $(1)/usr/lib/
-endef
-
-
 define Package/libwifi
  $(call Package/easy-soc-libs)
  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcmkernel
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_brcm63xx_arm:bcmkernel
 endef

 define Package/libwifi/config
-  if PACKAGE_libwifi
+  if PACKAGE_libdsl
 	  config LIBWIFI_DEBUG
 		depends on PACKAGE_libwifi
 		bool "Enable wifi debugging"
 		default n
+
  endif
 endef

-
 define Build/InstallDev/libwifi
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifiops.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef

 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
 endef
+
--- 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:=fb85081443c19b5062bede49c80b1802c0f05d34
+PKG_SOURCE_VERSION:=0901382048bb7ce01fc1767fef75e54692f56743
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/ethmngr/Makefile
+++ b/ethmngr/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.0.1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
@@ -23,7 +23,7 @@ define Package/ethmngr
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
+  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl
 endef

 define Package/ethmngr/description
@@ -37,24 +37,10 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

-ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx),)
-define Build/Compile
-endef
-endif
-
 define Package/ethmngr/install
-	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_brcmbca),)
-	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_airoha),)
-	$(CP) ./files/airoha/* $(1)/
-else
-	$(CP) ./files/linux/* $(1)/
-endif
-ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx),)
-	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/ethmngr.init $(1)/etc/init.d/ethmngr
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
-endif
 endef

 $(eval $(call BuildPackage,ethmngr))
--- a/ethmngr/files/airoha/lib/ethernet/airoha.sh
+++ b/ethmngr/files/airoha/lib/ethernet/airoha.sh
@@ -1,208 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-unset -f switchmgr
-# alias for switchmgr
-switchmgr() {
-	"/userfs/bin/switchmgr" "$@"
-}
-
-unset -f tc3162_get_lan_port
-# get lan port port by ifname
-# arg1: port ifname, ex: eth0.1
-tc3162_get_lan_port() {
-	[[ -z "$1" ]] && return 255
-
-	local ifname="$1"
-	local if_idx=255
-
-	# only for tc3162 eth switch ports (eth0.x, 0 < x < 7)
-	case "${ifname}" in
-	eth0.*)
-		;;
-	*)
-		logger -t "port-management" \
-		"unsupported - ${ifname} is not tc3162 switch port"
-		return 255
-		;;
-	esac
-
-	let "if_idx=$(echo "${ifname}" | cut -f2 -d'.')"
-	[[ -z "${if_idx}" ]] && return 255
-	[[ ${if_idx} -lt 1 || ${if_idx} -gt 6 ]] && {
-		logger -t "port-management" \
-		"incorrect tc3162 lan port index ${if_idx} picked from ifname ${ifname}"
-		return 255
-	}
-	let "if_idx=${if_idx}-1"
-	return ${if_idx}
-}
-
-
-unset -f tc3162_get_mapped_port
-# get mapped switch port by ifname
-# arg1: port ifname, ex: eth0.1
-tc3162_get_mapped_port() {
-	[[ -z "$1" ]] && return 255
-
-	local ifname="$1"
-	local if_idx=255
-	local prtmap_procfile="/proc/tc3162/eth_portmap"
-	local lan_prt=255
-	local port=255
-	local prtmap_out_line_num=4
-	local prtmap_out_line=""
-	
-	# check "lan port map" marker in portmap output string
-	prtmap_out_line="$(sed -n "${prtmap_out_line_num}p" ${prtmap_procfile})"
-	[[ ${prtmap_out_line} != "lan_port_map" ]] && return 255
-
-	tc3162_get_lan_port "${ifname}"
-	let "if_idx=$?"
-	[[ -z "${if_idx}" || ${if_idx} -eq 255 ]] && return
-
-	# get lan portmapping string "lan_port mapped_port" for ifname by it's index
-	let "prtmap_out_line_num=${prtmap_out_line_num}+1+${if_idx}"
-	prtmap_out_line="$(sed -n "${prtmap_out_line_num}p" ${prtmap_procfile})"
-
-	# get and check lan port index from lan portmapping string
-	lan_prt=$(echo "${prtmap_out_line}" | cut -f 1 -d' ')
-	[[ -z "${lan_prt}" || "${if_idx}" != "${lan_prt}" ]] && return 255
-
-	# get and check mapped port from lan portmapping string
-	let "port=$(echo "${prtmap_out_line}" | cut -f 2 -d' ')"
-	[[ ${port} -lt 0 || ${port} -gt 255 ]] && return 255
-
-	return ${port}
-}
-
-unset -f get_max_port_speed
-# arg1: port ifname, ex: eth0.1
-get_max_port_speed() {
-	[[ -z "$1" ]] && { echo 0; return; }
-
-	local ifname="$1"
-	local port=255
-	local speed=0
-
-	[[ -d "/sys/class/net/${ifname}" ]] || {
-		logger -t "port-management" "interface ${ifname} is not found"
-		return
-	}
-
-	tc3162_get_lan_port "${ifname}"
-	let "port=$?"
-	[[ -z "${port}" || ${port} -eq 255 ]] && return
-
-	# tc3162 capability for all ports is 1Gbps
-	speed=1000
-
-	echo $speed
-}
-
-unset -f power_updown
-# arg1: port ifname, ex: eth0.1
-# arg2: port enabled, ex: 0/1/off/on/..
-power_updown() {
-	[[ -z "$1" ]] && return
-	[[ -z "$2" ]] && return
-
-	local ifname="$1"
-	local enabled="$2"
-	local port=255
-
-	[[ -d "/sys/class/net/${ifname}" ]] || {
-		logger -t "port-management" "interface ${ifname} is not found"
-		return
-	}
-
-	let "enabled=$(get_bool "${enabled}" "-1")"
-	[[ ${enabled} -eq -1 ]] && return
-
-	tc3162_get_lan_port "${ifname}"
-	let "port=$?"
-	[[ -z "${port}" || ${port} -eq 255 ]] && return
-
-	switchmgr phy admin "${port}" "${enabled}"
-}
-
-unset -f set_port_settings
-# arg1: port ifname, ex: eth0.1
-# arg2: port enabled, ex: 0/1/off/on/..
-# arg3: port speed, ex: 1000
-# arg4: port duplex, ex: full
-# arg5: port autoneg, ex: 0/1/off/on/..
-# arg6: port eee, ex: 0/1/off/on/..
-# arg7: port pause, ex: 0/1/off/on/..
-set_port_settings() {
-	[[ -z "$1" ]] && return
-	[[ -z "$2" ]] && return
-	[[ -z "$3" ]] && return
-	[[ -z "$4" ]] && return
-	[[ -z "$5" ]] && return
-	[[ -z "$6" ]] && return
-	[[ -z "$7" ]] && return
-
-	local ifname="$1"
-	local enabled="$2"
-	local speed="$3"
-	local duplex="$4"
-	local autoneg=$5
-	local eee="$6"
-	local pause="$7"
-	local port=255
-	local speedmode=1
-	local last_speed=0
-
-	[[ -d "/sys/class/net/${ifname}" ]] || {
-		logger -t "port-management" "interface ${ifname} is not found"
-		return
-	}
-	
-	let "enabled=$(get_bool "${enabled}" "-1")"
-	[[ ${enabled} -eq -1 ]] && return
-
-	let "autoneg=$(get_bool "${autoneg}" "-1")"
-	[[ ${autoneg} -eq -1 ]] && return
-
-	let "eee=$(get_bool "${eee}" "-1")"
-	[[ ${eee} -eq -1 ]] && return
-	
-	let "pause=$(get_bool "${pause}" "-1")"
-	[[ ${pause} -eq -1 ]] && return
-	
-	duplex="$(echo "${duplex}" | awk '{print tolower($0)}')"
-	[[ "${duplex}" != "half" && "${duplex}" != "full" ]] && return
-
-	tc3162_get_lan_port "${ifname}"
-	let "port=$?"
-	[[ -z "${port}" || ${port} -eq 255 ]] && return
-	
-	last_speed="$(switchmgr phy maxspeed "${port}" | cut -f2 -d':')"
-	[[ -z "${last_speed}" || "${last_speed}" == "*Down*" ]] \
-		&& last_speed=${speed}
-	
-	switchmgr phy pause "${port}" "${pause}"
-
-	# set speedmode: speed+duplex+autoneg
-# FIXME: switchmgr has no separate setting for 1Gbps speed - use autoneg instead
-	if [[ ${autoneg} -eq 1 || ${speed} -gt 100 ]]; then
-		switchmgr phy speedmode ${port} "1"
-	else
-		[[ ${speed} -gt 10 ]] && let "speedmode=2" || let "speedmode=4"
-		[[ "${duplex}" == "half" ]] && let "speedmode=${speedmode}+1"
-		switchmgr phy speedmode "${port}" "${speedmode}"
-	fi
-	
-# TODO: implement MAC control register manipulations (mapped ports used) for
-	# eee settings change
-	# separate (tx/rx) pause (flow control) settings change
-	# set speed to 1Gbps separately from autoneg mode
-	
-# FIXME: workaround for duplex/pause settings being not applied if speed is unchanged
-	[[ ${last_speed} -eq ${speed} ]] && power_updown "${ifname}" 0
-
-	power_updown "${ifname}" ${enabled}
-
-}
--- a/ethmngr/files/broadcom/lib/ethernet/broadcom.sh
+++ b/ethmngr/files/broadcom/lib/ethernet/broadcom.sh
@@ -1,140 +0,0 @@
-# arg1: port ifname, ex: eth0
-get_max_port_speed() {
-	if [ -z "$1" ]; then
-		echo 0
-		return
-	fi
-
-	local ifname="$1"
-	local phycap="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Capabilities' | awk '{print$NF}' | cut -d'|' -f1)"
-	local speed=1000
-
-	case "$phycap" in
-		10GFD) speed=10000 ;;
-		5GFD) speed=5000 ;;
-		2.5GFD) speed=2500 ;;
-		1GFD|1GHD) speed=1000 ;;
-		100MFD|100MHD) speed=100 ;;
-		10MFD|10MHD) speed=10 ;;
-	esac
-
-	echo $speed
-}
-
-# arg1: port name, ex: eth0
-get_port_number() {
-	[ -z "$1" ] && return
-	local ports="0 1 2 3 4 5 6 7"
-	local units="0 1"
-	local port="$1"
-	local ifname
-
-	for unit in $units; do
-		for prt in $ports; do
-			ifname="$(ethswctl getifname $unit $prt 2>/dev/null | awk '{print$NF}')"
-			if [ "$ifname" == "$port" ]; then
-				echo "$unit $prt"
-				return
-			fi
-		done
-	done
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-power_updown() {
-	local ifname="$1"
-	local enabled=$2
-
-	local updown="up"
-	[ $enabled -eq 0 ] && updown="down"
-	ethctl $ifname phy-power $updown >/dev/null
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-# arg3: port speed, ex: 1000
-# arg4: port duplex, ex: full
-# arg5: port autoneg, ex: on
-# arg6: port eee, ex: 0
-# arg7: port pause, ex: 0
-set_port_settings() {
-	local ifname="$1"
-	local enabled=$2
-	local speed="$3"
-	local duplex=$4
-	local autoneg=$5
-	local eee=$6
-	local pause=$7
-
-	[ -d /sys/class/net/$ifname ] || return
-
-	local unitport="$(get_port_number $ifname)"
-	local unit=$(echo $unitport | cut -d ' ' -f 1)
-	local port=$(echo $unitport | cut -d ' ' -f 2)
-
-	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
-	[ "$duplex" == "half" ] && duplex=0 || duplex=1
-	[ "$duplex" == 0 ] && dplx="HD" || dplx="FD"
-	[ "$autoneg" == "on" ] && media_type="auto" || media_type="$speed$dplx"
-
-	phycrossbar="$(ethctl $ifname phy-crossbar | head -1)"
-	crossbartype="$(echo $phycrossbar | awk '{print$2$3}')"
-	# Take only the last PHY Endpoint (non-Serdes) into account as Serdes port number precedes
-	[ "$crossbartype" == "oncrossbar" ] && pyhendpoint="$(echo $phycrossbar | awk '{print$NF}')"
-
-	phycaps="$(ethctl $ifname media-type ${pyhendpoint:+ port $pyhendpoint} | awk -F'PHY Capabilities: ' '{print$2}')"
-	numofcaps="$(echo $phycaps | tr '|' ' ' | wc -w)"
-
-	if [ "$numofcaps" == "1" ]; then
-		logger -t "port-management" "$ifname is capable of $phycaps only; not setting speed/duplex"
-	else
-		logger -t "port-management" "$ifname is capable of $phycaps; setting speed/duplex to $media_type"
-		ethctl $ifname media-type $media_type ${pyhendpoint:+ port $pyhendpoint} &>/dev/null
-	fi
-
-	[ $eee -eq 1 ] && eee="on" || eee="off"
-	ethtool --set-eee $ifname eee $eee 2>/dev/null
-
-	case $pause in
-		off|0)
-			pause=0x0
-			auto=off
-			rx=off
-			tx=off
-		;;
-		on|1)
-			pause=0x2
-			auto=off
-			rx=on
-			tx=on
-		;;
-		auto)
-			pause=0x1
-			auto=on
-			rx=on
-			tx=on
-		;;
-		tx)
-			pause=0x3
-			auto=off
-			rx=off
-			tx=on
-		;;
-		rx)
-			pause=0x4
-			auto=off
-			rx=on
-			tx=off
-		;;
-	esac
-	if [ "$auto" == "on" ]; then
-		# Use ethswctl utility to set pause autoneg
-		# as ethtool is not setting it properly
-		ethswctl -c pause -n $unit -p $port -v $pause 2>&1 >/dev/null
-	else
-		ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
-	fi
-
-	power_updown $ifname $enabled
-}
--- a/ethmngr/files/ethmngr.init
+++ b/ethmngr/files/ethmngr.init
@@ -0,0 +1,19 @@
+#!/bin/sh /etc/rc.common
+
+START=95
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/ethmngr
+
+start_service() {
+	procd_open_instance
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
+}
+
+reload_service() {
+        stop
+        start
+}
--- a/ethmngr/files/linux/lib/ethernet/linux.sh
+++ b/ethmngr/files/linux/lib/ethernet/linux.sh
@@ -1,95 +0,0 @@
-# arg1: port ifname, ex: eth0
-get_max_port_speed() {
-	if [ -z "$1" ]; then
-		echo 0
-		return
-	fi
-
-	local ifname="$1"
-	local phycap="$(ethtool $ifname | grep -A 10 "Supported link modes" | grep 000 | tail -n 1 | awk '{print$NF}')"
-	local speed=1000
-
-	case "$phycap" in
-		10000*) speed=10000 ;;
-		5000*) speed=5000 ;;
-		2500*) speed=2500 ;;
-		1000*) speed=1000 ;;
-		100*) speed=100 ;;
-		10*) speed=10 ;;
-	esac
-
-	echo $speed
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-power_updown() {
-	local ifname="$1"
-	local enabled=$2
-
-	local updown="up"
-	[ $enabled -eq 0 ] && updown="down"
-	ip link set dev $ifname $updown
-}
-
-# arg1: port ifname, ex: eth0
-# arg2: port enabled, ex: 1
-# arg3: port speed, ex: 1000
-# arg4: port duplex, ex: full
-# arg5: port autoneg, ex: on
-# arg6: port eee, ex: 0
-# arg7: port pause, ex: 0
-set_port_settings() {
-	local ifname="$1"
-	local enabled=$2
-	local speed="$3"
-	local duplex=$4
-	local autoneg=$5
-	local eee=$6
-	local pause=$7
-
-	[ -d /sys/class/net/$ifname ] || return
-
-	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
-	ethtool --change $ifname speed $speed duplex $duplex autoneg $autoneg
-
-	[ $eee -eq 1 ] && eee="on" || eee="off"
-	ethtool --set-eee $ifname eee $eee 2>/dev/null
-
-	case $pause in
-		off|0)
-			pause=0x0
-			auto=off
-			rx=off
-			tx=off
-		;;
-		on|1)
-			pause=0x2
-			auto=off
-			rx=on
-			tx=on
-		;;
-		auto)
-			pause=0x1
-			auto=on
-			rx=on
-			tx=on
-		;;
-		tx)
-			pause=0x3
-			auto=off
-			rx=off
-			tx=on
-		;;
-		rx)
-			pause=0x4
-			auto=off
-			rx=on
-			tx=off
-		;;
-	esac
-
-	ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
-
-	power_updown $ifname $enabled
-}
--- 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.7
+PKG_VERSION:=9.0.3

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

 define Package/icwmp-openssl
@@ -83,9 +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_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libcwmpdm.so $(1)/usr/lib/bbfdm/libcwmpdm.so
 	$(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
@@ -95,8 +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) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.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
@@ -205,16 +205,6 @@ enable_dnsmasq_option125() {
 	fi
 }

-set_vendor_id() {
-	local wan="${1}"
-	local proto="$(uci -q get network.$wan.proto)"
-
-	if [ "${proto}" == "dhcp" ]; then
-		uci -q set network.$wan.vendorid="dslforum.org"
-		ubus call uci commit '{"config":"network"}'
-	fi
-}
-
 enable_disable_dhcp_option125() {
 	local wan="${1}"
 	local action="${2}"
@@ -250,7 +240,7 @@ enable_disable_dhcp_option125() {
 				uci -q set network.$wan.reqopts="$newreqopts"
 				network_uci_update=1
 			fi
-.
+
 			if [ ${send125_present} -eq 0 ]; then
 				configure_send_op125 "${sendopts}" "${wan}" "network"
 				network_uci_update=1
@@ -298,6 +288,12 @@ wait_for_resolvfile() {
 copy_cwmp_etc_files_to_varstate() {
 	mkdir -p /var/run/icwmpd

+	if [ -f /etc/icwmpd/cwmp ]; then
+		uci -q -c /etc/icwmpd delete cwmp.acs
+		uci -q -c /etc/icwmpd commit cwmp
+		cp -f /etc/icwmpd/cwmp /var/state/cwmp
+	fi
+
 	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
 		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
 	fi
@@ -316,6 +312,10 @@ copy_cwmp_varstate_files_to_etc() {
 		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
 	fi

+	if [ -f /var/state/cwmp ]; then
+		cp -f /var/state/cwmp /etc/icwmpd/
+	fi
+
 	# move the successful custom notify import marker to persistent storage
 	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
 		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
@@ -392,23 +392,15 @@ validate_defaults() {
 }

 boot() {
-	local enable_cwmp="0"
 	local dhcp_discovery="0"

 	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-	if [ "$enable_cwmp" = "0" ]; then
-		return 0
-	fi
-
 	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get wan_interface cpe default_wan_interface "wan"

+	config_get wan_interface cpe default_wan_interface "wan"
 	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
 		# Set dhcp option 43 if not already configured
 		enable_dhcp_option43 "${wan_interface}"
-		# Set dhcp option 60
-		set_vendor_id "${wan_interface}"
 	fi

 	config_get lan_interface cpe default_lan_interface ""
@@ -427,9 +419,6 @@ boot() {
 		regenerate_ssl_link "${ssl_capath}"
 	fi

-	# Copy backup data so that if it restart latter on, it gets the info
-	copy_cwmp_etc_files_to_varstate
-
 	start
 }

@@ -452,6 +441,9 @@ start_service() {
 		return 1;
 	}

+	# Copy backup data so that if it restart latter on it gets the info
+	copy_cwmp_etc_files_to_varstate
+
 	procd_open_instance icwmp
 	procd_set_param command "$PROG"
 	procd_append_param command -b
@@ -468,11 +460,6 @@ service_stopped()
 	copy_cwmp_varstate_files_to_etc
 }

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

@@ -486,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/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:=7.0.2
+PKG_VERSION:=4.10.7

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=47c04c502edf441fef9f14307be5f07541614049
+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
@@ -44,8 +44,7 @@ validate_ap_section() {
 	uci_validate_section ieee1905 $section "${1}" \
 			'band:or("2", "5", "60", "6")' \
 			'ssid:string' \
-			'encryption:or("psk2", "sae-mixed", "sae",
-				"psk", "psk-mixed", "none", string)' \
+			'encryption:or("psk2", "sae-mixed", "sae", string)' \
 			'key:string' \
 			'uuid:string' \
 			'manufacturer:string' \
@@ -83,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/files/etc/uci-defaults/31-ifname-option-to-list
+++ b/ieee1905/files/etc/uci-defaults/31-ifname-option-to-list
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-config_load ieee1905
-
-ifname_to_list() {
-	local section=$1
-
-	config_get ifname $section ifname	# get list or option as space separated values
-	ifname=${ifname//,/\ }			# convert csv with space separation
-	uci del ieee1905.${section}.ifname	# delete entry
-	for i in ${ifname}; do
-		uci add_list ieee1905.${section}.ifname="$i"	# writeback entry as list
-	done
-}
-
-config_foreach ifname_to_list al-iface
--- 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
@@ -56,8 +43,9 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"

 # EasySoC HAL #
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_qosmngr=y
-CONFIG_PACKAGE_libwifiutils=y
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_peripheral_manager=y
+CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_wifimngr=y

 # Multi-AP #
@@ -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,8 +140,7 @@ CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_ip6tables-zz-legacy=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
@@ -276,22 +265,11 @@ function genconfig {
 	setup_dirs()
 	{
 		git remote -v | grep -q http || {
-			CUSTBRANCH="$(git rev-parse --abbrev-ref HEAD)"
 			if git ls-remote $CUSTREPO -q 2>/dev/null; then
 				if [ ! -d "$CUSTPATH" ]; then
-					echo "Cloning $CUSTBRANCH branch of $CUSTREPO"
-					git clone -b "$CUSTBRANCH" "$CUSTREPO" "$CUSTPATH" 2>/dev/null || {
-						DEFBRANCH="$(git remote show $CUSTREPO | grep 'HEAD branch' | cut -d' ' -f5)"
-						echo "$CUSTBRANCH branch is not found, cloning $DEFBRANCH branch of $CUSTREPO"
-						git clone "$CUSTREPO" "$CUSTPATH"
-					}
+					git clone "$CUSTREPO" "$CUSTPATH"
 				elif [ $IMPORT -eq 1 ]; then
 					cd $CUSTPATH
-					echo "Checking out $CUSTBRANCH branch in $CUSTPATH"
-					git checkout "$CUSTBRANCH" 2>/dev/null || {
-						DEFBRANCH="$(git symbolic-ref refs/remotes/origin/HEAD | cut -d '/' -f4)"
-						echo "Checking out $CUSTBRANCH branch has failed, using $DEFBRANCH branch in $CUSTPATH"
-					}
 					v "git pull"
 					git pull
 					cd - >/dev/null #go back
@@ -351,9 +329,9 @@ function genconfig {
 		    echo "" >> .config
 		fi

-		# Special handling for targets which use TARGET_DEVICES
+		# 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)"
@@ -399,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
@@ -192,6 +181,12 @@ function genconfig_min {

 	git remote -v | grep -qE '(git@|ssh://)' && {
 		DEVELOPER=1
+
+		bcmAllowed=0
+		endptAllowed=0
+
+		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
+		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 	}

 	v() {
@@ -327,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)"
@@ -373,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:=3bb4a6113aa280f03a1353fa15c825d3428fae42
-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"
@@ -33,8 +30,5 @@ config AGENT_EASYMESH_VENDOR_EXT_OUI
 	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.

-config AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST
-	bool "Create STA entry before authorization is completed"
-
 endmenu
 endif
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=4.1.0.4
+PKG_VERSION:=2.10.3.14
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c28feecc7004307952d54c78f4110c5763dbe0ee
+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,12 +73,8 @@ 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

-ifeq ($(CONFIG_AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST),y)
-TARGET_CFLAGS += -DUNAUTHORIZED_STA_IN_ASSOCLIST
-endif

 MAKE_PATH:=src

--- 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' \
@@ -104,11 +150,7 @@ validate_radio_section() {
 			'include_sta_metric:bool:false' \
 			'rcpi_hysteresis_margin:range(0,255)' \
 			'report_util_threshold:range(0,255)' \
-			'encryption:or("sae", "sae+aes", "psk2",
-				"psk2+aes", "sae-mixed", "sae-mixed+aes",
-				"none", "psk-mixed", "psk-mixed+aes",
-				"wpa", "wpa+aes", "wpa2", "wpa2+aes",
-				"psk", "psk+aes")' \
+			'encryption:or("sae", "psk2", "sae-mixed")'

 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of radio section failed"
@@ -191,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"
@@ -200,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:=4.1.1.1
+PKG_VERSION:=2.11.0.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=7688c5fc6efe2c6f9ac82180035d5c16081c14ec
+PKG_SOURCE_VERSION:=a4a626539ede73c1c4eb1ad768331524a8ee9ce8

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -26,7 +26,7 @@ define Package/map-controller
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin
 endef

 define Package/map-controller/description
@@ -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,33 +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)' \
-		'rcpi_threshold_2g:range(0,220)' \
-		'rcpi_threshold_5g:range(0,220)' \
-		'rcpi_threshold_6g:range(0,220)' \
-		'report_rcpi_threshold_2g:range(0,220)' \
-		'report_rcpi_threshold_5g:range(0,220)' \
-		'report_rcpi_threshold_6g:range(0,220)'
-
-	[ "$?" -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"

@@ -68,10 +43,7 @@ validate_ap_section() {
 			'band:or("2", "5", "6")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
-				"psk2+aes", "sae-mixed", "sae-mixed+aes",
-				"none", "psk-mixed", "psk-mixed+aes",
-				"wpa", "wpa+aes", "wpa2", "wpa2+aes",
-				"psk", "psk+aes")' \
+				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
 			'key:string' \
 			'vid:range(1,65535):1' \
 			'type:or("backhaul", "fronthaul", "combined")' \
@@ -121,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)' \
@@ -144,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
@@ -199,7 +170,7 @@ reload_service() {
 		return
 	fi

-	pidof "/usr/sbin/mapcontroller" > /dev/null
+	pidof "mapcontroller" > /dev/null
 	if [[ $? -ne 0 ]] ; then
 		start
 		return
--- 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.15
+PKG_VERSION:=2.5.1.4

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

-	if [ -f "/proc/sys/net/netfilter/nf_conntrack_timestamp" ]; then
-		echo 1 >/proc/sys/net/netfilter/nf_conntrack_timestamp
-	fi
-
 	procd_open_instance
        procd_set_param command "/usr/sbin/topologyd"
 	procd_set_param respawn
--- a/map-topology/files/etc/uci-defaults/992-firewall_host.ucidefaults
+++ b/map-topology/files/etc/uci-defaults/992-firewall_host.ucidefaults
@@ -1,12 +0,0 @@
-#!/bin/sh
-
-if [ -f /etc/firewall.hosts ]; then
-	uci -q get firewall.hosts || {
-		uci -q set firewall.hosts=include
-		uci -q set firewall.hosts.path="/etc/firewall.hosts"
-		uci -q set firewall.hosts.reload=1
-	}
-fi
-
-
-exit 0
--- a/obudpst/Makefile
+++ b/obudpst/Makefile
@@ -6,10 +6,10 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obudpst
-PKG_VERSION:=7.5.1
+PKG_VERSION:=7.2.1
+PKG_SOURCE_VERSION:=9c448095c9773bd7e5cea143af07817ad9f3c6ba
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/BroadbandForum/obudpst.git
-PKG_SOURCE_VERSION:=a8faf1925ea9189467e7f8d3b9d93c67c8b927bd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

--- 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:=7.0.0.3
+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:=82bd0837c950b0c87572fce1ae58addd7b47cc4a
+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

@@ -110,7 +109,6 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/TransferComplete.json $(1)/etc/bbfdm/json/TransferComplete.json
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/50-add-mqtt-usp-test $(1)/etc/uci-defaults/
 endef

 $(eval $(call BuildPackage,obuspa))
--- a/obuspa/files/etc/config/obuspa
+++ b/obuspa/files/etc/config/obuspa
@@ -1,8 +1,8 @@
 config obuspa 'global'
 	option enabled '1'
-	option debug '0'
+	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'
@@ -11,22 +11,54 @@ config obuspa 'global'
 	#option log_dest '/var/log/obuspa'

 # Adds Device.LocalAgent.MTP.
-config mtp 'test_mtp'
+config mtp 'agent_mtp'
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
-	option mqtt 'testmqtt'
+	option mqtt 'localmqtt'

 # Adds Device.MQTT.Client.
-config mqtt 'testmqtt'
+config mqtt 'localmqtt'
 	option BrokerAddress '127.0.0.1'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'

 # Adds Device.LocalAgent.Controller.
-config controller 'testcontroller'
+config controller 'localcontroller'
 	option EndpointID 'proto::interop-usp-controller'
 	option Protocol 'MQTT'
 	option Topic '/usp/controller'
-	option mqtt 'testmqtt'
+	option mqtt 'localmqtt'
 	option assigned_role_name 'full_access'

+# Add Device.LocalAgent.Subscription.
+#config subscription 'sub_event'
+#    option ID 'uci-sub-events'
+#    option NotifType 'Event'
+#    list ReferenceList 'Device.Boot!'
+#    list ReferenceList 'Device.LocalAgent.TransferComplete!'
+#    option Persistent 'true'
+#    option controller 'localcontroller'
+
+#config subscription 'sub_op_comp'
+#   option ID 'uci-sub-op_complete'
+#   option NotifType 'OperationComplete'
+#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Download()'
+#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Activate()'
+#   option Persistent 'true'
+#   option controller 'localcontroller'
+
+#config challenge 'admin'
+#	option Description 'Request to get Administrative access'
+#	option role_name 'full_access'
+#	option Enable '1'
+#	option Value 'YWRtaW4='
+#	option Retries 2
+#	option LockoutPeriod 60
+
+#config challenge 'user'
+#	option Description 'Request to get User access'
+#	option role_name 'user'
+#	option Enable '1'
+#	option Value 'dXNlcg=='
+#	option Retries 3
+#	option LockoutPeriod 30
--- 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' \
@@ -314,7 +288,8 @@ publish_endpoint()
 {
 	local AgentEndpointID serial oui user pass

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

@@ -330,11 +305,11 @@ publish_endpoint()
 	if [ -z "${AgentEndpointID}" ]; then
 		serial=$(get_serial_from_db)
 		oui=$(get_oui_from_db)
-		AgentEndpointID="os::${oui}-${serial//+/%2B}"
+		AgentEndpointID="os::${oui}-${serial}"
 	fi

-	config_get user testmqtt Username
-	config_get pass testmqtt Password
+	config_get user localmqtt Username
+	config_get pass localmqtt Password

 	# publish Agent's EndpointID in mosquito broker for discovery by usp-js
 	# This is a work around till obuspa adds supports for mDNS discovery
@@ -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/files/etc/uci-defaults/50-add-mqtt-usp-test
+++ b/obuspa/files/etc/uci-defaults/50-add-mqtt-usp-test
@@ -1,14 +0,0 @@
-add_usp_test()
-{
-        if ! uci_get mosquitto usptest >/dev/null 2>&1; then
-                uci_add mosquitto listener usptest
-                uci_set mosquitto usptest enabled 1
-                uci_set mosquitto usptest port '9001'
-                uci_set mosquitto usptest protocol 'websockets'
-                uci_set mosquitto usptest require_certificates '0'
-                uci_set mosquitto usptest auth_plugin '/usr/lib/mosquitto_auth_shadow.so'
-        fi
-}
-
-uci_load mosquitto
-add_usp_test
--- 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
-@@ -893,6 +893,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/obuspa/patches/0004-suppress-notification-logs.patch
+++ b/obuspa/patches/0004-suppress-notification-logs.patch
@@ -1,20 +0,0 @@
--- a/src/core/data_model.c
-+++ b/src/core/data_model.c
-@@ -1239,7 +1239,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
-     // Exit if instance already exists - nothing to do
-     if (exists)
-     {
-        USP_ERR_SetMessage("%s: Object (%s) already exists in the data model", __FUNCTION__, path);
-+        // USP_ERR_SetMessage("%s: Object (%s) already exists in the data model", __FUNCTION__, path);
-         return USP_ERR_CREATION_FAILURE;
-     }
- 
-@@ -1324,7 +1324,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
-     // Exit if instance does not exist - nothing to do
-     if (exists == false)
-     {
-        USP_ERR_SetMessage("%s: Object (%s) does not exist in the data model", __FUNCTION__, path);
-+        // USP_ERR_SetMessage("%s: Object (%s) does not exist in the data model", __FUNCTION__, path);
-         return USP_ERR_OBJECT_DOES_NOT_EXIST;
-     }
- 
--- 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,13 +34,11 @@ 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
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(CP) ./files/etc/bbfdm/json/* $(1)/etc/bbfdm/json/
 endef

 $(eval $(call BuildPackage,ponmngr))
--- 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/ponmngr/files/etc/bbfdm/json/xpon.json
+++ b/ponmngr/files/etc/bbfdm/json/xpon.json
--- a/port-management/Makefile
+++ b/port-management/Makefile
@@ -0,0 +1,31 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=port-management
+PKG_VERSION:=1.1.0
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+PKG_LICENSE:=GPL-2.0-only
+include $(INCLUDE_DIR)/package.mk
+
+define Package/port-management
+  CATEGORY:=Utilities
+  TITLE:=Port management tool
+endef
+
+define Package/port-management/description
+	Port configuration utility
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+	$(CP) ./files/* $(PKG_BUILD_DIR)/
+endef
+
+define Build/Compile
+endef
+
+define Package/port-management/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,port-management))
--- a/port-management/files/etc/config/ports
+++ b/port-management/files/etc/config/ports
--- a/port-management/files/etc/init.d/port_management
+++ b/port-management/files/etc/init.d/port_management
@@ -1,15 +1,12 @@
 #!/bin/sh /etc/rc.common

 START=15
-STOP=90
-
 USE_PROCD=1
-PROG=/usr/sbin/ethmngr

 . /lib/functions.sh
-include /lib/ethernet
+include /lib/network

-configure_ethernet_port(){
+configure_ports(){
 	local cfg=$1
 	local ifname enabled speed duplex autoneg eee pause

@@ -27,22 +24,11 @@ configure_ethernet_port(){
 }

 start_service() {
-	if [ -s /etc/config/ports ]; then
-		config_load ports
-		config_foreach configure_ethernet_port ethport
-	fi
+	[ -f /lib/network/port.sh ] || return

-	if [ -f $PROG ]; then
-		procd_open_instance
-		procd_set_param command ${PROG}
-		procd_set_param respawn
-		procd_close_instance
-	fi
-}
-
-reload_service() {
-        stop
-        start
+	config_load ports
+	config_foreach configure_ports ethport
+	config_foreach configure_ports sfpport
 }

 service_triggers() {
--- a/port-management/files/etc/uci-defaults/15-ports-config-generate
+++ b/port-management/files/etc/uci-defaults/15-ports-config-generate
@@ -2,8 +2,7 @@

 populate_config_from_db() {
 	. /lib/functions.sh
-	. /lib/network/utils.sh
-	include /lib/ethernet
+	include /lib/network

 	portorder="$(db -q get hw.board.ethernetPortOrder)"
 	for port in $portorder; do
--- a/qosmngr/Makefile
+++ b/qosmngr/Makefile
@@ -27,7 +27,7 @@ define Package/qosmngr
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=QoS Manager
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos +!(TARGET_brcmbca||TARGET_airoha):tc-full
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
 endef

 define Package/qosmngr/description
@@ -41,14 +41,8 @@ endef
 endif

 define Package/qosmngr/install
-	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_brcmbca),)
-	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_airoha),)
-	$(CP) ./files/airoha/* $(1)/
-else
-	$(CP) ./files/linux/* $(1)/
-endif
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qosmngr $(1)/usr/sbin
 endef
--- a/qosmngr/files/airoha/etc/uci-defaults/60-qos_config_generate
+++ b/qosmngr/files/airoha/etc/uci-defaults/60-qos_config_generate
@@ -1,64 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-ethwan="$(db -q get hw.board.ethernetWanPort)"
-
-populate_no_of_queue(){
-    queue_num=4
-
-    # writing no. of queue per port into file and read on classify generate
-    if [ ! -d "/tmp/qos" ]; then
-	    mkdir -p "/tmp/qos"
-    fi
-    no_queue_file="/tmp/qos/no_queue_per_port"
-    touch "$no_queue_file"
-    echo $queue_num >"$no_queue_file"
-}
-
-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
-}
-
-populate_no_of_queue
-
-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
-
-# generate qos queue config
-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} \
-                            uplink-bandwidth ${shape_rate:-0} \
-                            queuemask $queue_mask
-    else
-        /userfs/bin/qosrule discpline Enable 0
-    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,102 +0,0 @@
-#!/bin/sh
-# Common classifier library
-
-#counter variable to assign classify order value if not added in config
-temp_order=1
-
-# 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 rules
-    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
-}
-
-# Handle classify section
-handle_classify() {
-
-    local corder_file="/tmp/qos/classify.order"
-
-    while read -r line; do
-        line_cid=$(echo $line | cut -d '_' -f 2)
-
-        # add ip rule only for classify rules which has non empty
-        # value forwarding policy option
-        # if forwarding policy option value empty then add iptables/
-        # ip6tables/ebtables/rate_limit rules
-        config_get fwding_policy "$line_cid" "forwarding_policy"
-        if [ -n "$fwding_policy" ]; then
-            handle_ip_rule $line_cid $fwding_policy
-        else
-            handle_ebtables_rules $line_cid
-	    handle_iptables_rules $line_cid
-	    handle_policer_rules $line_cid
-        fi
-    done < "$corder_file"
-}
-
-# 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
-    rm -f /tmp/qos/classify.order
-    rm -f /tmp/qos/tmp_classify.order
-    rm -f /tmp/qos/classify.iprule
-
-    # 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
-    touch /tmp/qos/classify.iprule
-
-    # Add flush chain rules
-    flush_chains
-
-    #flush added ip rule
-    flush_ip_rule
-
-    # Load UCI file
-    config_load qos
-    config_foreach handle_classify_order classify
-    sort_classify_by_order
-    handle_classify
-
-    sh /tmp/qos/classify.ebtables
-    sh /tmp/qos/classify.iptables
-    sh /tmp/qos/classify.ip6tables
-    sh /tmp/qos/classify.iprule
-
-}
--- 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" 1
-
-    # No need to configure disabled policer
-    if [ "$is_enable" == "0" ] ; then
-        return
-    fi
-
-    config_get cir "$p_sec" "committed_rate"
-    config_get cbs "$p_sec" "committed_burst_size" -1
-    config_get ebs "$p_sec" "excess_burst_size" 0
-    config_get pir "$p_sec" "peak_rate" 0
-    config_get pbs "$p_sec" "peak_burst_size" 0
-    config_get meter "$p_sec" "meter_type" 0
-
-    hw_policer_set add "$dir" "$POLICER_COUNT" "$meter" "$cir" "$cbs" "$ebs" "$pir" "$pbs"
-
-    POLICER_COUNT=$((POLICER_COUNT + 1))
-}
-
-# Configure policer based on UCI subtree 'qos.policer'
-configure_policer() {
-    for intf in $(db get hw.board.ethernetPortOrder); do
-        if [ -n "${intf}" ] ; then
-            hw_policer_set_ingress_rate "$intf" 0 0
-        fi
-    done
-
-    # Delete policer
-    local i=0
-    local max_p_inst=0
-    if [ -f "/tmp/qos/max_policer_inst" ]; then
-        max_p_inst=$(cat /tmp/qos/max_policer_inst)
-    fi
-
-    while :
-    do
-        if [ "$i" -eq "$max_p_inst" ]; then
-            break
-        fi
-        hw_policer_set del 1 $i
-        i=$((i + 1))
-    done
-
-    # reset the policer counter
-    echo 0 > /tmp/qos/max_policer_inst
-    # Load UCI file
-    config_load qos
-    config_foreach handle_policer policer
-    echo $POLICER_COUNT > /tmp/qos/max_policer_inst
-}
--- 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" 1
-
-    # no need to configure disabled queues
-    if [ "${is_enable}" == "0" ]; then
-        return
-    fi
-
-    config_get ifname "$qid" "ifname"
-    # if ifname is empty that is good enough to break
-    if [ -z "$ifname" ];then
-        return
-    fi
-
-    config_get sc_alg "$qid" "scheduling"
-    config_get wgt "$qid" "weight" 1
-    config_get rate "$qid" "rate"
-    config_get bs "$qid" "burst_size"
-    config_get qsize "$qid" "queue_size" 1024
-    config_get precedence "$qid" "precedence"
-
-    hw_queue_set "${ifname}" "${Q_COUNT}" "${precedence}" "$qsize" "$wgt" "$sc_alg" "$shapingrate" "$rate" "$bs"
-    Q_COUNT=$((Q_COUNT + 1))
-}
-
-# Configure all queues specified in UCI tree 'qos.queue'
-configure_queue() {
-    # Load UCI file
-    config_load qos
-    config_foreach handle_queue queue
-}
--- 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" 1
-    # no need to configure disabled queues
-    if [ "${is_enable}" == "0" ] ; then
-        return
-    fi
-
-
-    config_get ifname "$sid" "ifname"
-    # if ifname is empty that is good enough to break
-    if [ -z "$ifname" ] ; then
-        return
-    fi
-
-    config_get rate "$sid" "rate"
-    # Convert the rate from bps to kbps.
-    if [ -z "${rate}" ] || [ "${rate}" -lt 1000 ] ; then
-        return
-    fi
-
-    rate=$((rate / 1000))
-    config_get bs "$sid" "burst_size"
-
-    hw_shaper_set "$ifname" add "$rate" "$bs"
-}
-
-# Configure shaper based on options saved to UCI tree 'qos.shaper'
-configure_shaper() {
-    # Delete existing shaper
-    for intf in $(db get hw.board.ethernetPortOrder); do
-        hw_shaper_set "$intf" del
-    done
-
-    # Load UCI file
-    config_load qos
-    # Processing shaper section(s)
-    config_foreach handle_shaper shaper
-}
--- a/qosmngr/files/airoha/lib/qos/qos.sh
+++ b/qosmngr/files/airoha/lib/qos/qos.sh
@@ -1,56 +0,0 @@
-#!/bin/sh
-# The entrypoint for the QoS setup library
-
-. /lib/functions.sh
-include /lib/ethernet
-
-. /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
-. /lib/qos/ip_rule.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/broadcom/etc/uci-defaults/60-qos_config_generate
+++ b/qosmngr/files/broadcom/etc/uci-defaults/60-qos_config_generate
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-ethwan="$(db -q get hw.board.ethernetWanPort)"
-cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"
-
-queue_num=8
-
-populate_no_of_queue(){
-	case $cpu_model in
-		BCM68[3,4,5]*) queue_num=4 ;;
-	esac
-        if grep -qE '[0-9]+ archer$' /proc/devices; then
-                queue_num=4
-        fi
-
-	# writing no. of queue per port into file and read on classify generate
-	if [ ! -d "/tmp/qos" ]; then
-		mkdir -p "/tmp/qos"
-	fi
-	no_queue_file="/tmp/qos/no_queue_per_port"
-	touch "$no_queue_file"
-	echo $queue_num >"$no_queue_file"
-}
-
-generate_queue(){
-	section="$1"
-
-	config_get ifname "$section" "ifname"
-
-	local is_lan=0
-	if [ "$ifname" != "$ethwan" ]; then
-		is_lan=1
-	fi
-
-	local no_of_q="0 1 2 3 4 5 6 7"
-
-	if [ $is_lan -eq 1 ] -a [ $queue_num -eq 4 ]; then
-		no_of_q="0 1 2 3"
-	fi
-
-	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
-}
-
-populate_no_of_queue
-
-if [ -s "/etc/config/qos" ]; then
-	if uci -q get qos.@queue[0] >/dev/null; then
-		exit
-	else
-		rm -f /etc/config/qos
-	fi
-fi
-touch /etc/config/qos
-
-# generate qos queue config
-config_load ports
-config_foreach generate_queue ethport
-
--- a/qosmngr/files/common/etc/uci-defaults/61-qos_classify_generate
+++ b/qosmngr/files/common/etc/uci-defaults/61-qos_classify_generate
@@ -1,120 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-classify_no=0
-generate_dns_rule(){
-	classify_no=$((classify_no + 1))
-	uci add qos classify
-	uci rename qos.@classify[-1]="c${classify_no}"
-	uci set qos.@classify[-1].ifname="lo"
-	uci set qos.@classify[-1].proto="udp"
-	uci set qos.@classify[-1].ethertype="IPv4"
-	uci set qos.@classify[-1].dest_port="53"
-	uci set qos.@classify[-1].traffic_class="$1"
-	uci set qos.@classify[-1].order="$classify_no"
-}
-
-generate_dhcp_rule(){
-	classify_no=$((classify_no + 1))
-	uci add qos classify
-	uci rename qos.@classify[-1]="c${classify_no}"
-	uci set qos.@classify[-1].ifname="lo"
-	uci set qos.@classify[-1].proto="udp"
-	uci set qos.@classify[-1].ethertype="IPv4"
-	uci set qos.@classify[-1].dest_port="67"
-	uci set qos.@classify[-1].dest_port_range="68"
-	uci set qos.@classify[-1].traffic_class="$1"
-	uci set qos.@classify[-1].order="$classify_no"
-}
-
-generate_igmp_rule(){
-	classify_no=$((classify_no + 1))
-	uci add qos classify
-	uci rename qos.@classify[-1]="c${classify_no}"
-	uci set qos.@classify[-1].ifname="lo"
-	uci set qos.@classify[-1].proto="IGMP"
-	uci set qos.@classify[-1].ethertype="IPv4"
-	uci set qos.@classify[-1].traffic_class="$1"
-	uci set qos.@classify[-1].order="$classify_no"
-}
-
-generate_icmp_rule(){
-	classify_no=$((classify_no + 1))
-	uci add qos classify
-	uci rename qos.@classify[-1]="c${classify_no}"
-	uci set qos.@classify[-1].ifname="lo"
-	uci set qos.@classify[-1].proto="icmp"
-	uci set qos.@classify[-1].ethertype="IPv4"
-	uci set qos.@classify[-1].traffic_class="$1"
-	uci set qos.@classify[-1].order="$classify_no"
-
-	classify_no=$((classify_no + 1))
-	uci add qos classify
-	uci rename qos.@classify[-1]="c${classify_no}"
-	uci set qos.@classify[-1].proto="icmp"
-	uci set qos.@classify[-1].ethertype="IPv4"
-	uci set qos.@classify[-1].traffic_class="$2"
-	uci set qos.@classify[-1].order="$classify_no"
-}
-
-generate_classify(){
-
-
-	no_queue_file="/tmp/qos/no_queue_per_port"
-	queue_num=$(cat "$no_queue_file")
-	rm -f "$no_queue_file"
-
-	# assign queue type
-	if [ $queue_num -eq 8 ]; then
-		q_def_queue="0"
-		q_low="1"
-		q_besteffort="2"
-		q_normal="3"
-		q_video="4"
-		q_medium="5"
-		q_high="6"
-		q_highest="7"
-	elif [ $queue_num -eq 4 ]; then
-		q_def_queue="0"
-		q_normal="1"
-		q_medium="2"
-		q_highest="3"
-	fi
-
-	# Local generated DNS traffic goes to q_highest
-	generate_dns_rule $q_highest
-	# Local generated IGMP traffic goes to q_highest
-	generate_igmp_rule $q_highest
-	# Local generated DHCP traffic goes to q_highest
-	generate_dhcp_rule $q_highest
-	# Local generated ICMP traffic goes to q_highest rotue as q_normal
-	generate_icmp_rule $q_highest $q_normal
-
-	# VLAN priority tag -> Queue priority
-	for i in `seq 1 7`; do
-		classify_no=$((classify_no + 1))
-		uci add qos classify
-		uci rename qos.@classify[-1]="c${classify_no}"
-		uci set qos.@classify[-1].pcp_check="$i"
-		uci set qos.@classify[-1].traffic_class="$i"
-		uci set qos.@classify[-1].order="$classify_no"
-	done
-
-	uci commit qos
-}
-
-if [ -s "/etc/config/qos" ]; then
-	# cleaning up for upgrade same version that contain firewall.qos
-	if [ -s "/etc/firewall.qos" ]; then
-		rm -f "/etc/firewall.qos"
-		if [ -s "/etc/config/firewall" ]; then
-			uci delete firewall.qos
-		fi
-                generate_classify
-	elif uci -q get qos.@classify[0] >/dev/null; then
-		exit
-	else
-                generate_classify
-	fi
-fi
--- a/Show More
+++ b/Show More