qosmngr: Split queue configuration functionality

bbf/Config_bbfdm.in

@@ -1,3 +1,7 @@
+if PACKAGE_libbbfdm
+
+menu "Configuration"
+
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -10,6 +14,10 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
+config BBF_TR181
+	bool "Enable TR-181 Data Model Support"
+	default y
+
 config BBF_TR104
 	bool "Enable TR-104 Data Model Support"
 	default y
@@ -20,12 +28,10 @@ config BBF_TR143
 
 config BBFDM_ENABLE_JSON_PLUGIN
 	bool "Enable json plugin to extend datamodel"
-	default y
+	default n
 
 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
-	default y
-
-config BBF_MAX_OBJECT_INSTANCES
-	int "Maximum number of instances per object"
-	default 255
+	default n
+endmenu
+endif

bbf/Makefile

@@ -1,69 +1,41 @@
 #
-# Copyright (C) 2022 IOPSYS
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.9.25
-
-PKG_SOURCE_PROTO:=git
+PKG_VERSION:=6.5.6
+PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=e87b25b08294c608aef1e73d1268b35073097592
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=aa25738c8e923a2ff54aaccb44bf8126435789f0
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
 
 define Package/libbbf_api
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for libbbfdm API
-endef
-
-define Package/libbbfdm/default
-  SECTION:=utils
-  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
 endef
 
 define Package/libbbfdm
-  $(Package/libbbfdm/default)
-  TITLE += (internal)
-  VARIANT:=internal
-endef
-
-define Package/libbbfdm-mbedtls
-  $(Package/libbbfdm/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/libbbfdm-openssl
-  $(Package/libbbfdm/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
-  CONFLICTS := libbbfdm-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/libbbfdm-wolfssl
-  $(Package/libbbfdm/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
-  CONFLICTS := libbbfdm-mbedtls libbbfdm-openssl
-  VARIANT:=wolfssl
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libcurl
 endef
 
 define Package/libbbfdm/config
@@ -85,83 +57,72 @@ define Build/Prepare
 endef
 endif
 
-CMAKE_OPTIONS += \
-	-DBBF_TR181=ON
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE \
+	-Wall -Werror \
+
+ifeq ($(CONFIG_BBF_TR181),y)
+CONFIGURE_ARGS += \
+	--enable-tr181
+endif
 
 ifeq ($(CONFIG_BBF_TR104),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR104=ON
+CONFIGURE_ARGS += \
+	--enable-tr104
 endif
 
 ifeq ($(CONFIG_BBF_TR143),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR143=ON
+CONFIGURE_ARGS += \
+	--enable-tr143
+endif
+
+ifeq ($(CONFIG_PACKAGE_libopenssl),y)
+CONFIGURE_ARGS += \
+	--enable-libopenssl
 endif
 
 ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
-CMAKE_OPTIONS += \
-	-DBBF_VENDOR_EXTENSION=ON
+CONFIGURE_ARGS += \
+	--enable-vendor-extension
 
-CMAKE_OPTIONS += \
-	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
-	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
+CONFIGURE_ARGS += \
+	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)" \
+	BBF_VENDOR_PREFIX="$(CONFIG_BBF_VENDOR_PREFIX)"
 
 endif ##CONFIG_BBF_VENDOR_EXTENSION
 
 ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
-CMAKE_OPTIONS += \
-	-DBBF_JSON_PLUGIN=ON
+CONFIGURE_ARGS += \
+	--enable-json-plugin
 endif
 
 ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
-CMAKE_OPTIONS += \
-	-DBBF_DOTSO_PLUGIN=ON
-endif
-
-ifeq ($(BUILD_VARIANT),openssl)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
-CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+CONFIGURE_ARGS += \
+	--enable-shared-library
 endif
 
 define Package/libbbf_api/install
 	$(INSTALL_DIR) $(1)/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
 endef
 
-define Package/libbbfdm/default/install
+define Package/libbbfdm/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/lib/bbfdm
-	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/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
+define Package/libbbfdm/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
 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)
-
-Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -170,12 +131,9 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/
 	$(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
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libbbf_api))
 $(eval $(call BuildPackage,libbbfdm))
-$(eval $(call BuildPackage,libbbfdm-openssl))
-$(eval $(call BuildPackage,libbbfdm-wolfssl))
-$(eval $(call BuildPackage,libbbfdm-mbedtls))

bulkdata/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 iopsys Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,25 +8,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.3.1
+PKG_VERSION:=1.0.3
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=b35e7862bc17fc11dc1f757c7b93900995a28633
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
-
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 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,24 +29,21 @@ 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 +curl +libblobmsg-json +libbbfdm +libbbf_api
+endef
+
+define Package/$(PKG_NAME)/description
+	BBF BulkData Collection
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/bulkdata/* $(PKG_BUILD_DIR)/
-endef
-endif
+	-D_GNU_SOURCE
 
 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_BIN) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/bbfdm
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/config/bulkdata

@@ -1,6 +1,43 @@
 
 config bulkdata 'bulkdata'
 	option enable '0'
-	#Log levels: Error=1, Warning=2, Info=3, Debug=4
+	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
 	option log_level '3'
 
+config profile
+	option profile_id '1'
+	option enable '0'
+	option name ''
+	option nbre_of_retained_failed_reports '0'
+	option protocol 'http'
+	option encoding_type ''
+	option reporting_interval '86400'
+	option time_reference '0'
+	option csv_encoding_field_separator ','
+	option csv_encoding_row_separator '
'
+	option csv_encoding_escape_character '"'
+	option csv_encoding_report_format 'column'
+	option csv_encoding_row_time_stamp 'unix'
+	option json_encoding_report_format 'objecthierarchy'
+	option json_encoding_report_time_stamp 'unix'
+	option http_url ''
+	option http_username ''
+	option http_password ''
+	option http_compression 'none'
+	option http_method 'post'
+	option http_use_date_header '1'
+	option http_retry_enable '0'
+	option http_retry_minimum_wait_interval '5'
+	option http_retry_interval_multiplier '2000'
+	option http_persist_across_reboot '0'
+
+config profile_parameter
+	option profile_id '1'
+	option name ''
+	option reference ''
+
+config profile_http_request_uri_parameter
+	option profile_id '1'
+	option name ''
+	option reference ''
+

bulkdata/files/etc/init.d/bulkdatad

@@ -1,4 +1,7 @@
 #!/bin/sh /etc/rc.common
+# Bulkdata Software
+# Copyright (C) 2020 iopsys Software Solutions AB
+# Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
 
 START=99
 STOP=10
@@ -7,16 +10,13 @@ USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
 start_service() {
-	local enable=$(uci -q get bulkdata.bulkdata.enable)
-
-	[ "$enable" != "1" ] && {
-		return 0
-	}
-
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_set_param respawn "3" "7" "0"
-	procd_close_instance
+	local bulkdata_enable=`uci -q get bulkdata.bulkdata.enable`
+	if [ "$bulkdata_enable" = "1" ]; then
+		procd_open_instance
+		procd_set_param command "$PROG"
+		procd_set_param respawn "3" "7" "0"
+		procd_close_instance
+	fi
 }
 
 boot() {

bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options

@@ -1,75 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-PROFILE_COUNT=1
-
-get_next_count()
-{
-	local config="$1"
-	local default_name="${2}"
-	local count=${3}
-	local found=0
-
-	if [ -z "$count" ]; then
-		count=1
-	fi
-
-	while [ "${found}" -ne 1 ]; do
-		uci -q get ${config}.${default_name}_${count} >/dev/null
-		if [ $? -eq 0 ]; then
-			count=$((count + 1))
-		else
-			found=1;
-		fi
-	done
-
-	echo "${default_name}_${count}"
-}
-
-translate_profile_id_to_profile_name() {
-	local section="${1}"
-	local profile_id="${2}"
-	local profile_name="${3}"
-	local curr_profile_id
-
-	config_get curr_profile_id "${section}" profile_id
-
-	[ -n "${curr_profile_id}" ] || return
-	
-	[ "${curr_profile_id}" != "${profile_id}" ] && return
-
-	uci -q set bulkdata.${section}.profile_name="${profile_name}"
-	uci -q set bulkdata.${section}.profile_id=""	
-}
-
-update_profile_sections() {
-	local section="${1}"
-	local default="${2}"
-	local profile_name
-
-	config_get profile_id "${section}" profile_id
-
-	[ -n "${profile_id}" ] || return
-
-	case "${section}" in
-		"cfg"*)
-			profile_name="$(get_next_count bulkdata ${default} ${PROFILE_COUNT})"
-			uci_rename bulkdata "${section}" "${profile_name}"
-		;;
-	esac
-	PROFILE_COUNT=$((PROFILE_COUNT + 1))
-
-	[ -n "$profile_name" ] && section="${profile_name}"
-
-	uci -q set bulkdata.${section}.profile_id=""
-
-	config_foreach translate_profile_id_to_profile_name profile_parameter "${profile_id}" "${profile_name}"
-	config_foreach translate_profile_id_to_profile_name profile_http_request_uri_parameter "${profile_id}" "${profile_name}"
-}
-
-config_load bulkdata
-config_foreach update_profile_sections profile profile
-uci commit bulkdata
-
-exit 0

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.5
+PKG_VERSION:=3.5.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cf4e91ffe0a1d83140fef5b41d16e581e5341cec
+PKG_SOURCE_VERSION:=ef9d4c6124d0ca66f048f3d678d9a25f13aa4207
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c
+	DEPENDS:= +libubox +ubus +uci +libxml2
 endef
 
 define Package/$(PKG_NAME)/description

dectmngr/files/etc/config/dect

@@ -1,3 +1,2 @@
 config dect 'global'
- 	option log_dect_cmbs 'syslog'
-        option log_level 'realtime,warning,error'
+	option log_dect_cmbs 'syslog'

dectmngr/files/etc/init.d/dectmngr

@@ -11,8 +11,6 @@ PROG=/usr/sbin/dectmngr
 LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 
-DECT_GPIO=$(db -q get hw.board.dect_gpio)
-
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
 	pidof $NAME && killall -q $NAME
@@ -32,7 +30,7 @@ start_service() {
 
 	test $(db get hw.board.hasDect) = "0" && return
 
-	[ -n "$DECT_GPIO" ] && echo 1 > /sys/class/gpio/gpio${DECT_GPIO}/value
+	echo 1 > /sys/class/gpio/gpio14/value
 
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
@@ -73,7 +71,7 @@ start_service() {
 stop_service() {
 	test $(db get hw.board.hasDect) = "0" && return
 
-	[ -n "$DECT_GPIO" ] && echo 0 > /sys/class/gpio/gpio${DECT_GPIO}/value
+	echo 0 > /sys/class/gpio/gpio14/value
 	stop_and_wait_dectmngr
 }
 
@@ -88,10 +86,8 @@ service_triggers()
 }
 
 boot() {
-	[ -n "$DECT_GPIO" ] && {
-		echo ${DECT_GPIO} > /sys/class/gpio/export
-		echo out > /sys/class/gpio/gpio${DECT_GPIO}/direction
-	}
+	echo 14 > /sys/class/gpio/export
+	echo out > /sys/class/gpio/gpio14/direction
 
 	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
 	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH

dslmngr/Makefile

@@ -28,6 +28,12 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
+else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
+  TARGET_PLATFORM=MEDIATEK
+else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
+  TARGET_PLATFORM=MARVELL
+else ifeq ($(CONFIG_TARGET_intel_mips),y)
+  TARGET_PLATFORM=INTEL
 else
   $(info Unexpected CONFIG_TARGET)
 endif

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_intel_mips||TARGET_iopsys_brcm63xx_arm)
 endef
 
 define Package/easy-qos/description
@@ -39,7 +39,11 @@ define Package/easy-qos/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
+ifeq ($(CONFIG_TARGET_intel_mips),y)
+	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
+else
 	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
+endif
 	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
 endef

easy-qos/files/etc/init.d/easy_qos.classcfg

@@ -0,0 +1,301 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+USE_PROCD=1
+
+RULE_LIST="/tmp/easy_qos_rule.list"
+CLIENT_LIST="/tmp/easy_qos_class_client.list"
+BRIDGE_INTF=""
+
+[ -f /etc/profile.d/intel.sh ] && {
+	. /etc/profile.d/intel.sh
+	sh /etc/profile.d/intel.sh
+}
+
+log() {
+	echo "${@}"|logger -t easy_qos_class -p debug
+}
+
+exec_log() {
+	${@}
+	if [ "${?}" -ne 0 ]; then
+		log "Failed to create ${@}";
+	fi
+}
+
+exec_class_log() {
+	${@} |grep -i successful
+	if [ "${?}" -ne 0 ]; then
+		log "Failed to create ${@}";
+		return 1
+	fi
+	return 0
+}
+
+get_priority() {
+	local prio=$(echo $1|tr 'A-Z' 'a-z');
+	case "${prio}" in
+		"lowest")
+			echo 8;;
+		"low")
+			echo 7;;
+		"besteffort")
+			echo 6;;
+		"normal")
+			echo 5;;
+		"video")
+			echo 4;;
+		"medium")
+			echo 3;;
+		"high")
+			echo 2;;
+		"highest")
+			echo 1;;
+	esac
+}
+
+get_mark() {
+	local prio=$(echo $1|tr 'A-Z' 'a-z');
+	case "${prio}" in
+		"lowest")
+			echo "0x41/0x3df";;
+		"low")
+			echo "0x82/0x3df";;
+		"besteffort")
+			echo "0xc3/0x3df";;
+		"normal")
+			echo "0x104/0x3df";;
+		"video")
+			echo "0x145/0x3df";;
+		"medium")
+			echo "0x186/0x3df";;
+		"high")
+			echo "0x1c7/0x3df";;
+		"highest")
+			echo "0x208/0x3df";;
+	esac
+}
+
+clean_client_entries() {
+	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
+}
+
+map_client_entries() {
+	local clients ip mac host
+
+	json_load "$(ubus call router.network 'clients')"
+	json_get_keys keys
+
+	for key in ${keys};
+	do
+		json_select ${key}
+		json_get_vars ipaddr macaddr hostname
+		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
+		json_select ..
+	done
+
+	json_init
+
+	IFS=";"
+	for client in ${clients};
+	do
+		macaddr=$(echo ${client} | cut -d" " -f1)
+		json_add_object "${macaddr//:/_}"
+		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
+		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
+		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
+		json_close_object
+	done
+
+	IFS=' '
+	echo `json_dump` > ${CLIENT_LIST}
+	json_cleanup
+}
+
+# Find the IP of a corresponding mac from arp table
+get_ipaddress() {
+	local clients ip mac host
+
+	json_load "$(cat ${CLIENT_LIST})"
+	json_get_keys keys
+
+	# jshn seems a bit iffy on having : in key, replace by _
+	json_select "${1//:/_}" 2 > /dev/null
+	json_get_var ip ip
+
+	echo "$ip"
+}
+
+check_and_create() {
+	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
+	# Create rule if not exists
+	if [ ${?} -ne 0 ]; then
+		exec_log iptables -t mangle -A PREROUTING ${@}
+	else
+		log "Rule exists for ${@}"
+	fi
+}
+
+create_ip_rule() {
+	local proto=$1; shift
+	local src_ip=$1; shift
+	local mark=$1; shift
+	local ports=$1;
+	local cmd="";
+
+	cmd="-j EXTMARK --set-mark ${mark}";
+	if [ "${proto}" != "icmp" ]; then
+		if [ -n "${ports}" ]; then
+			cmd="--match multiport --dports ${ports} ${cmd}";
+		fi
+	fi
+
+	if [ "${proto}" == "icmp" ]; then
+		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
+	elif [ "${proto}" == "all" ]; then
+		cmd="-p all $cmd"
+	else
+		cmd="-p ${proto} -m ${proto} $cmd"
+	fi
+	cmd="-s ${src_ip} $cmd"
+
+	check_and_create ${cmd}
+}
+
+is_lan_bridge() {
+	local _section=$1
+	local _type
+	local _is_lan
+
+	config_get _type "$section" "type"
+	config_get _is_lan "$section" "is_lan"
+
+	if [ "${_type}" == "bridge" -a "${_is_lan}" == "1" ]; then
+		BRIDGE_INTF="br-${_section}"
+	fi
+}
+
+get_bridge_interface() {
+	config_load network
+	config_foreach is_lan_bridge interface
+}
+
+validate_rule_section()
+{
+	uci_validate_section easy_qos rule "${1}" \
+		'priority:string' \
+		'macaddr:string' \
+		'proto:string:none' \
+		'port:list(uinteger)' \
+		'comment:string:none'
+}
+
+# Clear existing rules before applying new rules
+clear_existing_rules() {
+	# execute the delete rules written onto a file then delete the file
+	[ -f ${RULE_LIST} ] || return 0
+
+	while read line
+	do
+		log "Deleting old classification rules"
+		exec_class_log classcfg -D ${line} -i ${BRIDGE_INTF}
+	done <${RULE_LIST}
+
+	local rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
+	while [ -n "${rule}" ]; do
+		exec_log iptables -t mangle ${rule}
+		rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
+	done
+	sync
+
+	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
+}
+
+# classcfg -M local_dhcp -i lo -p udp --dport 67:67 --dport 68:68 -j mark --mark 1
+create_rule() {
+	local proto=$1; shift
+	local mac_addr=$1; shift
+	local mark=$1; shift
+	local ports=$1;
+	local cmd="";
+	# Rule name is uniqe, so we take hash of all the input as rule_name
+	local rule_name="$(echo ${mac_addr}${proto}${mark}${ports} |md5sum |head -c 30)"
+
+	cmd="-j mark --mark ${mark}";
+
+	if [ "${mac_addr}" != "none" ]; then
+		cmd="--smac ${mac_addr} ${cmd}";
+	fi
+
+	if [ "${proto}" != "icmp" ]; then
+		if [ "${ports}" != "none" ]; then
+			IFS=","
+			for port in ${ports};
+			do
+				cmd="--dport ${port}:${port} ${cmd}";
+			done
+			IFS=' '
+		fi
+	fi
+	if [ "${proto}" != "none" ]; then
+		cmd="-p ${proto} $cmd"
+	fi
+	cmd="-i ${BRIDGE_INTF} $cmd"
+	cmd="-A ${rule_name} $cmd"
+
+	# Store the rule_names for cleanup on reload
+	exec_class_log classcfg ${cmd}
+	[ $? -eq 0 ] && \
+		echo ${rule_name}  >> ${RULE_LIST}
+}
+
+manage_rule() {
+	local cfg="$1"
+	local priority macaddr proto port comment prio_num port_list ip ipmark
+
+	validate_rule_section "${1}" || {
+		log "Validation of section failed"
+		return 1;
+	}
+
+	prio_num=$(get_priority ${priority})
+	port_list=$(echo ${port}|sed 's/ /,/g')
+	ipmark=$(get_mark ${priority})
+	ip=$(get_ipaddress ${macaddr})
+
+	if [ -n "${prio_num}" ]; then
+		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
+			create_rule tcp ${macaddr} ${prio_num} ${port_list}
+			create_rule udp ${macaddr} ${prio_num} ${port_list}
+			if [ -n "${ip}" ]; then
+				create_ip_rule tcp ${ip} ${ipmark} ${port_list}
+				create_ip_rule udp ${ip} ${ipmark} ${port_list}
+			fi
+		else
+			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
+			if [ -n "${ip}" ]; then
+				create_ip_rule ${proto} ${ip} ${ipmark} ${port_list}
+			fi
+		fi
+	fi
+}
+
+reload_service() {
+	get_bridge_interface
+	map_client_entries
+	clear_existing_rules
+	config_load easy_qos
+	config_foreach manage_rule rule
+	clean_client_entries
+}
+
+start_service() {
+	[ -x /opt/intel/usr/sbin/classcfg ] || exit 0
+	reload_service
+	log "Easy QoS class installed"
+}
+
+service_triggers() {
+	procd_add_reload_trigger "easy_qos" "network"
+}
+

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.52
+PKG_VERSION:=6.4.34
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=822e9a50790970d14db254ffe3d7464709bcd3ca
+PKG_SOURCE_VERSION:=4b4f04fb2485909fc56b409ae89296a815a98988
 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

endptmngr/Makefile

@@ -7,18 +7,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=endptmngr
-PKG_VERSION:=0.7
+PKG_VERSION:=0.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=dc12712af8c4088f7873502ca845e51c68a1ada9
+PKG_SOURCE_VERSION:=94df920d39e8589c7ac7f5523bf372d48ef24c5e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
 export BUILD_DIR

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:=7e013f0afa68378d38a6bdc9b0c5a342bd3dd0a5
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2
@@ -38,6 +38,9 @@ define Package/$(PKG_NAME)/description
 	Command to extract sub images from FIT images.
 endef
 
+MAKE_FLAGS += \
+	CFLAGS+="-Wall"
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 

icwmp/Config_cwmp.in

@@ -1,14 +1,24 @@
+if PACKAGE_icwmp
+
+menu "Configuration"
 choice
-       prompt "Select ACS sever"
-       default CWMP_ACS_MULTI
-       depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
+	prompt "Select ACS sever"
+	default CWMP_ACS_MULTI
 
 config CWMP_ACS_MULTI
 	bool "No specific ACS, follow standard"
 
 config CWMP_ACS_HDM
-	bool "Select HDM as ACS server"
+	bool "HDM"
 endchoice
+
+config CWMP_DEBUG
+	bool "Compile with debug options"
+	default y
+
+config CWMP_DEVEL_DEBUG
+	bool "Compile with development debug options"
+	default n
+endmenu
+endif
+

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,71 +8,45 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.25.10
-
-PKG_SOURCE_PROTO:=git
+PKG_VERSION:=8.2.27
+PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=cb601366e6a91db532ba7d577f653a2b86c4a479
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=da88c8c28656b2db54ab205d26faccda68546c05
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
+PKG_LICENSE_FILES:=COPYING
 
-PKG_FIXUP:=autoreconf
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_CWMP_ACS_MULTI \
+	CONFIG_CWMP_ACS_HDM \
+	CONFIG_CWMP_DEBUG \
+	CONFIG_CWMP_DEVEL_DEBUG
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/icwmp/default
+define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
+  TITLE:=CWMP client
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl
 endef
 
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
-
-define Package/icwmp-openssl
-  $(Package/icwmp/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
-  VARIANT:=openssl
+define Package/$(PKG_NAME)/description
+ A free client implementation of CWMP (TR-069) protocol
 endef
 
-define Package/icwmp-wolfssl
-  $(Package/icwmp/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
-  CONFLICTS := icwmp-openssl
-  VARIANT:=wolfssl
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config_cwmp.in"
 endef
 
-define Package/icwmp-mbedtls
-  $(Package/icwmp/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_icwmp-mbedtls:libmbedtls
-  CONFLICTS := icwmp-openssl icwmp-wolfssl
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS += --enable-libopenssl
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
-CONFIGURE_ARGS += --enable-libwolfssl
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIGURE_ARGS += --enable-libmbedtls
-endif
-
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)
 define Build/Prepare
@@ -80,29 +54,46 @@ define Build/Prepare
 endef
 endif
 
-define Package/icwmp/default/install
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE \
+	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
+
+ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
+CONFIGURE_ARGS += \
+	--enable-acs=multi
+endif
+
+ifeq ($(CONFIG_CWMP_ACS_HDM),y)
+CONFIGURE_ARGS += \
+	--enable-acs=hdm
+endif
+
+ifeq ($(CONFIG_CWMP_DEBUG),y)
+CONFIGURE_ARGS += \
+	--enable-debug
+endif
+
+ifeq ($(CONFIG_CWMP_DEVEL_DEBUG),y)
+CONFIGURE_ARGS += \
+	--enable-devel
+endif
+
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-icwmp-generate-ssl $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
-	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
 endef
 
-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-openssl))
-$(eval $(call BuildPackage,icwmp-wolfssl))
-$(eval $(call BuildPackage,icwmp-mbedtls))
+$(eval $(call BuildPackage,$(PKG_NAME)))

icwmp/files/etc/bbfdm/json/CWMPManagementServer.json

@@ -1,36 +0,0 @@
-{
-	"json_plugin_version": 1,
-	"Device.CWMPManagementServer.": {
-		"type": "object",
-		"version": "2.15",
-		"protocols": [
-			"usp"
-		],
-		"access": false,
-		"array": false,
-		"dependency": "file:/etc/config/cwmp",
-		"EnableCWMP": {
-			"type": "boolean",
-			"version": "2.15",
-			"read": true,
-			"write": true,
-			"protocols": [
-				"usp"
-			],
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "cwmp",
-						"section": {
-							"name": "cpe"
-						},
-						"option": {
-							"name": "enable"
-						}
-					}
-				}
-			]
-		}
-	}
-}

icwmp/files/etc/config/cwmp

@@ -11,15 +11,15 @@ config acs 'acs'
 	option retry_min_wait_interval '5'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
+	option https_ssl_capath ''
 	option ipv6_enable '0'
 	option ip_version '4'
 
 config cpe 'cpe'
-	option enable '1'
+	option interface 'eth0.1'
 	option default_wan_interface 'wan'
-	option default_lan_interface 'lan'
 	option log_to_console 'disable'
-	option log_to_file 'disable'
+	option log_to_file 'enable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
 	option log_severity 'INFO'

icwmp/files/etc/firewall.cwmp

@@ -6,6 +6,7 @@ log() {
 }
 
 if [ ! -f "/var/state/cwmp" ]; then
+	touch "/var/state/cwmp"
 	exit 0;
 fi
 

icwmp/files/etc/icwmpd/update.sh

@@ -1,29 +1,43 @@
 #!/bin/sh
-. /lib/functions.sh
 
 log() {
-	echo "$@" |logger -t cwmp.update -p info
+	echo $@ |logger -t cwmp.update -p info
 }
 
 handle_icwmp_update() {
-	local cwmp_enable
-	config_load cwmp
+	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
+	local vendorspecinf=`ifstatus ${defwan} | jsonfilter -e "@.data.vendorspecinf"`
 
-	config_get_bool cwmp_enable cpe enable 1
-	if [ "$cwmp_enable" = "0" ]; then
-		return 0
-	fi
+	log "Handling dhcp option value ${vendorspecinf}"
+	[ -n "$vendorspecinf" ] && {
+		local url=""
+		local old_url="$(uci -q get cwmp.acs.dhcp_url)"
 
-	status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
-	if [ "$status" != "running" ]; then
-		log "Trigger out of bound inform, since last inform status was failure"
-		ubus -t 10 call tr069 inform >/dev/null 2>&1
-		# Handle timeout or tr069 object not found
-		if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
-			log "Restarting icwmp tr069 object"
-			/etc/init.d/icwmpd restart
+		case $vendorspecinf in
+			http://*|https://*)
+					url="${vendorspecinf}"
+				;;
+			*)
+				for optval in $vendorspecinf; do
+				        case $optval in
+				                1=*)
+				                        url="$(echo $optval | cut -d"=" -f2-)"
+				                ;;
+				        esac
+				done
+			;;
+		esac
+
+		if [ -n "$url" ]; then
+			log "## icwmp url[${old_url}] changed to [${url}]"
+			if [ "${url}" != "${old_url}" ]; then
+				log "Restarting icwmp url[${old_url}] changed to [${url}]"
+				uci -q set cwmp.acs.dhcp_url="$url"
+				uci commit cwmp
+				ubus call uci commit '{"config":"cwmp"}'
+			fi
 		fi
-	fi
+	}
 }
 
-handle_icwmp_update $@
+handle_icwmp_update

icwmp/files/etc/init.d/icwmpd

@@ -1,48 +1,20 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2015-2019 iopsys Software Solutions AB
 
+. /lib/functions.sh
+include /lib/network
+. /usr/share/libubox/jshn.sh
+
 START=99
-STOP=00
+STOP=2
 
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
 
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-include /lib/network
-
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
 
-regenerate_ssl_link()
-{
-	local cert_dir all_file rehash
-
-	cert_dir="${1}"
-	[ ! -d "${cert_dir}" ] && return 0;
-
-	### Generate all ssl link for pem certicates ###
-	all_file=$(ls $cert_dir/*.pem 2>/dev/null)
-	if [ -n "${all_file}" ]; then
-		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in $cfile)"
-			[ -f ${cert_dir}/${rehash}.0 ] || \
-				ln -s $cfile $cert_dir/${rehash}.0
-		done
-	fi
-
-	### Generate all ssl link for crt certicates ###
-	all_file=$(ls $cert_dir/*.crt 2>/dev/null)
-	if [ -n "${all_file}" ]; then
-		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in $cfile)"
-			[ -f ${cert_dir}/${rehash}.0 ] || \
-				ln -s $cfile $cert_dir/${rehash}.0
-		done
-	fi
-}
-
 enable_dhcp_option43() {
 	local wan="${1}"
 
@@ -64,213 +36,13 @@ enable_dhcp_option43() {
 	fi
 
 	newreqopts="$reqopts 43"
-	if [ "${proto}" == "dhcp" ]; then
+	if [ $proto == "dhcp" ]; then
 		uci -q set network.$wan.reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
 	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
@@ -278,49 +50,65 @@ wait_for_resolvfile() {
 	local resolvfile="$(uci -q get dhcp.@dnsmasq[0].resolvfile)"
 	[ -n "$resolvfile" ] || return
 
-	while [ ! -f "$resolvfile" ]; do
+	while [ ! -f $resolvfile ]; do
 		sleep 1
-		[ "$tm" -ge "$time" ] && break
+		[ $tm -ge $time ] && break
 		tm=$((tm+1))
 	done
 }
 
+set_wan_interface() {
+	local wan_interface="${1}"
+	local l3_device=""
+
+	if [ -z "${wan_interface}" ]; then
+		return 0;
+	fi
+
+	json_load "$(ifstatus ${wan_interface})"
+	json_get_var l3_device l3_device
+	if [ -n "$l3_device" ]; then
+		uci -q set cwmp.cpe.interface="${l3_device}"
+		uci -q commit cwmp
+	fi
+}
+
 copy_cwmp_etc_files_to_varstate() {
+	if [ ! -f /var/state/cwmp ]
+	then
+		if [ -f /etc/icwmpd/cwmp ]
+		then
+			uci -q -c /etc/icwmpd delete cwmp.acs
+			uci -q -c /etc/icwmpd commit cwmp
+			cp /etc/icwmpd/cwmp /var/state/cwmp
+		else
+			touch /var/state/cwmp
+		fi
+	fi
+
 	mkdir -p /var/run/icwmpd
-
-	if [ -f /etc/icwmpd/cwmp ]; then
-		uci -q -c /etc/icwmpd delete cwmp.acs
-		uci -q -c /etc/icwmpd commit cwmp
-		cp -f /etc/icwmpd/cwmp /var/state/cwmp
+	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
+	then
+		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
 	fi
-
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
-		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
-	fi
-
-	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]; then
-		cp -f /etc/icwmpd/dm_enabled_notify /var/run/icwmpd/ 2>/dev/null
+	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]
+	then
+		mv /etc/icwmpd/dm_enabled_notify /var/run/icwmpd 2>/dev/null
 	fi
 }
 
 copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]; then
-		cp -f /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd/ 2>/dev/null
+	if [ -f /var/state/cwmp ]
+	then
+		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
 	fi
-
-	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]; then
-		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
+	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]
+	then
+		cp /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
 	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
-
-	# move the successful custom notify import marker to persistent storage
-	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
-		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
+	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]
+	then
+		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
 	fi
 }
 
@@ -332,13 +120,12 @@ validate_acs_section()
 		'periodic_inform_interval:uinteger' \
 		'periodic_inform_time:string' \
 		'url:string' \
-		'dhcp_discovery:string' \
 		'dhcp_url:string' \
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
 		'retry_interval_multiplier:range(1000, 65535)' \
-		'ipv6_enable:bool' \
-		'ssl_capath:string'
+		'https_ssl_capath:file' \
+		'ipv6_enable:bool'
 
 }
 
@@ -367,7 +154,6 @@ validate_cpe_section()
 }
 
 validate_defaults() {
-	local ssl_capath
 	config_load cwmp
 
 	validate_acs_section || {
@@ -375,123 +161,96 @@ validate_defaults() {
 		return 1;
 	}
 
-	ssl_capath="${ssl_capath%/}"
-	# Put the cert pem file in keep list
-	if [ -d "${ssl_capath}" ]; 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
+	[ -z "${url}" -a -z "${dhcp_url}" ] && {
+		log "ACS url is empty can't start"
+		return 1;
+	}
 
 	validate_cpe_section || {
 		log "Validation of cpe section failed"
 		return 1;
 	}
 
+	[ -z "${default_wan_interface}" ] && {
+		log "Wan interface is empty"
+		return 1;
+	}
+
 	return 0;
 }
 
 boot() {
-	local dhcp_discovery="0"
+	local dhcp_url=""
+	local discovery="1"
 
 	config_load cwmp
-	config_get dhcp_discovery acs dhcp_discovery "0"
+	config_get_bool dhcp_discovery acs dhcp_discovery 1
+	config_get dhcp_url acs dhcp_url ""
 
-	config_get wan_interface cpe default_wan_interface "wan"
-	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
-		# Set dhcp option 43 if not already configured
-		enable_dhcp_option43 "${wan_interface}"
+	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
+		if [ -z "${dhcp_url}" ]; then
+			log "dhcp discovery enabled but no dhcp url, trigger update"
+			/etc/icwmpd/update.sh
+		fi
 	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
-
-	if [ -n "${ssl_capath}" ]; then
-		regenerate_ssl_link "${ssl_capath}"
-	fi
-
 	start
 }
 
 start_service() {
 	local enable_cwmp
+	local wan_interface
+	local dhcp_discovery
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
+	config_get dhcp_discovery acs dhcp_discovery
+	config_get wan_interface cpe default_wan_interface "wan"
 
-	if [ "$enable_cwmp" = "0" ]; then
+	if [ "$enable_cwmp" = "0" -o "$enable_cwmp" = "false" ]; then
+		log "CWMP is not enabled"
 		return 0
 	fi
 
+	# Set wan interface if not configured
+	set_wan_interface "${wan_interface}"
+
+	# Set dhcp option 43 if dhcp discovery enabled
+	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
+		enable_dhcp_option43 "${wan_interface}"
+	fi
+
 	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
 	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
 	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
 
+	# Copy backup data so that if it restart latter on it gets the info
+	copy_cwmp_etc_files_to_varstate
+
 	validate_defaults || {
 		log "Validation of defaults failed"
 		return 1;
 	}
 
-	# Copy backup data so that if it restart latter on it gets the info
-	copy_cwmp_etc_files_to_varstate
-
 	procd_open_instance icwmp
 	procd_set_param command "$PROG"
 	procd_append_param command -b
 	procd_set_param respawn \
-		"${respawn_threshold:-5}" \
-		"${respawn_timeout:-10}" "${respawn_retry:-3}"
+		${respawn_threshold:-5} \
+		${respawn_timeout:-10} ${respawn_retry:-3}
 
 	procd_set_param watch network.interface
 	procd_close_instance
 }
 
-service_stopped()
-{
-	copy_cwmp_varstate_files_to_etc
-}
-
 stop_service()
 {
 	copy_cwmp_varstate_files_to_etc
 }
 
 reload_service() {
-	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
-
-	status="$(ubus -t 1 call 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
-	fi
+	log "Restarting CWMP client"
+	stop
+	start
 }
 
 service_triggers() {

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

@@ -1,11 +1,7 @@
-#!/bin/sh
-
-. /lib/functions.sh
 # Copy defaults by the factory to the cwmp UCI user section.
-config_load cwmp
 
 # Get Manufacturer OUI.
-config_get oui cpe manufacturer_oui ""
+oui=$(uci -q get cwmp.cpe.manufacturer_oui)
 if [ -z "${oui}" ]; then
 	oui=$(db -q get device.deviceinfo.ManufacturerOUI)
 fi
@@ -13,29 +9,24 @@ fi
 oui=$(echo "${oui}" | tr 'a-f' 'A-F')
 
 # Get system serial number.
-config_get serial cpe serial_number ""
+serial=$(uci -q get cwmp.cpe.serial_number)
 if [ -z "${serial}" ]; then
 	serial=$(db -q get device.deviceinfo.SerialNumber)
 fi
 
 # Get userid values
-config_get acs_userid acs userid ""
-config_get cpe_userid cpe userid ""
+acs_userid=$(uci -q get cwmp.acs.userid)
+cpe_userid=$(uci -q get cwmp.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/etc/uci-defaults/95-icwmp-generate-ssl

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+regenerate_ssl_link(){
+	[ ! -d "/etc/ssl/certs" ] && return 0;
+	[ ! -f "/etc/ssl/certs/*.pem" ] && return 0;
+
+	local cert_dir="/etc/ssl/certs"
+	local all_file=$(ls $cert_dir/*.pem)
+
+	for cfile in $all_file
+	do
+		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
+	done
+}
+
+regenerate_ssl_link

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

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

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

@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2021-2022 IOPSYS
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.10.28
+PKG_VERSION:=4.6.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e10385f117bc20a8d16f1b57ad4f86d4a98552c0
+PKG_SOURCE_VERSION:=43cc5cac9a7dc1fd3a78f60509800d853d67d476
 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
@@ -57,10 +57,6 @@ $(call Package/ieee1905/Default,$(1))
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
-define Package/map-plugin/config
-  source "$(SOURCE)/Config.map-plugin.in"
-endef
-
 define Package/ieee1905/description
  This package provides IEEE Std 1905.1 stack.
 endef
@@ -78,11 +74,6 @@ 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
-endif
-
-
 MAKE_PATH:=src
 
 

ieee1905/files/etc/config/ieee1905

@@ -3,24 +3,20 @@ config ieee1905 'ieee1905'
 	option extension '1'
 	list extmodule 'map'
 	option registrar '2 5'
-#	option macaddress '0a:1b:2c:3d:4e:50'
 
-config al-iface
-	option enabled '1'
-	option ifname 'br-lan'
-	option type 'bridge'
-
-# ap sections are auto-generated/overwritten during onboarding
-#
 config ap
 	option band '2'
-	option ssid 'IOWRT-2.4GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
+	option ssid 'TestSSID.2'
+	option encryption 'psk2'
+	option key '5555500000'
 
 config ap
 	option band '5'
-	option ssid 'IOWRT-5GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
+	option ssid 'TestSSID.5'
+	option encryption 'psk2'
+	option key '2222200000'
 
+config al-iface
+	option enabled 1
+	option ifname 'br-lan'
+	option type 'bridge'

ieee1905/files/etc/init.d/ieee1905

@@ -5,82 +5,7 @@ STOP=21
 
 USE_PROCD=1
 
-IS_CFG_VALID=1
-
-validate_ieee1905_section() {
-	uci_validate_section ieee1905 ieee1905 "ieee1905" \
-			'enabled:bool:true' \
-			'macaddress:or("auto",macaddr)' \
-			'registrar:string' \
-			'extension:bool:false' \
-			'extmodule:list(string)' \
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "ieee1905" "Validation of ieee1905 section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ali_section() {
-	local section="$1"
-
-	uci_validate_section ieee1905 $section "${1}" \
-			'ifname:string' \
-			'type:or("bridge",string)'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "ieee1905" "Validation of al-iface section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ap_section() {
-	local section="$1"
-
-	uci_validate_section ieee1905 $section "${1}" \
-			'band:or("2", "5", "60")' \
-			'ssid:string' \
-			'encryption:or("psk2", "sae-mixed", "sae", string)' \
-			'key:string' \
-			'uuid:string' \
-			'manufacturer:string' \
-			'model_name:string' \
-			'device_name:string' \
-			'model_number:string' \
-			'serial_number:string' \
-			'device_type:string' \
-			'os_version:uinteger'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "ieee1905" "Validation of ap section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ieee1905_config() {
-	IS_CFG_VALID=1
-
-	validate_ieee1905_section &&
-		config_foreach validate_ali_section "al-iface" &&
-		config_foreach validate_ap_section ap
-
-	[ "$IS_CFG_VALID" -ne 1 ] && {
-		logger -s -t "ieee1905" "Validation of ieee1905 UCI file failed"
-		return 1
-	}
-	return 0
-}
-
 start_service() {
-	config_load "ieee1905"
-	validate_ieee1905_config || return 1;
-
 	procd_open_instance
         procd_set_param command "/usr/sbin/ieee1905d"
 	procd_set_param respawn

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

@@ -1,22 +0,0 @@
-#!/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/files/etc/uci-defaults/31-ifname-list-to-option

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-config_load ieee1905
-
-list_to_ifname() {
-	local section=$1
-
-	config_get ifname $section ifname	# get list as space separated values
-
-	uci del ieee1905.${section}.ifname	# delete entry
-	uci set ieee1905.${section}.ifname="$ifname"	# writeback entry as option
-}
-
-config_foreach list_to_ifname al-iface
-

inbd/Makefile

@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=inbd
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.2.2
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=d4e910a31039e0c0b7a539311eafcd716c36be77
+PKG_SOURCE_VERSION:=10f765f3d0fcc226b6ecf0c481598c9e7f76315e
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz

iop/Config.in

@@ -1,7 +0,0 @@
-config TARGET_VERSION
-	string
-	prompt "Software Version"
-
-config TARGET_CUSTOMER
-	string
-	prompt "Customer ID"

iop/Makefile

@@ -24,10 +24,6 @@ define Package/iop/description
 	This package contains iopsysWrt SDK utilities
 endef
 
-define Package/iop/config
-	source "$(SOURCE)/Config.in"
-endef
-
 define Build/Compile
 	true
 endef

iop/config

@@ -51,6 +51,7 @@ CONFIG_PACKAGE_wifimngr=y
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
 CONFIG_PACKAGE_map-topology=y
+CONFIG_PACKAGE_wfadatad=y
 CONFIG_PACKAGE_wfadatad-collector=y
 
 # Network #
@@ -64,16 +65,15 @@ CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
 
 # TR-x69 #
-CONFIG_PACKAGE_uspd-mbedtls=y
-CONFIG_PACKAGE_icwmp-mbedtls=y
+CONFIG_PACKAGE_uspd=y
+CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc-mbedtls=m
+CONFIG_PACKAGE_stunc=m
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_twamp=m
-CONFIG_PACKAGE_udpecho-client=m
-CONFIG_PACKAGE_udpecho-server=m
+CONFIG_PACKAGE_udpechoserver=m
 CONFIG_PACKAGE_xmppc=m
 
 # WebGUI #
@@ -118,6 +118,7 @@ CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
+CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nginx=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y
@@ -133,7 +134,6 @@ 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

iop/scripts/feeds_update.sh

@@ -32,7 +32,8 @@ function feeds_update {
     fi
 
     # targets need to be installed explicitly
-    for target in $(ls ./feeds/targets)
+    targets="iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt iopsys-bcm27xx iopsys-mediatek iopsys-econet"
+    for target in $targets
     do
 	rm -f target/linux/$target
 	./scripts/feeds install -p targets $target

libmicroxml/Makefile

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2012-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libmicroxml
+PKG_VERSION:=2012-06-11
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mirror/microxml.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+PKG_LICENSE:=LGPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libmicroxml
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=XML library
+  MAINTAINER:=Luka Perkov <luka@openwrt.org>
+endef
+
+define Package/libmicroxml/description
+ A micro sized XML library
+endef
+
+CONFIGURE_ARGS += \
+	--disable-threads \
+	--enable-static \
+	--enable-shared
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig
+endef
+
+define Package/libmicroxml/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,libmicroxml))

libmicroxml/patches/100-fix-memleak.patch

@@ -0,0 +1,130 @@
+diff --git a/mxml-file.c b/mxml-file.c
+index 02eca9d..f10d202 100644
+--- a/mxml-file.c
++++ b/mxml-file.c
+@@ -363,9 +363,12 @@ mxmlSaveFile(mxml_node_t    *node,	/* I - Node to write */
+   * Write the node...
+   */
+ 
+-  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0)
++  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0){
++    global_free(global);
+     return (-1);
+-
++  }
++  
++  global_free(global);
+   if (col > 0)
+     if (putc('\n', fp) < 0)
+       return (-1);
+@@ -1448,6 +1451,7 @@ mxml_load_data(
+   if ((buffer = malloc(64)) == NULL)
+   {
+     mxml_error("Unable to allocate string buffer!");
++    global_free(global);
+     return (NULL);
+   }
+ 
+@@ -2083,11 +2087,12 @@ mxml_load_data(
+ 		 node->parent ? node->parent->value.element.name : "(null)");
+ 
+       mxmlDelete(first);
+-
++      global_free(global);
+       return (NULL);
+     }
+   }
+ 
++  global_free(global);
+   if (parent)
+     return (parent);
+   else
+@@ -2102,7 +2107,7 @@ error:
+   mxmlDelete(first);
+ 
+   free(buffer);
+-
++  global_free(global);
+   return (NULL);
+ }
+ 
+diff --git a/mxml-private.c b/mxml-private.c
+index 4378ca3..ea6e452 100644
+--- a/mxml-private.c
++++ b/mxml-private.c
+@@ -41,6 +41,32 @@
+  * This code currently supports AIX, HP-UX, Linux, Mac OS X, Solaris, and
+  * Windows.  It might work on the BSDs and IRIX, but I haven't tested that.
+  */
++void *global_mem[16] = {0};
++
++static void *global_calloc(int x, int size)
++{
++  int i;
++  void *m = calloc(x, size);
++  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i > 0; i--) {
++    global_mem[i] = global_mem[i-1];
++  }
++  global_mem[0] = m;
++  return m;
++}
++
++void global_free(void *m)
++{
++  int i;
++  if (m == NULL)
++    return;
++  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i >= 0; i--) {
++    if (global_mem[i] == m) {
++      global_mem[i] = NULL;
++      free(m);
++      break;
++    }
++  }
++}
+ 
+ #if defined(__sun) || defined(_AIX)
+ #  pragma fini(_mxml_fini)
+@@ -148,7 +174,6 @@ mxml_real_cb(mxml_node_t *node)		/* I - Current node */
+   return (MXML_REAL);
+ }
+ 
+-
+ #ifdef HAVE_PTHREAD_H			/**** POSIX threading ****/
+ #  include <pthread.h>
+ 
+@@ -190,7 +215,6 @@ _MXML_FINI(void)
+   }
+ }
+ 
+-
+ /*
+  * '_mxml_global()' - Get global data.
+  */
+@@ -205,7 +229,7 @@ _mxml_global(void)
+ 
+   if ((global = (_mxml_global_t *)pthread_getspecific(_mxml_key)) == NULL)
+   {
+-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
++    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
+     pthread_setspecific(_mxml_key, global);
+ 
+     global->num_entity_cbs = 1;
+@@ -288,7 +312,7 @@ _mxml_global(void)
+ 
+   if ((global = (_mxml_global_t *)TlsGetValue(_mxml_tls_index)) == NULL)
+   {
+-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
++    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
+ 
+     global->num_entity_cbs = 1;
+     global->entity_cbs[0]  = _mxml_entity_cb;
+diff --git a/mxml-private.h b/mxml-private.h
+index c591208..72ed338 100644
+--- a/mxml-private.h
++++ b/mxml-private.h
+@@ -43,3 +43,4 @@ typedef struct _mxml_global_s
+ extern _mxml_global_t	*_mxml_global(void);
+ extern int		_mxml_entity_cb(const char *name);
+ 
++extern void global_free(void *m);

libtrace/Makefile

@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libtrace
-PKG_VERSION:=3.0.23
+PKG_VERSION:=3.0.22
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -72,11 +72,11 @@ endef
 
 define Package/libtrace/install    
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtrace.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwandio.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump.so.* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libtrace.so.* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libwandio.so.* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump.so.* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/libpacketdump
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump/*.so* $(1)/usr/lib/libpacketdump/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump/*.so* $(1)/usr/lib/libpacketdump/
 endef
 
 define Package/libtrace-tools/install    

map-agent/Config.in

@@ -1,34 +0,0 @@
-if (PACKAGE_map-agent)
-
-menu "Configurations"
-
-config AGENT_SYNC_DYNAMIC_CNTLR_CONFIG
-	bool "Support Dynamic Controller configuration sync"
-	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
-
-config AGENT_ISLAND_PREVENTION
-	bool "Support Island Prevention"
-	default y if MULTIAP_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

@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2020-22 IOPSYS Software Solutions AB
+# Copyright (C) 2020-21 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.2.2
+PKG_VERSION:=7.1.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4ed3f9bf0743086a85e1b7cf49c47eb49ab05015
+PKG_SOURCE_VERSION:=5fbe1ee1c95cba679c78d658a56366541dee4795
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 LOCAL_DEV=0
@@ -28,7 +28,7 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +map-plugin +ip-bridge
+	  +map-plugin
 endef
 
 
@@ -50,7 +50,7 @@ define Package/dynbhd/description
 endef
 
 define Package/map-agent/config
-	source "$(SOURCE)/Config.in"
+	#source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
@@ -58,24 +58,6 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
-ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
-TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
-endif
-
-ifeq ($(CONFIG_AGENT_ISLAND_PREVENTION),y)
-TARGET_CFLAGS += -DAGENT_ISLAND_PREVENTION
-endif
-
-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

map-agent/files/etc/config/mapagent

@@ -1,134 +1,34 @@
 config agent 'agent'
 	option enabled '1'
-	option debug '0'
+	option debug '6'
 	option profile '2'
 	option al_bridge 'br-lan'
-	option netdev 'wlan'
-	option island_prevention '0'
-	option eth_onboards_wifi_bhs '0'
-	option ap_follow_sta_dfs '0'
-	option guest_isolation '0'
-#	option controller_macaddr '0a:1b:2c:3d:4e:50'
 
-config dynamic_backhaul
-	option missing_bh_timer '60'
-	option missing_bh_reconfig_timer '1800'
-
-config controller_select
-	option id 'auto'
-	option probe_int '20'
-	option retry_int '9'
-	option autostart '1'
-	option local '0'
-
-config radio
-	option device 'phy0'
-	option band '2'
-# options below are auto-generated during onboarding
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '70'
-#	option report_rcpi_threshold '80'
-#	option rcpi_hysteresis_margin '0'
-#	option report_util_threshold '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-config radio
-	option device 'phy1'
-	option band '5'
-# options below are auto-generated during onboarding
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '86'
-#	option report_rcpi_threshold '96'
-#	option rcpi_hysteresis_margin '0'
-#	option report_util_threshold '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-config bsta
-	option enabled '1'
-	option ifname 'wlan0'
-	option band '2'
-	option device 'phy0'
-	option priority '2'
-# options below are auto-generated during onboarding
-#	option ssid 'MAP-BH-2.4GHz'
-#	option encryption 'sae-mixed'
-#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
-#	option onboarded '1'
-#	option bssid '0a:1b:2c:3d:4e:53'
-#	option vid '1'
-
-config bsta
-	option enabled '1'
-	option ifname 'wlan1'
-	option band '5'
-	option device 'phy1'
-	option priority '0'
-# options below are auto-generated during onboarding
-#	option ssid 'MAP-BH-5GHz'
-#	option encryption 'sae-mixed'
-#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
-#	option onboarded '1'
-#	option bssid '0a:1b:2c:3d:4e:54'
-#	option vid '1'
-
-# ap sections and policy section are
-# auto-generated during onboarding
-#
 #config ap
-#	option enabled '1'
-#	option ifname 'wlan0-1'
+#	option ifname 'wl0'
+#	option steer 'rssi bssload'
+#	list exclude '00:11:22:33:44:55'
+#	list exclude_btm '00:aa:bb:cc:dd:ee'
+#	list assoc_ctrl '00:10:20:30:40:50'
+#	option btm_retry '3'
+#	option btm_retry_secs '180'
+#	option fallback_legacy '1'
+#	option steer_legacy_reassoc_secs '30'
+#	option steer_legacy_retry_secs '3600'
+#	option assoc_ctrl_secs '30'
 #	option band '2'
-#	option device 'phy0'
 #	option type 'fronthaul'
-#	option ssid 'IOWRT-2.4GHz'
-#	option encryption 'sae-mixed+aes'
-#	option key '1234567890'
-#	option vid '1'
 
 #config ap
-#	option enabled '1'
-#	option ifname 'wlan0-2'
-#	option band '2'
-#	option device 'phy0'
-#	option type 'backhaul'
-#	option ssid 'MAP-BH-2.4GHz'
-#	option encryption 'sae+aes'
-#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
-#	option disallow_bsta '0'
-#	option vid '1'
-
-#config ap
-#	option enabled '1'
-#	option ifname 'wlan1-1'
+#	option ifname 'wl1'
+#	option steer 'rssi bssload'
+#	list exclude '00:11:22:33:44:55'
+#	list exclude_btm '00:aa:bb:cc:dd:ee'
 #	option band '5'
-#	option device 'phy1'
 #	option type 'fronthaul'
-#	option ssid 'IOWRT-5GHz'
-#	option encryption 'sae-mixed+aes'
-#	option key '1234567890'
-#	option vid '1'
 
-#config ap
+#config bsta
+#	option ifname 'apclii0'
 #	option enabled '1'
-#	option ifname 'wlan1-2'
-#	option band '5'
-#	option device 'phy1'
-#	option type 'backhaul'
-#	option ssid 'MAP-BH-5GHz'
-#	option encryption 'sae+aes'
-#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
-#	option disallow_bsta '0'
-#	option vid '1'
-
-#config policy
-#	option report_interval '0'
-#	option pvid '1'
-#	option pcp_default '0'
-#	option report_scan '0'
-#	option report_sta_assocfails '0'
-#	option report_sta_assocfails_rate '0'
-
+#	option onboarded '0'
+#	option disallow_bsta '1		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)

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

@@ -1,78 +1,22 @@
 #!/bin/sh
 
-. /lib/network/utils.sh
+wan=$(db -q get hw.board.ethernetWanPort)
+MAPFILE="/tmp/multiap.backhaul"
 
-conn_ports_file="/tmp/map.connected.ports"
-map_bh_file="/tmp/multiap.backhaul"
-al_bridge="$(uci -q get mapagent.agent.al_bridge)"
-[ "${al_bridge:0:3}" = "br-" ] || exit 0
-al_brnet="${al_bridge:3}"
 
-# Exit if the PORT is not member of the AL Bridge
-[ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0
-
-############## Dynamic Backhaul Daemon ##############
-if [ -n "$(which dynbhd)" ]; then
-	pidof dynbhd >/dev/null && exit 0 # dynbhd is managing the links
-
-	if [ ! -f $conn_ports_file ]; then
-		touch $conn_ports_file
-		if [ "$LINK" = "up" ]; then
-			touch $conn_ports_file
-			echo "$PORT" > $conn_ports_file
-			brctl delif $al_bridge $PORT
-			#ubus call network.interface.lan remove_device "{\"name\":\"$PORT\"}"
-		fi
-	else
-		if [ "$LINK" = "up" ]; then
-			brctl delif $al_bridge $PORT
-			echo "$PORT" >> $conn_ports_file
-			#ubus call network.interface.lan remove_device "{\"name\":\"$PORT\"}"
-		else
-			sed -i -E "/(^|:)${PORT}(:|$)/d" $conn_ports_file
-			#ubus call network.interface.lan add_device "{\"name\":\"$PORT\"}"
-			brctl addif $al_bridge $PORT
-			[ "$(cat $conn_ports_file | wc -c)" = "0" ] && rm -f $conn_ports_file
-		fi
-	fi
-
-	exit 0
-fi
-########################################################
-
-################ Dedicated ETH WAN Port ################
-wanport="$(db -q get hw.board.ethernetWanPort)"
-if [ -n "$wanport" ]; then
-	[ "$wanport" = "$PORT" ] || exit 0
-########################################################
-else
-#################### DHCP Discovery ####################
-	[ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
-
-	if [ "$LINK" = "up" ]; then
-		brctl delif $al_bridge $PORT
-
-		udhcpc -qnRoC -i $PORT >/dev/null 2>&1 && dhcp=1
-
-		brctl addif $al_bridge $PORT
-
-		[ $dhcp -eq 1 ] || exit 0
-	else
-		[ -f $map_bh_file ] || exit 0
-		cur_bh="$(cat $map_bh_file  | jsonfilter -e @.ifname)"
-		[ "$cur_bh" = "$PORT" ] || exit 0
-	fi
-########################################################
-fi
+[ -z "$wan" ] && exit 1 # no configuration
+[ "$PORT" != "$wan" ] && exit 0
 
 remove_from_bridge() {
 	config_get ifname "$section" ifname
-	[ -n "$ifname" ] && ubus call network.interface.${al_brnet} remove_device '{"name":"$ifname"}'
+
+	ubus call network.interface.$bridge remove_device '{"name":"$ifname"}'
 }
 
 update_bstas() {
-	section="$1"
-	action="$2"
+	local section="$1"
+	local action="$2"
+	local ifname onboarded
 
 	config_get ifname "$section" ifname
 	config_get_bool enabled "$section" enabled 0
@@ -90,16 +34,16 @@ update_bstas() {
 }
 
 if [ "$LINK" = "up" ]; then
-	#touch "$map_bh_file"
+	#touch "$MAPFILE"
+
 	config_load "mapagent"
-	config_foreach remove_from_bridge bsta
+	bridge=$(uci get mapagent.agent.al_bridge | cut -d '-' -f2)
+	config_foreach remove_from_bridge bsta $bridge
 	config_foreach update_bstas bsta down
 
 	/lib/wifi/multiap set_uplink "eth" "$PORT"
 else
-	/lib/wifi/multiap unset_uplink "eth"
-	#rm -f "$map_bh_file"
+	rm -f "$MAPFILE"
 	config_load "mapagent"
 	config_foreach update_bstas bsta up
-
 fi

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

@@ -5,14 +5,59 @@ STOP=20
 
 USE_PROCD=1
 
-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 /tmp/map.agent.bsta_global_disable
 	procd_open_instance
 	procd_set_param command "/usr/sbin/dynbhd"
 	procd_set_param respawn
@@ -21,158 +66,10 @@ start_dynbhd_service() {
 	procd_close_instance
 }
 
-validate_agent_section() {
-	uci_validate_section mapagent agent "agent" \
-		'enabled:bool:true' \
-		'debug:range(0,16)' \
-		'profile:range(1,2):2' \
-		'brcm_setup:bool:false' \
-		'controller_macaddr:macaddr' \
-		'al_bridge:string' \
-		'netdev:string' \
-		'vlan_segregation:bool:false' \
-		'resend_num:uinteger:0' \
-		'dyn_cntlr_sync:bool:true' \
-		'island_prevention:bool:false' \
-		'eth_onboards_wifi_bhs:bool:false'
-
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of agent section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_cs_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${section}" \
-		'local:bool:false' \
-		'id:string' \
-		'probe_int:range(0,1000):20' \
-		'retry_int:range(0,255):3' \
-		'autostart:bool:false'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of controller_select section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ap_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${1}" \
-			'ifname:string' \
-			'device:string' \
-			'band:or("2", "5")' \
-			'enabled:bool:true' \
-			'onboarded:bool:false' \
-			'ssid:string' \
-			'key:string' \
-			'encryption:string' \
-			'disallow_bsta_p1:bool:false' \
-			'disallow_bsta_p2:bool:false'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of ap section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_radio_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${1}" \
-			'device:string' \
-			'band:or("2", "5")' \
-			'configured:bool:false' \
-			'onboarded:bool:false' \
-			'dedicated_backhaul:bool:false' \
-			'steer_policy:range(0,255)' \
-			'util_threshold:range(0,255)' \
-			'rcpi_threshold:range(0,255)' \
-			'report_rcpi_threshold:range(0,255)' \
-			'include_sta_stats:bool:false' \
-			'include_sta_metric:bool:false' \
-			'rcpi_hysteresis_margin:range(0,255)' \
-			'report_util_threshold:range(0,255)' \
-			'encryption:or("sae", "psk2", "sae-mixed")'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of radio section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_policy_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${1}" \
-			'report_interval:range(0,255)' \
-			'pvid:uinteger' \
-			'report_interval:range(0,255)' \
-			'pcp_default:range(0,255)' \
-			'report_scan:bool' \
-			'report_sta_assocfails:bool' \
-			'report_sta_assocfails_rate:uinteger' \
-			'steer_exclude:list(macaddr)' \
-			'steer_exclude_btm:list(macaddr)' \
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of policy section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_dyn_bh_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${1}" \
-			'missing_bh_timer:range(1,255)'
-	uci_validate_section mapagent $section "${1}" \
-			'missing_bh_reconfig_timer:range(0,65535)'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of dynamic backhaul section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_agent_config() {
-	IS_CFG_VALID=1
-
-	validate_agent_section &&
-		config_foreach validate_cs_section controller_select &&
-		config_foreach validate_ap_section ap &&
-		config_foreach validate_radio_section radio &&
-		config_foreach validate_policy_section policy &&
-		config_foreach validate_dyn_bh_section dynamic_backhaul
-
-	[ "$IS_CFG_VALID" -ne 1 ] && {
-		logger -s -t "mapagent" "Validation of mapagent UCI file failed"
-		return 1
-	}
-	return 0
-}
-
 start_service() {
 	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
 
 	config_load "mapagent"
-	validate_agent_config || return 1;
 
 	ubus -t 5 wait_for wifi
 
@@ -182,14 +79,22 @@ 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
-	procd_set_param command "/usr/sbin/mapagent" "-d"
+        procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1
 	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

@@ -1,13 +0,0 @@
-#!/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

@@ -55,9 +55,8 @@ get_type_by_section() {
 	echo "$(type_to_multi_ap $type)"
 }
 
-sync_credentials() {
+brcm_sync_credentials() {
 	bands=""
-	json_init
 	mapagent_process_fh() {
 		local section=$1
 		local dev=$2
@@ -81,17 +80,6 @@ sync_credentials() {
 		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() {
@@ -114,38 +102,7 @@ sync_credentials() {
 	}
 
 	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}
 	}
@@ -157,10 +114,10 @@ sync_credentials() {
 	config_foreach mapagent_process_radio radio
 
 	uci commit ieee1905
-	json_cleanup
 }
 
-write_credentials() {
+
+brcm_write_credentials() {
 	config_load mapagent
 
 	mapagent_apply_wireless() {
@@ -207,7 +164,7 @@ write_credentials() {
 		#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")
+		echo $(mapagent_apply_wireless $ifname "$bk_ssid" "$bk_key") 2> /dev/null
 	}
 
 	mapagent_find_bbss() {
@@ -250,7 +207,7 @@ write_credentials() {
 	uci commit wireless
 }
 
-set_network() {
+brcm_set_network() {
 	local ifname=$1
 	local num=$2
 	local bssid=$3
@@ -293,13 +250,7 @@ write_bsta_config() {
 
 			[ "$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
@@ -356,14 +307,14 @@ write_bsta_config() {
 
 	#echo result diff = $diff > /dev/console
 	[ "$diff" == "1" ] && {
-		(config_foreach mapagent_apply_bssid_same_band bsta)
-		#ubus call uci commit '{"config":"wireless"}'
+		config_foreach mapagent_apply_bssid_same_band bsta
+		ubus call uci commit '{"config":"wireless"}'
 		#echo reloading wireless > /dev/console
 	}
 
 }
 
-teardown_iface() {
+brcm_teardown_iface() {
 	config_load mapagent
 
 	local iface=$1
@@ -377,7 +328,7 @@ teardown_iface() {
 
 			[ "$ifname" != "$map_ifname" ] && return
 
-			uci -q set wireless.${section}.disabled="1"
+			uci -q set wireless.${section}.start_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
@@ -404,10 +355,9 @@ teardown_iface() {
 		uci -q set mapagent.${section}.enabled="0"
 		uci -q set mapagent.${section}.ssid="DISABLED-SSID"
 		uci -q set mapagent.${section}.key="DISABLED-KEY"
-		uci -q del mapagent.${section}.vid
 
 		# subshell in hopes to maintain mapagent config loaded
-		(mapagent_teardown_wireless $ifname)
+		$(mapagent_teardown_wireless $ifname)
 	}
 
 
@@ -417,7 +367,7 @@ teardown_iface() {
 	uci commit mapagent
 }
 
-bsta_to_wireless() {
+brcm_bsta_to_wireless() {
 	config_load mapagent
 
 	mapagent_find_lowest_prio_onboarded() {
@@ -471,7 +421,7 @@ bsta_to_wireless() {
 				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'
+				#uci -q set wireless.${section}.disabled=$disabled
 
 				[ "$disabled" != "1" ] && return
 				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
@@ -489,12 +439,10 @@ bsta_to_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
+			[ "$3" != "$band" -o "$onboarded" = "0" ] && return
 
 			config_get ssid $1 ssid
 			config_get key $1 key
@@ -502,12 +450,7 @@ bsta_to_wireless() {
 			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")
+			echo $(mapagent_apply_wl_bsta $2 "$ssid" "$key" $encryption $4 "$bssid")
 		}
 
 		config_get band $1 band
@@ -516,14 +459,14 @@ bsta_to_wireless() {
 		config_get enabled $1 enabled "0"
 
 		if [ "$onboarded" = "0" ]; then
-			config_foreach mapagent_find_other_creds bsta $1 $ifname $band $enabled
+			config_foreach mapagent_find_other_creds bsta $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")
+			echo $(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
 		fi
 	}
 
@@ -542,7 +485,6 @@ bsta_to_wireless() {
 	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
 
 #	[ "$diff" != "" ] && {
-
 		ubus call uci commit '{"config":"wireless"}'
 #	}
 }
@@ -637,43 +579,27 @@ sync_mapcontroller_from_wireless() {
 }
 
 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"
-	}
+	config_load mapagent
 
 	mapagent_enable_bk() {
 		config_get ifname $1 ifname
-		config_get band $1 band
 		config_get enabled $1 enabled
 
+		echo ifname $ifname enabled $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
+		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
 	}
 
-	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
+		config_get ifname $1 ifname "2"
 		uci -q set mapagent.$1.enabled="1"
 	}
 
@@ -684,68 +610,6 @@ bsta_enable_all() {
 	bsta_scan_on_enabled
 }
 
-# arg = one interface to clear
-# no arg = clear all interfaces
-bsta_clear_bssid() {
-	local iface=$1
-
-	mapagent_remove_bssid() {
-		local iface=$2
-
-		config_get ifname $1 ifname
-
-		[ -n "$iface" -a "$iface" != "$ifname" ] && return
-
-		uci -q set mapagent.$1.enabled="1"
-		uci -q del mapagent.$1.bssid
-	}
-
-	wireless_remove_bssid() {
-		local iface=$2
-
-		config_get mode $1 mode
-		config_get ifname $1 ifname
-
-		[ "$mode" != "sta" ] && return
-
-		[ -n "$iface" -a "$iface" != "$ifname" ] && 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 $iface
-	uci commit mapagent
-
-	config_load wireless
-	config_foreach wireless_remove_bssid wifi-iface $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
 
@@ -793,13 +657,9 @@ bsta_disable_lower_priority() {
 
 		[ "$ifname" != "$2" -a "$priority" -gt "$3" ] && enabled="0"
 
-		# enable passed ifname explicitly
-		# don't explicitly enable other higher prio interfaces
-		[ "$ifname" != "$2" -a "$enabled" = "1" ] && return
-
 		uci -q set mapagent.$1.enabled="$enabled"
 
-		(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
+		echo $(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
 	}
 
 	local bsta=$1
@@ -833,12 +693,6 @@ bsta_use_link() {
 	local bsta=$1
 
 	config_foreach mapagent_disable_bk bsta $bsta
-
-	noht=$(iw $bsta info | grep "no HT")
-	[ -n "$noht" ] &&  {
-		logger -t multiap "no HT hit, issue reassoc $bsta"
-		wpa_cli -i $bsta reassoc
-	}
 }
 
 bsta_swap_to_link() {
@@ -854,14 +708,11 @@ 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
+	json_load "$(cat $MAPFILE)"
+	json_add_string "backhaul_device_id" "$ul_1905id"
+	json_add_string "backhaul_macddr" "$ul_mac"
+	json_dump > "$MAPFILE"
+	json_cleanup
 }
 
 set_uplink() {
@@ -875,63 +726,31 @@ set_uplink() {
 	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_dump > "$MAPFILE"
 	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
+	rm "$MAPFILE" > /dev/null 2>&1
 }
 
 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;;
+	wireless_teardown) brcm_wireless_teardown;;
+	setup_network) brcm_setup_network;;
+	setup_wireless) brcm_setup_wireless;;
+	write_credentials) brcm_write_credentials;;
+	sync_credentials) brcm_sync_credentials;;
 	bsta_steer) bsta_steer $@;;
-	set_network) set_network $@;;
+	set_network) brcm_set_network $@;;
 	write_bsta_config) write_bsta_config $@;;
-	teardown_iface) teardown_iface $@;;
-	bsta_to_wireless) bsta_to_wireless $@;;
+	teardown_iface) brcm_teardown_iface $@;;
+	bsta_to_wireless) brcm_bsta_to_wireless $@;;
 	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
 	ts) ts_sub $@;;
 	bsta_enable_all) bsta_enable_all $@;;
-	bsta_clear_bssid) bsta_clear_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 $@;;

map-agent/files/lib/wifi/traffic_separation

@@ -2,9 +2,6 @@
 
 . /lib/functions.sh
 
-AL_BRIDGE=${AL_BRIDGE-"br-lan"}
-PRIMARY_VID=${PRIMARY_VID-1}
-
 ### Traffic Separation ###
 
 dbg() {
@@ -12,437 +9,459 @@ dbg() {
 }
 
 ts_sub() {
+
 	ts_usage() {
 		cat <<EOF
-Usage: $0 [create|reload]
+Usage: $0 [create|delete|populate|primary|reload]
 Traffic Separation related functions.
-create vid - create vlan configuration with vlan_id
-reload     - reload network with new configuration
+create fh <iface> <vid>			- create vlan device and rules for wifi fronthaul
+create bh <iface> <vid> <profile>	- create vlan device and rules for wifi backhaul
+create eth <iface> <vid> <pbits>	- create vlan device and rules for logical ethernet interface
+delete <iface>				- delete vlan device
+populate eth <iface> <vid>		- add secondary network rules for logical ethernet interface
+primary get <iface>			- read primary VID for interface from driver (from Association Response frame IE)
+reload     				- reload network with new configuration
 EOF
 	exit 1
 	}
 
+	_get_bridge() {
+		local bridge=$(ip link show $1 | grep -o "master [^\s]*" | cut -d ' ' -f 2)
+		echo $bridge
+	}
+
+	set_wireless_bridge() {
+		config_load wireless
+
+		_set_network() {
+			local sec=$1
+			local iface=$2
+			local bridge=$3
+
+			config_get ifname $sec ifname
+			[ "$iface" != "$ifname" ] && continue
+
+			config_get mode $sec mode
+			config_get multi_ap $sec multi_ap "0"
+			[ "$mode" = "sta" -a "$multi_ap" = "1" ] && continue
+
+			config_get network $sec network
+			local new_network=${bridge##br-}
+			if [ "$new_network" != "$network" ] ; then
+				uci -q set wireless.${sec}.network=${new_network}
+				uci commit wireless
+			fi
+
+			brctl addif $bridge $iface &> /dev/null
+		}
+
+		config_foreach _set_network wifi-iface ${1} ${2}
+	}
+
 	ts_create() {
-		_dhcp_setup() {
-			local name=$1
 
-			[ -n "$(uci -q get dhcp.${name})" ] && return
+		_create_vlan_dev() {
+			iface=$1				# real iface
+			vid=$2					# Vlan ID
+			bridge=$3				# bridge iface should be connected
+			old_bridge="$(_get_bridge $iface)"	# bridge iface is connected to
+			vlan_dev=${iface}_vlan${vid}		# name of vlan device to create
 
-			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"
+			# remove interface from bridge if it is in one
+			[ -n "$old_bridge" ] && brctl delif $old_bridge $iface &> /dev/null
 
-			uci -q commit dhcp
+			# create vlan device
+			ip link show $vlan_dev &> /dev/null && vlanctl --if-delete $vlan_dev &> /dev/null
+			vlanctl --mcast --if-create-name $iface $vlan_dev --if $iface --set-if-mode-rg
+
+			# bring the vlan device up and add back to bridge if it was in one
+			brctl addif $bridge $vlan_dev &> /dev/null
+			ip link set $vlan_dev up
+
+			echo $vlan_dev
 		}
 
-		_firewall_setup() {
-			local name=$1
-			local network=$1
-			local vid=$2
-			local zone_exist=0
+		ts_create_fh() {
+			iface=$1				# fh iface
+			vid=$2					# SSID specific (secondary) or primary vid
+			bridge=$3
 
-			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
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$bridge" ]  || {
+				cat <<EOF
+Adding FH device requires IFACE, VID and bridge
+EOF
+				exit 1
 			}
 
-			config_foreach _process_zone zone $name
+			# create vlan device
+			set_wireless_bridge $iface $bridge
+			vlan_dev=$(_create_vlan_dev $iface $vid $bridge)
 
-			[ "$zone_exist" != "0" ] && return
-
-			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
+			# add rules
+			# Note: removing these for now since these packets are read directly from the iface anyway
+#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x888e --set-rxif $vlan_dev --rule-append		# incoming EAPOL
+#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x886c --set-rxif $vlan_dev --rule-append		# incoming brcm
+			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --rule-append
+			vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --filter-vid $vid 0 --pop-tag --dscp2pbits 0 --rule-append
 		}
 
-		_guest_net_setup() {
-			local vid=$1
-			local name="guest${vid}"
-			local dev="guest_dev${vid}"
-			local br_guest="br-guest${vid}"
-			local peer="guest_peer${vid}"
-			local ip_addr="192.168.${vid}.1"
-			local br_dev="${AL_BRIDGE/-/_}"
+# Note: Currently not used (will be needed for Profile 1)
+		ts_create_bh() {
+			iface=$1				# bh iface
+			vid=$2					# primary vid
+			profile=$3				# agent profile (1 or 2)
 
-			[ "${vid}" = "${PRIMARY_VID}" ] && return
-
-			ip link show $dev 2> /dev/null || {
-				ip link add $dev type veth peer name $peer
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
+				cat <<EOF
+Adding BH device requires IFACE, VID and PROFILE (1 or 2).
+EOF
+				exit 1
 			}
 
-			ip link set $dev up
-			ip link set $port_dev up
+			# create vlan device
+			vlan_dev=$(_create_vlan_dev $iface $vid)
 
-			[ -z "$(uci -q get network.${name})" ] || return
+			# add rules
+			case "$profile" in
+				1 | profile_1 | profile1 | Profile_1 | Profile1)
+					vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --rule-append
+					vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --pop-tag --rule-append
+					;;
+				2 | profile_2 | profile2 | Profile_2 | Profile2)
+					vlanctl --if $iface --rx --tags 1 --set-rxif $vlan_dev --rule-append
+					vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --rule-append								# note: already default
+					vlanctl --if $iface --tx --tags 0 --filter-ethertype 0x893a --filter-txif $vlan_dev --push-tag --set-vid $vid 0 --rule-append	# note: outgoing IEEE1905.1
+					vlanctl --if $iface --tx --tags 0 --filter-ethertype 0x888e --filter-txif $vlan_dev --push-tag --set-vid $vid 0 --rule-append	# note: outgoing EAPOL
+					;;
+				*)
+					ts_delete $iface
+					ts_usage
+					exit 1
+					;;
+			esac
 
-			uci -q set network.${name}="interface"
-			uci -q set network.${name}.device="${br_guest}"
-			uci -q set network.${name}.is_lan="1"
-			uci -q set network.${name}.proto="static"
-			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'
-
-			uci -q set network.br_${name}="device"
-			uci -q set network.br_${name}.name="${br_guest}"
-			uci -q set network.br_${name}.type="bridge"
-
-			if [ -z $(uci -q get network.${br_dev}.ports | grep -w ${dev}) ]; then
-				uci -q add_list network.${br_dev}.ports="${dev}"
-			fi
-
-			if [ -z $(uci -q get network.br_${name}.ports | grep -w ${peer}) ]; then
-				uci -q add_list network.br_${name}.ports="${peer}"
-			fi
-
-			if [ -z $(uci -q get network.vlan${vid}.ports | grep -w ${dev}) ]; then
-				uci -q add_list network.vlan${vid}.ports="${dev}:*"
-			fi
-
-			uci -q commit network
+			set_wireless_bridge $iface $bridge
 		}
 
-		_net_setup() {
-			local vid=$1
-			local layer3=$2
-			local name="vlan${vid}"
-			local br_dev="${AL_BRIDGE/-/_}"
-			local tag=":t"
-			local self_flags="untagged"
-			local brvid_local="1"
+		ts_create_bh_drv() {
+			iface=$1				# bh iface
+			vid=$2					# primary vid
+			profile=$3				# agent profile (1 or 2)
+			bridge=$4				# bridge interface should be connected to
 
-			[ -z "$(uci -q get network.${name})" ] || return
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
+				cat <<EOF
+Adding BH device requires IFACE, VID and PROFILE (1 or 2).
+EOF
+				exit 1
+			}
 
-			uci -q set network.${name}="bridge-vlan"
-			uci -q set network.${name}.name="${name}"
-			uci -q set network.${name}.device="$AL_BRIDGE"
-			uci -q set network.${name}.vlan="$vid"
+			[ -n "$bridge" ] && set_wireless_bridge $iface $bridge
 
-			if [ "${vid}" = "${PRIMARY_VID}" ]; then
-				self_flags="untagged pvid"
-				tag=":*"
-			elif [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
-				brvid_local="0"
-			fi
+			old_vid=$(wl -i $1 map_8021q_settings)
+			old_vid=${old_vid##* }
+			old_profile=$(wl -i $1 map_profile | cut -d ' ' -f 3)
 
-			uci -q set network.${name}.flags="${self_flags}"
-			uci -q set network.${name}.local="${brvid_local}"
+			[ "$old_vid" = "$vid" -a "$old_profile" = "$profile" ] && return
 
-			for port in $(uci -q get network.${br_dev}.ports) ; do
-				if [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
-					echo $port | grep "guest" && continue
-				fi
-				uci -q get network.${name}.ports | grep -q "${port}${tag}" && continue
-				uci -q add_list network.${name}.ports="${port}${tag}"
-			done
-
-			uci -q commit network
+			wl vlan_mode 0 &> /dev/null				# make sure this is OFF, else driver won't handle vlan
+			wl -i $iface down &> /dev/null
+			wl -i $iface map_profile $profile &> /dev/null		# only has effect on profile 2
+			wl -i $iface map_8021q_settings $vid &> /dev/null	# can only be set on bBSS (read-only on bSTA)
+			wl -i $iface up &> /dev/null
 		}
-		local layer3=$(uci -q get mapagent.agent.layer3_ts)
 
-		vid=$1
+		ts_create_eth() {
+			iface=$1				# Multi-AP Logical Ethernet Interface
+			vid=$2					# primary vid
+			pbits=$3				# default pbits to apply
+			vlan_bridge=$4				# name of ts subsystem bridge
+			lan_bridge=$5				# name of node local bridge
 
-		[ -n "$vid" ] || {
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$pbits" ] && [ -n "$vlan_bridge" ] && [ -n "$lan_bridge" ] || {
+				cat <<EOF
+Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
+EOF
+				exit 1
+			}
+
+			ip link set lei down
+			ip link set lei_map down
+
+			old_bridge="$(_get_bridge lei_lan)"
+			[ -n "$old_bridge" ] && brctl delif $old_bridge lei_lan &> /dev/null
+
+			ip link show lei_lan || ip link del lei_lan
+			ip link add link lei name lei_lan type vlan id ${vid}
+
+			brctl addif ${lan_bridge} lei_lan &>/dev/null
+			brctl addif ${vlan_bridge} lei_map &>/dev/null
+
+			ip link set lei up
+			ip link set lei_map up
+			ip link set lei_lan up
+		}
+
+		ts_create_dhcp() {
+			local diff=""
+
+                        _net_setup() {
+				local name=$1
+				local devname=$2
+				local vid=$3
+
+				[ -z "$(uci -q get network.${name})" ] && {
+					uci -q set network.${name}="interface"
+					uci -q set network.${name}.device="$devname"
+					uci -q set network.${name}.is_lan="1"
+					uci -q set network.${name}.proto="static"
+					# TODO vid > 255
+					local ip_addr="192.168.${vid}.1"
+					[ "${vid}" = "1" ] && ip_addr="192.168.${vid}.2"
+					uci -q set network.${name}.ipaddr="${ip_addr}"
+					uci -q set network.${name}.netmask="255.255.255.0"
+
+					diff="1"
+				}
+
+				[ "$diff" = "1" ] && uci -q commit network
+			}
+
+			_br_setup() {
+				local name=$1
+				local sinkname=$2
+				local vid=$3
+
+				[ -z "$(uci -q get network.${name}_dev)" ] && {
+					uci -q set network.${name}_dev="device"
+					uci -q set network.${name}_dev.name="br-${name}"
+					uci -q set network.${name}_dev.type="bridge"
+					uci -q set network.${name}_dev.bridge_empty="1"
+					uci -q add_list network.${name}_dev.ports="${sinkname}"
+
+					diff="1"
+				}
+
+				[ -z "$(uci -q get network.${name})" ] && {
+					uci -q set network.${name}="interface"
+					uci -q set network.${name}.device="br-${name}"
+					uci -q set network.${name}.is_lan="1"
+					uci -q set network.${name}.proto="static"
+					uci -q set network.${name}.ipaddr="192.168.${vid}.1"
+					uci -q set network.${name}.netmask="255.255.255.0"
+
+					diff="1"
+				}
+
+				[ "$diff" = "1" ] && 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"
+
+				diff="1"
+				uci -q commit dhcp
+			}
+
+			_firewall_setup() {
+				local name=$1
+				local network=$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
+
+				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"
+
+				diff="1"
+				uci -q commit firewall
+			}
+
+			vid=$1					# primary vid
+
+			[ -n "$vid" ] || {
+				cat <<EOF
+VID required to configure DHCP.
+EOF
+				exit 1
+			}
+
+			ip link show sink${vid} || {
+				ip link add sink${vid} type veth peer name sink${vid}_vlan
+				ip link add link sink${vid} name sink${vid}_peer type vlan id ${vid}
+			}
+
+			ip link set sink${vid} up
+			ip link set sink${vid}_peer up
+			ip link set sink${vid}_vlan up
+
+			diff=""
+			_net_setup sink${vid} sink${vid}_peer ${vid}
+			_dhcp_setup sink${vid}
+			_firewall_setup lan${vid} sink${vid}
+
+			[ "$diff" = "1" ] && {
+				ubus call network reload
+				ubus -t 5 wait_for network.interface.sink${vid}
+			}
+
+			brctl addif br-map sink${vid}_vlan &> /dev/null
+		}
+
+	local type=$1
+	shift
+
+	case "$type" in
+		fh) ts_create_fh $@;;
+#		bh) ts_create_bh $@;;
+		bh) ts_create_bh_drv $@;;
+		eth) ts_create_eth $@;;
+		dhcp) ts_create_dhcp $@;;
+		--help|help) ts_usage;;
+		*) ts_usage; exit 1;;
+	esac
+	}
+
+	ts_delete() {
+		iface=$1
+
+		path=$(ls -d /sys/class/net/${iface}/upper_*)
+		[ -z "$path" ] && exit 0
+
+		vlan_dev=${path##*upper_}
+		bridge="$(_get_bridge $vlan_dev)"
+
+		[ -n "$bridge" ] && {
+			vlanctl --if-delete $vlan_dev		# note: also removes rules and removes from bridge
+			brctl addif $bridge $iface &> /dev/null # needed to add again
+                }
+
+	}
+
+	ts_populate() {
+		local type=$1
+		shift
+
+		[ "$type" == "eth" ] || {
 			cat <<EOF
-VID required to configure.
+Populating ETH rules requires IFACE and VID.
 EOF
 			exit 1
 		}
 
-		_net_setup ${vid} ${layer3}
+		iface=$1				# Multi-AP Logical Ethernet Interface
+		vid=$2					# secondary vid
 
-                logger -t vlan "setup ts vid $vid"
-		[ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ] && {
-			_dhcp_setup guest${vid}
-			_firewall_setup guest${vid} ${vid}
-			_guest_net_setup ${vid}
+		path=$(ls -d /sys/class/net/${iface}/upper_*)
+		[ -z "$path" ] && exit 1
+		vlan_dev=${path##*upper_}
 
-		}
+		# add rules
+		#vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append		# note: retain secondary vids
+		#vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append		# note: already default
+	}
 
-                # Disable pktfwd here and flush FlowCache rules
-                echo 0 > /proc/pktfwd_dhd/enable
-                echo 0 > /proc/pktfwd_wl/enable
-                fcctl flush
+	ts_primary() {
+		local func=$1
+		shift
+
+		case "$func" in
+			get) vid=$(wl -i $1 map_8021q_settings); echo ${vid##* };;
+			*) ts_usage; exit 1;;
+		esac
+	}
+
+	ts_unicast() {
+		local mac=$1
+		local iface=$2
+
+		# TODO: improve?
+		res=$(ebtables -t broute -L | grep -i "$mac" | grep "$iface")
+		[ -n "$res" ] && return
+
+		ebtables -t broute -D BROUTING -d "$mac" -p 0x893a -j DROP
+		ebtables -t broute -I BROUTING -i "$iface" -d "$mac" -p 0x893a -j DROP
+	}
+
+	ts_multicast() {
+		local iface=$1
+
+		# TODO: improve?
+		res=$(ebtables -t broute -L | grep -i "1:80:C2:00:00:13" | grep "$iface")
+		[ -n "$res" ] && return
+
+		ebtables -t broute -D BROUTING -d 01:80:C2:00:00:13 -p 0x893a -j DROP
+		ebtables -t broute -D BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
+		ebtables -t broute -I BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
 	}
 
 	ts_reload() {
-		# TODO check it again
 		local dhcp_reload=$1
-		restart=""
 
-		bridge_verify_vid_mapping() {
-			local section=$1
+		# workaround for missing backhaul wifi.ap.* ubus obj's:
+		# iterate in config and setup bh
+		config_load wireless
 
-			check_port_vid() {
-				local port="$1"
-				local vlan="$2"
+		_setup_bh_iface() {
+			local sec=$1
+			local iface=$2
+			local bridge=$3
 
-				added=$(bridge vlan show dev $port | grep -w "$vlan")
-				if [ "$added" = "" ]; then
-					restart="1"
-					break
-				fi
+			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_get vlan "$section" vlan "0"
-
-			[ "$vlan" = "0" ] && continue
-
-			config_list_foreach "$section" "ports" check_port_vid "$vlan"
-			[ "$restart" = "1" ] && break
 		}
 
-
-
-		config_load network
-		config_foreach bridge_verify_vid_mapping bridge-vlan
-
+		config_foreach _setup_bh_iface wifi-iface
 
 		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
-		if [ "$restart" = "1" ]; then
-			dbg "trigger network restart"
-			/etc/init.d/network restart
-		else
-			ubus call uci commit '{"config":"network"}'
-		fi
-		/etc/init.d/firewall reload
 
-
-		#for sink in $(ubus list network.interface.sink*) ; do
-		#	local sink_vlan=${sink/network.interface./}_vlan
-		#done
-	}
-
-	# maintain VIDs passed as args in network config, remove rest
-	ts_keep() {
-		local al_bridge=$(uci -q get mapagent.agent.al_bridge)
-		local layer3="$(uci -q get mapagent.agent.layer3_ts)"
-		restart=""
-
-		[ "$al_bridge" = "" ] && al_bridge="br-lan"
-
-
-		guest_teardown() {
-			local section=$1
-			local config=$2
-			local bridge=$3
-			local option=$4
-
-			config_get name "$section" "$option"
-
-			[ "$bridge" != "$name" ] && continue
-
-			uci -q delete ${config}.${section}
-		}
-
-		bridge_vlan_teardown() {
-			local section=$1
-			shift
-			local bridge=$1
-			shift
-			local layer3=$1
-			shift
-			local keep="$@"
-
-			config_get device "$section" device
-
-			[ "$bridge" != "$device" ] && continue
-
-			config_get vlan "$section" vlan
-
-			for i in $@; do
-				if [ "$i" -eq "$vlan" ] ; then
-					return
-				fi
-			done
-
-			#if layer3ts enabled
-			if [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
-				local br_guest="br-guest${vlan}"
-
-				config_load network
-				config_foreach guest_teardown device "network" $br_guest "name" $@ # could easier be replaced by uci ubus api and using match field
-				config_foreach guest_teardown interface "network" $br_guest "device" $@ # could easier be replaced by uci ubus api and using match field
-
-				config_load dhcp
-				[ -n "$(uci -q get dhcp.guest${vlan})" ] && {
-					uci -q delete dhcp.guest${vlan}
-					restart="1"
-				}
-				config_load firewall
-				config_foreach guest_teardown zone "firewall" guest${vlan} "name" $@ #delete firewall section with name = guest${vlan}
-				config_foreach guest_teardown forwarding "firewall" guest${vlan} "src" $@ #delete firewall section with name = guest${vlan}
-			fi
-
-
-			#endif
-			uci -q delete network.$section
-			restart="1"
-		}
-
-		config_load network
-		(config_foreach bridge_vlan_teardown bridge-vlan $al_bridge $layer3 $@)
-
-		if [ "$restart" = "1" ]; then
-			uci commit network
-			if [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
-				uci commit firewall
-				uci commit dhcp
-			fi
-			dbg "trigger network restart"
-			/etc/init.d/network restart
-		fi
-	}
-
-	ts_cleanup() {
-		local al_bridge=$(uci -q get mapagent.agent.al_bridge)
-		local layer3="$(uci -q get mapagent.agent.layer3_ts)"
-		restart=""
-
-		[ "$al_bridge" = "" ] && al_bridge="br-lan"
-
-		bridge_device_teardown() {
-			local section=$1
-			local bridge=$2
-			local layer3=$3
-			local br_dev="${AL_BRIDGE/-/_}"
-			local dev
-			local br_guest
-			local peer
-
-			config_get device "$section" device
-			config_get vlan "$section" vlan
-
-			dev="guest_dev${vlan}"
-
-			[ "$bridge" != "$device" ] && continue
-
-			uci -q delete network.$section
-
-			echo "restart"
-
-			[ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ] || continue
-
-			####
-			# layer3 specific teardown
-			####
-
-			guest_teardown() {
-				local section=$1
-				local config=$2
-				local bridge=$3
-				local option=$4
-
-				config_get name "$section" "$option"
-
-				[ "$bridge" != "$name" ] && continue
-
-				echo "$bridge=$name" > /dev/console
-
-				uci -q delete ${config}.${section}
-				echo "uci -q delete ${config}.${section}" > /dev/console
-			}
-
-			br_guest="br-guest${vlan}"
-
-			# network config guest teardown
-			config_load network
-			config_foreach guest_teardown device "network" $br_guest "name"
-			config_foreach guest_teardown interface "network" $br_guest "device"
-
-			if [ -n "$(uci -q get network.${br_dev}.ports | grep -w ${dev})" ]; then
-				uci -q del_list network.${br_dev}.ports="${dev}"
-			fi
-
-			peer="guest_peer${vlan}"
-
-			ip link show $dev 2> /dev/null && {
-				ip link del $dev
-			}
-
-			ip link show $peer 2> /dev/null && {
-				ip link del $peer
-			}
-
-			# dhcp config guest teardown
-			[ -n "$(uci -q get dhcp.guest${vlan})" ] && {
-				uci -q delete dhcp.guest${vlan}
-			}
-
-			# firewall config guest teardown
-			config_load firewall
-			config_foreach guest_teardown zone "firewall" guest${vlan} "name"
-			config_foreach guest_teardown forwarding "firewall" guest${vlan} "src"
-		}
-
-		config_load network
-		restart="$(config_foreach bridge_device_teardown bridge-vlan $al_bridge $layer3)"
-
-		if [ -n "$restart" ]; then
-			uci commit network
-			if [ -x "/usr/sbin/mapcontroller" -a "$layer3" = "1" ]; then
-				uci commit firewall
-				uci commit dhcp
-			fi
-			dbg "trigger network restart"
-			/etc/init.d/network restart
-		fi
-
-		# enable pktfwd again and flush FlowCache rules
-		echo 1 > /proc/pktfwd_dhd/enable
-		echo 1 > /proc/pktfwd_wl/enable
-		echo 0 > /proc/pktfwd_dhd/enable
-		echo 0 > /proc/pktfwd_wl/enable
-		echo 1 > /proc/pktfwd_dhd/enable
-		echo 1 > /proc/pktfwd_wl/enable
-		fcctl flush
-	}
-
-	ts_isolate() {
-		local action=$1
-		shift
-		local pvid=$1 # pvid
-		shift
-		local ifname=$1 # guest fbss name
-		shift
-		local ifprefix=$@ # 4addr mode ifname prefix
-
-		[ -z "$pvid" -o -z "$ifprefix" -o -z "$ifname" ] && return
-
-		for prefix in $@; do
-			ebtables -D FORWARD -i $ifname --o ${prefix}+ --vlan-id ! $pvid -j DROP -p 802_1Q > /dev/null 2>&1
-			ebtables -D FORWARD -i ${prefix}+ --o ${ifname} --vlan-id ! $pvid -j DROP -p 802_1Q > /dev/null 2>&1
-
-			[ "$action" != "add" ] && continue
-			ebtables -A FORWARD -i $ifname --o ${prefix}+ --vlan-id ! $pvid -j DROP -p 802_1Q > /dev/null 2>&1
-			ebtables -A FORWARD -i ${prefix}+ --o ${ifname} --vlan-id ! $pvid -j DROP -p 802_1Q > /dev/null 2>&1
+		# another workaround for netif? removed
+		# sink devices for br-map bridge
+		for sink in $(ubus list network.interface.sink*) ; do
+			local sink_vlan=${sink/network.interface./}_vlan
+			brctl addif br-map $sink_vlan &> /dev/null
 		done
-
-
 	}
 
 	local func=$1
@@ -450,10 +469,12 @@ EOF
 
 	case "$func" in
 		create) dbg "create $@"; ts_create $@;;
-		keep) dbg "keep $@"; ts_keep $@;;
+		delete) dbg "delete $@"; ts_delete $@;;
+		populate) dbg "populate $@"; ts_populate $@;;
+		primary) dbg "primary $@"; ts_primary $@;;
+		unicast) dbg "unicast $@"; ts_unicast $@;;
+		multicast) dbg "multicast $@"; ts_multicast $@;;
 		reload) dbg "reload $@"; ts_reload $@;;
-		cleanup) dbg "cleanup $@"; ts_cleanup $@;;
-		isolate) dbg "isolate $@"; ts_isolate $@;;
 		--help|help) ts_usage;;
 		*) ts_usage; exit 1;;
 	esac

map-controller/Config.in

@@ -1,26 +0,0 @@
-if (PACKAGE_map-controller)
-
-menu "Configurations"
-
-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

@@ -1,13 +1,16 @@
 #
-# Copyright (C) 2020-22 IOPSYS Software Solutions AB
+# Copyright (C) 2020 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.8.0.15
+PKG_VERSION:=6.0.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e71a5f4f7f947f4c7819b4caf238fd1bec9b4fe8
+PKG_SOURCE_VERSION:=4d8e171fabc16ee93bbad8d4a7471f8968836217
+
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -17,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/map-controller
@@ -34,7 +34,7 @@ define Package/map-controller/description
 endef
 
 define Package/map-controller/config
-	source "$(SOURCE)/Config.in"
+	#source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
@@ -44,22 +44,11 @@ TARGET_CFLAGS += \
 
 MAKE_PATH:=src
 
-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

@@ -1,144 +1,67 @@
 config controller 'controller'
 	option enabled '1'
-	option registrar '2 5'
-	option debug '0'
+	option registrar '5 2'	    #bands on which wps registrar supported
+	option debug '6'
 	option enable_sta_steer '0'
 	option enable_bsta_steer '0'
-	option use_bcn_metrics '0'
-	option use_usta_metrics '0'
 	option primary_vid '1'
 	option primary_pcp '0'
-	option enable_ts '0'
-	option allow_bgdfs '0'
-	option channel_plan '0'
 
-config ap
-	option band '2'
-	option encryption 'sae-mixed'
-	option vid '1'
-	option ssid 'IOWRT-2.4GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
+config interface 'lan'
+	option 'dhcp'
 
 config ap
 	option band '5'
+	option encryption 'sae-mixed'
+	option key '1234567890'
+	option ssid 'map-net5'
+	option vid '1'
 	option type 'fronthaul'
-	option vid '1'
-	option ssid 'IOWRT-5GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
+	option network 'lan'
 
 config ap
 	option band '2'
-	option type 'backhaul'
+	option encryption 'sae-mixed'
+	option key '1234567890'
+	option ssid 'map-net2'
 	option vid '1'
-	list disallow_bsta '0'
-	option ssid 'MAP-BH-2.4GHz'
-	option encryption 'sae'
-	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
+	option type 'fronthaul'
+	option network 'lan'
 
 config ap
 	option band '5'
-	option type 'backhaul'
-	option vid '1'
-	list disallow_bsta '0'
-	option ssid 'MAP-BH-5GHz'
 	option encryption 'sae'
-	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
+	option key '5555555555'
+	option ssid 'map-bkhaul-5'
+	option type 'backhaul'
+	option disallow_bsta '1'		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
+	option vid '1'
+	option network 'lan'
 
-# node and radio sections (per node) are auto
-# generated per Multi-AP Agent in the network
-#
-#config node 'node_0a1b2c3d4e50'
-#	option agent_id '0a:1b:2c:3d:4e:50'
-# following values use default values after onboarding if not explicitly set
-#	option backhaul_ul_macaddr '00:00:00:00:00:00'
-#	option backhaul_dl_macaddr '00:00:00:00:00:00'
-#	option backhaul_type 'none'
-#	option primary_vid '1'
-#	option primary_pcp '0'
-#	option report_sta_assocfails '0'
-#	option report_sta_assocfails_rate '0'
-#	option report_metric_periodic '0'
-#	option report_scan '0'
-#	option steer_exclude '0'
-#	option steer_exclude_btm '0'
-#	option steer_disallow '0'
-#	option coordinated_cac '0'
-#	option traffic_separation '0'
-#	option sta_steer '0'
+config ap
+	option band '2'
+	option encryption 'sae'
+	option key '2222222222'
+	option ssid 'map-bkhaul-2'
+	list disallow_bsta '0'                # 0 or 1 profile-1 bSTA
+	option vid '1'
+	option type 'backhaul'
+	option network 'lan'
 
-#config radio 'radio_0a1b2c3d4e53'
-#	option agent_id '0a:1b:2c:3d:4e:50'
-#	option macaddr '0a:1b:2c:3d:4e:53'
-#	option band '2'
-# following values use default values after onboarding if not explicitly set
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '70'
-#	option report_rcpi_threshold '80'
-#	option report_util_threshold '0'
-#	option report_rcpi_hysteresis_margin '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-#config radio 'radio_0a1b2c3d4e54'
-#	option agent_id '0a:1b:2c:3d:4e:50'
-#	option macaddr '0a:1b:2c:3d:4e:54'
-#	option band '5'
-# following values use default values after onboarding if not explicitly set
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '86'
-#	option report_rcpi_threshold '96'
-#	option report_util_threshold '0'
-#	option report_rcpi_hysteresis_margin '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-#config node 'node_3fb1c2d3e460'
-#	option agent_id '3f:b1:c2:d3:e4:60'
-# following values use default values after onboarding if not explicitly set
-#	option backhaul_ul_macaddr '00:00:00:00:00:00'
-#	option backhaul_dl_macaddr '00:00:00:00:00:00'
-#	option backhaul_type 'none'
-#	option primary_vid '1'
-#	option primary_pcp '0'
-#	option report_sta_assocfails '0'
-#	option report_sta_assocfails_rate '0'
-#	option report_metric_periodic '0'
-#	option report_scan '0'
-#	option steer_exclude '0'
-#	option steer_exclude_btm '0'
-#	option steer_disallow '0'
-#	option coordinated_cac '0'
-#	option traffic_separation '0'
-#	option sta_steer '0'
-
-#config radio 'radio_3fb1c2d3e463'
-#	option agent_id '3f:b1:c2:d3:e4:60'
-#	option macaddr '3f:b1:c2:d3:e4:63'
-#	option band '2'
-# following values use default values after onboarding if not explicitly set
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '70'
-#	option report_rcpi_threshold '80'
-#	option report_util_threshold '0'
-#	option report_rcpi_hysteresis_margin '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-#config radio 'radio_3fb1c2d3e464'
-#	option agent_id '3f:b1:c2:d3:e4:60'
-#	option macaddr '3f:b1:c2:d3:e4:64'
-#	option band '5'
-# following values use default values after onboarding if not explicitly set
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '86'
-#	option report_rcpi_threshold '96'
-#	option report_util_threshold '0'
-#	option report_rcpi_hysteresis_margin '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
+config policy 'policy'
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_sta_assocfails_rate '2'      # reporting rate for STA assoc fails (attempts per minute)
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option rcpi_hysteresis_margin '0'          # 0, or > 0 - hysteresis margin
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA

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

@@ -5,8 +5,6 @@ STOP=20
 
 USE_PROCD=1
 
-IS_CFG_VALID=1
-
 handle_controller_select() {
 	local section="$1"
 
@@ -14,125 +12,10 @@ handle_controller_select() {
 	return 1
 }
 
-validate_controller_section() {
-	uci_validate_section mapcontroller controller "controller" \
-		'enabled:bool:true' \
-		'registrar:string' \
-		'debug:range(0,16)' \
-		'resend_num:uinteger:0' \
-		'enable_sta_steer:bool:false' \
-		'enable_bsta_steer:bool:false' \
-		'use_bcn_metrics:bool:false' \
-		'use_usta_metrics:bool:false' \
-		'allow_bgdfs:range(0,2629744)' \
-		'channel_plan:range(0,2629744)' \
-		'enable_ts:bool:false'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of controller section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_ap_section() {
-	local section="$1"
-
-	uci_validate_section mapcontroller $section "${1}" \
-			'band:or("2", "5")' \
-			'ssid:string' \
-			'encryption:or("sae", "sae+aes", "psk2",
-				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
-			'key:string' \
-			'vid:range(1,65535):1' \
-			'type:or("backhaul", "fronthaul", "combined")' \
-			'disallow_bsta:list(range(0,255)):0' \
-			'enabled:bool:true'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of ap section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_node_section() {
-	local section="$1"
-
-	uci_validate_section mapcontroller $section "${1}" \
-			'agent_id:macaddr' \
-			'backhaul_ul_macaddr:macaddr' \
-			'backhaul_dl_macaddr:macaddr' \
-			'backhaul_type:or("none")' \
-			'primary_vid:range(0,255):1' \
-			'primary_pcp:range(0,255):0' \
-			'report_sta_assocfails:bool:false' \
-			'report_sta_assocfails_rate:uinteger' \
-			'report_metric_periodic:range(0,255)' \
-			'report_scan:bool:false' \
-			'steer_exclude:list(macaddr)' \
-			'steer_exclude_btm:list(macaddr)' \
-			'steer_disallow:bool:false' \
-			'coordinated_cac:bool:false' \
-			'traffic_separation:bool:false' \
-			'sta_steer:bool:false'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of node section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_radio_section() {
-	local section="$1"
-
-	uci_validate_section mapcontroller $section "${1}" \
-			'agent_id:macaddr' \
-			'macaddr:macaddr' \
-			'band:or("2", "5")' \
-			'steer_policy:range(0,2)' \
-			'util_threshold:range(0,255)' \
-			'rcpi_threshold:range(0,255)' \
-			'report_rcpi_threshold:range(0,255)' \
-			'report_util_threshold:range(0,255)' \
-			'report_rcpi_hysteresis_margin:range(0,255)' \
-			'include_sta_stats:bool:false' \
-			'include_sta_metric:bool:false'
-
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapcontroller" "Validation of radio section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_controller_config() {
-	IS_CFG_VALID=1
-
-	validate_controller_section &&
-		config_foreach validate_ap_section ap &&
-		config_foreach validate_node_section node &&
-		config_foreach validate_radio_section radio
-
-	[ "$IS_CFG_VALID" -ne 1 ] && {
-		logger -s -t "mapcontroller" "Validation of mapcontroller UCI file failed"
-		return 1
-	}
-	return 0
-}
-
 start_service() {
 	local enabled
 
 	config_load "mapcontroller"
-	validate_controller_config || return 1;
-
 	config_get_bool enabled controller enabled 1
 	[ "$enabled" -eq 0 ] && return
 

map-topology/Config.in

@@ -1,22 +0,0 @@
-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

@@ -1,44 +1,37 @@
 #
-# Copyright (C) 2020-22 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys
 #
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.0.13
+PKG_VERSION:=3.2.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=413330b08fc4608ea2f5f740cf829f62d5a8bba0
+PKG_SOURCE_VERSION:=76767466f3dbd2a697fa4cdd966f4dd2ce4f43c8
 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
 PKG_MIRROR_HASH:=skip
 endif
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=ieee1905
-
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/map-topology
 	CATEGORY:=Utilities
 	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy \
-		 +libavahi-nodbus-support +libnetfilter-conntrack +libnfnetlink +libmnl
+		+libieee1905 +map-plugin +libavahi-nodbus-support
 	TITLE:=Utility to build topology of a multi-AP network
 endef
 
-define Package/map-topology/config
-	source "$(SOURCE)/Config.in"
-endef
-
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
 	-D_GNU_SOURCE
 
 define Package/map-topology/description
@@ -47,11 +40,6 @@ 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,4 +2,3 @@
 config global 'global'
 	option ageing_timer '1440'
 	option reboot_persistent '0'
-	option ifname 'br-lan'

map-topology/files/etc/init.d/topologyd

@@ -5,73 +5,7 @@ STOP=21
 
 USE_PROCD=1
 
-IS_CFG_VALID=1
-
-validate_topology_config() {
-	uci_validate_section topology topology "topology" \
-			'enabled:bool:true' \
-			'depth:range(0,16)' \
-			'interval:range(0,65535)' \
-			'maxlog:range(0,128)' \
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "topology" "Validation of topology UCI file failed"
-		return 1
-	}
-	return 0
-}
-
-validate_global_section() {
-	uci_validate_section hosts global "global" \
-		'ageing_timer:uinteger' \
-		'reboot_persistent:bool' \
-		'ifname:string'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "hosts" "Validation of global section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_host_section() {
-	local section="$1"
-
-	uci_validate_section hosts $section "${1}" \
-			'macaddr:macaddr' \
-			'interface_type:or("wifi","eth")' \
-			'active:bool' \
-			'active_last_change:string'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "hosts" "Validation of host section $section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
-validate_hosts_config() {
-	IS_CFG_VALID=1
-
-	validate_global_section &&
-		config_foreach validate_host_section host
-
-	[ "$IS_CFG_VALID" -ne 1 ] && {
-		logger -s -t "topology" "Validation of hosts UCI file failed"
-		return 1
-	}
-	return 0
-}
-
 start_service() {
-	config_load "topology"
-	validate_topology_config || return 1;
-
-	config_load "hosts"
-	validate_hosts_config || return 1;
-
 	procd_open_instance
         procd_set_param command "/usr/sbin/topologyd"
 	procd_set_param respawn

mosquitto-auth-shadow/Makefile

@@ -1,45 +0,0 @@
-#
-# 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

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

mosquitto-auth-shadow/src/Makefile

@@ -1,25 +0,0 @@
-#
-# 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

@@ -1,80 +0,0 @@
-/*
- * 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);
-}

netmode/files/etc/init.d/netmode

@@ -34,13 +34,12 @@ start_service() {
 	[ -n "$mode" ] || return
 
 	# Get the last saved mode
-	lastmode="$(cat $MODEDIR/.last_mode 2>/dev/null)"
+	lastmode="$(cat /etc/netmodes/.last_mode 2>/dev/null)"
 	# Return if desired mode is same as last saved mode
 	[ "$mode" == "$lastmode" ] && return
 
 	# Save mode as last mode
-	[ -d $MODEDIR ] || mkdir -p $MODEDIR
-	echo "$mode" > $MODEDIR/.last_mode
+	echo "$mode" > /etc/netmodes/.last_mode
 
 	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
 

obuspa/Config.in

@@ -21,9 +21,5 @@ config OBUSPA_MTP_ENABLE_STOMP
 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
 	default n
-
-config OBUSPA_CONTROLLER_MTP_VERIFY
-	bool "Enable verification of MQTT response topic before processing the message"
-	default n
 endmenu
 endif

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.16.5
+PKG_VERSION:=5.0.0.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b0626e54ba4a0e8d1d261948a7114c6dc35e2dbc
+PKG_SOURCE_VERSION:=0afaf5eeed63dceb275d7715ccce8977cfad1ee3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -31,7 +31,7 @@ define Package/obuspa
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=USP agent
-  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
+  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto-ssl +libwebsockets-openssl
 endef
 
 define Package/obuspa/description
@@ -43,14 +43,11 @@ define Package/obuspa/config
 endef
 
 TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
 	-Wall \
 	-Werror
 
-ifneq ($(CONFIG_OBUSPA_CONTROLLER_MTP_VERIFY),)
-  TARGET_CFLAGS += -DOBUSPA_CONTROLLER_MTP_VERIFY
-endif
-
 ifneq ($(CONFIG_OBUSPA_DB_PATH),)
   CONFIGURE_ARGS += \
 	--localstatedir="$(CONFIG_OBUSPA_DB_PATH)"
@@ -91,7 +88,6 @@ endif
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
-        $(Build/Patch)
 endef
 endif
 
@@ -100,14 +96,11 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(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/
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(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
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/init.d/obuspa

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
 START=99
-STOP=02
+STOP=2
 USE_PROCD=1
 PROG=/usr/sbin/obuspa
 
@@ -16,6 +16,7 @@ mqtt_num=0
 subs_num=0
 challenge_num=0
 index=0
+role_def_file=""
 PROFILE="/root/.profile"
 
 . /lib/functions/network.sh
@@ -34,7 +35,7 @@ log() {
 }
 
 db_set() {
-	if [ -n "${1}" ] && [ -n "${2}" ]; then
+	if [ -n "${1}" ]; then
 		echo "${1} \"${2}\"">>${PARAM_FILE}
 	else
 		echo >>${PARAM_FILE}
@@ -61,15 +62,13 @@ get_index() {
 }
 
 get_role_index_from_json() {
-	local role="$1"
-	local role_def_file="$2"
+	local role="$*"
 	local num=0
 	local roles_obj
 
 	# In case of role is empty or file not present
 	if [ -z "${role}" ] || [ ! -f "${role_def_file}" ]; then
-		echo "${num}"
-		return ${num}
+		return 0
 	fi
 
 	json_init
@@ -89,12 +88,11 @@ get_role_index_from_json() {
 		fi
 
 		if [ "${role}" = "${rname}" ]; then
-			echo "${num}"
 			return ${num}
 		fi
 	done
 
-	return ${num}
+	return 0
 }
 
 get_uci_ref_index() {
@@ -151,7 +149,7 @@ validate_controller_section()
 		'USPNotifRetryMinimumWaitInterval:uinteger:5' \
 		'USPNotifRetryIntervalMultiplier:uinteger:2000' \
 		'ControllerCode:string' \
-		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
+		'Protocol:or("STOMP","CoAP","MQTT")' \
 		'Reference:string' \
 		'Destination:string:controller-notify-dest' \
 		'Topic:string' \
@@ -160,14 +158,7 @@ validate_controller_section()
 		'coap_path:string' \
 		'coap_port:port' \
 		'mqtt:string' \
-		'stomp:string' \
-		'Host:host' \
-		'Port:port' \
-		'Path:string' \
-		'EnableEncryption:bool' \
-		'KeepAliveInterval:uinteger' \
-		'SessionRetryIntervalMultiplier:uinteger' \
-		'SessionRetryMinimumWaitInterval:uinteger'
+		'stomp:string'
 }
 
 validate_subscription_section()
@@ -186,7 +177,7 @@ validate_mtp_section()
 {
 	uci_validate_section ${CONFIGURATION} mtp "${1}" \
 		'Enable:bool:true' \
-		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
+		'Protocol:or("STOMP","CoAP","MQTT")' \
 		'Reference:string' \
 		'ResponseTopicConfigured:string' \
 		'PublishQoS:uinteger' \
@@ -194,12 +185,7 @@ validate_mtp_section()
 		'coap_path:string' \
 		'coap_port:port' \
 		'mqtt:string' \
-		'stomp:string' \
-		'Path:string' \
-		'Port:port' \
-		'EnableEncryption:bool' \
-		'KeepAliveInterval:uinteger'
-
+		'stomp:string'
 }
 
 validate_stomp_connection_section()
@@ -237,19 +223,6 @@ validate_mqtt_client_section()
 		'ConnectRetryMaxInterval:uinteger:60'
 }
 
-validate_challenge_section()
-{
-	uci_validate_section ${CONFIGURATION} challenge "${1}" \
-		'Enable:bool:true' \
-		'Alias:string' \
-		'Description:string' \
-		'role_name:string' \
-		'Role:string' \
-		'Value:string' \
-		'Retries:uinteger:3' \
-		'LockoutPeriod:uinteger:0'
-}
-
 get_oui_from_db() {
 	db -q get device.deviceinfo.ManufacturerOUI
 }
@@ -260,11 +233,7 @@ get_serial_from_db() {
 
 publish_endpoint() {
 	local AgentEndpointID serial oui user pass
-
-	if ! uci -q get obuspa.localmqtt; then
-		log "Remote mqtt broker configured, skip publishing endpoint"
-		return 0;
-	fi
+	local opt=""
 
 	# return if mosquitto_pub is not present
 	if [ ! "$(command -v mosquitto_pub)" ]; then
@@ -282,24 +251,22 @@ publish_endpoint() {
 	fi
 
 	config_get user localmqtt Username
+	if [ -n "${user}" ]; then
+		opt="-u ${user}"
+	fi
 	config_get pass localmqtt Password
+	if [ -n "${pass}" ]; then
+		opt="${opt} -P ${pass}"
+	fi
 
 	# publish Agent's EndpointID in mosquito broker for discovery by usp-js
 	# This is a work around till obuspa adds supports for mDNS discovery
-	if [ -n "${user}" ] && [ -n "${pass}" ]; then
-		log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker with username, password"
-		mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" -u "${user}" -P "${pass}"
-	elif [ -n "${user}" ]; then
-		log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker with username only"
-		mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" -u "${user}"
-	else
-		log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
-		mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}"
-	fi
+	log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
+	mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" ${opt}
 }
 
 configure_localagent() {
-	local Enable EndpointID
+	local Enable ParameterName EndpointID
 
 	validate_localagent_section 'localagent' || {
 		log "Validation of localagent section failed"
@@ -316,9 +283,7 @@ configure_localagent() {
 configure_controller() {
 	local EndpointID Enable AssignedRole PeriodicNotifInterval PeriodicNotifTime USPNotifRetryMinimumWaitInterval
 	local USPNotifRetryIntervalMultiplier ControllerCode Protocol Destination coap_host coap_path coap_port
-	local Reference Topic mqtt stomp assigned_role_name ParameterName
-	local Host Port Path EnableEncryption KeepAliveInterval
-	local SessionRetryIntervalMultiplier SessionRetryMinimumWaitInterval
+	local Reference Topic mqtt stomp assigned_role_name
 
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
@@ -330,20 +295,7 @@ configure_controller() {
 		return 1;
 	fi
 
-	# Support for backward compatibility for coap uci parameters
-	if [ -n "${coap_host}" ] && [ -z "${Host}" ]; then
-		Host="${coap_host}"
-	fi
-
-	if [ -n "${coap_path}" ] && [ -z "${Path}" ]; then
-		Path="${coap_path}"
-	fi
-
-	if [ -n "${coap_port}" ] && [ -z "${Port}" ]; then
-		Port="${coap_port}"
-	fi
-
-	if [ -z "${stomp}" ] && [ -z "${Reference}" ] && [ -z "${mqtt}" ] && [ -z "${Host}" ]; then
+	if [ -z "${stomp}" ] && [ -z "${Reference}" ] && [ -z "${mqtt}" ] && [ -z "${coap_path}" ]; then
 		log "controller:: Invalid configuration"
 		return 1;
 	fi
@@ -401,18 +353,9 @@ configure_controller() {
 		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Reference "${Reference}"
 		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Destination "${Destination}"
 	elif [ "${Protocol}" = "CoAP" ]; then
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Host "${Host}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Path "${Path}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Port "${Port}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.EnableEncryption "${EnableEncryption}"
-	elif [ "${Protocol}" = "WebSocket" ]; then
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Host "${Host}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Port "${Port}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Path "${Path}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.EnableEncryption "${EnableEncryption}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.KeepAliveInterval "${KeepAliveInterval}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.SessionRetryIntervalMultiplier "${SessionRetryIntervalMultiplier}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.SessionRetryMinimumWaitInterval "${SessionRetryMinimumWaitInterval}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Host "${coap_host}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Path "${coap_path}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Port "${coap_port}"
 	else
 		log "Unsupported Protocol ${Protocol}"
 	fi
@@ -442,7 +385,6 @@ configure_subscription(){
 
 	if [ -z "${Recipient}" ] && [ -z "${controller}" ]; then
 		log "No recipient for subscription"
-		return 1;
 	fi
 
 	if [ -z "${Recipient}" ]; then
@@ -463,14 +405,24 @@ configure_subscription(){
 	db_set Device.LocalAgent.Subscription.${subs_num}.ReferenceList "${ReferenceList}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.Persistent "${Persistent}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.Recipient "${Recipient}"
-	db_set Device.LocalAgent.Subscription.${subs_num}.CreationDate "$(date -I'seconds')"
+}
+
+validate_challenge_section()
+{
+	uci_validate_section ${CONFIGURATION} challenge "${1}" \
+		'Enable:bool:true' \
+		'Alias:string' \
+		'Description:string' \
+		'role_name:string' \
+		'Role:string' \
+		'Value:string' \
+		'Retries:uinteger:3' \
+		'LockoutPeriod:uinteger:0'
 }
 
 check_json_load()
 {
-	local ret
-
-	ret=0
+	local ret=0
 	if [ -f "${role_def_file}" ]; then
 		json_init
 		if json_load_file "${role_def_file}" 2>&1 |grep -q Failed; then
@@ -485,10 +437,8 @@ check_json_load()
 get_role_index() {
 	local role="Device.LocalAgent.ControllerTrust.Role"
 	local idx=0
-	local role_name="$1"
-	local role_def_file
+	local role_name="$*"
 
-	role_def_file=$(uci -q get obuspa.global.role_file 2>/dev/null)
 	case "${role_name}" in
 	'full_access')
 		idx=1;
@@ -499,9 +449,9 @@ get_role_index() {
 	 *)
 		local ji=0
 
-		check_json_load
-		if [ "$?" -eq "0" ]; then
-			ji=$(get_role_index_from_json "${role_name}" "${role_def_file}")
+		ji=$(check_json_load)
+		if [ "${ji}" -eq 0 ]; then
+			get_role_index_from_json "${role_name}"
 		fi
 		idx=$(( ji + 2 )) # Add predefined roles
 	 esac
@@ -547,21 +497,12 @@ configure_challenges() {
 configure_mtp() {
 	local Enable Protocol Reference ResponseTopicConfigured PublishQoS
 	local stomp mqtt
-	local Path Port EnableEncryption KeepAliveInterval
 
 	validate_mtp_section "${1}" || {
 		log "Validation of mtp section failed"
 		return 1;
 	}
 
-	if [ -n "${coap_path}" ] && [ -z "${Path}" ]; then
-		Path="${coap_path}"
-	fi
-
-	if [ -n "${coap_port}" ] && [ -z "${Port}" ]; then
-		Port="${coap_port}"
-	fi
-
 	if [ -z "${Reference}" ]; then
 		if [ "${Protocol}" = "STOMP" ]; then
 			val=$(get_uci_ref_index stomp "${stomp}")
@@ -594,13 +535,8 @@ configure_mtp() {
 		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Reference "${Reference}"
 		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Destination "${Destination}"
 	elif [ "${Protocol}" = "CoAP" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${Path}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${Port}"
-	elif [ "${Protocol}" = "WebSocket" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.Path "${Path}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.Port "${Port}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.EnableEncryption "${EnableEncryption}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.KeepAliveInterval "${KeepAliveInterval}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${coap_path}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${coap_port}"
 	else
 		log "Unsupported Protocol ${Protocol} in mtp"
 	fi
@@ -676,7 +612,12 @@ configure_obuspa() {
 	local enabled trust_cert ifname interface debug prototrace log_level db_file log_dest role_file
 	local client_cert
 
-	validate_obuspa_section "global"
+	validate_obuspa_section "global" || {
+		log "Validation of global section failed"
+		return 1;
+	}
+
+	role_def_file="${role_file}"
 
 	if [ "${debug}" -eq 1 ]; then
 		# Forward stdout of the command to logd
@@ -703,16 +644,20 @@ configure_obuspa() {
 
 	if [ -n "${ifname}" ]; then
 		procd_set_param env USP_BOARD_IFNAME="${ifname}"
-	fi
-
-	if [ -z "${ifname}" ] || ! grep -F -q "export USP_BOARD_IFNAME=${ifname}" "${PROFILE}"; then
+		# Set this variable for root user and obuspa -c tool
 		if [ -f "${PROFILE}" ]; then
-			sed -i "/export USP_BOARD_IFNAME/d" "${PROFILE}"
+			if grep -q "export USP_BOARD_IFNAME=${ifname}" ${PROFILE}; then
+				if grep -q "export USP_BOARD_IFNAME" ${PROFILE}; then
+					sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
+				fi
+			fi
 		fi
-
-		if [ -n "${ifname}" ]; then
-			# Set this variable for root user and obuspa -c tool
-			echo "export USP_BOARD_IFNAME=${ifname}" >> "${PROFILE}"
+		echo "export USP_BOARD_IFNAME=${ifname}" >> ${PROFILE}
+	else
+		if [ -f "$PROFILE" ]; then
+			if grep -q "export USP_BOARD_IFNAME" ${PROFILE}; then
+				sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
+			fi
 		fi
 	fi
 
@@ -740,39 +685,16 @@ configure_obuspa() {
 db_init() {
 	# Load configuration
 	config_load $CONFIGURATION
-
+	config_foreach configure_obuspa obuspa
 	config_foreach configure_controller controller
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_localagent localagent
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_mtp mtp
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_stomp_connection stomp
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_mqtt_client mqtt
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_subscription subscription
-	[ "$?" -ne 0 ] && return 1;
 	config_foreach configure_challenges challenge
-	[ "$?" -ne 0 ] && return 1;
 
 	db_set Internal.Reboot.Cause "LocalFactoryReset"
-	return 0;
-}
-
-register_service()
-{
-	procd_open_instance ${CONFIGURATION}
-	procd_set_param command ${PROG}
-	procd_append_param command -r ${PARAM_FILE}
-
-	configure_obuspa
-	procd_set_param respawn \
-			"${respawn_threshold:-5}" \
-			"${respawn_timeout:-10}" "${respawn_retry:-3}"
-
-	procd_set_param watch usp.raw
-	procd_close_instance
 }
 
 service_running() {
@@ -784,17 +706,23 @@ start_service() {
 
 	mkdir -p /tmp/obuspa/
 	config_load obuspa
-	config_get_bool enabled global enabled 0
+	config_get enabled global enabled
 
 	if [ "${enabled}" -eq 0 ]; then
 		log "OBUSPA not enabled"
 		return 0;
 	fi
 
+	procd_open_instance ${CONFIGURATION}
+	procd_set_param command ${PROG}
 	db_init
-	[ "$?" -ne 0 ] && return 1;
+	procd_append_param command -r ${PARAM_FILE}
+	procd_set_param respawn \
+			"${respawn_threshold:-5}" \
+			"${respawn_timeout:-10}" "${respawn_retry:-3}"
 
-	register_service
+	procd_set_param watch usp.raw
+	procd_close_instance
 }
 
 stop_service() {
@@ -806,7 +734,7 @@ stop_service() {
 	${PROG} -c stop >/dev/null 2>&1
 
 	if [ -z "${db_file}" ]; then
-		db_file="/tmp/obuspa/usp.db"
+		db_file="/tmp/usp.db"
 	fi
 
 	[ -f "${db_file}" ] && rm -f ${db_file}
@@ -841,14 +769,4 @@ service_triggers() {
 			json_add_int "" "2000"
 		json_close_array
 	procd_close_trigger
-
-	procd_open_validate
-	validate_obuspa_section
-	validate_localagent_section
-	validate_controller_section
-	validate_subscription_section
-	validate_mtp_section
-	validate_stomp_connection_section
-	validate_mqtt_client_section
-	procd_close_validate
 }

obuspa/files/etc/obuspa/dmcaching_exclude.json

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

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

@@ -1,42 +0,0 @@
---- a/src/core/cli_server.c
-+++ b/src/core/cli_server.c
-@@ -733,10 +733,6 @@ int ExecuteCli_Get(char *arg1, char *arg
-             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);
---- a/src/core/handle_get.c
-+++ b/src/core/handle_get.c
-@@ -252,24 +252,14 @@ void FormPathExprResponse(int get_expr_i
-         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];
- 
-+        if (gge->err_code != USP_ERR_OK)
-+		continue;
- #ifdef GET_RESPONSE_SIMPLE_FORMAT
-         // Simple format contains a resolved_path_result for every object (and sub object)
-         AddResolvedPathResult(req_path_result, gge->path, gge->value, 0);

periodicstats/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6c68428405bc88a9990e855f911aecc86f07f4a8
+PKG_SOURCE_VERSION:=7426c7458f792cc66920c206d62869c5620f1400
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -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
@@ -37,7 +35,7 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-        $(CP) -rf ~/git/periodicstats/* $(PKG_BUILD_DIR)/
+        $(CP) -rf ./periodicstats/* $(PKG_BUILD_DIR)/
 endef
 endif
 

periodicstats/files/etc/init.d/periodicstats

@@ -11,12 +11,9 @@ service_running() {
 }
 
 start_service() {
-	local enable
+	enable=$(uci -q get periodicstats.globals.enable)
 
-	config_load periodicstats
-	config_get_bool enable globals enable 1
-
-	if [ "${enable}" -ne "1" ]; then
+	if [ "$(enable)" != "1" ]; then
 		return 0;
 	fi
 
@@ -27,7 +24,7 @@ start_service() {
 }
 
 service_triggers() {
-	procd_add_reload_trigger periodicstats
+	procd_add_reload_trigger periodicstats uspd
 }
 
 reload_service() {

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=21522c2003b8c61904acc61ff97e54fc9b0c3c92
+PKG_SOURCE_VERSION:=15ba90f01914113e7c5e8f8a6df6279c882e8265
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 

peripheral_manager/files/etc/init.d/ledmngr

@@ -1,62 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=20
-USE_PROCD=1
-
-setled() {
-	local enable
-	local brightness
-
-	config_get_bool enable $1 enable 1
-	config_get brightness $1 brightness 100
-	ubus call led.$1 set "{\"enable\":$enable,\"brightness\":$brightness}"
-}
-
-start_service() {
-	local enable
-
-	config_load leds
-	config_foreach setled led
-	config_get_bool enable leds enable 1
-
-	if [ "$enable" == "0" ]; then
-		ubus call leds set  '{"state" : "alloff"}'
-	else
-		ubus call leds set  '{"state" : "normal"}'
-	fi
-}
-
-boot() {
-	local led ledname
-
-	ubus list led* >/dev/null || sleep 1
-	ubus list led* >/dev/null || sleep 1
-
-	[ -f /etc/config/leds ] || touch /etc/config/leds
-
-	if ! uci -q get leds.leds >/dev/null; then
-		uci set leds.leds=leds
-		uci set leds.leds.enable=1
-	fi
-
-	for led in $(ubus list led.*); do
-		ledname=${led:4}
-		case $ledname in
-			*phy*) continue ;;
-		esac
-		if ! uci -q  get leds.$ledname >/dev/null; then
-			uci set leds.$ledname=led
-			uci set leds.$ledname.enable=1
-		fi
-	done
-
-	uci commit leds
-
-	start
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "leds"
-}
-

ponmngr/files/etc/init.d/pon

@@ -0,0 +1,36 @@
+#!/bin/sh /etc/rc.common
+
+START=98
+STOP=10
+
+USE_PROCD=1
+NAME=ponmngr
+PROG="/usr/sbin/omcid start"
+
+include /lib/pon
+
+
+start_service() {
+       if [ -f "/etc/config/pon" ]; then
+		procd_open_instance $NAME
+		procd_set_param command ${PROG}
+		procd_set_param respawn
+		procd_close_instance
+                start_gpon
+       fi
+}
+
+boot() {
+        start
+}
+
+stop_service() {
+	service_stop ${PROG}
+        stop_gpon
+}
+
+reload_service() {
+        stop
+        start
+}
+

ponmngr/files/etc/init.d/xpon

@@ -1,40 +0,0 @@
-#!/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/etc/uci-defaults/60-pon-generate

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+basemac="$(db -q get hw.board.basemac | tr -d ':')"
+             
+if [ -s "/etc/config/pon" ]; then
+        if uci -q get pon.globals >/dev/null; then
+                # return if there is any valid content
+                exit                                  
+        else                                          
+                rm -f /etc/config/pon
+        fi                           
+fi                                   
+touch /etc/config/pon
+                     
+mac=''               
+if [ -z "$basemac" ]; then
+        mac="12345678"    
+else                      
+        # read last 8 characters of basemac without :
+        mac=${basemac: -8}                           
+fi                                                   
+                          
+uci set pon.globals=globals
+uci set pon.globals.enabled="1"
+uci set pon.globals.serial_number="BRCM$mac"
+                                           
+uci commit pon  

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

@@ -1,34 +0,0 @@
-#!/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/lib/pon/broadcom.sh

@@ -0,0 +1,70 @@
+#!/bin/sh
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+
+configure_snpwd() {
+        local serial_no password
+        serial_no="$1"
+        password="$2"
+
+        # serial number comprises of 2 parts, vendor id and vendor specific, the vendor id is
+        # a string while the vendor specific is a hex, so split the 2 and set accordingly
+        local vendor_id vendor_specific
+        vendor_id=${serial_no:0:4}
+        vendor_specific=${serial_no: -8}
+
+        # attempt to conver vendor_id from string to hex
+	vendor_id=$(echo $vendor_id | hexdump -e '4/1 "%02X" "\n"')
+	vendor_id=${vendor_id:0:8}
+
+        bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure gpon onu_sn={vendor_id=$vendor_id,vendor_specific=$vendor_specific}
+        if [ -n "$password" ]; then
+		password=$(echo $password | hexdump -n ${#password} -e '16/1 "%02X""\n"')
+                bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure gpon password=$password
+        fi
+}
+
+configure_gpon() {
+        local enabled serial_no password
+        config_load pon
+        config_get enabled globals "enabled"
+
+	if [ "$enabled" == "0" ]; then
+		exit
+        fi
+
+        config_get serial_no globals "serial_number"
+        config_get password globals "password"
+
+        configure_snpwd $serial_no $password
+}
+
+start_gpon() {
+        if [ -n "$(which gponctl)" ]; then
+                configure_gpon
+                gponctl start
+        fi
+}
+
+stop_gpon() {
+        if [ -n "$(which gponctl)" ]; then
+                gponctl stop
+        fi
+}
+
+get_gpon_status() {
+        json_init
+        status="$(gponctl getstate)"
+        admin_status="$(echo $status | head -n1 | awk '{print $8;}')"
+        json_add_string "admin_status" "$admin_status"
+        op_status="$(echo $status | head -n1 | awk '{print $12;}')"
+        case $op_status in
+        NUMBER)
+                op_status="$(echo $status | head -n1 | awk '{print $13;}')"
+                ;;
+        esac
+
+        op_status=${op_status:1:2}
+        json_add_string "operational_status" "$op_status"
+        json_dump
+}

ponmngr/files/lib/xpon/broadcom.sh

@@ -1,30 +0,0 @@
-#!/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/usr/libexec/rpcd/pon

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+include /lib/pon
+
+case "$1" in
+	list)
+		echo '{ "status": {} }'
+		;;
+	call)
+		case "$2" in
+			status)
+				get_gpon_status
+				;;
+		esac
+		;;
+esac
+

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

@@ -1,20 +1,16 @@
 #!/bin/sh
 
 populate_config_from_db() {
-	. /lib/functions.sh
-	include /lib/network
+	. /lib/network/utils.sh
 
 	portorder="$(db -q get hw.board.ethernetPortOrder)"
 	for port in $portorder; do
-		speed="$(get_max_port_speed $port 2>/dev/null)"
-		speed="${speed:-1000}"
-
 		uci add ports ethport
 		uci rename ports.@ethport[-1]="$(get_port_name $port)"
 		uci set ports.@ethport[-1].enabled=1
 		uci set ports.@ethport[-1].name="$(get_port_name $port)"
 		uci set ports.@ethport[-1].ifname="$port"
-		uci set ports.@ethport[-1].speed="$speed"
+		uci set ports.@ethport[-1].speed=1000
 		uci set ports.@ethport[-1].duplex="full"
 		uci set ports.@ethport[-1].autoneg=1
 		uci set ports.@ethport[-1].eee=0

qosmngr/files/lib/qos/broadcom.sh

@@ -4,18 +4,23 @@
 
 IP_RULE=""
 BR_RULE=""
-BR6_RULE=""
 
+POLICER_SKIP=0
 POLICER_COUNT=0
+INTF_NAME=""
 Q_COUNT=0
-SP_Q_PRIO=7
+ITER=0
+PREV_ORDER=""
+CURR_ORDER=""
+MAX_ORDER=""
+
 
 # Function to handle a queue order and
 # update total number of queues
 handle_q_order() {
-	local qid="$1" #queue section ID
+	qid="$1" #queue section ID
 
-	config_get is_enable "$qid" "enable" 1
+	config_get is_enable "$qid" "enable"
 
 	# No need to configure disabled queues
 	if [ $is_enable == '0' ]; then
@@ -31,7 +36,7 @@ handle_q_order() {
 	# Create precedence file containing queue order per
 	# interface.
 	local precedence_file="/tmp/qos/$ifname/q_order"
-	local q_no=$(cat /tmp/qos/$ifname/q_idx)
+	local q_no=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
 
 	config_get precedence "$qid" "precedence"
 	value=${precedence}_q${q_no}
@@ -39,32 +44,71 @@ handle_q_order() {
 
 	# Update the number of queues per interface.
 	q_no=$((q_no + 1))
-	echo $q_no > /tmp/qos/$ifname/q_idx
+	echo $q_no > /tmp/qos/queue_stats/$ifname/q_idx
 }
 
-# Sort queue, lower value in uci means higher precedence, so this
-# function sorts the precedence in decending order
-sort_q_by_precedence() {
+# Function to check if values are greater than (total number
+# of queue -1) and map them to corresponding value.
+configure_precedence_to_file() {
+	order="$1"
+	line="$2"
+	order_file="$3"
+
+	if [ $order == "$PREV_ORDER" ]; then
+		queue_id=${line#*_}
+		val=${CURR_ORDER}_${queue_id}
+		echo $val >> $order_file
+	else
+		PREV_ORDER=$order
+		queue_id=${line#*_}
+		val=${MAX_ORDER}_${queue_id}
+		echo $val >> $order_file
+		CURR_ORDER=$MAX_ORDER
+		MAX_ORDER=$((MAX_ORDER - 1))
+	fi
+}
+
+# Fucntion to map queue precedence per interface
+# ranging from 1-X to 0-(no of queues -1)
+map_queue_precedence() {
 	ifname="$1"
+	total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
+	q_no=`expr $total_q - 1`
 
+	MAX_ORDER=$q_no
+
+	local precedence_file="/tmp/qos/$ifname/q_precedence"
 	local order_file="/tmp/qos/$ifname/q_order"
-	local tmp_order_file="/tmp/qos/$ifname/q_order.tmp"
 
-	sort -n -k1 $order_file > $tmp_order_file
-	cp $tmp_order_file $order_file
-	rm -f $tmp_order_file
+	sort -n -r -k1 $order_file >> $precedence_file
+	rm $order_file
+
+	while read line
+	do
+		order=${line%_*}
+		if [ $order  -gt $q_no ]; then
+			ITER=$((ITER + 1))
+			configure_precedence_to_file $order $line $order_file
+		else
+			if [ $ITER == '0' ]; then
+				echo $line >> $order_file
+			else
+				configure_precedence_to_file $order $line $order_file
+			fi
+		fi
+
+	done < $precedence_file
 }
 
-sort_by_precedence() {
+map_precedence() {
 	for interf in $(db -q get hw.board.ethernetPortOrder); do
-		sort_q_by_precedence $interf
+		map_queue_precedence $interf
 	done
 }
 
 # function to handle a queue section
 handle_queue() {
-	local qid="$1" #queue section ID
-	local intf_name="$2"
+	qid="$1" #queue section ID
 
 	config_get is_enable "$qid" "enable"
 
@@ -80,35 +124,33 @@ handle_queue() {
 	fi
 
 	# This is to get the qid per interface.
-	if [ "$intf_name" != "$ifname" ]; then
-		return
+	if [ "$INTF_NAME" == $ifname ]; then
+		Q_COUNT=$((Q_COUNT + 1))
+	else
+		Q_COUNT='0'
 	fi
 
-	local precedence_file="/tmp/qos/$ifname/q_order"
+	INTF_NAME=$ifname
 
-	local temp_order=0
-	while read -r line; do
-		line_qid=${line: -1}
-		if [ "$line_qid" == "$Q_COUNT" ]; then
-			break
-		fi
-		temp_order=$((temp_order + 1))
-	done < "$precedence_file"
+	local total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
+	q_no=`expr $total_q - 1` local
+	precedence_file="/tmp/qos/$ifname/q_order"
 
-	# for sp queue, no matter what the precedence value is configured in the uci file
-	# broadcom recommends that the highest precedence queue should have priority value
-	#7, the next priority q 6 and so on.
-	# Here, we have the index of the queue when sorted by precedence value in the file
-	# precedence_file so the order is calculated accordingly.
-	local order=`expr $SP_Q_PRIO - $temp_order`
+	# TR181 suggests lower the precedence value higher the priority
+	# but in the chip its the opposite ie lower the value, lower
+	# the priority of queue on this chip. So we need to reverse the
+	# precedence value.
+	precedence="$(grep -i q${Q_COUNT} $precedence_file)"
+	precedence=${precedence%_*}
+	order=`expr $q_no - $precedence`
 
 	config_get sc_alg "$qid" "scheduling"
-	config_get wgt "$qid" "weight" 1
+	config_get wgt "$qid" "weight"
 	config_get rate "$qid" "rate"
 	config_get bs "$qid" "burst_size"
 	config_get qsize "$qid" "queue_size" 1024
 
-	local salg=1
+	salg=1
 
 	case "$sc_alg" in
 		"SP") salg=1
@@ -121,15 +163,31 @@ handle_queue() {
 		;;
 	esac
 
-	# ignore precedence value in case of WRR, broadcom recommends that WRR queue should
-	# always have precedence value set to 0
+	# ignore precedence value in case of WRR
 	if [ $salg -eq 2 ]; then
 	       order=0
 	fi
 
 	# Call tmctl which is a broadcomm command to configure queues on a port.
 	tmctl setqcfg --devtype 0 --if $ifname --qid $Q_COUNT --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
-	Q_COUNT=$((Q_COUNT + 1))
+
+	# In BCM968 chips, the counters for queues are read, on other model, its read and reset. So, to maintain counter
+	# value and uniform behaviour, we are storing counter value for each queue in files
+	local d_name="/tmp/qos/queue_stats/${ifname}/q_${Q_COUNT}"
+	mkdir $d_name
+	local f_name="$d_name/txPackets"
+	touch $f_name
+	echo 0 > $f_name
+	f_name="$d_name/txBytes"
+	touch $f_name
+	echo 0 > $f_name
+	f_name="$d_name/droppedPackets"
+	touch $f_name
+	echo 0 > $f_name
+	f_name="$d_name/droppedBytes"
+	touch $f_name
+	echo 0 > $f_name
+
 }
 
 #function to handle a policer section
@@ -234,7 +292,6 @@ flush_chains() {
 
 init_broute_rule() {
 	BR_RULE=""
-	BR6_RULE=""
 }
 
 broute_filter_on_src_if() {
@@ -270,82 +327,6 @@ 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() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
-	if [ ! -z "$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() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
-	if [ ! -z "$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() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
-	if [ ! -z "$BR6_RULE" ]; then
-		BR6_RULE="$BR6_RULE --ip6-proto $1"
-	else
-		BR_RULE="$BR_RULE --ip6-proto $1"
-	fi
-}
-
-ebt_match_ipv6_dscp() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
-	if [ ! -z "$BR6_RULE" ]; then
-		BR6_RULE="$BR6_RULE --ip6-tclass $1"
-	else
-		BR_RULE="$BR_RULE --ip6-tclass $1"
-	fi
-}
-
 broute_filter_on_dscp() {
 	# The broadcom option --ip-dscp-extend actually accepts tos
 	# and not dscp and that too in hex, hence, perform the conversion
@@ -356,11 +337,6 @@ broute_filter_on_dscp() {
 }
 
 broute_filter_on_vid() {
-
-	if [ $1 -lt 0 ]; then
-		return
-	fi
-
 	case "$BR_RULE" in
 	*proto*)
 		BR_RULE="$BR_RULE --vlan-id $1"
@@ -372,145 +348,11 @@ broute_filter_on_vid() {
 }
 
 broute_rule_set_traffic_class() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
 	BR_RULE="$BR_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
-	if [ ! -z "$BR6_RULE" ]; then
-		BR6_RULE="$BR6_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
-	fi
 }
 
 broute_append_rule() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed otherwise install ipv6 proto rule only.
 	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 [ ! -z "$src_ip" ]; then
-                $match_src_ip_func "$src_ip"
-        fi
-
-        if [ ! -z "$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 ! [ -z $src_port ] && ! [ -z $src_port_range ]; then
-                $match_src_port_func "$src_port:$src_port_range"
-        elif [ ! -z $src_port ]; then
-                $match_src_port_func $src_port
-        fi
-
-        if ! [ -z $dst_port ] && ! [ -z $dst_port_range ]; then
-                $match_dst_port_func "$dst_port:$dst_port_range"
-        elif [ ! -z $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 [ ! -z $dscp_filter ]; then
-		broute_filter_on_dscp "$dscp_filter"
-	fi
-
-	if [ ! -z $protocol ]; then
-		local proto_num=$(protocol_string_to_num "$protocol")
-		ebt_match_ip_protocol "$proto_num"
-
-		#port installation for protol tcp/udp/sctp
-		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 [ ! -z $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 [ ! -z $protocol ]; then
-		local proto_num=$(protocol_string_to_num "$protocol")
-		ebt_match_ipv6_protocol "$proto_num"
-
-		#port installation for protol tcp/udp/sctp
-		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() {
@@ -518,8 +360,6 @@ handle_ebtables_rules() {
 	local is_l2_rule=0
 	local src_dhcp_options=""
 	local dst_dhcp_options=""
-	local protocol=""
-	local ip_version=""
 
 	init_broute_rule
 
@@ -537,9 +377,8 @@ handle_ebtables_rules() {
 	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"
 
+	config_get traffic_class "$sid" "traffic_class"
 
 	if [ -n "$src_if" ]; then
 		for interf in $(db -q get hw.board.ethernetPortOrder); do
@@ -566,6 +405,13 @@ handle_ebtables_rules() {
 		is_l2_rule=1
 	fi
 
+	if [ -n "$dscp_filter" ]; then
+		# filter on ethertype and proto is same thing
+		broute_filter_on_ether_type IPv4
+		broute_filter_on_dscp $dscp_filter
+		is_l2_rule=1
+	fi
+
 	if [ -n "$eth_type" ]; then
 		broute_filter_on_ether_type $eth_type
 		is_l2_rule=1
@@ -576,47 +422,6 @@ handle_ebtables_rules() {
 		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$dest_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
-					ip_version=1 #neither ether_type nor ip address used
-					#ethertype is not configured by user so install 
-					#both proto ipv4 and ipv6 rule
-					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
@@ -947,7 +752,12 @@ handle_policer_rules() {
 		return
 	fi
 
-	config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
+	# The policer object is not available on non BCM968* chips
+	if [ $POLICER_SKIP -eq 1 ]; then
+		assign_policer_to_port $ifname $pindex
+	else
+		config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
+	fi
 
 }
 
@@ -1034,20 +844,23 @@ configure_classify() {
 
 pre_configure_queue() {
 	# Delete queues
+	rm -rf /tmp/qos/queue_stats
+
 	for intf in $(db get hw.board.ethernetPortOrder); do
 		rm -rf /tmp/qos/$intf
 
-		mkdir -p /tmp/qos/$intf
-		touch /tmp/qos/$intf/q_order
-		touch /tmp/qos/$intf/q_idx
-		echo 0 > /tmp/qos/$intf/q_idx
-
-		tmctl porttminit --devtype 0 --if $intf --numqueues 8
-
+		mkdir -p /tmp/qos/queue_stats/$intf
+		touch /tmp/qos/queue_stats/$intf/q_idx
+		echo 0 > /tmp/qos/queue_stats/$intf/q_idx
 		i=0
 		for i in 0 1 2 3 4 5 6 7; do
 			tmctl delqcfg --devtype 0 --if $intf --qid $i &>/dev/null
 		done
+		tmctl porttminit --devtype 0 --if $intf --flag 0 --numqueues 8
+
+		mkdir -p /tmp/qos/$intf
+		touch /tmp/qos/$intf/q_order
+		touch /tmp/qos/$intf/q_precedence
 	done
 }
 
@@ -1055,29 +868,24 @@ configure_queue() {
 	# Load UCI file
 	config_load qos
 	config_foreach handle_q_order queue
-	sort_by_precedence
-	for interf in $(db -q get hw.board.ethernetPortOrder); do
-		Q_COUNT=0
-		# sp queue have max priority value = no. of queue configured on the port
-		# hence read and update SP_Q_PRIO here
-		local q_no=$(cat /tmp/qos/$interf/q_idx)
-		SP_Q_PRIO=`expr $q_no - 1`
-		config_foreach handle_queue queue $interf
-	done
+	map_precedence
+	config_foreach handle_queue queue
 }
 
 configure_policer() {
 	# The policer object is not available on non BCM968* chips, just clean up
 	# the old config if any and return
-	for intf in $(db get hw.board.ethernetPortOrder); do
-		local unitport="$(get_port_number $intf)"
-		local unit=$(echo $unitport | cut -d ' ' -f 1)
-		local port=$(echo $unitport | cut -d ' ' -f 2)
-		# setting rate and burst size to 0 disables rate limiting
-		if [ $port != "" -a $unit != "" ]; then
-			ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
-		fi
-	done
+	if [ $POLICER_SKIP -eq 0 ]; then
+		for intf in $(db get hw.board.ethernetPortOrder); do
+			local unitport="$(get_port_number $intf)"
+			local unit=$(echo $unitport | cut -d ' ' -f 1)
+			local port=$(echo $unitport | cut -d ' ' -f 2)
+			# setting rate and burst size to 0 disables rate limiting
+			if [ $port != "" -a $unit != "" ]; then
+				ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
+			fi
+		done
+	fi
 
 	# Delete policer
 	local i=0
@@ -1118,6 +926,10 @@ reload_qos() {
 	local service_name="$1"
 	local cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"
 
+	case $cpu_model in
+		BCM68*|BCM6755) POLICER_SKIP=1 ;;
+	esac
+
 	if [ -z "$service_name" ]; then
 		configure_qos
 	elif [ "$service_name" == "shaper" ]; then

questd/Makefile

@@ -1,20 +1,21 @@
 #
-# Copyright (C) 2013-2022 iopsys
+# Copyright (C) 2013-2020 iopsys
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=5.2.4
+PKG_VERSION:=5.2.3
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=cf54bd65ec821ac67f3aa1caeebcd3ea9aae07ad
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
-PKG_SOURCE_VERSION:=2ca3ae0c29dcbbf01282f6118eb8d5e5bc9a1c45
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
@@ -22,6 +23,8 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
+PKG_INSTALL:=
+
 define Package/questd
 	CATEGORY:=Utilities
 	DEPENDS:=+libuci +libubox +ubus +libpthread
@@ -33,13 +36,6 @@ define Package/questd/description
 	this information via ubus
 endef
 
-ifeq ($(LOCAL_DEV),1)
-CMAKE_OPTIONS:=-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-define Build/Prepare
-	$(CP) -rf ~/git/code/questd/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 define Package/questd/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin

rulengd/Makefile

@@ -1,22 +1,23 @@
 #
-# Copyright (C) 2018-2022 iopsys
+# Copyright (C) 2018 iopsys
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rulengd
-PKG_VERSION:=1.2.7
+PKG_VERSION:=1.2.6
 PKG_RELEASE:=1
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=1f247e1afc845f47348febffa55fe40d8b552737
+PKG_SOURCE_VERSION:=e323bebe85cd7fb4eeb6cee535188227bc9b81e3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
-
+PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
@@ -34,14 +35,6 @@ define Package/rulengd/description
 	rulengd listens for events and executes speficied methods if the incoming event arguments contain speficied ones.
 endef
 
-#CMAKE_OPTIONS:=-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/code/rulengd/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 define Package/rulengd/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/bin

shflags/Makefile

@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2012-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=shflags
+PKG_VERSION:=2012-06-11
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/kward/shflags.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=c12b30cebb92b49c5edb6df255c0952c65b4ddc6
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+PKG_LICENSE:=LGPL-2.1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/shflags
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=shflags
+  DEPENDS:=+getopt
+  URL:=http://code.google.com/p/shflags/
+  MAINTAINER:=Luka Perkov <luka@openwrt.org>
+endef
+
+define Package/shflags/description
+ command-line flags module for Unix shell scripts
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Build/Install
+endef
+
+define Package/shflags/install
+	$(INSTALL_DIR) $(1)/usr/share/shflags
+	$(CP) $(PKG_BUILD_DIR)/source/1.0/src/shflags  $(1)/usr/share/shflags/shflags.sh
+endef
+
+$(eval $(call BuildPackage,shflags))

shflags/patches/000-strip.patch

@@ -0,0 +1,763 @@
+--- a/source/1.0/src/shflags
++++ b/source/1.0/src/shflags
+@@ -1,91 +1,10 @@
+-# $Id$
+-# vim:et:ft=sh:sts=2:sw=2
+-#
+-# Copyright 2008 Kate Ward. All Rights Reserved.
+-# Released under the LGPL (GNU Lesser General Public License)
+-#
+-# shFlags -- Advanced command-line flag library for Unix shell scripts.
+-# http://code.google.com/p/shflags/
+-#
+-# Author: kate.ward@forestent.com (Kate Ward)
+-#
+-# This module implements something like the google-gflags library available
+-# from http://code.google.com/p/google-gflags/.
+-#
+-# FLAG TYPES: This is a list of the DEFINE_*'s that you can do.  All flags take
+-# a name, default value, help-string, and optional 'short' name (one-letter
+-# name).  Some flags have other arguments, which are described with the flag.
+-#
+-# DEFINE_string: takes any input, and intreprets it as a string.
+-#
+-# DEFINE_boolean: typically does not take any argument: say --myflag to set
+-#   FLAGS_myflag to true, or --nomyflag to set FLAGS_myflag to false.
+-#   Alternately, you can say
+-#     --myflag=true  or --myflag=t or --myflag=0  or
+-#     --myflag=false or --myflag=f or --myflag=1
+-#   Passing an option has the same affect as passing the option once.
+-#
+-# DEFINE_float: takes an input and intreprets it as a floating point number. As
+-#   shell does not support floats per-se, the input is merely validated as
+-#   being a valid floating point value.
+-#
+-# DEFINE_integer: takes an input and intreprets it as an integer.
+-#
+-# SPECIAL FLAGS: There are a few flags that have special meaning:
+-#   --help (or -?)  prints a list of all the flags in a human-readable fashion
+-#   --flagfile=foo  read flags from foo.  (not implemented yet)
+-#   --              as in getopt(), terminates flag-processing
+-#
+-# EXAMPLE USAGE:
+-#
+-#   -- begin hello.sh --
+-#   #! /bin/sh
+-#   . ./shflags
+-#   DEFINE_string name 'world' "somebody's name" n
+-#   FLAGS "$@" || exit $?
+-#   eval set -- "${FLAGS_ARGV}"
+-#   echo "Hello, ${FLAGS_name}."
+-#   -- end hello.sh --
+-#
+-#   $ ./hello.sh -n Kate
+-#   Hello, Kate.
+-#
+-# NOTE: Not all systems include a getopt version that supports long flags. On
+-# these systems, only short flags are recognized.
+-
+-#==============================================================================
+-# shFlags
+-#
+-# Shared attributes:
+-#   flags_error: last error message
+-#   flags_return: last return value
+-#
+-#   __flags_longNames: list of long names for all flags
+-#   __flags_shortNames: list of short names for all flags
+-#   __flags_boolNames: list of boolean flag names
+-#
+-#   __flags_opts: options parsed by getopt
+-#
+-# Per-flag attributes:
+-#   FLAGS_<flag_name>: contains value of flag named 'flag_name'
+-#   __flags_<flag_name>_default: the default flag value
+-#   __flags_<flag_name>_help: the flag help string
+-#   __flags_<flag_name>_short: the flag short name
+-#   __flags_<flag_name>_type: the flag type
+-#
+-# Notes:
+-# - lists of strings are space separated, and a null value is the '~' char.
+-
+-# return if FLAGS already loaded
+ [ -n "${FLAGS_VERSION:-}" ] && return 0
+ FLAGS_VERSION='1.0.3'
+ 
+-# return values
+ FLAGS_TRUE=0
+ FLAGS_FALSE=1
+ FLAGS_ERROR=2
+ 
+-# reserved flag names
+ FLAGS_RESERVED='ARGC ARGV ERROR FALSE HELP PARENT RESERVED TRUE VERSION'
+ 
+ _flags_debug() { echo "flags:DEBUG $@" >&2; }
+@@ -93,7 +12,6 @@ _flags_warn() { echo "flags:WARN $@" >&2
+ _flags_error() { echo "flags:ERROR $@" >&2; }
+ _flags_fatal() { echo "flags:FATAL $@" >&2; }
+ 
+-# specific shell checks
+ if [ -n "${ZSH_VERSION:-}" ]; then
+   setopt |grep "^shwordsplit$" >/dev/null
+   if [ $? -ne ${FLAGS_TRUE} ]; then
+@@ -107,20 +25,15 @@ if [ -n "${ZSH_VERSION:-}" ]; then
+   fi
+ fi
+ 
+-#
+-# constants
+-#
+ 
+-# getopt version
+ __FLAGS_GETOPT_VERS_STD=0
+ __FLAGS_GETOPT_VERS_ENH=1
+ __FLAGS_GETOPT_VERS_BSD=2
+ 
+ getopt >/dev/null 2>&1
+ case $? in
+-  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;  # bsd getopt
++  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;
+   2)
+-    # TODO(kward): look into '-T' option to test the internal getopt() version
+     if [ "`getopt --version`" = '-- ' ]; then
+       __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD}
+     else
+@@ -133,82 +46,49 @@ case $? in
+     ;;
+ esac
+ 
+-# getopt optstring lengths
+ __FLAGS_OPTSTR_SHORT=0
+ __FLAGS_OPTSTR_LONG=1
+ 
+ __FLAGS_NULL='~'
+ 
+-# flag info strings
+ __FLAGS_INFO_DEFAULT='default'
+ __FLAGS_INFO_HELP='help'
+ __FLAGS_INFO_SHORT='short'
+ __FLAGS_INFO_TYPE='type'
+ 
+-# flag lengths
+ __FLAGS_LEN_SHORT=0
+ __FLAGS_LEN_LONG=1
+ 
+-# flag types
+ __FLAGS_TYPE_NONE=0
+ __FLAGS_TYPE_BOOLEAN=1
+ __FLAGS_TYPE_FLOAT=2
+ __FLAGS_TYPE_INTEGER=3
+ __FLAGS_TYPE_STRING=4
+ 
+-# set the constants readonly
+ __flags_constants=`set |awk -F= '/^FLAGS_/ || /^__FLAGS_/ {print $1}'`
+ for __flags_const in ${__flags_constants}; do
+-  # skip certain flags
+   case ${__flags_const} in
+     FLAGS_HELP) continue ;;
+     FLAGS_PARENT) continue ;;
+   esac
+-  # set flag readonly
+   if [ -z "${ZSH_VERSION:-}" ]; then
+     readonly ${__flags_const}
+-  else  # handle zsh
++  else
+     case ${ZSH_VERSION} in
+       [123].*) readonly ${__flags_const} ;;
+-      *) readonly -g ${__flags_const} ;;  # declare readonly constants globally
++      *) readonly -g ${__flags_const} ;;
+     esac
+   fi
+ done
+ unset __flags_const __flags_constants
+ 
+-#
+-# internal variables
+-#
+-
+-__flags_boolNames=' '  # space separated list of boolean flag names
+-__flags_longNames=' '  # space separated list of long flag names
+-__flags_shortNames=' '  # space separated list of short flag names
+-
+-__flags_columns=''  # screen width in columns
+-__flags_opts=''  # temporary storage for parsed getopt flags
+-
+-#------------------------------------------------------------------------------
+-# private functions
+-#
+-
+-# Define a flag.
+-#
+-# Calling this function will define the following info variables for the
+-# specified flag:
+-#   FLAGS_flagname - the name for this flag (based upon the long flag name)
+-#   __flags_<flag_name>_default - the default value
+-#   __flags_flagname_help - the help string
+-#   __flags_flagname_short - the single letter alias
+-#   __flags_flagname_type - the type of flag (one of __FLAGS_TYPE_*)
+-#
+-# Args:
+-#   _flags__type: integer: internal type of flag (__FLAGS_TYPE_*)
+-#   _flags__name: string: long flag name
+-#   _flags__default: default flag value
+-#   _flags__help: string: help string
+-#   _flags__short: string: (optional) short flag name
+-# Returns:
+-#   integer: success of operation, or error
++
++__flags_boolNames=' '
++__flags_longNames=' '
++__flags_shortNames=' '
++__flags_columns=''
++__flags_opts=''
++
+ _flags_define()
+ {
+   if [ $# -lt 4 ]; then
+@@ -226,16 +106,13 @@ _flags_define()
+ 
+   _flags_return_=${FLAGS_TRUE}
+ 
+-  # TODO(kward): check for validity of the flag name (e.g. dashes)
+ 
+-  # check whether the flag name is reserved
+   echo " ${FLAGS_RESERVED} " |grep " ${_flags_name_} " >/dev/null
+   if [ $? -eq 0 ]; then
+     flags_error="flag name (${_flags_name_}) is reserved"
+     _flags_return_=${FLAGS_ERROR}
+   fi
+ 
+-  # require short option for getopt that don't support long options
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
+       -a ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} \
+       -a "${_flags_short_}" = "${__FLAGS_NULL}" ]
+@@ -244,7 +121,6 @@ _flags_define()
+     _flags_return_=${FLAGS_ERROR}
+   fi
+ 
+-  # check for existing long name definition
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
+     if _flags_itemInList "${_flags_name_}" \
+         ${__flags_longNames} ${__flags_boolNames}
+@@ -255,7 +131,6 @@ _flags_define()
+     fi
+   fi
+ 
+-  # check for existing short name definition
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
+       -a "${_flags_short_}" != "${__FLAGS_NULL}" ]
+   then
+@@ -266,9 +141,6 @@ _flags_define()
+     fi
+   fi
+ 
+-  # handle default value. note, on several occasions the 'if' portion of an
+-  # if/then/else contains just a ':' which does nothing. a binary reversal via
+-  # '!' is not done because it does not work on all shells.
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
+     case ${_flags_type_} in
+       ${__FLAGS_TYPE_BOOLEAN})
+@@ -301,7 +173,7 @@ _flags_define()
+         fi
+         ;;
+ 
+-      ${__FLAGS_TYPE_STRING}) ;;  # everything in shell is a valid string
++      ${__FLAGS_TYPE_STRING}) ;;
+ 
+       *)
+         flags_error="unrecognized flag type '${_flags_type_}'"
+@@ -311,7 +183,6 @@ _flags_define()
+   fi
+ 
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
+-    # store flag information
+     eval "FLAGS_${_flags_name_}='${_flags_default_}'"
+     eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}=${_flags_type_}"
+     eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}=\
+@@ -319,7 +190,6 @@ _flags_define()
+     eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP}=\"${_flags_help_}\""
+     eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT}='${_flags_short_}'"
+ 
+-    # append flag name(s) to list of names
+     __flags_longNames="${__flags_longNames}${_flags_name_} "
+     __flags_shortNames="${__flags_shortNames}${_flags_short_} "
+     [ ${_flags_type_} -eq ${__FLAGS_TYPE_BOOLEAN} ] && \
+@@ -333,17 +203,6 @@ _flags_define()
+   return ${flags_return}
+ }
+ 
+-# Return valid getopt options using currently defined list of long options.
+-#
+-# This function builds a proper getopt option string for short (and long)
+-# options, using the current list of long options for reference.
+-#
+-# Args:
+-#   _flags_optStr: integer: option string type (__FLAGS_OPTSTR_*)
+-# Output:
+-#   string: generated option string for getopt
+-# Returns:
+-#   boolean: success of operation (always returns True)
+ _flags_genOptStr()
+ {
+   _flags_optStrType_=$1
+@@ -358,7 +217,6 @@ _flags_genOptStr()
+             ${_flags_flag_} ${__FLAGS_INFO_SHORT}`
+         if [ "${_flags_shortName_}" != "${__FLAGS_NULL}" ]; then
+           _flags_opts_="${_flags_opts_}${_flags_shortName_}"
+-          # getopt needs a trailing ':' to indicate a required argument
+           [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
+               _flags_opts_="${_flags_opts_}:"
+         fi
+@@ -366,7 +224,6 @@ _flags_genOptStr()
+ 
+       ${__FLAGS_OPTSTR_LONG})
+         _flags_opts_="${_flags_opts_:+${_flags_opts_},}${_flags_flag_}"
+-        # getopt needs a trailing ':' to indicate a required argument
+         [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
+             _flags_opts_="${_flags_opts_}:"
+         ;;
+@@ -379,15 +236,6 @@ _flags_genOptStr()
+   return ${FLAGS_TRUE}
+ }
+ 
+-# Returns flag details based on a flag name and flag info.
+-#
+-# Args:
+-#   string: long flag name
+-#   string: flag info (see the _flags_define function for valid info types)
+-# Output:
+-#   string: value of dereferenced flag variable
+-# Returns:
+-#   integer: one of FLAGS_{TRUE|FALSE|ERROR}
+ _flags_getFlagInfo()
+ {
+   _flags_name_=$1
+@@ -399,13 +247,6 @@ _flags_getFlagInfo()
+   if [ -n "${_flags_value_}" ]; then
+     flags_return=${FLAGS_TRUE}
+   else
+-    # see if the _flags_name_ variable is a string as strings can be empty...
+-    # note: the DRY principle would say to have this function call itself for
+-    # the next three lines, but doing so results in an infinite loop as an
+-    # invalid _flags_name_ will also not have the associated _type variable.
+-    # Because it doesn't (it will evaluate to an empty string) the logic will
+-    # try to find the _type variable of the _type variable, and so on. Not so
+-    # good ;-)
+     _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}"
+     _flags_strToEval_="_flags_type_=\"\${${_flags_typeVar_}:-}\""
+     eval "${_flags_strToEval_}"
+@@ -424,15 +265,6 @@ _flags_getFlagInfo()
+   return ${flags_return}
+ }
+ 
+-# check for presense of item in a list. passed a string (e.g. 'abc'), this
+-# function will determine if the string is present in the list of strings (e.g.
+-# ' foo bar abc ').
+-#
+-# Args:
+-#   _flags__str: string: string to search for in a list of strings
+-#   unnamed: list: list of strings
+-# Returns:
+-#   boolean: true if item is in the list
+ _flags_itemInList()
+ {
+   _flags_str_=$1
+@@ -449,34 +281,22 @@ _flags_itemInList()
+   return ${flags_return}
+ }
+ 
+-# Returns the width of the current screen.
+-#
+-# Output:
+-#   integer: width in columns of the current screen.
+ _flags_columns()
+ {
+   if [ -z "${__flags_columns}" ]; then
+-    # determine the value and store it
+     if eval stty size >/dev/null 2>&1; then
+-      # stty size worked :-)
+       set -- `stty size`
+       __flags_columns=$2
+     elif eval tput cols >/dev/null 2>&1; then
+       set -- `tput cols`
+       __flags_columns=$1
+     else
+-      __flags_columns=80  # default terminal width
++      __flags_columns=80
+     fi
+   fi
+   echo ${__flags_columns}
+ }
+ 
+-# Validate a boolean.
+-#
+-# Args:
+-#   _flags__bool: boolean: value to validate
+-# Returns:
+-#   bool: true if the value is a valid boolean
+ _flags_validateBoolean()
+ {
+   _flags_bool_=$1
+@@ -492,12 +312,6 @@ _flags_validateBoolean()
+   return ${flags_return}
+ }
+ 
+-# Validate a float.
+-#
+-# Args:
+-#   _flags__float: float: value to validate
+-# Returns:
+-#   bool: true if the value is a valid float
+ _flags_validateFloat()
+ {
+   _flags_float_=$1
+@@ -507,10 +321,10 @@ _flags_validateFloat()
+   else
+     flags_return=${FLAGS_TRUE}
+     case ${_flags_float_} in
+-      -*)  # negative floats
++      -*)
+         _flags_test_=`expr "${_flags_float_}" : '\(-[0-9][0-9]*\.[0-9][0-9]*\)'`
+         ;;
+-      *)  # positive floats
++      *)
+         _flags_test_=`expr "${_flags_float_}" : '\([0-9][0-9]*\.[0-9][0-9]*\)'`
+         ;;
+     esac
+@@ -521,22 +335,16 @@ _flags_validateFloat()
+   return ${flags_return}
+ }
+ 
+-# Validate an integer.
+-#
+-# Args:
+-#   _flags__integer: interger: value to validate
+-# Returns:
+-#   bool: true if the value is a valid integer
+ _flags_validateInteger()
+ {
+   _flags_int_=$1
+ 
+   flags_return=${FLAGS_TRUE}
+   case ${_flags_int_} in
+-    -*)  # negative ints
++    -*)
+       _flags_test_=`expr "${_flags_int_}" : '\(-[0-9][0-9]*\)'`
+       ;;
+-    *)  # positive ints
++    *)
+       _flags_test_=`expr "${_flags_int_}" : '\([0-9][0-9]*\)'`
+       ;;
+   esac
+@@ -546,23 +354,12 @@ _flags_validateInteger()
+   return ${flags_return}
+ }
+ 
+-# Parse command-line options using the standard getopt.
+-#
+-# Note: the flag options are passed around in the global __flags_opts so that
+-# the formatting is not lost due to shell parsing and such.
+-#
+-# Args:
+-#   @: varies: command-line options to parse
+-# Returns:
+-#   integer: a FLAGS success condition
+ _flags_getoptStandard()
+ {
+   flags_return=${FLAGS_TRUE}
+   _flags_shortOpts_=`_flags_genOptStr ${__FLAGS_OPTSTR_SHORT}`
+ 
+-  # check for spaces in passed options
+   for _flags_opt_ in "$@"; do
+-    # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
+     _flags_match_=`echo "x${_flags_opt_}x" |sed 's/ //g'`
+     if [ "${_flags_match_}" != "x${_flags_opt_}x" ]; then
+       flags_error='the available getopt does not support spaces in options'
+@@ -585,15 +382,6 @@ _flags_getoptStandard()
+   return ${flags_return}
+ }
+ 
+-# Parse command-line options using the enhanced getopt.
+-#
+-# Note: the flag options are passed around in the global __flags_opts so that
+-# the formatting is not lost due to shell parsing and such.
+-#
+-# Args:
+-#   @: varies: command-line options to parse
+-# Returns:
+-#   integer: a FLAGS success condition
+ _flags_getoptEnhanced()
+ {
+   flags_return=${FLAGS_TRUE}
+@@ -617,17 +405,6 @@ _flags_getoptEnhanced()
+   return ${flags_return}
+ }
+ 
+-# Dynamically parse a getopt result and set appropriate variables.
+-#
+-# This function does the actual conversion of getopt output and runs it through
+-# the standard case structure for parsing. The case structure is actually quite
+-# dynamic to support any number of flags.
+-#
+-# Args:
+-#   argc: int: original command-line argument count
+-#   @: varies: output from getopt parsing
+-# Returns:
+-#   integer: a FLAGS success condition
+ _flags_parseGetopt()
+ {
+   _flags_argc_=$1
+@@ -638,35 +415,26 @@ _flags_parseGetopt()
+   if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
+     set -- $@
+   else
+-    # note the quotes around the `$@' -- they are essential!
+     eval set -- "$@"
+   fi
+ 
+-  # provide user with number of arguments to shift by later
+-  # NOTE: the FLAGS_ARGC variable is obsolete as of 1.0.3 because it does not
+-  # properly give user access to non-flag arguments mixed in between flag
+-  # arguments. Its usage was replaced by FLAGS_ARGV, and it is being kept only
+-  # for backwards compatibility reasons.
+   FLAGS_ARGC=`expr $# - 1 - ${_flags_argc_}`
+ 
+-  # handle options. note options with values must do an additional shift
+   while true; do
+     _flags_opt_=$1
+     _flags_arg_=${2:-}
+     _flags_type_=${__FLAGS_TYPE_NONE}
+     _flags_name_=''
+ 
+-    # determine long flag name
+     case "${_flags_opt_}" in
+-      --) shift; break ;;  # discontinue option parsing
++      --) shift; break ;;
+ 
+-      --*)  # long option
++      --*)
+         _flags_opt_=`expr "${_flags_opt_}" : '--\(.*\)'`
+         _flags_len_=${__FLAGS_LEN_LONG}
+         if _flags_itemInList "${_flags_opt_}" ${__flags_longNames}; then
+           _flags_name_=${_flags_opt_}
+         else
+-          # check for negated long boolean version
+           if _flags_itemInList "${_flags_opt_}" ${__flags_boolNames}; then
+             _flags_name_=`expr "${_flags_opt_}" : 'no\(.*\)'`
+             _flags_type_=${__FLAGS_TYPE_BOOLEAN}
+@@ -675,12 +443,10 @@ _flags_parseGetopt()
+         fi
+         ;;
+ 
+-      -*)  # short option
++      -*)
+         _flags_opt_=`expr "${_flags_opt_}" : '-\(.*\)'`
+         _flags_len_=${__FLAGS_LEN_SHORT}
+         if _flags_itemInList "${_flags_opt_}" ${__flags_shortNames}; then
+-          # yes. match short name to long name. note purposeful off-by-one
+-          # (too high) with awk calculations.
+           _flags_pos_=`echo "${__flags_shortNames}" \
+               |awk 'BEGIN{RS=" ";rn=0}$0==e{rn=NR}END{print rn}' \
+                   e=${_flags_opt_}`
+@@ -690,14 +456,12 @@ _flags_parseGetopt()
+         ;;
+     esac
+ 
+-    # die if the flag was unrecognized
+     if [ -z "${_flags_name_}" ]; then
+       flags_error="unrecognized option (${_flags_opt_})"
+       flags_return=${FLAGS_ERROR}
+       break
+     fi
+ 
+-    # set new flag value
+     [ ${_flags_type_} -eq ${__FLAGS_TYPE_NONE} ] && \
+         _flags_type_=`_flags_getFlagInfo \
+             "${_flags_name_}" ${__FLAGS_INFO_TYPE}`
+@@ -746,7 +510,6 @@ _flags_parseGetopt()
+         ;;
+     esac
+ 
+-    # handle special case help flag
+     if [ "${_flags_name_}" = 'help' ]; then
+       if [ ${FLAGS_help} -eq ${FLAGS_TRUE} ]; then
+         flags_help
+@@ -756,12 +519,10 @@ _flags_parseGetopt()
+       fi
+     fi
+ 
+-    # shift the option and non-boolean arguements out.
+     shift
+     [ ${_flags_type_} != ${__FLAGS_TYPE_BOOLEAN} ] && shift
+   done
+ 
+-  # give user back non-flag arguments
+   FLAGS_ARGV=''
+   while [ $# -gt 0 ]; do
+     FLAGS_ARGV="${FLAGS_ARGV:+${FLAGS_ARGV} }'$1'"
+@@ -773,43 +534,18 @@ _flags_parseGetopt()
+   return ${flags_return}
+ }
+ 
+-#------------------------------------------------------------------------------
+-# public functions
+-#
+-
+-# A basic boolean flag. Boolean flags do not take any arguments, and their
+-# value is either 1 (false) or 0 (true). For long flags, the false value is
+-# specified on the command line by prepending the word 'no'. With short flags,
+-# the presense of the flag toggles the current value between true and false.
+-# Specifying a short boolean flag twice on the command results in returning the
+-# value back to the default value.
+-#
+-# A default value is required for boolean flags.
+-#
+-# For example, lets say a Boolean flag was created whose long name was 'update'
+-# and whose short name was 'x', and the default value was 'false'. This flag
+-# could be explicitly set to 'true' with '--update' or by '-x', and it could be
+-# explicitly set to 'false' with '--noupdate'.
++
+ DEFINE_boolean() { _flags_define ${__FLAGS_TYPE_BOOLEAN} "$@"; }
+ 
+-# Other basic flags.
+ DEFINE_float()   { _flags_define ${__FLAGS_TYPE_FLOAT} "$@"; }
+ DEFINE_integer() { _flags_define ${__FLAGS_TYPE_INTEGER} "$@"; }
+ DEFINE_string()  { _flags_define ${__FLAGS_TYPE_STRING} "$@"; }
+ 
+-# Parse the flags.
+-#
+-# Args:
+-#   unnamed: list: command-line flags to parse
+-# Returns:
+-#   integer: success of operation, or error
+ FLAGS()
+ {
+-  # define a standard 'help' flag if one isn't already defined
+   [ -z "${__flags_help_type:-}" ] && \
+       DEFINE_boolean 'help' false 'show this help' 'h'
+ 
+-  # parse options
+   if [ $# -gt 0 ]; then
+     if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
+       _flags_getoptStandard "$@"
+@@ -818,7 +554,6 @@ FLAGS()
+     fi
+     flags_return=$?
+   else
+-    # nothing passed; won't bother running getopt
+     __flags_opts='--'
+     flags_return=${FLAGS_TRUE}
+   fi
+@@ -832,23 +567,11 @@ FLAGS()
+   return ${flags_return}
+ }
+ 
+-# This is a helper function for determining the `getopt` version for platforms
+-# where the detection isn't working. It simply outputs debug information that
+-# can be included in a bug report.
+-#
+-# Args:
+-#   none
+-# Output:
+-#   debug info that can be included in a bug report
+-# Returns:
+-#   nothing
+ flags_getoptInfo()
+ {
+-  # platform info
+   _flags_debug "uname -a: `uname -a`"
+   _flags_debug "PATH: ${PATH}"
+ 
+-  # shell info
+   if [ -n "${BASH_VERSION:-}" ]; then
+     _flags_debug 'shell: bash'
+     _flags_debug "BASH_VERSION: ${BASH_VERSION}"
+@@ -857,7 +580,6 @@ flags_getoptInfo()
+     _flags_debug "ZSH_VERSION: ${ZSH_VERSION}"
+   fi
+ 
+-  # getopt info
+   getopt >/dev/null
+   _flags_getoptReturn=$?
+   _flags_debug "getopt return: ${_flags_getoptReturn}"
+@@ -866,39 +588,16 @@ flags_getoptInfo()
+   unset _flags_getoptReturn
+ }
+ 
+-# Returns whether the detected getopt version is the enhanced version.
+-#
+-# Args:
+-#   none
+-# Output:
+-#   none
+-# Returns:
+-#   bool: true if getopt is the enhanced version
+ flags_getoptIsEnh()
+ {
+   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_ENH}
+ }
+ 
+-# Returns whether the detected getopt version is the standard version.
+-#
+-# Args:
+-#   none
+-# Returns:
+-#   bool: true if getopt is the standard version
+ flags_getoptIsStd()
+ {
+   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD}
+ }
+ 
+-# This is effectively a 'usage()' function. It prints usage information and
+-# exits the program with ${FLAGS_FALSE} if it is ever found in the command line
+-# arguments. Note this function can be overridden so other apps can define
+-# their own --help flag, replacing this one, if they want.
+-#
+-# Args:
+-#   none
+-# Returns:
+-#   integer: success of operation (always returns true)
+ flags_help()
+ {
+   if [ -n "${FLAGS_HELP:-}" ]; then
+@@ -953,19 +652,14 @@ flags_help()
+         echo "${flags_helpStr_}" >&2
+       else
+         echo "  ${flags_flagStr_}  ${flags_help_}" >&2
+-        # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
+-        # because it doesn't like empty strings when used in this manner.
+         flags_emptyStr_="`echo \"x${flags_flagStr_}x\" \
+             |awk '{printf "%"length($0)-2"s", ""}'`"
+         flags_helpStr_="  ${flags_emptyStr_}  ${flags_defaultStr_}"
+         flags_helpStrLen_=`expr "${flags_helpStr_}" : '.*'`
+         if [ ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} \
+             -o ${flags_helpStrLen_} -lt ${flags_columns_} ]; then
+-          # indented to match help string
+           echo "${flags_helpStr_}" >&2
+         else
+-          # indented four from left to allow for longer defaults as long flag
+-          # names might be used too, making things too long
+           echo "    ${flags_defaultStr_}" >&2
+         fi
+       fi
+@@ -978,12 +672,6 @@ flags_help()
+   return ${FLAGS_TRUE}
+ }
+ 
+-# Reset shflags back to an uninitialized state.
+-#
+-# Args:
+-#   none
+-# Returns:
+-#   nothing
+ flags_reset()
+ {
+   for flags_name_ in ${__flags_longNames}; do
+@@ -1000,7 +688,6 @@ flags_reset()
+     eval ${flags_strToEval_}
+   done
+ 
+-  # reset internal variables
+   __flags_boolNames=' '
+   __flags_longNames=' '
+   __flags_shortNames=' '

stunc/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,83 +8,38 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_RELEASE:=1
-PKG_VERSION:=1.1.12
+PKG_VERSION:=1.0.4
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=9c585888cae94180d715f46f6602090f328240d4
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=5b65364709a921db0956bf74a4f126217cfb1775
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+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/stunc/default
+define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libopenssl +libblobmsg-json +libbbf_api
 endef
 
-define Package/stunc-mbedtls
-  $(Package/stunc/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_stunc-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/stunc-openssl
-  $(Package/stunc/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_stunc-openssl:libopenssl
-  CONFLICTS := stunc-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/stunc-wolfssl
-  $(Package/stunc/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_stunc-wolfssl:libwolfssl
-  CONFLICTS := stunc-mbedtls stunc-openssl
-  VARIANT:=wolfssl
+define Package/$(PKG_NAME)/description
+	BBF STUN Client
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror
+	-D_GNU_SOURCE
 
-ifeq ($(BUILD_VARIANT),wolfssl)
-  MAKE_FLAGS += \
-	USE_WOLFSSL="yes"
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-  MAKE_FLAGS += \
-	USE_MBEDTLS="yes"
-endif
-
-ifeq ($(BUILD_VARIANT),openssl)
-  MAKE_FLAGS += \
-	USE_OPENSSL="yes"
-endif
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/stunc/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/stunc/default/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -95,10 +50,4 @@ define Package/stunc/default/install
 	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
 endef
 
-Package/stunc-openssl/install = $(Package/stunc/default/install)
-Package/stunc-wolfssl/install = $(Package/stunc/default/install)
-Package/stunc-mbedtls/install = $(Package/stunc/default/install)
-
-$(eval $(call BuildPackage,stunc-openssl))
-$(eval $(call BuildPackage,stunc-wolfssl))
-$(eval $(call BuildPackage,stunc-mbedtls))
+$(eval $(call BuildPackage,$(PKG_NAME)))

stunc/files/etc/config/stunc

@@ -8,5 +8,5 @@ config stunc 'stunc'
 	option min_keepalive '30'
 	option max_keepalive '3600'
 #	option client_port 7547
-	option log_level '1'
+	option log_level '0'
 

stunc/files/etc/init.d/stunc

@@ -36,6 +36,11 @@ start_service() {
 		return 0;
 	fi
 
+	if [ -z "${server_address}" ]; then
+		log "Stun server address not defined or invalid"
+		return 0;
+	fi
+
 	procd_open_instance stunc
 	procd_set_param command ${PROG}
 	procd_set_param respawn "3" "7" "0"

sulu/Makefile

@@ -1,15 +1,15 @@
 #
-# Copyright (C) 2021-2022 IOPSYS
+# Copyright (C) 2021 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.3.15
+PKG_VERSION:=0.2.28
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=81d4bb268914dc3822293e93519ae6adbd6ddbea
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
+PKG_SOURCE_VERSION:=b861e90ed331fb8cba5ed8c9d9b9e9c859f60815
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -26,8 +26,9 @@ include $(INCLUDE_DIR)/package.mk
 define Package/sulu
 	SECTION:=sulu
 	CATEGORY:=Utilities
+	MENU=1
 	TITLE:=SULU-CE ReactJS based Web UI Package
-	DEPENDS:=+nginx +mosquitto-auth-shadow
+	DEPENDS:=+nginx
 endef
 
 define Package/sulu/description
@@ -36,17 +37,7 @@ endef
 
 define Package/sulu/install
 	$(INSTALL_DIR) $(1)/sulu
-	$(INSTALL_DIR) $(1)/sulu/config
-	$(INSTALL_DIR) $(1)/sulu/config/widgets
-	$(INSTALL_DIR) $(1)/etc/nginx/
-	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
 	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
-	$(CP) $(PKG_BUILD_DIR)/config/*.json $(1)/sulu/config
-	$(CP) $(PKG_BUILD_DIR)/config/widgets/diagnostics.json $(1)/sulu/config/widgets/
-	$(CP) $(PKG_BUILD_DIR)/config/widgets/wan.json $(1)/sulu/config/widgets/
-ifeq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy)
-	$(CP) $(PKG_BUILD_DIR)/config/widgets/lcm-store.json $(1)/sulu/config/widgets/
-endif
 	$(CP) ./files/* $(1)/
 endef
 

sulu/files/etc/mosquitto/conf.d/obuspa.conf

@@ -1,3 +0,0 @@
-listener 1883 127.0.0.1
-allow_anonymous true
-

sulu/files/etc/mosquitto/conf.d/sulu.conf

@@ -1,5 +0,0 @@
-listener 9001
-protocol websockets
-plugin /usr/lib/mosquitto_auth_shadow.so
-require_certificate false
-allow_anonymous false

sulu/files/etc/nginx/conf.d/sulu.locations

@@ -1,18 +0,0 @@
-location /config/ {
-	autoindex on;
-	if ($request_method = 'OPTIONS') {
-		add_header 'Access-Control-Allow-Origin' '*';
-		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-		add_header 'Access-Control-Max-Age' 1728000;
-		add_header 'Content-Type' 'text/plain; charset=utf-8';
-		add_header 'Content-Length' 0;
-		return 204;
-	}
-	if ($request_method = 'GET') {
-		add_header 'Access-Control-Allow-Origin' '*' always;
-		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
-		add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-	}
-}

sulu/files/etc/uci-defaults/90-sulu-set-nginx-conf

@@ -7,4 +7,3 @@ uci -q add_list nginx._sulu.listen='8080'
 uci -q add_list nginx._sulu.listen='[::]:8080'
 uci -q set nginx._sulu.root='/sulu'
 uci -q set nginx._sulu.server_name='_sulu'
-uci -q add_list nginx._sulu.include='conf.d/sulu.locations'

swmodd/Makefile

@@ -6,22 +6,18 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.5.1
+PKG_VERSION:=2.0.24
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2f953ea76b5779a73a540777dfb450982802e4f8
+PKG_SOURCE_VERSION:=f729686d90b3fb33bb731a9bff119efc5357dfb1
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=bbf
-
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,10 +26,9 @@ define Package/swmodd
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:= Software Modules Daemon
-  DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
-	    +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
-	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
-	    +swmodd-cgroup
+  DEPENDS:=+libuci +libubox +ubus +libuuid +libbbf_api +opkg +libcurl \
+	    +PACKAGE_liblxc:liblxc +PACKAGE_liblxc:cgroupfs-mount \
+	    +@BUSYBOX_CONFIG_BUSYBOX +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT
 endef
 
 define Package/swmodd/description
@@ -44,18 +39,9 @@ define Package/swmodd/config
 	source "$(SOURCE)/Config.in"
 endef
 
-define Package/swmodd-cgroup
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:= Cgroup mount handler for Software modules daemon
-  DEPENDS:=+@CONFIG_KERNEL_CGROUPS
-endef
-
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE \
-	-Wall -Werror
+	-D_GNU_SOURCE
 
 ifeq ($(CONFIG_PACKAGE_liblxc),y)
 MAKE_FLAGS += \
@@ -91,10 +77,4 @@ ifeq ($(CONFIG_PACKAGE_liblxc),y)
 endif
 endef
 
-define Package/swmodd-cgroup/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/etc/init.d/swmodd_cgroup $(1)/etc/init.d/swmodd_cgroup
-endef
-
-$(eval $(call BuildPackage,swmodd-cgroup))
 $(eval $(call BuildPackage,swmodd))

swmodd/files/etc/init.d/swmodd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
-START=99
-STOP=01
+START=94
+STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/swmodd

swmodd/files/etc/init.d/swmodd_cgroup

@@ -1,56 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=01
-
-log() {
-	echo "swmodd_cgroup: ${@}" >/dev/console
-}
-
-cgroup_remounting_required()
-{
-	if ! mount |grep -q '/sys/fs/cgroup '; then
-		return 1;
-	fi
-
-	if grep -v '^#' /etc/fstab | grep -q cgroup; then
-		log "fstab mounted system, remounting of cgroup not required"
-		return 1
-	fi
-
-	if [ ! -d /sys/fs/cgroup ] && [ ! -e /proc/cgroups ]; then
-		log "cgroup fs not found"
-		return 1
-	fi
-
-	umount /sys/fs/cgroup
-	return 0;
-}
-
-mount_cgroup()
-{
-
-	if ! cgroup_remounting_required; then
-		log "cgroup remounting not required"
-		return 1
-	fi
-
-	mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-	cd /sys/fs/cgroup
-	for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-		mkdir -p $sys
-		if ! mountpoint -q $sys; then
-			if ! mount -n -t cgroup -o $sys cgroup $sys; then
-				rm -f $sys || true
-			fi
-		fi
-	done
-
-	if [ -e /sys/fs/cgroup/memory/memory.use_hierarchy ]; then
-		echo 1 > /sys/fs/cgroup/memory/memory.use_hierarchy
-	fi
-}
-
-boot()
-{
-	mount_cgroup
-}

twamp/Makefile

@@ -1,25 +1,28 @@
 #
-# Copyright (C) 2020-2022 iopsys Software Solutions AB
+# Copyright (C) 2020 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:=twamp
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp-light.git
-PKG_SOURCE_VERSION:=b0111c35ff4908edd82c5d5f4a3c0d6809605b94
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp.git
+PKG_SOURCE_VERSION:=a0f7355afea41dbafd443d119cb394e038e70dc6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+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
 
@@ -27,21 +30,20 @@ define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=TWAMP Light Client(TR-390)
-  DEPENDS:=+libuci +ubox +libubus
+  TITLE:=BBF TWAMP/TWAMP Light feature
+  DEPENDS:=+libuci +libbbf_api +ubox +libubus
 endef
 
 define Package/$(PKG_NAME)/description
-	TWAMP Client for Performance Measurement from IP Edge to Customer Equipment using TWAMP Light Protocol
+	BBF TWAMP/TWAMP Light feature
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror
+	-D_GNU_SOURCE
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	$(CP) -rf ~/git/twamp-light/* $(PKG_BUILD_DIR)/
+	$(CP) -rf ~/git/twamp/* $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -58,7 +60,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) ./files/etc/init.d/twampd $(1)/etc/init.d/twampd
 	$(INSTALL_BIN) ./files/etc/firewall.twamp $(1)/etc/firewall.twamp
 	$(INSTALL_BIN) ./files/etc/uci-defaults/92-twampfirewall $(1)/etc/uci-defaults/92-twampfirewall
-	$(INSTALL_BIN) ./files/etc/uci-defaults/93-twamp_fix_reflector $(1)/etc/uci-defaults/93-twamp_fix_reflector
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

twamp/files/etc/config/twamp

@@ -1,5 +1,13 @@
+
 config twamp 'twamp'
-	option enable '0'
-	#Log levels: Critical=0, Error=1, Warning=2, Notice=3, Info=4, Debug=5
+	option enable '1'
+	option twamp_light '1'
+	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
 	option log_level '3'
 
+config twamp_reflector 'reflector_1'
+	option enable '0'
+	option interface 'wan'
+	option port '862'
+	option max_ttl '1'
+

twamp/files/etc/firewall.twamp

@@ -14,7 +14,7 @@ function configure_firewall()
 {
 	local enable port interface
 
-	config_get enable ${1} enable "1"
+	config_get enable ${1} enable "0"
 	config_get port ${1} port
 	config_get interface ${1} interface
 	if [ "$enable" -eq 0 -o -z "${port}" -o -z "${interface}" ]; then
@@ -27,24 +27,5 @@ function configure_firewall()
 	fi
 }
 
-function delete_rule()
-{
-        while iptables -w 1 -L zone_${1}_input --line-numbers 2>/dev/null | grep "TWAMP reflector port"; do
-		rule_num="$(iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" | head -1|awk '{print $1}')"
-		if [ -n "${rule_num}" ]; then
-			iptables -w 1 -D zone_${1}_input ${rule_num};
-		fi
-	done
-}
-
-# Loop through all interfaces and delete the twamp reflector rule from interface's input chain
-config_load network
-config_foreach delete_rule interface
-
 config_load twamp
-config_get twamp_enable twamp enable "0"
-if [ "${twamp_enable}" -eq "0" ]; then
-	exit 0;
-fi
-
 config_foreach configure_firewall twamp_reflector

twamp/files/etc/init.d/twampd

@@ -22,9 +22,6 @@ start_service() {
 reload_service() {
         stop
         start
-        [ -f /etc/firewall.twamp ] && {
-                sh /etc/firewall.twamp
-        }
 }
 
 service_triggers() {