Add a new package airties-edge

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>

airties-edge/Makefile

@@ -0,0 +1,44 @@
+#
+# 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:=airties-edge
+PKG_VERSION:=1.0.0
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/3rdparty/airties-edge.git
+PKG_SOURCE_VERSION:=2824fbc580f6cfc39b6a5faa4f0e4d168169ed22
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/airties-edge
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=Airties Edge library
+  DEPENDS:=+libubox +libubus +libblobmsg-json +libjson-c
+endef
+
+TARGET_CFLAGS += -DVENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+#TARGET_CFLAGS += -DLIB_VERSION=\\\"$(PKG_VERSION)\\\"
+
+define Package/airties-edge/install
+	#$(INSTALL_DIR) $(1)/airties-edge
+	#$(INSTALL_DIR) $(1)/airties-edge/lib
+	#$(CP) $(PKG_BUILD_DIR)/lib_airties_edge/libairtiesedge.so $(1)/airties-edge/lib
+	$(INSTALL_DIR) $(1)/usr
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libairtiesedge_dm.so $(1)/usr/lib/bbfdm
+endef
+
+$(eval $(call BuildPackage,airties-edge))

bbf/Makefile

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

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

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

bbf/files/etc/config/userinterface

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

bbf/files/etc/firewall.userinterface

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

bbf/files/etc/init.d/userinterface

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

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

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

bulkdata/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.3
+PKG_VERSION:=2.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=85d7486a21a9eb0e0f345b587b3ac506edcb72fe
+PKG_SOURCE_VERSION:=6e85d2032e66df581fae7c72cd83cc89367b8fc8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -25,8 +25,6 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -34,7 +32,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json +zlib
 endef
 
 TARGET_CFLAGS += \
@@ -50,8 +48,8 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.so $(1)/usr/lib/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/init.d/bulkdatad

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

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.2
+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:=ffda80f40b5703f07570a2892522d5dded84b63a
+PKG_SOURCE_VERSION:=cf4e91ffe0a1d83140fef5b41d16e581e5341cec
 PKG_MIRROR_HASH:=skip
 endif
 

dslmngr/Makefile

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

easy-qos/Makefile

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

easy-soc-events/Makefile

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

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.45
+PKG_VERSION:=6.7.7
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b6baf5a2c1213230651912bd9141f1cee02e500a
+PKG_SOURCE_VERSION:=055ffe68d293616f02a430692343b9d051d96f5b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -36,7 +36,7 @@ define Package/easy-soc-libs
   MENU:=1
 endef
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
   TARGET_WIFI_TYPE=BROADCOM
   CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
@@ -55,6 +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)
+  TARGET_PLATFORM=ECONET
+  TARGET_WIFI_TYPE=MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_ECONET
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211

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
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_airoha:ecnt_api
 endef
 
 define Package/libethernet/config

easy-soc-libs/wifi.mk

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

endptmngr/Makefile

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

evoice/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=evoice
-PKG_VERSION:=0.2.5
+PKG_VERSION:=0.2.39
 
 LOCAL_DEV=0
 LOCAL_DEV_EVOICE_DIR=~/voip/evoice
@@ -13,7 +13,7 @@ LOCAL_DEV_EVOICE_DIR=~/voip/evoice
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=9a2f547c7c3c8d67928c1ed7fbca538e59088c2a
+PKG_SOURCE_VERSION:=30d65330de0368f73ecf4a2e804c39a2ee280454
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,7 +21,6 @@ endif
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
-
 # All config variable that are passed to the make invocation, directly or
 # indirectly. This ensures that the package is rebuilt on config-changes.
 #PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
@@ -33,10 +32,10 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl\
-		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
-		+TARGET_iopsys_econet:kmod-voip_driver\
-		+TARGET_iopsys_econet:voip_app
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c +libblobmsg-json\
+		+TARGET_brcmbca:bcmkernel\
+		+TARGET_airoha:kmod-voip_driver\
+		+TARGET_airoha:voip_app +libbbf_api
 endef
 
 define Package/$(PKG_NAME)/description
@@ -57,17 +56,19 @@ endif
 IDIR = $(STAGING_DIR)/usr/include
 TONES_INI_REQUIRED=
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_brcmbca),y)
 	TARGET_PLATFORM=BROADCOM
 	BDIR = bcm963xx/userspace/private/apps/voice
 	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
 		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
 		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
 	TRG=SVrgBcmFxs
-else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
+	JSONFILE=codecs_brcm.json
+else ifeq ($(CONFIG_TARGET_airoha),y)
 	TARGET_PLATFORM=ECONET
 	TONES_INI_REQUIRED=y
 	TRG=SVrgMtekOwrt
+	JSONFILE=codecs_airoha.json
 endif
 
 # disable temporarily some not important warnings, force PIC
@@ -94,6 +95,9 @@ define Package/evoice/install
 	$(CP) ./files/* $(1)/
 	$(if $(TONES_INI_REQUIRED),,$(RM) $(1)/etc/evoice/tones.ini)
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(1)/lib/voice/$(JSONFILE) $(1)/lib/voice/codecs_evoice.json
+	$(RM) $(1)/lib/voice/codecs_brcm.json
+	$(RM) $(1)/lib/voice/codecs_airoha.json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/

evoice/files/etc/config/voice

@@ -22,6 +22,7 @@ config SIPClient 'Client2'
 config SIPNetwork 'Network1'
 	option Enable '1'
 	option ProxyServer 'sip-proxy.iopsys.eu'
+	option AcceptFromProxyOnly '0'
 	option ProxyServerPort '5060'
 	option ProxyServerTransport 'UDP'
 	option RegistrarServer 'sip-proxy.iopsys.eu'
@@ -33,72 +34,45 @@ 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'
 	list CodecList '1CodecProfile5'
 	list CodecList '1CodecProfile4'
 
-config Capabilities 'Capabilities'
-	option FacilityActions 'CW_ACTIVE,CFU_ACTIVE'
-
-config CapabilitiesCodec 'Codec1'
-	option Codec 'G.711ALaw'
-	option BitRate '64000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '1'
-
-config CapabilitiesCodec 'Codec2'
-	option Codec 'G.711MuLaw'
-	option BitRate '64000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '1'
-
-config CapabilitiesCodec 'Codec3'
-	option Codec 'G.726'
-	option BitRate '32000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '0'
-	
-config CapabilitiesCodec 'Codec4'
-	option Codec 'G.722'
-	option BitRate '64000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '0'
-	
-config CapabilitiesCodec 'Codec4'
-	option Codec 'G.729'
-	option BitRate '8000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '0'
-
 config CodecProfile '1CodecProfile1'
 	option Enable '1'
-	option Codec 'Codec1'
+	option Codec 'G.711ALaw'
 	option PacketizationPeriod '20'
 	option SilenceSupression '1'
 
 config CodecProfile '1CodecProfile2'
 	option Enable '1'
-	option Codec 'Codec2'
+	option Codec 'G.711MuLaw'
 	option PacketizationPeriod '20'
 	option SilenceSupression '1'
 
 config CodecProfile '1CodecProfile3'
 	option Enable '1'
-	option Codec 'Codec3'
+	option Codec 'G.726'
 	option PacketizationPeriod '20'
 	option SilenceSupression '0'
 
 config CodecProfile '1CodecProfile4'
 	option Enable '1'
-	option Codec 'Codec4'
+	option Codec 'G.722'
 	option PacketizationPeriod '20'
 	option SilenceSupression '0'
 
 config CodecProfile '1CodecProfile5'
 	option Enable '1'
-	option Codec 'Codec5'
+	option Codec 'G.729'
 	option PacketizationPeriod '20'
 	option SilenceSupression '0'
 
@@ -164,7 +138,7 @@ config IncomingMap 'IncomingMap2'
 	option Line 'Line2'
 
 config IncomingMap 'IncomingMap3'
-	option Enable '1'
+	option Enable '0'
 	option Extension 'Extension2'
 	option Line 'Line1'
 
@@ -237,15 +211,15 @@ config NumberingPlan 'NumberingPlan2'
 	option InterDigitTimerStd '2000'
 	option InterDigitTimerOpen '2000'
 	option TerminationDigit ' '
-	list PrefixList '3PrefixInfo1'
-	list PrefixList '3PrefixInfo2'
-	list PrefixList '3PrefixInfo3'
-	list PrefixList '3PrefixInfo4'
-	list PrefixList '3PrefixInfo5'
-	list PrefixList '3PrefixInfo6'
-	list PrefixList '3PrefixInfo7'
-	list PrefixList '3PrefixInfo8'
-	list PrefixList '3PrefixInfo9'
+	list PrefixList '2PrefixInfo1'
+	list PrefixList '2PrefixInfo2'
+	list PrefixList '2PrefixInfo3'
+	list PrefixList '2PrefixInfo4'
+	list PrefixList '2PrefixInfo5'
+	list PrefixList '2PrefixInfo6'
+	list PrefixList '2PrefixInfo7'
+	list PrefixList '2PrefixInfo8'
+	list PrefixList '2PrefixInfo9'
 
 config NumberingPlan 'NumberingPlan3'
 	option MinimumNumberOfDigits '5'
@@ -253,9 +227,9 @@ config NumberingPlan 'NumberingPlan3'
 	option InterDigitTimerStd '2000'
 	option InterDigitTimerOpen '2000'
 	option TerminationDigit '#'
-	list PrefixList '4PrefixInfo1'
+	list PrefixList '3PrefixInfo1'
 
-config PrefixInfo '3PrefixInfo1'
+config PrefixInfo '2PrefixInfo1'
 	option Enable '1'
 	option PrefixRange '*43#'
 	option PrefixMinNumberOfDigits '4'
@@ -265,7 +239,7 @@ config PrefixInfo '3PrefixInfo1'
 	option FacilityAction 'CW_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo2'
+config PrefixInfo '2PrefixInfo2'
 	option Enable '1'
 	option PrefixRange '#43#'
 	option PrefixMinNumberOfDigits '4'
@@ -275,7 +249,7 @@ config PrefixInfo '3PrefixInfo2'
 	option FacilityAction 'CW_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo3'
+config PrefixInfo '2PrefixInfo3'
 	option Enable '1'
 	option PrefixRange '*21*(X+)#'
 	option PrefixMinNumberOfDigits '9'
@@ -285,7 +259,7 @@ config PrefixInfo '3PrefixInfo3'
 	option FacilityAction 'CFU_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo4'
+config PrefixInfo '2PrefixInfo4'
 	option Enable '1'
 	option PrefixRange '#21#'
 	option PrefixMinNumberOfDigits '4'
@@ -295,7 +269,7 @@ config PrefixInfo '3PrefixInfo4'
 	option FacilityAction 'CFU_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo5'
+config PrefixInfo '2PrefixInfo5'
 	option Enable '1'
 	option PrefixRange '*67*(X+)#'
 	option PrefixMinNumberOfDigits '9'
@@ -305,7 +279,7 @@ config PrefixInfo '3PrefixInfo5'
 	option FacilityAction 'CFB_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo6'
+config PrefixInfo '2PrefixInfo6'
 	option Enable '1'
 	option PrefixRange '#67#'
 	option PrefixMinNumberOfDigits '4'
@@ -315,7 +289,7 @@ config PrefixInfo '3PrefixInfo6'
 	option FacilityAction 'CFB_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo7'
+config PrefixInfo '2PrefixInfo7'
 	option Enable '1'
 	option PrefixRange '*61*(X+(*X+)?)#'
 	option PrefixMinNumberOfDigits '15'
@@ -325,7 +299,7 @@ config PrefixInfo '3PrefixInfo7'
 	option FacilityAction 'CFNR_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo8'
+config PrefixInfo '2PrefixInfo8'
 	option Enable '1'
 	option PrefixRange '#61#'
 	option PrefixMinNumberOfDigits '4'
@@ -335,7 +309,7 @@ config PrefixInfo '3PrefixInfo8'
 	option FacilityAction 'CFNR_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo9'
+config PrefixInfo '2PrefixInfo9'
 	option Enable '1'
 	option PrefixRange '*31*'
 	option PrefixMinNumberOfDigits '4'
@@ -345,7 +319,7 @@ config PrefixInfo '3PrefixInfo9'
 	option FacilityAction 'CA_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '4PrefixInfo1'
+config PrefixInfo '3PrefixInfo1'
 	option Enable '1'
 	option PrefixRange '110|112'
 	option PrefixMinNumberOfDigits '7'

evoice/files/etc/evoice/voicedm

@@ -48,16 +48,23 @@ config account 'map_account'
 # Network stuff associated with an account.
 # All parameters in this table are written to internal configuration
 config network 'map_net'
-   option Enable 'voice.Network@.Enable'
-   option Registration_Server 'voice.Network@.RegistrarServer'
-   option Outbound_Proxy 'voice.Network@.ProxyServer'
-   option SIP_Port 'voice.Network@.RegistrarServerPort'
-   option SIP_Transport 'voice.Network@.RegistrarServerTransport'
-   option RegistrationPeriod 'voice.Network@.RegistrationPeriod'
+   option Enable                'voice.Network@.Enable'
+   option Registration_Server   'voice.Network@.RegistrarServer'
+   option Outbound_Proxy        'voice.Network@.ProxyServer'
+   option Accept_From_Registered 'voice.Network@.AcceptFromProxyOnly'
+   option SIP_Port              'voice.Network@.RegistrarServerPort'
+   option SIP_Transport         'voice.Network@.RegistrarServerTransport'
+   option RegistrationPeriod    'voice.Network@.RegistrationPeriod'
    option Registration_Interval 'voice.Network@.RegisterExpires'
-   option Reg_Failure_Interval 'voice.Network@.TimerRegistrationFailed'
-   option T1 'voice.Network@.TimerT1'
-   option UserAgentDomain 'voice.Network@.UserAgentDomain'
+   option Reg_Failure_Interval  'voice.Network@.TimerRegistrationFailed'
+   option T1                    'voice.Network@.TimerT1'
+   option UserAgentDomain       'voice.Network@.UserAgentDomain'
+   option SIP_SessTmrEnable     'voice.Network@.SIPSessionTimerEnable'
+   option SIP_SessTmrMode       'voice.Network@.SIPSessionTimerMode'
+   option SIP_SessTmrMsg        'voice.Network@.SIPSessionRefreshRequest'
+   option SIP_SessTmrRefresher  'voice.Network@.SIPSessionRefresher'
+   option SIP_MinSE             'voice.Network@.SIPSessionMinimumTimer'
+   option SIP_SessInterval      'voice.Network@.SIPSessionExpireInterval'
 
 config VoIPProfile 'map_voip'
    option Enable 'voice.VoIPProfile@.Enable'
@@ -74,6 +81,13 @@ config codecs 'map_codec'
    option ptime 'voice.CodecProfile@.PacketizationPeriod'
    option dtx 'voice.CodecProfile@.SilenceSupression'
 
+config fxsinfo 'map_fxs'
+   option Enable 'voice.FXS@.Enable'
+   option DialType 'voice.FXS@.DialType'
+   option TransmitGain 'voice.FXS@.TransmitGain'
+   option ReceiveGain  'voice.FXS@.ReceiveGain'
+   option EchoCancellationEnable 'voice.FXS@.EchoCancellationEnable'
+
 config extensioninfo 'map_ext'
    option Enable 'voice.Extension@.Enable'
    option Internal_Number_Phone 'voice.Extension@.ExtensionNumber'

evoice/files/etc/evoice/voicero

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

evoice/files/etc/init.d/evoice

@@ -10,6 +10,12 @@ VOICE_UCI_CONFIG=voice
 start_service() {
 	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
 
+
+	which endptmngr >/dev/null 2>&1 && {
+		echo "evoice can't be started since endptmngr is installed. Please remove endptmngr and retry"
+		return
+	}
+
 	procd_open_instance
 	procd_set_param command $NAME
 	procd_set_param respawn "5" "0" "3"

evoice/files/lib/voice/codecs_airoha.json

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

evoice/files/lib/voice/codecs_brcm.json

@@ -0,0 +1,140 @@
+{
+	"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
+		}
+	]
+}
+

fdtextract/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=1.0
 
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0ebaf1e7d1f09318ae75d0f475a25280742b790e
+PKG_SOURCE_VERSION:=e3cefda3b26c9aea3021b20725ce7b31b33eebc4
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2

gryphon-led-module/Makefile

@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):bcmkernel
+  DEPENDS:= +(TARGET_brcmbca):bcmkernel
   PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef
@@ -42,9 +42,17 @@ EXTRA_KCONFIG:= CONFIG_RGB_LED=m
 MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
 
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_brcmbca),y)
 	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
-	MODULES_SUBDIR:=lib/modules/4.19.225
+	# 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
+	# and abcdef the git-commit.
+	# The kernel compiled by the Broadcom SDK has a uname -r of 4.19.235, i.e. without the git-commit.
+	# The assignment below removes the part after the - which puts modules in the right directory as
+	# long as the bcmlinux version matches the kernel version in the BCM SDK.
+	# So, this will only stop working in the time window where the BCM SDK has been updated
+	# but bcmlinux has not yet been updated.
+	MODULES_SUBDIR:=$(firstword $(subst -, ,$(MODULES_SUBDIR)))
 	TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)-
 
 	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))

icwmp/Config_cwmp.in

@@ -1,14 +0,0 @@
-choice
-       prompt "Select ACS sever"
-       default CWMP_ACS_MULTI
-       depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
-
-config CWMP_ACS_MULTI
-	bool "No specific ACS, follow standard"
-
-config CWMP_ACS_HDM
-	bool "Select HDM as ACS server"
-endchoice

icwmp/Makefile

@@ -1,55 +1,35 @@
 #
 # Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
-# This is free software, licensed under the GNU General Public License v2.
+# This is free software, licensed under the BSD-3-Clause
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.21
+PKG_VERSION:=9.1.2
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=3ddb80f5fcb89273620ce41fb4f7b7d4b754c9eb
+PKG_SOURCE_VERSION:=b964edb3570797286584793dbadfbef323cddbeb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_LICENSE:=GPLv2
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_FIXUP:=autoreconf
-PKG_CONFIG_DEPENDS:= \
-	CONFIG_CWMP_ACS_MULTI \
-	CONFIG_CWMP_ACS_HDM \
-	CONFIG_CWMP_DEBUG \
-	CONFIG_CWMP_DEVEL_DEBUG
-
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
 
 define Package/icwmp/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
-endef
-
-define Package/icwmp/config
-	source "$(SOURCE)/Config_cwmp.in"
-endef
-
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
-
-define Package/icwmp
-  $(Package/icwmp/default)
-  TITLE += (internal)
-  VARIANT:=internal
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid
 endef
 
 define Package/icwmp-openssl
@@ -77,25 +57,15 @@ define Package/icwmp-mbedtls
 endef
 
 ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS += --enable-libopenssl
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
 endif
 
 ifeq ($(BUILD_VARIANT),wolfssl)
-CONFIGURE_ARGS += --enable-libwolfssl
+CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIGURE_ARGS += --enable-libmbedtls
-endif
-
-ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
-CONFIGURE_ARGS += \
-	--enable-acs=multi
-endif
-
-ifeq ($(CONFIG_CWMP_ACS_HDM),y)
-CONFIGURE_ARGS += \
-	--enable-acs=hdm
+CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -128,7 +98,6 @@ Package/icwmp-openssl/install = $(Package/icwmp/default/install)
 Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
 Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
 
-$(eval $(call BuildPackage,icwmp))
 $(eval $(call BuildPackage,icwmp-openssl))
 $(eval $(call BuildPackage,icwmp-wolfssl))
 $(eval $(call BuildPackage,icwmp-mbedtls))

icwmp/files/etc/config/cwmp

@@ -17,6 +17,7 @@ config acs 'acs'
 config cpe 'cpe'
 	option enable '1'
 	option default_wan_interface 'wan'
+	option default_lan_interface 'lan'
 	option log_to_console 'disable'
 	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
@@ -31,7 +32,7 @@ config cpe 'cpe'
 	option amd_version '5'
 	# compression possible configs: InstanceNumber, InstanceAlias
 	option instance_mode 'InstanceNumber'
-	option session_timeout '60'
+	option session_timeout '300'
 	option notification '1'
 	option exec_download '0'
 	option periodic_notify_enable '1'

icwmp/files/etc/icwmpd/update.sh

@@ -1,105 +1,31 @@
 #!/bin/sh
+. /lib/functions.sh
 
 log() {
 	echo "$@" |logger -t cwmp.update -p info
 }
 
 handle_icwmp_update() {
-	local defwan vendorspecinf update
-	local bootup_start
+	local cwmp_enable
+	config_load cwmp
 
-	bootup_start="${1:-0}"
-	update="0"
-	defwan="$(uci -q get cwmp.cpe.default_wan_interface)"
-	vendorspecinf="$(ifstatus "${defwan}" | jsonfilter -e "@.data.vendorspecinf")"
-
-	log "Handling dhcp option value [${vendorspecinf}]"
-	[ -n "$vendorspecinf" ] && {
-		local url old_url
-		local prov_code old_prov_code
-		local min_wait_interval old_min_wait_interval
-		local retry_interval_multiplier old_retry_interval_multiplier
-
-		old_url="$(uci -q get cwmp.acs.dhcp_url)"
-		old_prov_code="$(uci -q get cwmp.cpe.dhcp_provisioning_code)"
-		old_min_wait_interval="$(uci -q get cwmp.acs.dhcp_retry_min_wait_interval)"
-		old_retry_interval_multiplier="$(uci -q get cwmp.acs.dhcp_retry_interval_multiplier)"
-
-		case $vendorspecinf in
-			http://*|https://*)
-					url="${vendorspecinf}"
-				;;
-			*)
-				for optval in $vendorspecinf; do
-				        case $optval in
-				                1=*)
-				                        url="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				                2=*)
-				                        prov_code="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				                3=*)
-				                        min_wait_interval="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				                4=*)
-				                        retry_interval_multiplier="$(echo "$optval" | cut -d"=" -f2-)"
-				                ;;
-				        esac
-				done
-			;;
-		esac
-
-		if [ -n "$url" ]; then
-			if [ "${url}" != "${old_url}" ]; then
-				log "## icwmp url[${old_url}] changed to [${url}]"
-				uci -q set cwmp.acs.dhcp_url="$url"
-				update=1
-			fi
-		fi
-		if [ -n "$prov_code" ]; then
-			if [ "${prov_code}" != "${old_prov_code}" ]; then
-				log "## icwmp prov_code[${old_prov_code}] changed to [${prov_code}]"
-				uci -q set cwmp.cpe.dhcp_provisioning_code="$prov_code"
-				update=1
-			fi
-		fi
-		if [ -n "$min_wait_interval" ]; then
-			if [ "${min_wait_interval}" != "${old_min_wait_interval}" ]; then
-				log "## icwmp min_wait_interval[${old_min_wait_interval}] changed to [${min_wait_interval}]"
-				uci -q set cwmp.acs.dhcp_retry_min_wait_interval="$min_wait_interval"
-				update=1
-			fi
-		fi
-		if [ -n "$retry_interval_multiplier" ]; then
-			if [ "${retry_interval_multiplier}" != "${old_retry_interval_multiplier}" ]; then
-				log "## icwmp retry_interval_multiplier[${old_retry_interval_multiplier}] changed to [${retry_interval_multiplier}]"
-				uci -q set cwmp.acs.dhcp_retry_interval_multiplier="$retry_interval_multiplier"
-				update=1
-			fi
-		fi
-	}
-
-	if [ "${bootup_start}" -eq "1" ]; then
-		# if called at boot up then no need to reload the service, since it will start after
-		uci commit cwmp
+	config_get_bool cwmp_enable cpe enable 1
+	if [ "$cwmp_enable" = "0" ]; then
 		return 0
 	fi
 
-	# In case of update restart icwmp
-	if [ "${update}" -eq "1" ]; then
-		log "CWMP uci changes, reload cwmp with uci commit"
-		ubus call uci commit '{"config":"cwmp"}'
-	else
-		status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
-		if [ "$status" = "failure" ] || [ "$status" = "" ]; then
+	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
-			# Handle timeout or tr069 object not found
-			if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
-				log "Restarting icwmp tr069 object"
-				/etc/init.d/icwmpd restart
-			fi
 		fi
+	else
+		log "Restarting icwmp tr069 object"
+		/etc/init.d/icwmpd restart
 	fi
 }
 

icwmp/files/etc/init.d/icwmpd

@@ -71,6 +71,206 @@ enable_dhcp_option43() {
 	fi
 }
 
+convert_to_hex() {
+	local val=""
+	local optval="${1}"
+	OPTIND=1
+	while getopts ":" opt "-$optval"
+	do
+		temp=$(printf "%02X" "'${OPTARG:-:}")
+		val="${val}:${temp}"
+	done
+
+	echo "${val}"
+}
+
+configure_send_op125() {
+	local sendopt="${1}"
+	local intf="${2}"
+	local uci="${3}"
+	local hex_oui=""
+	local hex_serial=""
+	local hex_class=""
+	local oui_len=0
+	local serial_len=0
+	local class_len=0
+
+	if [ "${uci}" = "network" ]; then
+		local opt125="125:00:00:0D:E9"
+	else
+		local opt125="125,00:00:0D:E9"
+	fi
+
+	config_get oui cpe manufacturer_oui ""
+	if [ -z "${oui}" ]; then
+		oui=$(db -q get device.deviceinfo.ManufacturerOUI)
+	fi
+
+	oui=$(echo "${oui}" | tr 'a-f' 'A-F')
+
+	config_get serial cpe serial_number ""
+	if [ -z "${serial}" ]; then
+		serial=$(db -q get device.deviceinfo.SerialNumber)
+	fi
+
+	config_get class cpe product_class ""
+	if [ -z "${class}" ]; then
+		class=$(db -q get device.deviceinfo.ProductClass)
+	fi
+
+	oui_len=$(echo -n "${oui}" | wc -m)
+	serial_len=$(echo -n "${serial}" | wc -m)
+	class_len=$(echo -n "${class}" | wc -m)
+
+	if [ ${oui_len} -eq 0 ] || [ ${serial_len} -eq 0 ]; then
+		return 0
+	fi
+
+	opt125_len=$((oui_len + serial_len + class_len))
+	if [ ${class_len} -gt 0 ]; then
+		opt125_len=$((opt125_len + 6))
+	else
+		opt125_len=$((opt125_len + 4))
+	fi
+
+	hex_opt125_len=$(printf "%02X" "${opt125_len}")
+	opt125="${opt125}:${hex_opt125_len}"
+	hex_oui=$(convert_to_hex "${oui}")
+	if [ -z "${hex_oui}" ]; then
+		return 0
+	fi
+
+	hex_oui_len=$(printf "%02X" "${oui_len}")
+	if [ "${uci}" = "network" ]; then
+		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
+	else
+		opt125="${opt125}:04:${hex_oui_len}${hex_oui}"
+	fi
+
+	hex_serial=$(convert_to_hex "${serial}")
+	if [ -z "${hex_serial}" ]; then
+		return 0
+	fi
+
+	hex_serial_len=$(printf "%02X" "${serial_len}")
+	if [ "${uci}" = "network" ]; then
+		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
+	else
+		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
+	fi
+
+	if [ ${class_len} -gt 0 ]; then
+		hex_class=$(convert_to_hex "${class}")
+		if [ -z "${hex_class}" ]; then
+			return 0
+		fi
+
+		hex_class_len=$(printf "%02X" "${class_len}")
+		if [ "${uci}" = "network" ]; then
+			opt125="${opt125}:03:${hex_class_len}${hex_class}"
+		else
+			opt125="${opt125}:06:${hex_class_len}${hex_class}"
+		fi
+	fi
+
+
+	if [ "${uci}" = "network" ]; then
+		new_send_opt="$sendopt $opt125"
+		uci -q set network.$intf.sendopts="$new_send_opt"
+	else
+		uci -q add_list dhcp.$intf.dhcp_option="$opt125"
+	fi
+}
+
+enable_dnsmasq_option125() {
+	local lan="${1}"
+	local send125_present=0
+	local opt125="125,"
+
+	local proto="$(uci -q get dhcp.$lan.dhcpv4)"
+	if [ "${proto}" = "server" ]; then
+		opt_list="$(uci -q get dhcp.$lan.dhcp_option)"
+
+		for sopt in $opt_list; do
+			if [[ "$sopt" == "$opt125"* ]]; then
+				send125_present=1
+				break
+			fi
+		done
+
+		if [ ${send125_present} -eq 0 ]; then
+			configure_send_op125 "" "${lan}" "dhcp"
+			ubus call uci commit '{"config":"dhcp"}'
+		fi
+	fi
+}
+
+enable_disable_dhcp_option125() {
+	local wan="${1}"
+	local action="${2}"
+
+	local reqopts="$(uci -q get network.$wan.reqopts)"
+	local sendopts="$(uci -q get network.$wan.sendopts)"
+	local proto="$(uci -q get network.$wan.proto)"
+	local newreqopts=""
+	local newsendopts=""
+	local req125_present=0
+	local send125_present=0
+	local network_uci_update=0
+	local opt125="125:"
+
+	for ropt in $reqopts; do
+		case $ropt in
+			125) req125_present=1 ;;
+			*) ;;
+		esac
+	done
+
+	for sopt in $sendopts; do
+		if [[ "$sopt" == "$opt125"* ]]; then
+			send125_present=1
+			break
+		fi
+	done
+
+	if [ "${proto}" == "dhcp" ]; then
+		if [ "${action}" == "enable" ]; then
+			if [ ${req125_present} -eq 0 ]; then
+				newreqopts="$reqopts 125"
+				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
+			fi
+		else
+			if [ ${req125_present} -eq 1 ]; then
+				newreqopts=$(echo ${reqopts/125/})
+				uci -q set network.$wan.reqopts="$newreqopts"
+				network_uci_update=1
+			fi
+
+			if [ ${send125_present} -eq 1 ]; then
+				for sopt in $sendopts; do
+					if [[ "$sopt" == "$opt125"* ]]; then
+						newsendopts=$(echo ${sendopts/"${sopt}"/})
+						uci -q set network.$wan.sendopts="$newreqopts"
+						network_uci_update=1
+						break
+					fi
+				done
+			fi
+		fi
+	fi
+
+	if [ ${network_uci_update} -eq 1 ]; then
+		uci commit network
+		ubus call network reload
+	fi
+}
+
 wait_for_resolvfile() {
 	local time=$1
 	local tm=1
@@ -113,6 +313,8 @@ copy_cwmp_varstate_files_to_etc() {
 	fi
 
 	if [ -f /var/state/cwmp ]; then
+		uci -q -c /var/state delete cwmp.sess_status
+		uci -q -c /var/state commit cwmp
 		cp -f /var/state/cwmp /etc/icwmpd/
 	fi
 
@@ -173,10 +375,13 @@ validate_defaults() {
 		return 1;
 	}
 
+	ssl_capath="${ssl_capath%/}"
 	# Put the cert pem file in keep list
 	if [ -d "${ssl_capath}" ]; then
-		if ! grep "${ssl_capath}" /lib/upgrade/keep.d/icwmp; then
+		if ! grep "*.pem\|*.crt" /lib/upgrade/keep.d/icwmp; then
 			echo "${ssl_capath}"'/*.pem' >> /lib/upgrade/keep.d/icwmp
+			echo "${ssl_capath}"'/*.crt' >> /lib/upgrade/keep.d/icwmp
+			echo "${ssl_capath}"'/*.0' >> /lib/upgrade/keep.d/icwmp
 		fi
 	fi
 
@@ -194,11 +399,20 @@ boot() {
 	config_load cwmp
 	config_get dhcp_discovery acs dhcp_discovery "0"
 
+	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
-		config_get wan_interface cpe default_wan_interface "wan"
 		enable_dhcp_option43 "${wan_interface}"
-		/etc/icwmpd/update.sh 1
+	fi
+
+	config_get lan_interface cpe default_lan_interface ""
+	if [ -n "${lan_interface}" ]; then
+		# Set dhcp_option 125 if not already configured
+		enable_disable_dhcp_option125 "${wan_interface}" "enable"
+		enable_dnsmasq_option125 "${lan_interface}"
+	else
+		# Remove dhcp option 125 if exists
+		enable_disable_dhcp_option125 "${wan_interface}" "disable"
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -212,14 +426,11 @@ boot() {
 
 start_service() {
 	local enable_cwmp
-	local wan_interface
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
-	config_get wan_interface cpe default_wan_interface "wan"
 
-	if [ "$enable_cwmp" = "0" ] || [ "$enable_cwmp" = "false" ]; then
-		log "CWMP is not enabled"
+	if [ "$enable_cwmp" = "0" ]; then
 		return 0
 	fi
 
@@ -251,10 +462,39 @@ service_stopped()
 	copy_cwmp_varstate_files_to_etc
 }
 
+stop_service()
+{
+	copy_cwmp_varstate_files_to_etc
+}
+
 reload_service() {
-	log "Reloading CWMP client"
-	ubus -t 1 call tr069 command '{"command":"reload"}'
-	if [ "$?" -ne "0" ]; then
+	local ret
+
+	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+
+	ret="0"
+	if [ "$enable_cwmp" = "0" ]; then
+		stop
+		start
+		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')"
+	ret="$?"
+	if [ "$status" = "up" ]; then
+		ubus -t 1 call tr069 command '{"command":"reload"}'
+		ret="$?"
+	fi
+
+	if [ "$status" = "init" ] || [ "$ret" -ne "0" ]; then
 		log "Restarting CWMP client"
 		stop
 		start

icwmp/files/etc/uci-defaults/85-cwmp-set-userid

@@ -1,7 +1,11 @@
+#!/bin/sh
+
+. /lib/functions.sh
 # Copy defaults by the factory to the cwmp UCI user section.
+config_load cwmp
 
 # Get Manufacturer OUI.
-oui=$(uci -q get cwmp.cpe.manufacturer_oui)
+config_get oui cpe manufacturer_oui ""
 if [ -z "${oui}" ]; then
 	oui=$(db -q get device.deviceinfo.ManufacturerOUI)
 fi
@@ -9,24 +13,29 @@ fi
 oui=$(echo "${oui}" | tr 'a-f' 'A-F')
 
 # Get system serial number.
-serial=$(uci -q get cwmp.cpe.serial_number)
+config_get serial cpe serial_number ""
 if [ -z "${serial}" ]; then
 	serial=$(db -q get device.deviceinfo.SerialNumber)
 fi
 
 # Get userid values
-acs_userid=$(uci -q get cwmp.acs.userid)
-cpe_userid=$(uci -q get cwmp.cpe.userid)
+config_get acs_userid acs userid ""
+config_get cpe_userid cpe userid ""
 
 # Only set if they are empty
-if [ -z "$acs_userid" ]
-then
+if [ -z "${acs_userid}" ]; then
     uci -q set cwmp.acs.userid="${oui}-${serial}"
 fi
 
-if [ -z "$cpe_userid" ]
-then
+if [ -z "${cpe_userid}" ]; then
     uci -q set cwmp.cpe.userid="${oui}-${serial}"
 fi
 
+# Fix the cwmp.cpe.enable parameter
+# set default to 1 if not defined
+config_get enable_cwmp cpe enable ""
+if [ -z "${enable_cwmp}" ]; then
+    uci -q set cwmp.cpe.enable="1"
+fi
+
 # No need for commit here, it is done by uci_apply_defaults().

icwmp/files/lib/upgrade/keep.d/icwmp

@@ -1 +1,2 @@
 /var/run/icwmpd/icwmpd_backup_session.xml
+/etc/icwmpd/cwmp

ieee1905/Config.in

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

ieee1905/Config.map-plugin.in

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

ieee1905/Makefile

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

ieee1905/files/etc/config/ieee1905

@@ -2,7 +2,7 @@ config ieee1905 'ieee1905'
 	option enabled '1'
 	option extension '1'
 	list extmodule 'map'
-	option registrar '2 5'
+	option registrar '2 5 6'
 #	option macaddress '0a:1b:2c:3d:4e:50'
 
 config al-iface
@@ -24,3 +24,9 @@ config ap
 	option encryption 'sae-mixed'
 	option key '1234567890'
 
+config ap
+	option band '6'
+	option ssid 'IOWRT-6GHz'
+	option encryption 'sae-mixed'
+	option key '1234567890'
+

ieee1905/files/etc/init.d/ieee1905

@@ -42,7 +42,7 @@ validate_ap_section() {
 	local section="$1"
 
 	uci_validate_section ieee1905 $section "${1}" \
-			'band:or("2", "5", "60")' \
+			'band:or("2", "5", "60", "6")' \
 			'ssid:string' \
 			'encryption:or("psk2", "sae-mixed", "sae", string)' \
 			'key:string' \

ieee1905/files/etc/uci-defaults/30-set-ieee1905-al-macaddr

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+
+BMAC=$(db -q get hw.board.basemac)
+BMAC=${BMAC//:/}
+BMAC=${BMAC// /}
+BMAC=$(printf "%12.12X" $((0x$BMAC)))
+
+[ "$BMAC" == "" ] && exit 1
+
+LMAC=$((0x$BMAC & 0xfeffffffffff))
+LMAC=$(($LMAC | 0x020000000000))
+LMAC=$(printf "%12.12X" $LMAC)
+LMAC=$(echo $LMAC | sed -e 's/[0-9A-F]\{2\}/&:/g' -e 's/:$//')
+
+mac=$(uci -q get ieee1905.ieee1905.macaddress)
+
+[ "$mac" != "" ] && exit 0
+
+uci set ieee1905.ieee1905.macaddress="$LMAC"
+uci commit ieee1905
+

ieee1905/plugins/map.mk

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

ieee1905/plugins/snoop.mk

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

ieee1905/plugins/topology.mk

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

iop/config

@@ -18,8 +18,21 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 # /etc/banner and /etc/device_info #
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="iopsysWrt"
+CONFIG_VERSION_MANUFACTURER="IOPSYS"
 CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
+CONFIG_VERSION_DIST="IOWRT"
+
+# OpenWrt is given by CONFIG_VERSION_NUMBER which we do not want to override.
+# disabling CONFIG_VERSION_FILENAMES will hide the OpenWrt version from the image filename
+# CONFIG_VERSION_FILENAMES is not set
+
+# CONFIG_VERSION_CODE is set to the IOWRT version instead by the genconfig-script and
+# CONFIG_VERSION_CODE_FILENAMES will put it into the image filename.
+CONFIG_VERSION_CODE_FILENAMES=y
+
+CONFIG_VERSION_HOME_URL="https://iopsys.eu"
+CONFIG_VERSION_BUG_URL="https://iopsys.eu"
+CONFIG_VERSION_SUPPORT_URL="https://iopsys.eu"
 
 # /lib/preinit #
 CONFIG_PREINITOPT=y
@@ -44,12 +57,13 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 # EasySoC HAL #
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_peripheral_manager=y
 CONFIG_PACKAGE_port-management=y
 CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
+CONFIG_PACKAGE_map-agent=m
+CONFIG_PACKAGE_map-controller=m
 CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_wfadatad-collector=y
 
@@ -115,7 +129,8 @@ CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_miniupnpd=y
+CONFIG_PACKAGE_dnsmasq=y
+CONFIG_PACKAGE_miniupnpd-iptables=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -133,10 +148,11 @@ CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
 CONFIG_PACKAGE_ethtool=y
+CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables=y
+CONFIG_PACKAGE_iptables-zz-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
@@ -161,6 +177,7 @@ CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
+CONFIG_PACKAGE_procd-ujail=m
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-rpcsys=y
 CONFIG_PACKAGE_rpcd-mod-rrdns=y
@@ -284,3 +301,10 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
+
+# Use fw3 iptables-based instead of newer nftables-based fw4
+# TODO: for now we cannot build an image with fw3 and luci-app-firewall (i.e. fw3)
+# Enabling luci-app-firewall enables fw4
+# CONFIG_PACKAGE_luci-app-firewall is not set
+CONFIG_PACKAGE_firewall=y
+# CONFIG_PACKAGE_firewall4 is not set

iop/scripts/feeds_update.sh

@@ -36,6 +36,17 @@ function feeds_update {
 		./scripts/feeds install -p targets $target
 	done
 
+	# Workaround for bug in 22.03.0-rc4 where installed target path has been
+	# moved to target/linux/feeds but Config.in and Makefile from installed
+	# targets are not properly included from the new location.
+	# This hack is to be removed once the issues are fixed.
+	# Note that the above block of code might no longer necessary because
+	# targets no longer need to be installed explicitly.
+	echo "Working around installed-target-bug"
+	for f in target/linux/feeds/*; do
+		ln -vsf "feeds/$(basename "$f")" "target/linux/$(basename "$f")"
+	done
+
 	# install all packages
 	./scripts/feeds install -a
 

iop/scripts/genconfig.sh

@@ -13,11 +13,13 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
-	ramips="target/linux/iopsys-ramips"
-	econet="target/linux/iopsys-econet"
-	x86="target/linux/iopsys-x86"
-	armvirt="target/linux/iopsys-armvirt"
+	brcmbca_feed="target/linux/feeds/brcmbca"
+	ramips_feed="target/linux/feeds/iopsys-ramips"
+	airoha_feed="target/linux/feeds/airoha"
+	x86_feed="target/linux/feeds/iopsys-x86"
+	armvirt_feed="target/linux/feeds/iopsys-armvirt"
+	mediatek_feed="target/linux/feeds/iopsys-mediatek"
+	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -83,8 +85,8 @@ function genconfig {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
-			local targetpath="./target/linux/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
+			local targetpath="./target/linux/feeds/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -107,19 +109,23 @@ function genconfig {
 			return
 		fi
 
-		[ -e $brcm63xx_arm/genconfig ] &&
-			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
-		[ -e $ramips/genconfig ] &&
-			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $econet/genconfig ] &&
-			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $x86/genconfig ] &&
-			iopsys_x86=$(cd $x86; ./genconfig)
-		[ -e $armvirt/genconfig ] &&
-			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $brcmbca_feed/genconfig ] &&
+			brcmbca=$(cd $brcmbca_feed; ./genconfig)
+		[ -e $ramips_feed/genconfig ] &&
+			iopsys_ramips=$(cd $ramips_feed; ./genconfig)
+		[ -e $airoha_feed/genconfig ] &&
+			airoha=$(cd $airoha_feed; ./genconfig)
+		[ -e $x86_feed/genconfig ] &&
+			iopsys_x86=$(cd $x86_feed; ./genconfig)
+		[ -e $armvirt_feed/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt_feed; ./genconfig)
+		[ -e $mediatek_feed/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek_feed; ./genconfig)
+		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
+			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
+			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -128,10 +134,10 @@ function genconfig {
 			return
 	    fi
 
-	    for p in $iopsys_brcm63xx_arm; do
+	    for p in $brcmbca; do
 		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_arm"
-			target_config_path="$brcm63xx_arm/config"
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
 		    return
 		fi
 	    done
@@ -139,15 +145,15 @@ function genconfig {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
+			target_config_path="$ramips_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_econet; do
+	    for p in $airoha; do
 		if [ $p == $profile ]; then
-		    target="iopsys_econet"
-			target_config_path="$econet/config"
+		    target="airoha"
+			target_config_path="$airoha_feed/config"
 		    return
 		fi
 	    done
@@ -155,7 +161,7 @@ function genconfig {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86/config"
+			target_config_path="$x86_feed/config"
 		    return
 		fi
 	    done
@@ -163,7 +169,23 @@ function genconfig {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt/config"
+			target_config_path="$armvirt_feed/config"
+		    return
+		fi
+	    done
+
+	    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"
 		    return
 		fi
 	    done
@@ -319,20 +341,25 @@ function genconfig {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES 
-		if [ "$target" = "iopsys_ramips" ]; then
-			subtarget="mt7621"
+		case "$target" in
+		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
+			# This assumes the device name to be unique within one target,
+			# which is a fair assumption to make.
+			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
+			if [ -z "$mk_file" ]; then
+				echo "Error determining subtarget for $target / ${BOARDTYPE}"
+				return 1
+			fi
+			local subtarget="$(basename "${mk_file%.mk}")"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_econet" ]; then
-			subtarget="en7562"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		else
+			;;
+		*)
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-		fi
+			;;
+		esac
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

iop/scripts/genconfig_min.sh

@@ -12,11 +12,13 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
-	ramips="target/linux/iopsys-ramips"
-	econet="target/linux/iopsys-econet"
-	x86="target/linux/iopsys-x86"
-	armvirt="target/linux/iopsys-armvirt"
+	brcmbca_feed="target/linux/feeds/brcmbca"
+	ramips_feed="target/linux/feeds/iopsys-ramips"
+	airoha_feed="target/linux/feeds/airoha"
+	x86_feed="target/linux/feeds/iopsys-x86"
+	armvirt_feed="target/linux/feeds/iopsys-armvirt"
+	mediatek_feed="target/linux/feeds/iopsys-mediatek"
+	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -82,8 +84,8 @@ function genconfig_min {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
-			local targetpath="./target/linux/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
+			local targetpath="./target/linux/feeds/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -106,19 +108,23 @@ function genconfig_min {
 			return
 		fi
 
-		[ -e $brcm63xx_arm/genconfig ] &&
-			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
-		[ -e $ramips/genconfig ] &&
-			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $econet/genconfig ] &&
-			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $x86/genconfig ] &&
-			iopsys_x86=$(cd $x86; ./genconfig)
-		[ -e $armvirt/genconfig ] &&
-			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $brcmbca_feed/genconfig ] &&
+			brcmbca=$(cd $brcmbca_feed; ./genconfig)
+		[ -e $ramips_feed/genconfig ] &&
+			iopsys_ramips=$(cd $ramips_feed; ./genconfig)
+		[ -e $airoha_feed/genconfig ] &&
+			airoha=$(cd $airoha_feed; ./genconfig)
+		[ -e $x86_feed/genconfig ] &&
+			iopsys_x86=$(cd $x86_feed; ./genconfig)
+		[ -e $armvirt_feed/genconfig ] &&
+			iopsys_armvirt=$(cd $armvirt_feed; ./genconfig)
+		[ -e $mediatek_feed/genconfig ] &&
+			iopsys_mediatek=$(cd $mediatek_feed; ./genconfig)
+		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
+			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
+			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -127,10 +133,10 @@ function genconfig_min {
 			return
 	    fi
 
-	    for p in $iopsys_brcm63xx_arm; do
+	    for p in $brcmbca; do
 		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_arm"
-			target_config_path="$brcm63xx_arm/config"
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
 		    return
 		fi
 	    done
@@ -138,15 +144,15 @@ function genconfig_min {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
+			target_config_path="$ramips_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_econet; do
+	    for p in $airoha; do
 		if [ $p == $profile ]; then
-		    target="iopsys_econet"
-			target_config_path="$econet/config"
+		    target="airoha"
+			target_config_path="$airoha_feed/config"
 		    return
 		fi
 	    done
@@ -154,7 +160,7 @@ function genconfig_min {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86/config"
+			target_config_path="$x86_feed/config"
 		    return
 		fi
 	    done
@@ -162,7 +168,23 @@ function genconfig_min {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt/config"
+			target_config_path="$armvirt_feed/config"
+		    return
+		fi
+	    done
+
+	    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"
 		    return
 		fi
 	    done
@@ -310,20 +332,25 @@ function genconfig_min {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES
-		if [ "$target" = "iopsys_ramips" ]; then
-			subtarget="mt7621"
+		case "$target" in
+		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
+			# This assumes the device name to be unique within one target,
+			# which is a fair assumption to make.
+			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
+			if [ -z "$mk_file" ]; then
+				echo "Error determining subtarget for $target / ${BOARDTYPE}"
+				return 1
+			fi
+			local subtarget="$(basename "${mk_file%.mk}")"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_econet" ]; then
-			subtarget="en7562"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		else
+			;;
+		*)
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-		fi
+			;;
+		esac
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

iop/scripts/install_key.sh

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

iop/scripts/iopupgrade.sh

@@ -1,344 +1,283 @@
 # this is a developer helper script to install firmware on a remote host with SSH
 
 function upd_usage {
-    echo "usage: $0 iopupgrade -t <host> -f <file> [opts] "
-    echo ""
-    echo "   Default host is 192.168.1.1"
-    echo "   Default firmware file is the newest one found"
-    echo "   Default is to not keep configuration"
-    echo "opts:"
-    echo ""
-    echo "	-i	Interactive use, Allows to select firmware file"
-    echo "	-n	Do not do the final reboot of the target board"
-    echo "	-c	Keep configuration"
-    echo "	-x	Force install even if firmware is not for this board"
-    echo "	-b	Force install of bootloader regardless of version installed"
-    echo "	-s	Use sysupgade. old upgrade method, needed for old releases that do not have iopu"
+	echo "usage: $0 ssh_upgrade [-t <host>] [-f <file>] [opts] "
+	echo ""
+	echo "   Default host is 192.168.1.1"
+	echo "   Default firmware file is the latest one (last.{itb,pkgtb})"
+	echo "   Default is to not keep configuration"
+	echo "opts:"
+	echo ""
+	echo "	-i	Interactive use, allows to select firmware file"
+	echo "	-n	Do not do the final reboot of the target board"
+	echo "	-c	Keep configuration"
+	echo "	-x	Force install even if firmware is not for this board"
+	echo "	-b	Force install of bootloader regardless of version installed"
 }
 
 function set_config_string {
-    eval `grep $1 .config`
+	eval $(grep $1 .config)
 }
 
 function upd_ask_ok {
-    echo "Will Continue with the following settings"
-    echo "-----------------------------------------"
-    printf "%20s: %s\n"  "Firmare file" "$upd_fw_base"
-    printf "%20s: %s\n"  "Host ip" "$upd_host"
-    printf "%20s: " "Reboot";               if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    printf "%20s: " "Keep config";          if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    printf "%20s: " "Force bootloader";     if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    printf "%20s: " "Force image upgrade";  if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    printf "%20s: " "Use sysupgrade";       if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
-    echo "-----------------------------------------"
+	echo "Will continue with the following settings:"
+	echo "-----------------------------------------"
+	printf "%20s: %s\n" "Firmware file" "$upd_fw_base"
+	printf "%20s: %s\n" "Host IP" "$upd_host"
+	printf "%20s: " "Reboot"
+	if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi
+	printf "%20s: " "Keep config"
+	if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
+	printf "%20s: " "Force bootloader"
+	if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
+	printf "%20s: " "Force image upgrade"
+	if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
+	echo "-----------------------------------------"
 
-    if [ "$upd_sysupgrade" == "0" ]
-       then
-	   if [ "$upd_keepconf"   == "1" ] ;then echo "keeping config is just a fantasy it's not yet implemented, try sysupgrade";fi
-    fi
+	echo -n "Continue? [Y/n/q]:"
+	read answer
 
-    echo -n "Continue? [Y/n/q]:"
-    read answer
-
-    case $answer in
-	n|N)
-	    return 1;;
-	q|Q)
-	    exit 1;;
-	y|Y|*)
-	    return 0;;
-    esac
+	case $answer in
+	n | N)
+		return 1
+		;;
+	q | Q)
+		exit 1
+		;;
+	y | Y | *)
+		return 0
+		;;
+	esac
 }
 
 function upd_select_file {
+	dialog --keep-tite --title "To select a file, use TAB/ARROW to highlight then press SPACEBAR -> RETURN" \
+		--fselect "${upd_fw:-bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/}" \
+		$((lines - 10)) $((cols - 5)) \
+		2>$tempfile
 
-    dialog --keep-tite --title "To select file use TAB/ARROW to hilight then press SPACEBAR -> RETURN" \
-	   --fselect "bin/targets/$CONFIG_TARGET_BOARD/generic/" \
-	   $((lines -10)) $((cols -5)) \
-	   2> $tempfile
-
-    new_file=$(cat $tempfile)
-    if [ -n "$new_file" ]
-    then
-	upd_fw="$new_file"
-	upd_fw_base=$(basename $upd_fw);
-    fi
+	new_file=$(cat $tempfile)
+	if [ -n "$new_file" ]; then
+		upd_fw="$new_file"
+		upd_fw_base=$(basename $upd_fw)
+	fi
 }
 
 function upd_select_target {
+	dialog --keep-tite --title "Input the hostname/IP of the target board" \
+		--inputbox "Name/IP" \
+		$((lines - 10)) $((cols - 5)) \
+		"$upd_host" \
+		2>$tempfile
 
-    dialog --keep-tite --title "Input the name/ip number of target board" \
-	   --inputbox "Name/IP" \
-	   $((lines -10)) $((cols -5)) \
-	   "$upd_host" \
-	   2> $tempfile
-
-    new_file=$(cat $tempfile)
-    if [ -n "$new_file" ]
-    then
-	upd_host="$new_file"
-    fi
+	new_file=$(cat $tempfile)
+	if [ -n "$new_file" ]; then
+		upd_host="$new_file"
+	fi
 }
 
-
 function upd_select_reboot {
-    dialog --keep-tite --radiolist "Should the board reboot after download finished" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Reboot" "Restart board after done"       `if [ "$upd_noreboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "No reboot" "Continue running old system" `if [ "$upd_noreboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
+	dialog --keep-tite --radiolist "Should the board reboot after download finished" \
+		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
+		"Reboot" "Restart board after done" $(if [ "$upd_noreboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
+		"No reboot" "Continue running old system" $(if [ "$upd_noreboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
+		2>$tempfile
 
-    res=$(cat $tempfile)
-    case $res in
+	res=$(cat $tempfile)
+	case $res in
 	"No reboot")
-	    upd_noreboot=1
-	;;
+		upd_noreboot=1
+		;;
 	"Reboot")
-	    upd_noreboot=0
-	    ;;
-    esac
+		upd_noreboot=0
+		;;
+	esac
 }
 
 function upd_select_config {
-    dialog --keep-tite --radiolist "Should the configuration be keept" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Keep" "Keep the config from old system"      `if [ "$upd_keepconf" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "Default" "Use default config for new system" `if [ "$upd_keepconf" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
+	dialog --keep-tite --radiolist "Should the configuration be kept" \
+		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
+		"Keep" "Keep the config from old system" $(if [ "$upd_keepconf" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
+		"Default" "Use default config for new system" $(if [ "$upd_keepconf" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
+		2>$tempfile
 
-    res=$(cat $tempfile)
-    case $res in
+	res=$(cat $tempfile)
+	case $res in
 	"Keep")
-	    upd_keepconf=1
-	    ;;
+		upd_keepconf=1
+		;;
 	"Default")
-	    upd_keepconf=0
-	    ;;
-    esac
+		upd_keepconf=0
+		;;
+	esac
 }
 
 function upd_select_forceboot {
-    dialog --keep-tite --radiolist "Should the boot loader be updated reagardless of version installed" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Force" "Alwasy update boot loader"                `if [ "$upd_forceboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "Version check" "Only upgrade if version is newer" `if [ "$upd_forceboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
+	dialog --keep-tite --radiolist "Should the boot loader be updated regardless of the version installed" \
+		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
+		"Force" "Always update boot loader" $(if [ "$upd_forceboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
+		"Version check" "Only upgrade if version is newer" $(if [ "$upd_forceboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
+		2>$tempfile
 
-    res=$(cat $tempfile)
-    case $res in
+	res=$(cat $tempfile)
+	case $res in
 	"Force")
-	    upd_forceboot=1
-	    ;;
+		upd_forceboot=1
+		;;
 	"Version check")
-	    upd_forceboot=0
-	    ;;
-    esac
+		upd_forceboot=0
+		;;
+	esac
 }
 
 function upd_select_forceimage {
-    dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Force" "Dissable sanity check and force use of image (dangerous)" `if [ "$upd_forceimage" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "Only compatible" "Normal checks apply"                            `if [ "$upd_forceimage" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
+	dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
+		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
+		"Force" "Disable sanity check and force use of image (dangerous)" $(if [ "$upd_forceimage" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
+		"Only compatible" "Normal checks apply" $(if [ "$upd_forceimage" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
+		2>$tempfile
 
-    res=$(cat $tempfile)
-    case $res in
+	res=$(cat $tempfile)
+	case $res in
 	"Force")
-	    upd_forceimage=1
-	    ;;
+		upd_forceimage=1
+		;;
 	"Only compatible")
-	    upd_forceimage=0
-	    ;;
-    esac
-}
-
-function upd_select_sysupgrade {
-    dialog --keep-tite --radiolist "Use the old way to upgrade a board" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "iopu" "Use the iop upgrade methode"          `if [ "$upd_sysupgrade" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   "sysupgrade" "Use the old sysupgrade methode" `if [ "$upd_sysupgrade" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
-	   2> $tempfile
-
-    res=$(cat $tempfile)
-    case $res in
-	"iopu")
-	    upd_sysupgrade=0
-	    ;;
-	"sysupgrade")
-	    upd_sysupgrade=1
-	    ;;
-    esac
+		upd_forceimage=0
+		;;
+	esac
 }
 
 function upd_select {
+	dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select item to change" \
+		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
+		"Firmware file" "$upd_fw_base" \
+		"Host IP" "$upd_host" \
+		"Reboot" $(if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi) \
+		"Keep config" $(if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
+		"Force bootloader" $(if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
+		"Force image upgrade" $(if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
+		2>$tempfile
 
-    dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select Item to change" \
-	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
-	   "Firmare file" "$upd_fw_base"\
-	   "Host ip" "$upd_host" \
-	   "Reboot"               `if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   "Keep config"          `if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   "Force bootloader"     `if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   "Force image upgrade"  `if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   "sysupgrade"           `if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
-	   2> $tempfile
-
-
-    case $(cat $tempfile) in
-	"Firmare file")
-	    upd_select_file
-	    ;;
-	"Host ip")
-	    upd_select_target
-	    ;;
+	case $(cat $tempfile) in
+	"Firmware file")
+		upd_select_file
+		;;
+	"Host IP")
+		upd_select_target
+		;;
 	"Reboot")
-	    upd_select_reboot
-	    ;;
+		upd_select_reboot
+		;;
 	"Keep config")
-	    upd_select_config
-	    ;;
+		upd_select_config
+		;;
 	"Force bootloader")
-	    upd_select_forceboot
-	    ;;
+		upd_select_forceboot
+		;;
 	"Force image upgrade")
-	    upd_select_forceimage
-	    ;;
-	"sysupgrade")
-	    upd_select_sysupgrade
-	    ;;
+		upd_select_forceimage
+		;;
 	*)
-	    return
-	;;
-    esac
-    upd_select
+		return
+		;;
+	esac
+	upd_select
 }
 function upd_select_start {
-    lines=$(tput lines)
-    cols=$(tput cols)
-    tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
-    trap "rm -f $tempfile" 0 1 2 5 15
-    upd_select
+	lines=$(tput lines)
+	cols=$(tput cols)
+	tempfile="$(mktemp)"
+	trap "rm -f $tempfile" 0 1 2 5 15
+	upd_select
 
 }
 
 function ssh_upgrade {
-    upd_noreboot=0
-    upd_forceboot=0
-    upd_keepconf=0
-    upd_forceimage=0
-    upd_fw_base=""
-    upd_fw=""
-    upd_host="192.168.1.1"
-    upd_sysupgrade=1
-    do_dialog=0
+	upd_noreboot=0
+	upd_forceboot=0
+	upd_keepconf=0
+	upd_forceimage=0
+	upd_fw_base=""
+	upd_fw=""
+	upd_host="192.168.1.1"
+	do_dialog=0
 
-    while getopts "f:hnxt:iscb" opt; do
-	case $opt in
-	    n)
-		upd_noreboot=1
-		;;
-	    x)
-		upd_forceimage=1
-		;;
-	    b)
-		upd_forceboot=1
-		;;
-	    c)
-		upd_keepconf=1
-		;;
-	    v)
-		verbose=$OPTARG
-		;;
-	    f)
-		upd_fw=$OPTARG
-		;;
-	    t)
-		upd_host=$OPTARG
-		;;
-	    i)
-		do_dialog=1
-		;;
-	    s)
-		upd_sysupgrade=1
-		;;
-	    h)
-		upd_usage
-		exit 1
-		;;
-	    \?)
-		echo "Invalid option: -$OPTARG" >&2
-		exit 1
-		;;
-	esac
-    done
-
-    if [ -n "$upd_fw" ]
-    then
-	upd_fw_base=$(basename $upd_fw);
-    else
-	set_config_string CONFIG_TARGET_BOARD
-	firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t *[0-9].y[3])
-
-	# if target uses pkgtb
-	if [ -z "$firmwares"]
-	then
-	    # pkgtb files can not be streamed so copy over the file witch scp
-	    use_scp=1
-	    firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t last.pkgtb)
-	fi
-
-	for upd_fw_base in $firmwares
-	do
-	    #echo "firmware $upd_fw"
-	    break
+	while getopts "f:hnxt:icb" opt; do
+		case $opt in
+		n)
+			upd_noreboot=1
+			;;
+		x)
+			upd_forceimage=1
+			;;
+		b)
+			upd_forceboot=1
+			;;
+		c)
+			upd_keepconf=1
+			;;
+		v)
+			verbose=$OPTARG
+			;;
+		f)
+			upd_fw=$OPTARG
+			;;
+		t)
+			upd_host=$OPTARG
+			;;
+		i)
+			do_dialog=1
+			;;
+		h)
+			upd_usage
+			exit 1
+			;;
+		\?)
+			echo "Invalid option: -$OPTARG" >&2
+			exit 1
+			;;
+		esac
 	done
-	upd_fw="bin/targets/$CONFIG_TARGET_BOARD/generic/$upd_fw_base"
-    fi
 
-    [ $do_dialog -eq 1 ] && upd_select_start
-
-    if ! upd_ask_ok
-    then
-	upd_select_start
-	if ! upd_ask_ok
-	then
-	    exit 1
+	if [ -z "$upd_fw" ]; then
+		set_config_string CONFIG_TARGET_BOARD
+		set_config_string CONFIG_TARGET_SUBTARGET
+		upd_fw="$(realpath -q --canonicalize-existing --relative-to=. "bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/"last.{pkgtb,itb})"
+		if [ -z "$upd_fw" ] && [ $do_dialog -eq 0 ]; then
+			echo "Could not find image. Check that last.{itb,pkgtb} exists or specify an image using -f <image> or -i (interactive)." >&2
+			return 1
+		fi
 	fi
-    fi
+	upd_fw_base="$(basename "$upd_fw")"
 
-    if [ ! -f $upd_fw ]
-    then
-	echo "firmware file $firmware do not exist"
-	exit 1
-    fi
+	[ $do_dialog -eq 1 ] && upd_select_start
 
-    if [ $upd_sysupgrade -eq 0 ]
-    then
-	extra_args=""
-	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -n"
-	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args -x"
-	[ $upd_forceboot  -eq 1 ] && extra_args="$extra_args -b"
-
-	file_size_kb=`du -k "$upd_fw" | cut -f1`
-	if [ "$use_scp" == "1" ]
-	then
-	    scp $upd_fw root@$upd_host:/tmp/ &&
-		ssh -o ConnectTimeout=60 root@$upd_host "iopu $extra_arg -f /tmp/$upd_fw_base"
-	else
-	    cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
+	if ! upd_ask_ok; then
+		upd_select_start
+		if ! upd_ask_ok; then
+			exit 1
+		fi
 	fi
-    else
-	extra_args=""
-	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -d"
-	[ $upd_keepconf   -eq 0 ] && extra_args="$extra_args -n"
 
-	scp $upd_fw root@$upd_host:/tmp/ &&
-	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $extra_args /tmp/$upd_fw_base" &&
-	    echo "sysupgrade done!"
-    fi
+	if [ ! -f $upd_fw ]; then
+		echo "Firmware file $firmware does not exist."
+		exit 1
+	fi
+
+	extra_args=""
+	[ $upd_noreboot -eq 1 ] && extra_args="$extra_args --no-reboot"
+	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args --force"
+	[ $upd_keepconf -eq 0 ] && extra_args="$extra_args -n"
+	[ $upd_forceboot -eq 1 ] && extra_args="$extra_args --force-loader-upgrade"
+
+	pv "$upd_fw" |
+		ssh \
+			-o ConnectTimeout=60 \
+			-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+			root@"$upd_host" \
+			sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" ||
+		echo "Sysupgrade failed" >&2 && return 1
 }
 
-register_command "ssh_upgrade" "-h <host> -f <file> [opts]  Install firmware on remote host with SSH"
-
-
+register_command "ssh_upgrade" "-t <host> -f <file> [opts]  Install firmware on remote host with SSH"

map-agent/Config.in

@@ -13,5 +13,22 @@ config AGENT_ISLAND_PREVENTION
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
+
+config AGENT_EASYMESH_VENDOR_EXT
+	bool "Enable extra features through Easymesh vendor extension"
+	default y
+
+config AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
+	string
+	default "\\\\x11\\\\x22\\\\x33"
+
+config AGENT_EASYMESH_VENDOR_EXT_OUI
+	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
+	default AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
+	help
+	Extra features not covered by the base Easymesh specification can be
+	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
+	through which such features would be exposed.
+
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.9.0.0
+PKG_VERSION:=2.10.3.28
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=c3887ca931d4e7fb6f773b4d71b4e6164f9f0372
+PKG_SOURCE_VERSION:=5deb9717bdf4832734bc710bf51cf27a69a9d7eb
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -28,7 +28,7 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +map-plugin
+	  +map-plugin +ip-bridge
 endef
 
 
@@ -56,6 +56,7 @@ endef
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
@@ -70,6 +71,12 @@ ifeq ($(CONFIG_AGENT_EASYMESH_R2_CERT),y)
 TARGET_CFLAGS += -DEASYMESH_R2_CERT
 endif
 
+ifeq ($(CONFIG_AGENT_EASYMESH_VENDOR_EXT),y)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_AGENT_EASYMESH_VENDOR_EXT_OUI)\\\"
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
+endif
+
+
 MAKE_PATH:=src
 
 define Package/map-agent/install
@@ -77,6 +84,8 @@ define Package/map-agent/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/lib/wifi
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/script/* $(1)/lib/wifi/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef
 

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

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

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

@@ -10,56 +10,9 @@ IS_CFG_VALID=1
 MAP_DEV="map_dev"
 MAP_IF="map"
 
-create_map() {
-	ip link add lei type veth peer name lei_map 2>/dev/null
-	ip link add link lei name lei_lan type vlan id 1 2>/dev/null
-
-	uci -q set network.${MAP_DEV}=device
-	uci -q set network.${MAP_DEV}.name=br-map
-	uci -q set network.${MAP_DEV}.type=bridge
-
-	uci -q show network.${MAP_DEV}.ports | grep -q lei_map || {
-		uci -q add_list network.${MAP_DEV}.ports='lei_map'
-	}
-
-	uci -q set network.${MAP_IF}=interface
-	uci -q set network.${MAP_IF}.device=br-map
-	uci -q set network.${MAP_IF}.is_lan=1
-
-	uci -q show network.br_lan.ports | grep -q lei_lan || {
-		uci -q add_list network.br_lan.ports="lei_lan"
-	}
-
-	uci -q set mapagent.agent.al_bridge=br-map
-
-	uci -q commit
-
-	ubus call network reload
-	ubus -t 5 wait_for network.interface.map
-
-	brctl addif br-map lei_map 2>/dev/null
-	brctl addif br-lan lei_lan 2>/dev/null
-
-	ip link set lei up 2>/dev/null
-	ip link set lei_map up 2>/dev/null
-	ip link set lei_lan up 2>/dev/null
-}
-
-remove_map() {
-	ip link delete ${MAP_VETH} &>/dev/null
-
-	uci -q delete network.${MAP_DEV}
-	uci -q delete network.${MAP_IF}
-
-	uci -q set mapagent.agent.al_bridge=br-lan
-
-	uci -q commit
-
-	ubus call network reload
-}
 
 start_dynbhd_service() {
-	rm -f /tmp/multiap.backhaul
+	rm -f /var/run/multiap/multiap.backhaul
 	procd_open_instance
 	procd_set_param command "/usr/sbin/dynbhd"
 	procd_set_param respawn
@@ -138,7 +91,7 @@ validate_radio_section() {
 
 	uci_validate_section mapagent $section "${1}" \
 			'device:string' \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'configured:bool:false' \
 			'onboarded:bool:false' \
 			'dedicated_backhaul:bool:false' \
@@ -215,6 +168,10 @@ validate_agent_config() {
 	return 0
 }
 
+create_dir() {
+        mkdir -p /var/run/multiap
+}
+
 start_service() {
 	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
 
@@ -229,11 +186,8 @@ 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"
 	procd_set_param respawn
 #	procd_set_param stdout 1
@@ -241,10 +195,6 @@ start_service() {
 	procd_close_instance
 }
 
-#stop_service() {
-#	remove_map
-#}
-
 service_triggers()
 {
 	procd_add_reload_trigger "mapagent"

map-agent/files/etc/uci-defaults/991-map-agent-unset-pvid

@@ -0,0 +1,13 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+unset_pvid() {
+	local section=$1
+
+	uci -q set mapagent.${section}.pvid="0"
+}
+
+config_load mapagent
+
+config_foreach unset_pvid policy

map-agent/files/lib/wifi/multiap

@@ -1,920 +0,0 @@
-#!/bin/sh
-
-# functions
-# wireless_teardown - tear down ifaces based on mapagent config
-# setup_network     - prepare /etc/config/network if necessary
-# setup_wireless    - prepare /etc/config/wireless based on mapagent config
-# write_credentials - write bBSS credentials to fBSS
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-. /lib/wifi/traffic_separation
-
-MAPFILE="/tmp/multiap.backhaul"
-
-diff=0
-onbrd_bssid=0
-onbrd_band=0
-
-usage() {
-	cat <<EOF
-Usage: $0 [wireless_teardown|setup_network|setup_wireless|write_credentials]
-Platform specific Multi-AP script to prepare network and wifi subsystem based on
-mapagent configuration.
-wireless_teardown - tear down ifaces in /etc/config/wireless
-setup_network     - prepare /etc/config/network
-setup_wireless    - prepare /etc/config/wireless
-write_credentials - write bBSS credentials to fBSS
-EOF
-	exit 1
-}
-
-
-type_to_multi_ap () {
-	type="$1"
-
-	if [ "$type" = "backhaul" ]; then
-		echo "1"
-		return
-	elif [ "$type" = "fronthaul" ]; then
-		echo "2"
-		return
-	elif [ "$type" = "combined" ]; then
-		echo "3"
-		return
-	fi
-
-	echo "0"
-}
-
-get_type_by_section() {
-	section="$1"
-
-	config_get type $section type "0"
-
-	echo "$(type_to_multi_ap $type)"
-}
-
-sync_credentials() {
-	bands=""
-	json_init
-	mapagent_process_fh() {
-		local section=$1
-		local dev=$2
-
-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
-
-		config_get device $section device
-
-		[ "$dev" != "$device" ] && return
-
-		config_get band $section band
-		config_get ssid $section ssid
-		config_get encryption $section encryption
-		config_get key $section key
-
-		section=$(uci add ieee1905 ap)
-		[ "$section" == "" ] && return
-
-		uci -q set ieee1905.${section}.band=$band
-		uci -q set ieee1905.${section}.ssid="$ssid"
-		uci -q set ieee1905.${section}.encryption=$encryption
-		uci -q set ieee1905.${section}.key="$key"
-		json_select "$band" > /dev/null
-		if [ "$?" = "0" ]; then
-			json_get_keys keys
-
-			for key in ${keys};
-			do
-				json_get_var val "$key"
-				uci -q set ieee1905.${section}.$key="$val"
-			done
-			json_select ..
-		fi
-	}
-
-	mapagent_process_radio() {
-		local section=$1
-
-		config_get device $section device
-		config_get band $section band
-		config_get dedicated_backhaul $section dedicated_backhaul 0
-
-		[ "$dedicated_backhaul" != "0" ] && return
-
-		for b in $bands; do
-			if [ "$b" == "$band" ]; then
-				return
-			fi
-		done
-
-		config_foreach mapagent_process_fh ap $device
-		bands="$bands $band"
-	}
-
-	ieee1905_del_ap() {
-		append_value() {
-			local section=$1
-			local key=$2
-			shift
-			shift
-
-			while [ "$key" != "" ]; do
-				val=$(uci -q get ieee1905.$section.$key)
-				[ "$val" = "" ] && {
-					key=$1
-					shift
-					continue
-				}
-				json_add_string "$key" ${val}
-				key=$1
-				shift
-			done
-		}
-
-		local section=$1
-		local band
-
-		config_get band $section band
-		json_select "$band" > /dev/null
-		rc=$?
-		[ "$rc" != "0" ] && json_add_object "$band"
-		append_value $section "manufacturer" "model_name" "device_name" "model_number" "serial_number" "device_type" "os_version"
-		if [ "$rc" != "0" ]; then
-			json_close_object
-		else
-			json_select ..
-		fi
-
-		uci -q delete ieee1905.${section}
-	}
-
-	config_load ieee1905
-	config_foreach ieee1905_del_ap ap
-
-	config_load mapagent
-	config_foreach mapagent_process_radio radio
-
-	uci commit ieee1905
-	json_cleanup
-}
-
-write_credentials() {
-	config_load mapagent
-
-	mapagent_apply_wireless() {
-		write_wireless() {
-			local section=$1
-			local map_ifname=$2
-			local bk_ssid="$3"
-			local bk_key="$4"
-
-			config_get ifname $section ifname
-
-			#echo found device=$device map=$multi_ap ifname=$ifname mapifname=$map_ifname
-
-			[ "$ifname" != "$map_ifname" ] && return
-
-			#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
-
-			uci -q set wireless.${section}.multi_ap_backhaul_ssid="$bk_ssid"
-			uci -q set wireless.${section}.multi_ap_backhaul_key="$bk_key"
-		}
-		config_load wireless
-
-		config_foreach write_wireless wifi-iface "$1" "$2" "$3"
-	}
-
-	mapagent_find_fbss() {
-		local section=$1
-		local dev=$2
-		local bk_ssid="$3"
-		local bk_key="$4"
-
-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
-
-		config_get device $section device
-
-		#echo found dev=$dev device=$device map=$multi_ap
-
-		[ "$device" != "$dev" ] && return
-		[ "$multi_ap" != "2" ] && return
-
-		config_get ifname $section ifname
-
-		#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
-
-		# subshell in hopes to maintain mapagent config loaded
-		(mapagent_apply_wireless $ifname "$bk_ssid" "$bk_key")
-	}
-
-	mapagent_find_bbss() {
-		local section=$1
-		local dev=$2
-
-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
-
-		config_get device $section device
-		config_get enabled $section enabled "1"
-
-		#echo found dev=$dev device=$device map=$multi_ap
-
-		[ "$enabled" == "0" ] && return
-		[ "$device" != "$dev" ] && return
-		[ "$multi_ap" != "1" ] && return
-
-		config_get ssid $1 ssid
-		config_get key $1 key
-
-		#echo found ssid="$ssid" key="$key"
-
-		config_foreach mapagent_find_fbss ap $dev "$ssid" "$key"
-	}
-
-	mapagent_process_radio() {
-		local section=$1
-
-		config_get device $section device
-
-		#echo found dev=$dev
-
-		config_foreach mapagent_find_bbss ap $device
-	}
-
-
-	config_foreach mapagent_process_radio radio
-
-	uci commit wireless
-}
-
-set_network() {
-	local ifname=$1
-	local num=$2
-	local bssid=$3
-
-	wpa_cli -i $ifname set_n $num bssid $bssid
-}
-
-bsta_steer() {
-	local ifname=$1
-	local bssid=$2
-
-	rc=$(wpa_cli -i $ifname set_n 0 bssid $bssid)
-	[ "$rc" == "FAIL" ] && {
-		echo "1"
-		return;
-	}
-
-	rc=$(wpa_cli -i $ifname roam $bssid)
-	[ "$rc" == "FAIL" ] && {
-		echo "1"
-		return;
-	}
-}
-
-write_bsta_config() {
-	local ifname=$1
-
-	#echo diff = $diff > /dev/console
-
-
-	config_load mapagent
-
-	mapagent_apply_wl_bsta() {
-		apply_config() {
-			local section=$1
-			local bsta=$2
-			local bssid=$3
-
-			config_get ifname $section ifname
-
-			[ "$bsta" == "$ifname" ] || return
-			#echo setting diff = $diff > /dev/console
-			old_bssid="$(uci -q get wireless.${section}.bssid)"
-
-			[ "$old_bssid" == "$bssid" ] && break
-
-			uci -q set wireless.${section}.bssid=$bssid
-			wpa_cli -i "$bsta" set_n 0 bssid $bssid
-			wpa_cli -i "$bsta" save_config
-			echo 1
-		}
-		config_load wireless
-
-		config_foreach apply_config wifi-iface $1 $2
-		uci commit wireless
-	}
-
-	mapagent_process_bk() {
-		local section=$1
-		local bsta=$2
-
-
-		config_get ifname $section ifname
-		#echo bsta = $bsta > /dev/console
-
-		[ "$bsta" == "$ifname" ] || return
-		#echo found ifname=$ifname > /dev/console
-
-		config_get bssid $section bssid
-		config_get band $section band
-		ret=$(mapagent_apply_wl_bsta $ifname $bssid)
-		[ "$ret" == "1" ] && {
-			diff=1
-			onbrd_bssid=$bssid
-			onbrd_band=$band
-		}
-	}
-
-	mapagent_apply_bssid_same_band() {
-		apply_config() {
-			local section=$1
-			local bsta=$2
-
-			config_get ifname $section ifname
-
-			[ "$bsta" == "$ifname" ] || return
-			uci -q set wireless.${section}.bssid=$bssid
-		}
-
-		config_get band $1 band
-		config_get onboarded $1 onboarded "0"
-
-		[ "$onbrd_band" != "$band" -o "$onboarded" = "1" ] && return
-
-		config_get ifname $1 ifname
-
-		config_load wireless
-		config_foreach apply_config wifi-iface $ifname $onbrd_bssid
-		uci commit wireless
-	}
-
-	config_foreach mapagent_process_bk bsta $ifname
-
-	#echo result diff = $diff > /dev/console
-	[ "$diff" == "1" ] && {
-		(config_foreach mapagent_apply_bssid_same_band bsta)
-		#ubus call uci commit '{"config":"wireless"}'
-		#echo reloading wireless > /dev/console
-	}
-
-}
-
-teardown_iface() {
-	config_load mapagent
-
-	local iface=$1
-
-	mapagent_teardown_wireless() {
-		write_wireless() {
-			local section=$1
-			local map_ifname=$2
-
-			config_get ifname $section ifname
-
-			[ "$ifname" != "$map_ifname" ] && return
-
-			uci -q set wireless.${section}.disabled="1"
-			uci -q set wireless.${section}.ssid="DISABLED-SSID"
-			uci -q set wireless.${section}.key="DISABLED-KEY"
-			uci -q delete wireless.${section}.multi_ap_backhaul_ssid
-			uci -q delete wireless.${section}.multi_ap_backhaul_key
-		}
-
-		config_load wireless
-
-		config_foreach write_wireless wifi-iface $1
-	}
-
-	mapagent_teardown_bss() {
-		local section=$1
-		local iface=$2
-
-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
-
-		config_get ifname $section ifname
-
-		[ "$iface" != "$ifname" ] && return
-
-		config_get ifname $section ifname
-		uci -q set mapagent.${section}.enabled="0"
-		uci -q set mapagent.${section}.ssid="DISABLED-SSID"
-		uci -q set mapagent.${section}.key="DISABLED-KEY"
-
-		# subshell in hopes to maintain mapagent config loaded
-		(mapagent_teardown_wireless $ifname)
-	}
-
-
-	config_foreach mapagent_teardown_bss ap $iface
-
-	uci commit wireless
-	uci commit mapagent
-}
-
-bsta_to_wireless() {
-	config_load mapagent
-
-	mapagent_find_lowest_prio_onboarded() {
-		mapagent_process_bk() {
-			config_get priority $1 priority "2"
-			config_get onboarded $1 onboarded "0"
-
-			[ "$onboarded" = "0" ] && return
-
-			if [ -z "$sec" -o "$prio" = "-1" -o "$priority" -lt "$prio" ]; then
-				sec=$1
-				prio=$priority
-			fi
-		}
-
-		local sec=""
-		local prio="-1"
-
-		config_foreach mapagent_process_bk bsta
-		echo $sec
-	}
-
-	mapagent_enable_best() {
-		#echo 1=$1 best=$best > /dev/console
-		if [ "$1" = "$best" ]; then
-			uci -q set mapagent.$1.enabled='1'
-		else
-			uci -q set mapagent.$1.enabled='0'
-		fi
-	}
-
-	mapagent_bsta_to_wireless() {
-		mapagent_apply_wl_bsta() {
-			apply_config() {
-				local section=$1
-				local bsta=$2
-				local ssid="$3"
-				local key="$4"
-				local encryption=$5
-				local enabled=$6
-				local bssid=$7
-				local disabled="0"
-
-				config_get ifname $section ifname
-
-				[ -z "$enabled" -o "$enabled" = "0" ] && disabled="1"
-
-				[ "$bsta" == "$ifname" ] || return
-
-				uci -q set wireless.${section}.ssid="$ssid"
-				uci -q set wireless.${section}.key="$key"
-				uci -q set wireless.${section}.encryption=$encryption
-				uci -q set wireless.${section}.bssid="$bssid"
-				uci -q set wireless.${section}.default_disabled='0'
-
-				[ "$disabled" != "1" ] && return
-				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
-				wpa_cli -i "$bsta" disable_network 0 > /dev/null 2>&1
-				wpa_cli -i "$bsta" save_config > /dev/null 2>&1
-
-				echo 1
-			}
-
-			config_load wireless
-
-			config_foreach apply_config wifi-iface $@
-			uci commit wireless
-		}
-
-		mapagent_find_other_creds() {
-			#echo "trying to find other creds for $2" > /dev/console
-			local other_section="$2"
-
-			config_get band $1 band
-			config_get onboarded $1 onboarded "0"
-
-			[ "$4" != "$band" -o "$onboarded" = "0" ] && return
-
-			config_get ssid $1 ssid
-			config_get key $1 key
-			config_get encryption $1 encryption
-			config_get enabled $1 enabled "0"
-			config_get bssid $1 bssid
-
-			uci -q set mapagent.${other_section}.ssid="$ssid"
-			uci -q set mapagent.${other_section}.key="$key"
-			uci -q set mapagent.${other_section}.encryption=$encryption
-			uci -q set mapagent.${other_section}.bssid="$bssid"
-			uci commit mapagent
-			(mapagent_apply_wl_bsta "$3" "$ssid" "$key" $encryption "$5" "$bssid")
-		}
-
-		config_get band $1 band
-		config_get ifname $1 ifname
-		config_get onboarded $1 onboarded "0"
-		config_get enabled $1 enabled "0"
-
-		if [ "$onboarded" = "0" ]; then
-			config_foreach mapagent_find_other_creds bsta $1 $ifname $band $enabled
-		else
-			config_get ssid $1 ssid
-			config_get key $1 key
-			config_get encryption $1 encryption
-			config_get bssid $1 bssid
-
-			(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
-		fi
-	}
-
-#	best=$(mapagent_find_lowest_prio_onboarded)
-#
-#	[ -z "$best" ] && return
-#
-#	band=$1
-#	sec=""
-#	prio=""
-#
-#	config_foreach mapagent_enable_best bsta $best
-#	uci commit mapagent
-	config_load mapagent
-
-	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
-
-#	[ "$diff" != "" ] && {
-
-		ubus call uci commit '{"config":"wireless"}'
-#	}
-}
-
-
-sync_mapcontroller_from_wireless() {
-	ubus -t 5 wait_for wifi
-	[ "$?" != "0" ] && return
-
-	[ ! -f "/etc/config/wireless" ] && return
-
-	status=$(ubus -S call wifi status)
-
-	device_to_band() {
-		local ifname=$1
-		json_load "$status"
-		json_select "radios"
-		json_get_keys keys
-
-		for key in $keys; do
-			json_select $key
-			json_get_var name name
-
-			if [ "$name" != "$ifname" ]; then
-				json_select ..
-				continue
-			fi
-
-			json_get_var band band
-
-			if [ "$band" == "5GHz" ]; then
-				echo "5"
-			elif [ "$band" == "2.4GHz" ]; then
-				echo "2"
-			fi
-
-			break
-		done
-
-		json_cleanup
-	}
-
-	wireless_process_iface() {
-		local section=$1
-		local type="ap"
-		local enabled="1"
-
-		config_get multi_ap $section multi_ap 0
-		[ "$multi_ap" != "1" ] && [ "$multi_ap" != "2" ] && return
-
-		config_get mode $section mode "ap"
-		[ "$mode" != "ap" ] && return
-
-		config_get device $section device
-		band=$(device_to_band $device)
-		[ "$band" == "" ] && return
-
-		config_get ssid $section ssid
-		config_get key $section key
-		config_get encryption $section encryption
-		config_get start_disabled $section start_disabled "0"
-		config_get network $section network
-
-
-		cntlr_section=$(uci add mapcontroller ${type})
-		uci -q set mapcontroller.${cntlr_section}.ssid="$ssid"
-		uci -q set mapcontroller.${cntlr_section}.key="$key"
-		uci -q set mapcontroller.${cntlr_section}.encryption="$encryption"
-		uci -q set mapcontroller.${cntlr_section}.band="$band"
-		uci -q set mapcontroller.${cntlr_section}.vid="1"
-		uci -q set mapcontroller.${cntlr_section}.network="$network"
-
-		[ "$multi_ap" == "1" ] && map_type="backhaul" || map_type="fronthaul"
-		uci -q set mapcontroller.${cntlr_section}.type="$map_type"
-
-		[ "$start_disabled" == "1" ] && enabled="0"
-		uci -q set mapcontroller.${cntlr_section}.enabled="$enabled"
-	}
-
-	mapcontroller_teardown() {
-		local section=$1
-
-		uci delete mapcontroller.$1
-	}
-
-	config_load mapcontroller
-	config_foreach mapcontroller_teardown ap
-
-	config_load wireless
-	config_foreach wireless_process_iface wifi-iface
-	uci commit mapcontroller
-}
-
-bsta_scan_on_enabled() {
-	local onboarded_bands=""
-
-	mapagent_onboarded_bands() {
-		config_get band $1 band
-		config_get onboarded $1 onboarded "0"
-
-		[ "$onboarded" = "0" ] && return
-
-		onboarded_bands="$onboarded_bands $band"
-	}
-
-	mapagent_enable_bk() {
-		config_get ifname $1 ifname
-		config_get band $1 band
-		config_get enabled $1 enabled
-
-		[ "$enabled" = "0" ] && return
-
-		for onboarded_band in $onboarded_bands
-		do
-			[ "$onboarded_band" != "$band" ] && continue
-
-			logger -t multiap "bsta_scan_on_enabled $ifname $band"
-			wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
-			wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
-			wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-		done
-	}
-
-	config_load mapagent
-	config_foreach mapagent_onboarded_bands bsta
-	config_foreach mapagent_enable_bk bsta
-}
-
-bsta_enable_all() {
-	mapagent_enable_bk() {
-		config_get ifname $1 ifname
-		uci -q set mapagent.$1.enabled="1"
-	}
-
-	config_load mapagent
-
-	config_foreach mapagent_enable_bk bsta
-	uci commit mapagent
-	bsta_scan_on_enabled
-}
-
-bsta_clear_all_bssid() {
-	mapagent_remove_bssid() {
-		uci -q set mapagent.$1.enabled="1"
-		uci -q del mapagent.$1.bssid
-	}
-
-	wireless_remove_bssid() {
-		config_get mode $1 mode
-		config_get ifname $1 ifname
-
-		[ "$mode" != "sta" ] && return
-
-		uci -q del wireless.$1.bssid
-		wpa_cli -i "$ifname" bssid 0 00:00:00:00:00:00 > /dev/null 2>&1
-		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-	}
-
-	config_load mapagent
-	config_foreach mapagent_remove_bssid bsta
-	uci commit mapagent
-
-	config_load wireless
-	config_foreach wireless_remove_bssid wifi-iface
-	uci commit wireless
-}
-
-# arg1 = ifname arg2 = bssid
-bsta_blacklist_bssid_set() {
-	local ifname="$1"
-	shift
-	local bssid="$@"
-
-	wpa_cli -i "$ifname" set_network 0 bssid_ignore "$bssid" > /dev/null 2>&1
-	wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-}
-
-bsta_blacklist_bssid_clear() {
-	mapagent_blacklist_by_band() {
-		config_get ifname $1 ifname
-
-		wpa_cli -i "$ifname" set_network 0 bssid_ignore "" > /dev/null 2>&1
-		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-	}
-
-	config_load mapagent
-	config_foreach mapagent_blacklist_by_band bsta
-}
-
-bsta_disable_lower_priority() {
-	config_load mapagent
-
-	mapagent_get_priority() {
-		config_get ifname $1 ifname
-
-		[ "$ifname" != "$2" ] && return
-
-		config_get priority $1 priority "2"
-
-		echo "$priority"
-	}
-
-	mapagent_disable_lower_bk() {
-		mapagent_apply_wl_bsta() {
-			apply_config() {
-				local section="$1"
-				local bsta="$2"
-				local enabled="$3"
-
-				config_get ifname $section ifname
-
-				[ "$bsta" == "$ifname" ] || return
-
-				[ "$enabled" != "0" ] && return
-
-				wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
-				wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
-				wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-			}
-			local ifname="$1"
-			local enabled="$2"
-
-			[ "$enabled" != "0" ] && return
-
-			config_load wireless
-
-			config_foreach apply_config wifi-iface $ifname $enabled
-		}
-
-		local enabled="1"
-
-		config_get ifname $1 ifname
-		config_get priority $1 priority
-
-		[ "$ifname" != "$2" -a "$priority" -gt "$3" ] && enabled="0"
-
-		uci -q set mapagent.$1.enabled="$enabled"
-
-		(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
-	}
-
-	local bsta=$1
-
-	prio=$(config_foreach mapagent_get_priority bsta $bsta)
-	#echo bsta $bsta has prio $prio > /dev/console
-
-	config_foreach mapagent_disable_lower_bk bsta $bsta $prio
-	uci commit mapagent
-
-#	ubus call uci commit '{"config":"wireless"}'
-}
-
-
-bsta_use_link() {
-	config_load mapagent
-
-	mapagent_disable_bk() {
-		local bsta="$2"
-
-		config_get ifname $1 ifname
-		config_get enabled $1 enabled
-
-		[ "$bsta" = "$ifname" ] && return
-
-		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
-		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-	}
-
-	local bsta=$1
-
-	config_foreach mapagent_disable_bk bsta $bsta
-}
-
-bsta_swap_to_link() {
-	bsta_disable_lower_priority $1
-	bsta_use_link $1
-
-	wpa_cli -i "$1" enable_network 0 > /dev/null
-	wpa_cli -i "$1" reconnect > /dev/null
-	wpa_cli -i "$1" save_config > /dev/null
-}
-
-set_uplink_backhaul_info() {
-	local ul_1905id=$1
-	local ul_mac=$2
-
-	(
-		flock -x 200
-		json_load "$(cat $MAPFILE)"
-		json_add_string "backhaul_device_id" "$ul_1905id"
-		json_add_string "backhaul_macddr" "$ul_mac"
-		json_dump > "$MAPFILE"
-		json_cleanup
-	) 200>/var/lock/map.backhaul.lock
-}
-
-set_uplink() {
-	local type=$1
-	local ifname=$2
-	local hwaddr
-
-	hwaddr="$(ifconfig $ifname | grep -i hwaddr | awk '{print $5}' | awk '{print tolower($0)}')"
-
-	json_init
-	json_add_string "type" "$type"
-	json_add_string "ifname" "$ifname"
-	json_add_string "macaddr" "$hwaddr"
-	(
-		flock -x 200
-		json_dump > "$MAPFILE"
-	) 200>/var/lock/map.backhaul.lock
-	json_cleanup
-
-	config_load mapagent
-
-	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
-
-	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
-		ubus call map.agent toggle_fh '{"enable":true, "prevent_island":true, "ifname":"all"}'
-	fi
-
-}
-
-unset_uplink() {
-	local type=${1:-wifi}
-
-	config_load mapagent
-
-	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
-
-	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
-		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
-	fi
-
-	(
-		flock -x 200
-		json_load "$(cat $MAPFILE)"
-		json_get_var bk_type type
-		json_cleanup
-
-		[ "$type" = "$bk_type" ] && rm -f "$MAPFILE" > /dev/null 2>&1
-	) 200>/var/lock/map.backhaul.lock
-}
-
-func=$1
-shift
-
-case "$func" in
-	wireless_teardown) wireless_teardown;;
-	setup_network) setup_network;;
-	setup_wireless) setup_wireless;;
-	write_credentials) write_credentials;;
-	sync_credentials) sync_credentials;;
-	bsta_steer) bsta_steer $@;;
-	set_network) set_network $@;;
-	write_bsta_config) write_bsta_config $@;;
-	teardown_iface) teardown_iface $@;;
-	bsta_to_wireless) bsta_to_wireless $@;;
-	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
-	ts) ts_sub $@;;
-	bsta_enable_all) bsta_enable_all $@;;
-	bsta_clear_all_bssid) bsta_clear_all_bssid $@;;
-	bsta_blacklist_bssid_set) bsta_blacklist_bssid_set $@;;
-	bsta_blacklist_bssid_clear) bsta_blacklist_bssid_clear $@;;
-	bsta_disable_lower_priority) bsta_disable_lower_priority $@;;
-	bsta_scan_on_enabled) bsta_scan_on_enabled $@;;
-	bsta_use_link) bsta_use_link $@;;
-	bsta_swap_to_link) bsta_swap_to_link $@;;
-	set_uplink) set_uplink $@;;
-	set_uplink_backhaul_info) set_uplink_backhaul_info $@;;
-	unset_uplink) unset_uplink $@;;
-	--help|help) usage;;
-	*) usage; exit 1;;
-esac
-

map-agent/files/lib/wifi/traffic_separation

@@ -1,210 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-AL_BRIDGE=${AL_BRIDGE-"br-lan"}
-PRIMARY_VID=${PRIMARY_VID-1}
-
-### Traffic Separation ###
-
-dbg() {
-	logger -t traffic_separation $@
-}
-
-ts_sub() {
-	ts_usage() {
-		cat <<EOF
-Usage: $0 [create|reload]
-Traffic Separation related functions.
-create vid - create vlan configuration with vlan_id
-reload     - reload network with new configuration
-EOF
-	exit 1
-	}
-
-	ts_create() {
-		_net_setup() {
-			local name=$1
-			local vid=$2
-			local proto=$3
-			local dev=$4
-			local port_dev=$5
-
-			[ -z "$(uci -q get network.${name})" ] || return
-
-			local ip_addr="192.168.${vid}.1"
-			local br_dev="${AL_BRIDGE/-/_}"
-			local tag=":t"
-
-			[ "${vid}" = "${PRIMARY_VID}" ] && {
-				tag=""
-
-				# Global options
-				[ -z "$(uci -q get network.${br_dev}.vlan_filtering)" ] && {
-					uci -q set network.${br_dev}.vlan_filtering=1;
-				}
-
-				uci -q delete network.lan.proto
-				uci -q delete network.lan.ipaddr
-				uci -q delete network.lan.netmask
-				uci -q delete network.lan.ip6assign
-			}
-
-			uci -q set network.${name}="interface"
-			uci -q set network.${name}.device="$dev"
-			uci -q set network.${name}.is_lan="1"
-
-			if [ "$proto" = "static" ] ; then
-				uci -q set network.${name}.proto="static"
-				# TODO vid > 255
-				uci -q set network.${name}.ipaddr="${ip_addr}"
-				uci -q set network.${name}.netmask="255.255.255.0"
-				uci -q set network.${name}.ip6assign '60'
-			else
-				uci -q set network.${name}.proto="dhcp"
-			fi
-
-			uci -q add network bridge-vlan
-			uci -q set network.@bridge-vlan[-1].device="$AL_BRIDGE"
-			uci -q set network.@bridge-vlan[-1].vlan="$vid"
-
-			for port in $(uci -q get network.${br_dev}.ports) ; do
-				echo $port | grep -q eth || continue
-				uci -q add_list network.@bridge-vlan[-1].ports="${port}${tag}"
-			done
-
-			uci -q add_list network.${br_dev}.ports="$port_dev"
-			uci -q add_list network.@bridge-vlan[-1].ports="$port_dev"
-
-			uci -q commit network
-		}
-
-		_dhcp_setup() {
-			local name=$1
-
-			[ -n "$(uci -q get dhcp.${name})" ] && return
-
-			uci -q set dhcp.${name}=dhcp
-			uci -q set dhcp.${name}.interface="${name}"
-			uci -q set dhcp.${name}.start="100"
-			uci -q set dhcp.${name}.limit="150"
-			uci -q set dhcp.${name}.leasetime="1h"
-			uci -q set dhcp.${name}.dhcpv4="server"
-			uci -q set dhcp.${name}.dhcpv6="server"
-			uci -q set dhcp.${name}.ra="server"
-			uci -q set dhcp.${name}.ra_slaac="1"
-			uci -q add_list dhcp.${name}.ra_flags="managed-config"
-			uci -q add_list dhcp.${name}.ra_flags="other-config"
-
-			uci -q commit dhcp
-		}
-
-		_firewall_setup() {
-			local name=$1
-			local network=$1
-			local vid=$2
-			local zone_exist=0
-
-			config_load firewall
-
-			_process_zone() {
-				local section=$1
-				local new_name=$2
-				local name
-
-				config_get name $section name
-
-				[ "$name" == "$new_name" ] && zone_exist=1
-			}
-
-			config_foreach _process_zone zone $name
-
-			[ "$zone_exist" != "0" ] && return
-
-			[ "${vid}" = "${PRIMARY_VID}" ] && {
-				uci -q delete firewall.lan
-			}
-
-			uci -q add firewall zone
-			uci -q set firewall.@zone[-1].name="$name"
-			uci -q add_list firewall.@zone[-1].network="$network"
-			uci -q set firewall.@zone[-1].input='ACCEPT'
-			uci -q set firewall.@zone[-1].output='ACCEPT'
-			uci -q set firewall.@zone[-1].forward='ACCEPT'
-
-			uci -q add firewall forwarding
-			uci -q set firewall.@forwarding[-1].src="$name"
-			uci -q set firewall.@forwarding[-1].dest="wan"
-
-			uci -q commit firewall
-		}
-
-		vid=$1
-
-		[ -n "$vid" ] || {
-			cat <<EOF
-VID required to configure.
-EOF
-			exit 1
-		}
-
-		ip link show sink${vid} 2> /dev/null || {
-			ip link add sink${vid} type veth peer name sink_peer${vid}
-		}
-
-		ip link set sink${vid} up
-		ip link set sink_peer${vid} up
-
-		proto="dhcp"
-		[ -x "/usr/sbin/mapcontroller" ] && proto="static" ;
-		_net_setup "vlan${vid}" ${vid} ${proto} "sink${vid}" "sink_peer${vid}"
-
-		[ -x "/usr/sbin/mapcontroller" ] && {
-			_dhcp_setup vlan${vid}
-			_firewall_setup vlan${vid} ${vid}
-		}
-	}
-
-	ts_reload() {
-		local dhcp_reload=$1
-
-		# workaround for missing backhaul wifi.ap.* ubus obj's:
-		# iterate in config and setup bh
-#		config_load wireless
-
-# _setup_bh_iface() {
-#			local sec=$1
-#			local iface=$2
-#			local bridge=$3
-
-#			config_get ifname $sec ifname
-
-#			config_get mode $sec mode
-#			config_get multi_ap $sec multi_ap "0"
-#			[ "$mode" = "ap" -a "$multi_ap" = "1" ] && {
-#				ts_create bh $ifname 1 2 br-map
-#			}
-		#}
-
-#		config_foreach _setup_bh_iface wifi-iface
-
-		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
-		ubus call uci commit '{"config":"network"}'
-		/etc/init.d/firewall reload
-
-
-		#for sink in $(ubus list network.interface.sink*) ; do
-		#	local sink_vlan=${sink/network.interface./}_vlan
-		#done
-	}
-
-	local func=$1
-	shift
-
-	case "$func" in
-		create) dbg "create $@"; ts_create $@;;
-		reload) dbg "reload $@"; ts_reload $@;;
-		--help|help) ts_usage;;
-		*) ts_usage; exit 1;;
-	esac
-}

map-controller/Config.in

@@ -6,5 +6,21 @@ config CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 	bool "Support Dynamic Controller configuration sync"
 	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 
+config CONTROLLER_EASYMESH_VENDOR_EXT
+	bool "Enable extra features through Easymesh vendor extension"
+	default y
+
+config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
+	string
+	default "\\\\x11\\\\x22\\\\x33"
+
+config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
+	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
+	default CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
+	help
+	Extra features not covered by the base Easymesh specification can be
+	enabled through CONTROLLER_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
+	through which such features would be exposed.
+
 endmenu
 endif

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.10.0.1
+PKG_VERSION:=2.11.0.14
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4cac1a57ede76550273ebd02aa13a1992d3645ab
+PKG_SOURCE_VERSION:=8a71dffdd66b2dcacf67353efcb09cb9127c1ea9
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -38,6 +38,7 @@ define Package/map-controller/config
 endef
 
 TARGET_CFLAGS += \
+	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
@@ -48,11 +49,18 @@ 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
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
+	$(CP) $(PKG_BUILD_DIR)/src/plugins/steer/rcpi/rcpi.so $(1)/usr/lib/mapcontroller/rcpi.so
 endef
 
 ifeq ($(LOCAL_DEV),1)

map-controller/files/etc/config/mapcontroller

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

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

@@ -19,16 +19,36 @@ 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' \
+		'allow_bgdfs:range(0,2629744)' \
+		'channel_plan:range(0,2629744)' \
+		'enable_ts:bool:false'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapcontroller" "Validation of controller section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	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' \
-		'allow_bgdfs:range(0,2629744)' \
-		'channel_plan:range(0,2629744)'
+		'bandsteer:bool:false' \
+		'diffsnr:range(0,100)'
 
 	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of controller section failed"
+		logger -s -t "mapcontroller" "Validation of sta_steering section failed"
 		IS_CFG_VALID=0
 		return 1
 	}
@@ -92,7 +112,7 @@ validate_radio_section() {
 	uci_validate_section mapcontroller $section "${1}" \
 			'agent_id:macaddr' \
 			'macaddr:macaddr' \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'steer_policy:range(0,2)' \
 			'util_threshold:range(0,255)' \
 			'rcpi_threshold:range(0,255)' \
@@ -115,6 +135,7 @@ validate_controller_config() {
 	IS_CFG_VALID=1
 
 	validate_controller_section &&
+		config_foreach validate_sta_steering_section sta_steering &&
 		config_foreach validate_ap_section ap &&
 		config_foreach validate_node_section node &&
 		config_foreach validate_radio_section radio

map-topology/Config.in

@@ -0,0 +1,22 @@
+if (PACKAGE_map-topology)
+
+menu "Configurations"
+
+config TOPOLOGYD_EASYMESH_VENDOR_EXT
+	bool "Enable extra features through Easymesh vendor extension"
+	default y
+
+config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
+	string
+	default "\\\\x11\\\\x22\\\\x33"
+
+config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI
+	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
+	default TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
+	help
+	Extra features not covered by the base Easymesh specification can be
+	enabled through TOPOLOGYD_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
+	through which such features would be exposed.
+
+endmenu
+endif

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.0.5
+PKG_VERSION:=2.5.1.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=8ddd80413d6ffd174cd1b4a6859e2a306af0d409
+PKG_SOURCE_VERSION:=ee72703a5c89983c881d8faedcdc749b54278790
 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
@@ -31,7 +31,12 @@ define Package/map-topology
 	TITLE:=Utility to build topology of a multi-AP network
 endef
 
+define Package/map-topology/config
+	source "$(SOURCE)/Config.in"
+endef
+
 TARGET_CFLAGS += \
+	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
@@ -43,6 +48,11 @@ endef
 
 MAKE_PATH:=src
 
+ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)\\\"
+endif
+
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/map-topology/* $(PKG_BUILD_DIR)/

map-topology/files/etc/config/hosts

@@ -2,3 +2,4 @@
 config global 'global'
 	option ageing_timer '1440'
 	option reboot_persistent '0'
+	list ifname 'br-lan'

mosquitto-auth-shadow/Makefile

@@ -0,0 +1,45 @@
+#
+# Copyright (c) 2022 Genexis B.V.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Erik Karlsson - initial implementation
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=mosquitto-auth-shadow
+PKG_VERSION:=1.0.0
+
+PKG_MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
+PKG_LICENSE:=EPL-2.0
+
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/mosquitto-auth-shadow
+  SECTION:=net
+  CATEGORY:=Network
+  TITLE:=mosquitto - /etc/shadow authentication plugin
+  DEPENDS:=mosquitto
+  USERID:=mosquitto=200:mosquitto=200 mosquitto=200:shadow=11
+endef
+
+define Package/mosquitto-auth-shadow/description
+  Plugin for the mosquitto MQTT message broker that authenticates
+  users using /etc/shadow
+endef
+
+define Package/mosquitto-auth-shadow/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mosquitto_auth_shadow.so $(1)/usr/lib/
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,mosquitto-auth-shadow))

mosquitto-auth-shadow/files/etc/uci-defaults/14_set-shadow-permissions

@@ -0,0 +1 @@
+chown root:shadow /etc/shadow && chmod 0640 /etc/shadow

mosquitto-auth-shadow/src/Makefile

@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2022 Genexis B.V.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License 2.0 which is available at
+# https://www.eclipse.org/legal/epl-2.0/
+#
+# SPDX-License-Identifier: EPL-2.0
+#
+# Contributors:
+#   Erik Karlsson - initial implementation
+#
+
+TARGETS = mosquitto_auth_shadow.so
+
+all: $(TARGETS)
+
+%.pic.o: %.c
+	$(CC) $(CFLAGS) -Wall -Werror -fPIC -c -o $@ $<
+
+mosquitto_auth_shadow.so: mosquitto_auth_shadow.pic.o
+	$(CC) $(LDFLAGS) -shared -o $@ $^
+
+clean:
+	rm -f *.o $(TARGETS)

mosquitto-auth-shadow/src/mosquitto_auth_shadow.c

@@ -0,0 +1,80 @@
+/*
+ * Copyright (c) 2022 Genexis B.V.
+ *
+ * This program and the accompanying materials are made available under the
+ * terms of the Eclipse Public License 2.0 which is available at
+ * https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ *
+ * Contributors:
+ *   Erik Karlsson - initial implementation
+ */
+
+#include <string.h>
+#include <shadow.h>
+#include <crypt.h>
+#include <mosquitto.h>
+#include <mosquitto_broker.h>
+#include <mosquitto_plugin.h>
+
+static int basic_auth_callback(int event, void *event_data, void *userdata)
+{
+	struct mosquitto_evt_basic_auth *ed = event_data;
+	struct spwd spbuf, *sp = NULL;
+	char buf[256];
+	struct crypt_data data;
+	char *hash;
+
+	/* Let other plugins or broker decide about anonymous login */
+	if (ed->username == NULL)
+		return MOSQ_ERR_PLUGIN_DEFER;
+
+	getspnam_r(ed->username, &spbuf, buf, sizeof(buf), &sp);
+
+	if (sp == NULL || sp->sp_pwdp == NULL)
+		return MOSQ_ERR_AUTH;
+
+	/* Empty string as hash means password is not required */
+	if (sp->sp_pwdp[0] == 0)
+		return MOSQ_ERR_SUCCESS;
+
+	if (ed->password == NULL)
+		return MOSQ_ERR_AUTH;
+
+	memset(&data, 0, sizeof(data));
+	hash = crypt_r(ed->password, sp->sp_pwdp, &data);
+
+	if (hash == NULL)
+		return MOSQ_ERR_AUTH;
+
+	if (strcmp(hash, sp->sp_pwdp) == 0)
+		return MOSQ_ERR_SUCCESS;
+
+	return MOSQ_ERR_AUTH;
+}
+
+int mosquitto_plugin_version(int supported_version_count,
+			     const int *supported_versions)
+{
+	return 5;
+}
+
+int mosquitto_plugin_init(mosquitto_plugin_id_t *identifier,
+			  void **user_data,
+			  struct mosquitto_opt *opts, int opt_count)
+{
+	*user_data = identifier;
+
+	return mosquitto_callback_register(identifier, MOSQ_EVT_BASIC_AUTH,
+					   basic_auth_callback, NULL, NULL);
+}
+
+int mosquitto_plugin_cleanup(void *user_data,
+			     struct mosquitto_opt *opts, int opt_count)
+{
+	mosquitto_plugin_id_t *identifier = user_data;
+
+	return mosquitto_callback_unregister(identifier, MOSQ_EVT_BASIC_AUTH,
+					     basic_auth_callback, NULL);
+}

obuspa/Config.in

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

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.16
+PKG_VERSION:=6.0.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cd47bcaf1cc82dfd5c10ea76491fd0dae4436cc6
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
+PKG_SOURCE_VERSION:=668748cd4801aa5af12d61d9b0837064b9f933cc
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -91,6 +91,7 @@ endif
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
+        $(Build/Patch)
 endef
 endif
 
@@ -100,6 +101,7 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
@@ -107,6 +109,7 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
 	$(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/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,30 +1,17 @@
 config obuspa 'global'
 	option enabled '1'
-	option interface 'loopback'
-	#option ifname 'lo'
 	option debug '1'
 	option log_level '1'
-	option prototrace '0'
-	#option db_file '/etc/obuspa/usp.db'
+	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'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/var/log/obuspa'
 
-config localagent 'localagent'
-	option Enable '1'
-
-# Adds Device.LocalAgent.Controller.
-config controller 'localcontroller'
-	option EndpointID 'proto::interop-usp-controller'
-	option Protocol 'MQTT'
-	option Topic '/usp/controller'
-	option mqtt 'localmqtt'
-	option assigned_role_name 'full_access'
-
 # Adds Device.LocalAgent.MTP.
-config mtp
+config mtp 'agent_mtp'
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
 	option mqtt 'localmqtt'
@@ -35,13 +22,30 @@ config mqtt 'localmqtt'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
 
+# Adds Device.LocalAgent.Controller.
+config controller 'localcontroller'
+	option EndpointID 'proto::interop-usp-controller'
+	option Protocol 'MQTT'
+	option Topic '/usp/controller'
+	option mqtt 'localmqtt'
+	option assigned_role_name 'full_access'
+
 # Add Device.LocalAgent.Subscription.
-config subscription
-	option ID 'default-boot-event-ACS'
-	option NotifType 'Event'
-	option ReferenceList 'Device.Boot!'
-	option Persistent 'true'
-	option controller 'localcontroller'
+#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'

obuspa/files/etc/obuspa/dmcaching_exclude.json

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

obuspa/files/etc/uci-defaults/01-fix-upgrade-uci

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+fix_stomp_section() {
+	local encryption
+
+	config_get_bool encryption $1 encryption ""
+	if [ -n "${encryption}" ]; then
+		uci_set obuspa $1 encryption ""
+		uci_set obuspa $1 EnableEncryption "$encryption"
+	fi
+}
+
+# fix the stomp encryption parameter
+config_load obuspa
+config_foreach fix_stomp_section stomp
+uci_commit

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

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

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

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

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

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

owsd/Makefile

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

periodicstats/Makefile

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

ponmngr/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ponmngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -17,11 +17,12 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/ponmngr
 	CATEGORY:=Utilities
-	TITLE:=ponmngr packets manager daemon
+	TITLE:=PON Manager
+	DEPENDS:=@(TARGET_brcmbca||TARGET_airoha)
 endef
 
 define Package/ponmngr/description
-	Configures pon
+	Configures PON
 endef
 
 #define Build/Prepare
@@ -32,7 +33,12 @@ define Build/Compile
 endef
 
 define Package/ponmngr/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/common/* $(1)/
+ifneq ($(CONFIG_TARGET_brcmbca),)
+	$(CP) ./files/broadcom/* $(1)/
+else ifneq ($(CONFIG_TARGET_airoha),)
+	$(CP) ./files/airoha/* $(1)/
+endif
 endef
 
 $(eval $(call BuildPackage,ponmngr))

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

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+set_serial_number() {
+	vendor_id=$1
+	vssn=$2
+
+	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
+}
+
+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
+	procd_open_instance omci
+	procd_set_param command /userfs/bin/omci
+	procd_close_instance
+}
+
+deinit_xpon() {
+	killall -9 omci 2>/dev/null
+	killall -9 ponmgr_cfg 2>/dev/null
+}
+

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

@@ -0,0 +1,30 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+set_serial_number() {
+	vendor_id=$1
+	vssn=$2
+
+	vendor_id="$(echo $vendor_id | hexdump -e '4/1 "%02X" "\n"')"
+	vendor_id=${vendor_id:0:8}
+
+	bs /b/c gpon onu_sn={vendor_id=$vendor_id,vendor_specific=$vssn}
+}
+
+init_xpon() {
+	procd_open_instance pon_msgd
+	procd_set_param command bcm_msgd -c gpon
+	procd_close_instance
+
+	procd_open_instance pon_daemon
+	procd_set_param command omcid start -n
+	procd_set_param respawn
+	procd_close_instance
+}
+
+deinit_xpon() {
+	# stopping omcid does not bring down the pon link, which should happen
+	# if ANI is disabled or stopped (go to O1)
+	gponctl stop
+}

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

@@ -0,0 +1,40 @@
+#!/bin/sh /etc/rc.common
+
+START=19
+STOP=91
+
+USE_PROCD=1
+
+. /lib/functions.sh
+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
+	fi
+
+	set_serial_number $vendor_id $vssn
+}
+
+start_service() {
+	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
+		configure_serial_number
+		init_xpon
+	fi
+}
+
+stop_service() {
+	deinit_xpon
+}
+
+service_triggers() {
+	procd_add_reload_trigger "xpon"
+}

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

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

ponmngr/files/etc/init.d/xpon

@@ -1,25 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=19
-STOP=10
-
-USE_PROCD=1
-
-. /lib/functions.sh
-include /lib/xpon
-
-start_service() {
-	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
-		init_xpon
-	fi
-}
-
-stop_service() {
-	# stopping omcid does not bring down the pon link, which should happen
-	# if ANI is disabled or stopped (go to O1)
-	deinit_xpon
-}
-
-service_triggers() {
-	procd_add_reload_trigger "xpon"
-}

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

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if [ -s "/etc/config/xpon" ]; then
-        if uci -q get xpon.ani >/dev/null; then
-                # 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"
-                                           
-uci commit xpon  

ponmngr/files/lib/xpon/broadcom.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-USE_PROCD=1
-
-. /lib/functions.sh
-
-init_xpon() {
-	procd_open_instance pon_msgd
-	procd_set_param command bcm_msgd -c gpon
-	procd_close_instance
-	procd_open_instance pon_daemon
-	procd_set_param command omcid start -n
-	procd_close_instance
-
-}
-
-deinit_xpon() {
-	gponctl stop
-}
-

port-management/files/etc/uci-defaults/15-ports-config-generate

@@ -30,17 +30,25 @@ populate_config_from_db() {
 }
 
 populate_config_from_device_tree() {
-	for port in $(find /proc/device-tree/ -name "port@*"); do
-		port="$(cat $port/label)"
+	for path in $(find /proc/device-tree/ -name "port@*"); do
+		port="$(cat $path/label)"
 		[ -n "$port" ] || continue
 		[ "$port" = "cpu" ] && continue
+		speed=1000
+		if [ -e "$path/phy-mode" ]; then
+			phymode="$(cat $path/phy-mode)"
+			case "$phymode" in
+				10000*) speed=10000 ;;
+				2500*) speed=2500 ;;
+			esac
+		fi
 		PORT="$(echo $port | tr '[a-z]' '[A-Z]')"
 		uci add ports ethport
 		uci rename ports.@ethport[-1]="$PORT"
 		uci set ports.@ethport[-1].enabled=1
 		uci set ports.@ethport[-1].name="$PORT"
 		uci set ports.@ethport[-1].ifname="$port"
-		uci set ports.@ethport[-1].speed=1000
+		uci set ports.@ethport[-1].speed="$speed"
 		uci set ports.@ethport[-1].duplex="full"
 		uci set ports.@ethport[-1].autoneg=1
 		uci set ports.@ethport[-1].eee=0
@@ -65,7 +73,7 @@ fi
 
 touch /etc/config/ports
 
-if [ -f /sbin/db ] && [ -f /etc/board-db/config/hw ]; then
+if [ -f /sbin/db -a -n "$(db get hw.board.ethernetPortOrder 2>/dev/null)" ]; then
 	populate_config_from_db
 elif [ -d /proc/device-tree/ ]; then
 	populate_config_from_device_tree

qosmngr/Makefile

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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