map-agent: 2.10.4.2

Anonymous call to DECT should be displayed as "Withheld"

bbf/Config_bbfdm.in

@@ -1,7 +1,3 @@
-if PACKAGE_libbbfdm
-
-menu "Configuration"
-
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -14,10 +10,6 @@ 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
@@ -28,10 +20,12 @@ config BBF_TR143
 
 config BBFDM_ENABLE_JSON_PLUGIN
 	bool "Enable json plugin to extend datamodel"
-	default n
+	default y
 
 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
-	default n
-endmenu
-endif
+	default y
+
+config BBF_MAX_OBJECT_INSTANCES
+	int "Maximum number of instances per object"
+	default 255

bbf/Makefile

@@ -1,41 +1,69 @@
 #
-# Copyright (C) 2021 IOPSYS
+# Copyright (C) 2022 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.2.1
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_VERSION:=6.8.9.37
+
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=428f8d50c863589f6244cc04d5ee3dca978edd02
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
+PKG_SOURCE_VERSION:=925a6ee278d827edf6a57715463263394eddac21
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_RELEASE=$(PKG_SOURCE_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
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
-define Package/libbbfdm
+define Package/libbbfdm/default
   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
+  TITLE:=Library for broadband forum data model support
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
+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
 endef
 
 define Package/libbbfdm/config
@@ -57,81 +85,97 @@ define Build/Prepare
 endef
 endif
 
-TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror \
-
-ifeq ($(CONFIG_BBF_TR181),y)
-CONFIGURE_ARGS += \
-	--enable-tr181
-endif
+CMAKE_OPTIONS += \
+	-DBBF_TR181=ON
 
 ifeq ($(CONFIG_BBF_TR104),y)
-CONFIGURE_ARGS += \
-	--enable-tr104
+CMAKE_OPTIONS += \
+	-DBBF_TR104=ON
 endif
 
 ifeq ($(CONFIG_BBF_TR143),y)
-CONFIGURE_ARGS += \
-	--enable-tr143
-endif
-
-ifeq ($(CONFIG_PACKAGE_libopenssl),y)
-CONFIGURE_ARGS += \
-	--enable-libopenssl
+CMAKE_OPTIONS += \
+	-DBBF_TR143=ON
 endif
 
 ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
-CONFIGURE_ARGS += \
-	--enable-vendor-extension
+CMAKE_OPTIONS += \
+	-DBBF_VENDOR_EXTENSION=ON
 
-CONFIGURE_ARGS += \
-	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)" \
-	BBF_VENDOR_PREFIX="$(CONFIG_BBF_VENDOR_PREFIX)"
+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)
 
 endif ##CONFIG_BBF_VENDOR_EXTENSION
 
 ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
-CONFIGURE_ARGS += \
-	--enable-json-plugin
+CMAKE_OPTIONS += \
+	-DBBF_JSON_PLUGIN=ON
 endif
 
 ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
-CONFIGURE_ARGS += \
-	--enable-shared-library
+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
 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/install
+define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
+	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
 endef
 
-define Package/libbbfdm/prerm
+define Package/libbbfdm/default/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
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
+	$(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/
-	$(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/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/usr/lib/
+	touch $(1)/usr/lib/libbbf_api.so
 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) 2020 iopsys Software Solutions AB
+# Copyright (C) 2022 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,20 +8,25 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.3
+PKG_VERSION:=2.0.3.1
 
-PKG_SOURCE_VERSION:=b35e7862bc17fc11dc1f757c7b93900995a28633
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-
+PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
 PKG_SOURCE:=$(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)
@@ -29,21 +34,24 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm +libbbf_api
-endef
-
-define Package/$(PKG_NAME)/description
-	BBF BulkData Collection
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE
+	-D_GNU_SOURCE \
+	-Wall -Werror
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/bulkdata/* $(PKG_BUILD_DIR)/
+endef
+endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.so $(1)/usr/lib/bbfdm
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/config/bulkdata

@@ -1,43 +1,6 @@
 
 config bulkdata 'bulkdata'
 	option enable '0'
-	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
+	#Log levels: Error=1, Warning=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,7 +1,4 @@
 #!/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
@@ -10,13 +7,16 @@ USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
 
 start_service() {
-	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
+	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
 }
 
 boot() {

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

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

crashlog/Makefile

@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2019 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:=crashlog
-PKG_VERSION:=1.0.0
-PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=none
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/crashlog
-  CATEGORY:=Utilities
-  TITLE:=Handling kernel crash logs
-endef
-
-define Package/crashlog/description
-	Handling kernel crash logs.
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./files/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-endef
-
-define Package/crashlog/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,crashlog))

crashlog/files/etc/init.d/corelog

@@ -1,11 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=01
-
-start()
-{
-    if [ -e /proc/sys/kernel/core_pattern ]
-    then
-	echo "|/sbin/logcore %e %s" > /proc/sys/kernel/core_pattern
-    fi
-}

crashlog/files/etc/init.d/crashlog

@@ -1,55 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-
-send_log()
-{
-	nr=$(db get hw.board.serial_number)
-	hw=$(db get hw.board.model_name)
-	fam=$(db get hw.board.iopVerFam)
-	sw=$(db get hw.board.iopVersion)
-	server=$(/sbin/uci get system.crashlog.server)
-
-	while true
-	do
-	    scp  -S /usr/sbin/logssh /proc/last_kmsg log@${server}:log/${fam}_${hw}_${sw}_${nr}
-	    if [ $? == 0 ]
-	    then
-	       break;
-	    fi
-	    # wait for another minute then try again
-	    sleep 60
-	done
-}
-
-fill_in_default()
-{
-    /sbin/uci add system log
-    /sbin/uci rename system.@log[-1]=crashlog
-    /sbin/uci set system.crashlog.enable=no
-    /sbin/uci set system.crashlog.server="crashlog.iopsys.eu"
-    /sbin/uci commit
-}
-
-boot()
-{
-    # is crashlog enabled ?
-    enable=$(/sbin/uci get system.crashlog.enable)
-    case $enable in
-	0|no|NO|false|FALSE)
-	    exit 0
-	    ;;
-	"")
-	    fill_in_default
-	    exit 0
-	    ;;
-    esac
-
-    # is this boot a result from a crash ?
-    reason=$(cat /etc/boot_reason)
-    case $reason in
-	HW|WD)
-	    send_log&
-	    ;;
-    esac
-}

crashlog/files/sbin/logcore

@@ -1,60 +0,0 @@
-#! /bin/sh
-
-TMP_CORE=/tmp/new_core
-# first test if we can contact the log server.
-# if not abort directly the core file takes up memory
-alive()
-{
-	ping -c1 $server
-
-	if [ $? != 0 ]
-	then
-		# drain core file from kernel
-		cat >/dev/null
-		exit 0
-	fi
-}
-
-fill_in_default()
-{
-    /sbin/uci add system log
-    /sbin/uci rename system.@log[-1]=corelog
-    /sbin/uci set system.corelog.enable=no
-    /sbin/uci set system.corelog.server="corelog.iopsys.eu"
-    /sbin/uci commit
-}
-
-# is corelog enabled ?
-enable=$(/sbin/uci get system.corelog.enable)
-case $enable in
-    0|no|NO|false|FALSE)
-	# drain core file from kernel
-	cat >/dev/null
-	exit 0
-	;;
-    "")
-	fill_in_default
-	exit 0
-	;;
-esac
-
-server=$(/sbin/uci get system.corelog.server)
-
-alive
-
-# dump out the core to disk we need this as scp needs a size before we send data
-# and this is the only way to know how much data there is
-cat >$TMP_CORE
-
-# in case filesystem/memory is full at least kill the core in the kernel memory should give us some
-# more memory to work with. normally this would do nothing.
-cat >/dev/null
-
-nr=$(db get hw.board.serial_number)
-hw=$(db get hw.board.model_name)
-fam=$(hw.board.iopVerFam)
-sw=$(db get hw.board.iopVersion)
-
-scp -S /usr/sbin/logssh $TMP_CORE log@${server}:log/core_${1}_${2}_${fam}_${hw}_${sw}_${nr}
-rm $TMP_CORE
-

crashlog/files/usr/sbin/logssh

@@ -1,6 +0,0 @@
-#!/bin/sh
-# we need to have the -y option to dropbear to not halt the scp when
-# transfering the log file to a new server for the first time.
-# since we already need this also put in the keyfile
-
-ssh -y -i /etc/dropbear/logid $@

crashlog/readme

@@ -1,42 +0,0 @@
-Install scp server.
-
-Create a user account on a server and make sure it's possible to login to it
-using ssh.
-
-For now the user has to be called "log"
-
-USER is the user name of the account
-HOME is the user home directory.
-Both should be changed to the correct value in all following example commands.
-
-create HOME/bin
-Put scp_upload in HOME/bin
-make it executable "chmod a+x HOME/bin/scp_upload" 
-
-create home/.ssh   (observer the dot .shh)
-
-create an empty file HOME/.ssh/authorized_keys
-
--------------------------------
-Now everyhting is setup for use but we have not added any clients.
-What we need is the public key for the clients.
-
-For dropbear "dropbearkey -y -f files/etc/dropbear/logid" will generate the public key.
-
-----------
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCwn9RaDAzxW1dTmIhXgFBnpi1lhj8xhYpCVQiPxxdk9IEmH8zjo4y9j3sPkqKOlRnkwjpZIpLEKBnpQTwVIMCU/AG7nDJX3OH9RfS9mLJQLfFL8HyGCyqDezFWldbyovhJZvdUeK4tAXJWv2W3OVHiz2L8IlncBgP/E9DJElsyhhQHsM96UE6tBkXsvXkoDbMSYXFcLbgiUwBKfmM2BF/aPDL45iznGur7/2j9v95PwJ0gtMu9jjNRq+pXCXhTh3bsnczm0MpZC1aiRc9nJAeGIMmhrf15E4jBKgTnrstzJxGVAdajKeR954KcNsS33cS2Wmui2YjmPbBXjqf1frzJ log@iopsys
-----------
-
-The public key should be just one line. Add that line to the 
-HOME/.ssh/authorized_keys file on the scp server. Then add the follwoing as
-the first text on the same line. that is insert before the key data.
-
-command="HOME/bin/scp_upload",no-port-forwarding,no-agent-forwarding,no-X11-forwarding 
-
-Do not forget to change HOME to the correct value for the server and there 
-should be one space separating the key data and the above text.
----------------------------------
-Now test to make sure that you can upload new files, not download files
-and not overwrite files from the client.
-
-

crashlog/scp_upload

@@ -1,53 +0,0 @@
-#! /bin/bash
-# authorized_keys command="/home/boxi/my_scp",no-port-forwarding,no-agent-forwarding,no-X11-forwarding
-
-val=`expr match "$SSH_ORIGINAL_COMMAND" "scp"`
-if [ $val != 3 ]
-then
-    echo "only scp is allowed for this rsa key"
-    exit 1
-fi
-
-#strip out "scp" as getopts barf on anything not an option
-
-args=${SSH_ORIGINAL_COMMAND:3}
-
-# we must set args to positional paramters otherwise it's next to impossible
-# to get to the rest of the line that is not arguments.
-
-set -- $args
-while getopts "rftdvpq" Option
-do
-  case $Option in
-    r ) echo "recursive not allowed";exit 1;;
-    f ) echo "reading files not allowed";exit 1;;
-    t ) ;;
-    d ) ;;
-    v ) ;;
-    p ) ;;
-    q ) ;;
-    * ) ;;   # Default.
-  esac
-done
-
-shift $(($OPTIND - 1))
-
-file="$*"
-dir=$(dirname "$file")
-
-if [ "$dir" != "log" ]
-then
-    echo "only allowed to write to log/"
-    exit 1
-fi
-
-# try to create uniq files
-EXTRA=$((0))
-while [ -e "${file}_${EXTRA}" ]
-do
-    EXTRA=$((EXTRA +1))
-done
-
-logger -t scp_upload "${SSH_ORIGINAL_COMMAND}_${EXTRA}"
-
-exec ${SSH_ORIGINAL_COMMAND}_${EXTRA}

crun/Makefile

@@ -1,81 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=crun
-PKG_VERSION:=0.20
-PKG_RELEASE:=$(AUTORELEASE)
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/containers/crun.git
-PKG_SOURCE_DATE:=2021-06-07
-PKG_SOURCE_VERSION:=8d6a8b5ab80461cfed19f020a36584af13c32038
-PKG_MIRROR_HASH:=9ca1f0e530b33ce8820bd03329eb6731c5050d6e7f35bd2463d9a81cc00382e0
-
-PKG_BUILD_DEPENDS:=argp-standalone
-PKG_BUILD_PARALLEL:=1
-PKG_FIXUP:=autoreconf
-PKG_INSTALL:=1
-
-PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
-PKG_LICENSE:=GPL-2.0-or-later
-PKG_LICENSE_FILES:=COPYING
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/crun
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=crun
-  URL:=https://github.com/containers/crun
-  DEPENDS:=@!arc +libseccomp +libcap
-endef
-
-define Package/crun/description
-  A fast and low-memory footprint OCI Container Runtime fully written in C.
-endef
-
-CONFIGURE_ARGS+= \
-	--disable-systemd \
-	--enable-embedded-yajl \
-	--enable-caps \
-	--enable-dl \
-	--enable-seccomp \
-	--enable-bpf
-
-define Build/Prepare
-	$(call Build/Prepare/Default)
-	$(SED) '/#include <git-version.h>/d' $(PKG_BUILD_DIR)/src/crun.c
-endef
-
-define Build/Configure
-	$(call Build/Configure/Default)
-
-	$(SED) '/#define PACKAGE \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define VERSION \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define GIT_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_BUGREPORT \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_NAME \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_STRING \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_TARNAME \"/d' $(PKG_BUILD_DIR)/config.h
-	$(SED) '/#define PACKAGE_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
-
-	echo "#define PACKAGE \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_NAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_STRING \"$(PKG_NAME) $(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_TARNAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define PACKAGE_BUGREPORT \"bugs@openwrt.org\"" >> $(PKG_BUILD_DIR)/config.h
-	echo "#define GIT_VERSION \"$(PKG_SOURCE_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
-endef
-
-define Package/crun/install
-	$(INSTALL_DIR) $(1)/usr/bin/
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
-endef
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcrun.* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,crun))

dectmngr/Config.in

@@ -0,0 +1,11 @@
+if PACKAGE_dectmngr
+
+menu "Configuration"
+
+config ENABLE_LINE_SETTINGS_EXTENSION
+	bool "Enable Line Settings List extension "
+	default y
+
+endmenu
+
+endif

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.2.1
+PKG_VERSION:=3.5.9
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=aafbade1c9af60325973bfa9bc702b63f4f61562
+PKG_SOURCE_VERSION:=eecab9a6d52bba25dd9dfab8616b6d30e0346e18
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,13 +34,17 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2
+	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c
 endef
 
 define Package/$(PKG_NAME)/description
 	DECT manager is a daemon that provides UBUS RPC objects and sends UBUS events for communication with the DECT chip.
 endef
 
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
+endef
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	rsync -av --exclude=.* ~/git/voip/dectmngr/* $(PKG_BUILD_DIR)/
@@ -49,8 +53,13 @@ endif
 
 TARGET_CFLAGS += \
 	-Wall \
+        -Werror \
 	-I$(STAGING_DIR)/usr/include/libxml2
 
+ifeq ($(CONFIG_ENABLE_LINE_SETTINGS_EXTENSION),y)
+TARGET_CFLAGS += -DENABLE_LINE_SETTINGS_EXTENSION
+endif
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc

dectmngr/files/etc/config/dect

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

dectmngr/files/etc/init.d/dectmngr

@@ -11,6 +11,8 @@ 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
@@ -26,32 +28,42 @@ start_service() {
 	local opt_ext=
 	local rfpi=
 	local model_id=
+	local rxtun=
 
 	test $(db get hw.board.hasDect) = "0" && return
 
-	echo 1 > /sys/class/gpio/gpio14/value
+	[ -n "$DECT_GPIO" ] && echo 1 > /sys/class/gpio/gpio${DECT_GPIO}/value
 
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
 
-	# model_id=$(db -q get hw.board.dect_model_id)
-	# Setting model_id to 0x010203 is a workaround to reduce synchronisation time of some handset
-	# TODO: remove below line and uncomment the line above to get value from db when the problem is solved
-	model_id="01.02.03"
-	[ -n "$model_id" -a ${#model_id} -eq 8 ] && opt_ext="$opt_ext -model $model_id"
+	model_id=$(db -q get hw.board.dect_model_id)
+	[ -n "$model_id" -a ${#model_id} -eq 8 ] || {
+		echo "Invalid hw.board.dect_model_id:$model_id. Set to 30.3B.06"
+		model_id="30.3B.06"
+	}
+	opt_ext="$opt_ext -model $model_id"
+
+	rxtun=$(db -q get hw.board.dect_rxtun)
+	[ -n "$rxtun" -a ${#rxtun} -eq 2 ] && opt_ext="$opt_ext -rxtun $rxtun"
 
 	config_load dect
-	config_get_bool log_dect_cmbs global log_dect_cmbs 0
+	config_get log_dect_cmbs global log_dect_cmbs syslog
 
 	procd_open_instance
-	if [ $log_dect_cmbs -eq 0 ]; then
+	if [ "$log_dect_cmbs" = "none" ]; then
 		echo "Starting dectmngr with cmbs logging disabled"
 		procd_set_param command $PROG -comname ttyH0 $opt_ext
 		rm -f $LOG_PATH/*
-	else
-		echo "Starting dectmngr with cmbs logging enabled"
+	elif [ "$log_dect_cmbs" = "file" ]; then
+		echo "Starting dectmngr with cmbs logging enabled to file"
 		procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
+	else
+		echo "Starting dectmngr with cmbs logging enabled to syslog"
+		procd_set_param command $PROG -comname ttyH0 -syslog $opt_ext
+		rm -f $LOG_PATH/*
 	fi
+
 	procd_set_param respawn 6 2 3
 	procd_set_param term_timeout 20
 	procd_set_param triggers asterisk
@@ -61,23 +73,25 @@ start_service() {
 stop_service() {
 	test $(db get hw.board.hasDect) = "0" && return
 
-	echo 0 > /sys/class/gpio/gpio14/value
+	[ -n "$DECT_GPIO" ] && echo 0 > /sys/class/gpio/gpio${DECT_GPIO}/value
 	stop_and_wait_dectmngr
 }
 
 reload_service() {
-	stop_and_wait_dectmngr
-	start
+	ubus call dect reload
 }
 
 service_triggers()
 {
-	procd_add_reload_trigger asterisk dect
+	procd_add_config_trigger "config.change" "asterisk" /etc/init.d/dectmngr restart
+	procd_add_config_trigger "config.change" "dect" /etc/init.d/dectmngr reload
 }
 
 boot() {
-	echo 14 > /sys/class/gpio/export
-	echo out > /sys/class/gpio/gpio14/direction
+	[ -n "$DECT_GPIO" ] && {
+		echo ${DECT_GPIO} > /sys/class/gpio/export
+		echo out > /sys/class/gpio/gpio${DECT_GPIO}/direction
+	}
 
 	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
 	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH

dslmngr/Makefile

@@ -28,12 +28,6 @@ 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_intel_mips||TARGET_iopsys_brcm63xx_arm)
+  DEPENDS:=@TARGET_iopsys_brcm63xx_arm
 endef
 
 define Package/easy-qos/description
@@ -39,11 +39,7 @@ 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

@@ -1,301 +0,0 @@
-#!/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-qos/files/etc/init.d/easy_qos.ebtables

@@ -15,7 +15,7 @@ exec_log() {
 }
 
 get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
+	local prio=$(echo $1|tr 'A-Z' 'a-z');
 	case "${prio}" in
 		"lowest")
 			echo 0;;
@@ -98,7 +98,7 @@ manage_rule() {
 		return 1;
 	}
 
-	protocol=$(echo ${proto}|tr [A-Z] [a-z])
+	protocol=$(echo ${proto}|tr 'A-Z' 'a-z')
 	prio_num=$(get_priority ${priority})
 	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
 		for p in ${port}; do

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

@@ -19,7 +19,7 @@ exec_log() {
 }
 
 get_priority() {
-	local prio=$(echo $1|tr [A-Z] [a-z]);
+	local prio=$(echo $1|tr 'A-Z' 'a-z');
 	case "${prio}" in
 		"lowest")
 			echo 0;;

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.27
+PKG_VERSION:=6.5.60
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cd36f0c5a8c4a48182273cca121dcc0fb117a6bf
+PKG_SOURCE_VERSION:=ec2e8d0341e246ff371481ae20418d8301dfcf12
 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.6
+PKG_VERSION:=0.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=1d4f1aafcb929e64597d226a710fd0c1b949ba08
+PKG_SOURCE_VERSION:=e5fb705f3a1b6065606e0cba82a54fb6eee10ae9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=MIT
+PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
 export BUILD_DIR
@@ -56,6 +56,10 @@ define Build/Prepare
 endef
 endif
 
+TARGET_CFLAGS += \
+        -Wall \
+        -Werror
+
 define Package/endptmngr/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin

endptmngr/files/etc/init.d/endptmngr

@@ -7,6 +7,8 @@ USE_PROCD=1
 NAME=endptmngr
 
 start_service() {
+	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
+
 	procd_open_instance
 	procd_set_param env hw_board_hasDect=$(db get hw.board.hasDect)
 	procd_set_param command $NAME

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:=ef46eb3be68ae1216d8699234f237fb2243289f1
+PKG_SOURCE_VERSION:=0ebaf1e7d1f09318ae75d0f475a25280742b790e
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2
@@ -38,9 +38,6 @@ 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
 

gryphon-led-module/Makefile

@@ -45,12 +45,12 @@ MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
 	MODULES_SUBDIR:=lib/modules/4.19.183
-	KERNEL_CROSS:=$(CONFIG_BCM_TOOLCHAIN)/bin/$(CONFIG_BCM_TOOLTUPLE)
+	TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)-
 
 	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))
 		# These targets use a 64-bit kernel
 		LINUX_KARCH:=arm64
-		KERNEL_CROSS:=/opt/toolchains/crosstools-aarch64-gcc-9.2-linux-4.19-glibc-2.30-binutils-2.32/bin/aarch64-buildroot-linux-gnu-
+		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX)-
 	endif
 	# For some reason, Broadcom's kernel does not set the include paths correctly when compiling out-of-tree modules
 	EXTRA_KCPPFLAGS:="-I $(LINUX_DIR)/../bcmkernel/include -I $(LINUX_DIR)/arch/arm/mach-bcm963xx/include"

icwmp/Config_cwmp.in

@@ -1,24 +1,14 @@
-if PACKAGE_icwmp
-
-menu "Configuration"
 choice
-	prompt "Select ACS sever"
-	default CWMP_ACS_MULTI
+       prompt "Select ACS sever"
+       default CWMP_ACS_MULTI
+       depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
 
 config CWMP_ACS_MULTI
 	bool "No specific ACS, follow standard"
 
 config CWMP_ACS_HDM
-	bool "HDM"
+	bool "Select HDM as ACS server"
 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 iopsys Software Solutions AB
+# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,45 +8,71 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.8-2021-11-13
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_VERSION:=8.4.26.10
+
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1b5b3b3f8d92c5a18f20dba512755acfc9bcc953
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_SOURCE_VERSION:=ac7410a726a7269dcaef4c80061cab7a4447f6d1
 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_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
+PKG_LICENSE_FILES:=LICENSE
 
-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)
+PKG_FIXUP:=autoreconf
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/$(PKG_NAME)
+define Package/icwmp/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=CWMP client
-  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libopenssl +curl +libcurl
+  TITLE:=TR069 CWMP client
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
 endef
 
-define Package/$(PKG_NAME)/description
- A free client implementation of CWMP (TR-069) protocol
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE -g \
+	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
+
+define Package/icwmp-openssl
+  $(Package/icwmp/default)
+  TITLE += (openssl)
+  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
+  VARIANT:=openssl
 endef
 
-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config_cwmp.in"
+define Package/icwmp-wolfssl
+  $(Package/icwmp/default)
+  TITLE += (wolfssl)
+  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
+  CONFLICTS := icwmp-openssl
+  VARIANT:=wolfssl
 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
@@ -54,47 +80,32 @@ define Build/Prepare
 endef
 endif
 
-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
+define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/icwmpd
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
+	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/99-icwmp $(1)/etc/hotplug.d/iface/99-icwmp
 	$(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/90-icwmp-set-dhcp-reqopts $(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/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
 endef
 
-$(eval $(call BuildPackage,$(PKG_NAME)))
+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))

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

@@ -0,0 +1,36 @@
+{
+	"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

@@ -1,5 +1,4 @@
 config acs 'acs'
-	option url ''
 	option userid '' #$OUI-$SER
 	option passwd 'iopsys'
 	option periodic_inform_enable 'true'
@@ -12,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 interface 'eth0.1'
+	option enable '1'
 	option default_wan_interface 'wan'
+	option default_lan_interface 'lan'
 	option log_to_console 'disable'
-	option log_to_file 'enable'
+	option log_to_file 'disable'
 	# 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

@@ -1,4 +1,9 @@
+#!/bin/sh
+
 #created by the icwmp package
+log() {
+	echo "${@}"|logger -t firewall.cwmp -p info
+}
 
 if [ ! -f "/var/state/cwmp" ]; then
 	exit 0;
@@ -8,24 +13,25 @@ zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
 port=$(uci -q get cwmp.cpe.port)
 ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
 ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
-incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr [A-Z] [a-z])
+incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
 
-if [ "$zone_name" = "" ]; then
+if [ -z "${zone_name}" ]; then
+	log "empty firewall zone name"
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
 	iptables -nL zone_icwmp_input 2> /dev/null
 	if [ $? != 0 ]; then
-		iptables -N zone_icwmp_input
-		iptables -t filter -A INPUT -j zone_icwmp_input
-		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -w 1 -N zone_icwmp_input
+		iptables -w 1 -t filter -A INPUT -j zone_icwmp_input
+		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
 	else			
-		iptables -F zone_icwmp_input
-		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -w 1 -F zone_icwmp_input
+		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
 	fi			
 else
-	iptables -F zone_icwmp_input 2> /dev/null
-	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
-	iptables -X zone_icwmp_input 2> /dev/null
+	iptables -w 1 -F zone_icwmp_input 2> /dev/null
+	iptables -w 1 -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
+	iptables -w 1 -X zone_icwmp_input 2> /dev/null
 fi
 
 cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"

icwmp/files/etc/hotplug.d/iface/99-icwmp

@@ -1,136 +0,0 @@
-#!/bin/sh
-
-. /lib/functions/network.sh
-
-[ "$ACTION" == "ifup" -o "$ACTION" == "ifupdate" ] || exit 0
-
-[ -f /etc/config/cwmp ] || exit 0
-
-handle_icwmp_restart() {
-	[ -f /tmp/switching_mode ] && exit 0
-	[ -f /tmp/wificontrol.txt -a -f /tmp/netmode-conf.pid ] && exit 0
-
-	[ "$INTERFACE" == "loopback" ] && exit 0
-
-	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
-	[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
-
-	local islan="$(uci -q get network.$INTERFACE.is_lan)"
-	[ "$islan" == "1" ] && exit 0
-
-	local proto="$(uci -q get network.$INTERFACE.proto)"
-	[ "$proto" == "none" ] && exit 0
-
-	local ifname="$(uci -q get network.$INTERFACE.ifname)"
-	[ "${ifname:0:1}" == "@" ] && exit 0
-	
-	mkdir -p /tmp/ipv4
-
-	network_flush_cache
-
-	local previpaddr=""
-	local curipaddr=""
-	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
-	previpaddr=$(cat $ipaddrfile 2>/dev/null)
-	network_get_ipaddr curipaddr $INTERFACE
-	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
-
-	local prevgateway=""
-	local curgateway=""
-	local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
-	prevgateway=$(cat $gatewayfile 2>/dev/null)
-	network_get_gateway curgateway $INTERFACE
-	[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
-
-	local prevsubnets=""
-	local cursubnets=""
-	local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
-	prevsubnets=$(cat $subnetsfile 2>/dev/null)
-	network_get_subnets cursubnets $INTERFACE
-	[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
-
-	local prevdnsservers=""
-	local curdnsservers=""
-	local dnsserverfile=/tmp/ipv4/$INTERFACE-dnsservers
-	prevdnsservers=$(cat $dnsserverfile 2>/dev/null)
-	network_get_dnsserver curdnsservers $INTERFACE
-	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
-
-	local prevdev=""
-	local curdev=""
-	local devfile=/tmp/ipv4/$INTERFACE-dev
-	prevdev=$(cat $devfile 2>/dev/null)
-	network_get_device curdev $INTERFACE
-	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
-
-	if [ ! -f /var/state/cwmp ]
-	then
-		if [ -f /etc/icwmpd/cwmp ]
-		then
-			uci -c /etc/icwmpd delete cwmp.acs
-			uci -c /etc/icwmpd commit cwmp
-			cp /etc/icwmpd/cwmp /var/state/cwmp
-		else
-			touch /var/state/cwmp
-		fi
-	fi
-	
-	uci -q -c /var/state/ get cwmp.cpe
-	if [ "$?" -ne 0 ]; then
-		unnamedcpe=`uci -q -c /var/state/ add cwmp cpe`
-		uci -c /var/state/ -q rename cwmp.$unnamedcpe='cpe'
-	fi 
-	
-	local vendorspecinf=`ubus call network.interface.${defwan} status | jsonfilter -e "@.data.vendorspecinf"`
-	[ -n "$vendorspecinf" ] && {
-		local url=""
-		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 [ ! -f /var/state/cwmp ]; then
-			touch /var/state/cwmp
-		fi
-		uci -q -c /var/state/ get cwmp.acs
-		if [ "$?" -ne 0 ]; then
-			unnamed=`uci -q -c /var/state/ add cwmp acs`
-			uci -c /var/state/ -q rename cwmp.$unnamed='acs'
-		fi
-		[ -n "$url" ] && uci -c /var/state -q set cwmp.acs.dhcp_url="$url"
-		uci -c /var/state commit cwmp
-	}
-                
-	local prevopt43url=""
-	local curopt43url=""
-	local opt43urlfile=/tmp/ipv4/$INTERFACE-opt43url
-	prevopt43url=$(cat $opt43urlfile 2>/dev/null)
-	curopt43url="$(uci -c /var/state -q get cwmp.acs.dhcp_url)"
-	[ -n "$curopt43url" ] && echo $curopt43url > $opt43urlfile || rm -f $opt43urlfile
-
-	[ \
-		"$prevdev" == "$curdev" -a \
-		"$previpaddr" = "$curipaddr" -a \
-		"$prevgateway" = "$curgateway" -a \
-		"$prevsubnets" = "$cursubnets" -a \
-		"$prevdnsservers" = "$curdnsservers" \
-	] && {
-		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
-		[ -z "$prevopt43url" ] && exit 0
-	}
-
-	echo "Restarting icwmp"|logger -t cwmp.hotplug -p info
-
-	/etc/init.d/icwmpd reload &
-}
-
-handle_icwmp_restart

icwmp/files/etc/icwmpd/update.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+. /lib/functions.sh
+
+log() {
+	echo "$@" |logger -t cwmp.update -p info
+}
+
+handle_icwmp_update() {
+	local cwmp_enable
+	config_load cwmp
+
+	config_get_bool cwmp_enable cpe enable 1
+	if [ "$cwmp_enable" = "0" ]; then
+		return 0
+	fi
+
+	status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
+	if [ "$status" != "running" ]; then
+		log "Trigger out of bound inform, since last inform status was failure"
+		ubus -t 10 call tr069 inform >/dev/null 2>&1
+		# Handle timeout or tr069 object not found
+		if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
+			log "Restarting icwmp tr069 object"
+			/etc/init.d/icwmpd restart
+		fi
+	fi
+}
+
+handle_icwmp_update $@

icwmp/files/etc/init.d/icwmpd

@@ -1,22 +1,50 @@
 #!/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=2
+STOP=00
 
 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
+	local wan="${1}"
 
 	### Ask for DHCP Option 43 only if CWMP is enabled ###
 	local reqopts="$(uci -q get network.$wan.reqopts)"
@@ -36,30 +64,190 @@ 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
 }
 
-wait_for_option43() {
-	local time=$1
-
-	local tm=0
-
-	log "Waiting for discovery of ACS URL from dhcp server ..."
-	while [ $tm -le $time ]
+convert_to_hex() {
+	local val=""
+	local optval="${1}"
+	OPTIND=1
+	while getopts ":" opt "-$optval"
 	do
-		acs_url=`uci -c /var/state -q get cwmp.acs.dhcp_url`
-		if [ "$acs_url" != "" ]
-		then
-			break
-		else
-			sleep 1
-		fi
-		tm=$((tm+1))
+		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_dhcp_option125() {
+	local wan="${1}"
+	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 [ ${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
+	fi
+
+	if [ ${network_uci_update} -eq 1 ]; then
+		uci commit network
+		ubus call network reload
+	fi
 }
 
 wait_for_resolvfile() {
@@ -69,62 +257,38 @@ 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 l3_device=""
-	local default_wan_interface=""
-
-	config_get default_wan_interface cpe default_wan_interface "wan"
-	json_load "$(ifstatus $default_wan_interface)"
-	json_get_var l3_device l3_device
-	if [ "$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 -c /etc/icwmpd delete cwmp.acs
-			uci -c /etc/icwmpd commit cwmp
-			cp /etc/icwmpd/cwmp /var/state/cwmp
-		else
-			touch /var/state/cwmp
-		fi
+	mkdir -p /var/run/icwmpd
+
+	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
+		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
 	fi
-	
-	mkdir -p /var/state/icwmpd
-	if [ -f /etc/icwmpd/.icwmpd_backup_session.xml ]
-	then
-		mv /etc/icwmpd/.icwmpd_backup_session.xml /var/state/icwmpd 2>/dev/null
-	fi
-	if [ -f /etc/icwmpd/.dm_enabled_notify.xml ]
-	then
-		mv /etc/icwmpd/.dm_enabled_notify /var/state/icwmpd 2>/dev/null
+
+	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]; then
+		cp -f /etc/icwmpd/dm_enabled_notify /var/run/icwmpd/ 2>/dev/null
 	fi
+	touch /var/run/icwmpd/cwmp
 }
 
 copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/state/cwmp ]
-	then
-		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
+	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]; then
+		cp -f /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /var/state/icwmpd/.icwmpd_backup_session.xml ]
-	then
-		cp /var/state/icwmpd/.icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
+
+	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]; then
+		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /var/state/icwmpd/.dm_enabled_notify.xml ]
-	then
-		cp /var/state/icwmpd/.dm_enabled_notify /etc/icwmpd 2>/dev/null
+
+	# 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/
 	fi
 }
 
@@ -135,14 +299,15 @@ validate_acs_section()
 		'periodic_inform_enable:bool' \
 		'periodic_inform_interval:uinteger' \
 		'periodic_inform_time:string' \
-		'url:string:http://192.168.1.1' \
-		'dhcp_discovery:or("enable", "disable")' \
+		'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)' \
-		'https_ssl_capath:file' \
-		'ipv6_enable:bool'
-		
+		'ipv6_enable:bool' \
+		'ssl_capath:string'
+
 }
 
 validate_cpe_section()
@@ -165,10 +330,12 @@ validate_cpe_section()
 		'notification:bool' \
 		'exec_download:bool' \
 		'periodic_notify_enable:bool' \
-		'periodic_notify_interval:uinteger'		
+		'enable:bool' \
+		'periodic_notify_interval:uinteger'
 }
 
 validate_defaults() {
+	local ssl_capath
 	config_load cwmp
 
 	validate_acs_section || {
@@ -176,71 +343,112 @@ 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
+
 	validate_cpe_section || {
 		log "Validation of cpe section failed"
 		return 1;
 	}
 
-	[ -z "${default_wan_interface}" ] && {
-		log "Wan interface is empty"
-		return 1;
-	}
-
 	return 0;
 }
 
-validate_acs_url() {
-	dhcp_url=`uci -c /var/state get cwmp.acs.dhcp_url`
-	[ -z "${url}" -a -z "${dhcp_url}" ] && {
-		log "ACS url is empty"
-		return 1;
-	}
+set_vendor_id() {
+	local wan="${1}"
+	local proto="$(uci -q get network.$wan.proto)"
+
+	if [ "${proto}" == "dhcp" ]; then
+		vendorid="$(uci -q get network.$wan.vendorid)"
+		if [ -z "${vendorid}" ]; then
+			uci -q set network.$wan.vendorid="dslforum.org"
+			ubus call uci commit '{"config":"network"}'
+		elif [[ $vendorid != *"dslforum.org"* ]]; then
+			uci -q set network.$wan.vendorid="${vendorid},dslforum.org"
+			ubus call uci commit '{"config":"network"}'
+		fi
+
+	fi
+}
+
+boot() {
+	local enable_cwmp="0"
 	
-	return 0
+	local dhcp_discovery="0"
+
+	config_load cwmp
+	
+	config_get_bool enable_cwmp cpe enable 1
+	if [ "$enable_cwmp" = "0" ]; then
+		return 0
+	fi
+	
+	config_get dhcp_discovery acs dhcp_discovery "0"
+	
+	config_get wan_interface cpe default_wan_interface "wan"
+	
+	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
+		# Set dhcp option 43 if not already configured
+		enable_dhcp_option43 "${wan_interface}"
+		# Set dhcp option 60
+		set_vendor_id "${wan_interface}"
+	fi
+
+	config_get lan_interface cpe default_lan_interface ""
+	if [ -n "${lan_interface}" ]; then
+		# Set dhcp_option 125 if not already configured
+		enable_dhcp_option125 "${wan_interface}"
+		enable_dnsmasq_option125 "${lan_interface}"
+	fi
+	
+	config_get ssl_capath acs ssl_capath
+
+	if [ -n "${ssl_capath}" ]; then
+		regenerate_ssl_link "${ssl_capath}"
+	fi
+
+	# Copy backup data so that if it restart latter on it gets the info
+	copy_cwmp_etc_files_to_varstate
+	touch /etc/icwmpd/cwmp_notifications
+
+	start
 }
 
 start_service() {
-	if [ ! -f /tmp/.icwmpd_boot ]; then
-		touch /etc/icwmpd/.icwmpd_boot
-		touch /tmp/.icwmpd_boot
-	else
-		[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-		[ -f /etc/config/wireless ] && log "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
-		[ -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
-		[ -f /usr/sbin/asterisk ] && log "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
+	local enable_cwmp
 
-		log "Waiting for usp.raw to be started"
-		ubus wait_for usp.raw
-		
-		validate_defaults || {
-			log "Validation of defaults failed"
-			return 1;
-		}
-		
-		# Set wan interface if not configured
-		set_wan_interface
-		
-		# Set dhcp option 43 if dhcp discovery enabled
-		if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
-			enable_dhcp_option43 $default_wan_interface
-			wait_for_option43 20
-		fi
-		
-		validate_acs_url || {
-			log "Validation of ACS URL failed"
-			return 1;
-		}
-		
-		copy_cwmp_etc_files_to_varstate
-		procd_open_instance icwmp
-		procd_set_param command "$PROG"
-		procd_set_param respawn \
-			${respawn_threshold:-5} \
-			${respawn_timeout:-10} ${respawn_retry:-3}
+	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
 
-		procd_close_instance
+	if [ "$enable_cwmp" = "0" ]; then
+		return 0
 	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
+
+	validate_defaults || {
+		log "Validation of defaults failed"
+		return 1;
+	}
+
+	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}"
+
+	procd_set_param watch network.interface
+	procd_close_instance
 }
 
 stop_service()
@@ -249,11 +457,46 @@ stop_service()
 }
 
 reload_service() {
-	stop
-	start
+	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
 }
 
 service_triggers() {
-	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
+       procd_add_reload_trigger "cwmp"
+
+       procd_open_trigger
+               json_add_array
+                       json_add_string "" "interface.update"
+                       json_add_array
+                               json_add_array
+                                       json_add_string "" "run_script"
+                                       json_add_string "" "/etc/icwmpd/update.sh"
+                               json_close_array
+                       json_close_array
+                       json_add_int "" "2000"
+               json_close_array
+       procd_close_trigger
 }
 

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

@@ -1,32 +1,41 @@
+#!/bin/sh
+
+. /lib/functions.sh
 # Copy defaults by the factory to the cwmp UCI user section.
+config_load cwmp
 
-
-# Get factory base MAC.
-baseMac=$(db -q get hw.board.basemac)
-
-# Erase colon and space characters.
-baseMac=${baseMac//:/}
-baseMac=${baseMac// /}
-
-# Caseing and fixed length string.
-mac=$(printf "%12.12X" $((0x$baseMac)))
-
-# Get system serial number.
-serial=$(db -q get hw.board.serial_number)
-
-# Get userid values
-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
-    uci -q set cwmp.acs.userid="${mac:0:6}-${serial}"
+# Get Manufacturer OUI.
+config_get oui cpe manufacturer_oui ""
+if [ -z "${oui}" ]; then
+	oui=$(db -q get device.deviceinfo.ManufacturerOUI)
 fi
 
-if [ -z "$cpe_userid" ]
-then
-    uci -q set cwmp.cpe.userid="${mac:0:6}-${serial}"
+oui=$(echo "${oui}" | tr 'a-f' 'A-F')
+
+# Get system serial number.
+config_get serial 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 ""
+
+# Only set if they are empty
+if [ -z "${acs_userid}" ]; then
+    uci -q set cwmp.acs.userid="${oui}-${serial}"
+fi
+
+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/90-icwmp-set-dhcp-reqopts

@@ -1,54 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_cwmp_reqopts() {
-	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local wan=$(uci -q get cwmp.cpe.default_wan_interface)
-	local dhcp_discovery=$(uci -q get cwmp.acs.dhcp_discovery)
-	local discovery=0
-	case $dhcp_discovery in
-		enable|1) discovery=1 ;;
-	esac
-
-	local newreqopts=
-	local baseopts=
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local proto="$(uci -q get network.$wan.proto)"
-	local tropts="43"
-	local oldreqopts="$reqopts"
-	local ropt iopt
-	for ropt in $reqopts; do
-		case $ropt in
-			43) ;;
-			*) baseopts="$baseopts $ropt" ;;
-		esac
-	done
-	ropt=""
-	reqopts="$baseopts $tropts"
-	for ropt in $reqopts; do
-		case $ropt in
-			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
-			*) newreqopts="$newreqopts $ropt" ;;
-		esac
-	done
-	if [ "$proto" == "dhcp" ]; then
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		[ "$newreqopts" == "$oldreqopts" ] && return
-		uci -q set network.$wan.reqopts="$newreqopts"
-		uci commit network
-	fi
-}
-
-regenerate_ssl_link(){
-	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
-}
-
-set_cwmp_reqopts
-regenerate_ssl_link

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

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

ieee1905/Config.in

@@ -6,5 +6,9 @@ config IEEE1905_EXTENSION_ALLOWED
 	bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
 	default y
 
+config IEEE1905_PLATFORM_HAS_WIFI
+	bool "Platform has WiFi"
+	default y if PACKAGE_libwifi
+
 endmenu
 endif

ieee1905/Config.map-plugin.in

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

ieee1905/Makefile

@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2021 IOPSYS
+# Copyright (C) 2021-2022 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.0.5
+PKG_VERSION:=4.10.40
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=67ace7d344e287cd8b1d90003ed487cd021e5223
+PKG_SOURCE_VERSION:=4533751a58cfb0fcf4ee878785f6c0872949c68d
 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
@@ -37,26 +37,30 @@ endef
 define Package/libieee1905
 $(call Package/ieee1905/Default,$(1))
   TITLE+= (library for CMDU and TLV handling)
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json
 endef
 
 define Package/ieee1905
 $(call Package/ieee1905/Default,$(1))
   TITLE+= ieee1905d (daemon implementing 1905.1 and provides cli)
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
-	   +libjson-c +libblobmsg-json +libwifi +ubus +libpthread \
-	   +libnl-genl +libieee1905
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +ubus +libpthread \
+	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
 endef
 
 
 define Package/map-plugin
 $(call Package/ieee1905/Default,$(1))
   TITLE:=Multi-AP (Easymesh) plugin
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
+define Package/map-plugin/config
+  source "$(SOURCE)/Config.map-plugin.in"
+endef
+
 define Package/ieee1905/description
  This package provides IEEE Std 1905.1 stack.
 endef
@@ -70,6 +74,15 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
+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
 
 
@@ -100,6 +113,7 @@ define Build/InstallDev/map-plugin
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map2.h
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
 endef
@@ -115,6 +129,7 @@ define Build/InstallDev/libieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
 	$(CP) $(PKG_BUILD_DIR)/src/libieee1905.so $(1)/usr/lib/
 endef
@@ -124,6 +139,11 @@ define Build/InstallDev
 	$(call Build/InstallDev/map-plugin,$(1),$(2))
 endef
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        rsync -r --exclude=.* ~/git/ieee1905/ $(PKG_BUILD_DIR)/
+endef
+endif
 
 $(eval $(call BuildPackage,ieee1905))
 $(eval $(call BuildPackage,libieee1905))

ieee1905/files/etc/config/ieee1905

@@ -3,20 +3,24 @@ 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 'TestSSID.2'
-	option encryption 'psk2'
-	option key '5555500000'
+	option ssid 'IOWRT-2.4GHz'
+	option encryption 'sae-mixed'
+	option key '1234567890'
 
 config ap
 	option band '5'
-	option ssid 'TestSSID.5'
-	option encryption 'psk2'
-	option key '2222200000'
+	option ssid 'IOWRT-5GHz'
+	option encryption 'sae-mixed'
+	option key '1234567890'
 
-config al-iface
-	option enabled 1
-	option ifname 'br-lan'
-	option type 'bridge'

ieee1905/files/etc/init.d/ieee1905

@@ -5,7 +5,83 @@ 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",
+				"psk", "psk-mixed", "none", 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

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

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

@@ -0,0 +1,17 @@
+#!/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.2
+PKG_VERSION:=1.2.3
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=10f765f3d0fcc226b6ecf0c481598c9e7f76315e
+PKG_SOURCE_VERSION:=d4e910a31039e0c0b7a539311eafcd716c36be77
 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

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

iop/Makefile

@@ -24,6 +24,10 @@ 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

@@ -1,32 +1,139 @@
-CONFIG_BUSYBOX_CUSTOM=y
+############
+# Generic #
+##########
+
+# Build #
+CONFIG_BUILD_LOG=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
 CONFIG_DEVEL=y
+# CONFIG_USE_SSTRIP is not set
+CONFIG_USE_STRIP=y
+# CONFIG_SIGNED_PACKAGES is not set
+
+# Image #
+CONFIG_TARGET_CUSTOMER="IOPSYS"
+CONFIG_TARGET_ROOTFS_TARGZ=y
+
+# /etc/banner and /etc/device_info #
+CONFIG_IMAGEOPT=y
+CONFIG_VERSIONOPT=y
+CONFIG_VERSION_MANUFACTURER="iopsysWrt"
+CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
+
+# /lib/preinit #
+CONFIG_PREINITOPT=y
+# CONFIG_TARGET_PREINIT_SUPPRESS_STDERR is not set
+CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y
+CONFIG_TARGET_PREINIT_TIMEOUT=1
+# CONFIG_TARGET_PREINIT_SHOW_NETMSG is not set
+# CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG is not set
+CONFIG_TARGET_PREINIT_IFNAME=""
+CONFIG_TARGET_PREINIT_IP=""
+CONFIG_TARGET_PREINIT_NETMASK=""
+CONFIG_TARGET_PREINIT_BROADCAST=""
+
+# Mirror #
+CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
+
+
+##################
+# IOWRT Add-ons #
+################
+
+# EasySoC HAL #
+CONFIG_PACKAGE_inbd=y
+CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_peripheral_manager=y
+CONFIG_PACKAGE_port-management=y
+CONFIG_PACKAGE_wifimngr=y
+
+# Multi-AP #
+CONFIG_PACKAGE_ieee1905=y
+CONFIG_PACKAGE_map-topology=y
+CONFIG_PACKAGE_wfadatad-collector=y
+
+# Network #
+CONFIG_PACKAGE_netmode=y
+CONFIG_PACKAGE_owsd=m
+CONFIG_PACKAGE_urlfilter=y
+
+# System #
+CONFIG_PACKAGE_imonitor=m
+CONFIG_PACKAGE_questd=y
+CONFIG_PACKAGE_rulengd=y
+
+# TR-x69 #
+CONFIG_PACKAGE_uspd-mbedtls=y
+CONFIG_PACKAGE_icwmp-mbedtls=y
+CONFIG_PACKAGE_obuspa=y
+CONFIG_PACKAGE_bulkdata=y
+CONFIG_PACKAGE_periodicstats=y
+CONFIG_PACKAGE_stunc-mbedtls=m
+CONFIG_PACKAGE_swmodd=m
+CONFIG_PACKAGE_twamp=m
+CONFIG_PACKAGE_udpecho-client=m
+CONFIG_PACKAGE_udpecho-server=m
+CONFIG_PACKAGE_xmppc=m
+
+# WebGUI #
+CONFIG_PACKAGE_sulu=y
+
+
+############
+# Network #
+##########
+
+# Protocols #
 CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
-CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_atftp=m
-CONFIG_PACKAGE_atftpd=m
-CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
 CONFIG_PACKAGE_comgt-ncm=y
-CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_ethtool=y
-CONFIG_PACKAGE_getopt=y
-CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_gre=y
-CONFIG_PACKAGE_icwmp=y
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-topology=y
+CONFIG_PACKAGE_map=y
+CONFIG_PACKAGE_ntfs-3g=y
+CONFIG_PACKAGE_ntpd=y
+CONFIG_PACKAGE_odhcp6c=y
+CONFIG_PACKAGE_odhcpd=y
+CONFIG_PACKAGE_ppp-mod-pppoa=y
+CONFIG_PACKAGE_ppp-mod-pppoe=y
+CONFIG_PACKAGE_ppp-mod-pppol2tp=y
+CONFIG_PACKAGE_ppp-mod-pptp=y
+CONFIG_PACKAGE_ppp-multilink=y
+# CONFIG_PACKAGE_ppp is not set
+CONFIG_PACKAGE_relayd=y
+CONFIG_PACKAGE_umbim=y
+CONFIG_PACKAGE_uqmi=y
+CONFIG_PACKAGE_wwan=y
+CONFIG_PACKAGE_xl2tpd=y
+
+# Services #
+CONFIG_PACKAGE_atftp=m
+CONFIG_PACKAGE_atftpd=m
+CONFIG_PACKAGE_ddns-scripts=y
+CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
-CONFIG_PACKAGE_wfadatad=y
-CONFIG_PACKAGE_imonitor=m
-CONFIG_PACKAGE_inbd=y
+CONFIG_PACKAGE_nginx=y
+CONFIG_PACKAGE_openvpn-easy-rsa=y
+CONFIG_PACKAGE_openvpn-openssl=y
+CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
+# CONFIG_PACKAGE_qos-scripts is not set
+CONFIG_PACKAGE_rdnssd=y
+CONFIG_PACKAGE_vsftpd-tls=m
+
+# Tools and Utilities #
+CONFIG_PACKAGE_curl=y
+CONFIG_PACKAGE_libcurl=y
+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
@@ -34,73 +141,67 @@ CONFIG_PACKAGE_iptables=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
+CONFIG_PACKAGE_ndisc6=y
+CONFIG_PACKAGE_rdisc6=y
+CONFIG_PACKAGE_resolveip=y
+CONFIG_PACKAGE_tcpdump=y
+CONFIG_PACKAGE_traceroute6=y
+
+
+############
+# System  #
+##########
+
+CONFIG_PACKAGE_at=y
+CONFIG_PACKAGE_getopt=y
 # CONFIG_PACKAGE_iwatchdog is not set
 CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_libreswan=m
-CONFIG_PACKAGE_libwifi=y
+CONFIG_PACKAGE_libustream-openssl=y
+# CONFIG_PACKAGE_libustream-wolfssl is not set
 CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_luci-nginx=y
+CONFIG_PACKAGE_nand-utils=y
+CONFIG_PACKAGE_openssl-util=y
+CONFIG_OPENSSL_WITH_COMPRESSION=y
+CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rpcd-mod-rpcsys=y
+CONFIG_PACKAGE_rpcd-mod-rrdns=y
+CONFIG_PACKAGE_strace=y
+CONFIG_PACKAGE_terminfo=y
+CONFIG_PACKAGE_uledd=y
+# The urandom-seed package is very strange. It seeds urandom with urandom...
+# Disable it. Most SoCs nowadays has HW random generators anyway.
+# CONFIG_PACKAGE_urandom-seed is not set
+# CONFIG_PACKAGE_urngd is not set
+CONFIG_PACKAGE_usb-modeswitch=y
+CONFIG_PACKAGE_uuidgen=y
+CONFIG_PACKAGE_zoneinfo-core=y
+CONFIG_PACKAGE_zoneinfo-europe=y
+
+
+################
+# LuCI WebGUI #
+##############
+
+# BEGIN: luci-nginx metapackage with some changes
+# We do not want libiwinfo-lua on non-WiFi targets, but it is already
+# depended on by other luci-packages, so no need to take it in explicitly
+CONFIG_PACKAGE_luci-mod-admin-full=y
+CONFIG_PACKAGE_luci-app-firewall=y
+CONFIG_PACKAGE_luci-app-opkg=y
+CONFIG_PACKAGE_luci-proto-ppp=y
+CONFIG_PACKAGE_luci-proto-ipv6=y
 # CONFIG_LUCI_JSMIN is not set
 # CONFIG_LUCI_CSSTIDY is not set
 CONFIG_PACKAGE_luci-mod-dashboard=y
 CONFIG_PACKAGE_luci-theme-openwrt-2020=y
-CONFIG_PACKAGE_map=y
-CONFIG_PACKAGE_miniupnpd=y
-CONFIG_PACKAGE_mwan3=y
-CONFIG_PACKAGE_nand-utils=y
-CONFIG_PACKAGE_ndisc6=y
-CONFIG_PACKAGE_netmode=y
-CONFIG_PACKAGE_ntfs-3g=y
-CONFIG_PACKAGE_ntpd=y
-CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_odhcp6c=y
-CONFIG_PACKAGE_odhcpd=y
-CONFIG_PACKAGE_openssl-util=y
-CONFIG_OPENSSL_WITH_COMPRESSION=y
-CONFIG_PACKAGE_openvpn-easy-rsa=y
-CONFIG_PACKAGE_openvpn-openssl=y
-CONFIG_PACKAGE_owsd=y
-CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_peripheral_manager=y
-CONFIG_PACKAGE_port-management=y
-CONFIG_PACKAGE_ppp-mod-pppoa=y
-CONFIG_PACKAGE_ppp-mod-pppoe=y
-CONFIG_PACKAGE_ppp-mod-pppol2tp=y
-CONFIG_PACKAGE_ppp-mod-pptp=y
-CONFIG_PACKAGE_ppp-multilink=y
-# CONFIG_PACKAGE_ppp is not set
-# CONFIG_PACKAGE_qos-scripts is not set
-CONFIG_PACKAGE_questd=y
-CONFIG_PACKAGE_rdisc6=y
-CONFIG_PACKAGE_rdnssd=y
-CONFIG_PACKAGE_relayd=y
-CONFIG_PACKAGE_resolveip=y
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-rpcsys=y
-CONFIG_PACKAGE_rulengd=y
-CONFIG_PACKAGE_strace=y
-CONFIG_PACKAGE_sulu=y
-CONFIG_PACKAGE_swmodd=m
-CONFIG_PACKAGE_tcpdump=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_traceroute6=y
-CONFIG_PACKAGE_uledd=y
-CONFIG_PACKAGE_umbim=y
-CONFIG_PACKAGE_uqmi=y
-CONFIG_PACKAGE_urlfilter=y
-CONFIG_PACKAGE_usb-modeswitch=y
-CONFIG_PACKAGE_uspd=y
-CONFIG_PACKAGE_vsftpd-tls=m
-CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_wifimngr=y
-CONFIG_PACKAGE_uuidgen=y
-CONFIG_PACKAGE_xl2tpd=y
-CONFIG_PACKAGE_zoneinfo-core=y
-CONFIG_PACKAGE_zoneinfo-europe=y
-CONFIG_TARGET_CUSTOMER="IOPSYS"
-# CONFIG_USE_SSTRIP is not set
-CONFIG_USE_STRIP=y
-CONFIG_BUILD_LOG=y
+CONFIG_PACKAGE_nginx-mod-luci=y
+
+
+############
+# BusyBox #
+##########
+
+CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_BUSYBOX_CONFIG_ADDUSER=y
 CONFIG_BUSYBOX_CONFIG_ARPING=y
 CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
@@ -120,6 +221,7 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS=y
 CONFIG_BUSYBOX_CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
 CONFIG_BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
+# CONFIG_BUSYBOX_CONFIG_IP is not set
 CONFIG_BUSYBOX_CONFIG_LAST_SYSTEM_ID=999
 CONFIG_BUSYBOX_CONFIG_LOGIN=y
 # CONFIG_BUSYBOX_CONFIG_LSMOD is not set
@@ -183,42 +285,3 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
-CONFIG_LIBCURL_CRYPTO_AUTH=y
-# CONFIG_LIBCURL_MBEDTLS is not set
-CONFIG_LIBCURL_OPENSSL=y
-CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
-# CONFIG_SIGNED_PACKAGES is not set
-CONFIG_KERNEL_DEVTMPFS=y
-CONFIG_KERNEL_DEVTMPFS_MOUNT=y
-# CONFIG_BUSYBOX_CONFIG_IP is not set
-CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
-
-# Generation of /etc/banner.
-CONFIG_IMAGEOPT=y
-CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="iopsysWrt"
-CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
-
-# Disable as much as possible of OpenWrt messy "pre-init" stuff.
-CONFIG_PREINITOPT=y
-# CONFIG_TARGET_PREINIT_SUPPRESS_STDERR is not set
-CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE=y
-CONFIG_TARGET_PREINIT_TIMEOUT=1
-# CONFIG_TARGET_PREINIT_SHOW_NETMSG is not set
-# CONFIG_TARGET_PREINIT_SUPPRESS_FAILSAFE_NETMSG is not set
-CONFIG_TARGET_PREINIT_IFNAME=""
-CONFIG_TARGET_PREINIT_IP=""
-CONFIG_TARGET_PREINIT_NETMASK=""
-CONFIG_TARGET_PREINIT_BROADCAST=""
-
-# Generate rootfs tar file
-CONFIG_TARGET_ROOTFS_TARGZ=y
-
-# The urandom-seed package is very strange. It seeds urandom with urandom...
-# Disable it. Most SoCs nowadays has HW random generators anyway.
-# CONFIG_PACKAGE_urandom-seed is not set
-# CONFIG_PACKAGE_urngd is not set
-
-# We use OpenSSL, no need to ship multiple TLS libraries
-CONFIG_PACKAGE_libustream-openssl=y
-# CONFIG_PACKAGE_libustream-wolfssl is not set

iop/scripts/feeds_update.sh

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

iop/scripts/genconfig.sh

@@ -13,12 +13,9 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
-	mediatek="target/linux/iopsys-mediatek"
 	econet="target/linux/iopsys-econet"
-	intel_mips="target/linux/intel_mips"
 	x86="target/linux/iopsys-x86"
 	armvirt="target/linux/iopsys-armvirt"
 
@@ -114,21 +111,15 @@ function genconfig {
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 		[ -e $econet/genconfig ] &&
 			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $intel_mips/genconfig ] &&
-			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
 		[ -e $x86/genconfig ] &&
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $bcm27xx/genconfig ] &&
-			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_mediatek iopsys_econet iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -153,14 +144,6 @@ function genconfig {
 		fi
 	    done
 
-	    for p in $iopsys_mediatek; do
-		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
-		    return
-		fi
-	    done
-
 	    for p in $iopsys_econet; do
 		if [ $p == $profile ]; then
 		    target="iopsys_econet"
@@ -169,14 +152,6 @@ function genconfig {
 		fi
 	    done
 
-	    for p in $iopsys_intel_mips; do
-		if [ $p == $profile ]; then
-		    target="intel_mips"
-			target_config_path="$intel_mips/config"
-		    return
-		fi
-	    done
-
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
@@ -192,15 +167,6 @@ function genconfig {
 		    return
 		fi
 	    done
-
-	    for p in $iopsys_bcm27xx; do
-		if [ $p == $profile ]; then
-		    target="iopsys_bcm27xx"
-			target_config_path="$bcm27xx/config"
-		    return
-		fi
-	    done
-
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -288,11 +254,22 @@ function genconfig {
 	setup_dirs()
 	{
 		git remote -v | grep -q http || {
+			CUSTBRANCH="$(git rev-parse --abbrev-ref HEAD)"
 			if git ls-remote $CUSTREPO -q 2>/dev/null; then
 				if [ ! -d "$CUSTPATH" ]; then
-					git clone "$CUSTREPO" "$CUSTPATH"
+					echo "Cloning $CUSTBRANCH branch of $CUSTREPO"
+					git clone -b "$CUSTBRANCH" "$CUSTREPO" "$CUSTPATH" 2>/dev/null || {
+						DEFBRANCH="$(git remote show $CUSTREPO | grep 'HEAD branch' | cut -d' ' -f5)"
+						echo "$CUSTBRANCH branch is not found, cloning $DEFBRANCH branch of $CUSTREPO"
+						git clone "$CUSTREPO" "$CUSTPATH"
+					}
 				elif [ $IMPORT -eq 1 ]; then
 					cd $CUSTPATH
+					echo "Checking out $CUSTBRANCH branch in $CUSTPATH"
+					git checkout "$CUSTBRANCH" 2>/dev/null || {
+						DEFBRANCH="$(git symbolic-ref refs/remotes/origin/HEAD | cut -d '/' -f4)"
+						echo "Checking out $CUSTBRANCH branch has failed, using $DEFBRANCH branch in $CUSTPATH"
+					}
 					v "git pull"
 					git pull
 					cd - >/dev/null #go back
@@ -352,32 +329,16 @@ function genconfig {
 		    echo "" >> .config
 		fi
 
-		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
-		if [ "$target" = "intel_mips" ]; then
-			subtarget="xrx500"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			device=$(echo $BOARDTYPE | tr a-z A-Z)
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
-		elif [ "$target" = "iopsys_ramips" ]; then
+		# Special handling for targets which use TARGET_DEVICES 
+		if [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_mediatek" ]; then
-			subtarget="mt7622"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		elif [ "$target" = "iopsys_econet" ]; then
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-		elif [ "$target" = "iopsys_bcm27xx" ]; then
-			subtarget="iopsys_bcm2711"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config

iop/scripts/genconfig_min.sh

@@ -12,12 +12,9 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
-	mediatek="target/linux/iopsys-mediatek"
 	econet="target/linux/iopsys-econet"
-	intel_mips="target/linux/intel_mips"
 	x86="target/linux/iopsys-x86"
 	armvirt="target/linux/iopsys-armvirt"
 
@@ -113,21 +110,15 @@ function genconfig_min {
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 		[ -e $econet/genconfig ] &&
 			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $intel_mips/genconfig ] &&
-			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
 		[ -e $x86/genconfig ] &&
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $bcm27xx/genconfig ] &&
-			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_mediatek iopsys_econet iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -152,14 +143,6 @@ function genconfig_min {
 		fi
 	    done
 
-	    for p in $iopsys_mediatek; do
-		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
-		    return
-		fi
-	    done
-
 	    for p in $iopsys_econet; do
 		if [ $p == $profile ]; then
 		    target="iopsys_econet"
@@ -168,14 +151,6 @@ function genconfig_min {
 		fi
 	    done
 
-	    for p in $iopsys_intel_mips; do
-		if [ $p == $profile ]; then
-		    target="intel_mips"
-			target_config_path="$intel_mips/config"
-		    return
-		fi
-	    done
-
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
@@ -191,25 +166,10 @@ function genconfig_min {
 		    return
 		fi
 	    done
-
-	    for p in $iopsys_bcm27xx; do
-		if [ $p == $profile ]; then
-		    target="iopsys_bcm27xx"
-			target_config_path="$bcm27xx/config"
-		    return
-		fi
-	    done
-
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
 		DEVELOPER=1
-
-		bcmAllowed=0
-		endptAllowed=0
-
-		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
-		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 	}
 
 	v() {
@@ -343,34 +303,16 @@ function genconfig_min {
 		    echo "" >> .config
 		fi
 
-		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
-		if [ "$target" = "intel_mips" ]; then
-			subtarget="xrx500"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			device=$(echo $BOARDTYPE | tr a-z A-Z)
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
-		elif [ "$target" = "iopsys_ramips" ]; then
+		# Special handling for targets which use TARGET_DEVICES
+		if [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_mediatek" ]; then
-			subtarget="mt7622"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		elif [ "$target" = "iopsys_econet" ]; then
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-		elif [ "$target" = "iopsys_bcm27xx" ]; then
-			subtarget="iopsys_bcm2711"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config

libjwt/Makefile

@@ -1,54 +0,0 @@
-
-# Copyright (C) 2018 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libjwt
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=866607c7741421c8ac99876e7201eb32d9af1b92
-PKG_SOURCE_URL:=https://github.com/benmcollins/libjwt.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_FIXUP:=autoreconf
-
-PKG_LICENSE:=LGPLv3
-PKG_LICENSE_FILES:=COPYING
-include $(INCLUDE_DIR)/package.mk
-
-define Package/libjwt
-  CATEGORY:=Libraries
-  DEPENDS:=+libopenssl +jansson
-  TITLE:= libjwt
-endef
-
-
-#TARGET_CFLAGS += \
-#	-I$(STAGING_DIR)/usr/include
-#	-I$(STAGING_DIR)/usr/include/libnl3
-
-#MAKE_FLAGS += \
-#	CFLAGS="$(TARGET_CFLAGS)" \
-#	LDFLAGS="$(TARGET_LDFLAGS)" \
-#	FPIC="$(FPIC)" \
-#	PLATFORM="$(TARGET_PLATFORM)" \
-#	subdirs="$(subdirs)"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/include/jwt.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libjwt/.libs/libjwt.so* $(1)/usr/lib/
-endef
-
-define Package/libjwt/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libjwt/.libs/libjwt.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libjwt))

libmicroxml/Makefile

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

@@ -1,130 +0,0 @@
-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.22
+PKG_VERSION:=3.0.23
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
@@ -72,11 +72,11 @@ endef
 
 define Package/libtrace/install    
 	$(INSTALL_DIR) $(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/
+	$(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_DIR) $(1)/usr/lib/libpacketdump
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump/*.so* $(1)/usr/lib/libpacketdump/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump/*.so* $(1)/usr/lib/libpacketdump/
 endef
 
 define Package/libtrace-tools/install    

map-agent/Config.in

@@ -0,0 +1,34 @@
+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,24 +1,25 @@
 #
-# Copyright (C) 2020-21 IOPSYS Software Solutions AB
+# Copyright (C) 2020-22 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.1.1
+PKG_VERSION:=2.10.4.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=11c7b8686a936262d25123a3c1eb822da31078a5
+PKG_SOURCE_VERSION:=6ee9d2d711241d59f77b1e254343903cc92108d1
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
-PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-agent
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
-
-PKG_BUILD_DEPENDS:=map-plugin
+endif
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -27,15 +28,29 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +map-plugin
+	  +map-plugin +ip-bridge
 endef
 
+
+define Package/dynbhd
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Dynamic Backhaul Daemon
+  DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
+	  +map-plugin +map-agent
+endef
+
+
 define Package/map-agent/description
  This package implements EasyMesh R2 compliant WiFi Agent.
 endef
 
+define Package/dynbhd/description
+ Dyanmic LAN/WAN port detection and loop avoidance.
+endef
+
 define Package/map-agent/config
-	#source "$(SOURCE)/Config.in"
+	source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
@@ -43,6 +58,24 @@ 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
@@ -53,4 +86,21 @@ define Package/map-agent/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef
 
+define Package/dynbhd/install
+	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/lib/wifi/dynbhd
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/ethernet
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/dynbhd $(1)/usr/sbin/dynbhd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/api $(1)/lib/wifi/dynbhd/api
+#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/map-dynamic-backhaul $(1)/etc/hotplug.d/ethernet/map-dynamic-backhaul
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        rsync -r --exclude=.* ~/git/map-agent/ $(PKG_BUILD_DIR)/
+endef
+endif
+
 $(eval $(call BuildPackage,map-agent))
+$(eval $(call BuildPackage,dynbhd))

map-agent/files/etc/config/mapagent

@@ -1,32 +1,134 @@
 config agent 'agent'
 	option enabled '1'
-	option debug '6'
+	option debug '0'
 	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 fh-iface
-#	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'
+config dynamic_backhaul
+	option missing_bh_timer '60'
+	option missing_bh_reconfig_timer '1800'
 
-#config fh-iface
-#	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'
+config controller_select
+	option id 'auto'
+	option probe_int '20'
+	option retry_int '9'
+	option autostart '1'
+	option local '0'
 
-#config bk-iface
-#	option ifname 'apclii0'
+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 onboarded '0'
-#	option disallow_bsta '1		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
+#	option ifname 'wlan0-1'
+#	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 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
+#	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'
+

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

@@ -1,20 +1,78 @@
 #!/bin/sh
 
-wan=$(db -q get hw.board.ethernetWanPort)
+. /lib/network/utils.sh
 
-[ -z "$wan" ] && exit 1 # no configuration
-[ "$PORT" != "$wan" ] && exit 0
+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
 
 remove_from_bridge() {
 	config_get ifname "$section" ifname
-
-	ubus call network.interface.$bridge remove_device '{"name":"$ifname"}'
+	[ -n "$ifname" ] && ubus call network.interface.${al_brnet} remove_device '{"name":"$ifname"}'
 }
 
 update_bstas() {
-	local section="$1"
-	local action="$2"
-	local ifname onboarded
+	section="$1"
+	action="$2"
 
 	config_get ifname "$section" ifname
 	config_get_bool enabled "$section" enabled 0
@@ -32,14 +90,16 @@ update_bstas() {
 }
 
 if [ "$LINK" = "up" ]; then
-	touch /tmp/map.agent.bsta_global_disable
+	#touch "$map_bh_file"
+	config_load "mapagent"
+	config_foreach remove_from_bridge bsta
+	config_foreach update_bstas bsta down
 
-	config_load "mapagent"
-	bridge=$(uci get mapagent.agent.al_bridge | cut -d '-' -f2)
-	config_foreach remove_from_bridge bk-iface $bridge
-	config_foreach update_bstas bk-iface down
+	/lib/wifi/multiap set_uplink "eth" "$PORT"
 else
-	rm -f /tmp/map.agent.bsta_global_disable
+	/lib/wifi/multiap unset_uplink "eth"
+	#rm -f "$map_bh_file"
 	config_load "mapagent"
-	config_foreach update_bstas bk-iface up
+	config_foreach update_bstas bsta up
+
 fi

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

@@ -5,49 +5,177 @@ STOP=20
 
 USE_PROCD=1
 
+IS_CFG_VALID=1
+
 MAP_DEV="map_dev"
 MAP_IF="map"
-MAP_VETH="lei"
 
-create_map() {
-	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 set network.${MAP_DEV}.bridge_empty=1
-
-	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 set mapagent.agent.al_bridge=br-map
-
-	uci -q commit
-
-	ubus call network reload
-	ubus -t 5 wait_for network.device
-
-	ip link add ${MAP_VETH} type veth peer name ${MAP_VETH}_lan 2>/dev/null
-	brctl addif br-map ${MAP_VETH} 2>/dev/null
-	brctl addif br-lan ${MAP_VETH}_lan 2>/dev/null
-	ip link set ${MAP_VETH} up 2>/dev/null
-	ip link set ${MAP_VETH}_lan up 2>/dev/null
+start_dynbhd_service() {
+	rm -f /tmp/multiap.backhaul
+	procd_open_instance
+	procd_set_param command "/usr/sbin/dynbhd"
+	procd_set_param respawn
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_close_instance
 }
 
-remove_map() {
-	ip link delete ${MAP_VETH} &>/dev/null
+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'
 
-	uci -q delete network.${MAP_DEV}
-	uci -q delete network.${MAP_IF}
 
-	uci -q set mapagent.agent.al_bridge=br-lan
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapagent" "Validation of agent section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
 
-	uci -q commit
+validate_cs_section() {
+	local section="$1"
 
-	ubus call network reload
+	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", "sae+aes", "psk2",
+				"psk2+aes", "sae-mixed", "sae-mixed+aes",
+				"none", "psk-mixed", "psk-mixed+aes",
+				"wpa", "wpa+aes", "wpa2", "wpa2+aes",
+				"psk", "psk+aes")' \
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapagent" "Validation of radio section failed"
+		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
 
@@ -57,22 +185,14 @@ 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

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

map-agent/files/lib/wifi/multiap

@@ -10,7 +10,11 @@
 . /usr/share/libubox/jshn.sh
 . /lib/wifi/traffic_separation
 
+MAPFILE="/tmp/multiap.backhaul"
+
 diff=0
+onbrd_bssid=0
+onbrd_band=0
 
 usage() {
 	cat <<EOF
@@ -25,12 +29,42 @@ EOF
 	exit 1
 }
 
-brcm_sync_credentials() {
+
+type_to_multi_ap () {
+	type="$1"
+
+	if [ "$type" = "backhaul" ]; then
+		echo "1"
+		return
+	elif [ "$type" = "fronthaul" ]; then
+		echo "2"
+		return
+	elif [ "$type" = "combined" ]; then
+		echo "3"
+		return
+	fi
+
+	echo "0"
+}
+
+get_type_by_section() {
+	section="$1"
+
+	config_get type $section type "0"
+
+	echo "$(type_to_multi_ap $type)"
+}
+
+sync_credentials() {
 	bands=""
+	json_init
 	mapagent_process_fh() {
 		local section=$1
 		local dev=$2
 
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
 		config_get device $section device
 
 		[ "$dev" != "$device" ] && return
@@ -47,6 +81,17 @@ brcm_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() {
@@ -64,12 +109,43 @@ brcm_sync_credentials() {
 			fi
 		done
 
-		config_foreach mapagent_process_fh fh-iface $device
+		config_foreach mapagent_process_fh ap $device
 		bands="$bands $band"
 	}
 
 	ieee1905_del_ap() {
+		append_value() {
+			local section=$1
+			local key=$2
+			shift
+			shift
+
+			while [ "$key" != "" ]; do
+				val=$(uci -q get ieee1905.$section.$key)
+				[ "$val" = "" ] && {
+					key=$1
+					shift
+					continue
+				}
+				json_add_string "$key" ${val}
+				key=$1
+				shift
+			done
+		}
+
 		local section=$1
+		local band
+
+		config_get band $section band
+		json_select "$band" > /dev/null
+		rc=$?
+		[ "$rc" != "0" ] && json_add_object "$band"
+		append_value $section "manufacturer" "model_name" "device_name" "model_number" "serial_number" "device_type" "os_version"
+		if [ "$rc" != "0" ]; then
+			json_close_object
+		else
+			json_select ..
+		fi
 
 		uci -q delete ieee1905.${section}
 	}
@@ -78,13 +154,13 @@ brcm_sync_credentials() {
 	config_foreach ieee1905_del_ap ap
 
 	config_load mapagent
-	config_foreach mapagent_process_radio wifi-radio
+	config_foreach mapagent_process_radio radio
 
 	uci commit ieee1905
+	json_cleanup
 }
 
-
-brcm_write_credentials() {
+write_credentials() {
 	config_load mapagent
 
 	mapagent_apply_wireless() {
@@ -116,8 +192,10 @@ brcm_write_credentials() {
 		local bk_ssid="$3"
 		local bk_key="$4"
 
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
 		config_get device $section device
-		config_get multi_ap $section multi_ap "0"
 
 		#echo found dev=$dev device=$device map=$multi_ap
 
@@ -129,15 +207,17 @@ brcm_write_credentials() {
 		#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
 
 		# subshell in hopes to maintain mapagent config loaded
-		echo $(mapagent_apply_wireless $ifname "$bk_ssid" "$bk_key") 2> /dev/null
+		(mapagent_apply_wireless $ifname "$bk_ssid" "$bk_key")
 	}
 
 	mapagent_find_bbss() {
 		local section=$1
 		local dev=$2
 
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
 		config_get device $section device
-		config_get multi_ap $section multi_ap "0"
 		config_get enabled $section enabled "1"
 
 		#echo found dev=$dev device=$device map=$multi_ap
@@ -151,7 +231,7 @@ brcm_write_credentials() {
 
 		#echo found ssid="$ssid" key="$key"
 
-		config_foreach mapagent_find_fbss fh-iface $dev "$ssid" "$key"
+		config_foreach mapagent_find_fbss ap $dev "$ssid" "$key"
 	}
 
 	mapagent_process_radio() {
@@ -161,16 +241,16 @@ brcm_write_credentials() {
 
 		#echo found dev=$dev
 
-		config_foreach mapagent_find_bbss fh-iface $device
+		config_foreach mapagent_find_bbss ap $device
 	}
 
 
-	config_foreach mapagent_process_radio wifi-radio
+	config_foreach mapagent_process_radio radio
 
 	uci commit wireless
 }
 
-brcm_set_network() {
+set_network() {
 	local ifname=$1
 	local num=$2
 	local bssid=$3
@@ -200,6 +280,7 @@ write_bsta_config() {
 
 	#echo diff = $diff > /dev/console
 
+
 	config_load mapagent
 
 	mapagent_apply_wl_bsta() {
@@ -212,7 +293,13 @@ 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
@@ -225,6 +312,7 @@ write_bsta_config() {
 		local section=$1
 		local bsta=$2
 
+
 		config_get ifname $section ifname
 		#echo bsta = $bsta > /dev/console
 
@@ -232,22 +320,50 @@ write_bsta_config() {
 		#echo found ifname=$ifname > /dev/console
 
 		config_get bssid $section bssid
+		config_get band $section band
 		ret=$(mapagent_apply_wl_bsta $ifname $bssid)
-		[ "$ret" == "1" ] && diff=1
+		[ "$ret" == "1" ] && {
+			diff=1
+			onbrd_bssid=$bssid
+			onbrd_band=$band
+		}
 	}
 
+	mapagent_apply_bssid_same_band() {
+		apply_config() {
+			local section=$1
+			local bsta=$2
 
-	config_foreach mapagent_process_bk bk-iface $ifname
+			config_get ifname $section ifname
+
+			[ "$bsta" == "$ifname" ] || return
+			uci -q set wireless.${section}.bssid=$bssid
+		}
+
+		config_get band $1 band
+		config_get onboarded $1 onboarded "0"
+
+		[ "$onbrd_band" != "$band" -o "$onboarded" = "1" ] && return
+
+		config_get ifname $1 ifname
+
+		config_load wireless
+		config_foreach apply_config wifi-iface $ifname $onbrd_bssid
+		uci commit wireless
+	}
+
+	config_foreach mapagent_process_bk bsta $ifname
 
 	#echo result diff = $diff > /dev/console
 	[ "$diff" == "1" ] && {
-		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
 	}
 
 }
 
-brcm_teardown_iface() {
+teardown_iface() {
 	config_load mapagent
 
 	local iface=$1
@@ -261,7 +377,7 @@ brcm_teardown_iface() {
 
 			[ "$ifname" != "$map_ifname" ] && return
 
-			uci -q set wireless.${section}.start_disabled="1"
+			uci -q set wireless.${section}.disabled="1"
 			uci -q set wireless.${section}.ssid="DISABLED-SSID"
 			uci -q set wireless.${section}.key="DISABLED-KEY"
 			uci -q delete wireless.${section}.multi_ap_backhaul_ssid
@@ -277,6 +393,9 @@ brcm_teardown_iface() {
 		local section=$1
 		local iface=$2
 
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
 		config_get ifname $section ifname
 
 		[ "$iface" != "$ifname" ] && return
@@ -285,19 +404,20 @@ brcm_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)
 	}
 
 
-	config_foreach mapagent_teardown_bss fh-iface $iface
+	config_foreach mapagent_teardown_bss ap $iface
 
 	uci commit wireless
 	uci commit mapagent
 }
 
-brcm_bsta_to_wireless() {
+bsta_to_wireless() {
 	config_load mapagent
 
 	mapagent_find_lowest_prio_onboarded() {
@@ -316,7 +436,7 @@ brcm_bsta_to_wireless() {
 		local sec=""
 		local prio="-1"
 
-		config_foreach mapagent_process_bk bk-iface
+		config_foreach mapagent_process_bk bsta
 		echo $sec
 	}
 
@@ -351,7 +471,7 @@ brcm_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}.disabled=$disabled
+				uci -q set wireless.${section}.default_disabled='0'
 
 				[ "$disabled" != "1" ] && return
 				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
@@ -369,10 +489,12 @@ brcm_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"
 
-			[ "$3" != "$band" -o "$onboarded" = "0" ] && return
+			[ "$4" != "$band" -o "$onboarded" = "0" ] && return
 
 			config_get ssid $1 ssid
 			config_get key $1 key
@@ -380,7 +502,12 @@ brcm_bsta_to_wireless() {
 			config_get enabled $1 enabled "0"
 			config_get bssid $1 bssid
 
-			echo $(mapagent_apply_wl_bsta $2 "$ssid" "$key" $encryption $4 "$bssid")
+			uci -q set mapagent.${other_section}.ssid="$ssid"
+			uci -q set mapagent.${other_section}.key="$key"
+			uci -q set mapagent.${other_section}.encryption=$encryption
+			uci -q set mapagent.${other_section}.bssid="$bssid"
+			uci commit mapagent
+			(mapagent_apply_wl_bsta "$3" "$ssid" "$key" $encryption "$5" "$bssid")
 		}
 
 		config_get band $1 band
@@ -389,14 +516,14 @@ brcm_bsta_to_wireless() {
 		config_get enabled $1 enabled "0"
 
 		if [ "$onboarded" = "0" ]; then
-			config_foreach mapagent_find_other_creds bk-iface $ifname $band $enabled
+			config_foreach mapagent_find_other_creds bsta $1 $ifname $band $enabled
 		else
 			config_get ssid $1 ssid
 			config_get key $1 key
 			config_get encryption $1 encryption
 			config_get bssid $1 bssid
 
-			echo $(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
+			(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
 		fi
 	}
 
@@ -408,13 +535,14 @@ brcm_bsta_to_wireless() {
 #	sec=""
 #	prio=""
 #
-#	config_foreach mapagent_enable_best bk-iface $best
+#	config_foreach mapagent_enable_best bsta $best
 #	uci commit mapagent
 	config_load mapagent
 
-	diff=$(config_foreach mapagent_bsta_to_wireless bk-iface)
+	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
 
 #	[ "$diff" != "" ] && {
+
 		ubus call uci commit '{"config":"wireless"}'
 #	}
 }
@@ -509,37 +637,115 @@ sync_mapcontroller_from_wireless() {
 }
 
 bsta_scan_on_enabled() {
-	config_load mapagent
+	local onboarded_bands=""
+
+	mapagent_onboarded_bands() {
+		config_get band $1 band
+		config_get onboarded $1 onboarded "0"
+
+		[ "$onboarded" = "0" ] && return
+
+		onboarded_bands="$onboarded_bands $band"
+	}
 
 	mapagent_enable_bk() {
 		config_get ifname $1 ifname
+		config_get band $1 band
 		config_get enabled $1 enabled
 
-		echo ifname $ifname enabled $enabled
-
 		[ "$enabled" = "0" ] && return
 
-		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
+		for onboarded_band in $onboarded_bands
+		do
+			[ "$onboarded_band" != "$band" ] && continue
+
+			logger -t multiap "bsta_scan_on_enabled $ifname $band"
+			wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
+			wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
+			wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+		done
 	}
 
-	config_foreach mapagent_enable_bk bk-iface
+	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 "2"
+		config_get ifname $1 ifname
 		uci -q set mapagent.$1.enabled="1"
 	}
 
 	config_load mapagent
 
-	config_foreach mapagent_enable_bk bk-iface
+	config_foreach mapagent_enable_bk bsta
 	uci commit mapagent
 	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
 
@@ -587,17 +793,21 @@ 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"
 
-		echo $(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
+		(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
 	}
 
 	local bsta=$1
 
-	prio=$(config_foreach mapagent_get_priority bk-iface $bsta)
+	prio=$(config_foreach mapagent_get_priority bsta $bsta)
 	#echo bsta $bsta has prio $prio > /dev/console
 
-	config_foreach mapagent_disable_lower_bk bk-iface $bsta $prio
+	config_foreach mapagent_disable_lower_bk bsta $bsta $prio
 	uci commit mapagent
 
 #	ubus call uci commit '{"config":"wireless"}'
@@ -622,7 +832,13 @@ bsta_use_link() {
 
 	local bsta=$1
 
-	config_foreach mapagent_disable_bk bk-iface $bsta
+	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() {
@@ -634,28 +850,126 @@ bsta_swap_to_link() {
 	wpa_cli -i "$1" save_config > /dev/null
 }
 
+set_uplink_backhaul_info() {
+	local ul_1905id=$1
+	local ul_mac=$2
+
+	(
+		flock -x 200
+		json_load "$(cat $MAPFILE)"
+		json_add_string "backhaul_device_id" "$ul_1905id"
+		json_add_string "backhaul_macddr" "$ul_mac"
+		json_dump > "$MAPFILE"
+		json_cleanup
+	) 200>/var/lock/map.backhaul.lock
+}
+
+
+
+update_isolate_ebtables() {
+	parse_fh() {
+		local brcm_setup="$(uci -q get mapagent.agent.brcm_setup)"
+		local guest_isolate="$(uci -q get mapagent.agent.guest_isolation)"
+		local pvid="$(uci -q get mapagent.@policy[0].pvid)"
+		local section=$1
+		local prefix="TODO"
+		local action="del"
+
+		config_get vid $section vid
+		config_get band $section band
+		config_get ifname $section ifname
+
+		[ $vid -gt 4094 -o $vid -lt 1 ] && vid=$pvid
+		[ "$guest_isolate" = "1" -a "$vid" != "$pvid" ] && action="add"
+		if [ "$brcm_setup" = "1" ]; then
+			prefix="wds"
+		else
+			#todo
+			break;
+		fi
+
+		ts_sub "isolate" "$action" "$pvid" "$vid" "$band" "$ifname" "$prefix"
+
+	}
+	config_load mapagent
+
+
+	config_foreach parse_fh ap
+
+}
+
+set_uplink() {
+	local type=$1
+	local ifname=$2
+	local hwaddr
+
+	hwaddr="$(ifconfig $ifname | grep -i hwaddr | awk '{print $5}' | awk '{print tolower($0)}')"
+
+	json_init
+	json_add_string "type" "$type"
+	json_add_string "ifname" "$ifname"
+	json_add_string "macaddr" "$hwaddr"
+	(
+		flock -x 200
+		json_dump > "$MAPFILE"
+	) 200>/var/lock/map.backhaul.lock
+	json_cleanup
+
+	update_isolate_ebtables
+	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}
+
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
+
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
+	fi
+
+	(
+		flock -x 200
+		json_load "$(cat $MAPFILE)"
+		json_get_var bk_type type
+		json_cleanup
+
+		[ "$type" = "$bk_type" ] && rm -f "$MAPFILE" > /dev/null 2>&1
+	) 200>/var/lock/map.backhaul.lock
+}
 
 func=$1
 shift
 
 case "$func" in
-	wireless_teardown) brcm_wireless_teardown;;
-	setup_network) brcm_setup_network;;
-	setup_wireless) brcm_setup_wireless;;
-	write_credentials) brcm_write_credentials;;
-	sync_credentials) brcm_sync_credentials;;
+	wireless_teardown) wireless_teardown;;
+	setup_network) setup_network;;
+	setup_wireless) setup_wireless;;
+	write_credentials) write_credentials;;
+	sync_credentials) sync_credentials;;
 	bsta_steer) bsta_steer $@;;
-	set_network) brcm_set_network $@;;
+	set_network) set_network $@;;
 	write_bsta_config) write_bsta_config $@;;
-	teardown_iface) brcm_teardown_iface $@;;
-	bsta_to_wireless) brcm_bsta_to_wireless $@;;
+	teardown_iface) teardown_iface $@;;
+	bsta_to_wireless) bsta_to_wireless $@;;
 	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
 	ts) ts_sub $@;;
 	bsta_enable_all) bsta_enable_all $@;;
+	bsta_clear_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 $@;;
 	bsta_swap_to_link) bsta_swap_to_link $@;;
+	set_uplink) set_uplink $@;;
+	set_uplink_backhaul_info) set_uplink_backhaul_info $@;;
+	unset_uplink) unset_uplink $@;;
 	--help|help) usage;;
 	*) usage; exit 1;;
 esac

map-agent/files/lib/wifi/traffic_separation

@@ -2,379 +2,540 @@
 
 . /lib/functions.sh
 
+AL_BRIDGE=${AL_BRIDGE-"br-lan"}
+PRIMARY_VID=${PRIMARY_VID-1}
+MAP_BH_FILE="/tmp/multiap.backhaul"
+
 ### Traffic Separation ###
 
-ts_sub() {
+ts_dbg() {
+	logger -t traffic_separation $@
+}
 
+ts_sub() {
 	ts_usage() {
 		cat <<EOF
-Usage: $0 [create|delete|populate]
+Usage: $0 [create|reload]
 Traffic Separation related functions.
-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)
-     
+create vid - create vlan configuration with vlan_id
+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
+	_dhcp_cleanup() {
+		vid=$1
+
+		[ -n "$(uci -q get dhcp.guest${vid})" ] && {
+			uci -q delete dhcp.guest${vid}
+			uci commit dhcp
+			/etc/init.d/dnsmasq reload
+		}
+	}
+
+	_firewall_cleanup() {
+		vid=$1
+
+		guest_teardown() {
+				local section=$1
+				local config=$2
+				local val=$3
+				local option=$4
+
+				config_get name "$section" "$option"
+
+				[ "$val" != "$name" ] && continue
+
+				uci delete ${config}.${section}
+				uci commit ${config}
+			}
+
+			[ -n "$(uci -q get firewall.guest${vid}_dns)" ] && {
+				uci -q delete firewall.guest${vid}_dns
+				uci commit firewall
+			}
+
+			[ -n "$(uci -q get firewall.guest${vid}_dhcp)" ] && {
+				uci -q delete firewall.guest${vid}_dhcp
+				uci commit firewall
+			}
+
+			[ -n "$(uci -q get firewall.guest${vid}_ping)" ] && {
+				uci -q delete firewall.guest${vid}_ping
+				uci commit firewall
+			}
+
+			config_load firewall
+			config_foreach guest_teardown forwarding "firewall" guest${vid} "src" #delete firewall section with name = guest${vid}
+			config_load firewall
+			config_foreach guest_teardown zone "firewall" guest${vid} "name" #delete firewall section with name = guest${vid}
+	}
+
+	_network_cleanup() {
+		vid=$1
+
+		[ -n "$(uci -q get network.vlan${vid})" ] && {
+			uci -q delete network.vlan${vid}
+			uci commit network
+		}
+
+		[ -n "$(uci -q get network.guest${vid})" ] && {
+			uci -q delete network.guest${vid}
+			uci commit network
+		}
+
+		[ -n "$(uci -q get network.guest${vid}_8021q)" ] && {
+			uci -q delete network.guest${vid}_8021q
+			uci commit network
+		}
+	}
+
+	_guest_cleanup() {
+		vid=$1
+		_dhcp_cleanup $vid
+		_firewall_cleanup $vid
+		_network_cleanup $vid
 	}
 
 	ts_create() {
+		_dhcp_setup() {
+			local name=$1
 
-		_create_vlan_dev() {
-			iface=$1				# real iface
-			vid=$2					# Vlan ID
-			bridge="$(_get_bridge $iface)"		# bridge iface is connected to
-			vlan_dev=${iface}_vlan${vid}		# name of vlan device to create
+			[ -n "$(uci -q get dhcp.${name})" ] && return
 
-			# remove interface from bridge if it is in one
-			[ -n "$bridge" ] && brctl delif $bridge $iface &> /dev/null
+			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"
 
-			# create vlan device
-			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
-			[ -n "$bridge" ] && brctl addif $bridge $vlan_dev &> /dev/null
-			ip link set dev $vlan_dev up
-
-			echo $vlan_dev
+			uci -q commit dhcp
 		}
 
-		ts_create_fh() {
-			iface=$1				# fh iface
-			vid=$2					# SSID specific (secondary) or primary vid
 
-			[ -n "$iface" ] && [ -n "$vid" ] || {
-				cat <<EOF
-Adding FH device requires IFACE and VID.
-EOF
-				exit 1
+		_firewall_setup() {
+			local name=$1
+			local network=$1
+			local vid=$2
+			local exists=0
+			local diff=0
+			local subnet=$(($vid % 256))
+			local ipaddr="192.168.${subnet}.1"
+
+			config_load firewall
+
+			_process_zone() {
+				local section=$1
+				local new_name=$2
+				local val=$3
+				local name
+
+				config_get name $section $val
+
+				[ "$name" == "$new_name" ] && exists=1
 			}
 
-			# create vlan device
-			vlan_dev=$(_create_vlan_dev $iface $vid)
+			config_foreach _process_zone zone $name "name"
+			[ "$exists" == "0" ] && {
+				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='DROP'
+				uci -q set firewall.@zone[-1].output='ACCEPT'
+				uci -q set firewall.@zone[-1].forward='DROP'
+				diff=1
+			}
 
-			# 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
+			exists=0
+			config_foreach _process_zone forwarding $name "src"
+			[ "$exists" == "0" ] && {
+				uci -q add firewall forwarding
+				uci -q set firewall.@forwarding[-1].src="$name"
+				uci -q set firewall.@forwarding[-1].dest="wan"
+				diff=1
+			}
+
+			[ -z "$(uci -q get firewall.${name}_dns)" ] && {
+				uci set firewall.${name}_dns=rule
+				uci set firewall.${name}_dns.name="Allow-DNS-${name}"
+				uci set firewall.${name}_dns.src="${name}"
+				uci set firewall.${name}_dns.dest_port="53"
+				uci set firewall.${name}_dns.proto="tcp udp"
+				uci set firewall.${name}_dns.target="ACCEPT"
+				diff=1
+			}
+
+			[ -z "$(uci -q get firewall.${name}_dhcp)" ] && {
+				uci set firewall.${name}_dhcp=rule
+				uci set firewall.${name}_dhcp.name="Allow-DHCP-${name}"
+				uci set firewall.${name}_dhcp.src="${name}"
+				uci set firewall.${name}_dhcp.src_port="68"
+				uci set firewall.${name}_dhcp.dest_port="67"
+				uci set firewall.${name}_dhcp.proto="udp"
+				uci set firewall.${name}_dhcp.family="ipv4"
+				uci set firewall.${name}_dhcp.target="ACCEPT"
+				diff=1
+			}
+
+			[ -z "$(uci -q get firewall.${name}_ping)" ] && {
+				uci set firewall.${name}_ping=rule
+				uci set firewall.${name}_ping.name="Allow-Ping-${name}"
+				uci set firewall.${name}_ping.src="${name}"
+				uci set firewall.${name}_ping.dest_ip="${ipaddr}"
+				uci set firewall.${name}_ping.proto="icmp"
+				uci set firewall.${name}_ping.icmp_type="echo-request"
+				uci set firewall.${name}_ping.family="ipv4"
+				uci set firewall.${name}_ping.target="ACCEPT"
+				diff=1
+			}
+
+			[ $diff -eq 1 ] && uci -q commit firewall
 		}
 
-# 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)
+		_net_setup() {
+			net_check_for_vlan() {
+				local section=$1
+				local vid=$2
 
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
-				cat <<EOF
-Adding BH device requires IFACE, VID and PROFILE (1 or 2).
-EOF
-				exit 1
-			}
+				config_get vlan "$section" vlan
 
-			# create vlan device
-			vlan_dev=$(_create_vlan_dev $iface $vid)
-
-			# 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
-		}
-
-		ts_create_bh_drv() {
-			iface=$1				# bh iface
-			vid=$2					# primary vid
-			profile=$3				# agent profile (1 or 2)
-
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
-				cat <<EOF
-Adding BH device requires IFACE, VID and PROFILE (1 or 2).
-EOF
-				exit 1
-			}
-
-			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
-		}
-
-		ts_create_eth() {
-
-			_ts_setup() {
-				vlan_bridge=$1
-				lan_bridge=$2
-				vlan_dev=$3
-				lan_dev=${vlan_dev}_lan
-
-				ip link show $vlan_dev &> /dev/null || ip link add $vlan_dev type veth peer name $lan_dev
-				brctl addif $vlan_bridge $vlan_dev &> /dev/null
-				brctl addif $lan_bridge $lan_dev &> /dev/null
-				ip link set $vlan_dev up
-				ip link set $lan_dev up
-			}
-
-			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 "$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
-			}
-
-			# create virtual eth device between bridges (if it doesn't exist))
-			_ts_setup $vlan_bridge $lan_bridge $iface
-
-			# create vlan device
-			vlan_dev=$(_create_vlan_dev $iface $vid)
-
-			# TODO: how to disable returning traffic back to incoming interface?
-
-			# add rules
-			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --set-pbits $pbits 0 --rule-append
-			vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --pop-tag --rule-append
-		}
-
-		ts_create_dhcp() {
-			_br_setup() {
-				local name=$1
-				local sinkname=$2
-				local vid=$3
-				local diff=""
-
-				[ -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"
+				[ "$vid" = "$vlan" ] && {
+					echo "1"
+					break
 				}
+			}
 
-				[ -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"
+			net_check_for_network() {
+				local section=$1
+				local vid=$2
 
-					diff="1"
+				config_get device "$section" device
+
+				[ "${AL_BRIDGE}.$vid" = "$device" ] && {
+					echo "1"
+					break
 				}
+			}
 
-				[ "$diff" = "1" ] && {
+			net_set_primary() {
+				local section=$1
+				local pvid=$2
+
+				config_get device "$section" device
+
+				[ "${AL_BRIDGE}" = "$device" ] && {
+					uci -q set network.${section}.device="${AL_BRIDGE}.${pvid}"
 					uci -q commit network
-					ubus call network reload
-					ubus -t 5 wait_for network.device
+					diff="1"
+					break;
 				}
 			}
+			local vid=$1
+			diff=""
 
-			_dhcp_setup() {
-				local name=$1
+			config_load network
 
-				[ -n "$(uci -q get dhcp.${name})" ] && return
+			#[ -x "/usr/sbin/mapcontroller" ] && config_foreach net_set_primary interface $PRIMARY_VID
 
-				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"
+			exists=$(config_foreach net_check_for_vlan bridge-vlan $vid)
+			[ -z "$exists" ] && {
+				local name="vlan${vid}"
+				local br_dev="${AL_BRIDGE/-/_}"
+				local tag=":t"
+				local self_flags="untagged"
 
-				uci -q commit dhcp
-				ubus call uci commit '{"config":"dhcp"}'
+				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"
+
+				[ "${vid}" = "${PRIMARY_VID}" ] && {
+#					self_flags="untagged pvid"
+					uci -q set network.${name}.flags="untagged pvid"
+					tag=":*"
+				}
+
+#				uci -q set network.${name}.flags="${self_flags}"
+				uci -q set network.${name}.local='1'
+
+				for port in $(uci -q get network.${br_dev}.ports) ; do
+					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
+				diff="1"
 			}
 
-			_wan_setup() {
-				local name=$1
-
-				config_load firewall
-
-				_process_zone() {
+			exists=$(config_foreach net_check_for_network interface $vid)
+			[ -z "$exists" -a "$PRIMARY_VID" != "$vid" -a -x "/usr/sbin/mapcontroller" ] && {
+				net_get_albridge_ip() {
 					local section=$1
-					local sink=$2
-					local name
-					local exists=false
 
-					config_get name $section name
+					config_get device "$section" device
 
-					[ "$name" == "lan" ] || return
-
-					_process_list() {
-						local value=$1
-
-						[ "$value" == "$sink" ] && exists=true && return 1
+					[ "${AL_BRIDGE}" = "$device" -o "${AL_BRIDGE}.${PRIMARY_VID}" = "$device" ] && {
+						ipaddr="$(uci -q get network.${section}.ipaddr)"
+						netmask="$(uci -q get network.${section}.netmask)"
+						break;
 					}
-
-					config_list_foreach "$section" network _process_list 
-
-					[ $exists = false ] && {
-						uci -q add_list firewall.${section}.network="${sink}"
-						uci -q commit firewall
-						ubus call uci commit '{"config":"firewall"}'
-					}
-
-					return 1
 				}
+				local name="guest${vid}"
+				local br_dev="${AL_BRIDGE/-/_}"
+				local tag=":t"
+				local self_flags="untagged"
+				local subnet=$(($vid % 256))
+				netmask="255.255.255.0"
+				ipaddr="192.168.1.1"
 
-				config_foreach _process_zone zone $name
+				config_load network
+
+				config_foreach net_get_albridge_ip interface $PRIMARY_VID
+
+				# replace third octet of the ip with $subnet
+				ipaddr=$(echo $ipaddr | sed "s/\(\([0-9]\{1,3\}\.\)\{2\}\)[0-9]\{1,3\}/\1${subnet}/")
+
+				uci -q set network.${name}="interface"
+				uci -q set network.${name}.device="${AL_BRIDGE}.$vid"
+				uci -q set network.${name}.ipaddr="$ipaddr"
+				uci -q set network.${name}.netmask="$netmask"
+				uci -q set network.${name}.proto="static"
+
+				uci -q commit network
+				diff="1"
 			}
 
-			vid=$1					# primary vid
-
-			[ -n "$vid" ] || {
-				cat <<EOF
-VID required to configure DHCP.
-EOF
-				exit 1
+			[ -z "$(uci -q get network.guest${vid}_8021q)" -a $PRIMARY_VID != $vid ] && {
+				uci -q set network.guest${vid}_8021q="device"
+				uci -q set network.guest${vid}_8021q.ifname="${AL_BRIDGE}"
+				uci -q set network.guest${vid}_8021q.name="${AL_BRIDGE}.$vid"
+				uci -q set network.guest${vid}_8021q.type="8021q"
+				uci -q set network.guest${vid}_8021q.vid="$vid"
+				uci -q set network.guest${vid}_8021q.native="1"
 			}
-
-			br_dev=sink_vlan${vid}			# name of vlan device to create
-
-
-			ip l a sink1_vlan${vid} type veth peer name sink2_vlan${vid}
-			vlanctl --mcast --if-create-name sink2_vlan${vid} sink3_vlan${vid} --if sink2_vlan${vid} --set-if-mode-rg
-			vlanctl --if sink2_vlan${vid} --rx --tags 1 --filter-vid ${vid} 0 --set-rxif sink3_vlan${vid} --pop-tag --rule-append
-			vlanctl --if sink2_vlan${vid} --tx --tags 0 --filter-txif sink3_vlan${vid} --push-tag --set-vid ${vid} 0 --rule-append
-			ip l s sink1_vlan${vid} up
-			ip l s sink2_vlan${vid} up
-			ip l s sink3_vlan${vid} up
-
-			_br_setup $br_dev sink3_vlan${vid} $vid
-			_dhcp_setup $br_dev
-			_wan_setup $br_dev
 		}
 
-	local type=$1
-	shift
+		vid=$1
 
-	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)"
-
-		vlanctl --if-delete $vlan_dev		# note: also removes rules and removes from bridge
-
-		brctl addif $bridge $iface &> /dev/null
-	}
-
-	ts_populate() {
-		local type=$1
-		shift
-
-		[ "$type" == "eth" ] || {
+		[ -n "$vid" ] || {
 			cat <<EOF
-Populating ETH rules requires IFACE and VID.
+VID required to configure.
 EOF
 			exit 1
 		}
 
-		iface=$1				# Multi-AP Logical Ethernet Interface
-		vid=$2					# secondary vid
+                logger -t vlan "setup ts vid $vid"
+                _net_setup ${vid}
 
-		path=$(ls -d /sys/class/net/${iface}/upper_*)
-		[ -z "$path" ] && exit 1
-		vlan_dev=${path##*upper_}
+		[ -x "/usr/sbin/mapcontroller" -a "$PRIMARY_VID" != "$vid" ] && {
+			_dhcp_setup guest${vid}
+			_firewall_setup guest${vid} $vid
+		}
 
-		# 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
+	ts_reload() {
+		# TODO check it again
+		local dhcp_reload=$1
+		restart=""
+
+		bridge_verify_vid_mapping() {
+			local section=$1
+
+			check_port_vid() {
+				local port="$1"
+				local vlan="$2"
+
+				added=$(bridge vlan show dev $port | grep -w "$vlan")
+				if [ "$added" = "" ]; then
+					restart="1"
+					break
+				fi
+			}
+
+			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
+
+
+		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
+		if [ "$restart" = "1" ]; then
+			ts_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)
+		restart=""
+
+		[ "$al_bridge" = "" ] && al_bridge="br-lan"
+
+		bridge_vlan_teardown() {
+			local section=$1
+			shift
+			local bridge=$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
+
+			restart="1"
+			_guest_cleanup $vlan
+		}
+
+		config_load network
+		config_foreach bridge_vlan_teardown bridge-vlan $al_bridge $@
+
+		if [ "$restart" = "1" ]; then
+			uci commit network
+			ts_dbg "trigger network restart"
+			/etc/init.d/network restart
+		fi
+	}
+
+	ts_cleanup() {
+		guest_teardown() {
+			local section=$1
+			local config=$2
+			local val=$3
+			local option=$4
+
+			config_get name "$section" "$option"
+
+			[ "$val" != "$name" ] && continue
+
+			uci delete ${config}.${section}
+			uci commit ${config}
+			restart="1"
+		}
+		local vid=$1
+		restart=""
+
+		_guest_cleanup $vid
+
+		# 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() {
+		ts_isolate_radio() {
+			local section=$1
+			local action=$2
+			local band=$3
+			local vid=$4
+			local ifname=$5
+
+			config_get apband "$section" band
+			[ "$band" = "$apband" ] && continue
+
+			config_get apvid "$section" vid
+			[ "$vid" != "$apvid" ] && continue
+
+			config_get apifname "$section" ifname
+			[ "$ifname" = "$apifname" ] && continue # this should never happen
+
+			ebtables -D FORWARD -i $ifname --o $apifname -j DROP > /dev/null 2>&1
+
+			[ "$action" != "add" ] && continue
+
+			ebtables -A FORWARD -i $ifname --o $apifname -j DROP > /dev/null 2>&1
+		}
+		local action=$1
 		shift
+		local pvid=$1 # pvid
+		shift
+		local vid=$1 # vid
+		shift
+		local band=$1 # band
+		shift
+		local ifname=$1 # guest fbss name
+		shift
+		local ifprefix=$1 # 4addr mode ifname prefix
+		local br_dev="${AL_BRIDGE/-/_}"
 
-		case "$func" in
-			get) vid=$(wl -i $1 map_8021q_settings); echo ${vid##* };;
-			*) ts_usage; exit 1;;
-		esac
-	}
+		[ -z "$pvid" -o -z "$ifprefix" -o -z "$ifname" ] && return
 
-	ts_unicast() {
-		local mac=$1
-		local iface=$2
+		config_load mapagent
+		config_foreach ts_isolate_radio ap $action $band $vid $ifname
 
-		# TODO: improve?
-		res=$(ebtables -t broute -L | grep -i "$mac" | grep "$iface")
-		[ -n "$res" ] && return
+		# must not drop traffic to upstream
+		json_load "$(cat $MAP_BH_FILE)"
+		json_get_var bk_ifname ifname
+		json_cleanup
 
-		ebtables -t broute -D BROUTING -d "$mac" -p 0x893a -j DROP
-		ebtables -t broute -I BROUTING -i "$iface" -d "$mac" -p 0x893a -j DROP
-	}
+		for prefix in $@; do
+			ebtables -D FORWARD -i $ifname --o ${prefix}+ -j DROP > /dev/null 2>&1
+			ebtables -D FORWARD -i ${prefix}+ --o $ifname -j DROP > /dev/null 2>&1
 
-	ts_multicast() {
-		local iface=$1
+			# isolate eth interfaces
+			for port in $(uci -q get network.${br_dev}.ports) ; do
+					ebtables -D FORWARD -i $ifname --o $port -j DROP > /dev/null 2>&1
+					ebtables -D FORWARD -i $port --o $ifname -j DROP  > /dev/null 2>&1
 
-		# TODO: improve?
-		res=$(ebtables -t broute -L | grep -i "1:80:C2:00:00:13" | grep "$iface")
-		[ -n "$res" ] && return
+					[ "$action" != "add" -o "$port" = "$bk_ifname" ] && continue
+					ebtables -A FORWARD -i $ifname --o $port -j DROP > /dev/null 2>&1
+					ebtables -A FORWARD -i $port --o $ifname -j DROP > /dev/null 2>&1
+			done
 
-		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
+			[ "$action" != "add" ] && continue
+			ebtables -A FORWARD -i $ifname --o ${prefix}+ -j DROP > /dev/null 2>&1
+			ebtables -A FORWARD -i ${prefix}+ --o $ifname -j DROP > /dev/null 2>&1
+		done
 	}
 
 	local func=$1
 	shift
 
 	case "$func" in
-		create) ts_create $@;;
-		delete) ts_delete $@;;
-		populate) ts_populate $@;;
-		primary) ts_primary $@;;
-		unicast) ts_unicast $@;;
-		multicast) ts_multicast $@;;
+		create) ts_dbg "create $@"; ts_create $@;;
+		keep) ts_dbg "keep $@"; ts_keep $@;;
+		reload) ts_dbg "reload $@"; ts_reload $@;;
+		cleanup) ts_dbg "cleanup $@"; ts_cleanup $@;;
+		isolate) ts_dbg "isolate $@"; ts_isolate $@;;
 		--help|help) ts_usage;;
 		*) ts_usage; exit 1;;
 	esac

map-controller/Config.in

@@ -0,0 +1,26 @@
+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,24 +1,24 @@
 #
-# Copyright (C) 2020 IOPSYS Software Solutions AB
+# Copyright (C) 2020-22 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=5.1.1
+PKG_VERSION:=2.8.0.25
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=234cff05ee7987f50e3d5e76d920f59f9c680212
-
-PKG_LICENSE:=PROPRIETARY IOPSYS
-PKG_LICENSE_FILES:=LICENSE
+PKG_SOURCE_VERSION:=209ffb0bb4932e29e3d4d05f515b71985491abce
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-controller
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
+endif
 
-
-PKG_BUILD_DEPENDS:=map-plugin
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -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,11 +44,28 @@ 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)
+define Build/Prepare
+        rsync -r --exclude=.* ~/git/map-controller/ $(PKG_BUILD_DIR)/
+endef
+endif
+
 $(eval $(call BuildPackage,map-controller))

map-controller/files/etc/config/mapcontroller

@@ -1,67 +1,144 @@
 config controller 'controller'
 	option enabled '1'
-	option registrar '5 2'	    #bands on which wps registrar supported
-	option debug '6'
+	option registrar '2 5'
+	option debug '0'
 	option enable_sta_steer '0'
 	option enable_bsta_steer '0'
+	option use_bcn_metrics '0'
+	option use_usta_metrics '0'
 	option primary_vid '1'
 	option primary_pcp '0'
-
-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 network 'lan'
+	option enable_ts '0'
+	option allow_bgdfs '0'
+	option channel_plan '0'
 
 config ap
 	option band '2'
 	option encryption 'sae-mixed'
-	option key '1234567890'
-	option ssid 'map-net2'
 	option vid '1'
-	option type 'fronthaul'
-	option network 'lan'
+	option ssid 'IOWRT-2.4GHz'
+	option encryption 'sae-mixed'
+	option key '1234567890'
 
 config ap
 	option band '5'
-	option encryption 'sae'
-	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 type 'fronthaul'
 	option vid '1'
-	option network 'lan'
+	option ssid 'IOWRT-5GHz'
+	option encryption 'sae-mixed'
+	option key '1234567890'
 
 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'
+	option vid '1'
+	list disallow_bsta '0'
+	option ssid 'MAP-BH-2.4GHz'
+	option encryption 'sae'
+	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
 
-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
+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'
+
+# 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 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'

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

@@ -5,6 +5,8 @@ STOP=20
 
 USE_PROCD=1
 
+IS_CFG_VALID=1
+
 handle_controller_select() {
 	local section="$1"
 
@@ -12,10 +14,132 @@ 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' \
+		'rcpi_threshold_2g:range(0,220)' \
+		'rcpi_threshold_5g:range(0,220)' \
+		'report_rcpi_threshold_2g:range(0,220)' \
+		'report_rcpi_threshold_5g:range(0,220)'
+
+	[ "$?" -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",
+				"none", "psk-mixed", "psk-mixed+aes",
+				"wpa", "wpa+aes", "wpa2", "wpa2+aes",
+				"psk", "psk+aes")' \
+			'key:string' \
+			'vid:range(1,65535):1' \
+			'type:or("backhaul", "fronthaul", "combined")' \
+			'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

@@ -0,0 +1,26 @@
+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.
+
+config TOPOLOGYD_ACTIVE_CONN_LIBCONNTRACK
+	bool "Support active connection fetch using netlink"
+	default n
+
+endmenu
+endif

map-topology/Makefile

@@ -1,36 +1,45 @@
 #
-# Copyright (C) 2020 iopsys
+# Copyright (C) 2020-22 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=3.0.4
+PKG_VERSION:=2.5.0.18
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=5763d405ed896140f5ca5ed9073b98d4bb728b14
+PKG_SOURCE_VERSION:=be7e37f2c85f3142af827a0279d2eec7088d796a
 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_LICENSE:=PROPRIETARY IOPSYS
+PKG_BUILD_DEPENDS:=ieee1905
+
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/map-topology
 	CATEGORY:=Utilities
 	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy \
-		+libieee1905 +map-plugin +libavahi-nodbus-support
+		 +libavahi-nodbus-support +libnetfilter-conntrack +libnfnetlink +libmnl
 	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 \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
+	-D_GNU_SOURCE
 
 define Package/map-topology/description
 	Constructs network topology and show it as json structure over UBUS
@@ -38,6 +47,15 @@ endef
 
 MAKE_PATH:=src
 
+ifeq ($(CONFIG_TOPOLOGYD_ACTIVE_CONN_LIBCONNTRACK),y)
+TARGET_CFLAGS += -DACTIVE_CONN_LIBCONNTRACK
+endif
+
+ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)\\\"
+endif
+
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/map-topology/* $(PKG_BUILD_DIR)/

map-topology/files/etc/config/hosts

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

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

@@ -5,7 +5,76 @@ 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;
+
+	if [ -f "/proc/sys/net/netfilter/nf_conntrack_timestamp" ]; then
+		echo 1 >/proc/sys/net/netfilter/nf_conntrack_timestamp
+	fi
 	procd_open_instance
         procd_set_param command "/usr/sbin/topologyd"
 	procd_set_param respawn

mcastmngr/files/lib/mcast/broadcom.sh

@@ -59,9 +59,6 @@ mld_p_up_interfaces=""
 mld_p_down_interfaces=""
 mld_p_exceptions=""
 
-# Standard parameters need by BCM's multicast daemon
-allow_brdevice=0
-
 proxdevs=""
 ethwan="$(db -q get hw.board.ethernetWanPort)"
 
@@ -170,6 +167,36 @@ config_mcast_querier_params() {
 	echo "${protocol}-last-member-query-interval $last_mem_q_int" >> $CONFFILE
 }
 
+config_snooping_upstream_interface() {
+	local snooping_upstream_intf=""
+
+	json_load "$(devstatus $1)"
+	logger -t "mcastconf" "$(devstatus $1)"
+	itr=1
+	json_select bridge-members
+
+	# loop over the bridge and find the device on wan port
+	while json_get_var dev $itr; do
+		case "$dev" in
+			*.*)
+				port="$(echo "$dev" | cut -d'.' -f 1)"
+				if [ $port == $ethwan ]; then
+					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
+				fi
+				;;
+		esac
+		itr=$(($itr + 1))
+	done
+	json_select ..
+
+	# if none of the bridge members are on wan port, set the wan port itself
+	if [ -n "$snooping_upstream_intf" ]; then
+		echo "upstream-interface $snooping_upstream_intf" >>$CONFFILE
+	else
+		echo "upstream-interface $ethwan" >>$CONFFILE
+	fi
+}
+
 config_snooping_on_bridge() {
 	local protocol="$1"
 	local bcm_mcast_p=1
@@ -187,39 +214,6 @@ config_snooping_on_bridge() {
 	done
 }
 
-handle_bridged_proxy_interface() {
-	local p2="$1"
-	local p_enable=0
-
-	if [ "$p2" == "igmp" ]; then
-		p_enable=$igmp_p_enable
-	else
-		p_enable=$mld_p_enable
-	fi
-
-	if [ $p_enable -eq 1 -a $allow_brdevice -eq 1 ]
-	then
-		proxdevs="$proxdevs $2"
-		echo "upstream-interface $2" >>$CONFFILE
-	else
-		json_load "$(devstatus $2)"
-		itr=1
-		json_select bridge-members
-		while json_get_var dev $itr; do
-			case "$dev" in
-				*.*)
-					port="$(echo "$dev" | cut -d'.' -f 1)"
-					if [ $port == $ethwan ]; then
-						ifconfig $dev | grep RUNNING >/dev/null && proxdevs="$proxdevs $dev" && break
-					fi
-					;;
-			esac
-			itr=$(($itr + 1))
-		done
-		json_select ..
-	fi
-}
-
 config_mcast_proxy_interface() {
 	local itr
 	local p1="$1"
@@ -234,7 +228,8 @@ config_mcast_proxy_interface() {
 	for proxif in $2; do
 		case "$proxif" in
 			br-*)
-				handle_bridged_proxy_interface $p1 $proxif
+				proxdevs="$proxdevs $proxif"
+				echo "upstream-interface $proxif" >>$CONFFILE
 			;;
 			*)
 				ifconfig $proxif | grep RUNNING >/dev/null && proxdevs="$proxdevs $proxif"
@@ -246,7 +241,12 @@ config_mcast_proxy_interface() {
 		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
 	fi
 
-	[ -n "$proxdevs" ] && echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
+	# if proxdevs is empty set the wan port as mcast-interface
+	if [ -n "$proxdevs" ]; then
+		echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
+	else
+		echo "${p1}-mcast-interfaces $ethwan" >> $CONFFILE
+	fi
 }
 
 configure_mcpd_snooping() {
@@ -259,14 +259,14 @@ configure_mcpd_snooping() {
 	if [ "$protocol" == "igmp" ]; then
 		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
 		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
-		config_mcast_proxy_interface $protocol "$igmp_s_iface"
+		config_snooping_upstream_interface "$igmp_s_iface"
 		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
 		exceptions=$igmp_s_exceptions
 		fast_leave=$igmp_s_fast_leave
 	elif [ "$protocol" == "mld" ]; then
 		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
 		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
-		config_mcast_proxy_interface $protocol "$mld_s_iface"
+		config_snooping_upstream_interface "$mld_s_iface"
 		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
 		exceptions=$mld_s_exceptions
 		fast_leave=$mld_s_fast_leave
@@ -458,7 +458,7 @@ read_mcast_stats() {
 		case $line in
 		br-*)
 			found_ip=0
-			grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
+			grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
 			if [ -z "$mcast_addrs" ]; then
 				mcast_addrs="$grp_ip"
 				continue
@@ -510,7 +510,7 @@ read_mcast_stats() {
 					if [ "$snoop_iface" != "$intf" ]; then
 						continue
 					fi
-					grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
+					grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
 					if [ "$grp_ip" != "$gip_addr" ]; then
 						continue
 					fi
@@ -523,12 +523,12 @@ read_mcast_stats() {
 					fi
 
 					json_add_object ""
-					host_ip="$(echo $line | awk -F ' ' '{ print $13 }')"
+					host_ip="$(echo $line | awk -F ' ' '{ print $14 }')"
 					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
 					json_add_string "ipaddr" "$h_ip"
 					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
 					json_add_string "device" "$src_port"
-					timeout="$(echo $line | awk -F ' ' '{ print $14 }')"
+					timeout="$(echo $line | awk -F ' ' '{ print $15 }')"
 					json_add_int "timeout" "$timeout"
 					json_close_object #close the associated device object
 					;;

mosquitto-auth-shadow/Makefile

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

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

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

mosquitto-auth-shadow/src/Makefile

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

mosquitto-auth-shadow/src/mosquitto_auth_shadow.c

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

mqtt-ciotc/Makefile

@@ -1,40 +0,0 @@
-#
-# Copyright (C) 2020 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=mqtt-ciotc
-PKG_VERSION:=0.1
-
-PKG_SOURCE_VERSION:=00da3fb1f1691d836037dc4d93e38d0835ba46a4
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifilife-testbed.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=Apache-2.0
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mqtt-ciotc
-	CATEGORY:=Utilities
-	DEPENDS:=+libjwt +lib-paho-mqtt +libopenssl +libubox +ubus +libblobmsg-json
-	TITLE:=mqtt google iot clinet
-endef
-
-define Package/mqtt-ciotc/description
-	mqtt google iot client
-endef
-
-define Package/mqtt-ciotc/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mqtt_ciotc $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,mqtt-ciotc))

mqtt-ciotc/files/etc/config/mqtt_ciotc

@@ -1,3 +0,0 @@
-config certs 'certs'
-	option private '/etc/mqtt-ciotc/rsa_private.pem'
-	option root '/etc/mqtt-ciotc/roots.pem'

mqtt-ciotc/files/etc/init.d/mqtt_ciotc

@@ -1,35 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=96
-STOP=10
-PROG=/sbin/mqtt_ciotc
-
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-	procd_set_param command ${PROG}
-	config_load mqtt_ciotc
-	config_get private certs private
-	config_get root certs root
-
-	[ -n $private ] && procd_append_param command --private-cert $private
-	[ -n $root ] && procd_append_param command --root-cert $root
-	procd_set_param respawn
-	procd_close_instance
-}
-
-stop_service()
-{
-	service_stop ${PROG}
-}
-
-reload_service() {
-#	procd_send_signal wifilife # use SIGHUP
-	stop
-	start
-}
-
-service_triggers() {
-        procd_add_reload_trigger "mqtt_ciotc"
-}

netmode/Makefile

@@ -8,35 +8,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=0.2.0
-
-PKG_SOURCE_VERSION:=5c8abbdf86e4651c7c6f14f784cfb52e69979f96
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
+PKG_VERSION:=0.3.0
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0-only
 include $(INCLUDE_DIR)/package.mk
 
 define Package/netmode
-	CATEGORY:=Base system
-	DEPENDS:=+fping +ubus +libubox +libuci
-	TITLE:=Predefined Network Modes
+  CATEGORY:=Utilities
+  TITLE:=Network Modes and Utils
 endef
 
 define Package/netmode/description
-	Predefined Network Modes
+	Network Modes and Utils
+endef
+
+define Build/Compile
 endef
 
 define Package/netmode/install
 	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netmoded $(1)/sbin/
 endef
 
 $(eval $(call BuildPackage,netmode))

netmode/files/etc/config/netmode

@@ -1,8 +1,10 @@
-config netmoded 'netmoded'
-	option enabled '0'
-
-config setup 'setup'
-	option enabled '0'
-        option dir '/etc/netmodes'
+config netmode global
+	option enabled 0
 #	option mode 'router'
 
+#config testnet testnet
+#	option enabled 1
+#	option destination '8.8.8.8'
+	
+#config shiftrange shiftrange
+#	option enabled 1

netmode/files/etc/hotplug.d/iface/05-testnet

@@ -1,16 +1,16 @@
 #!/bin/sh
 
+# do not start testnet if the feature is explicitly disabled
+[ "$(uci -q get netmode.testnet.enabled)" = "0" ] && exit 0
+
 [ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 0
 
 interface_check() {
-	local islan="$(uci -q get network.$INTERFACE.is_lan)"
-	[ "$islan" == "1" ] && exit 0
+	[ "$(uci -q get network.$INTERFACE.is_lan)" = "1" ] && exit 0
 
-	local proto="$(uci -q get network.$INTERFACE.proto)"
-	[ "$proto" == "none" ] && exit 0
+	[ "$(uci -q get network.$INTERFACE.proto)" = "none" ] && exit 0
 
-	local defroute="$(uci -q get network.$INTERFACE.defaultroute)"
-	[ "$defroute" == "0" ] && exit 0
+	[ "$(uci -q get network.$INTERFACE.defaultroute)" = "0" ] && exit 0
 }
 
 interface_check
@@ -19,4 +19,3 @@ if [ -n "$(pgrep -f testnet)" ]; then
 else
 	testnet &
 fi
-

netmode/files/etc/hotplug.d/iface/70-shiftrange

@@ -2,6 +2,9 @@
 # this scripts shifts the lan network prefixes
 # if a wan interface has the same network prefix.
 
+# do not shift range if the feature is explicitly disabled
+[ "$(uci -q get netmode.shiftrange.enabled)" == "0" ] && exit 0
+
 . /lib/functions.sh
 . /lib/functions/network.sh
 

netmode/files/etc/init.d/netmode

@@ -3,44 +3,72 @@
 START=10
 USE_PROCD=1
 
-NETMODED="/sbin/netmoded"
-
 . /lib/functions.sh
-. /lib/functions/netmode.sh
 
-start_netmoded() {
-	config_load netmode
+MODEDIR="/etc/netmodes"
 
-        config_get enabled netmoded enabled 0
-        if [ "$enabled" != "1" ]; then
-		return
+libnetmode_exec() {
+	when="$1"
+	# Execute /lib/netmode scripts
+	if [ -d /lib/netmode/$when ]; then
+		logger -s -p user.info -t "netmode" "Executing /lib/netmode/$when scripts"
+		for script in $(ls /lib/netmode/$when/); do
+			sh /lib/netmode/$when/$script
+		done
 	fi
-
-	procd_open_instance
-	procd_set_param command $NETMODED
-
-	procd_append_param command --verbose warning -i macaddr
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-
-	procd_set_param respawn
-	procd_close_instance
 }
 
 start_service() {
-	populate_netmodes
+	[ -f /etc/config/netmode ] || return
 
-	start_netmoded
-}
+	config_load netmode
 
-reload_service() {
-        switch_netmode
+	config_get_bool enabled global enabled '0'
+	[ $enabled -eq 0 ] && return
 
-	start_netmoded
+	# Get the desired netmode from config
+	config_get mode global mode
+	# Check if netmode is set as boot environment parameter
+	[ -n "$mode" ] || mode="$(fw_printenv -n netmode 2>/dev/null)"
+	# Return if mode is not set
+	[ -n "$mode" ] || return
+
+	# Get the last saved mode
+	lastmode="$(cat $MODEDIR/.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
+
+	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
+
+	# Execute netmode generic pre-mode-switch scripts
+	libnetmode_exec "pre"
+
+	# Copy netmode UCI config files
+	if [ -d $MODEDIR/$mode/uci ]; then
+		logger -s -p user.info -t "netmode" "Copying $MODEDIR/$mode/uci/* to /etc/config/"
+		cp $MODEDIR/$mode/uci/* /etc/config/ 2>/dev/null
+	fi
+
+	# Execute netmode generic scripts
+	libnetmode_exec
+
+	# Execute mode specific scripts
+	if [ -d $MODEDIR/$mode/scripts ]; then
+		logger -s -p user.info -t "netmode" "Executing $MODEDIR/$mode/scripts/* scripts"
+		for script in $(ls $MODEDIR/$mode/scripts/); do
+			sh $MODEDIR/$mode/scripts/$script
+		done
+	fi
+
+	# Execute netmode generic post-mode-switch scripts
+	libnetmode_exec "post"
 }
 
 service_triggers()
 {
 	procd_add_reload_trigger netmode
 }
-

netmode/files/etc/netmodes/bridge/DETAILS

@@ -1,9 +0,0 @@
-{
-	"description": [
-		{ "en" : "Bridge Mode" }
-	],
-	"explanation": [
-		{ "en" : "NAT is disabled." }
-	],
-	"reboot" : 0
-}

netmode/files/etc/netmodes/bridge/scripts/pre/bridge_mode.sh

@@ -1,92 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions.sh
-
-BRIDGEPORTS=""
-
-get_vlan() {
-	local device="$1"
-	for section in $(uci show network | grep "=device" | cut -d '=' -f1); do
-		if [ "$(uci -q get $section.ifname)" == "$device" ]; then
-			uci -q get $section.name
-			break
-		fi
-	done
-}
-
-add_wifi_devs()
-{
-
-	add_wdev()
-	{
-		local cfg=$1
-#		local disabled
-
-#		config_get_bool disabled $cfg disabled 0
-#		config_get_bool ifname $cfg ifname
-	
-#		if [ $disabled -eq 0 -a -n "$ifname" ]; then
-#			BRIDGEPORTS="$ifname"
-#		fi
-
-		uci -q set wireless.$cfg.network="wan"
-	}
-
-	config_load wireless
-	config_foreach add_wdev "wifi-iface"
-
-	uci -q commit wireless
-}
-
-add_xtm_devs() {
-	local section device vlan
-
-	for section in $(uci show dsl | grep "=.*tm-device" | cut -d'=' -f1); do
-		if [ -n "$(uci -q get $section.device)" ]; then
-
-			vlan="$(get_vlan $device)"
-			[ -n "$vlan" ] && device="$vlan"
-		
-			if [ -n "$device" ]; then
-				BRIDGEPORTS="$BRIDGEPORTS $device"
-			fi
-
-		fi
-	done
-}
-
-add_eth_ports() {
-
-	add_port()
-	{
-		local cfg=$1
-		local ifname vlan
-
-		config_get ifname $cfg ifname
-
-		vlan="$(get_vlan $ifname)"
-		[ -n "$vlan" ] && ifname="$vlan"
-	
-		if [ -n "$ifname" ]; then
-			BRIDGEPORTS="$BRIDGEPORTS $ifname"
-		fi
-	}
-
-	config_load ports
-	config_foreach add_port "ethport"
-}
-
-add_xtm_devs
-add_eth_ports
-add_wifi_devs
-
-BRIDGEPORTS="$(echo $BRIDGEPORTS | sed -e 's/[[:space:]]*$//')"
-
-uci -q set network.wan.type="bridge"
-uci -q set network.wan.ifname="$BRIDGEPORTS"
-uci -q set network.wan6.ifname="@wan"
-uci -q delete network.lan.ifname
-
-ubus call uci commit '{"config":"network"}'
-

netmode/files/etc/netmodes/router/DETAILS

@@ -1,9 +0,0 @@
-{
-	"description": [
-		{ "en" : "Router Mode" }
-	],
-	"explanation": [
-		{ "en" : "NAT is enabled." }
-	],
-	"reboot" : 0
-}

netmode/files/etc/netmodes/router/scripts/pre/router_mode.sh

@@ -1,94 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions.sh
-
-WANPORTS=""
-LANPORTS=""
-
-get_vlan() {
-	local device="$1"
-	for section in $(uci show network | grep "=device" | cut -d '=' -f1); do
-		if [ "$(uci -q get $section.ifname)" == "$device" ]; then
-			uci -q get $section.name
-			break
-		fi
-	done
-}
-
-add_wifi_devs()
-{
-
-	add_wdev()
-	{
-		local cfg=$1
-
-		config_get mode $cfg mode "ap"
-
-		if [ "$mode" == "ap" ]; then
-			uci -q set wireless.$cfg.network="lan"
-		fi
-	}
-
-	config_load wireless
-	config_foreach add_wdev "wifi-iface"
-
-	uci -q commit wireless
-}
-
-add_xtm_devs() {
-	local section device vlan
-
-	for section in $(uci show dsl | grep "=.*tm-device" | cut -d'=' -f1); do
-		device="$(uci -q get $section.device)"
-
-		if [ -n "$device" ]; then
-			vlan="$(get_vlan $device)"
-			[ -n "$vlan" ] && device="$vlan"
-
-			if [ -n "$device" ]; then
-				WANPORTS="$WANPORTS $device"
-			fi
-		fi
-	done
-}
-
-add_eth_ports() {
-
-	add_port()
-	{
-		local cfg=$1
-		local uplink ifname vlan
-
-		config_get ifname $cfg ifname
-		config_get_bool uplink $cfg uplink 0
-	
-		vlan="$(get_vlan $ifname)"
-		[ -n "$vlan" ] && ifname="$vlan"
-
-		if [ $uplink -eq 1 ]; then
-			WANPORTS="$WANPORTS $ifname"
-		else
-			LANPORTS="$LANPORTS $ifname"
-		fi
-	}
-
-	config_load ports
-	config_foreach add_port "ethport"
-}
-
-add_xtm_devs
-add_eth_ports
-add_wifi_devs
-
-WANPORTS="$(echo $WANPORTS | sed -e 's/[[:space:]]*$//')"
-LANPORTS="$(echo $LANPORTS | sed -e 's/[[:space:]]*$//')"
-
-uci -q set network.wan.type="anywan"
-uci -q set network.wan.ifname="$WANPORTS"
-uci -q set network.wan6.ifname="@wan"
-uci -q set network.lan.type="bridge"
-uci -q set network.lan.ifname="$LANPORTS"
-
-ubus call uci commit '{"config":"network"}'
-

netmode/files/etc/uci-defaults/998-netmode-opreqs

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-add_owsd_ubusproxy_object_netmode() {
-	local netmd=$(uci -q get owsd.ubusproxy.object | grep netmode)
-	if [ -z "$netmd" ]; then
-		uci -q add_list owsd.ubusproxy.object="netmode"
-		uci commit owsd
-	fi
-}
-
-add_owsd_ubusproxy_object_netmode

netmode/files/lib/functions/netmode.sh

@@ -1,150 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-
-MODEDIR=$(uci -q get netmode.setup.dir)
-
-[ -n "$MODEDIR" ] || MODEDIR="/etc/netmodes"
-
-run_netmode_scripts() {
-	local mode=$1
-	local when=$2
-	local script
-	local path
-
-	path=$(readlink -f /etc/netmodes/$mode/)
-	[ "${path:0:14}" == "/etc/netmodes/" ] || exit
-
-	if [ -d /etc/netmodes/$mode/scripts/$when ]; then
-		logger -s -p user.info -t "netmode" "Executing $when netmode scripts" >/dev/console
-		for script in $(ls /etc/netmodes/$mode/scripts/$when/); do
-			sh /etc/netmodes/$mode/scripts/$when/$script
-		done
-	fi
-}
-
-switch_netmode() {
-	[ -f /etc/config/netmode -a -d $MODEDIR ] || return
-
-	config_load netmode
-
-	local enabled
-	config_get_bool enabled setup enabled '0'
-	[ $enabled -eq 0 ] && return 
-
-	local mode
-	config_get mode setup mode
-
-	[ -d "/etc/netmodes/$mode" ] || return
-
-	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
-
-	run_netmode_scripts $mode "pre"
-
-	local reboot=$(uci -q get netmode.$mode.reboot)
-
-	if [ "$reboot" == "1" ]; then
-		#run_netmode_scripts $mode "post"
-		reboot &
-		exit
-	fi
-
-	#run_netmode_scripts $mode "post"
-}
-
-populate_netmodes() {
-	[ -f /etc/config/netmode -a -d $MODEDIR ] || return
-
-	config_load netmode
-
-	local enabled
-	config_get_bool enabled setup enabled '0'
-	[ $enabled -eq 0 ] && return 
-
-	delete_netmode() {
-		uci delete netmode.$1
-	}
-
-	config_foreach delete_netmode netmode
-	uci commit netmode
-
-	local hardware=$(db -q get hw.board.model_name)
-	local keys lang desc exp exclude support
-	for mode in $(ls $MODEDIR); do
-			lang=""
-			desc=""
-			exp=""
-			uci -q set netmode.$mode=netmode
-			json_load "$(cat $MODEDIR/$mode/DETAILS)"
-
-			if json_select excluded_boards; then
-				exclude=0
-				_i=1
-				while json_get_var board $_i; do
-					case "$hardware" in
-						$board)
-							uci -q delete netmode.$mode
-							exclude=1
-							break
-						;;
-					esac
-					_i=$((_i+1))
-				done
-				json_select ..
-				[ $exclude -eq 1 ] && continue
-			elif json_select supported_boards; then
-				support=0
-				_i=1
-				while json_get_var board $_i; do
-					case "$hardware" in
-						$board)
-							support=1
-							break
-						;;
-					esac
-					_i=$((_i+1))
-				done
-				json_select ..
-				[ $support -eq 1 ] || {
-					uci -q delete netmode.$mode
-					continue
-				}
-			fi
-
-			json_select description
-			json_get_keys keys
-			for k in $keys; do
-				json_get_keys lang $k
-				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
-				json_select $k
-				json_get_var desc $lang
-				uci -q set netmode.$mode."desc_$lang"="$desc"
-				[ "$lang" == "en" ] && uci -q set netmode.$mode."desc"="$desc"
-				json_select ..
-			done
-			json_select ..
-
-			json_select explanation
-			json_get_keys keys
-			for k in $keys; do
-				json_get_keys lang $k
-				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
-				json_select $k
-				json_get_var exp $lang
-				uci -q set netmode.$mode."exp_$lang"="$exp"
-				[ "$lang" == "en" ] && uci -q set netmode.$mode."exp"="$exp"
-				json_select ..
-			done
-			json_select ..
-
-			json_get_var cred credentials
-			uci -q set netmode.$mode.askcred="$cred"
-			json_get_var ulb uplink_band
-			uci -q set netmode.$mode.uplink_band="$ulb"
-			json_get_var reboot reboot
-			uci -q set netmode.$mode.reboot="$reboot"
-	done
-
-	uci commit netmode
-}

netmode/files/sbin/testnet

@@ -31,7 +31,10 @@ test_connection() {
 internet_test() {
 	local link dest
 
-	dest="$(uci -q get diagnostics.@connectivity[0].destination)"
+	# use the destination address given in config for connectivity check
+	dest="$(uci -q get netmode.testnet.destination)"
+	# for backwards compatibility
+	[ -n "$dest" ] || dest="$(uci -q get diagnostics.@connectivity[0].destination)"
 
 	test_connection $dest
 

obuspa/Config.in

@@ -2,16 +2,28 @@ if PACKAGE_obuspa
 
 menu "Configuration"
 
-config OBUSPA_MTP_ENABLE_STOMP
-	bool "Enable STOMP as mtp protocol"
-	default y
+config OBUSPA_DB_PATH
+	string "Configure path for usp.db file"
+	default "/tmp/"
 
 config OBUSPA_MTP_ENABLE_MQTT
 	bool "Enable MQTT as mtp protocol"
 	default y
 
+config OBUSPA_MTP_ENABLE_WEBSOCKETS
+	bool "Enable WebSockets as mtp protocol"
+	default y
+
+config OBUSPA_MTP_ENABLE_STOMP
+	bool "Enable STOMP as mtp protocol"
+	default y
+
 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
-	default y
+	default n
+
+config OBUSPA_CONTROLLER_MTP_VERIFY
+	bool "Enable verification of MQTT response topic before processing the message"
+	default n
 endmenu
 endif

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=4.1.0.9
+PKG_VERSION:=5.0.0.16.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a52205791ef71cb54fa468064075ff85c7f5a638
+PKG_SOURCE_VERSION:=6477337ec0d5dd6fa5586b42ba6423a892643106
 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 +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto
+  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
 endef
 
 define Package/obuspa/description
@@ -43,8 +43,18 @@ define Package/obuspa/config
 endef
 
 TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
+	-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)"
+endif
 
 ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_STOMP),y)
   CONFIGURE_ARGS += \
@@ -70,9 +80,18 @@ else
 	--disable-coap
 endif
 
+ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_WEBSOCKETS),y)
+  CONFIGURE_ARGS += \
+	--enable-websockets
+else
+  CONFIGURE_ARGS += \
+	--disable-websockets
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/obuspa/* $(PKG_BUILD_DIR)/
+        $(Build/Patch)
 endef
 endif
 
@@ -81,13 +100,14 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(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_BIN) ./files/etc/hotplug.d/iface/85-obuspa $(1)/etc/hotplug.d/iface/
+	$(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))