qosmngr: handled qos reload, statistics reset

hanlded the qos reload without statistics reset.
shaping , classification or policer change and qos reload should
not cause queue reset in driver that was causing statistics of that queue
reset to 0. qos reload if trigerred with queue specific config change,in
that case only statistics will reset tot 0.

ated/Makefile

@@ -1,78 +0,0 @@
-#
-# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
-#
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# version 2 as published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-
-include $(TOPDIR)/rules.mk
-include $(INCLUDE_DIR)/kernel.mk
-
-PKG_NAME:=ated
-PKG_VERSION:=1.2.2
-PKG_RELEASE:=1
-
-PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
-
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(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
-
-# support parallel build
-#PKG_BUILD_PARALLEL:=1
-
-#re create configure scripts if not present.
-#PKG_FIXUP:=autoreconf
-
-# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
-# this way we don't need to pick out the resulting files from the build dir.
-PKG_INSTALL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/ated
-	CATEGORY:=Utilities
-	TITLE:=Daemon for handling wifi calibration
-	URL:=
-	DEPENDS:= libc
-endef
-
-define Package/ated/description
-	Daemon for handling wifi calibration
-endef
-
-#TARGET_CFLAGS += -I$(LINUX_DIR)/include -I$(LINUX_DIR)/arch/mips/include
-
-MAKE_FLAGS += \
-	v=2 \
-	m=3
-
-
-#TARGET_CPPFLAGS := \
-#	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
-#	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
-#	$(TARGET_CPPFLAGS)
-
-# we donot wwant to have any install.
-define Build/Install/Default
-endef
-
-define Package/ated/install
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ated $(1)/sbin/
-endef
-
-$(eval $(call BuildPackage,ated))

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,70 @@
 #
-# Copyright (C) 2021 IOPSYS
+# Copyright (C) 2022 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.4.27
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_VERSION:=6.7.5
+
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=710485a57e311a5b4c5434efe3e79fc58cb6c429
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_SOURCE_VERSION:=4ed1dfffc30d1635563d61ede0204febf14dc12d
 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
+  TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
+  ABI_VERSION:=1.0
 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 +libcurl +libbbf_api
+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,72 +86,83 @@ 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/share/bbfdm
 	$(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
@@ -131,9 +171,11 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(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/
 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,14 +8,17 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.3
+PKG_VERSION:=2.0.8
 
-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:=be565bd5b7bf91c81a824601235f68b11e6ea308
 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)
 
@@ -29,21 +32,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 +zlib
 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_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
 	$(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,17 +7,17 @@ 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
+	local enable
+
+	config_load bulkdata
+	config_get_bool enable bulkdata enable 1
+
+	procd_open_instance bulkdata
+	[ "$enable" -eq "1" ] && {
 		procd_set_param command "$PROG"
 		procd_set_param respawn "3" "7" "0"
-		procd_close_instance
-	fi
-}
-
-boot() {
-	start
+	}
+	procd_close_instance
 }
 
 reload_service() {

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}

dectmngr/Makefile

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

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
@@ -30,7 +32,7 @@ start_service() {
 
 	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"
@@ -71,7 +73,7 @@ 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
 }
 
@@ -86,8 +88,10 @@ service_triggers()
 }
 
 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||TARGET_iopsys_econet)
 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-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.40
+PKG_VERSION:=6.7.5
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=699744d5ae9e043715c260f9b58bbc18747895f9
+PKG_SOURCE_VERSION:=6a7dcbfe7ce41e87a7528b63cf12e67078231629
 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
@@ -32,31 +32,42 @@ define Package/easy-soc-libs
   CATEGORY:=Libraries
   TITLE:=IOPSYS Easy SoC libraries
   SUBMENU:=IOPSYS Easy SoC libraries
+  DEPENDS:=+libopenssl
   MENU:=1
 endef
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
+  TARGET_WIFI_TYPE=BROADCOM
   CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
   TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
-  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
+  TARGET_WIFI_TYPE=MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_MAC80211
 else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
   TARGET_PLATFORM=TEST
+  TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
 else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
   TARGET_PLATFORM=TEST
+  TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
+  TARGET_PLATFORM=ECONET
+  TARGET_WIFI_TYPE=MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_ECONET
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211
+  TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
 export TARGET_PLATFORM
+export TARGET_WIFI_TYPE
 
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
@@ -78,6 +89,7 @@ endif
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
 	-I$(STAGING_DIR)/usr/include/libnl3
 
 MAKE_FLAGS += \
@@ -85,6 +97,7 @@ MAKE_FLAGS += \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FPIC="$(FPIC)" \
 	PLATFORM="$(TARGET_PLATFORM)" \
+	WIFI_TYPE="$(TARGET_WIFI_TYPE)" \
 	subdirs="$(subdirs)"
 
 ifeq ($(LOCAL_DEV),1)

easy-soc-libs/ethernet.mk

@@ -2,7 +2,7 @@
 define Package/libethernet
   $(call Package/easy-soc-libs)
   TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_econet:ecnt_api
 endef
 
 define Package/libethernet/config

endptmngr/Makefile

@@ -13,12 +13,12 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=3a71d4124061287783e0d4c763b1b20e925d2133
+PKG_SOURCE_VERSION:=0901382048bb7ce01fc1767fef75e54692f56743
 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
@@ -30,7 +30,7 @@ PKG_BUILD_PARALLEL:=1
 # indirectly. This ensures that the package is rebuilt on config-changes.
 PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
 
-export CONFIG_BRCM_SDK_VER_504021
+export CONFIG_BRCM_SDK_VER_504040
 export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk
@@ -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

evoice/Makefile

@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=evoice
+PKG_VERSION:=0.2.38
+
+LOCAL_DEV=0
+LOCAL_DEV_EVOICE_DIR=~/voip/evoice
+
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
+PKG_SOURCE_VERSION:=8ffed73a755909cdf70d7050c98ce0f407621860
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+#PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Network
+	SUBMENU:=Telephony
+	TITLE:=Ensemble Voice
+	URL:=
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c +libblobmsg-json\
+		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
+		+TARGET_iopsys_econet:kmod-voip_driver\
+		+TARGET_iopsys_econet:voip_app +libbbf_api
+endef
+
+define Package/$(PKG_NAME)/description
+	Ensemble Voice. A stand alone SIP VoIP application. 
+endef
+
+ifeq ($(LOCAL_DEV),1)
+# If you want to build the code from your own local repositiory enable
+# LOCAL_DEV and set LOCAL_DEV_EVOICE_DIR to your own git repository.
+define Build/Prepare
+	@echo "======================================================="
+	@echo "DEVELOPMENT BUILD! rsync $(LOCAL_DEV_EVOICE_DIR) to $(PKG_BUILD_DIR)"
+	@echo "======================================================="
+	rsync -a $(LOCAL_DEV_EVOICE_DIR)/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+IDIR = $(STAGING_DIR)/usr/include
+TONES_INI_REQUIRED=
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+	TARGET_PLATFORM=BROADCOM
+	BDIR = bcm963xx/userspace/private/apps/voice
+	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
+		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
+		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
+	TRG=SVrgBcmFxs
+	JSONFILE=codecs_brcm.json
+else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
+	TARGET_PLATFORM=ECONET
+	TONES_INI_REQUIRED=y
+	TRG=SVrgMtekOwrt
+	JSONFILE=codecs_airoha.json
+endif
+
+# disable temporarily some not important warnings, force PIC
+CC_FLAGS_VS=$(CC_FLAGS) -Wno-unused-parameter -Wno-unused-function -fPIC
+
+export TARGET_PLATFORM
+
+#used and altered by BIDE makefiles
+export _XFLAGS
+
+BIDE_MAKE_OPTS = -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk\
+	SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix LIF=cerder DBG=dbg
+
+define Build/Compile
+	@echo "TARGET_PLATFORM=${TARGET_PLATFORM}"
+	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS)" TRG=$(TRG)
+
+	@echo "clean libvoiceservice before building shared lib!"
+	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice cleanall
+	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice
+endef
+
+define Package/evoice/install
+	$(CP) ./files/* $(1)/
+	$(if $(TONES_INI_REQUIRED),,$(RM) $(1)/etc/evoice/tones.ini)
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(1)/lib/voice/$(JSONFILE) $(1)/lib/voice/codecs_evoice.json
+	$(RM) $(1)/lib/voice/codecs_brcm.json
+	$(RM) $(1)/lib/voice/codecs_airoha.json
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/
+endef
+
+$(eval $(call BuildPackage,evoice))

evoice/files/etc/config/voice

@@ -0,0 +1,334 @@
+
+config SIPClient 'Client1'
+	option Enable '1'
+	option RegisterMode 'RFC3261'
+	option AuthUserName '51234'
+	option AuthPassword '51234'
+	option Network 'Network1'
+	option MaxSessions '5'
+	option RegisiterURI '51234@sip-proxy.iopsys.eu'
+	option E164Format '1'
+
+config SIPClient 'Client2'
+	option Enable '1'
+	option RegisterMode 'RFC3261'
+	option AuthUserName '51235'
+	option AuthPassword '51235'
+	option Network 'Network1'
+	option MaxSessions '5'
+	option RegisiterURI '51235@sip-proxy.iopsys.eu'
+	option E164Format '1'
+
+config SIPNetwork 'Network1'
+	option Enable '1'
+	option ProxyServer 'sip-proxy.iopsys.eu'
+	option AcceptFromProxyOnly '0'
+	option ProxyServerPort '5060'
+	option ProxyServerTransport 'UDP'
+	option RegistrarServer 'sip-proxy.iopsys.eu'
+	option RegistrarServerPort '5060'
+	option RegistrarServerTransport 'UDP'
+	option RegistrationPeriod '3240'
+	option RegisterExpires '3600'
+	option UserAgentDomain ' '
+	option TimerRegistrationFailed '120'
+	option TimerT1 '500'
+	option VoIPProfile 'VoIPProfile1'
+	option SIPSessionTimerEnable '0'
+	option SIPSessionExpireInterval '1800'
+	option SIPSessionMinimumTimer '90'
+	option SIPSessionRefresher 'NONE'
+	option SIPSessionTimerMode 'REQUEST'
+	option SIPSessionRefreshRequest 'UPDATE'
+	list CodecList '1CodecProfile1'
+	list CodecList '1CodecProfile2'
+	list CodecList '1CodecProfile3'
+	list CodecList '1CodecProfile5'
+	list CodecList '1CodecProfile4'
+
+config CodecProfile '1CodecProfile1'
+	option Enable '1'
+	option Codec 'G.711ALaw'
+	option PacketizationPeriod '20'
+	option SilenceSupression '1'
+
+config CodecProfile '1CodecProfile2'
+	option Enable '1'
+	option Codec 'G.711MuLaw'
+	option PacketizationPeriod '20'
+	option SilenceSupression '1'
+
+config CodecProfile '1CodecProfile3'
+	option Enable '1'
+	option Codec 'G.726'
+	option PacketizationPeriod '20'
+	option SilenceSupression '0'
+
+config CodecProfile '1CodecProfile4'
+	option Enable '1'
+	option Codec 'G.722'
+	option PacketizationPeriod '20'
+	option SilenceSupression '0'
+
+config CodecProfile '1CodecProfile5'
+	option Enable '1'
+	option Codec 'G.729'
+	option PacketizationPeriod '20'
+	option SilenceSupression '0'
+
+config VoIPProfile 'VoIPProfile1'
+	option Enable '1'
+	option DTMFMethod 'RFC4733'
+	option RTP '1RTP'
+
+config RTP '1RTP'
+	option LocalPortMin '10020'
+	option LocalPortMax '10039'
+	option JitterBufferType 'Static'
+
+config FXXPorts 'POTS'
+	option Region 'US'
+
+config FXSPorts 'FXS1'
+	option Enable '1'
+	option DialType 'Tone'
+	option TransmitGain '0'
+	option ReceiveGain '0'
+	option EchoCancellationEnable '1'
+
+config FXSPorts 'FXS2'
+	option Enable '1'
+	option DialType 'Tone'
+	option TransmitGain '0'
+	option ReceiveGain '0'
+	option EchoCancellationEnable '1'
+
+config Extension 'Extension1'
+	option Enable '1'
+	option ExtensionNumber '10#'
+	option Provider 'FXS1'
+	option CallingFeatures 'Set1'
+	option Name 'Phone 1'
+
+config Extension 'Extension2'
+	option Enable '1'
+	option ExtensionNumber '11#'
+	option Provider 'FXS2'
+	option CallingFeatures 'Set1'
+	option Name 'Phone 2'
+
+config Line 'Line1'
+	option Enable '1'
+	option Provider 'Client1'
+	option CallingFeatures 'Set1'
+
+config Line 'Line2'
+	option Enable '1'
+	option Provider 'Client2'
+	option CallingFeatures 'Set2'
+
+config IncomingMap 'IncomingMap1'
+	option Enable '1'
+	option Extension 'Extension1'
+	option Line 'Line1'
+
+config IncomingMap 'IncomingMap2'
+	option Enable '1'
+	option Extension 'Extension2'
+	option Line 'Line2'
+
+config IncomingMap 'IncomingMap3'
+	option Enable '0'
+	option Extension 'Extension2'
+	option Line 'Line1'
+
+config OutgoingMap 'OutgoingMap1'
+	option Enable '1'
+	option Extension 'Extension1'
+	option Line 'Line1'
+
+config OutgoingMap 'OutgoingMap2'
+	option Enable '1'
+	option Extension 'Extension2'
+	option Line 'Line2'
+
+config CallingFeatures 'Set1'
+	option CallerIDEnable '1'
+	option CallerIDNameEnable '1'
+	option CallForwardUnconditionalEnable '0'
+	option CallForwardUnconditionalNumber ' '
+	option CallForwardOnBusyEnable '0'
+	option CallForwardOnBusyNumber ' '
+	option CallForwardOnNoAnswerEnable '0'
+	option CallForwardOnNoAnswerRingTimeout '24'
+	option CallForwardOnNoAnswerNumber ' '
+	option CallTransferEnable '1'
+	option MWIEnable '1'
+	option VMWIEnable '1'
+	option LineMessagesWaiting '0'
+	option AnonymousCallRejectionEnable '0'
+	option AnonymousCallEnable '1'
+	option DoNotDisturbEnable '1'
+	option RepeatDialEnable '1'
+	option VoiceMailEnable '1'
+	option CallPickUpEnable '1'
+	option CCBSEnable '1'
+	option CallWaitingEnable '0'
+
+config CallingFeatures 'Set2'
+	option CallerIDEnable '1'
+	option CallerIDNameEnable '1'
+	option CallForwardUnconditionalEnable '0'
+	option CallForwardUnconditionalNumber ' '
+	option CallForwardOnBusyEnable '0'
+	option CallForwardOnBusyNumber ' '
+	option CallForwardOnNoAnswerEnable '0'
+	option CallForwardOnNoAnswerRingTimeout '24'
+	option CallForwardOnNoAnswerNumber ' '
+	option CallTransferEnable '1'
+	option MWIEnable '1'
+	option VMWIEnable '1'
+	option LineMessagesWaiting '0'
+	option AnonymousCallRejectionEnable '0'
+	option AnonymousCallEnable '1'
+	option DoNotDisturbEnable '1'
+	option RepeatDialEnable '1'
+	option VoiceMailEnable '1'
+	option CallPickUpEnable '1'
+	option CCBSEnable '1'
+	option CallWaitingEnable '1'
+
+config NumberingPlan 'NumberingPlan1'
+	option MinimumNumberOfDigits '1'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit '#'
+
+config NumberingPlan 'NumberingPlan2'
+	option MinimumNumberOfDigits '5'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit ' '
+	list PrefixList '2PrefixInfo1'
+	list PrefixList '2PrefixInfo2'
+	list PrefixList '2PrefixInfo3'
+	list PrefixList '2PrefixInfo4'
+	list PrefixList '2PrefixInfo5'
+	list PrefixList '2PrefixInfo6'
+	list PrefixList '2PrefixInfo7'
+	list PrefixList '2PrefixInfo8'
+	list PrefixList '2PrefixInfo9'
+
+config NumberingPlan 'NumberingPlan3'
+	option MinimumNumberOfDigits '5'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit '#'
+	list PrefixList '3PrefixInfo1'
+
+config PrefixInfo '2PrefixInfo1'
+	option Enable '1'
+	option PrefixRange '*43#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CW_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo2'
+	option Enable '1'
+	option PrefixRange '#43#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CW_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo3'
+	option Enable '1'
+	option PrefixRange '*21*(X+)#'
+	option PrefixMinNumberOfDigits '9'
+	option PrefixMaxNumberOfDigits '9'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFU_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo4'
+	option Enable '1'
+	option PrefixRange '#21#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFU_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo5'
+	option Enable '1'
+	option PrefixRange '*67*(X+)#'
+	option PrefixMinNumberOfDigits '9'
+	option PrefixMaxNumberOfDigits '9'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFB_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo6'
+	option Enable '1'
+	option PrefixRange '#67#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFB_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo7'
+	option Enable '1'
+	option PrefixRange '*61*(X+(*X+)?)#'
+	option PrefixMinNumberOfDigits '15'
+	option PrefixMaxNumberOfDigits '15'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFNR_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo8'
+	option Enable '1'
+	option PrefixRange '#61#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFNR_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '2PrefixInfo9'
+	option Enable '1'
+	option PrefixRange '*31*'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CA_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo1'
+	option Enable '1'
+	option PrefixRange '110|112'
+	option PrefixMinNumberOfDigits '7'
+	option PrefixMaxNumberOfDigits '7'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'X_IOPSYS_EU_EMERGENCY'
+	option FacilityActionArgument ' '
+
+config DialPlan 'X_IOPSYS_EU_InternalNumber1'
+	option RegExp '1X#'
+

evoice/files/etc/evoice/voicedm

@@ -0,0 +1,181 @@
+# RO (Main)
+config account 'map_board'
+   option HW_Has_Voice 'hw.board.hasVoice'
+   option HW_Has_DECT 'hw.board.hasDect'
+   option HW_Nr_Of_POTS_Ports 'hw.board.VoicePorts'
+   option HW_VoiceDSP 'hw.board.VoiceDSP'
+   option ProductID 'device.deviceinfo.ModelName'
+   option I3_VERSION 'device.deviceinfo.SoftwareVersion'
+   option SerialNumber 'device.deviceinfo.SerialNumber'
+   
+config account 'map_pots'
+   option Country 'voice.POTS.Region'
+
+# Voice Service navigation paths
+# Not used to initialize internal configuration
+config navigation 'map_vs'
+   option Account 'voice.Client@.'
+   option Network 'voice.Client@.Network'
+   option VoIPProfile 'voice.Network@.VoIPProfile'
+   option CfAccount 'voice.Line@.CallingFeatures'
+   option CfPhone 'voice.Extension@.CallingFeatures'
+   option CodecList 'voice.Network@.CodecList'
+   option Codec 'voice.Codec@.Codec'
+   option OutgoingMapEnabled 'voice.OutgoingMap@.Enable'
+   option From_Phone 'voice.OutgoingMap@.Extension'
+   option Extension 'voice.Extension@.Provider'
+   option To_Account 'voice.OutgoingMap@.Line'
+   option Line 'voice.Line@.Provider'
+   option LineEnable 'voice.Line@.Enable'
+   option LineProvider 'voice.Line@.Provider'
+   option IncomingMapEnabled 'voice.IncomingMap@.Enable'
+   option From_Account 'voice.IncomingMap@.Line'
+   option To_Phone 'voice.IncomingMap@.Extension'
+   option ExtensionEnable 'voice.Extension@.Enable'
+   option ExtensionProvider 'voice.Extension@.Provider'
+
+# Registration for account A-Z is associate with SIP.Clienti.Enable    
+# All parameters in this table are written to internal configuration
+config account 'map_account'
+   option Registration 'voice.Client@.Enable'
+   option Display_Name ''
+   option PhoneNumber 'voice.Client@.RegisiterURI'
+   option Username 'voice.Client@.AuthUserName'
+   option Password 'voice.Client@.AuthPassword'
+   option SIP_Telephone_Syntax 'voice.Client@.E164Format'
+   option Device_Description 'voice.Client@.UserAgent'
+
+# Network stuff associated with an account.
+# All parameters in this table are written to internal configuration
+config network 'map_net'
+   option Enable                'voice.Network@.Enable'
+   option Registration_Server   'voice.Network@.RegistrarServer'
+   option Outbound_Proxy        'voice.Network@.ProxyServer'
+   option Accept_From_Registered 'voice.Network@.AcceptFromProxyOnly'
+   option SIP_Port              'voice.Network@.RegistrarServerPort'
+   option SIP_Transport         'voice.Network@.RegistrarServerTransport'
+   option RegistrationPeriod    'voice.Network@.RegistrationPeriod'
+   option Registration_Interval 'voice.Network@.RegisterExpires'
+   option Reg_Failure_Interval  'voice.Network@.TimerRegistrationFailed'
+   option T1                    'voice.Network@.TimerT1'
+   option UserAgentDomain       'voice.Network@.UserAgentDomain'
+   option SIP_SessTmrEnable     'voice.Network@.SIPSessionTimerEnable'
+   option SIP_SessTmrMode       'voice.Network@.SIPSessionTimerMode'
+   option SIP_SessTmrMsg        'voice.Network@.SIPSessionRefreshRequest'
+   option SIP_SessTmrRefresher  'voice.Network@.SIPSessionRefresher'
+   option SIP_MinSE             'voice.Network@.SIPSessionMinimumTimer'
+   option SIP_SessInterval      'voice.Network@.SIPSessionExpireInterval'
+
+config VoIPProfile 'map_voip'
+   option Enable 'voice.VoIPProfile@.Enable'
+   option DTMF_Method 'voice.VoIPProfile@.DTMFMethod'
+   option RTP 'voice.VoIPProfile@.RTP'
+
+config RTP 'map_rtp'
+   option RTP_Port_Base 'voice.@RTP@.LocalPortMin'
+   option RTP_Port_End 'voice.@RTP@.LocalPortMax'
+
+config codecs 'map_codec'
+   option Codec 'voice.CodecProfile@.Codec'
+   option enable 'voice.CodecProfile@.Enable'
+   option ptime 'voice.CodecProfile@.PacketizationPeriod'
+   option dtx 'voice.CodecProfile@.SilenceSupression'
+
+config fxsinfo 'map_fxs'
+   option Enable 'voice.FXS@.Enable'
+   option DialType 'voice.FXS@.DialType'
+   option TransmitGain 'voice.FXS@.TransmitGain'
+   option ReceiveGain  'voice.FXS@.ReceiveGain'
+   option EchoCancellationEnable 'voice.FXS@.EchoCancellationEnable'
+
+config extensioninfo 'map_ext'
+   option Enable 'voice.Extension@.Enable'
+   option Internal_Number_Phone 'voice.Extension@.ExtensionNumber'
+   option Display_Name_Phone 'voice.Extension@.Name'
+
+config capabilities 'map_capa'
+   option Call_Waiting_Enable 'voice.Capabilities@FacilityActions'
+   option Enable_Call_Diversion 'voice.Capabilities@FacilityActions'
+
+config cs_account 'map_set'
+   option BusyCallWait 'voice.Set@.CallWaitingEnable'
+   option AlwaysDivert 'voice.Set@.CallForwardUnconditionalEnable'
+   option CFU_Number 'voice.Set@.CallForwardUnconditionalNumber'
+   option BusyDivert 'voice.Set@.CallForwardOnBusyEnable'
+   option CFB_Number 'voice.Set@.CallForwardOnBusyNumber'
+   option NoAnswDivert 'voice.Set@.CallForwardOnNoAnswerEnable'
+   option CFNR_Number 'voice.Set@.CallForwardOnNoAnswerNumber'
+   option CFNR_Timeout 'voice.Set@.CallForwardOnNoAnswerRingTimeout'
+   option Enable_Call_Transfer 'voice.Set@.CallTransferEnable'
+   option AnonymousReject 'voice.Set@.AnonymousCallRejectionEnable'
+   option AllowAnonymousConf 'voice.Set@.AnonymousCallEnable'
+   option CallerIDEnable 'voice.Set@.CallerIDEnable'
+
+config cs_xvendor 'map_np_cs'
+   option np_sc_actCW 'voice.X_IOPSYS_EU_NpSc@.CW_ACT'
+   option np_sc_actCW_output 'voice.X_IOPSYS_EU_NpSc@.CW_OUT'
+   option np_sc_deactCW 'voice.X_IOPSYS_EU_NpSc@.CW_DEACT'
+   option np_sc_isactCW 'voice.X_IOPSYS_EU_NpSc@.CW_ISACT'
+   option np_sc_actCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_ACT'
+   option np_sc_actCFU_output 'voice.X_IOPSYS_EU_NpSc@.CFU_OUT'
+   option np_sc_deactCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_DEACT'
+   option np_sc_actCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_ACT'
+   option np_sc_actCFB_output 'voice.X_IOPSYS_EU_NpSc@.CFB_OUT'
+   option np_sc_deactCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_DEACT'
+   option np_sc_actCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_ACT'
+   option np_sc_actCFNR_output 'voice.X_IOPSYS_EU_NpSc@.CFNR_OUT'
+   option np_sc_deactCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_DEACT'
+   option np_sc_actRA 'voice.X_IOPSYS_EU_NpSc@.RA_ACT'
+   option np_sc_deactRA 'voice.X_IOPSYS_EU_NpSc@.RA_DEACT'
+   option np_sc_actAC 'voice.X_IOPSYS_EU_NpSc@.AC_ACT'
+   option np_sc_deactAC 'voice.X_IOPSYS_EU_NpSc@.AC_DEACT'
+   option np_sc_actAA 'voice.X_IOPSYS_EU_NpSc@.AA_ACT'
+   option np_sc_deactAA 'voice.X_IOPSYS_EU_NpSc@.AA_DEACT'
+   option np_sc_actAD 'voice.X_IOPSYS_EU_NpSc@.AD_ACT'
+   option np_sc_actAD_output 'voice.X_IOPSYS_EU_NpSc@.AD_OUT'
+   option np_sc_deactAD 'voice.X_IOPSYS_EU_NpSc@.AD_DEACT'
+   option np_sc_actMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_ACT'
+   option np_sc_deactMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_DEACT'
+   option np_sc_actMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_ACT'
+   option np_sc_deactMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_DEACT'
+   option np_sc_redial 'voice.X_IOPSYS_EU_NpSc@.REDIAL'
+   option np_sc_setMiscConf 'voice.X_IOPSYS_EU_NpSc@.SET_MISC'
+
+config cc_xvendor 'map_np_in'
+   option np_in_limitExp 'voice.X_IOPSYS_EU_InternalNumber@.RegExp'
+
+config cc_xvendor 'map_np_sh'
+   option sh_no_str 'voice.X_IOPSYS_EU_ShortNumber@.RegExp'
+
+config cc_xvendor 'map_np_eme'
+   option np_eme 'voice.X_IOPSYS_EU_EmergencyNumber@.RegExp'
+   option np_eme_out 'voice.X_IOPSYS_EU_EmergencyNumber@.OutStr'
+
+config cc_xvendor 'map_np_rn'
+   option np_rn 'voice.X_IOPSYS_EU_RegularNumber@.RegExp'
+   option np_rn_out 'voice.X_IOPSYS_EU_RegularNumber@.OutStr'
+   option np_rn_account 'voice.X_IOPSYS_EU_RegularNumber@.AccStr'
+
+config cc_xvendor 'map_np_bn'
+   option np_bn 'voice.X_IOPSYS_EU_BarredNumber@.RegExp'
+   option np_bn_out 'voice.X_IOPSYS_EU_BarredNumber@.OutStr'
+
+config TR104NumberingPlan 'map_np_tr'
+   option min_digits 'voice.NumberingPlan@.MinimumNumberOfDigits'
+   option max_digits 'voice.NumberingPlan@.MaximumNumberOfDigits'
+   option tmo_std 'voice.NumberingPlan@.InterDigitTimerStd'
+   option tmo_open 'voice.NumberingPlan@.InterDigitTimerOpen'
+   option term_digit 'voice.NumberingPlan@.TerminationDigit'
+   option prefix_list 'voice.NumberingPlan@.PrefixList'
+
+config TR104NumberingPlanPrefix 'map_np_pf'
+   option enable 'voice.@PrefixInfo@.Enable'
+   option range 'voice.@PrefixInfo@.PrefixRange'
+   option prefix_min_digits 'voice.@PrefixInfo@.PrefixMinNumberOfDigits'
+   option prefix_max_digits 'voice.@PrefixInfo@.PrefixMaxNumberOfDigits'
+   option remove_digits 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
+   option remove_pos 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
+   option facility_act 'voice.@PrefixInfo@.FacilityAction'
+   option facility_arg 'voice.@PrefixInfo@.FacilityActionArgument'
+
+

evoice/files/etc/evoice/voicero

@@ -0,0 +1,56 @@
+config static_prm 'defaults'
+   option Print_Control '4'
+   option Print_UDP_Addr '192.168.1.3'
+   option Print_UDP_Port '60000'
+   option Verbosity 'On'
+   option Failure_Log 'On'
+   option Message_Log 'On'
+   option Method_Trace 'Off'
+   option Dial_Cache_Size '0'
+   option Reverse_Fax_Detection '0'
+   option DSP_24 '0'
+   option DSP_36 '0'
+   option DSP_43 '0'
+   option Swap_Name_Nr_CID '0'
+   option R_Button_Lower_Lim '100'
+   option R_Button_Upper_Lim '800'
+   option HookOn_Delay '0'
+   option SupportLDD '0'
+   option LDD_Min_Break_Time '41'
+   option LDD_Max_Break_Time '94'
+   option LDD_Percent_Break '55'
+   option Tone_On_Hangup '1'
+   option BusyTone_On_Hangup '1'
+   option Enable_Analouge_Conf '0'
+   option PrackUsage '1'
+   option SIP_SupportedPath '0'
+   option IMS_Access_Network_Info ' '
+   option SIP_Reason_Protocol '0'
+   option SIP_Body_QOST '0'
+   option SIP_HistoryInfo '0'
+   option Customer_Spec2 '1'
+   option UTF8_Enable '0'
+   option RFC3325 '0'
+   option Accept_From_Registered '0'
+   option Polarity_Reversal '0'
+   option Closed_Dial_Plan '0'
+   option Netw_Dial '0'
+   option No_Answer_Tmo '180'
+   option UPnP_Enabled '0'
+   option NAT_Address ' '
+   option NAT_Address_From_SIP '0'
+   option HookOn_Transfer '0'
+   option Enable_Call_Transfer '1'
+   option CallerIDEnable '1'
+   option Multiparty_Transp '0'
+   option Presence_Indication '0'
+   option Login_Note ' '
+   option Login_Description ' '
+   option Logout_Note ' '
+   option Logout_Description ' '
+   option Resolve_Every_Transaction '2'
+   option Translate_Plus '1'
+   option Mid_Call_Services '0'
+   option Account_Restriction '0'
+   option Answering_Machine_Enable '0'
+

evoice/files/etc/init.d/evoice

@@ -0,0 +1,32 @@
+#!/bin/sh /etc/rc.common
+
+START=68
+STOP=12
+
+USE_PROCD=1
+NAME=evoice
+VOICE_UCI_CONFIG=voice
+
+start_service() {
+	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
+
+
+	which endptmngr >/dev/null 2>&1 && {
+		echo "evoice can't be started since endptmngr is installed. Please remove endptmngr and retry"
+		return
+	}
+
+	procd_open_instance
+	procd_set_param command $NAME
+	procd_set_param respawn "5" "0" "3"
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger $VOICE_UCI_CONFIG
+}

evoice/files/lib/voice/codecs_airoha.json

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

evoice/files/lib/voice/codecs_brcm.json

@@ -0,0 +1,140 @@
+{
+	"G.711MuLaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.711ALaw": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.726": [
+		{
+			"BitRate": 16000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 24000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 32000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 40000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.723.1": [
+		{
+			"BitRate": 5300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 6300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.729": [
+		{
+			"BitRate": 8000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"iLBC": [
+		{
+			"BitRate": 15200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 13300,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"G.722": [
+		{
+			"BitRate": 64000,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"AMR": [
+		{
+			"BitRate": 12200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 10200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 7950,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 7400,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 6700,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 5900,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 5150,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		},
+		{
+			"BitRate": 4750,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-EFR": [
+		{
+			"BitRate": 12200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-FR": [
+		{
+			"BitRate": 13200,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	],
+	"GSM-HR": [
+		{
+			"BitRate": 5600,
+			"PacketizationPeriod": "10-30",
+			"SilenceSuppression": true
+		}
+	]
+}
+

fdtextract/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=1.0
 
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7e013f0afa68378d38a6bdc9b0c5a342bd3dd0a5
+PKG_SOURCE_VERSION:=e3cefda3b26c9aea3021b20725ce7b31b33eebc4
 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

@@ -44,13 +44,25 @@ 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
-	TARGET_CROSS:=$(CONFIG_BCM_TOOLCHAIN)/bin/$(CONFIG_BCM_TOOLTUPLE)
+	# This assumes that the MODULES_SUBDIR set by OpenWrt is of the form
+	# lib/modules/4.19.235-abcdef where 4.19.235 is the version of our fake bcmlinux kernel
+	# and abcdef the git-commit.
+	# The kernel compiled by the Broadcom SDK has a uname -r of 4.19.235, i.e. without the git-commit.
+	# The assignment below removes the part after the - which puts modules in the right directory as
+	# long as the bcmlinux version matches the kernel version in the BCM SDK.
+	# So, this will only stop working in the time window where the BCM SDK has been updated
+	# but bcmlinux has not yet been updated.
+	MODULES_SUBDIR:=$(firstword $(subst -, ,$(MODULES_SUBDIR)))
+	TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)-
 
 	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))
 		# These targets use a 64-bit kernel
 		LINUX_KARCH:=arm64
-		TARGET_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)-
+	else ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"6855" "6756" "47622" "63148" "63178"))
+		# These targets use a 32-bit arm-sfp kernel
+		LINUX_KARCH:=arm
+		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARMSFP_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 +0,0 @@
-if PACKAGE_icwmp
-
-menu "Configuration"
-choice
-	prompt "Select ACS sever"
-	default CWMP_ACS_MULTI
-
-config CWMP_ACS_MULTI
-	bool "No specific ACS, follow standard"
-
-config CWMP_ACS_HDM
-	bool "HDM"
-endchoice
-
-config CWMP_DEBUG
-	bool "Compile with debug options"
-	default y
-
-config CWMP_DEVEL_DEBUG
-	bool "Compile with development debug options"
-	default n
-endmenu
-endif
-

icwmp/Makefile

@@ -1,52 +1,73 @@
 #
-# 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.
+# This is free software, licensed under the BSD-3-Clause
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.27
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_VERSION:=9.0.17
+
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=da88c8c28656b2db54ab205d26faccda68546c05
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_SOURCE_VERSION:=280e2f2bc3b2b24057b6d43c53aad41aacb65cc7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-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_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.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 +libuuid
 endef
 
-define Package/$(PKG_NAME)/description
- A free client implementation of CWMP (TR-069) protocol
+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)
+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
+
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
 ifneq ($(USE_LOCAL),)
 define Build/Prepare
@@ -54,46 +75,29 @@ 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/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_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/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-icwmp-generate-ssl $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
 endef
 
-$(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

@@ -11,15 +11,15 @@ config acs 'acs'
 	option retry_min_wait_interval '5'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
-	option https_ssl_capath ''
 	option ipv6_enable '0'
 	option ip_version '4'
 
 config cpe 'cpe'
-	option 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'
@@ -32,7 +32,7 @@ config cpe 'cpe'
 	option amd_version '5'
 	# compression possible configs: InstanceNumber, InstanceAlias
 	option instance_mode 'InstanceNumber'
-	option session_timeout '60'
+	option session_timeout '300'
 	option notification '1'
 	option exec_download '0'
 	option periodic_notify_enable '1'

icwmp/files/etc/firewall.cwmp

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

icwmp/files/etc/icwmpd/update.sh

@@ -1,43 +1,32 @@
 #!/bin/sh
+. /lib/functions.sh
 
 log() {
-	echo $@ |logger -t cwmp.update -p info
+	echo "$@" |logger -t cwmp.update -p info
 }
 
 handle_icwmp_update() {
-	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
-	local vendorspecinf=`ifstatus ${defwan} | jsonfilter -e "@.data.vendorspecinf"`
+	local cwmp_enable
+	config_load cwmp
 
-	log "Handling dhcp option value ${vendorspecinf}"
-	[ -n "$vendorspecinf" ] && {
-		local url=""
-		local old_url="$(uci -q get cwmp.acs.dhcp_url)"
+	config_get_bool cwmp_enable cpe enable 1
+	if [ "$cwmp_enable" = "0" ]; then
+		return 0
+	fi
 
-		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
+	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 
-		if [ -n "$url" ]; then
-			log "## icwmp url[${old_url}] changed to [${url}]"
-			if [ "${url}" != "${old_url}" ]; then
-				log "Restarting icwmp url[${old_url}] changed to [${url}]"
-				uci -q set cwmp.acs.dhcp_url="$url"
-				uci commit cwmp
-				ubus call uci commit '{"config":"cwmp"}'
-			fi
+	if [ "$ret" == "true" ]; then
+		# read status from var/state/cwmp
+		status=$(uci -q -c /var/state get cwmp.sess_status.current_status)
+		if [ "$status" != "running" ]; then
+			log "Trigger out of bound inform, since last inform status was failure"
+			ubus -t 10 call tr069 inform >/dev/null 2>&1
 		fi
-	}
+	else
+		log "Restarting icwmp tr069 object"
+		/etc/init.d/icwmpd restart
+	fi
 }
 
-handle_icwmp_update
+handle_icwmp_update $@

icwmp/files/etc/init.d/icwmpd

@@ -1,20 +1,48 @@
 #!/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}"
 
@@ -36,13 +64,213 @@ enable_dhcp_option43() {
 	fi
 
 	newreqopts="$reqopts 43"
-	if [ $proto == "dhcp" ]; then
+	if [ "${proto}" == "dhcp" ]; then
 		uci -q set network.$wan.reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
 	fi
 }
 
+convert_to_hex() {
+	local val=""
+	local optval="${1}"
+	OPTIND=1
+	while getopts ":" opt "-$optval"
+	do
+		temp=$(printf "%02X" "'${OPTARG:-:}")
+		val="${val}:${temp}"
+	done
+
+	echo "${val}"
+}
+
+configure_send_op125() {
+	local sendopt="${1}"
+	local intf="${2}"
+	local uci="${3}"
+	local hex_oui=""
+	local hex_serial=""
+	local hex_class=""
+	local oui_len=0
+	local serial_len=0
+	local class_len=0
+
+	if [ "${uci}" = "network" ]; then
+		local opt125="125:00:00:0D:E9"
+	else
+		local opt125="125,00:00:0D:E9"
+	fi
+
+	config_get oui cpe manufacturer_oui ""
+	if [ -z "${oui}" ]; then
+		oui=$(db -q get device.deviceinfo.ManufacturerOUI)
+	fi
+
+	oui=$(echo "${oui}" | tr 'a-f' 'A-F')
+
+	config_get serial cpe serial_number ""
+	if [ -z "${serial}" ]; then
+		serial=$(db -q get device.deviceinfo.SerialNumber)
+	fi
+
+	config_get class cpe product_class ""
+	if [ -z "${class}" ]; then
+		class=$(db -q get device.deviceinfo.ProductClass)
+	fi
+
+	oui_len=$(echo -n "${oui}" | wc -m)
+	serial_len=$(echo -n "${serial}" | wc -m)
+	class_len=$(echo -n "${class}" | wc -m)
+
+	if [ ${oui_len} -eq 0 ] || [ ${serial_len} -eq 0 ]; then
+		return 0
+	fi
+
+	opt125_len=$((oui_len + serial_len + class_len))
+	if [ ${class_len} -gt 0 ]; then
+		opt125_len=$((opt125_len + 6))
+	else
+		opt125_len=$((opt125_len + 4))
+	fi
+
+	hex_opt125_len=$(printf "%02X" "${opt125_len}")
+	opt125="${opt125}:${hex_opt125_len}"
+	hex_oui=$(convert_to_hex "${oui}")
+	if [ -z "${hex_oui}" ]; then
+		return 0
+	fi
+
+	hex_oui_len=$(printf "%02X" "${oui_len}")
+	if [ "${uci}" = "network" ]; then
+		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
+	else
+		opt125="${opt125}:04:${hex_oui_len}${hex_oui}"
+	fi
+
+	hex_serial=$(convert_to_hex "${serial}")
+	if [ -z "${hex_serial}" ]; then
+		return 0
+	fi
+
+	hex_serial_len=$(printf "%02X" "${serial_len}")
+	if [ "${uci}" = "network" ]; then
+		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
+	else
+		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
+	fi
+
+	if [ ${class_len} -gt 0 ]; then
+		hex_class=$(convert_to_hex "${class}")
+		if [ -z "${hex_class}" ]; then
+			return 0
+		fi
+
+		hex_class_len=$(printf "%02X" "${class_len}")
+		if [ "${uci}" = "network" ]; then
+			opt125="${opt125}:03:${hex_class_len}${hex_class}"
+		else
+			opt125="${opt125}:06:${hex_class_len}${hex_class}"
+		fi
+	fi
+
+
+	if [ "${uci}" = "network" ]; then
+		new_send_opt="$sendopt $opt125"
+		uci -q set network.$intf.sendopts="$new_send_opt"
+	else
+		uci -q add_list dhcp.$intf.dhcp_option="$opt125"
+	fi
+}
+
+enable_dnsmasq_option125() {
+	local lan="${1}"
+	local send125_present=0
+	local opt125="125,"
+
+	local proto="$(uci -q get dhcp.$lan.dhcpv4)"
+	if [ "${proto}" = "server" ]; then
+		opt_list="$(uci -q get dhcp.$lan.dhcp_option)"
+
+		for sopt in $opt_list; do
+			if [[ "$sopt" == "$opt125"* ]]; then
+				send125_present=1
+				break
+			fi
+		done
+
+		if [ ${send125_present} -eq 0 ]; then
+			configure_send_op125 "" "${lan}" "dhcp"
+			ubus call uci commit '{"config":"dhcp"}'
+		fi
+	fi
+}
+
+enable_disable_dhcp_option125() {
+	local wan="${1}"
+	local action="${2}"
+
+	local reqopts="$(uci -q get network.$wan.reqopts)"
+	local sendopts="$(uci -q get network.$wan.sendopts)"
+	local proto="$(uci -q get network.$wan.proto)"
+	local newreqopts=""
+	local newsendopts=""
+	local req125_present=0
+	local send125_present=0
+	local network_uci_update=0
+	local opt125="125:"
+
+	for ropt in $reqopts; do
+		case $ropt in
+			125) req125_present=1 ;;
+			*) ;;
+		esac
+	done
+
+	for sopt in $sendopts; do
+		if [[ "$sopt" == "$opt125"* ]]; then
+			send125_present=1
+			break
+		fi
+	done
+
+	if [ "${proto}" == "dhcp" ]; then
+		if [ "${action}" == "enable" ]; then
+			if [ ${req125_present} -eq 0 ]; then
+				newreqopts="$reqopts 125"
+				uci -q set network.$wan.reqopts="$newreqopts"
+				network_uci_update=1
+			fi
+
+			if [ ${send125_present} -eq 0 ]; then
+				configure_send_op125 "${sendopts}" "${wan}" "network"
+				network_uci_update=1
+			fi
+		else
+			if [ ${req125_present} -eq 1 ]; then
+				newreqopts=$(echo ${reqopts/125/})
+				uci -q set network.$wan.reqopts="$newreqopts"
+				network_uci_update=1
+			fi
+
+			if [ ${send125_present} -eq 1 ]; then
+				for sopt in $sendopts; do
+					if [[ "$sopt" == "$opt125"* ]]; then
+						newsendopts=$(echo ${sendopts/"${sopt}"/})
+						uci -q set network.$wan.sendopts="$newreqopts"
+						network_uci_update=1
+						break
+					fi
+				done
+			fi
+		fi
+	fi
+
+	if [ ${network_uci_update} -eq 1 ]; then
+		uci commit network
+		ubus call network reload
+	fi
+}
+
 wait_for_resolvfile() {
 	local time=$1
 	local tm=1
@@ -50,65 +278,49 @@ wait_for_resolvfile() {
 	local resolvfile="$(uci -q get dhcp.@dnsmasq[0].resolvfile)"
 	[ -n "$resolvfile" ] || return
 
-	while [ ! -f $resolvfile ]; do
+	while [ ! -f "$resolvfile" ]; do
 		sleep 1
-		[ $tm -ge $time ] && break
+		[ "$tm" -ge "$time" ] && break
 		tm=$((tm+1))
 	done
 }
 
-set_wan_interface() {
-	local wan_interface="${1}"
-	local l3_device=""
-
-	if [ -z "${wan_interface}" ]; then
-		return 0;
-	fi
-
-	json_load "$(ifstatus ${wan_interface})"
-	json_get_var l3_device l3_device
-	if [ -n "$l3_device" ]; then
-		uci -q set cwmp.cpe.interface="${l3_device}"
-		uci -q commit cwmp
-	fi
-}
-
 copy_cwmp_etc_files_to_varstate() {
-	if [ ! -f /var/state/cwmp ]
-	then
-		if [ -f /etc/icwmpd/cwmp ]
-		then
-			uci -q -c /etc/icwmpd delete cwmp.acs
-			uci -q -c /etc/icwmpd commit cwmp
-			cp /etc/icwmpd/cwmp /var/state/cwmp
-		else
-			touch /var/state/cwmp
-		fi
+	mkdir -p /var/run/icwmpd
+
+	if [ -f /etc/icwmpd/cwmp ]; then
+		uci -q -c /etc/icwmpd delete cwmp.acs
+		uci -q -c /etc/icwmpd commit cwmp
+		cp -f /etc/icwmpd/cwmp /var/state/cwmp
 	fi
 
-	mkdir -p /var/run/icwmpd
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
-	then
-		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
+	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
+		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]
-	then
-		mv /etc/icwmpd/dm_enabled_notify /var/run/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
 }
 
 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/run/icwmpd/icwmpd_backup_session.xml ]
-	then
-		cp /var/run/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/run/icwmpd/dm_enabled_notify.xml ]
-	then
-		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
+
+	if [ -f /var/state/cwmp ]; then
+		uci -q -c /var/state delete cwmp.sess_status
+		uci -q -c /var/state commit cwmp
+		cp -f /var/state/cwmp /etc/icwmpd/
+	fi
+
+	# move the successful custom notify import marker to persistent storage
+	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
+		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
 	fi
 }
 
@@ -120,12 +332,13 @@ validate_acs_section()
 		'periodic_inform_interval:uinteger' \
 		'periodic_inform_time:string' \
 		'url:string' \
+		'dhcp_discovery:string' \
 		'dhcp_url:string' \
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
 		'retry_interval_multiplier:range(1000, 65535)' \
-		'https_ssl_capath:file' \
-		'ipv6_enable:bool'
+		'ipv6_enable:bool' \
+		'ssl_capath:string'
 
 }
 
@@ -154,6 +367,7 @@ validate_cpe_section()
 }
 
 validate_defaults() {
+	local ssl_capath
 	config_load cwmp
 
 	validate_acs_section || {
@@ -161,96 +375,130 @@ validate_defaults() {
 		return 1;
 	}
 
-	[ -z "${url}" -a -z "${dhcp_url}" ] && {
-		log "ACS url is empty can't start"
-		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;
 }
 
 boot() {
-	local dhcp_url=""
-	local discovery="1"
+	local dhcp_discovery="0"
 
 	config_load cwmp
-	config_get_bool dhcp_discovery acs dhcp_discovery 1
-	config_get dhcp_url acs dhcp_url ""
+	config_get dhcp_discovery acs dhcp_discovery "0"
 
-	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
-		if [ -z "${dhcp_url}" ]; then
-			log "dhcp discovery enabled but no dhcp url, trigger update"
-			/etc/icwmpd/update.sh
-		fi
+	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}"
 	fi
+
+	config_get lan_interface cpe default_lan_interface ""
+	if [ -n "${lan_interface}" ]; then
+		# Set dhcp_option 125 if not already configured
+		enable_disable_dhcp_option125 "${wan_interface}" "enable"
+		enable_dnsmasq_option125 "${lan_interface}"
+	else
+		# Remove dhcp option 125 if exists
+		enable_disable_dhcp_option125 "${wan_interface}" "disable"
+	fi
+	
+	config_get ssl_capath acs ssl_capath
+
+	if [ -n "${ssl_capath}" ]; then
+		regenerate_ssl_link "${ssl_capath}"
+	fi
+
 	start
 }
 
 start_service() {
 	local enable_cwmp
-	local wan_interface
-	local dhcp_discovery
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
-	config_get dhcp_discovery acs dhcp_discovery
-	config_get wan_interface cpe default_wan_interface "wan"
 
-	if [ "$enable_cwmp" = "0" -o "$enable_cwmp" = "false" ]; then
-		log "CWMP is not enabled"
+	if [ "$enable_cwmp" = "0" ]; then
 		return 0
 	fi
 
-	# Set wan interface if not configured
-	set_wan_interface "${wan_interface}"
-
-	# Set dhcp option 43 if dhcp discovery enabled
-	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
-		enable_dhcp_option43 "${wan_interface}"
-	fi
-
 	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
 	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
 	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
 
-	# Copy backup data so that if it restart latter on it gets the info
-	copy_cwmp_etc_files_to_varstate
-
 	validate_defaults || {
 		log "Validation of defaults failed"
 		return 1;
 	}
 
+	# Copy backup data so that if it restart latter on it gets the info
+	copy_cwmp_etc_files_to_varstate
+
 	procd_open_instance icwmp
 	procd_set_param command "$PROG"
 	procd_append_param command -b
 	procd_set_param respawn \
-		${respawn_threshold:-5} \
-		${respawn_timeout:-10} ${respawn_retry:-3}
+		"${respawn_threshold:-5}" \
+		"${respawn_timeout:-10}" "${respawn_retry:-3}"
 
 	procd_set_param watch network.interface
 	procd_close_instance
 }
 
+service_stopped()
+{
+	copy_cwmp_varstate_files_to_etc
+}
+
 stop_service()
 {
 	copy_cwmp_varstate_files_to_etc
 }
 
 reload_service() {
-	log "Restarting CWMP client"
-	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
+
+	tr069_status="$(ubus -t 1 call tr069 status)"
+	ret="$?"
+	if [ "$ret" = "7" ]; then
+		# ubus timed out may be due to uloop is busy in some task so returning
+		return 0
+	fi
+
+	status="$(echo $tr069_status | jsonfilter -qe '@.cwmp.status')"
+	ret="$?"
+	if [ "$status" = "up" ]; then
+		ubus -t 1 call tr069 command '{"command":"reload"}'
+		ret="$?"
+	fi
+
+	if [ "$status" = "init" ] || [ "$ret" -ne "0" ]; then
+		log "Restarting CWMP client"
+		stop
+		start
+	fi
 }
 
 service_triggers() {

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

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

icwmp/files/etc/uci-defaults/95-icwmp-generate-ssl

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

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

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

ieee1905/Config.in

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

ieee1905/Config.map-plugin.in

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

ieee1905/Makefile

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

ieee1905/files/etc/config/ieee1905

@@ -2,21 +2,31 @@ config ieee1905 'ieee1905'
 	option enabled '1'
 	option extension '1'
 	list extmodule 'map'
-	option registrar '2 5'
+	option registrar '2 5 6'
+#	option macaddress '0a:1b:2c:3d:4e:50'
 
+config al-iface
+	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 ap
+	option band '6'
+	option ssid 'IOWRT-6GHz'
+	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

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

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

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

ieee1905/plugins/map.mk

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

ieee1905/plugins/snoop.mk

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

ieee1905/plugins/topology.mk

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

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,106 +1,210 @@
-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_port-management=y
+CONFIG_PACKAGE_wifimngr=y
+
+# Multi-AP #
+CONFIG_PACKAGE_ieee1905=y
+CONFIG_PACKAGE_map-agent=m
+CONFIG_PACKAGE_map-controller=m
+CONFIG_PACKAGE_map-topology=y
+CONFIG_PACKAGE_wfadatad-collector=y
+
+# 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_gre=y
-CONFIG_PACKAGE_icwmp=y
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_mosquitto-client-ssl=y
-CONFIG_PACKAGE_mosquitto-ssl=y
-CONFIG_PACKAGE_wfadatad=y
-CONFIG_PACKAGE_wfadatad-collector=y
-CONFIG_PACKAGE_imonitor=m
-CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_ip-full=y
-CONFIG_PACKAGE_iperf3=y
-CONFIG_PACKAGE_ipset=y
-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_iwatchdog is not set
-CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_libreswan=m
-CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_lscpu=y
-CONFIG_PACKAGE_luci-nginx=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
+
+# Services #
+CONFIG_PACKAGE_atftp=m
+CONFIG_PACKAGE_atftpd=m
+CONFIG_PACKAGE_ddns-scripts=y
+CONFIG_PACKAGE_dnsmasq=y
+CONFIG_PACKAGE_miniupnpd-iptables=y
+CONFIG_PACKAGE_mosquitto-client-ssl=y
+CONFIG_PACKAGE_mosquitto-ssl=y
+CONFIG_PACKAGE_nginx=y
+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
+CONFIG_PACKAGE_iptables-zz-legacy=y
+CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
+CONFIG_PACKAGE_iptables-mod-filter=y
+CONFIG_PACKAGE_iptables-mod-ipopt=y
+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_libustream-openssl=y
+# CONFIG_PACKAGE_libustream-wolfssl is not set
+CONFIG_PACKAGE_lscpu=y
+CONFIG_PACKAGE_nand-utils=y
+CONFIG_PACKAGE_openssl-util=y
+CONFIG_OPENSSL_WITH_COMPRESSION=y
+CONFIG_PACKAGE_procd-ujail=m
+CONFIG_PACKAGE_rpcd=y
+CONFIG_PACKAGE_rpcd-mod-rpcsys=y
+CONFIG_PACKAGE_rpcd-mod-rrdns=y
+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
-CONFIG_TARGET_CUSTOMER="IOPSYS"
-# CONFIG_USE_SSTRIP is not set
-CONFIG_USE_STRIP=y
-CONFIG_BUILD_LOG=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_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 +224,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,40 +288,10 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
-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_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
+# Use fw3 iptables-based instead of newer nftables-based fw4
+# TODO: for now we cannot build an image with fw3 and luci-app-firewall (i.e. fw3)
+# Enabling luci-app-firewall enables fw4
+# CONFIG_PACKAGE_luci-app-firewall is not set
+CONFIG_PACKAGE_firewall=y
+# CONFIG_PACKAGE_firewall4 is not set

iop/scripts/feeds_update.sh

@@ -2,58 +2,65 @@
 
 function feeds_update {
 
-    developer=0
-    override=1
-    start=$(date -u +'%s');
-    while getopts "n" opt; do
-	case $opt in
-	    n)
-		override=0
-		;;
-	esac
-    done
+	developer=0
+	override=1
+	start=$(date -u +'%s')
+	while getopts "n" opt; do
+		case $opt in
+		n)
+			override=0
+			;;
+		esac
+	done
 
+	git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
-    git remote -v | grep -qE '(git@|ssh://)' && developer=1
+	cp .config .genconfig_config_bak
 
-    cp .config .genconfig_config_bak
-
-    #if -d argument is passed, clone feeds with ssh instead of http
-    if [ $developer == 1 ]; then
-	./scripts/feeds update -g
-    else
-	./scripts/feeds update
-    fi
+	#if -d argument is passed, clone feeds with ssh instead of http
+	if [ $developer == 1 ]; then
+		./scripts/feeds update -g
+	else
+		./scripts/feeds update
+	fi
 	./scripts/feeds update -ai
 
-    # replace core packages with iopsys versions
-    if [ $override == 1 ]; then
+	# replace core packages with iopsys versions
+	if [ $override == 1 ]; then
 		./scripts/feeds install -f -p openwrt_core -a
-    fi
+	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
-    do
-	rm -f target/linux/$target
-	./scripts/feeds install -p targets $target
-    done
+	# targets need to be installed explicitly
+	for target in $(ls ./feeds/targets); do
+		rm -f target/linux/$target
+		./scripts/feeds install -p targets $target
+	done
 
-    # install all packages
-    ./scripts/feeds install -a
+	# Workaround for bug in 22.03.0-rc4 where installed target path has been
+	# moved to target/linux/feeds but Config.in and Makefile from installed
+	# targets are not properly included from the new location.
+	# This hack is to be removed once the issues are fixed.
+	# Note that the above block of code might no longer necessary because
+	# targets no longer need to be installed explicitly.
+	echo "Working around installed-target-bug"
+	for f in target/linux/feeds/*; do
+		ln -vsf "feeds/$(basename "$f")" "target/linux/$(basename "$f")"
+	done
 
-    # remove broken symlinks ( for packages that are no longer in the feed )
-    find -L package/feeds -maxdepth 2 -type l -delete
+	# install all packages
+	./scripts/feeds install -a
 
-    cp .genconfig_config_bak .config
-    make defconfig
+	# remove broken symlinks ( for packages that are no longer in the feed )
+	find -L package/feeds -maxdepth 2 -type l -delete
 
-    # record when we last run this script
-    touch tmp/.iop_bootstrap
+	cp .genconfig_config_bak .config
+	make defconfig
 
-    # always return true
-    exit 0
+	# record when we last run this script
+	touch tmp/.iop_bootstrap
+
+	# always return true
+	exit 0
 }
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
-

iop/scripts/genconfig.sh

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

iop/scripts/genconfig_min.sh

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

iop/scripts/install_key.sh

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

iop/scripts/iopupgrade.sh

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

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

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

map-agent/Makefile

@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2020-21 IOPSYS Software Solutions AB
+# Copyright (C) 2020-22 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=7.1.10
+PKG_VERSION:=2.10.3.25
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8d2fa1af3b0cbdb65f791b490e72c5925cccaa05
+PKG_SOURCE_VERSION:=fa73ec8a5128dd9609abfd17ca40dbf10327684b
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
-PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 LOCAL_DEV=0
@@ -28,7 +28,7 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +map-plugin
+	  +map-plugin +ip-bridge
 endef
 
 
@@ -56,12 +56,27 @@ endef
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 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
@@ -69,6 +84,8 @@ define Package/map-agent/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/lib/wifi
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/script/* $(1)/lib/wifi/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef
 

map-agent/files/etc/config/mapagent

@@ -1,34 +1,132 @@
 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 controller_macaddr '0a:1b:2c:3d:4e:50'
 
+config dynamic_backhaul
+	option missing_bh_timer '60'
+	option missing_bh_reconfig_timer '1800'
+
+config controller_select
+	option id 'auto'
+	option probe_int '20'
+	option retry_int '9'
+	option autostart '1'
+	option local '0'
+
+config radio
+	option device 'phy0'
+	option band '2'
+# options below are auto-generated during onboarding
+#	option steer_policy '0'
+#	option util_threshold '0'
+#	option rcpi_threshold '70'
+#	option report_rcpi_threshold '80'
+#	option rcpi_hysteresis_margin '0'
+#	option report_util_threshold '0'
+#	option include_sta_stats '1'
+#	option include_sta_metric '1'
+
+config radio
+	option device 'phy1'
+	option band '5'
+# options below are auto-generated during onboarding
+#	option steer_policy '0'
+#	option util_threshold '0'
+#	option rcpi_threshold '86'
+#	option report_rcpi_threshold '96'
+#	option rcpi_hysteresis_margin '0'
+#	option report_util_threshold '0'
+#	option include_sta_stats '1'
+#	option include_sta_metric '1'
+
+config bsta
+	option enabled '1'
+	option ifname 'wlan0'
+	option band '2'
+	option device 'phy0'
+	option priority '2'
+# options below are auto-generated during onboarding
+#	option ssid 'MAP-BH-2.4GHz'
+#	option encryption 'sae-mixed'
+#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
+#	option onboarded '1'
+#	option bssid '0a:1b:2c:3d:4e:53'
+#	option vid '1'
+
+config bsta
+	option enabled '1'
+	option ifname 'wlan1'
+	option band '5'
+	option device 'phy1'
+	option priority '0'
+# options below are auto-generated during onboarding
+#	option ssid 'MAP-BH-5GHz'
+#	option encryption 'sae-mixed'
+#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
+#	option onboarded '1'
+#	option bssid '0a:1b:2c:3d:4e:54'
+#	option vid '1'
+
+# ap sections and policy section are
+# auto-generated during onboarding
+#
 #config ap
-#	option ifname 'wl0'
-#	option steer 'rssi bssload'
-#	list exclude '00:11:22:33:44:55'
-#	list exclude_btm '00:aa:bb:cc:dd:ee'
-#	list assoc_ctrl '00:10:20:30:40:50'
-#	option btm_retry '3'
-#	option btm_retry_secs '180'
-#	option fallback_legacy '1'
-#	option steer_legacy_reassoc_secs '30'
-#	option steer_legacy_retry_secs '3600'
-#	option assoc_ctrl_secs '30'
-#	option band '2'
-#	option type 'fronthaul'
-
-#config ap
-#	option ifname 'wl1'
-#	option steer 'rssi bssload'
-#	list exclude '00:11:22:33:44:55'
-#	list exclude_btm '00:aa:bb:cc:dd:ee'
-#	option band '5'
-#	option type 'fronthaul'
-
-#config bsta
-#	option ifname 'apclii0'
 #	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,22 +1,78 @@
 #!/bin/sh
 
-wan=$(db -q get hw.board.ethernetWanPort)
-MAPFILE="/tmp/multiap.backhaul"
+. /lib/network/utils.sh
 
+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}"
 
-[ -z "$wan" ] && exit 1 # no configuration
-[ "$PORT" != "$wan" ] && exit 0
+# 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
@@ -34,16 +90,16 @@ update_bstas() {
 }
 
 if [ "$LINK" = "up" ]; then
-	#touch "$MAPFILE"
-
+	#touch "$map_bh_file"
 	config_load "mapagent"
-	bridge=$(uci get mapagent.agent.al_bridge | cut -d '-' -f2)
-	config_foreach remove_from_bridge bsta $bridge
+	config_foreach remove_from_bridge bsta
 	config_foreach update_bstas bsta down
 
 	/lib/wifi/multiap set_uplink "eth" "$PORT"
 else
-	rm -f "$MAPFILE"
+	/lib/wifi/multiap unset_uplink "eth"
+	#rm -f "$map_bh_file"
 	config_load "mapagent"
 	config_foreach update_bstas bsta up
+
 fi

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

@@ -10,56 +10,9 @@ IS_CFG_VALID=1
 MAP_DEV="map_dev"
 MAP_IF="map"
 
-create_map() {
-	ip link add lei type veth peer name lei_map 2>/dev/null
-	ip link add link lei name lei_lan type vlan id 1 2>/dev/null
-
-	uci -q set network.${MAP_DEV}=device
-	uci -q set network.${MAP_DEV}.name=br-map
-	uci -q set network.${MAP_DEV}.type=bridge
-
-	uci -q show network.${MAP_DEV}.ports | grep -q lei_map || {
-		uci -q add_list network.${MAP_DEV}.ports='lei_map'
-	}
-
-	uci -q set network.${MAP_IF}=interface
-	uci -q set network.${MAP_IF}.device=br-map
-	uci -q set network.${MAP_IF}.is_lan=1
-
-	uci -q show network.br_lan.ports | grep -q lei_lan || {
-		uci -q add_list network.br_lan.ports="lei_lan"
-	}
-
-	uci -q set mapagent.agent.al_bridge=br-map
-
-	uci -q commit
-
-	ubus call network reload
-	ubus -t 5 wait_for network.interface.map
-
-	brctl addif br-map lei_map 2>/dev/null
-	brctl addif br-lan lei_lan 2>/dev/null
-
-	ip link set lei up 2>/dev/null
-	ip link set lei_map up 2>/dev/null
-	ip link set lei_lan up 2>/dev/null
-}
-
-remove_map() {
-	ip link delete ${MAP_VETH} &>/dev/null
-
-	uci -q delete network.${MAP_DEV}
-	uci -q delete network.${MAP_IF}
-
-	uci -q set mapagent.agent.al_bridge=br-lan
-
-	uci -q commit
-
-	ubus call network reload
-}
 
 start_dynbhd_service() {
-	rm -f /tmp/map.agent.bsta_global_disable
+	rm -f /tmp/multiap.backhaul
 	procd_open_instance
 	procd_set_param command "/usr/sbin/dynbhd"
 	procd_set_param respawn
@@ -79,7 +32,10 @@ validate_agent_section() {
 		'netdev:string' \
 		'vlan_segregation:bool:false' \
 		'resend_num:uinteger:0' \
-		'dyn_cntlr_sync:bool:true'
+		'dyn_cntlr_sync:bool:true' \
+		'island_prevention:bool:false' \
+		'eth_onboards_wifi_bhs:bool:false'
+
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of agent section failed"
@@ -113,7 +69,7 @@ validate_ap_section() {
 	uci_validate_section mapagent $section "${1}" \
 			'ifname:string' \
 			'device:string' \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'enabled:bool:true' \
 			'onboarded:bool:false' \
 			'ssid:string' \
@@ -135,18 +91,19 @@ validate_radio_section() {
 
 	uci_validate_section mapagent $section "${1}" \
 			'device:string' \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'configured:bool:false' \
 			'onboarded:bool:false' \
 			'dedicated_backhaul:bool:false' \
-            'steer_policy:range(0,255)' \
+			'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)'
+			'report_util_threshold:range(0,255)' \
+			'encryption:or("sae", "psk2", "sae-mixed")'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of radio section failed"
@@ -178,14 +135,31 @@ validate_policy_section() {
 	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_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"
@@ -194,6 +168,10 @@ validate_agent_config() {
 	return 0
 }
 
+create_dir() {
+        mkdir -p /var/run/multiap
+}
+
 start_service() {
 	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
 
@@ -208,22 +186,15 @@ 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"
+	create_dir
+	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

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

map-agent/files/lib/wifi/traffic_separation

@@ -1,511 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-### Traffic Separation ###
-
-dbg() {
-	logger -t traffic_separation $@
-}
-
-ts_sub() {
-
-	ts_usage() {
-		cat <<EOF
-Usage: $0 [create|delete|populate|primary|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)
-reload     				- reload network with new configuration
-EOF
-	exit 1
-	}
-
-	_get_bridge() {
-		local bridge=$(ip link show $1 | grep -o "master [^\s]*" | cut -d ' ' -f 2)
-		echo $bridge
-	}
-
-	set_wireless_bridge() {
-		config_load wireless
-
-		_set_network() {
-			local sec=$1
-			local iface=$2
-			local bridge=$3
-
-			config_get ifname $sec ifname
-			[ "$iface" != "$ifname" ] && continue
-
-			config_get mode $sec mode
-			config_get multi_ap $sec multi_ap "0"
-			[ "$mode" = "sta" -a "$multi_ap" = "1" ] && continue
-
-			config_get network $sec network
-			local new_network=${bridge##br-}
-			if [ "$new_network" != "$network" ] ; then
-				uci -q set wireless.${sec}.network=${new_network}
-				uci commit wireless
-			fi
-
-			brctl addif $bridge $iface &> /dev/null
-		}
-
-		config_foreach _set_network wifi-iface ${1} ${2}
-	}
-
-	ts_create() {
-
-		_create_vlan_dev() {
-			iface=$1				# real iface
-			vid=$2					# Vlan ID
-			bridge=$3				# bridge iface should be connected
-			vlan_dev=$4
-
-			old_bridge="$(_get_bridge $iface)"	# bridge iface is connected to
-
-			# remove interface from bridge if it is in one
-			[ -n "$old_bridge" ] && brctl delif $old_bridge $iface &> /dev/null
-
-			# (re)create vlan device
-			ip link show $vlan_dev && vlanctl --if-delete $vlan_dev
-			vlanctl --mcast --if-create-name $iface $vlan_dev --if $iface --set-if-mode-rg
-
-			vlanctl --if $iface --tx --tags 0 --default-miss-drop
-			vlanctl --if $iface --tx --tags 1 --default-miss-drop
-			vlanctl --if $iface --tx --tags 2 --default-miss-drop
-			vlanctl --if $iface --rx --tags 0 --default-miss-drop
-			vlanctl --if $iface --rx --tags 1 --default-miss-drop
-			vlanctl --if $iface --rx --tags 2 --default-miss-drop
-
-			# bring the vlan device up and add back to bridge if it was in one
-			brctl addif $bridge $vlan_dev &> /dev/null
-		}
-
-		ts_create_fh() {
-			iface=$1				# fh iface
-			vid=$2					# SSID specific (secondary) or primary vid
-			bridge=$3
-
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$bridge" ]  || {
-				cat <<EOF
-Adding FH device requires IFACE, VID and bridge
-EOF
-				exit 1
-			}
-
-			# create vlan device
-			#set_wireless_bridge $iface $bridge
-
-			vlan_dev=${iface}_vlan${vid}
-			ip link set $vlan_dev down
-			_create_vlan_dev $iface $vid $bridge $vlan_dev
-
-			# add rules
-#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x886c --set-rxif $vlan_dev --rule-append		# incoming brcm
-
-			# EAPOL frames
-			vlanctl --if $iface --rx --tags 0 --filter-ethertype 34958 --set-rxif $vlan_dev --rule-append
-			vlanctl --if $iface --rx --tags 1 --filter-ethertype 34958 --pop-tag --set-rxif $vlan_dev --rule-append
-			vlanctl --if $iface --tx --tags 0 --filter-txif $vlan_dev --filter-ethertype 34958 --rule-append
-
-			# 8021q vlan id TAG/UNTAG
-			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
-
-			ip link set $iface up
-			ip link set $vlan_dev up
-		}
-
-		ts_create_bh() {
-			iface=$1				# bh iface
-			vid=$2					# primary vid
-			profile=$3				# agent profile (1 or 2)
-			bridge=$4				# bridge interface should be connected to
-
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
-				cat <<EOF
-Adding BH device requires IFACE, VID and PROFILE (1 or 2).
-EOF
-				exit 1
-			}
-
-			#[ -n "$bridge" ] && set_wireless_bridge $iface $bridge
-
-			old_vid=$(wl -i $1 map_8021q_settings)
-			old_vid=${old_vid##* }
-			old_profile=$(wl -i $1 map_profile | cut -d ' ' -f 3)
-
-			[ "$old_vid" = "$vid" -a "$old_profile" = "$profile" ] && return
-
-			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_lei() {
-			vid=$1					# primary vid
-			pbits=$2				# default pbits to apply
-			vlan_bridge=$3				# name of ts subsystem bridge
-			lan_bridge=$4				# name of node local bridge
-
-			[ -n "$vid" ] && [ -n "$pbits" ] && [ -n "$vlan_bridge" ] && [ -n "$lan_bridge" ] || {
-				cat <<EOF
-Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
-EOF
-				exit 1
-			}
-
-			ip link show lei &> /dev/null || {
-				ip link add link lei name lei_lan type vlan id 1 2>/dev/null
-			}
-
-			old_vid=$(ip -d link show lei_lan | sed -n 's/vlan.*id \([0-9][0-9]*\) .*/\1/p')
-
-			[ "$old_vid" != "$vid" ] && {
-				ip link del lei_lan
-				ip link add link lei name lei_lan type vlan id ${vid}
-			}
-
-			brctl addif ${lan_bridge} lei_lan &>/dev/null
-			brctl addif ${vlan_bridge} lei_map &>/dev/null
-
-			ip link set lei up
-			ip link set lei_map up
-			ip link set lei_lan up
-		}
-
-		_create_eth() {
-			iface=$1				# Multi-AP Logical Ethernet Interface
-			vid=$2					# primary vid
-			bridge=$3				# name of ts subsystem bridge
-			pbits=0
-
-			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$bridge" ] || {
-				cat <<EOF
-Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
-EOF
-				exit 1
-			}
-
-			dbg create $@
-
-			ip link set $iface down
-
-			vlan_dev=${iface}_vlan${vid}
-			ip link set $vlan_dev down
-			_create_vlan_dev $iface $vid $bridge $vlan_dev
-
-			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
-
-			[ $# -le 3 ] && exit 0
-			shift 3
-
-			while [ -n "$1" ] ; do
-				vid=$1
-				vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append
-				vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append
-				shift
-			done
-
-			ip link set $iface up
-			ip link set $vlan_dev up
-		}
-
-		ts_create_eths() {
-			pvid=$1					# primary vid
-			bridge=$2				# name of ts subsystem bridge
-
-			shift 2
-			# TODO use ieee1905 bridge
-			for iface in $(uci get network.br_lan.ports) ; do
-				[ "$iface" = "lei_lan" ] && continue
-				_create_eth $iface $pvid $bridge $@
-				ubus call ieee1905 del_interface "{\"ifname\":\"$iface\"}"
-			done
-		}
-
-		ts_create_dhcp() {
-			local diff=""
-
-                        _net_setup() {
-				local name=$1
-				local devname=$2
-				local vid=$3
-
-				[ -z "$(uci -q get network.${name})" ] && {
-					uci -q set network.${name}="interface"
-					uci -q set network.${name}.device="$devname"
-					uci -q set network.${name}.is_lan="1"
-					uci -q set network.${name}.proto="static"
-					# TODO vid > 255
-					local ip_addr="192.168.${vid}.1"
-					[ "${vid}" = "1" ] && ip_addr="192.168.${vid}.2"
-					uci -q set network.${name}.ipaddr="${ip_addr}"
-					uci -q set network.${name}.netmask="255.255.255.0"
-
-					diff="1"
-				}
-
-				[ "$diff" = "1" ] && uci -q commit network
-			}
-
-			_br_setup() {
-				local name=$1
-				local sinkname=$2
-				local vid=$3
-
-				[ -z "$(uci -q get network.${name}_dev)" ] && {
-					uci -q set network.${name}_dev="device"
-					uci -q set network.${name}_dev.name="br-${name}"
-					uci -q set network.${name}_dev.type="bridge"
-					uci -q set network.${name}_dev.bridge_empty="1"
-					uci -q add_list network.${name}_dev.ports="${sinkname}"
-
-					diff="1"
-				}
-
-				[ -z "$(uci -q get network.${name})" ] && {
-					uci -q set network.${name}="interface"
-					uci -q set network.${name}.device="br-${name}"
-					uci -q set network.${name}.is_lan="1"
-					uci -q set network.${name}.proto="static"
-					uci -q set network.${name}.ipaddr="192.168.${vid}.1"
-					uci -q set network.${name}.netmask="255.255.255.0"
-
-					diff="1"
-				}
-
-				[ "$diff" = "1" ] && uci -q commit network
-			}
-
-			_dhcp_setup() {
-				local name=$1
-
-				[ -n "$(uci -q get dhcp.${name})" ] && return
-
-				uci -q set dhcp.${name}=dhcp
-				uci -q set dhcp.${name}.interface="${name}"
-				uci -q set dhcp.${name}.start="100"
-				uci -q set dhcp.${name}.limit="150"
-				uci -q set dhcp.${name}.leasetime="1h"
-				uci -q set dhcp.${name}.dhcpv4="server"
-				uci -q set dhcp.${name}.dhcpv6="server"
-				uci -q set dhcp.${name}.ra="server"
-				uci -q set dhcp.${name}.ra_slaac="1"
-				uci -q add_list dhcp.${name}.ra_flags="managed-config"
-				uci -q add_list dhcp.${name}.ra_flags="other-config"
-
-				diff="1"
-				uci -q commit dhcp
-			}
-
-			_firewall_setup() {
-				local name=$1
-				local network=$2
-				local zone_exist=0
-
-				config_load firewall
-
-				_process_zone() {
-					local section=$1
-					local new_name=$2
-					local name
-
-					config_get name $section name
-
-					[ "$name" == "$new_name" ] && zone_exist=1
-				}
-
-				config_foreach _process_zone zone $name
-
-				[ "$zone_exist" != "0" ] && return
-
-				uci -q add firewall zone
-				uci -q set firewall.@zone[-1].name="$name"
-				uci -q add_list firewall.@zone[-1].network="$network"
-				uci -q set firewall.@zone[-1].input='ACCEPT'
-				uci -q set firewall.@zone[-1].output='ACCEPT'
-				uci -q set firewall.@zone[-1].forward='ACCEPT'
-
-				uci -q add firewall forwarding
-				uci -q set firewall.@forwarding[-1].src="$name"
-				uci -q set firewall.@forwarding[-1].dest="wan"
-
-				diff="1"
-				uci -q commit firewall
-			}
-
-			vid=$1					# primary vid
-
-			[ -n "$vid" ] || {
-				cat <<EOF
-VID required to configure DHCP.
-EOF
-				exit 1
-			}
-
-			ip link show sink${vid} || {
-				ip link add sink${vid} type veth peer name sink${vid}_vlan
-				ip link add link sink${vid} name sink${vid}_peer type vlan id ${vid}
-			}
-
-			ip link set sink${vid} up
-			ip link set sink${vid}_peer up
-			ip link set sink${vid}_vlan up
-
-			diff=""
-			_net_setup sink${vid} sink${vid}_peer ${vid}
-			_dhcp_setup sink${vid}
-			_firewall_setup lan${vid} sink${vid}
-
-			[ "$diff" = "1" ] && {
-				ubus call network reload
-				ubus -t 5 wait_for network.interface.sink${vid}
-			}
-
-			brctl addif br-map sink${vid}_vlan &> /dev/null
-		}
-
-	local type=$1
-	shift
-
-	case "$type" in
-		fh) ts_create_fh $@;;
-		bh) ts_create_bh $@;;
-		lei) ts_create_lei $@;;
-		eths) ts_create_eths $@;;
-		dhcp) ts_create_dhcp $@;;
-		--help|help) ts_usage;;
-		*) ts_usage; exit 1;;
-	esac
-	}
-
-	ts_delete() {
-		iface=$1
-
-		path=$(ls -d /sys/class/net/${iface}/upper_*)
-		[ -z "$path" ] && exit 0
-
-		vlan_dev=${path##*upper_}
-		bridge="$(_get_bridge $vlan_dev)"
-
-		[ -n "$bridge" ] && {
-			vlanctl --if-delete $vlan_dev		# note: also removes rules and removes from bridge
-			brctl addif $bridge $iface &> /dev/null # needed to add again
-                }
-
-	}
-
-	ts_populate() {
-		local type=$1
-		shift
-
-		[ "$type" == "eth" ] || {
-			cat <<EOF
-Populating ETH rules requires IFACE and VID.
-EOF
-			exit 1
-		}
-
-		iface=$1				# Multi-AP Logical Ethernet Interface
-		vid=$2					# secondary vid
-
-		path=$(ls -d /sys/class/net/${iface}/upper_*)
-		[ -z "$path" ] && exit 1
-		vlan_dev=${path##*upper_}
-
-		# add rules
-		#vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append		# note: retain secondary vids
-		#vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append		# note: already default
-	}
-
-	ts_primary() {
-		local func=$1
-		shift
-
-		case "$func" in
-			get) vid=$(wl -i $1 map_8021q_settings); echo ${vid##* };;
-			*) ts_usage; exit 1;;
-		esac
-	}
-
-	ts_unicast() {
-		local mac=$1
-		local iface=$2
-
-		# TODO: improve?
-		res=$(ebtables -t broute -L | grep -i "$mac" | grep "$iface")
-		[ -n "$res" ] && return
-
-		ebtables -t broute -D BROUTING -d "$mac" -p 0x893a -j DROP
-		ebtables -t broute -I BROUTING -i "$iface" -d "$mac" -p 0x893a -j DROP
-	}
-
-	ts_multicast() {
-		local iface=$1
-
-		# TODO: improve?
-		res=$(ebtables -t broute -L | grep -i "1:80:C2:00:00:13" | grep "$iface")
-		[ -n "$res" ] && return
-
-		ebtables -t broute -D BROUTING -d 01:80:C2:00:00:13 -p 0x893a -j DROP
-		ebtables -t broute -D BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
-		ebtables -t broute -I BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
-	}
-
-	ts_reload() {
-		local dhcp_reload=$1
-
-		# workaround for missing backhaul wifi.ap.* ubus obj's:
-		# iterate in config and setup bh
-		config_load wireless
-
-		_setup_bh_iface() {
-			local sec=$1
-			local iface=$2
-			local bridge=$3
-
-			config_get ifname $sec ifname
-
-			config_get mode $sec mode
-			config_get multi_ap $sec multi_ap "0"
-			[ "$mode" = "ap" -a "$multi_ap" = "1" ] && {
-				ts_create bh $ifname 1 2 br-map
-			}
-		}
-
-		config_foreach _setup_bh_iface wifi-iface
-
-		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
-
-		# another workaround for netif? removed
-		# sink devices for br-map bridge
-		for sink in $(ubus list network.interface.sink*) ; do
-			local sink_vlan=${sink/network.interface./}_vlan
-			brctl addif br-map $sink_vlan &> /dev/null
-		done
-	}
-
-	local func=$1
-	shift
-
-	case "$func" in
-		create) dbg "create $@"; ts_create $@;;
-		delete) dbg "delete $@"; ts_delete $@;;
-		populate) dbg "populate $@"; ts_populate $@;;
-		primary) dbg "primary $@"; ts_primary $@;;
-		unicast) dbg "unicast $@"; ts_unicast $@;;
-		multicast) dbg "multicast $@"; ts_multicast $@;;
-		reload) dbg "reload $@"; ts_reload $@;;
-		--help|help) ts_usage;;
-		*) ts_usage; exit 1;;
-	esac
-}

map-controller/Config.in

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

map-controller/Makefile

@@ -1,16 +1,13 @@
 #
-# 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:=6.0.5
+PKG_VERSION:=2.11.0.11
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3562b7f774e6dffda2e58ad2acb382fc439273fb
-
-PKG_LICENSE:=PROPRIETARY IOPSYS
-PKG_LICENSE_FILES:=LICENSE
+PKG_SOURCE_VERSION:=3f462d32e487115b1a1d6f92645d895dc5cd9c44
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -20,6 +17,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
 
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/map-controller
@@ -38,6 +38,7 @@ define Package/map-controller/config
 endef
 
 TARGET_CFLAGS += \
+	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
@@ -48,11 +49,18 @@ ifeq ($(CONFIG_CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
 
+ifeq ($(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT),y)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)\\\"
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
+endif
+
 define Package/map-controller/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
+	$(INSTALL_DIR) $(1)/usr/lib/mapcontroller
+	$(CP) $(PKG_BUILD_DIR)/src/plugins/steer/rcpi/rcpi.so $(1)/usr/lib/mapcontroller/rcpi.so
 endef
 
 ifeq ($(LOCAL_DEV),1)

map-controller/files/etc/config/mapcontroller

@@ -1,67 +1,143 @@
 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 primary_vid '1'
+	option use_bcn_metrics '0'
+	option use_usta_metrics '0'
+	option primary_vid '0'
 	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 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

@@ -23,7 +23,10 @@ validate_controller_section() {
 		'enable_sta_steer:bool:false' \
 		'enable_bsta_steer:bool:false' \
 		'use_bcn_metrics:bool:false' \
-		'use_usta_metrics:bool:false'
+		'use_usta_metrics:bool:false' \
+		'allow_bgdfs:range(0,2629744)' \
+		'channel_plan:range(0,2629744)' \
+		'enable_ts:bool:false'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapcontroller" "Validation of controller section failed"
@@ -37,7 +40,7 @@ validate_ap_section() {
 	local section="$1"
 
 	uci_validate_section mapcontroller $section "${1}" \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
 				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
@@ -90,7 +93,7 @@ validate_radio_section() {
 	uci_validate_section mapcontroller $section "${1}" \
 			'agent_id:macaddr' \
 			'macaddr:macaddr' \
-			'band:or("2", "5")' \
+			'band:or("2", "5", "6")' \
 			'steer_policy:range(0,2)' \
 			'util_threshold:range(0,255)' \
 			'rcpi_threshold:range(0,255)' \

map-topology/Config.in

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

map-topology/Makefile

@@ -1,37 +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.2.5
+PKG_VERSION:=2.5.1.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=ddf78cca217ebfa83733a532bdd2d17b6c3af54e
+PKG_SOURCE_VERSION:=ee72703a5c89983c881d8faedcdc749b54278790
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 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 += \
+	-Wno-error=deprecated-declarations \
 	-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
@@ -40,6 +48,11 @@ endef
 
 MAKE_PATH:=src
 
+ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)\\\"
+endif
+
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/map-topology/* $(PKG_BUILD_DIR)/

map-topology/files/etc/config/hosts

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

mosquitto-auth-shadow/Makefile

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

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

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

mosquitto-auth-shadow/src/Makefile

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

mosquitto-auth-shadow/src/mosquitto_auth_shadow.c

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

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/files/etc/init.d/netmode

@@ -34,12 +34,13 @@ start_service() {
 	[ -n "$mode" ] || return
 
 	# Get the last saved mode
-	lastmode="$(cat /etc/netmodes/.last_mode 2>/dev/null)"
+	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
-	echo "$mode" > /etc/netmodes/.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
 

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
+
+config OBUSPA_CONTROLLER_MTP_VERIFY
+	bool "Enable verification of MQTT response topic before processing the message"
+	default n
 endmenu
 endif

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=4.1.0.18
+PKG_VERSION:=6.0.0.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=af3d4663d66942e3b0e3253375c5620629769aa5
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
+PKG_SOURCE_VERSION:=b5afdfc4b7ba93698a6ac981fc0f300b5362b7bf
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -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,11 +100,16 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/TransferComplete.json $(1)/etc/bbfdm/json/TransferComplete.json
+	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,30 +1,17 @@
 config obuspa 'global'
 	option enabled '1'
-	option interface 'loopback'
-	#option ifname 'lo'
 	option debug '1'
 	option log_level '1'
-	option prototrace '0'
-	#option db_file '/etc/obuspa/usp.db'
+	option prototrace '1'
+	option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/var/log/obuspa'
 
-config localagent 'localagent'
-	option Enable '1'
-
-# Adds Device.LocalAgent.Controller.
-config controller 'localcontroller'
-	option EndpointID 'proto::interop-usp-controller'
-	option Protocol 'MQTT'
-	option Topic '/usp/controller'
-	option mqtt 'localmqtt'
-	option assigned_role_name 'full_access'
-
 # Adds Device.LocalAgent.MTP.
-config mtp
+config mtp 'agent_mtp'
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
 	option mqtt 'localmqtt'
@@ -35,13 +22,30 @@ config mqtt 'localmqtt'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
 
+# Adds Device.LocalAgent.Controller.
+config controller 'localcontroller'
+	option EndpointID 'proto::interop-usp-controller'
+	option Protocol 'MQTT'
+	option Topic '/usp/controller'
+	option mqtt 'localmqtt'
+	option assigned_role_name 'full_access'
+
 # Add Device.LocalAgent.Subscription.
-config subscription
-	option ID 'default-boot-event-ACS'
-	option NotifType 'Event'
-	option ReferenceList 'Device.Boot!'
-	option Persistent 'true'
-	option controller 'localcontroller'
+#config subscription 'sub_event'
+#    option ID 'uci-sub-events'
+#    option NotifType 'Event'
+#    list ReferenceList 'Device.Boot!'
+#    list ReferenceList 'Device.LocalAgent.TransferComplete!'
+#    option Persistent 'true'
+#    option controller 'localcontroller'
+
+#config subscription 'sub_op_comp'
+#   option ID 'uci-sub-op_complete'
+#   option NotifType 'OperationComplete'
+#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Download()'
+#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Activate()'
+#   option Persistent 'true'
+#   option controller 'localcontroller'
 
 #config challenge 'admin'
 #	option Description 'Request to get Administrative access'