iopsys-analytics: updates to icwmp configuration and core-watcher

DCHP lease start time is needed to calculate remaining lease time
which is needed for Device.DHCPv4.Client.{i}.LeaseTimeRemaining.

Earlier this was being provided via interface.status, but that was
leading to unnecessary hotplug events for interface data update so
it had to be removed from there.

Add the logic in udhcpc.user.d script separate from netifd as
there does not seem to be a need in netifd for this information.

bbfdm/Config_bbfdm.in

@@ -6,6 +6,10 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
+config BBF_OBFUSCATION_KEY
+	string "Obfuscation key"
+	default "371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04"
+
 config BBF_TR143
 	bool "Enable TR-143 Data Model Support"
 	default y

bbfdm/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.7.6
+PKG_VERSION:=1.8.10
 
 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=8acd70acf1e47626ec1c5faf46e41b5841df9e10
+PKG_SOURCE_VERSION:=fffa5e45aeb3cb51a5e2641e9d72021f471bcd47
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -94,6 +94,12 @@ endif
 define Package/libbbfdm-api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/scripts/bbf.secure $(1)/usr/libexec/rpcd/bbf.secure
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/scripts/bbf.config $(1)/usr/libexec/rpcd/bbf.config
+	$(INSTALL_DIR) $(1)/etc/bbfdm
+	echo "$(CONFIG_BBF_OBFUSCATION_KEY)" > $(1)/etc/bbfdm/.secure_hash
+	$(INSTALL_DIR) $(1)/etc/bbfdm/certificates
 endef
 
 define Package/libbbfdm/install
@@ -102,21 +108,24 @@ define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/lib/
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/usr/share/bbfdm/libbbfdm.so
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
 	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
 	$(INSTALL_BIN) ./files/etc/uci-defaults/97-firewall-service $(1)/etc/uci-defaults/97-firewall-service
 	$(INSTALL_BIN) ./files/etc/uci-defaults/99-link-core-plugins $(1)/etc/uci-defaults/99-link-core-plugins
+	$(INSTALL_BIN) ./files/etc/uci-defaults/90-remove-nonexisting-microservices $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/91-fix-bbfdmd-enabled-option $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
 	$(INSTALL_BIN) ./files/etc/firewall.service $(1)/etc/firewall.service
 ifeq ($(findstring iopsys,$(CONFIG_BBF_VENDOR_LIST)),iopsys)
-	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so)
-endif	
+	$(BBFDM_INSTALL_CORE_PLUGIN) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/iopsys/libbbfdm_iopsys_ext.so $(1)
+endif
 ifeq ($(CONFIG_BBF_TR143),y)
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm/scripts/
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm
-	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm/scripts/
+	$(LN) /usr/share/bbfdm/scripts/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
 endif
 endef
 
@@ -132,12 +141,14 @@ define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
 	$(INSTALL_DATA) ./files/etc/bbfdm/input.json $(1)/etc/bbfdm/
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
+	$(INSTALL_BIN) ./files/etc/init.d/bbfdm.services $(1)/etc/init.d/
 	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
-	$(INSTALL_BIN) ./files/etc/bbfdm/bbfdm_services.sh $(1)/etc/bbfdm/
 	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_lease_start_time.user $(1)/etc/udhcpc.user.d/udhcpc_lease_start_time.user
 endef
 
 define Build/InstallDev

bbfdm/README.md

@@ -0,0 +1,40 @@
+# BBFDM configuration options and utilities
+
+bbfdm provides few compile time configuration options and compile time help utility called [bbfdm.mk](./bbfdm.mk), this document aimed to explain the available usages and best practices.
+
+## Compilation options
+
+|  Configuration option    | Description   | Default Value |
+| -----------------------  | ------------- | ----------- |
+| CONFIG_BBF_VENDOR_LIST   | List of vendor extension directories | iopsys        |
+| CONFIG_BBF_VENDOR_PREFIX | Prefix for Vendor extension datamodel objects/parameters | X_IOPSYS_EU_  |
+| CONFIG_BBF_TR143         | Enable/Add TR-143 Data Model Support | y             |
+| CONFIG_BBF_TR471         | Enable/Add TR-471 Data Model Support | y             |
+| CONFIG_BBF_MAX_OBJECT_INSTANCES | Maximum number of instances per object | 255    |
+| BBF_OBFUSCATION_KEY      | Hash used to encode/decode in `bbf.secure` object | 371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04 |
+
+
+#### BBF_OBFUSCATION_KEY
+
+`bbfdm` provides an ubus object called `bbf.secure` to allow encoding/decoding the values, `bbf.secure` currently support following methods internally to encode/decode
+
+  - Encode/Decode using a predefined SHA512 Hash key
+  - Encode/Decode using a private/public RSA key pair
+
+The `BBF_OBFUSCATION_KEY` compile time configuration option used to defined the SHA512 HASH, if this option is undefined, then it usages a default value as mention in the above table.
+
+User must override this parameter with their own hash value, to generate a hash user can run below command and copy the hash value to this option.
+
+ex: User wants to use 'Sup3rS3cur3Passw0rd' as passkey, then can get the SHA512 sum with
+
+```bash
+$ echo -n "Sup3rS3cur3Passw0rd" | sha512sum
+371d530c95a17d1ca223a29b7a6cdc97e1135c1e0959b51106cca91a0b148b5e42742d372a359760742803f2a44bd88fca67ccdcfaeed26d02ce3b6049cb1e04  -
+```
+
+> Note: Additionally, user can install RSA private key in '/etc/bbfdm/certificates/private_key.pem' path, if private key is present `bbf.secure` shall use rsa private certificate for encrypt/decrypt function. In case of key not present in the pre-defined path, hash will be used for the same.
+
+## Helper utility (bbfdm.mk)
+
+bbfdm provides a helper utility [bbfdm.mk](./bbfdm.mk) to install datamodel plugins in bbfdm core or in microservice directory.
+

bbfdm/bbfdm.mk

@@ -2,8 +2,95 @@
 # Copyright (C) 2023 IOPSYS
 #
 
+BBFDM_BASE_DM_PATH=/usr/share/bbfdm
+BBFDM_INPUT_PATH=/etc/bbfdm/micro_services
+BBFDM_DIR:=$(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
+
+#BBFDM_VERSION:=$(shell grep -oP '(?<=^PKG_VERSION:=).*' ${BBFDM_DIR}/Makefile)
+#BBFDM_TOOLS:=$(BUILD_DIR)/bbfdm-$(BBFDM_VERSION)/tools
+
+# Utility to install the plugin in bbfdm core path with priority.
+# Its now possible to overwrite/remove core datamodel with plugin, so, if some
+# datamodel objects/parameters are present in more than one plugin, order in
+# which they loaded into memory becomes crucial, this Utility help to configure
+# a priority order in which they gets loaded in memory.
+#
+# ARGS:
+#  $1 => Plugin artifact
+#  $2 => package install directory
+#  $3 => Priority of the installed plugin (Optional)
+#
+# Note:
+# - Last loaded plugin gets the highest priority
+#
+# Example:
+#  BBFDM_INSTALL_CORE_PLUGIN ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)
+#
+# Example to install plugin with priority:
+#  BBFDM_INSTALL_CORE_PLUGIN ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) 01
+#
+BBFDM_INSTALL_CORE_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -p
+
+
+# Utility to install the micro-service datamodel
+# Use Case:
+# user wants to run a datamodel micro-service, it required to install the
+# DotSO/JSON plugin into a bbf shared directory, this utility helps in
+# installing the DotSO/JSON plugin in bbfdm shared directory, and auto-generate
+# input file for the micro-service
+#
+# ARGS:
+#  $1 => DotSo or Json plugin with complete path
+#  $2 => package install directory
+#  $3 => service name
+#
+# Note:
+# - There could be only one main plugin file, so its bind to PKG_NAME
+# - Micro-service input.json will be auto generated with this call
+#
+# Example:
+#  BBFDM_INSTALL_MS_DM $(PKG_BUILD_DIR)/libcwmp.so $(1) $(PKG_NAME)
+#
+BBFDM_INSTALL_MS_DM:=$(BBFDM_DIR)/tools/bbfdm.sh -m
+
+
+# Utility to install a plugins in datamodel micro-service
+#
+# ARGS:
+#  $1 => DotSo or Json plugin with complete path
+#  $2 => package install directory
+#  $3 => service name
+#
+# Note:
+# - Use the service_name/PKG_NAME of the service in which this has to run
+#
+# Example:
+#  BBFDM_INSTALL_MS_PLUGIN $(PKG_BUILD_DIR)/libxmpp.so $(1) icwmp
+#
+BBFDM_INSTALL_MS_PLUGIN:=$(BBFDM_DIR)/tools/bbfdm.sh -m -p
+
+
+# Deprecated functions errors
+define BbfdmInstallPluginInMicroservice
+	$(warning # BbfdmInstallPluginInMicroservice function is deprecated, use BBFDM_INSTALL_MS_PLUGIN macro #)
+	$(INSTALL_DIR) $(1)
+	$(INSTALL_DATA) $(2) $(1)/
+endef
+
+define BbfdmInstallMicroServiceInputFile
+	$(warning # function BbfdmInstallMicroServiceInputFile deprecated, input file auto generated with BBFDM_INSTALL_MS_DM #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/micro_services
+	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/micro_services/$(PKG_NAME).json
+endef
 
 define BbfdmInstallPlugin
+	$(warning # function BbfdmInstallPlugin deprecated, use BBFDM_INSTALL_CORE_PLUGIN macro #)
 	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
 	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/plugins/
 endef
+
+define BbfdmInstallPluginWithPriority
+	$(warning # fucntion BbfdmInstallPluginWithPriority deprecated, use BBFDM_INSTALL_CORE_PLUGIN #)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
+	$(INSTALL_DATA) $(3) $(1)/etc/bbfdm/plugins/$(2)_$(shell basename ${3})
+endef

bbfdm/files/etc/bbfdm/bbfdm_services.sh

@@ -1,47 +0,0 @@
-#!/bin/sh
-
-BBFDMD="/usr/sbin/bbfdmd"
-
-bbfdm_add_service()
-{
-	local name path
-
-	name="${1}"
-	path="${2}"
-
-	if [ -z "${name}" -o -z "$path" ]; then
-		return 0;
-	fi
-
-	ubus call service add "{'name':'bbfdm.services','instances':{'$name':{'command':['$BBFDMD','-m','$path']}}}"
-}
-
-bbfdm_stop_service()
-{
-	local name
-
-	name="${1}"
-	if [ -z "${name}" ]; then
-		return 0;
-	fi
-
-	if ubus call service list '{"name":"bbfdm.services"}' |grep -q "bbfdm.$name"; then
-		ubus call service delete "{'name':'bbfdm.services','instance':'bbfdm.$name'}"
-	fi
-}
-
-usages()
-{
-	echo "Usages $0: <OPTIONS>..."
-	echo
-	echo "    -h    show help"
-	echo "    -k    micro-service name to stop"
-	echo
-}
-
-while getopts "s:k:h" opts; do
-	case "$opts" in
-		h) usages; exit 0;;
-		k) bbfdm_stop_service "${OPTARG}";;
-	esac
-done

bbfdm/files/etc/bbfdm/input.json

@@ -4,8 +4,8 @@
                 },
                 "input": {
                         "type": "DotSo",
-                        "name": "/lib/libbbfdm.so",
-                        "plugin_dir": "/etc/bbfdm/plugins"
+                        "name": "/usr/share/bbfdm/libbbfdm.so",
+                        "plugin_dir": "/usr/share/bbfdm/plugins"
                 },
                 "output": {
                         "type": "UBUS",

bbfdm/files/etc/config/bbfdm

@@ -1,8 +1,11 @@
-
 config bbfdmd 'bbfdmd'
-	option enabled '1'
+	option enable '1'
 	option loglevel '1'
-	option refresh_time '10'
+	option refresh_time '120'
 	option transaction_timeout '30'
 	option subprocess_level '2'
 
+config micro_services 'micro_services'
+	option enable '1'
+	option enable_core '0'
+	option enable_respawn '1'

bbfdm/files/etc/init.d/bbfdm.services

@@ -0,0 +1,106 @@
+#!/bin/sh /etc/rc.common
+
+START=40
+STOP=8
+
+USE_PROCD=1
+PROG=/usr/sbin/bbfdmd
+
+BBFDM_MICROSERVICE_DIR="/etc/bbfdm/micro_services"
+
+. /usr/share/libubox/jshn.sh
+
+log() {
+	echo "${@}"|logger -t bbfdmd.services -p info
+}
+
+validate_bbfdm_micro_service_section()
+{
+	uci_validate_section bbfdm micro_services "micro_services" \
+		'enable:bool:true' \
+		'enable_core:bool:false' \
+		'enable_respawn:bool:true'
+}
+
+_add_microservice()
+{
+	local name path
+	local enable enable_core enable_respawn
+
+	# Check enable from micro-service
+	path="${1}"
+	enable_respawn="${2}"
+	enable_core="${3}"
+
+	name="$(basename ${path})"
+	name="${name//.json}"
+
+	enable="$(jq '.daemon.enable//1' ${path})"
+	if [ "${enable}" -eq "0" ]; then
+		log "datamodel micro-service ${name} not enabled"
+		return 0
+	fi
+
+	procd_open_instance "${name}"
+
+	procd_set_param command ${PROG}
+	procd_append_param command -m "${name}"
+
+	if [ "${enable_core}" -eq "1" ]; then
+		procd_set_param limits core="unlimited"
+		procd_set_param stdout 1
+		procd_set_param stderr 1
+	fi
+
+	if [ "${enable_respawn}" -eq "1" ]; then
+		procd_set_param respawn "3600" "5" "5"
+	fi
+	procd_close_instance "${name}"
+}
+
+configure_bbfdm_micro_services()
+{
+	local enable enable_core enable_respawn
+
+	config_load bbfdm
+	validate_bbfdm_micro_service_section || {
+		log "Validation of micro_service section failed"
+		return 1;
+	}
+
+	[ "${enable}" -eq "0" ] && return 0
+
+	if [ -d "${BBFDM_MICROSERVICE_DIR}" ]; then
+		FILES="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/*.json)"
+
+		for file in $FILES;
+		do
+			[ -e "$file" ] || continue
+
+			_add_microservice $file "${enable_respawn}" "${enable_core}"
+		done
+	fi
+}
+
+_start_single_service()
+{
+	local service file
+
+	service="${1}"
+
+	if [ -d "${BBFDM_MICROSERVICE_DIR}" ]; then
+		file="$(ls -1 ${BBFDM_MICROSERVICE_DIR}/${service}.json)"
+		[ -e "$file" ] || return
+
+		_add_microservice $file "0" "0"
+	fi
+}
+
+start_service()
+{
+	if [ -n "${1}" ]; then
+		_start_single_service "${1}"
+	else
+		configure_bbfdm_micro_services
+	fi
+}

bbfdm/files/etc/init.d/bbfdmd

@@ -7,7 +7,9 @@ USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
 BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_TEMP_JSON="/tmp/bbfdm/input.json"
+BBFDM_TEMP_DIR="/tmp/bbfdm"
+
+. /usr/share/libubox/jshn.sh
 
 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
@@ -16,7 +18,7 @@ log() {
 validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
-		'enabled:bool:true' \
+		'enable:bool:true' \
 		'sock:string' \
 		'debug:bool:false' \
 		'loglevel:uinteger:1' \
@@ -27,20 +29,19 @@ validate_bbfdm_bbfdmd_section()
 
 configure_bbfdmd()
 {
-	local enabled debug sock update
+	local enable debug sock
 	local jlog jrefresh jtimeout jlevel
 
-	update=0
 	config_load bbfdm
 	validate_bbfdm_bbfdmd_section || {
 		log "Validation of bbfdmd section failed"
 		return 1;
 	}
 
-	[ "${enabled}" -eq 0 ] && return 0
+	[ "${enable}" -eq 0 ] && return 0
 
 	if [ -f "${BBFDM_JSON_INPUT}" ]; then
-		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > ${BBFDM_TEMP_JSON}
+		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} --arg level ${subprocess_level} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran, "subprocess_level": $level}' ${BBFDM_JSON_INPUT})" > "${BBFDM_TEMP_DIR}/input.json"
 	fi
 
 	procd_set_param command ${PROG}
@@ -56,18 +57,12 @@ configure_bbfdmd()
 
 start_service()
 {
-	mkdir -p /tmp/bbfdm
+	mkdir -p ${BBFDM_TEMP_DIR}
+
 	procd_open_instance "bbfdm"
 	configure_bbfdmd
 	procd_set_param respawn
 	procd_close_instance "bbfdm"
-
-	ubus call service state '{"name":"bbfdm.services", "spawn":true}'
-}
-
-stop_service()
-{
-	ubus call service state '{"name":"bbfdm.services", "spawn":false}'
 }
 
 service_triggers()

bbfdm/files/etc/uci-defaults/90-remove-nonexisting-microservices

@@ -0,0 +1,18 @@
+#!/bin/sh
+. /lib/functions.sh
+
+remove_nonexisting_microservice() {
+	local input_json
+
+	config_get input_json "$1" input_json ""
+
+	if [ -z "${input_json}" ]; then
+		uci_remove bbfdm "${1}"
+	fi
+}
+
+config_load bbfdm
+config_foreach remove_nonexisting_microservice "micro_service"
+
+exit 0
+

bbfdm/files/etc/uci-defaults/91-fix-bbfdmd-enabled-option

@@ -0,0 +1,11 @@
+#!/bin/sh
+
+# rename bbfdmd enabled option to enable
+val="$(uci -q get bbfdm.bbfdmd.enabled)"
+if [ -n "${val}" ]; then
+	uci -q set bbfdm.bbfdmd.enabled=""
+	uci -q set bbfdm.bbfdmd.enable="${val}"
+fi
+
+exit 0
+

bbfdm/files/etc/uci-defaults/99-link-core-plugins

@@ -1,16 +1,32 @@
 #!/bin/sh
 
-UNIFIED_PATH="/etc/bbfdm/plugins/"
+UNIFIED_PATH="/usr/share/bbfdm/plugins/"
+
+log() {
+	echo "$@" | logger -t bbfdm.uci-default -p info
+}
 
 # Link JSON plugins
 for f in `ls -1 /etc/bbfdm/json/*.json`; do
-	echo "# BBFDM JSON plugin ${f} not aligned #"
+	log "# BBFDM JSON plugin ${f} not aligned #"
 	ln -s ${f} "${UNIFIED_PATH}"
 done
 
 # Link DotSo plugins
 for f in `ls -1 /usr/lib/bbfdm/*.so`; do
-	echo "# BBFDM DotSO plugin ${f} not aligned #"
+	log "# BBFDM DotSO plugin ${f} not aligned #"
+	ln -s ${f} "${UNIFIED_PATH}"
+done
+
+# Link JSON plugins
+for f in `ls -1 /etc/bbfdm/plugins/*.json`; do
+	log "# BBFDM JSON plugin ${f} not aligned #"
+	ln -s ${f} "${UNIFIED_PATH}"
+done
+
+# Link DotSo plugins
+for f in `ls -1 /etc/bbfdm/plugins/*.so`; do
+	log "# BBFDM DotSO plugin ${f} not aligned #"
 	ln -s ${f} "${UNIFIED_PATH}"
 done
 

bbfdm/files/etc/udhcpc.user.d/udhcpc_lease_start_time.user

@@ -0,0 +1,14 @@
+#!/bin/sh
+
+leasestarttime="$(awk -F'.' '{print $1}' /proc/uptime 2> /dev/null)"
+target_file=/tmp/dhcp_client_info
+target_str="$INTERFACE $lease $leasestarttime"
+
+# if this interface is present in file, then replace it
+if grep -q "$INTERFACE" "$target_file" 2> /dev/null; then
+	# replace the whole line if pattern matches
+	sed -i "/${INTERFACE}/c\\${target_str}" "$target_file"
+else
+	# interface info was not present, append it to the file
+	echo "$target_str" >> "$target_file"
+fi

bbfdm/tools/bbfdm.sh

@@ -0,0 +1,141 @@
+#!/bin/bash
+
+BBFDM_BASE_DM_PATH="usr/share/bbfdm"
+BBFDM_INPUT_PATH="etc/bbfdm/micro_services"
+INPUT_TEMPLATE='{"daemon":{"service_name":"template","config":{"loglevel":"1"}}}'
+
+MICRO_SERVICE=0
+PLUGIN=0
+DEST=""
+TOOLS="$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )"
+SRC=""
+
+while getopts ":mp" opt; do
+	case ${opt} in
+	  m)
+	  	MICRO_SERVICE=1
+		;;
+	  p)
+	  	PLUGIN=1
+		;;
+	  ?)
+	  	echo "Invalid option: ${OPTARG}"
+		exit 1
+		;;
+	esac
+done
+shift $((OPTIND-1))
+
+SRC="${1}"
+shift
+DEST="${1}"
+shift
+DATA="${1}"
+
+install_bin() {
+	if ! install -m0755 ${1} ${2}; then
+		echo "Failed to install bin ${1} => ${2}"
+		exit 1
+	fi
+}
+
+install_dir() {
+	if ! install -d -m0755 ${1}; then
+		echo "Failed to create directory ${1}"
+		exit 1
+	fi
+}
+
+install_data() {
+	if ! install -m0644 ${1} ${2}; then
+		echo "Failed to install ${1} => ${2}"
+		exit 1
+	fi
+}
+
+# Installing datamodel
+bbfdm_install_dm()
+{
+	local src dest minfile
+
+	src="$1"
+	dest="$2"
+	minfile=""
+
+	if [ -z ${src} ] || [ -z "${dest}" ] || [ -z "${TOOLS}" ]; then
+		echo "Invalid input option for install dm $@"
+		exit 1
+	fi
+
+	if [ "${src##*.}" = "json" ]; then
+		echo "Compacting BBFDM JSON file"
+		minfile=$(mktemp)
+		jq -c 'del(..|.description?)' ${src} > ${minfile}
+
+		src=${minfile}
+		if dpkg -s python3-jsonschema >/dev/null 2>&1; then
+			echo "Verifying bbfdm Datamodel JSON file"
+			if ! ${TOOLS}/validate_plugins.py ${src}; then
+				echo "Validation of the plugin failed ${src}"
+				exit 1
+			fi
+		else
+			echo "## Install python3-jsonschema to verify datamodel plugins"
+		fi
+	fi
+
+	install_bin ${src} ${dest}
+
+	if [ -f "${minfile}" ]; then
+		rm ${minfile}
+	fi
+}
+
+bbfdm_generate_input()
+{
+	local dest ser
+
+	dest_dir=${1}
+	ser=${2}
+	dest=${dest_dir}/${ser}.json
+
+	echo ${INPUT_TEMPLATE} | jq --arg service "$ser" '.daemon.service_name = $service' > ${dest}
+	chmod 466 ${dest}
+}
+
+if [ -z "$SRC" ] || [ -z "${DEST}" ] ; then
+	echo "# BBFDM Null value in src[${SRC}], dest[${DEST}]"
+	exit 1
+fi
+
+if [ "${MICRO_SERVICE}" -eq "1" ]; then
+	if [ -z "${DATA}" ]; then
+		echo "# service_name[${DATA}] not provided"
+		exit 1
+	fi
+
+	if [ "${PLUGIN}" -ne "1" ]; then
+		extn="$(basename ${SRC})"
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services
+		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}.${extn##*.}
+
+		# main micro-service datamodel plugin, create an input file as well
+		install_dir ${DEST}/${BBFDM_INPUT_PATH}
+		bbfdm_generate_input ${DEST}/${BBFDM_INPUT_PATH}/ ${DATA}
+	else
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}
+		bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/micro_services/${DATA}/$(basename ${SRC})
+	fi
+else
+	if [ "${PLUGIN}" -eq "1" ]; then
+		priority="${DATA:-0}"
+		install_dir ${DEST}/${BBFDM_BASE_DM_PATH}/plugins
+		if [ "${priority}" -gt "0" ]; then
+			# install with priority if defined
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/${priority}_$(basename ${SRC})
+		else
+			bbfdm_install_dm ${SRC} ${DEST}/${BBFDM_BASE_DM_PATH}/plugins/$(basename ${SRC})
+		fi
+	fi
+fi
+

bbfdm/tools/validate_plugins.py

@@ -0,0 +1,330 @@
+#!/usr/bin/python3
+
+# Copyright (C) 2024 iopsys Software Solutions AB
+# Author: Amin Ben Romdhane <amin.benromdhane@iopsys.eu>
+
+import sys
+import json
+from jsonschema import validate
+
+JSON_PLUGIN_VERSION = 0
+
+obj_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"object"
+			]
+		},
+		"map_type_t": {
+			"type": "string",
+			"enum": [
+				"uci",
+				"ubus"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"cwmp",
+				"usp"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"version" : {"type": "string"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"uniqueKeys" : {"type" : "array"},
+		"access" : {"type" : "boolean"},
+		"array" : {"type" : "boolean"},
+		"mapping" : {"type" : "object", "properties" : {
+				"type" : {"$ref": "#/definitions/map_type_t"},
+				"uci" : {"type" : "object", "properties" : {
+						"file" : {"type": "string"},
+						"section" : {"type": "object", "properties" : {
+								"type" : {"type": "string"}
+							}
+						},
+						"dmmapfile" : {"type": "string"}
+					}
+				},
+				"ubus" : {"type" : "object", "properties" : {
+						"object" : {"type": "string"},
+						"method" : {"type": "string"},
+						"args" : {"type": "object"},
+						"key" : {"type": "string"}
+					}
+				}
+			}
+		}
+	},
+	"required": [
+		"type",
+		"protocols",
+		"array",
+		"access"
+	]
+}
+
+obj_schema_v1 = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"object"
+			]
+		},
+		"map_type_t": {
+			"type": "string",
+			"enum": [
+				"uci",
+				"ubus"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"cwmp",
+				"usp",
+				"none"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"version" : {"type": "string"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"uniqueKeys" : {"type" : "array"},
+		"access" : {"type" : "boolean"},
+		"array" : {"type" : "boolean"},
+		"mapping" : {"type" : "array", "items" : {
+			"type" : "object", "properties" : {
+				"type" : {"$ref": "#/definitions/map_type_t"},
+					"uci" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"},
+							"section" : {"type": "object", "properties" : {
+									"type" : {"type": "string"}
+								}
+							},
+							"dmmapfile" : {"type": "string"}
+						}
+					},
+					"ubus" : {"type" : "object", "properties" : {
+							"object" : {"type": "string"},
+							"method" : {"type": "string"},
+							"args" : {"type": "object"},
+							"key" : {"type": "string"}
+						}
+					}
+				}
+			}
+		}
+	},
+	"required": [
+		"type",
+		"protocols",
+		"array",
+		"access"
+	]
+}
+
+param_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"string",
+				"unsignedInt",
+				"unsignedLong",
+				"int",
+				"long",
+				"boolean",
+				"dateTime",
+				"hexBinary",
+				"base64",
+				"decimal"
+			]
+		},
+		"map_type_t": {
+			"type": "string",
+			"enum": [
+				"uci",
+				"ubus",
+				"procfs",
+				"sysfs",
+				"json",
+				"uci_sec"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"cwmp",
+				"usp",
+				"none"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"read" : {"type" : "boolean"},
+		"write" : {"type" : "boolean"},
+		"mapping" : {"type" : "array", "items" : {"type": "object", "properties" : {
+					"type" : {"$ref": "#/definitions/map_type_t"},
+					"uci" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"},
+							"section" : {"type": "object", "properties" : {
+									"type" : {"type": "string"},
+									"index" : {"type": "string"}
+								}
+							},
+							"option" : {"type": "object", "properties" : {
+									"name" : {"type": "string"}								}
+							}
+						}
+					},
+					"ubus" : {"type" : "object", "properties" : {
+							"object" : {"type": "string"},
+							"method" : {"type": "string"},
+							"args" : {"type": "object"},
+							"key" : {"type": "string"}
+						}
+					},
+					"procfs" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"}
+						}
+					},
+					"sysfs" : {"type" : "object", "properties" : {
+							"file" : {"type": "string"}
+						}
+					}
+				}
+			}
+		}
+	},
+	"required": [
+		"type",
+		"protocols",
+		"read",
+		"write"
+	]
+}
+
+event_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"event"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"usp"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"version" : {"type": "string"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}}
+	},
+	"required": [
+		"type",
+		"protocols"
+	]
+}
+
+command_schema = {
+	"definitions": {
+		"type_t": {
+			"type": "string",
+			"enum": [
+				"command"
+			]
+		},
+		"protocols_t": {
+			"type": "string",
+			"enum": [
+				"usp"
+			]
+		}
+	},
+	"type" : "object",
+	"properties" : {
+		"type" : {"$ref": "#/definitions/type_t"},
+		"async" : {"type" : "boolean"},
+		"protocols" : {"type" : "array", "items" : {"$ref": "#/definitions/protocols_t"}},
+		"input" : {"type" : "object"},
+		"output" : {"type" : "object"}
+	},
+	"required": [
+		"type",
+		"async",
+		"protocols"
+	]
+}
+
+def print_validate_json_usage():
+    print("Usage: " + sys.argv[0] + " <dm json file>")
+    print("Examples:")
+    print("  - " + sys.argv[0] + " datamodel.json")
+    print("    ==> Validate the json file")
+    print("")
+    exit(1)
+
+def parse_value( key , value ):
+
+    if key.endswith('.') and not key.startswith('Device.'):
+        print(key + " is not a valid path")
+        exit(1)
+
+    if key.endswith('.') and (JSON_PLUGIN_VERSION == 1 or JSON_PLUGIN_VERSION == 2):
+        __schema = obj_schema_v1
+    elif key.endswith('.'):
+        __schema = obj_schema
+    elif key.endswith('!'):
+        __schema = event_schema
+    elif key.endswith('()'):
+        __schema = command_schema
+    else:
+        __schema = param_schema
+    
+    validate(instance = value, schema = __schema)
+    
+    for k, v in value.items():
+        if k != "list" and k != "mapping" and k != "input" and k != "output" and isinstance(v, dict):
+            parse_value(k, v)
+
+### main ###
+if len(sys.argv) < 2:
+    print_validate_json_usage()
+    
+json_file = open(sys.argv[1], "r", encoding='utf-8')
+try:
+    json_data = json.loads(json_file.read())
+except ValueError:
+    print(sys.argv[1] + " file has a wrong JSON format!!!!!")
+    exit(1)
+
+for __key, __value in json_data.items():
+
+    if __key == "json_plugin_version":
+
+        if not isinstance(__value, int) or __value not in [0, 1, 2]:
+            raise ValueError("Invalid value for json_plugin_version")
+
+        JSON_PLUGIN_VERSION = __value
+        continue
+
+    parse_value(__key , __value)
+
+print("JSON File is Valid")

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.5
+PKG_VERSION:=2.1.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=f03fb8682aa7efe760294e54c422f2eab856e08c
+PKG_SOURCE_VERSION:=e472e90feec31d9f318ea8c732ab564002e25db1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,6 +22,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/$(PKG_NAME)
   SECTION:=utils
@@ -43,10 +44,14 @@ endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/	
-	$(INSTALL_DIR) $(1)/etc/bulkdata
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bulkdata
-	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
+	$(INSTALL_DATA) ./files/etc/config/bulkdata $(1)/etc/config/
+	$(INSTALL_BIN) ./files/etc/init.d/bulkdatad $(1)/etc/init.d/
+	$(INSTALL_DATA) ./files/etc/uci-defaults/95-bulkdata-translation-options $(1)/etc/uci-defaults/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/bulkdata.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

bulkdata/bulkdata/usr/share/bbfdm/micro_services/bulkdata.json

@@ -0,0 +1,960 @@
+{
+	"json_plugin_version": 2,
+	"Device.BulkData.": {
+		"type": "object",
+		"protocols": [
+			"cwmp",
+			"usp"
+		],
+		"access": false,
+		"array": false,
+		"Enable": {
+			"type": "boolean",
+			"read": true,
+			"write": true,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "boolean",
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"name": "bulkdata"
+						},
+						"option": {
+							"name": "enable"
+						}
+					}
+				}
+			]
+		},
+		"Status": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "string",
+			"enumerations": [
+				"Enabled",
+				"Disabled",
+				"Error"
+			],
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"name": "bulkdata"
+						},
+						"option": {
+							"name": "enable"
+						}
+					}
+				}
+			]
+		},
+		"MinReportingInterval": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "0",
+			"datatype": "unsignedInt",
+			"unit": "seconds"
+		},
+		"Protocols": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "HTTP",
+			"list": {
+				"datatype": "string",
+				"enumerations": [
+					"Streaming",
+					"File",
+					"HTTP",
+					"MQTT"
+				]
+			}
+		},
+		"EncodingTypes": {
+			"type": "string",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "JSON,CSV",
+			"list": {
+				"datatype": "string",
+				"enumerations": [
+					"XML",
+					"XDR",
+					"CSV",
+					"JSON"
+				]
+			}
+		},
+		"ParameterWildCardSupported": {
+			"type": "boolean",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "1",
+			"datatype": "boolean"
+		},
+		"MaxNumberOfProfiles": {
+			"type": "int",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "-1",
+			"datatype": "int",
+			"range": [
+				{
+					"min": -1
+				}
+			]
+		},
+		"MaxNumberOfParameterReferences": {
+			"type": "int",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"default": "-1",
+			"datatype": "int",
+			"range": [
+				{
+					"min": -1
+				}
+			]
+		},
+		"ProfileNumberOfEntries": {
+			"type": "unsignedInt",
+			"read": true,
+			"write": false,
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"datatype": "unsignedInt",
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"type": "profile"
+						},
+						"option": {
+							"name": "@Count"
+						}
+					}
+				}
+			]
+		},
+		"Device.BulkData.Profile.{i}.": {
+			"type": "object",
+			"protocols": [
+				"cwmp",
+				"usp"
+			],
+			"access": true,
+			"array": true,
+			"mapping": [
+				{
+					"type": "uci",
+					"uci": {
+						"file": "bulkdata",
+						"section": {
+							"type": "profile"
+						},
+						"dmmapfile": "dmmap_bulkdata"
+					}
+				}
+			],
+			"Enable": {
+				"type": "boolean",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "boolean",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "enable"
+					}
+				]
+			},
+			"Alias": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "Alias",
+				"range": [
+					{
+						"max": 64
+					}
+				],
+				"flags": [
+					"Unique"
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "alias"
+					}
+				]
+			},
+			"Name": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"range": [
+					{
+						"max": 255
+					}
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "name"
+					}
+				]
+			},
+			"NumberOfRetainedFailedReports": {
+				"type": "int",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "int",
+				"range": [
+					{
+						"min": -1
+					}
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "nbre_of_retained_failed_reports"
+					}
+				]
+			},
+			"Protocol": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"enumerations": [
+					"Streaming",
+					"File",
+					"HTTP"
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "protocol"
+					}
+				]
+			},
+			"EncodingType": {
+				"type": "string",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "string",
+				"enumerations": [
+					"XML",
+					"XDR",
+					"CSV",
+					"JSON"
+				],
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "encoding_type"
+					}
+				]
+			},
+			"ReportingInterval": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"range": [
+					{
+						"min": 1
+					}
+				],
+				"unit": "seconds",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "reporting_interval"
+					}
+				]
+			},
+			"TimeReference": {
+				"type": "dateTime",
+				"read": true,
+				"write": true,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "dateTime",
+				"mapping": [
+					{
+						"data": "@Parent",
+						"type": "uci_sec",
+						"key": "time_reference"
+					}
+				]
+			},
+			"ParameterNumberOfEntries": {
+				"type": "unsignedInt",
+				"read": true,
+				"write": false,
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"datatype": "unsignedInt",
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "bulkdata",
+							"section": {
+								"type": "profile_parameter"
+							},
+							"option": {
+								"name": "@Count"
+							}
+						}
+					}
+				]
+			},
+			"Device.BulkData.Profile.{i}.Parameter.{i}.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": true,
+				"array": true,
+				"mapping": [
+					{
+						"type": "uci",
+						"uci": {
+							"file": "bulkdata",
+							"section": {
+								"type": "profile_parameter"
+							},
+							"dmmapfile": "dmmap_bulkdata"
+						}
+					}
+				],
+				"Name": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 64
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "name"
+						}
+					]
+				},
+				"Reference": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "reference"
+						}
+					]
+				}
+			},
+			"Device.BulkData.Profile.{i}.CSVEncoding.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": false,
+				"FieldSeparator": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_field_separator"
+						}
+					]
+				},
+				"RowSeparator": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_row_separator"
+						}
+					]
+				},
+				"EscapeCharacter": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_escape_character"
+						}
+					]
+				},
+				"ReportFormat": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"ParameterPerRow",
+						"ParameterPerColumn"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_report_format"
+						}
+					]
+				},
+				"RowTimestamp": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"Unix-Epoch",
+						"ISO-8601",
+						"None"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "csv_encoding_row_time_stamp"
+						}
+					]
+				}
+			},
+			"Device.BulkData.Profile.{i}.JSONEncoding.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": false,
+				"ReportFormat": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"ObjectHierarchy",
+						"NameValuePair"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "json_encoding_report_format"
+						}
+					]
+				},
+				"ReportTimestamp": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"Unix-Epoch",
+						"ISO-8601",
+						"None"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "json_encoding_report_time_stamp"
+						}
+					]
+				}
+			},
+			"Device.BulkData.Profile.{i}.HTTP.": {
+				"type": "object",
+				"protocols": [
+					"cwmp",
+					"usp"
+				],
+				"access": false,
+				"array": false,
+				"URL": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "URL",
+					"range": [
+						{
+							"max": 2048
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_url"
+						}
+					]
+				},
+				"Username": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_username"
+						}
+					]
+				},
+				"Password": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"range": [
+						{
+							"max": 256
+						}
+					],
+					"flags": [
+						"Secure"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_password"
+						}
+					]
+				},
+				"CompressionsSupported": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"default": "GZIP",
+					"list": {
+						"datatype": "string",
+						"enumerations": [
+							"GZIP",
+							"Compress",
+							"Deflate"
+						]
+					}
+				},
+				"Compression": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"GZIP",
+						"Compress",
+						"Deflate"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_compression"
+						}
+					]
+				},
+				"MethodsSupported": {
+					"type": "string",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"default": "POST,PUT",
+					"list": {
+						"datatype": "string",
+						"enumerations": [
+							"POST",
+							"PUT"
+						]
+					}
+				},
+				"Method": {
+					"type": "string",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "string",
+					"enumerations": [
+						"POST",
+						"PUT"
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_method"
+						}
+					]
+				},
+				"UseDateHeader": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_use_date_header"
+						}
+					]
+				},
+				"RetryEnable": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_retry_enable"
+						}
+					]
+				},
+				"RetryMinimumWaitInterval": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 1,
+							"max": 65535
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_retry_minimum_wait_interval"
+						}
+					]
+				},
+				"RetryIntervalMultiplier": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"range": [
+						{
+							"min": 1000,
+							"max": 65535
+						}
+					],
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_retry_interval_multiplier"
+						}
+					]
+				},
+				"RequestURIParameterNumberOfEntries": {
+					"type": "unsignedInt",
+					"read": true,
+					"write": false,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "unsignedInt",
+					"mapping": [
+						{
+							"type": "uci",
+							"uci": {
+								"file": "bulkdata",
+								"section": {
+									"type": "profile_http_request_uri_parameter"
+								},
+								"option": {
+									"name": "@Count"
+								}
+							}
+						}
+					]
+				},
+				"PersistAcrossReboot": {
+					"type": "boolean",
+					"read": true,
+					"write": true,
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"datatype": "boolean",
+					"mapping": [
+						{
+							"data": "@Parent",
+							"type": "uci_sec",
+							"key": "http_persist_across_reboot"
+						}
+					]					
+				},
+				"Device.BulkData.Profile.{i}.HTTP.RequestURIParameter.{i}.": {
+					"type": "object",
+					"protocols": [
+						"cwmp",
+						"usp"
+					],
+					"access": true,
+					"array": true,
+					"mapping": [
+						{
+							"type": "uci",
+							"uci": {
+								"file": "bulkdata",
+								"section": {
+									"type": "profile_http_request_uri_parameter"
+								},
+								"dmmapfile": "dmmap_bulkdata"
+							}
+						}
+					],
+					"Name": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"datatype": "string",
+						"range": [
+							{
+								"max": 64
+							}
+						],
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "uci_sec",
+								"key": "name"
+							}
+						]
+					},
+					"Reference": {
+						"type": "string",
+						"read": true,
+						"write": true,
+						"protocols": [
+							"cwmp",
+							"usp"
+						],
+						"datatype": "string",
+						"range": [
+							{
+								"max": 256
+							}
+						],
+						"mapping": [
+							{
+								"data": "@Parent",
+								"type": "uci_sec",
+								"key": "reference"
+							}
+						]
+					}
+				}
+			}
+		}
+	}
+}

bulkdata/files/etc/bulkdata/input.json

@@ -1,15 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "JSON",
-			"name": "/etc/bulkdata/bulkdata.json"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.bulkdata",
-			"parent_dm": "Device.",
-			"object": "BulkData",
-			"root_obj": "bbfdm"
-		}
-	}
-}

bulkdata/files/etc/init.d/bulkdatad

@@ -3,11 +3,8 @@
 START=60
 STOP=10
 
-. /etc/bbfdm/bbfdm_services.sh
-
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
-BULKDATA_JSON_INPUT="/etc/bulkdata/input.json"
 
 start_service() {
 	local enable
@@ -21,8 +18,6 @@ start_service() {
 		procd_set_param respawn
 		procd_close_instance "bulkdata"
 	}
-
-	bbfdm_add_service "bbfdm.bulkdata" "${BULKDATA_JSON_INPUT}"
 }
 
 reload_service() {

csmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=csmngr
-PKG_VERSION:=0.0.5
+PKG_VERSION:=0.0.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dcdaba75b85bf8758c34d3ae4a1be0ba09359331
+PKG_SOURCE_VERSION:=ca899eb18b5bec38f4b8b4d08b42d89fef965c13
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/csmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

ddnsmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ddnsmngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/ddnsmngr.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/ddnsmngr.git
 PKG_SOURCE_VERSION:=d0d37df44644ef2c1a0b11d3a4f92dc694ae1010
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -21,6 +21,7 @@ PKG_LICENSE_FILES:=LICENSE
 PKG_CONFIG_DEPENDS:=CONFIG_DDNSMNGR_BACKEND_DDNSSCRIPT CONFIG_DDNSMNGR_BACKEND_INADYN
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/$(PKG_NAME)
   SECTION:=utils
@@ -48,17 +49,13 @@ endef
 endif
 
 define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/etc/ddnsmngr
 	$(INSTALL_DIR) $(1)/etc/ddnsmngr/ddns
 	$(INSTALL_DIR) $(1)/etc/ddnsmngr/servers
-	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/lib/ddnsmngr
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1)/etc/ddnsmngr/
-	$(INSTALL_DATA) ./files/etc/ddnsmngr/input.json $(1)/etc/ddnsmngr/
 	$(INSTALL_DATA) ./files/etc/config/ddnsmngr $(1)/etc/config/ddnsmngr
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-ddns-config-migrate $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/init.d/ddnsmngr $(1)/etc/init.d/ddnsmngr
@@ -73,6 +70,7 @@ ifeq ($(CONFIG_DDNSMNGR_BACKEND_INADYN),y)
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/files/inadyn/server/* $(1)/etc/ddnsmngr/servers
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/inadyn/usr/libexec/rpcd/ddnsmngr $(1)/usr/libexec/rpcd/ddnsmngr
 endif
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libddnsmngr.so $(1) $(PKG_NAME)
 endef
 
 

ddnsmngr/files/etc/ddnsmngr/input.json

@@ -1,15 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/ddnsmngr/libddnsmngr.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.ddnsmngr",
-			"parent_dm": "Device.",
-			"object": "DynamicDNS",
-			"root_obj": "bbfdm"
-		}
-	}
-}

ddnsmngr/files/etc/init.d/ddnsmngr

@@ -3,14 +3,11 @@
 START=80
 STOP=10
 USE_PROCD=1
-DM_INPUT="/etc/ddnsmngr/input.json"
 
-. /etc/bbfdm/bbfdm_services.sh
 . /usr/lib/ddnsmngr/ddnsmngr_service.sh
 
 start_service() {
 	start_ddnsmngr_service
-	bbfdm_add_service "bbfdm.ddnsmngr" "${DM_INPUT}"
 }
 
 stop_service() {

decollector/Config.in

@@ -2,6 +2,6 @@ menu "Configuration"
 
 config DECOLLECTOR_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 4
+	default 6
 
 endmenu

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.2.1.3
+PKG_VERSION:=6.0.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0fe317cbe2b2e37c25a6d6d4e6f5c1d6964f9e50
+PKG_SOURCE_VERSION:=aaf79b36c05d7ac7a7d704db03a9c97905452025
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -2,13 +2,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.6.5
+PKG_VERSION:=3.6.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=192e74db2082e3f89f6defe9d752d752b0b09079
+PKG_SOURCE_VERSION:=85c173d1fac535726b2e750be8c282b74fb7dbca
 PKG_MIRROR_HASH:=skip
 endif
 

dectmngr/files/etc/init.d/dectmngr

@@ -11,8 +11,6 @@ LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 DCX81_UART_DT_ALIAS=/proc/device-tree/aliases/dcx81-uart
 
-DECT_GPIO="$(gpiofind DCX81_RSTN | cut -d ' ' -f 2 2>/dev/null)"
-
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
 	dect_pid=$(pidof $PROG)
@@ -64,8 +62,6 @@ start_service() {
 		dcx81_uart_device=/dev/ttyH0
 	fi
 
-	[ -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"
 
@@ -112,7 +108,6 @@ start_service() {
 stop_service() {
 	has_dect || return 0
 
-	[ -n "$DECT_GPIO" ] && echo 0 > /sys/class/gpio/gpio${DECT_GPIO}/value
 	stop_and_wait_dectmngr
 }
 
@@ -126,11 +121,6 @@ service_triggers() {
 }
 
 boot() {
-	[ -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
 	start

dnsmngr/Makefile

@@ -0,0 +1,48 @@
+#
+# Copyright (C) 2022-2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=dnsmngr
+PKG_VERSION:=1.0.4
+
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/network/dnsmngr.git
+PKG_SOURCE_VERSION:=60e2f64f5584a3b47f1a4cd7fae0edb478607bd6
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+MAKE_PATH:=src
+
+define Package/dnsmngr
+  SECTION:=net
+  CATEGORY:=Network
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm-api +dnsmasq +umdns
+  TITLE:=Package to add Device.DNS. datamodel support
+endef
+
+define Package/dnsmngr/description
+  Package to add Device.DNS. datamodel support.
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/dnsmngr/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/dnsmngr/install
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/libdnsmngr.so $(1) $(PKG_NAME)
+endef
+
+$(eval $(call BuildPackage,dnsmngr))

dslmngr/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cb8b8fd2549751bcd38808391b76a1a9a908c4de
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/dslmngr.git
+PKG_SOURCE_VERSION:=d71bef278b8222dee1c278723f8264aa8faf5e40
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_MIRROR_HASH:=skip
@@ -26,6 +26,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 
 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
@@ -39,7 +40,7 @@ define Package/dslmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=XDSL status and configration utility
-  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS:=+libdsl +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
 endef
 
 define Package/dslmngr/description
@@ -69,12 +70,14 @@ define Build/Compile
 endef
 
 define Package/dslmngr/install
+	$(INSTALL_DIR) $(1)/etc/dsl
 	$(CP) ./files/common/* $(1)/
 ifeq ($(CONFIG_TARGET_brcmbca),y)
 	$(CP) ./files/broadcom/* $(1)/
 endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfdsl.so $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,dslmngr))

dslmngr/files/broadcom/lib/dsl/broadcom.sh

@@ -211,8 +211,8 @@ create_ptm_devices() {
 
 prioritize_arp()
 {
-      ebtables -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
-      ebtables -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
+      ebtables --concurrent -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
+      ebtables --concurrent -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
 }
 
 xtm_remove_devices() {

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

@@ -48,10 +48,10 @@ validate_rule_section()
 
 # Clear existing rules before applying new rules
 clear_existing_rules() {
-	local rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
+	local rule=$(ebtables --concurrent -t broute -L BROUTING|grep -m 1 mark)
 	while [ -n "${rule}" ]; do
-		exec_log ebtables -t broute -D BROUTING ${rule}
-		rule=$(ebtables -t broute -L BROUTING|grep -m 1 mark)
+		exec_log ebtables --concurrent -t broute -D BROUTING ${rule}
+		rule=$(ebtables --concurrent -t broute -L BROUTING|grep -m 1 mark)
 	done
 }
 
@@ -86,7 +86,7 @@ create_rule() {
 	cmd="-p ip $cmd"
 
 	cmd="-s ${mac} $cmd"
-	exec_log ebtables -t broute -A BROUTING ${cmd}
+	exec_log ebtables --concurrent -t broute -A BROUTING ${cmd}
 }
 
 manage_rule() {

ethmngr/Config.in

@@ -0,0 +1,9 @@
+if (PACKAGE_ethmngr)
+
+menu "Configurations"
+
+config TR181_VENDOR_EXTENSIONS_MACVLAN
+	bool "Use TR181 vendor extension MACVLAN"
+	default y
+endmenu
+endif

ethmngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e96775ccd9f980c2e66ed0679851aa496e04e9d3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/ethmngr.git
+PKG_SOURCE_VERSION:=d029ce86fe99b7896f096f68eda3f6caa000ee5f
 PKG_MAINTAINER:=Rahul Thakur <rahul.thakur@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -21,12 +21,13 @@ PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
 
 define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_ipq53xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl +libeasy +libbbfdm-api
 endef
 
 define Package/ethmngr/description
@@ -35,6 +36,10 @@ define Package/ethmngr/description
  It uses APIs from the libethernet.so library.
 endef
 
+define Package/$(PKG_NAME)/config
+       source "$(SOURCE)/Config.in"
+endef
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ./ethmngr/* $(PKG_BUILD_DIR)/
@@ -44,7 +49,12 @@ endif
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
+	-D_GNU_SOURCE \
+	-DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+
+ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
+TARGET_CFLAGS += -DTR181_VENDOR_EXTENSIONS_MACVLAN
+endif
 
 ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 define Build/Compile
@@ -53,9 +63,15 @@ endif
 
 define Package/ethmngr/install
 	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/etc/ethmngr
+	$(INSTALL_DIR) $(1)/etc/ethmngr/plugins
 ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_ipq53xx)$(CONFIG_TARGET_mediatek),)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
+endif
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libbbfethernet.so $(1) $(PKG_NAME)
+ifeq ($(CONFIG_TR181_VENDOR_EXTENSIONS_MACVLAN),y)
+	$(BBFDM_INSTALL_MS_PLUGIN) $(PKG_BUILD_DIR)/libbbfethernetmacvlan.so $(1) $(PKG_NAME)
 endif
 endef
 

ethmngr/files/etc/hotplug.d/ethernet/ethport-deprecated-ubus-event

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+[ -n "$PORT" -a -n "$LINK" ] || exit 0
+
+case "$PORT" in
+	# do not generate ethport ubus event
+	# for wifi, dsl and brige devices
+	wl*|wds*|atm*|ptm*|br-*)
+		exit 0
+	;;
+esac
+
+speed=0
+duplex=full
+
+if [ "$LINK" = "up" ]; then
+	devspeed="$(ubus -t 2 call network.device status "{\"name\":\"$PORT\"}" | jsonfilter -e @.speed)"
+	speed=${devspeed:0:-1}
+	duplex=${devspeed:0-1}
+	[ "$duplex" == "H" ] && duplex="half" || duplex="full"
+fi
+
+ubus send ethport "{\"ifname\":\"$PORT\",\"link\":\"$LINK\",\"speed\":\"$speed\",\"duplex\":\"$duplex\"}"

ethmngr/files/etc/ruleng/ethport.json

@@ -0,0 +1,20 @@
+{
+	"ethport_update": {
+		"if" : [
+			{
+				"event": "network.device"
+			}
+		],
+		"then" : [
+			{
+				"cli": "/sbin/hotplug-call ethernet",
+				"envs": {
+					"PORT": "&network.device->ifname",
+					"LINK": "&network.device->link"
+				},
+				"timeout": 1
+			}
+		]
+	}
+}
+

ethmngr/files/etc/uci-defaults/ruleng.ethport

@@ -0,0 +1,2 @@
+uci -q set ruleng.ethport=rule
+uci -q set ruleng.ethport.recipe='/etc/ruleng/ethport.json'

hostmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=1.2.2
+PKG_VERSION:=1.2.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -22,7 +22,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/hostmngr
   SECTION:=utils
@@ -58,14 +58,12 @@ endif
 MAKE_PATH:=src
 
 define Package/hostmngr/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/etc $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/hostmngr/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1)/etc/hostmngr/
-	$(INSTALL_DATA) ./files/etc/hostmngr/input.json $(1)/etc/hostmngr/	
 	$(INSTALL_DIR) $(1)/usr/share/hostmngr
 	$(INSTALL_DATA) ./files/scripts/hosts_acl.sh $(1)/usr/share/hostmngr/
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1) $(PKG_NAME)
 endef
 
 ifeq ($(LOCAL_DEV),1)

hostmngr/files/etc/hostmngr/input.json

@@ -1,16 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/hostmngr/libhostmngr.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.hosts",
-			"parent_dm": "Device.",
-			"object": "Hosts",
-			"root_obj": "bbfdm"
-		}
-	}
-}
-

hostmngr/files/etc/init.d/hostmngr

@@ -3,12 +3,8 @@
 START=65
 STOP=20
 
-. /etc/bbfdm/bbfdm_services.sh
-
 USE_PROCD=1
 
-HOSTS_JSON_INPUT="/etc/hostmngr/input.json"
-
 start_service() {
 	procd_open_instance
 	procd_set_param command "/usr/sbin/hostmngr" "--config hosts" "-o"  "/tmp/hostmngr.log" "-f"
@@ -18,7 +14,6 @@ start_service() {
 #	procd_set_param stderr 1
 	procd_close_instance
 	
-	bbfdm_add_service "bbfdm.hosts" "${HOSTS_JSON_INPUT}"
 	sh /usr/share/hostmngr/hosts_acl.sh
 }
 

icwmp/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.7.0
+PKG_VERSION:=9.7.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=d1caec840201824b590a4aa98766d0aa94a409b0
+PKG_SOURCE_VERSION:=d2041138fc086dccf5f306d4426ab7a2f823ce86
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -58,8 +58,8 @@ define Package/icwmp/install
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
-	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json)
-	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libcwmpdm.so)
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/libcwmpdm.so $(1) $(PKG_NAME)
+	$(BBFDM_INSTALL_MS_PLUGIN) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,icwmp))

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

@@ -1,8 +1,7 @@
 {
-	"json_plugin_version": 1,
+	"json_plugin_version": 2,
 	"Device.CWMPManagementServer.": {
 		"type": "object",
-		"version": "2.15",
 		"protocols": [
 			"usp"
 		],
@@ -11,7 +10,6 @@
 		"dependency": "file:/etc/config/cwmp",
 		"EnableCWMP": {
 			"type": "boolean",
-			"version": "2.15",
 			"read": true,
 			"write": true,
 			"protocols": [

icwmp/files/etc/config/cwmp

@@ -5,7 +5,7 @@ config acs 'acs'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
 	option dhcp_discovery 'enable'
-	option ssl_capath "/etc/ssl/certs"
+	#option ssl_capath "/etc/icwmpd/ca.pem"
 	# compression possible configs: GZIP, Deflate, Disabled
 	option compression 'Disabled'
 	#­ possible configs interval :[1:65535]

icwmp/files/etc/init.d/icwmpd

@@ -9,6 +9,7 @@ PROG="/usr/sbin/icwmpd"
 
 . /lib/functions.sh
 . /usr/share/libubox/jshn.sh
+
 include /lib/network
 
 log() {
@@ -16,7 +17,15 @@ log() {
 }
 
 regenerate_ssl_link() {
-	local cert_dir="${1%/}"
+	local cert_dir
+
+	cert_dir="${1%/}"
+	if [ -f "${cert_dir}" ]; then
+		return 0
+	fi
+
+	# do not generate the c_rehash if its system default cert path
+	# ca-certificate package already generates c_rehash on compilation
 	[ ! -d "${cert_dir}" ] || [ "${cert_dir}" = "/etc/ssl/certs" ] && return 0
 
 	generate_links() {
@@ -25,14 +34,15 @@ regenerate_ssl_link() {
 		for cfile in ${files}; do
 			if [ -f "${cfile}" ]; then
 				rehash="$(openssl x509 -hash -noout -in "${cfile}")"
-				[ -f "${cert_dir}/${rehash}.0" ] || \
+				if [ ! -f "${cert_dir}/${rehash}.0" ]; then
+					log "Generating c_rehash for ${cfile}=>${rehash}.0"
 					ln -s "${cfile}" "${cert_dir}/${rehash}.0"
+				fi
 			fi
 		done
 	}
 
 	generate_links "pem"
-	generate_links "crt"
 }
 
 enable_dhcp_option43() {

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.3.7
+PKG_VERSION:=8.4.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a7303fc23b812dde4259cbf75c1cecfc7b6af1cd
+PKG_SOURCE_VERSION:=d631dc9520b3486efbe202241425118a603b6171
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

ieee1905/plugins/map.mk

@@ -12,7 +12,7 @@ define Package/ieee1905-map-plugin/config
 
 		config MULTIAP_EASYMESH_VERSION
 		int "Easymesh version"
-		default 4
+		default 6
 
 		config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 		bool "Sync configuration between dynamic controllers in the network"

iop/config

@@ -1,335 +0,0 @@
-############
-# 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
-
-CONFIG_JSON_CYCLONEDX_SBOM=y
-CONFIG_INCLUDE_CONFIG=y
-
-# Image #
-CONFIG_TARGET_CUSTOMER="IOPSYS"
-CONFIG_TARGET_ROOTFS_TARGZ=y
-
-# Although UBIFS and EXT4 images work on all non-secure-boot devices,
-# squashfs is the only officially supported rootfs filesystem.
-# A writable rootfs is useful for developping an debugging preinit code.
-# CONFIG_TARGET_ROOTFS_UBIFS is not set
-# CONFIG_TARGET_ROOTFS_EXT4FS is not set
-
-# /etc/banner and /etc/device_info #
-CONFIG_IMAGEOPT=y
-CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="IOPSYS"
-CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
-CONFIG_VERSION_DIST="IOWRT"
-
-# OpenWrt is given by CONFIG_VERSION_NUMBER which we do not want to override.
-# disabling CONFIG_VERSION_FILENAMES will hide the OpenWrt version from the image filename
-# CONFIG_VERSION_FILENAMES is not set
-
-# CONFIG_VERSION_CODE is set to the IOWRT version instead by the genconfig-script and
-# CONFIG_VERSION_CODE_FILENAMES will put it into the image filename.
-CONFIG_VERSION_CODE_FILENAMES=y
-
-CONFIG_VERSION_HOME_URL="https://iopsys.eu"
-CONFIG_VERSION_BUG_URL="https://iopsys.eu"
-CONFIG_VERSION_SUPPORT_URL="https://iopsys.eu"
-
-# /lib/preinit #
-CONFIG_PREINITOPT=y
-# 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_qosmngr=y
-CONFIG_PACKAGE_libwifiutils=y
-CONFIG_PACKAGE_wifimngr=y
-
-# Multi-AP #
-CONFIG_PACKAGE_ieee1905=y
-CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
-CONFIG_PACKAGE_ieee1905-topology-plugin=y
-CONFIG_PACKAGE_decollector=y
-CONFIG_PACKAGE_map-agent=y
-CONFIG_PACKAGE_map-controller=y
-
-# Network #
-CONFIG_PACKAGE_hostmngr=y
-CONFIG_PACKAGE_netmode=y
-CONFIG_PACKAGE_urlfilter=y
-
-# System #
-CONFIG_PACKAGE_imonitor=m
-CONFIG_PACKAGE_questd=y
-CONFIG_PACKAGE_rulengd=y
-CONFIG_PACKAGE_usermngr=y
-
-# TR-x69 #
-CONFIG_PACKAGE_libbbfdm=y
-CONFIG_PACKAGE_bbfdmd=y
-CONFIG_PACKAGE_icwmp=y
-CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_bulkdata=y
-CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=y
-CONFIG_PACKAGE_swmodd=y
-CONFIG_PACKAGE_twamp=y
-CONFIG_PACKAGE_udpecho-client=y
-CONFIG_PACKAGE_udpecho-server=y
-CONFIG_PACKAGE_userinterface=y
-CONFIG_PACKAGE_xmppc=y
-CONFIG_PACKAGE_timemngr=y
-CONFIG_PACKAGE_self-diagnostics=y
-
-# WebGUI #
-CONFIG_PACKAGE_sulu=y
-
-
-############
-# Network #
-##########
-
-# Protocols #
-CONFIG_PACKAGE_6in4=y
-CONFIG_PACKAGE_6rd=y
-CONFIG_PACKAGE_6to4=y
-CONFIG_PACKAGE_chat=y
-CONFIG_PACKAGE_comgt=y
-CONFIG_PACKAGE_comgt-directip=y
-CONFIG_PACKAGE_comgt-ncm=y
-CONFIG_PACKAGE_ds-lite=y
-CONFIG_PACKAGE_firewall=y
-# CONFIG_PACKAGE_firewall4 is not set
-CONFIG_PACKAGE_gre=y
-CONFIG_PACKAGE_map=y
-CONFIG_PACKAGE_ntfs-3g=y
-CONFIG_PACKAGE_ntpd=y
-CONFIG_PACKAGE_odhcp6c=y
-CONFIG_PACKAGE_odhcpd=y
-CONFIG_PACKAGE_ppp-mod-pppoa=y
-CONFIG_PACKAGE_ppp-mod-pppoe=y
-CONFIG_PACKAGE_ppp-mod-pppol2tp=y
-CONFIG_PACKAGE_ppp-mod-pptp=y
-CONFIG_PACKAGE_ppp-multilink=y
-# CONFIG_PACKAGE_ppp is not set
-CONFIG_PACKAGE_relayd=y
-CONFIG_PACKAGE_umbim=y
-CONFIG_PACKAGE_uqmi=y
-CONFIG_PACKAGE_wwan=y
-CONFIG_PACKAGE_xl2tpd=y
-
-# Services #
-CONFIG_PACKAGE_atftpd=y
-CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_dnsmasq=y
-CONFIG_PACKAGE_ssdpd=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=y
-
-# 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_ip6tables-zz-legacy=y
-CONFIG_PACKAGE_iptables-zz-legacy=y
-CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
-CONFIG_PACKAGE_iptables-mod-extra=y
-CONFIG_PACKAGE_iptables-mod-filter=y
-CONFIG_PACKAGE_iptables-mod-ipmark=y
-CONFIG_PACKAGE_iptables-mod-ipopt=y
-CONFIG_PACKAGE_iptables-mod-nflog=y
-CONFIG_PACKAGE_iptables-mod-nfqueue=y
-CONFIG_PACKAGE_iputils-arping=y
-CONFIG_PACKAGE_iputils-ping=y
-CONFIG_PACKAGE_ndisc6=y
-CONFIG_PACKAGE_rdisc6=y
-CONFIG_PACKAGE_resolveip=y
-CONFIG_PACKAGE_socat=y
-CONFIG_PACKAGE_tcpdump=y
-CONFIG_PACKAGE_traceroute6=y
-
-
-############
-# System  #
-##########
-
-CONFIG_PACKAGE_at=y
-CONFIG_PACKAGE_ca-certificates=y
-CONFIG_PACKAGE_crun=y
-CONFIG_PACKAGE_getopt=y
-CONFIG_PACKAGE_gpiod-tools=y
-# CONFIG_PACKAGE_iwatchdog is not set
-CONFIG_PACKAGE_jq=y
-CONFIG_PACKAGE_libcap-bin=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_quota=y
-CONFIG_PACKAGE_rpcd=y
-CONFIG_PACKAGE_rpcd-mod-rpcsys=y
-CONFIG_PACKAGE_rpcd-mod-rrdns=y
-CONFIG_PACKAGE_strace=y
-CONFIG_PACKAGE_terminfo=y
-CONFIG_PACKAGE_uledd=y
-# The urandom-seed package is very strange. It seeds urandom with urandom...
-# Disable it. Most SoCs nowadays has HW random generators anyway.
-# CONFIG_PACKAGE_urandom-seed is not set
-# CONFIG_PACKAGE_urngd is not set
-CONFIG_PACKAGE_usb-modeswitch=y
-CONFIG_PACKAGE_uuidgen=y
-CONFIG_PACKAGE_zoneinfo-core=y
-CONFIG_PACKAGE_zoneinfo-europe=y
-
-
-################
-# LuCI WebGUI #
-##############
-
-# BEGIN: luci-nginx metapackage with some changes
-# We do not want libiwinfo-lua on non-WiFi targets, but it is already
-# depended on by other luci-packages, so no need to take it in explicitly
-CONFIG_PACKAGE_luci-mod-admin-full=y
-CONFIG_PACKAGE_luci-app-firewall=y
-CONFIG_PACKAGE_luci-app-opkg=y
-CONFIG_PACKAGE_luci-proto-ppp=y
-CONFIG_PACKAGE_luci-proto-ipv6=y
-# CONFIG_LUCI_JSMIN is not set
-# CONFIG_LUCI_CSSTIDY is not set
-CONFIG_PACKAGE_luci-mod-dashboard=y
-CONFIG_PACKAGE_luci-theme-openwrt-2020=y
-CONFIG_PACKAGE_nginx-mod-luci=y
-
-
-############
-# BusyBox #
-##########
-
-CONFIG_BUSYBOX_CUSTOM=y
-CONFIG_BUSYBOX_CONFIG_ADDUSER=y
-CONFIG_BUSYBOX_CONFIG_ASH_IDLE_TIMEOUT=y
-CONFIG_BUSYBOX_CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_BUSYBOX_CONFIG_CTTYHACK=y
-CONFIG_BUSYBOX_CONFIG_DELUSER=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
-CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
-# CONFIG_BUSYBOX_CONFIG_HTTPD is not set
-# CONFIG_BUSYBOX_CONFIG_INSMOD is not set
-# CONFIG_BUSYBOX_CONFIG_MODINFO is not set
-# CONFIG_BUSYBOX_CONFIG_MODPROBE is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-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
-CONFIG_BUSYBOX_CONFIG_LSPCI=y
-CONFIG_BUSYBOX_CONFIG_LSUSB=y
-CONFIG_BUSYBOX_CONFIG_MICROCOM=y
-# CONFIG_BUSYBOX_CONFIG_RMMOD is not set
-CONFIG_BUSYBOX_CONFIG_STTY=y
-CONFIG_BUSYBOX_CONFIG_TFTP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_AUTH_MD5=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_CGI=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_GZIP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_PROXY=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_RANGES=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SETUID=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_HTTPD_USE_SENDFILE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_NOLOGIN is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_SECURETTY=y
-# CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_BLOCKSIZE is not set
-CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_GET=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_TFTP_PUT=y
-# CONFIG_BUSYBOX_CONFIG_WGET is not set
-# CONFIG_BUSYBOX_CONFIG_LOGIN_SCRIPTS is not set
-# CONFIG_BUSYBOX_CONFIG_LOGIN_SESSION_AS_CHILD is not set
-# CONFIG_BUSYBOX_CONFIG_PAM is not set
-# CONFIG_BUSYBOX_CONFIG_TFTP_DEBUG is not set
-# CONFIG_BUSYBOX_CONFIG_NTPD is not set
-CONFIG_BUSYBOX_CONFIG_MOUNTPOINT=y
-CONFIG_BUSYBOX_CONFIG_RUN_PARTS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_LONG_OPTIONS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_RUN_PARTS_FANCY=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GZIP_LEVELS=y
-CONFIG_BUSYBOX_CONFIG_GZIP_FAST=2
-CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_SLEEP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FLOAT_SLEEP=y
-CONFIG_BUSYBOX_CONFIG_FLOAT_DURATION=y
-CONFIG_BUSYBOX_CONFIG_USLEEP=y
-CONFIG_BUSYBOX_CONFIG_REALPATH=y
-CONFIG_BUSYBOX_CONFIG_TTY=y
-CONFIG_BUSYBOX_CONFIG_BLOCKDEV=y
-CONFIG_BUSYBOX_CONFIG_PARTPROBE=y
-CONFIG_BUSYBOX_CONFIG_LFS=y
-CONFIG_BUSYBOX_CONFIG_FDISK=y
-CONFIG_BUSYBOX_CONFIG_FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_WRITABLE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_GPT_LABEL=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_FDISK_ADVANCED=y
-CONFIG_BUSYBOX_CONFIG_IONICE=y
-CONFIG_BUSYBOX_CONFIG_RENICE=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_BTRFS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_F2FS=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_LINUXSWAP=y
-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_BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"
-# CONFIG_BUSYBOX_CONFIG_ARPING is not set
-# CONFIG_BUSYBOX_CONFIG_PING is not set
-# CONFIG_BUSYBOX_CONFIG_PING6 is not set
-# CONFIG_BUSYBOX_CONFIG_FEATURE_FANCY_PING is not set

iop/iop.completion

@@ -33,10 +33,10 @@ _iop()
     prev="${COMP_WORDS[COMP_CWORD-1]}"
 
     iopcmds="bootstrap cfe_upgrade cfe_upgrade_latest extract_core \
-             feeds_update feeds_update-legacy genconfig genconfig-legacy \
+             feeds_update genconfig \
              generate_tarballs install_key \
              scp_changes setup_host ssh_install_key status \
-             update_package update_feed_branches ssh_upgrade smoketest"
+             update_feed_branches ssh_upgrade smoketest"
 
     if [ $COMP_CWORD -eq 1 ] ; then
 

iop/scripts/feeds_update-legacy.sh

@@ -1,88 +0,0 @@
-#!/bin/bash
-
-function feeds_update-legacy {
-	heads=1
-	developer=0
-	override=1
-	force=1
-
-	function update_failure {
-		if [ $force == 1 ]; then
-			echo "WARNING: Failed to update feed(s). Forced update, proceeding anyway." >&2
-		else
-			echo "ERROR: Failed to update feed(s). Omit -F to proceed anyway." >&2
-			exit 1
-		fi
-	}
-
-	while getopts "inFh" opt; do
-		case $opt in
-		i)
-			heads=0
-			;;
-		n)
-			override=0
-			;;
-		F)
-			force=0
-			;;
-		h|\?)
-			echo "Usage: ./iop feeds_update-legacy  [-i] [-n] [-F] [-h]"
-			echo
-			echo "OPTIONS:"
-			echo "  -i - Only update index. Do not change HEAD in feeds."
-			echo "  -n - Do not replace core packages with iopsys versions."
-			echo "  -F - Do not force update if there are inaccessible feeds."
-			echo "  -h - Display this help message and exit."
-			exit 1
-			;;
-		esac
-	done
-
-	git remote -v | grep -qE '(git@|ssh://)' && developer=1
-
-	cp .config .genconfig_config_bak
-
-	if [ $heads == 1 ]; then
-		if [ $developer == 1 ]; then
-			./scripts/feeds update -g || update_failure
-		else
-			./scripts/feeds update || update_failure
-		fi
-	fi
-	./scripts/feeds update -ai || exit 1
-
-	# replace core packages with iopsys versions
-	if [ $override == 1 ]; then
-		./scripts/feeds install -f -p openwrt_core -a || exit 1
-		./scripts/feeds install -f -p qualcomm -a || exit 1
-	fi
-
-	(
-		echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update'
-		echo 'FEED_DEVICES_DIRS:='
-		find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h\n'
-	) > target/linux/feed-devices/feed-devices-list.mk || exit 1
-
-	# targets need to be installed explicitly
-	for target in $(ls ./feeds/targets); do
-		./scripts/feeds install -f -p targets $target || exit 1
-	done
-
-	# install all packages
-	./scripts/feeds install -a || exit 1
-
-	# remove broken symlinks ( for packages that are no longer in the feed )
-	find -L package/feeds -maxdepth 2 -type l -delete || exit 1
-
-	cp .genconfig_config_bak .config
-	make defconfig || exit 1
-
-	# record when we last run this script
-	touch tmp/.iop_bootstrap || exit 1
-
-	# always return true
-	exit 0
-}
-
-register_command "feeds_update-legacy" "Update feeds to point to commit hashes from feeds.conf - legacy mode"

iop/scripts/genconfig-legacy.sh

@@ -1,535 +0,0 @@
-#!/bin/bash
-
-function genconfig-legacy {
-	export CLEAN=0
-	export DIRTY="--dirty"
-	export IMPORT=1
-	export SRCTREEOVERR=0
-	export FILEDIR="files/"
-	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/iopsys/iop"
-	CUSTPATH="customerconfigs"
-	export CUSTCONF="customerconfigs/customers"
-	export VERBOSE=0
-	export DEVELOPER=0
-	target="bogus"
-	target_config_path=""
-	brcmbca_feed="target/linux/feeds/brcmbca"
-	airoha_feed="target/linux/feeds/airoha"
-	x86_feed="target/linux/feeds/x86"
-	armsr_feed="target/linux/feeds/armsr"
-	mediatek_feed="target/linux/feeds/mediatek"
-	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
-	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
-
-	Red='\033[0;31m'          # Red
-	Color_Off='\033[0m'       # Text Reset
-	Yellow='\033[0;33m'       # Yellow
-
-	function find_last {
-	    egrep "^[ #]*${1}[ =]" $2 | tail -n1
-	}
-
-	function is_new {
-	    for opt in $conf_warned
-	    do
-		if [ "$opt" == "$1" ]
-		then
-		    return 1
-		fi
-	    done
-	    # option not found return true
-	    return 0
-	}
-
-	function verify_config {
-	    local conf_opt
-	    local conf_org
-	    local conf_new
-
-	    while read -r line
-	    do
-		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
-		if [ -n "${conf_opt}" ]
-		then
-		    conf_org=$(find_last ${conf_opt} .genconfig.config)
-		    conf_new=$(find_last ${conf_opt} .config)
-		    if [ "$conf_org" != "$conf_new" ]
-		    then
-			if is_new $conf_opt
-			then
-			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
-			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
-			    echo "This is a real problem somebody needs to investigate"
-			    echo ""
-			    conf_warned="$conf_warned $conf_opt"
-			fi
-		    else
-			true
-			# for debug to see all options
-			#echo -e "wanted [$conf_org] got [$conf_new]"
-		    fi
-		fi
-	    done < .genconfig.config
-	}
-
-	# Takes a board name and returns the target name in global var $target
-	set_target() {
-		local profile=$1
-
-		[ -n "$profile" ] || return
-
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
-			local profiles=
-			local pfound=0
-
-			if [ -e "$targetpath/genconfig" ]; then
-				profiles=$(cd $targetpath; ./genconfig)
-
-				for p in $profiles; do
-					if [ $p == $profile ]; then
-						pfound=1
-						break
-					fi
-				done
-			fi
-
-			if [ $pfound -eq 1 ]; then
-				target="$(echo $TARGET | tr '-' '_')"
-				target_config_path="$targetpath/config"
-			fi
-
-			return
-		fi
-
-		[ -e $brcmbca_feed/genconfig ] &&
-			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $airoha_feed/genconfig ] &&
-			airoha=$(cd $airoha_feed; ./genconfig)
-		[ -e $x86_feed/genconfig ] &&
-			x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armsr_feed/genconfig ] &&
-			armsr=$(cd $armsr_feed; ./genconfig)
-		[ -e $mediatek_feed/genconfig ] &&
-			mediatek=$(cd $mediatek_feed; ./genconfig)
-		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
-		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
-			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armsr mediatek ipq95xx ipq53xx; do
-				echo "$list based boards:"
-				a=$(echo "${!list}" | sort)
-				for b in $a; do
-					echo -e "\t$b"
-				done
-			done
-			return
-	    fi
-
-	    for p in $airoha; do
-		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $x86; do
-		if [ $p == $profile ]; then
-		    target="x86"
-			target_config_path="$x86_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $armsr; do
-		if [ $p == $profile ]; then
-		    target="armsr"
-			target_config_path="$armsr_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $mediatek; do
-		if [ $p == $profile ]; then
-		    target="mediatek"
-			target_config_path="$mediatek_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq53xx; do
-		if [ $p == $profile ]; then
-		    target="ipq53xx"
-			target_config_path="$qualcomm_ipq53xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-	}
-
-	git remote -v | grep -qE '(git@|ssh://)' && {
-		DEVELOPER=1
-	}
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	usage() {
-		echo
-		echo 1>&2 "Usage: $0 genconfig-legacy [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
-		echo
-		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
-		echo -e "  -v|--verbose\t\tVerbose"
-		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
-		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
-		echo -e "  -s|--override\t\tEnable 'Package source tree override'"
-		echo -e "  -S|--brcmsingle\tForce build of bcmkernel to use only one thread"
-		echo -e "  -h|--help\t\tShow this message"
-		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
-		echo -e "  -a|--list-all\t\tList all Customers and their board types"
-		echo -e "  -b|--boards\t\tList all board types"
-		echo
-		echo "Example ./iop genconfig-legacy eg400 OPERATORX"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
-		echo
-		exit 0
-	}
-
-	list_customers()
-	{
-		local ALL="$1"
-		local CUSTOMER="$2"
-		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
-			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common)"
-			if [ "$boards" ]; then
-				echo "$CUSTOMER has following boards:"
-				for board in $boards; do
-					echo -e "\t$board"
-				done
-			else
-				echo "No boards found for $CUSTOMER"
-			fi
-		elif [ "$CUSTOMER" ]; then
-			echo "No customer called $CUSTOMER"
-			exit 1
-		elif [ -d $CUSTCONF ]; then
-			local customers="$(ls -1 $CUSTCONF)"
-			if [ "$customers" -a "$ALL" == 1 ]; then
-				for customer in $customers; do
-					echo $customer
-					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common)"
-					if [ "$boards" ]; then
-						for board in $boards; do
-							echo -e "\t$board"
-						done
-					else
-						echo "has no boards"
-					fi
-				done
-			elif [ "$customers" ]; then
-				echo -e "$customers"
-			else
-				echo "no customers found"
-			fi
-		else
-			echo "No $CUSTCONF folder found"
-		fi
-		exit 0
-	}
-
-
-	generate_config()
-	{
-		DIFFFILE="$1"
-		MASTERFILE="$2"
-		while read p; do
-			v "$p"
-			sed -r -i "$p" $MASTERFILE
-		done < $DIFFFILE
-	}
-
-	setup_dirs()
-	{
-		git remote -v | grep -q http || {
-			CUSTBRANCH="$(git rev-parse --abbrev-ref HEAD)"
-			if git ls-remote $CUSTREPO -q 2>/dev/null; then
-				if [ ! -d "$CUSTPATH" ]; then
-					echo "Cloning $CUSTBRANCH branch of $CUSTREPO"
-					git clone -b "$CUSTBRANCH" "$CUSTREPO" "$CUSTPATH" 2>/dev/null || {
-						DEFBRANCH="$(git remote show $CUSTREPO | grep 'HEAD branch' | cut -d' ' -f5)"
-						echo "$CUSTBRANCH branch is not found, cloning $DEFBRANCH branch of $CUSTREPO"
-						git clone "$CUSTREPO" "$CUSTPATH"
-					}
-				elif [ $IMPORT -eq 1 ]; then
-					cd $CUSTPATH
-					echo "Checking out $CUSTBRANCH branch in $CUSTPATH"
-					git checkout "$CUSTBRANCH" 2>/dev/null || {
-						DEFBRANCH="$(git symbolic-ref refs/remotes/origin/HEAD | cut -d '/' -f4)"
-						echo "Checking out $CUSTBRANCH branch has failed, using $DEFBRANCH branch in $CUSTPATH"
-					}
-					v "git pull"
-					git pull
-					cd - >/dev/null #go back
-				fi
-			else
-				echo "You do not have access to $CUSTREPO"
-			fi
-		}
-
-		if [ ! -d "$FILEDIR" ]; then
-			mkdir -p $FILEDIR
-		elif [ -d "$FILEDIR" -a $CLEAN -eq 1 ]; then
-			v "rm -rf $FILEDIR*"
-			rm -rf $FILEDIR*
-		fi
-	}
-
-	get_subtarget_for_device() {
-		readonly target="$1"
-		readonly device="$2"
-		readonly targetinfo_file="tmp/info/.targetinfo-feeds_$target"
-		readonly target_profile_line="Target-Profile: DEVICE_$device"
-		# We want to know after which Target: $target/$subtarget line
-		# our $target_profile_line appears
-		# This is a crude way to "parse" the file using shell 🤯
-		# 1. grep for both lines with line number output
-		# 2. grep again to determine the device profile line that we looked for
-		#    but output one context line before as well to determine corresponding subtarget line
-		# 4. Use head and sed to extract the subtarget
-		grep "^Target: $target/\|^$target_profile_line" "$targetinfo_file" \
-			| grep -E -B1 "^$target_profile_line" \
-			| head -n1 \
-			| sed -E "s|^Target: $target/||"
-	}
-
-	create_and_copy_files()
-	{
-		local BOARDTYPE=$1
-		shift
-		local CUSTOMERS=$@
-
-		# Validate seleced board and customers
-		set_target $BOARDTYPE
-		if [ $target == "bogus" ]; then
-			echo "Hardware profile does not exist"
-			exit 1
-		elif [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
-					echo "Customer profile for '$CUSTOMER' does not exist"
-					exit 1
-				elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
-					echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
-					if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-						echo "Common profile configuration will be used"
-					else
-						exit 1
-					fi
-				fi
-			done
-		fi
-
-		# Generate base config
-		rm -f .config
-		v "Config $BOARDTYPE selected"
-		v "cp $CONFIGPATH/config .config"
-		cp $CONFIGPATH/config .config
-
-		if [ -f $target_config_path/config ]; then
-		    cat $target_config_path/config >> .config
-		    echo "" >> .config
-		fi
-		if [ -f $target_config_path/$BOARDTYPE/config ]; then
-		    cat $target_config_path/$BOARDTYPE/config >> .config
-		    echo "" >> .config
-		fi
-		# hack to support custom-devices until we have deprecated this genconfig-script...
-		local custom_found=false
-		local used_config_file
-
-		for config_file in feeds/*/devices/$target/config/$BOARDTYPE/config; do
-			if [ "$custom_found" = "true" ]; then
-				echo
-				echo "Error was found!"
-				echo "Please use only one path."
-				echo "Two instances of $target/config/$BOARDTYPE exists:"
-				echo "Path 1: $used_config_file"
-				echo "Path 2: $config_file"
-				return 1
-			fi
-			if [ -f "$config_file" ]; then
-				cat "$config_file" >> .config
-				echo "" >> .config
-				custom_found=true
-				used_config_file=$config_file
-			fi
-		done
-
-		# Special handling for targets which use TARGET_DEVICES
-		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
-			if [ -z "$subtarget" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-			;;
-		*)
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
-
-		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
-
-		# Add customerconfig diff if a customer is selected
-		if [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
-				fi
-				if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
-					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
-					echo "" >> .config
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
-					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-					echo "" >> .config
-				fi
-			done
-		fi
-
-		# Set target version
-		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
-			echo "ERROR: Failed getting version via git describe, exiting." >&2
-			return 1
-		fi
-		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
-		local version_lower="${version,,}"
-		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
-
-		# Enable Package source tree override if selected
-		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
-
-		# developer mode selected ?
-		echo "CONFIG_DEVEL=y" >>.config
-		if [ $DEVELOPER -eq 1 ]; then
-			# rewrite url to clone with ssh instead of http
-			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
-		else
-			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
-		fi
-
-		if [ -n "$BRCM_MAX_JOBS" ]
-		then
-		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
-		fi
-
-		# Force regeneration of kernel Makefile
-		# Needed to disable kmods for iopsys-brcm targets
-		touch package/kernel/linux/Makefile
-
-		# we need to signal to bradcom SDK that we have changed the board id
-		# currently boardparms.c and boardparms_voice.c is the only place that is depending on boardid name
-		# so just touch that file.
-		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
-
-		# Store generated config
-		cp .config .genconfig.config
-
-		# Set default values based on selected parameters
-		v "$(make defconfig 2>&1)"
-
-		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
-
-		# Clean base-file package to force rebuild when changing profile
-		v "$(make package/base-files/clean 2>&1)"
-
-		verify_config
-	}
-
-	####### main #####
-	if [ ! -e tmp/.iop_bootstrap ]; then
-		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
-		echo "Run: iop feeds_update"
-		exit 1
-	fi
-
-	if [ $# -eq 0 ]; then
-		echo Current profile:
-		cat $CURRENT_CONFIG_FILE
-		echo "Try ./iop genconfig-legacy -h' to get instructions if you want to change current config"
-		exit 0
-	else
-		while [ -n "$1" ]; do
-			case "$1" in
-
-			-c|--clean) export CLEAN=1;;
-			-D|--no-dirty) export DIRTY="";;
-			-n|--no-update) export IMPORT=0;;
-			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
-			-t|--target) export TARGET="$2"; shift;;
-			-p|--profile) export PROFILE="$2"; shift;;
-			-r|--repo) export CUSTREPO="$2"; shift;;
-			-s|--override) export SRCTREEOVERR=1;;
-			-S|--brcmsingel) export BRCM_MAX_JOBS=1;;
-			-h|--help) usage;;
-			-l|--list) list_customers 0 $2;;
-			-a|--list-all)list_customers 1;;
-			-b|--boards)set_target LIST;exit 0;;
-			-*)
-				echo "Invalid option: $1 "
-				echo "Try -h or --help for more information."
-				exit 1
-				;;
-			*) break;;
-			esac
-			shift;
-		done
-
-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
-
-		setup_dirs
-		create_and_copy_files "$@" || exit 1
-	fi
-}
-
-register_command "genconfig-legacy" "Generate configuration for board and customer - legacy mode"

iop/scripts/genconfig_min-legacy.sh

@@ -1,503 +0,0 @@
-#!/bin/bash
-
-function genconfig_min-legacy {
-	export CLEAN=0
-	export DIRTY="--dirty"
-	export SRCTREEOVERR=0
-	export FILEDIR="files/"
-	CURRENT_CONFIG_FILE=".current_config_file"
-	export CONFIGPATH="package/feeds/iopsys/iop"
-	CUSTPATH="customerconfigs"
-	export CUSTCONF="customerconfigs/customers"
-	export VERBOSE=0
-	export DEVELOPER=0
-	target="bogus"
-	target_config_path=""
-	brcmbca_feed="target/linux/feeds/brcmbca"
-	airoha_feed="target/linux/feeds/airoha"
-	x86_feed="target/linux/feeds/x86"
-	armsr_feed="target/linux/feeds/armsr"
-	mediatek_feed="target/linux/feeds/mediatek"
-	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
-	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
-
-	Red='\033[0;31m'          # Red
-	Color_Off='\033[0m'       # Text Reset
-	Yellow='\033[0;33m'       # Yellow
-
-	function find_last {
-	    egrep "^[ #]*${1}[ =]" $2 | tail -n1
-	}
-
-	function is_new {
-	    for opt in $conf_warned
-	    do
-		if [ "$opt" == "$1" ]
-		then
-		    return 1
-		fi
-	    done
-	    # option not found return true
-	    return 0
-	}
-
-	function verify_config {
-	    local conf_opt
-	    local conf_org
-	    local conf_new
-
-	    while read -r line
-	    do
-		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
-		if [ -n "${conf_opt}" ]
-		then
-		    conf_org=$(find_last ${conf_opt} .genconfig.config)
-		    conf_new=$(find_last ${conf_opt} .config)
-		    if [ "$conf_org" != "$conf_new" ]
-		    then
-			if is_new $conf_opt
-			then
-			    echo -e "config option [${Red}$conf_opt${Color_Off}] is not set correctly in .config"
-			    echo -e "got value [${Yellow}$conf_new${Color_Off}] but wanted [${Yellow}$conf_org${Color_Off}]"
-			    echo "This is a real problem somebody needs to investigate"
-			    echo ""
-			    conf_warned="$conf_warned $conf_opt"
-			fi
-		    else
-			true
-			# for debug to see all options
-			#echo -e "wanted [$conf_org] got [$conf_new]"
-		    fi
-		fi
-	    done < .genconfig.config
-	}
-
-	# Takes a board name and returns the target name in global var $target
-	set_target() {
-		local profile=$1
-
-		[ -n "$profile" ] || return
-
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
-			local profiles=
-			local pfound=0
-
-			if [ -e "$targetpath/genconfig" ]; then
-				profiles=$(cd $targetpath; ./genconfig)
-
-				for p in $profiles; do
-					if [ $p == $profile ]; then
-						pfound=1
-						break
-					fi
-				done
-			fi
-
-			if [ $pfound -eq 1 ]; then
-				target="$(echo $TARGET | tr '-' '_')"
-				target_config_path="$targetpath/config"
-			fi
-
-			return
-		fi
-
-		[ -e $brcmbca_feed/genconfig ] &&
-			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $airoha_feed/genconfig ] &&
-			airoha=$(cd $airoha_feed; ./genconfig)
-		[ -e $x86_feed/genconfig ] &&
-			x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armsr_feed/genconfig ] &&
-			armsr=$(cd $armsr_feed; ./genconfig)
-		[ -e $mediatek_feed/genconfig ] &&
-			mediatek=$(cd $mediatek_feed; ./genconfig)
-		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
-			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
-		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
-			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
-
-	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armsr mediatek ipq95xx ipq53xx; do
-				echo "$list based boards:"
-				a=$(echo "${!list}" | sort)
-				for b in $a; do
-					echo -e "\t$b"
-				done
-			done
-			return
-	    fi
-
-	    for p in $airoha; do
-		if [ $p == $profile ]; then
-		    target="airoha"
-			target_config_path="$airoha_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $x86; do
-		if [ $p == $profile ]; then
-		    target="x86"
-			target_config_path="$x86_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $armsr; do
-		if [ $p == $profile ]; then
-		    target="armsr"
-			target_config_path="$armsr_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $mediatek; do
-		if [ $p == $profile ]; then
-		    target="mediatek"
-			target_config_path="$mediatek_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq95xx; do
-		if [ $p == $profile ]; then
-		    target="ipq95xx"
-			target_config_path="$qualcomm_ipq95xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $ipq53xx; do
-		if [ $p == $profile ]; then
-		    target="ipq53xx"
-			target_config_path="$qualcomm_ipq53xx_feed/config"
-		    return
-		fi
-	    done
-
-	    for p in $brcmbca; do
-		if [ $p == $profile ]; then
-		    target="brcmbca"
-			target_config_path="$brcmbca_feed/config"
-		    return
-		fi
-	    done
-	}
-
-	git remote -v | grep -qE '(git@|ssh://)' && {
-		DEVELOPER=1
-	}
-
-	v() {
-		[ "$VERBOSE" -ge 1 ] && echo "$@"
-	}
-
-	usage() {
-		echo
-		echo 1>&2 "Usage: $0 genconfig_min-legacy [ OPTIONS ] < Board_Type > [ Customer [customer2 ]...]"
-		echo
-		echo -e "  -c|--clean\t\tRemove all files under ./files and import from config "
-		echo -e "  -D|--no-dirty\t\tIgnore dirty tree"
-		echo -e "  -v|--verbose\t\tVerbose"
-		echo -e "  -n|--no-update\tDo NOT! Update customer config before applying"
-		echo -e "  -t|--target\t\tExplicitly specify the linux target to build the board profile from"
-		echo -e "  -s|--override\t\tEnable 'Package source tree override'"
-		echo -e "  -S|--brcmsingle\tForce build of bcmkernel to use only one thread"
-		echo -e "  -h|--help\t\tShow this message"
-		echo -e "  -l|--list [customer]\tList all Customers or all boards for one customer"
-		echo -e "  -a|--list-all\t\tList all Customers and their board types"
-		echo -e "  -b|--boards\t\tList all board types"
-		echo
-		echo "Example ./iop genconfig_min-legacy eg400 OPERATORX"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
-		echo
-		exit 0
-	}
-
-	list_customers()
-	{
-		local ALL="$1"
-		local CUSTOMER="$2"
-		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
-			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common )"
-			if [ "$boards" ]; then
-				echo "$CUSTOMER has following boards:"
-				for board in $boards; do
-					echo -e "\t$board"
-				done
-			else
-				echo "No boards found for $CUSTOMER"
-			fi
-		elif [ "$CUSTOMER" ]; then
-			echo "No customer called $CUSTOMER"
-			exit 1
-		elif [ -d $CUSTCONF ]; then
-			local customers="$(ls -1 $CUSTCONF)"
-			if [ "$customers" -a "$ALL" == 1 ]; then
-				for customer in $customers; do
-					echo $customer
-					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common )"
-					if [ "$boards" ]; then
-						for board in $boards; do
-							echo -e "\t$board"
-						done
-					else
-						echo "has no boards"
-					fi
-				done
-			elif [ "$customers" ]; then
-				echo -e "$customers"
-			else
-				echo "no customers found"
-			fi
-		else
-			echo "No $CUSTCONF folder found"
-		fi
-		exit 0
-	}
-
-
-	generate_config()
-	{
-		DIFFFILE="$1"
-		MASTERFILE="$2"
-		while read p; do
-			v "$p"
-			sed -r -i "$p" $MASTERFILE
-		done < $DIFFFILE
-	}
-
-	setup_dirs()
-	{
-
-		if [ ! -d "$FILEDIR" ]; then
-			mkdir -p $FILEDIR
-		elif [ -d "$FILEDIR" -a $CLEAN -eq 1 ]; then
-			v "rm -rf $FILEDIR*"
-			rm -rf $FILEDIR*
-		fi
-	}
-
-	get_subtarget_for_device() {
-		readonly target="$1"
-		readonly device="$2"
-		readonly targetinfo_file="tmp/info/.targetinfo-feeds_$target"
-		readonly target_profile_line="Target-Profile: DEVICE_$device"
-		# We want to know after which Target: $target/$subtarget line
-		# our $target_profile_line appears
-		# This is a crude way to "parse" the file using shell 🤯
-		# 1. grep for both lines with line number output
-		# 2. grep again to determine the device profile line that we looked for
-		#    but output one context line before as well to determine corresponding subtarget line
-		# 4. Use head and sed to extract the subtarget
-		grep "^Target: $target/\|^$target_profile_line" "$targetinfo_file" \
-			| grep -E -B1 "^$target_profile_line" \
-			| head -n1 \
-			| sed -E "s|^Target: $target/||"
-	}
-
-	create_and_copy_files()
-	{
-		local BOARDTYPE=$1
-		shift
-		local CUSTOMERS=$@
-
-		# Validate seleced board and customers
-		set_target $BOARDTYPE
-		if [ $target == "bogus" ]; then
-			echo "Hardware profile does not exist"
-			exit 1
-		elif [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ ! -d "$CUSTCONF/$CUSTOMER/" ]; then
-					echo "Customer profile for '$CUSTOMER' does not exist"
-					exit 1
-				elif [ ! -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/" ]; then
-					echo "'$BOARDTYPE' board profile does not exist for customer '$CUSTOMER'"
-					if [ -f "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-						echo "Common profile configuration will be used"
-					else
-						exit 1
-					fi
-				fi
-			done
-		fi
-
-		# Generate base config
-		rm -f .config
-		v "Config $BOARDTYPE selected"
-		v "cp $CONFIGPATH/config .config"
-		cp $CONFIGPATH/config .config
-
-		if [ -f $target_config_path/config ]; then
-		    cat $target_config_path/config >> .config
-		    echo "" >> .config
-		fi
-		if [ -f $target_config_path/$BOARDTYPE/config ]; then
-		    cat $target_config_path/$BOARDTYPE/config >> .config
-		    echo "" >> .config
-		fi
-		# hack to support custom-devices until we have deprecated this genconfig-script...
-		local custom_found=false
-		local used_config_file
-
-		for config_file in feeds/*/devices/$target/config/$BOARDTYPE/config; do
-			if [ "$custom_found" = "true" ]; then
-				echo
-				echo "Error was found!"
-				echo "Please use only one path."
-				echo "Two instances of $target/config/$BOARDTYPE exists:"
-				echo "Path 1: $used_config_file"
-				echo "Path 2: $config_file"
-				return 1
-			fi
-			if [ -f "$config_file" ]; then
-				cat "$config_file" >> .config
-				echo "" >> .config
-				custom_found=true
-				used_config_file=$config_file
-			fi
-		done
-
-		# Special handling for targets which use TARGET_DEVICES
-		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
-			if [ -z "$subtarget" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-			;;
-		*)
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
-			;;
-		esac
-
-		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
-
-		# Add customerconfig diff if a customer is selected
-		if [ -n "$CUSTOMERS" ]; then
-			for CUSTOMER in $CUSTOMERS; do
-				if [ -d "$CUSTCONF/$CUSTOMER/common/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/common/fs/* $FILEDIR
-				fi
-				if [ -d "$CUSTCONF/$CUSTOMER/$BOARDTYPE/fs" ]; then
-					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
-					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
-					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
-					echo "" >> .config
-				fi
-				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
-					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
-					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-					echo "" >> .config
-				fi
-			done
-		fi
-
-		# Set target version
-		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
-			echo "ERROR: Failed getting version via git describe, exiting." >&2
-			return 1
-		fi
-		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
-		local version_lower="${version,,}"
-		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
-		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
-
-		# Enable Package source tree override if selected
-		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
-
-		# developer mode selected ?
-		echo "CONFIG_DEVEL=y" >>.config
-
-		if [ -n "$BRCM_MAX_JOBS" ]
-		then
-		    echo "CONFIG_BRCM_MAX_JOBS=\"1\"" >>.config
-		fi
-
-		# Force regeneration of kernel Makefile
-		# Needed to disable kmods for iopsys-brcm targets
-		touch package/kernel/linux/Makefile
-
-		# we need to signal to bradcom SDK that we have changed the board id
-		# currently boardparms.c and boardparms_voice.c is the only place that is depending on boardid name
-		# so just touch that file.
-		[ -d ./build_dir ] && find build_dir/ -name "boardparms*c" -print0 2>/dev/null | xargs -0 touch 2>/dev/null
-
-		# Store generated config
-		cp .config .genconfig.config
-
-		# Set default values based on selected parameters
-		v "$(make defconfig 2>&1)"
-
-		echo Set version to $(grep -w CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"')
-
-		# Clean base-file package to force rebuild when changing profile
-		v "$(make package/base-files/clean 2>&1)"
-
-		verify_config
-	}
-
-	####### main #####
-	if [ ! -e tmp/.iop_bootstrap ]; then
-		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
-		echo "Run: iop feeds_update"
-		exit 1
-	fi
-
-	if [ $# -eq 0 ]; then
-		echo Current profile:
-		cat $CURRENT_CONFIG_FILE
-		echo "Try ./iop genconfig_min-legacy -h' to get instructions if you want to change current config"
-		exit 0
-	else
-		while [ -n "$1" ]; do
-			case "$1" in
-
-			-c|--clean) export CLEAN=1;;
-			-D|--no-dirty) export DIRTY="";;
-			-n|--no-update) export IMPORT=0;;
-			-v|--verbose) export VERBOSE="$(($VERBOSE + 1))";;
-			-t|--target) export TARGET="$2"; shift;;
-			-p|--profile) export PROFILE="$2"; shift;;
-			-r|--repo) export CUSTREPO="$2"; shift;;
-			-s|--override) export SRCTREEOVERR=1;;
-			-S|--brcmsingel) export BRCM_MAX_JOBS=1;;
-			-h|--help) usage;;
-			-l|--list) list_customers 0 $2;;
-			-a|--list-all)list_customers 1;;
-			-b|--boards)set_target LIST;exit 0;;
-			-*)
-				echo "Invalid option: $1 "
-				echo "Try -h or --help for more information."
-				exit 1
-				;;
-			*) break;;
-			esac
-			shift;
-		done
-
-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
-
-		setup_dirs
-		create_and_copy_files "$@"
-	fi
-}
-
-register_command "genconfig_min-legacy" "Generate configuration for customer with manual board configuration - legacy mode"

iop/scripts/update_package.sh

@@ -1,10 +0,0 @@
-# Exported interface
-update_package() {
-	echo "update_package is no longer supported." >&2
-	echo "Its replacement will come soon." >&2
-	echo >&2
-	echo "For now update references in profiles/include/*.yml and feeds.conf.io manually." >&2
-	return 1
-}
-
-register_command "update_package" "No longer used command"

iopsys-analytics/Makefile

@@ -4,7 +4,7 @@ PKG_NAME:=iopsys-analytics
 PKG_RELEASE:=$(COMMITCOUNT)
 PKG_LICENSE:=PROPRIETARY
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=88dd7997ed78b1ab02c2904ed90518c46a8fa26b
+PKG_SOURCE_VERSION:=837c28bb2587b348fa7dd6b98135752aaf5f5212
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/iopsys-analytics.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

ipt-trigger/Makefile

@@ -0,0 +1,62 @@
+#
+# Copyright (C) 2024 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ipt-trigger
+PKG_VERSION:=1.0.0
+PKG_LICENSE:=GPL-2.0
+
+include $(INCLUDE_DIR)/package.mk
+
+define KernelPackage/ipt-trigger
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for iptables port trigger
+  FILES:=$(PKG_BUILD_DIR)/ipv4/ipt_TRIGGER.ko
+  DEPENDS+=+kmod-nf-nat +xtables-legacy
+  AUTOLOAD:=$(call AutoLoad,30,ipt_TRIGGER,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/ip6t-trigger
+  SUBMENU:=Other modules
+  TITLE:=Kernel module for ip6tables port trigger
+  DEPENDS+=+kmod-nf-nat +xtables-legacy
+  FILES:=$(PKG_BUILD_DIR)/ipv6/ip6t_TRIGGER.ko
+  AUTOLOAD:=$(call AutoLoad,30,ip6t_TRIGGER,1)
+  KCONFIG:=
+endef
+
+define KernelPackage/ipt-trigger/description
+	Kernel module to enable port trigger for iptables
+endef
+
+define KernelPackage/ip6t-trigger/description
+	Kernel module to enable port trigger for ip6tables
+endef
+
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
+endif
+
+define Build/Prepare
+	$(CP) -rf ./src/* $(PKG_BUILD_DIR)/
+	$(CP) $(PKG_BUILD_DIR)/ipt_TRIGGER.h $(LINUX_DIR)/include/linux/netfilter_ipv4/
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/include/linux/netfilter_ipv4
+	$(CP) $(PKG_BUILD_DIR)/ipt_TRIGGER.h $(1)/include/linux/netfilter_ipv4/
+endef
+
+KERNEL_MAKE_FLAGS += -I$(LINUX_DIR)/include
+
+define Build/Compile
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/ipv4/" modules
+	$(KERNEL_MAKE) M="$(PKG_BUILD_DIR)/ipv6/" modules
+endef
+
+$(eval $(call KernelPackage,ipt-trigger))
+$(eval $(call KernelPackage,ip6t-trigger))

ipt-trigger/src/ipt_TRIGGER.h

@@ -0,0 +1,26 @@
+#ifndef _IPT_TRIGGER_H_target
+#define _IPT_TRIGGER_H_target
+
+#define TRIGGER_TIMEOUT 600	/* 600 secs */
+
+enum ipt_trigger_type
+{
+	IPT_TRIGGER_DNAT = 1,
+	IPT_TRIGGER_IN = 2,
+	IPT_TRIGGER_OUT = 3,
+	IPT_TRIGGER_REFRESH = 4
+};
+
+struct ipt_trigger_ports {
+	u_int16_t mport[2];	/* Related destination port range */
+	u_int16_t rport[2];	/* Port range to map related destination port range to */
+};
+
+struct ipt_trigger_info {
+	enum ipt_trigger_type type;
+	u_int16_t proto;		/* Related protocol */
+	u_int16_t trigger_timeout;	/* Auto disable duration */
+	struct ipt_trigger_ports ports;
+};
+
+#endif /*_IPT_TRIGGER_H_target*/

ipt-trigger/src/ipv4/Makefile

@@ -0,0 +1 @@
+obj-m +=ipt_TRIGGER.o

ipt-trigger/src/ipv4/ipt_TRIGGER.c

@@ -0,0 +1,407 @@
+/* Kernel module to match the port-ranges, trigger related port-ranges,
+ * and alters the destination to a local IP address.
+ *
+ * Copyright (C) 2003, CyberTAN Corporation
+ * All Rights Reserved.
+ *
+ * Description:
+ *   This is kernel module for port-triggering.
+ *
+ *   The module follows the Netfilter framework, called extended packet
+ *   matching modules.
+ */
+
+#include <linux/types.h>
+#include <linux/ip.h>
+#include <linux/tcp.h>
+#include <linux/timer.h>
+#include <linux/module.h>
+#include <linux/netfilter.h>
+#include <linux/netdevice.h>
+#include <linux/if.h>
+#include <linux/inetdevice.h>
+#include <linux/list.h>
+#include <net/protocol.h>
+#include <net/checksum.h>
+#include <linux/spinlock.h>
+
+#include <linux/netfilter_ipv4.h>
+#include <linux/netfilter_ipv4/ip_tables.h>
+#include <net/netfilter/nf_conntrack.h>
+#include <net/netfilter/nf_conntrack_core.h>
+#include <net/netfilter/nf_conntrack_tuple.h>
+#include <net/netfilter/nf_nat.h>
+#include <linux/netfilter_ipv4/ipt_TRIGGER.h>
+
+/* This rwlock protects the main hash table, protocol/helper/expected
+ *    registrations, conntrack timers*/
+
+
+static DEFINE_SPINLOCK(nf_trigger_lock);
+
+
+
+#define NF_IP_PRE_ROUTING	0
+#define NF_IP_FORWARD		2
+#define IPT_CONTINUE XT_CONTINUE
+
+
+
+/***********************lock help**********************/
+#define MUST_BE_READ_LOCKED(l)
+#define MUST_BE_WRITE_LOCKED(l)
+
+
+#define LOCK_BH(l) spin_lock_bh(l)
+#define UNLOCK_BH(l) spin_unlock_bh(l)
+
+#define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&nf_trigger_lock)
+#define ASSERT_WRITE_LOCK(x) MUST_BE_WRITE_LOCKED(&nf_trigger_lock)
+
+
+
+
+/***********************list help**********************/
+#define LIST_FIND(head, cmpfn, type, args...)           \
+({                                                      \
+        const struct list_head *__i, *__j = NULL;       \
+                                                        \
+        ASSERT_READ_LOCK(head);                         \
+        list_for_each(__i, (head))                      \
+                if (cmpfn((const type)__i , ## args)) { \
+                        __j = __i;                      \
+                        break;                          \
+                }                                       \
+        (type)__j;                                      \
+})
+
+static inline int
+__list_cmp_same(const void *p1, const void *p2) { return p1 == p2; }
+
+static inline void
+list_prepend(struct list_head *head, void *new)
+{
+	ASSERT_WRITE_LOCK(head);
+	list_add(new, head);
+}
+
+#define list_named_find(head, name)                     \
+LIST_FIND(head, __list_cmp_name, void *, name)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("Netfilter Core Team <coreteam@netfilter.org>");
+MODULE_DESCRIPTION("iptables trigger target module");
+
+#if 0
+#define DEBUGP printk
+#else
+#define DEBUGP(format, args...)
+#endif
+
+struct ipt_trigger {
+        struct list_head list;          /* Trigger list */
+        struct timer_list timeout;      /* Timer for list destroying */
+        u_int32_t srcip;                /* Outgoing source address */
+        u_int32_t dstip;                /* Outgoing destination address */
+        u_int16_t mproto;               /* Trigger protocol */
+        u_int16_t rproto;               /* Related protocol */
+        u_int16_t trigger_timeout;      /* Auto disable duration */
+        struct ipt_trigger_ports ports; /* Trigger and related ports */
+        u_int8_t reply;                 /* Confirm a reply connection */
+};
+
+LIST_HEAD(ipt_trigger_list);
+
+static void trigger_refresh(struct ipt_trigger *trig, unsigned long extra_jiffies)
+{
+	DEBUGP("%s: \n", __FUNCTION__);
+	LOCK_BH(&nf_trigger_lock);
+	/* Need del_timer for race avoidance (may already be dying). */
+	if (del_timer(&trig->timeout)) {
+		trig->timeout.expires = jiffies + extra_jiffies;
+		add_timer(&trig->timeout);
+	}
+
+	UNLOCK_BH(&nf_trigger_lock);
+}
+
+static void __del_trigger(struct ipt_trigger *trig)
+{
+	DEBUGP("%s: \n", __FUNCTION__);
+	MUST_BE_WRITE_LOCKED(&nf_trigger_lock);
+
+	/* delete from 'ipt_trigger_list' */
+	list_del(&trig->list);
+	kfree(trig);
+}
+
+static void trigger_timeout(struct timer_list *t)
+{
+	struct ipt_trigger *trig = from_timer(trig, t, timeout);
+
+	DEBUGP("trigger list %p timed out\n", trig);
+	LOCK_BH(&nf_trigger_lock);
+	__del_trigger(trig);
+	UNLOCK_BH(&nf_trigger_lock);
+}
+
+static unsigned int
+add_new_trigger(struct ipt_trigger *trig)
+{
+	struct ipt_trigger *new = NULL;
+
+	DEBUGP("!!!!!!!!!!!! %s !!!!!!!!!!!\n", __FUNCTION__);
+
+	LOCK_BH(&nf_trigger_lock);
+	new = (struct ipt_trigger *)
+		kmalloc(sizeof(struct ipt_trigger), GFP_ATOMIC);
+
+	if (!new) {
+		UNLOCK_BH(&nf_trigger_lock);
+		DEBUGP("%s: OOM allocating trigger list\n", __FUNCTION__);
+		return -ENOMEM;
+	}
+
+	memset(new, 0, sizeof(*trig));
+	INIT_LIST_HEAD(&new->list);
+	memcpy(new, trig, sizeof(*trig));
+
+	/* add to global table of trigger */
+	list_prepend(&ipt_trigger_list, &new->list);
+
+	/* add and start timer if required */
+	timer_setup(&new->timeout, trigger_timeout, 0);
+	mod_timer(&new->timeout, jiffies + (trig->trigger_timeout * HZ));
+
+	UNLOCK_BH(&nf_trigger_lock);
+
+	return 0;
+}
+
+/*
+ *      Service-Name    OutBound        InBound
+ * 1.   TMD             UDP:1000        TCP/UDP:2000..2010
+ * 2.   WOKAO           UDP:1000        TCP/UDP:3000..3010
+ * 3.   net2phone-1     UDP:6801        TCP:30000..30000
+ * 4.   net2phone-2     UDP:6801        UDP:30000..30000
+ *
+ * For supporting to use the same outgoing port to trigger different port rules,
+ * it should check the inbound protocol and port range value. If all conditions
+ * are matched, it is a same trigger item, else it needs to create a new one.
+ */
+static inline int trigger_out_matched(const struct ipt_trigger *i,
+        const u_int16_t proto, const u_int16_t dport, const struct ipt_trigger_info *info)
+{
+	DEBUGP("%s: i=%p, proto= %d, dport=%d.\n", __FUNCTION__, i, proto, dport);
+	DEBUGP("%s: Got one, mproto= %d, mport[0..1]=%d, %d, ", __FUNCTION__,
+			i->mproto, i->ports.mport[0], i->ports.mport[1]);
+	DEBUGP("rproto= %d, rport[0..1]=%d, %d.\n",
+			i->rproto, i->ports.rport[0], i->ports.rport[1]);
+
+	return ((i->mproto == proto) &&
+			(i->ports.mport[0] <= dport)  &&
+			(i->ports.mport[1] >= dport) &&
+			(i->rproto == info->proto) &&
+			(i->ports.rport[0] == info->ports.rport[0]) &&
+			(i->ports.rport[1] == info->ports.rport[1]));
+}
+
+static unsigned int
+trigger_out(struct sk_buff *skb,
+                unsigned int hooknum,
+                const void *targinfo)
+{
+	const struct ipt_trigger_info *info = targinfo;
+	struct ipt_trigger trig, *found;
+	const struct iphdr *iph = ip_hdr(skb);
+	struct tcphdr *tcph = (void *)iph + iph->ihl*4;     /* Might be TCP, UDP */
+
+	DEBUGP("############# %s ############\n", __FUNCTION__);
+	/* Check if the trigger range has already existed in 'ipt_trigger_list'. */
+	found = LIST_FIND(&ipt_trigger_list, trigger_out_matched,
+			struct ipt_trigger *, iph->protocol, ntohs(tcph->dest), info);
+
+
+	if (found) {
+		/* Yeah, it exists. We need to update(delay) the destroying timer. */
+		trigger_refresh(found, info->trigger_timeout * HZ);
+		/* In order to allow multiple hosts use the same port range, we update
+		   the 'saddr' after previous trigger has a reply connection. */
+		if (found->reply)
+			found->srcip = iph->saddr;
+	}
+	else {
+		/* Create new trigger */
+		memset(&trig, 0, sizeof(trig));
+		trig.srcip = iph->saddr;
+		trig.mproto = iph->protocol;
+		trig.rproto = info->proto;
+		trig.trigger_timeout = info->trigger_timeout;
+		memcpy(&trig.ports, &info->ports, sizeof(struct ipt_trigger_ports));
+		add_new_trigger(&trig); /* Add the new 'trig' to list 'ipt_trigger_list'. */
+	}
+
+	return IPT_CONTINUE;        /* We don't block any packet. */
+}
+
+static inline int trigger_in_matched(const struct ipt_trigger *i,
+        const u_int16_t proto, const u_int16_t dport)
+{
+	u_int16_t rproto = i->rproto;
+
+	DEBUGP("%s: i=%p, proto= %d, dport=%d.\n", __FUNCTION__, i, proto, dport);
+	DEBUGP("%s: Got one, rproto= %d, rport[0..1]=%d, %d.\n", __FUNCTION__,
+			i->rproto, i->ports.rport[0], i->ports.rport[1]);
+
+	if (!rproto)
+		rproto = proto;
+
+	return ((rproto == proto) && (i->ports.rport[0] <= dport)
+			&& (i->ports.rport[1] >= dport));
+}
+
+static unsigned int
+trigger_in(struct sk_buff *skb,
+                unsigned int hooknum,
+                const void *targinfo)
+{
+	const struct ipt_trigger_info *info = targinfo;
+	struct ipt_trigger *found;
+	const struct iphdr *iph = ip_hdr(skb);
+	struct tcphdr *tcph = (void *)iph + iph->ihl*4;     /* Might be TCP, UDP */
+	/* Check if the trigger-ed range has already existed in 'ipt_trigger_list'. */
+	found = LIST_FIND(&ipt_trigger_list, trigger_in_matched,
+			struct ipt_trigger *, iph->protocol, ntohs(tcph->dest));
+	if (found) {
+		DEBUGP("############# %s ############\n", __FUNCTION__);
+		/* Yeah, it exists. We need to update(delay) the destroying timer. */
+		trigger_refresh(found, info->trigger_timeout * HZ);
+		return NF_ACCEPT;       /* Accept it, or the imcoming packet could be
+					   dropped in the FORWARD chain */
+	}
+
+	return IPT_CONTINUE;        /* Our job is the interception. */
+}
+
+static unsigned int
+trigger_dnat(struct sk_buff *skb,
+                unsigned int hooknum,
+                const void *targinfo)
+{
+	struct ipt_trigger *found = NULL;
+	const struct iphdr *iph = ip_hdr(skb);
+	struct tcphdr *tcph = (void *)iph + iph->ihl*4;     /* Might be TCP, UDP */
+	struct nf_conn *ct = NULL;
+	enum ip_conntrack_info ctinfo;
+	struct nf_nat_range2 newrange;
+
+	DEBUGP("############# %s ############%d\n", __FUNCTION__, __LINE__);
+	/* Check if the trigger-ed range has already existed in 'ipt_trigger_list'. */
+	found = LIST_FIND(&ipt_trigger_list, trigger_in_matched,
+			struct ipt_trigger *, iph->protocol, ntohs(tcph->dest));
+	if (found) {
+		DEBUGP("############# %s ############%d srcip:%d\n", __FUNCTION__, __LINE__, found->srcip);
+	}
+
+	if (!found || !found->srcip)
+		return IPT_CONTINUE;    /* We don't block any packet. */
+
+	DEBUGP("############# %s ############\n", __FUNCTION__);
+	found->reply = 1;   /* Confirm there has been a reply connection. */
+	ct = nf_ct_get(skb, &ctinfo);
+
+	DEBUGP("%s: got ", __FUNCTION__);
+
+
+	/* Alter the destination of imcoming packet. */
+	/* Transfer from original range. */
+	memset(&newrange.min_addr, 0, sizeof(newrange.min_addr));
+	memset(&newrange.max_addr, 0, sizeof(newrange.max_addr));
+	memset(&newrange.min_proto, 0, sizeof(newrange.min_proto));
+	memset(&newrange.max_proto, 0, sizeof(newrange.max_proto));
+	newrange.flags	     = NF_NAT_RANGE_MAP_IPS;
+	newrange.min_addr.ip = found->srcip;
+	newrange.max_addr.ip = found->srcip;
+	DEBUGP("%s: found->srcip = %x\n", __FUNCTION__,  found->srcip);
+
+	/* Hand modified range to generic setup. */
+	return nf_nat_setup_info(ct, &newrange, NF_NAT_MANIP_DST);
+}
+
+static unsigned int
+trigger_target(struct sk_buff *skb,
+			       const struct xt_action_param *par)
+{
+	const struct ipt_trigger_info *info = par->targinfo;
+	const struct iphdr *iph = ip_hdr(skb);
+	unsigned int hooknum = xt_hooknum(par);
+
+	DEBUGP("%s: type = %s\n", __FUNCTION__,
+			(info->type == IPT_TRIGGER_DNAT) ? "dnat" :
+			(info->type == IPT_TRIGGER_IN) ? "in" : "out");
+
+	/* The Port-trigger only supports TCP and UDP. */
+	if ((iph->protocol != IPPROTO_TCP) && (iph->protocol != IPPROTO_UDP))
+		return IPT_CONTINUE;
+
+	if (info->type == IPT_TRIGGER_OUT)
+		return trigger_out(skb, hooknum, info);
+	else if (info->type == IPT_TRIGGER_IN)
+		return trigger_in(skb, hooknum, info);
+	else if (info->type == IPT_TRIGGER_DNAT)
+		return trigger_dnat(skb, hooknum, info);
+
+	return IPT_CONTINUE;
+}
+static int
+trigger_check(const struct xt_tgchk_param *par)
+{
+	const struct ipt_trigger_info *info = par->targinfo;
+
+	if ((strcmp(par->table, "mangle") == 0)) {
+		DEBUGP("trigger_check: bad table `%s'.\n", par->table);
+		return -EINVAL;
+	}
+	if (par->hook_mask & ~((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_FORWARD))) {
+		DEBUGP("trigger_check: bad hooks %x.\n", par->hook_mask);
+		return -EINVAL;
+	}
+
+	if (info->proto) {
+		if (info->proto != IPPROTO_TCP && info->proto != IPPROTO_UDP) {
+			DEBUGP("trigger_check: bad proto %d.\n", info->proto);
+			return -EINVAL;
+		}
+	}
+	if (info->type == IPT_TRIGGER_OUT) {
+		if (!info->ports.mport[0] || !info->ports.rport[0]) {
+			DEBUGP("trigger_check: Try 'iptbles -j TRIGGER -h' for help.\n");
+			return -EINVAL;
+		}
+	}
+
+	return 0;
+}
+
+
+static struct xt_target redirect_reg = {
+        .name           = "TRIGGER",
+        .family         = NFPROTO_IPV4,
+        .target         = trigger_target,
+        .targetsize     = sizeof(struct ipt_trigger_info),
+        .checkentry     = trigger_check,
+        .me             = THIS_MODULE,
+};
+
+static int __init init(void)
+{
+	return xt_register_target(&redirect_reg);
+}
+
+static void __exit fini(void)
+{
+	xt_unregister_target(&redirect_reg);
+}
+
+module_init(init);
+module_exit(fini);

ipt-trigger/src/ipv6/Makefile

@@ -0,0 +1 @@
+obj-m +=ip6t_TRIGGER.o

ipt-trigger/src/ipv6/ip6t_TRIGGER.c

@@ -0,0 +1,429 @@
+/* Kernel module to match the port-ranges, trigger related port-ranges,
+ * and alters the destination to a local IPv6 address.
+ *
+ * Copyright (C) 2024, IOPSYS
+ * All Rights Reserved.
+ *
+ * Description:
+ *   This is kernel module for port-triggering.
+ *
+ *   The module follows the Netfilter framework, called extended packet
+ *   matching modules.
+ */
+
+#include <linux/types.h>
+#include <linux/tcp.h>
+#include <linux/timer.h>
+#include <linux/module.h>
+#include <linux/netfilter.h>
+#include <linux/netdevice.h>
+#include <linux/if.h>
+#include <linux/inetdevice.h>
+#include <linux/list.h>
+#include <net/protocol.h>
+#include <net/checksum.h>
+#include <linux/spinlock.h>
+
+#include <linux/netfilter_ipv6.h>
+#include <linux/netfilter_ipv6/ip6_tables.h>
+#include <net/netfilter/nf_conntrack.h>
+#include <net/netfilter/nf_conntrack_core.h>
+#include <net/netfilter/nf_conntrack_tuple.h>
+#include <net/netfilter/nf_nat.h>
+#include <linux/netfilter_ipv4/ipt_TRIGGER.h>
+
+/* This rwlock protects the main hash table, protocol/helper/expected
+ *    registrations, conntrack timers*/
+
+
+static DEFINE_SPINLOCK(nf_trigger_lock);
+
+
+
+#define NF_IP_PRE_ROUTING	0
+#define NF_IP_FORWARD		2
+#define IPT_CONTINUE XT_CONTINUE
+
+
+
+/***********************lock help**********************/
+#define MUST_BE_READ_LOCKED(l)
+#define MUST_BE_WRITE_LOCKED(l)
+
+
+#define LOCK_BH(l) spin_lock_bh(l)
+#define UNLOCK_BH(l) spin_unlock_bh(l)
+
+#define ASSERT_READ_LOCK(x) MUST_BE_READ_LOCKED(&nf_trigger_lock)
+#define ASSERT_WRITE_LOCK(x) MUST_BE_WRITE_LOCKED(&nf_trigger_lock)
+
+
+
+
+/***********************list help**********************/
+#define LIST_FIND(head, cmpfn, type, args...)           \
+({                                                      \
+        const struct list_head *__i, *__j = NULL;       \
+                                                        \
+        ASSERT_READ_LOCK(head);                         \
+        list_for_each(__i, (head))                      \
+                if (cmpfn((const type)__i , ## args)) { \
+                        __j = __i;                      \
+                        break;                          \
+                }                                       \
+        (type)__j;                                      \
+})
+
+static inline int
+__list_cmp_same(const void *p1, const void *p2) { return p1 == p2; }
+
+static inline void
+list_prepend(struct list_head *head, void *new)
+{
+	ASSERT_WRITE_LOCK(head);
+	list_add(new, head);
+}
+
+#define list_named_find(head, name)                     \
+LIST_FIND(head, __list_cmp_name, void *, name)
+
+MODULE_LICENSE("GPL");
+MODULE_AUTHOR("IOPSYS Network Team");
+MODULE_DESCRIPTION("iptables trigger target module");
+
+#if 0
+#define DEBUGP printk
+#else
+#define DEBUGP(format, args...)
+#endif
+
+struct ipt_trigger {
+        struct list_head list;          /* Trigger list */
+        struct timer_list timeout;      /* Timer for list destroying */
+        struct in6_addr srcip;                /* Outgoing source address */
+        struct in6_addr dstip;                /* Outgoing destination address */
+        u_int16_t mproto;               /* Trigger protocol */
+        u_int16_t rproto;               /* Related protocol */
+	u_int16_t trigger_timeout;      /* Auto disable duration */
+        struct ipt_trigger_ports ports; /* Trigger and related ports */
+        u_int8_t reply;                 /* Confirm a reply connection */
+};
+
+LIST_HEAD(ipt_trigger_list);
+
+static unsigned char *ipv6_header_get_L4_header_offset(const struct ipv6hdr *ip6h_p)
+{
+        unsigned int ext_head_count = 8;
+        const struct ipv6_opt_hdr *ip_ext_p;
+        unsigned int payload_offset = 0;
+	char *tcpudp_hdr = NULL;
+	uint8_t nextHdr_p;
+
+        nextHdr_p = ip6h_p->nexthdr;
+        ip_ext_p = (const struct ipv6_opt_hdr *)(ip6h_p + 1);
+        payload_offset = sizeof(struct ipv6hdr);
+
+        do {
+                if ((nextHdr_p == IPPROTO_TCP) || (nextHdr_p == IPPROTO_UDP)) {
+			tcpudp_hdr = (unsigned char *)ip6h_p + payload_offset;
+                        break;
+		}
+
+                payload_offset += (ip_ext_p->hdrlen + 1U) << 3U;
+                nextHdr_p = ip_ext_p->nexthdr;
+                ip_ext_p = (struct ipv6_opt_hdr *)((uint8_t *)ip6h_p + payload_offset);
+                ext_head_count--; /* at most 8 extension headers */
+        } while (ext_head_count);
+
+        return tcpudp_hdr;
+}
+
+static void trigger_refresh(struct ipt_trigger *trig, unsigned long extra_jiffies)
+{
+	DEBUGP("%s: \n", __FUNCTION__);
+	LOCK_BH(&nf_trigger_lock);
+	/* Need del_timer for race avoidance (may already be dying). */
+	if (del_timer(&trig->timeout)) {
+		trig->timeout.expires = jiffies + extra_jiffies;
+		add_timer(&trig->timeout);
+	}
+
+	UNLOCK_BH(&nf_trigger_lock);
+}
+
+static void __del_trigger(struct ipt_trigger *trig)
+{
+	DEBUGP("%s: \n", __FUNCTION__);
+	MUST_BE_WRITE_LOCKED(&nf_trigger_lock);
+
+	/* delete from 'ipt_trigger_list' */
+	list_del(&trig->list);
+	kfree(trig);
+}
+
+static void trigger_timeout(struct timer_list *t)
+{
+	struct ipt_trigger *trig = from_timer(trig, t, timeout);
+
+	DEBUGP("trigger list %p timed out\n", trig);
+	LOCK_BH(&nf_trigger_lock);
+	__del_trigger(trig);
+	UNLOCK_BH(&nf_trigger_lock);
+}
+
+static unsigned int
+add_new_trigger(struct ipt_trigger *trig)
+{
+	struct ipt_trigger *new = NULL;
+
+	DEBUGP("!!!!!!!!!!!! %s !!!!!!!!!!!\n", __FUNCTION__);
+
+	LOCK_BH(&nf_trigger_lock);
+	new = (struct ipt_trigger *)
+		kmalloc(sizeof(struct ipt_trigger), GFP_ATOMIC);
+
+	if (!new) {
+		UNLOCK_BH(&nf_trigger_lock);
+		DEBUGP("%s: OOM allocating trigger list\n", __FUNCTION__);
+		return -ENOMEM;
+	}
+
+	memset(new, 0, sizeof(*trig));
+	INIT_LIST_HEAD(&new->list);
+	memcpy(new, trig, sizeof(*trig));
+
+	/* add to global table of trigger */
+	list_prepend(&ipt_trigger_list, &new->list);
+
+	/* add and start timer if required */
+	timer_setup(&new->timeout, trigger_timeout, 0);
+	mod_timer(&new->timeout, jiffies + (trig->trigger_timeout * HZ));
+
+	UNLOCK_BH(&nf_trigger_lock);
+
+	return 0;
+}
+
+/*
+ *      Service-Name    OutBound        InBound
+ * 1.   TMD             UDP:1000        TCP/UDP:2000..2010
+ * 2.   WOKAO           UDP:1000        TCP/UDP:3000..3010
+ * 3.   net2phone-1     UDP:6801        TCP:30000..30000
+ * 4.   net2phone-2     UDP:6801        UDP:30000..30000
+ *
+ * For supporting to use the same outgoing port to trigger different port rules,
+ * it should check the inbound protocol and port range value. If all conditions
+ * are matched, it is a same trigger item, else it needs to create a new one.
+ */
+static inline int trigger_out_matched(const struct ipt_trigger *i,
+        const u_int16_t proto, const u_int16_t dport, const struct ipt_trigger_info *info)
+{
+	DEBUGP("%s: i=%p, proto= %d, dport=%d.\n", __FUNCTION__, i, proto, dport);
+	DEBUGP("%s: Got one, mproto= %d, mport[0..1]=%d, %d, ", __FUNCTION__,
+			i->mproto, i->ports.mport[0], i->ports.mport[1]);
+	DEBUGP("rproto= %d, rport[0..1]=%d, %d.\n",
+			i->rproto, i->ports.rport[0], i->ports.rport[1]);
+
+	return ((i->mproto == proto) &&
+			(i->ports.mport[0] <= dport)  &&
+			(i->ports.mport[1] >= dport) &&
+			(i->rproto == info->proto) &&
+			(i->ports.rport[0] == info->ports.rport[0]) &&
+			(i->ports.rport[1] == info->ports.rport[1]));
+}
+
+static unsigned int
+trigger_out(struct sk_buff *skb,
+                unsigned int hooknum,
+                const void *targinfo)
+{
+	const struct ipt_trigger_info *info = targinfo;
+	struct ipt_trigger trig, *found;
+	const struct ipv6hdr *ip6h = ipv6_hdr(skb);
+	struct tcphdr *tcph = (struct tcphdr*)ipv6_header_get_L4_header_offset(ip6h);     /* Might be TCP, UDP */
+
+	DEBUGP("############# %s ############\n", __FUNCTION__);
+	/* Check if the trigger range has already existed in 'ipt_trigger_list'. */
+	found = LIST_FIND(&ipt_trigger_list, trigger_out_matched,
+			struct ipt_trigger *, ip6h->nexthdr, ntohs(tcph->dest), info);
+
+
+	if (found) {
+		/* Yeah, it exists. We need to update(delay) the destroying timer. */
+		trigger_refresh(found, info->trigger_timeout * HZ);
+		/* In order to allow multiple hosts use the same port range, we update
+		   the 'saddr' after previous trigger has a reply connection. */
+		if (found->reply)
+			found->srcip = ip6h->saddr;
+	}
+	else {
+		/* Create new trigger */
+		memset(&trig, 0, sizeof(trig));
+		memcpy(&trig.srcip, &ip6h->saddr, sizeof(trig.srcip));
+		trig.mproto = ip6h->nexthdr;
+		trig.rproto = info->proto;
+		trig.trigger_timeout = info->trigger_timeout;
+		memcpy(&trig.ports, &info->ports, sizeof(struct ipt_trigger_ports));
+		add_new_trigger(&trig); /* Add the new 'trig' to list 'ipt_trigger_list'. */
+	}
+
+	return IPT_CONTINUE;        /* We don't block any packet. */
+}
+
+static inline int trigger_in_matched(const struct ipt_trigger *i,
+        const u_int16_t proto, const u_int16_t dport)
+{
+	u_int16_t rproto = i->rproto;
+
+	DEBUGP("%s: i=%p, proto= %d, dport=%d.\n", __FUNCTION__, i, proto, dport);
+	DEBUGP("%s: Got one, rproto= %d, rport[0..1]=%d, %d.\n", __FUNCTION__,
+			i->rproto, i->ports.rport[0], i->ports.rport[1]);
+
+	if (!rproto)
+		rproto = proto;
+
+	return ((rproto == proto) && (i->ports.rport[0] <= dport)
+			&& (i->ports.rport[1] >= dport));
+}
+
+static unsigned int
+trigger_in(struct sk_buff *skb,
+                unsigned int hooknum,
+                const void *targinfo)
+{
+	const struct ipt_trigger_info *info = targinfo;
+	struct ipt_trigger *found;
+	const struct ipv6hdr *ip6h = ipv6_hdr(skb);
+	struct tcphdr *tcph =(struct tcphdr*)ipv6_header_get_L4_header_offset(ip6h);     /* Might be TCP, UDP */
+	/* Check if the trigger-ed range has already existed in 'ipt_trigger_list'. */
+	found = LIST_FIND(&ipt_trigger_list, trigger_in_matched,
+			struct ipt_trigger *, ip6h->nexthdr, ntohs(tcph->dest));
+	if (found) {
+		DEBUGP("############# %s ############\n", __FUNCTION__);
+		/* Yeah, it exists. We need to update(delay) the destroying timer. */
+		trigger_refresh(found, info->trigger_timeout * HZ);
+		return NF_ACCEPT;       /* Accept it, or the imcoming packet could be
+					   dropped in the FORWARD chain */
+	}
+
+	return IPT_CONTINUE;        /* Our job is the interception. */
+}
+
+static unsigned int
+trigger_dnat(struct sk_buff *skb,
+                unsigned int hooknum,
+                const void *targinfo)
+{
+	struct ipt_trigger *found = NULL;
+	const struct ipv6hdr *ip6h = ipv6_hdr(skb);
+	struct tcphdr *tcph =(struct tcphdr*)ipv6_header_get_L4_header_offset(ip6h);     /* Might be TCP, UDP */
+	struct nf_conn *ct = NULL;
+	enum ip_conntrack_info ctinfo;
+	struct nf_nat_range2 newrange;
+
+	/* Check if the trigger-ed range has already existed in 'ipt_trigger_list'. */
+	found = LIST_FIND(&ipt_trigger_list, trigger_in_matched,
+			struct ipt_trigger *, ip6h->nexthdr, ntohs(tcph->dest));
+
+	if (!found)
+		return IPT_CONTINUE;    /* We don't block any packet. */
+
+	DEBUGP("############# %s ############\n", __FUNCTION__);
+	found->reply = 1;   /* Confirm there has been a reply connection. */
+	ct = nf_ct_get(skb, &ctinfo);
+
+	DEBUGP("%s: got ", __FUNCTION__);
+
+
+	/* Alter the destination of imcoming packet. */
+	/* Transfer from original range. */
+	memset(&newrange.min_addr, 0, sizeof(newrange.min_addr));
+	memset(&newrange.max_addr, 0, sizeof(newrange.max_addr));
+	memset(&newrange.min_proto, 0, sizeof(newrange.min_proto));
+	memset(&newrange.max_proto, 0, sizeof(newrange.max_proto));
+	newrange.flags	     = NF_NAT_RANGE_MAP_IPS;
+	memcpy(&newrange.min_addr.ip, &found->srcip, sizeof(newrange.min_addr.ip));
+	memcpy(&newrange.max_addr.ip, &found->srcip, sizeof(newrange.max_addr.ip));
+	DEBUGP("%s: found->srcip = %x\n", __FUNCTION__,  found->srcip);
+
+	/* Hand modified range to generic setup. */
+	return nf_nat_setup_info(ct, &newrange, NF_NAT_MANIP_DST);
+}
+
+static unsigned int
+trigger_target(struct sk_buff *skb,
+			       const struct xt_action_param *par)
+{
+	const struct ipt_trigger_info *info = par->targinfo;
+	const struct ipv6hdr *ip6h = ipv6_hdr(skb);
+	unsigned int hooknum = xt_hooknum(par);
+
+	DEBUGP("%s: type = %s\n", __FUNCTION__,
+			(info->type == IPT_TRIGGER_DNAT) ? "dnat" :
+			(info->type == IPT_TRIGGER_IN) ? "in" : "out");
+
+	/* The Port-trigger only supports TCP and UDP. */
+	if ((ip6h->nexthdr != IPPROTO_TCP) && (ip6h->nexthdr != IPPROTO_UDP))
+		return IPT_CONTINUE;
+
+	if (info->type == IPT_TRIGGER_OUT)
+		return trigger_out(skb, hooknum, info);
+	else if (info->type == IPT_TRIGGER_IN)
+		return trigger_in(skb, hooknum, info);
+	else if (info->type == IPT_TRIGGER_DNAT)
+		return trigger_dnat(skb, hooknum, info);
+
+	return IPT_CONTINUE;
+}
+static int
+trigger_check(const struct xt_tgchk_param *par)
+{
+	const struct ipt_trigger_info *info = par->targinfo;
+
+	if ((strcmp(par->table, "mangle") == 0)) {
+		DEBUGP("trigger_check: bad table `%s'.\n", par->table);
+		return -EINVAL;
+	}
+	if (par->hook_mask & ~((1 << NF_IP_PRE_ROUTING) | (1 << NF_IP_FORWARD))) {
+		DEBUGP("trigger_check: bad hooks %x.\n", par->hook_mask);
+		return -EINVAL;
+	}
+
+	if (info->proto) {
+		if (info->proto != IPPROTO_TCP && info->proto != IPPROTO_UDP) {
+			DEBUGP("trigger_check: bad proto %d.\n", info->proto);
+			return -EINVAL;
+		}
+	}
+	if (info->type == IPT_TRIGGER_OUT) {
+		if (!info->ports.mport[0] || !info->ports.rport[0]) {
+			DEBUGP("trigger_check: Try 'iptbles -j TRIGGER -h' for help.\n");
+			return -EINVAL;
+		}
+	}
+
+	return 0;
+}
+
+
+static struct xt_target redirect_reg = {
+        .name           = "TRIGGER",
+        .family         = NFPROTO_IPV6,
+        .target         = trigger_target,
+        .targetsize     = sizeof(struct ipt_trigger_info),
+        .checkentry     = trigger_check,
+        .me             = THIS_MODULE,
+};
+
+static int __init init(void)
+{
+	return xt_register_target(&redirect_reg);
+}
+
+static void __exit fini(void)
+{
+	xt_unregister_target(&redirect_reg);
+}
+
+module_init(init);
+module_exit(fini);

libdpp/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libdpp
-PKG_VERSION:=2.0.0
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22959b107a8bf443d04d6261d00074b5514dfe8
+PKG_SOURCE_VERSION:=1f82436531d4bb094b0b74e99613e0dfc84eada3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/libdpp.git
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

libeasy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libeasy
-PKG_VERSION:=7.4.3
+PKG_VERSION:=7.4.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ba80dcc51056772c906cac8022a2537b74959e6a
+PKG_SOURCE_VERSION:=67e6b91b8aca4c068a71f097f5f0576b47ec1d2e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libeasy.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.108
+PKG_VERSION:=7.2.109
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=df0181ae4e8391901a8005ffa17ff28fbce8ec64
+PKG_SOURCE_VERSION:=cc72f5ab0171cd0fc29bb48dafff6751ab2f0d9c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libpicoevent-bcm/Makefile

@@ -28,9 +28,6 @@ define Package/libpicoevent-bcm
   URL:=
   DEPENDS:= +TARGET_brcmbca:bcmkernel
   include $(TOPDIR)/feeds/broadcom/bcmkernel/bcm-toolchain.mk
-  TARGET_CFLAGS := -Os -pipe -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCONFIG_TARGET_brcmbca -g3 -fno-caller-saves -fno-plt -Wno-error=unused-but-set-variable -Wno-error=unused-result \
-                   -mfloat-abi=soft -fmacro-prefix-map=$(BUILD_DIR)libpicoevent-bcm-0.3=libpicoevent-bcm-0.3 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 \
-                   -Wl,-z,now -Wl,-z,relro -Wl,--build-i
 endef
 
 define Package/libpicoevent-bcm/description

libqos/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.2.106
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=02dba6571fddd9b4c5b4b671270604b4c0faf9ae
+PKG_SOURCE_VERSION:=0e54d7a992c506d6302d7cc32a39eb64e9b2c42e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.9
+PKG_VERSION:=1.0.12
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=3a8d0954ca351a1f8f669dc2f3d294409b90f091
+PKG_SOURCE_VERSION:=475aa02e4fb9f8241ac4c38f622e87464cfc7154
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.10
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=0a7a3219bf0d90b1f1a31b0deaf9a6d78b6420f1
+PKG_SOURCE_VERSION:=983528e257256ead689f58c7ee7157c00a9fcb14
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.42
+PKG_VERSION:=7.4.62
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c3efa4ecd3bbf8247bc1b4c3e0ff512e42649531
+PKG_SOURCE_VERSION:=0aeaf5a5d378600f7324ec13066f4c2aefbd2f9d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

map-agent/Config.in

@@ -15,7 +15,7 @@ config AGENT_EASYMESH_R2_CERT
 
 config AGENT_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 4
+	default 6
 
 config AGENT_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"
@@ -55,5 +55,9 @@ config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
 config AGENT_USE_LIBDPP
 	bool "Depend on libdpp for DPP EasyConnect"
 
+config AGENT_CHECK_PARTIAL_WIFI_RELOAD
+	bool "Option that allow SSID/PSK simple reload"
+	default y
+
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.5.2.0
+PKG_VERSION:=6.0.0.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=90056e4e964153ab8594f97489c912bb1f65bd85
+PKG_SOURCE_VERSION:=eaa17062990735ee838fcd5904980ba68d3913fa
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -105,6 +105,10 @@ ifeq ($(CONFIG_AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST),y)
 TARGET_CFLAGS += -DOPER_CHAN_CHANGE_RELAY_MCAST
 endif
 
+ifeq ($(CONFIG_AGENT_CHECK_PARTIAL_WIFI_RELOAD),y)
+TARGET_CFLAGS += -DCHECK_PARTIAL_WIFI_RELOAD
+endif
+
 MAKE_PATH:=src
 
 define Package/map-agent/install

map-agent/files/etc/config/mapagent

@@ -1,14 +1,14 @@
 config agent 'agent'
-	option enabled '0'
+	option enabled '1'
 	option debug '0'
 	option profile '3'
 	option al_bridge 'br-lan'
-	option netdev 'wlan'
-	option island_prevention '0'
+	option island_prevention '1'
 	option eth_onboards_wifi_bhs '1'
 	option scan_on_boot_only '0'
 	option chan_ch_relay_mcast '0'
 	option guest_isolation '1'
+	option partial_wifi_reload '0'
 	list map_port 'all'
 #	option controller_macaddr '0a:1b:2c:3d:4e:50'
 

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

@@ -1,17 +1,19 @@
 #!/bin/sh
 
-. /lib/network/utils.sh
-
 conn_ports_file="/var/run/multiap/map.connected.ports"
 map_bh_file="/var/run/multiap/multiap.backhaul"
+
+# Exit if AL Bridge is not configured to be a bridge device
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
-al_brnet="${al_bridge:3}"
 
 # Exit if the PORT is not member of the AL Bridge
-[ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0
+port_bridge_sec="$(uci show network | grep -w $PORT | grep '\.ports' | cut -d'.' -f2)"
+port_bridge_name="$(uci -q get network.$port_bridge_sec.name)"
+[ "$port_bridge_name" = "$al_bridge" ] || exit 0
 
 # Exit if the device is not operating in extender/repeater mode
+al_brnet="${al_bridge:3}"
 [ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
 
 ############## Dynamic Backhaul Daemon ##############
@@ -45,7 +47,7 @@ fi
 ########################################################
 
 ################ Dedicated ETH WAN Port ################
-wanport="$(db -q get hw.board.ethernetWanPort)"
+wanport="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
 if [ -n "$wanport" ]; then
 	[ "$wanport" = "$PORT" ] || exit 0
 ########################################################

map-agent/files/lib/multiap/map_genconfig

@@ -5,8 +5,8 @@
 generate_mapagent_config=0
 generate_wireless_sta_config=0
 
-network_mode="$(fw_printenv -n netmode)"
-multiap_mode="$(fw_printenv -n multiap_mode)"
+network_mode="$(fw_printenv -n netmode)" # default is layer3
+multiap_mode="$(fw_printenv -n multiap_mode)" # default is full
 
 is_airoha() {
 	[ -f /proc/device-tree/compatible ] || return
@@ -81,6 +81,9 @@ generate_multiap_config() {
 			ifname="wlan${devidx}"
 			ifname_bh="wlan${devidx}-1"
 			ap_follow_sta_dfs="1"
+			uci set wireless.$dev.mlo="1"
+			uci set wireless.$dev.mlo_capable="1"
+			uci commit wireless
 		else
 			ifprefix="wlan%-"
 			ifname="wlan$devidx"
@@ -159,12 +162,6 @@ map_genconf () {
 		if ! uci show wireless | grep -q "mode=.*sta"; then
 			generate_wireless_sta_config=1
 
-			if is_broadcom; then
-				for section in $(uci show wireless | grep wifi-device | cut -d'.' -f2 | cut -d'=' -f1); do
-					uci -q set wireless.$section.apsta="1"
-				done
-			fi
-
 			for section in $(uci show wireless | grep "mode=.*ap" | cut -d'.' -f2); do
 				uci delete wireless.$section
 			done
@@ -181,16 +178,15 @@ map_genconf () {
 		elif [ "$multiap_mode" == "auto" ]; then
 			uci -q set mapagent.@controller_select[0].autostart=1
 			uci -q set mapagent.@controller_select[0].local=0
-		elif [ "$multiap_mode" == "full" ]; then
-			uci -q set mapagent.@controller_select[0].autostart=1
-			uci -q set mapagent.@controller_select[0].local=1
 		elif [ "$multiap_mode" == "none" ]; then
 			uci set mapagent.agent.enabled="0"
+		else # default to full
+			uci -q set mapagent.@controller_select[0].autostart=1
+			uci -q set mapagent.@controller_select[0].local=1
 		fi
 		uci -q commit mapagent
 	fi
 
-
 	if [ "$multiap_mode" == "agent" -o "$multiap_mode" == "none" ]; then
 		uci set mapcontroller.controller.enabled="0"
 	else

map-controller/Config.in

@@ -16,7 +16,7 @@ config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 
 config CONTROLLER_EASYMESH_VERSION
 	int "Support Easymesh version"
-	default 4
+	default 6
 
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
 	hex "Vendor OUI in 0xAABBCC format"

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.6.0.5
+PKG_VERSION:=6.0.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8b076f5ed4667b2888ea859eb01d1a5dc1f027fc
+PKG_SOURCE_VERSION:=9ad0223d8362c4984429b2d4f532d8fb5a0cb793
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0

map-controller/files/etc/config/mapcontroller

@@ -81,6 +81,41 @@ config ap
 	option type 'backhaul'
 	option vid '1'
 
+config ap
+	option band '2'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR-2.4GHz-MLDlink'
+	option encryption 'sae-mixed'
+	option key '$WIFI_FH_KEY'
+	option vid '1'
+	option type 'fronthaul'
+	option mld_id '1'
+
+config ap
+	option band '5'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR-5GHz-MLDlink'
+	option encryption 'sae-mixed'
+	option key '$WIFI_FH_KEY'
+	option vid '1'
+	option type 'fronthaul'
+	option mld_id '1'
+
+config ap
+	option band '6'
+	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR-6GHz-MLDlink'
+	option encryption 'sae'
+	option key '$WIFI_FH_KEY'
+	option vid '1'
+	option type 'fronthaul'
+	option mld_id '1'
+
+config mld
+	option id '1'
+	option ssid 'MAP-$BASEMAC_ADDR-MLD'
+	option encryption 'sae'
+	option key '$WIFI_FH_KEY'
+#	option vid '1'
+	option type 'fronthaul'
+
 # node and radio sections (per node) are auto
 # generated per Multi-AP Agent in the network
 #

mcastmngr/Makefile

@@ -1,36 +1,48 @@
 #
-# Copyright (C) 2013-2020 iopsys
+# Copyright (C) 2013-2024 iopsys
 #
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.1.0
+PKG_VERSION:=1.2.2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/hal/mcastmngr.git
+PKG_SOURCE_VERSION:=fcdaa46f1c7467e82d612070ec583d8311ba2576
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include ../bbfdm/bbfdm.mk
+
+MAKE_PATH:=bbf_plugin
 
 define Package/mcastmngr
  CATEGORY:=Utilities
  TITLE:=Multicast Proxy/Snooping Manager
- DEPENDS:=+!TARGET_brcmbca:mcproxy
+ DEPENDS:=+!TARGET_brcmbca:mcproxy +libuci +libubox +libubus +libblobmsg-json +libbbfdm-api
 endef
 
 define Package/mcastmngr/description
 	Configures IGMP and MLD snooping and proxy
 endef
 
-#define Build/Prepare
-#        $(CP) -rf ./mcastmngr/* $(PKG_BUILD_DIR)/
-#endef
-
-define Build/Compile
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/mcastmngr/* $(PKG_BUILD_DIR)/
 endef
+endif
+
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
 
 define Package/mcastmngr/install
 	$(CP) ./files/common/* $(1)/
@@ -39,6 +51,7 @@ ifneq ($(CONFIG_TARGET_brcmbca),)
 else
 	$(CP) ./files/linux/* $(1)/
 endif
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/libmcast_bbf.so $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,mcastmngr))

mcastmngr/files/broadcom/lib/mcast/broadcom.sh

@@ -11,7 +11,7 @@ CONFFILE=/var/mcpd.conf
 PROG_EXE=/usr/sbin/mcpd
 
 proxdevs=""
-ethwan="$(db -q get hw.board.ethernetWanPort)"
+ethwan="$(jsonfilter -i /etc/board.json -e @.network.wan.device)"
 
 
 config_snooping_common_params() {
@@ -49,7 +49,7 @@ config_snooping_upstream_interface() {
 			*.*)
 				port="$(echo "$dev" | cut -d'.' -f 1)"
 				if [ $port == $ethwan ]; then
-					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
+					ifconfig $dev | grep RUNNING >/dev/null && snooping_upstream_intf="$dev" && break
 				fi
 				;;
 		esac

mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate

@@ -91,7 +91,7 @@ interfaces_ok(){
 	for itf in $up_interf; do
 		# check if there exist a interface section for this upstream interface, if yes the
 		# do nothing, if no then generate config as mcast config is outdated
-		local dev_section=$(uci show network | grep -E "\.device=\'$itf\'" | cut -d'.' -f2)
+		local dev_section=$(uci show network | grep -E "\.device=\'$itf\'" | head -n 1 | cut -d'.' -f2)
 
 		# mcast config is outdated, simply generate as per new logic
 		if [ -z "$dev_section" ]; then

mcastmngr/files/common/lib/mcast/common.sh

@@ -62,7 +62,7 @@ read_snooping() {
 	local proto
 
 	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
+	config_get proto "$config" proto "igmp"
 
 	if [ "$sec_enable" == "0" ]; then
 		return
@@ -103,7 +103,7 @@ read_proxy() {
 	local proto
 
 	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
+	config_get proto "$config" proto "igmp"
 
 	if [ "$sec_enable" == "0" ]; then
 		return

mcastmngr/files/linux/lib/mcast/linux.sh

@@ -46,9 +46,6 @@ device_has_ip() {
 	# Read the openwrt interface for the device.
 	# Device can have multiple logical interfaces like wan and wan6
 	# but same l3 device
-	# NB. Don't use 'get_network_of' here.
-	# This function fails in some uci configurations for interfaces that refer
-	# to a device indirectly.
 	local ifaces=$(ubus call network.interface dump | jsonfilter -e "@.interface[@.device='$device'].interface")
 	for iface in $ifaces; do
 		local ip=

netmode/files/etc/uci-defaults/netmode.l2mode

@@ -98,6 +98,10 @@ l2_network_config() {
 	# Update CWMP Agent WAN Interface
 	uci -q set cwmp.cpe.default_wan_interface="lan"
 	uci -q commit cwmp
+
+	# disable firewall
+	uci -q set firewall.globals.enabled="0"
+	uci -q commit firewall
 }
 
 network_mode="$(fw_printenv -n netmode 2>/dev/null)"

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.5.16
+PKG_VERSION:=7.0.5.23
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=8249b1e9ae996ed45ec5edcd1adc128bd810a45b
+PKG_SOURCE_VERSION:=371d2c96d1d410b3d52cfe65505750843f2d1d6e
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -32,7 +32,7 @@ define Package/obuspa
   SUBMENU:=TRx69
   TITLE:=USP agent
   MENU:=1
-  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl +ca-certificates
+  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
 endef
 
 define Package/obuspa/description
@@ -104,11 +104,10 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
-	$(INSTALL_BIN) ./files/etc/uci-defaults/00-obuspa-extender-mode $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/02-obuspa-dhcp-option $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user
-	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/USPAgent.json)
+	$(BBFDM_INSTALL_CORE_PLUGIN) ./files/etc/bbfdm/json/USPAgent.json $(1)
 ifeq ($(CONFIG_OBUSPA_ENABLE_TEST_CONTROLLER),y)
 	$(INSTALL_BIN) ./files/etc/init.d/usptest $(1)/etc/init.d/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/55-test-usp-controller $(1)/etc/uci-defaults/

obuspa/files/etc/config/obuspa

@@ -2,12 +2,12 @@ config obuspa 'global'
 	option enabled '1'
 	option debug '1'
 	option dhcp_discovery '1'
-	option log_level '1'
-	option prototrace '0'
+	option log_level '4'
+	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/ssl/cert.pem'
+	#option trust_cert '/etc/obuspa/ca.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/tmp/obuspa.log'
 

obuspa/files/etc/obuspa/roles.json

@@ -260,6 +260,23 @@
             "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         },
+        {
+          "object":"Device.{BBF_VENDOR_PREFIX}OpenVPN.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_SET",
+            "PERMIT_ADD",
+            "PERMIT_DEL",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        },
         {
           "object":"Device.NAT.",
           "perm": [

obuspa/files/etc/uci-defaults/00-obuspa-extender-mode

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-config_load obuspa
-config_get interface global interface ""
-
-if command -v fw_printenv; then
-	mode="$(fw_printenv -n netmode)"
-	if [ "${mode}" == "extender" -a -z "$interface" ] ; then
-		uci_set obuspa global interface "lan"
-	fi
-fi

obuspa/files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user

@@ -129,15 +129,15 @@ get_vivsoi() {
 	done
 }
 
-get_netmode()
+get_access_role()
 {
-	local mode
+	local mode lan_proto
 
-	if command -v fw_printenv; then
-		mode="$(fw_printenv -n netmode)"
-	fi
+	lan_proto="$(uci -q get network.lan.proto)"
 
-	if [ "$mode" != "extender" ]; then
+	if [ "${lan_proto}" == "dhcp" ]; then
+		mode="extender"
+	else
 		mode="full_access"
 	fi
 
@@ -146,13 +146,25 @@ get_netmode()
 
 config_load obuspa
 config_get_bool enable_obuspa global enabled 1
-config_get wan_intf global interface "wan"
+config_get wan_intf global interface
 config_get_bool dhcp_discovery global dhcp_discovery 1
 
 if [ "$enable_obuspa" = "0" ] || [ "$dhcp_discovery" = "0" ]; then
 	return 0
 fi
 
+if [ -z "${wan_intf}" ]; then
+	role="$(get_access_role)"
+
+	if [ "${role}" = "extender" ]; then
+		wan_intf="lan"
+		uci -q set obuspa.global.interface="lan"
+		uci commit obuspa
+	else
+		wan_intf="wan"
+	fi
+fi
+
 if [ "${wan_intf}" == "${INTERFACE}" ]; then
 	if [ -n "$opt125" ]; then
 		len=$(printf "$opt125"|wc -c)
@@ -231,7 +243,7 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 			fi
 		fi
 
-		uci -q set obuspa.dhcpcontroller.assigned_role_name="$(get_netmode)"
+		uci -q set obuspa.dhcpcontroller.assigned_role_name="$(get_access_role)"
 		uci -q set obuspa.dhcpcontroller.Enable='1'
 		uci_change=1
 	fi

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

@@ -59,7 +59,7 @@
 +**************************************************************************/
 +void SetControllerDummyID()
 +{
-+    cur_msg_controller_info.endpoint_id = "";
++    cur_msg_controller_info.endpoint_id = "CLI_Utility";
 +}
 +
 +/*********************************************************************//**

obuspa/patches/0012-check_mqtt_host_alive.patch

@@ -0,0 +1,95 @@
+diff --git a/src/core/mqtt.c b/src/core/mqtt.c
+index 04a1a9c..00b95a4 100644
+--- a/src/core/mqtt.c
++++ b/src/core/mqtt.c
+@@ -2124,6 +2124,75 @@ exit:
+     }
+ }
+ 
++static int _check_host_rechability(CURL *handle, curl_infotype type, char *data, size_t size, void *userp)
++{
++    bool *palive = (bool *)userp;
++
++    USP_ASSERT(palive != NULL);
++    switch(type) {
++        case CURLINFO_HEADER_OUT:
++        case CURLINFO_HEADER_IN:
++            *palive = true;
++            break;
++        case CURLINFO_TEXT:
++        {
++            USP_LOG_Debug("CURL DATA:: [%s]", data);
++            if (strstr(data, "Connected to ") != NULL) {
++                *palive = true;
++            }
++            break;
++        }
++        default:
++            break;
++    }
++
++    return 0;
++}
++
++int check_mqtt_host_reachability(mqtt_client_t *client)
++{
++    CURL *curl;
++    mqtt_conn_params_t *cparam = &client->conn_params;
++    char buffer[128] = {0};
++    int ret = USP_ERR_INTERNAL_ERROR;
++    bool is_alive = false;
++
++    curl = curl_easy_init();
++    if(curl) {
++        USP_SNPRINTF(buffer, 128, "mqtt://%s:%d", cparam->host, cparam->port);
++        curl_easy_setopt(curl, CURLOPT_URL, buffer);
++
++        if (strlen(cparam->username) > 0) {
++            curl_easy_setopt(curl, CURLOPT_USERNAME, cparam->username);
++        }
++
++        if (strlen(cparam->password) > 0) {
++            curl_easy_setopt(curl, CURLOPT_PASSWORD, cparam->password);
++        }
++
++        curl_easy_setopt(curl, CURLOPT_VERBOSE, 1L);
++        curl_easy_setopt(curl, CURLOPT_DEBUGDATA, &is_alive);
++        curl_easy_setopt(curl, CURLOPT_DEBUGFUNCTION, _check_host_rechability);
++
++        /* complete within 2 seconds */
++        curl_easy_setopt(curl, CURLOPT_TIMEOUT, 2L);
++
++        ret = curl_easy_perform(curl);
++        /* Check for errors */
++        if(ret == CURLE_OK || ret == CURLE_URL_MALFORMAT || is_alive == true) {
++            USP_LOG_Debug("CURL MQTT host %s, ret %d, alive %d ...", buffer, ret, is_alive);
++            ret = USP_ERR_OK;
++        } else {
++            USP_LOG_Info("# CURL MQTT host %s unreachable: %d=>%s ...", buffer, ret, curl_easy_strerror(ret));
++        }
++
++        /* always cleanup */
++        curl_easy_cleanup(curl);
++    }
++
++    return ret;
++}
++
+ /*********************************************************************//**
+ **
+ ** PerformMqttClientConnect
+@@ -2193,6 +2262,14 @@ int PerformMqttClientConnect(mqtt_client_t *client)
+         keep_alive = 5;
+     }
+ 
++    // Below function is a workaround to check the host reachability with a timeout
++    // mosquitto_connect_* API block the thread for 2 mins if host is not reachable,
++    // which halts other clients connectivity
++    err = check_mqtt_host_reachability(client);
++    if (err != USP_ERR_OK) {
++        err = USP_ERR_INTERNAL_ERROR;
++        goto exit;
++    }
+     // Release the access mutex temporarily whilst performing the connect call
+     // We do this to prevent the data model thread from potentially being blocked, whilst the connect call is taking place
+     OS_UTILS_UnlockMutex(&mqtt_access_mutex);

obuspc/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspc
-PKG_VERSION:=1.0.1.6
+PKG_VERSION:=1.0.1.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -64,7 +64,6 @@ define Package/obuspc/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspc $(1)/usr/sbin/uspc
 	$(INSTALL_BIN) ./files/etc/init.d/uspc $(1)/etc/init.d/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/50-disable-on-extender $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/99-fix-agent-endpoint $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/100-add-mosquitto-listener $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/etc/config/uspc $(1)/etc/config/

obuspc/files/etc/init.d/uspc

@@ -329,6 +329,13 @@ boot() {
 		return 0;
 	fi
 
+	# Check if device is an extender nothing to do
+	lan_proto="$(uci -q get network.lan.proto)"
+	if [ "${lan_proto}" == "dhcp" ]; then
+		# extender so return
+		return 0;
+	fi
+
 	configure_dnsmasq_op125 "${interface}"
 
 	start
@@ -591,6 +598,13 @@ start_service() {
 		return 0;
 	fi
 
+	# Check if device is an extender then do not start the service
+	lan_proto="$(uci -q get network.lan.proto)"
+	if [ "${lan_proto}" == "dhcp" ]; then
+		# extender so return
+		return 0;
+	fi
+
 	mkdir -p /tmp/usp/
 	db_init
 	register_service

obuspc/files/etc/uci-defaults/50-disable-on-extender

@@ -1,10 +0,0 @@
-#!/bin/sh
-#!/bin/sh
-
-. /lib/functions.sh
-
-mode="$(fw_printenv -n netmode)"
-if [ "${mode}" == "extender" ]; then
-	uci set uspc.global.enabled=0
-	uci commit uspc
-fi

periodicstats/Config.in

@@ -0,0 +1,9 @@
+if PACKAGE_periodicstats
+config PERIODICSTAT_INTERNAL_SAMPLING_RATE
+	int "Number of times statistics will be measured within a sample interval"
+	range 3 10
+	default 3
+	depends on PACKAGE_periodicstats
+	help
+	 This value must be in range of 3 to 10. (default 3)	
+endif

periodicstats/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.5.3
+PKG_VERSION:=1.5.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git
-PKG_SOURCE_VERSION:=28bea5be686013af0ba8e54cf4871f10015e4b06
+PKG_SOURCE_VERSION:=c3bd2e1c1ee8e9cd03368fedf3649eff1e882a49
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -20,6 +20,7 @@ PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
+include $(TOPDIR)/feeds/iopsys/bbfdm/bbfdm.mk
 
 define Package/periodicstats
   SECTION:=utils
@@ -32,6 +33,12 @@ define Package/periodicstats/description
 	Manage periodic statistics
 endef
 
+define Package/periodicstats/config
+	source "$(SOURCE)/Config.in"
+endef
+
+TARGET_CFLAGS += -DINTERNAL_SAMPLING_RATE=$(CONFIG_PERIODICSTAT_INTERNAL_SAMPLING_RATE)
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/periodicstats/* $(PKG_BUILD_DIR)/
@@ -40,11 +47,9 @@ endif
 
 define Package/periodicstats/install
 	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/periodicstatsd $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/etc/periodicstats
-	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/etc/periodicstats
+	$(BBFDM_INSTALL_MS_DM) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,periodicstats))

periodicstats/files/etc/config/periodicstats

@@ -1,4 +1,4 @@
 config globals 'globals'
-	option enable '0'
+	option enable '1'
 	option base_interval '5'
 

periodicstats/files/etc/init.d/periodicstats

@@ -3,11 +3,8 @@
 START=61
 STOP=01
 
-. /etc/bbfdm/bbfdm_services.sh
-
 USE_PROCD=1
 PROG="/usr/sbin/periodicstatsd"
-PERIODICSTATS_JSON_INPUT="/etc/periodicstats/input.json"
 
 start_service() {
 	local enable
@@ -15,18 +12,19 @@ start_service() {
 	config_load periodicstats
 	config_get_bool enable globals enable 1
 	
-	bbfdm_add_service "bbfdm.periodicstats" "${PERIODICSTATS_JSON_INPUT}"
-
-	if [ "${enable}" -ne "1" ]; then
-		return 0;
-	fi
-
 	procd_open_instance periodicstatsd
-	procd_set_param command ${PROG}
-	procd_set_param respawn
+	if [ "${enable}" -eq "1" ]; then
+		procd_set_param command ${PROG}
+		procd_set_param respawn
+	fi
 	procd_close_instance
 }
 
+reload_service() {
+	stop
+	start
+}
+
 service_triggers() {
 	procd_add_reload_trigger periodicstats
 }

periodicstats/files/etc/periodicstats/input.json

@@ -1,15 +0,0 @@
-{
-	"daemon": {
-		"input": {
-			"type": "DotSo",
-			"name": "/etc/periodicstats/libperiodicstats.so"
-		},
-		"output": {
-			"type": "UBUS",
-			"name": "bbfdm.periodicstats",
-			"parent_dm": "Device.",
-			"object": "PeriodicStatistics",
-			"root_obj": "bbfdm"
-		}
-	}
-}

ponmngr/Makefile

@@ -9,7 +9,6 @@ PKG_NAME:=ponmngr
 PKG_VERSION:=1.0.2
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
@@ -19,7 +18,7 @@ include ../bbfdm/bbfdm.mk
 define Package/ponmngr
 	CATEGORY:=Utilities
 	TITLE:=PON Manager
-	DEPENDS:=@(TARGET_brcmbca||TARGET_airoha)
+	DEPENDS:=@(TARGET_brcmbca||TARGET_airoha) +libbbfdm-api
 endef
 
 define Package/ponmngr/description
@@ -40,7 +39,7 @@ ifneq ($(CONFIG_TARGET_brcmbca),)
 else ifneq ($(CONFIG_TARGET_airoha),)
 	$(CP) ./files/airoha/* $(1)/
 endif
-	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/xpon.json)
+	$(BBFDM_INSTALL_MS_DM) ./files/etc/ponmngr/xpon.json $(1) $(PKG_NAME)
 endef
 
 $(eval $(call BuildPackage,ponmngr))

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

@@ -3,45 +3,49 @@
 . /lib/functions.sh
 
 set_serial_number() {
-	vendor_id=$1
-	vssn=$2
+	local vendor_id="$1"
+	local vssn="$2"
 
 	# Vendor id is not taken from serial automatically, propagate it as well
-	/userfs/bin/omcicfgCmd set vendorId ${vendor_id}
-	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
+	/userfs/bin/omcicfgCmd set vendorId "${vendor_id}"
+	/userfs/bin/omcicfgCmd set sn "${vendor_id}${vssn}"
 }
 
 set_equipment_id() {
-	local eqid=$1
-	local eq_id_default="KE2.119.241R2B"
+	local eqid="$1"
 
-	if [ -z "$eqid"  ]; then
+	if [ -z "${eqid}" ]; then
 		return
 	fi
 
-	if [ "$eqid" = "$eq_id_default" ]; then
-		return
-	fi
-
-        /userfs/bin/omcicfgCmd set equipmentId ${eqid}
+	/userfs/bin/omcicfgCmd set equipmentId "${eqid}"
 }
 
 set_loid_authentication() {
-	local loid=$1
-	local loid_pwd=$2
+	local loid="$1"
+	local loid_pwd="$2"
 
-	[ -z "$loid" ] && return
+	[ -z "${loid}" ] && return
 
-	/userfs/bin/omcicfgCmd set loid ${loid}
+	/userfs/bin/omcicfgCmd set loid "${loid}"
 
-	if [ -n "$loid_pwd" ]; then
-		/userfs/bin/omcicfgCmd set loid_password ${loid_pwd}
+	if [ -n "${loid_pwd}" ]; then
+		/userfs/bin/omcicfgCmd set loidPasswd "${loid_pwd}"
 	fi
 }
 
+set_onu_version() {
+	local onu_version="$1"
+
+	[ -z "${onu_version}" ] && return
+
+	/userfs/bin/omcicfgCmd set onuVersion "${onu_version}"
+}
+
 apply_xpon_uci_config() {
 	configure_loid_authentication
 	configure_equipment_id
+	configure_onu_version
 }
 
 init_xpon() {

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

@@ -3,39 +3,49 @@
 . /lib/functions.sh
 
 set_serial_number() {
-	vendor_id=$1
-	vssn=$2
+	local vendor_id="$1"
+	local vssn="$2"
 
-	vendor_id="$(echo $vendor_id | hexdump -e '4/1 "%02X" "\n"')"
-	vendor_id=${vendor_id:0:8}
+	vendor_id="$(echo "${vendor_id}" | hexdump -e '4/1 "%02X" "\n"')"
+	vendor_id="${vendor_id:0:8}"
 
 	bs /b/c gpon onu_sn={vendor_id=$vendor_id,vendor_specific=$vssn}
 }
 
 set_equipment_id() {
-	equipment_id=$1
+	local equipment_id="$1"
 	[ -z "$equipment_id" ] && return
 
-	json_add_string "equipment_id" $equipment_id
+	json_add_string "equipment_id" "$equipment_id"
 }
 
 set_loid_authentication() {
-	loid=$1
-	loid_password=$2
+	local loid="$1"
+	local loid_password="$2"
+
 	[ -z "$loid" ] && return
 
-	json_add_string "loid" $loid
-	json_add_string "loid_password" $loid_password
+	json_add_string "loid" "$loid"
+	json_add_string "loid_password" "$loid_password"
+}
+
+set_onu_version() {
+	local onu_version="$1"
+	[ -z "${onu_version}" ] && return
+
+	json_add_string "onu_version" "${onu_version}"
 }
 
 apply_xpon_uci_config() {
+	local sn
 
 	json_init
 	json_add_object 'ani'
 	sn="$(uci -q get xpon.ani.serial_number)"
-	json_add_string "serial_number" $sn
+	json_add_string "serial_number" "$sn"
 	configure_loid_authentication
 	configure_equipment_id
+	configure_onu_version
 	json_close_object
 	json_dump > /tmp/xpon.json
 }

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

@@ -11,21 +11,21 @@ include /lib/xpon
 configure_serial_number() {
 	# serial number generation is taken care in the uci defaults, so if
 	# serial number is not found here its a misconfig
-	serial_number="$(uci -q get xpon.ani.serial_number)"
+	local serial_number="$(uci -q get xpon.ani.serial_number)"
 	if [ ${#serial_number} -eq 12 ]; then
-		vendor_id="${serial_number:0:4}"
-		vssn="${serial_number:4:8}"
+		local vendor_id="${serial_number:0:4}"
+		local vssn="${serial_number:4:8}"
 	else
-		logger -s -t "xpon" "Serial number not found in uci, ont will probably not be registered at the olt"
-		logger -s -t "xpon" "Please configure a valid serial number"
+		logger -s -t "xpon" "Serial number not found in UCI, ONT will probably not be registered at the OLT."
+		logger -s -t "xpon" "Please configure a valid serial number."
 		return
 	fi
 
-	set_serial_number $vendor_id $vssn
+	set_serial_number "${vendor_id}" "${vssn}"
 }
 
 start_service() {
-	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
+	if [ "$(uci -q get xpon.ani.enable)" = "1" ]; then
 		configure_serial_number
 		apply_xpon_uci_config
 		init_xpon

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

@@ -3,14 +3,15 @@
 
 configure_serial_number() {
 	# check if serial number is present in the production data
-	production_sn="$(fw_printenv -n gponsn)"
+	local production_sn="$(fw_printenv -n gponsn)"
 	if [ ${#production_sn} -eq 12 ]; then
-		uci set xpon.ani.serial_number=$production_sn
+		uci set xpon.ani.serial_number="${production_sn}"
 	else
-		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-		vendor_id="IOPS"
-		vssn="${macaddr:4:8}"
-		uci set xpon.ani.serial_number=$vendor_id$vssn
+		local macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
+		local vendor_id="IOPS"
+		local vssn="${macaddr:4:8}"
+
+		uci set xpon.ani.serial_number="${vendor_id}${vssn}"
 	fi
 }
 
@@ -18,37 +19,38 @@ configure_loid_authentication() {
 	local production_loid
 	local production_loidpwd
 
-	loid="$(uci -q get xpon.ani.loid)"
-	loidpwd="$(uci -q get xpon.ani.loid_password)"
-        if [ -z $loid ]; then
+	local loid="$(uci -q get xpon.ani.loid)"
+	local loidpwd="$(uci -q get xpon.ani.loid_password)"
+
+	if [ -z "${loid}" ]; then
 		production_loid="$(fw_printenv -n gponloid)"
 	fi
-	if [ -z $loidpwd ]; then
+	if [ -z "${loidpwd}" ]; then
 		production_loidpwd="$(fw_printenv -n gponloid_password)"
 	fi
 
-	if [ -n $production_loid ]; then
-		uci set xpon.ani.loid=$production_loid
+	if [ -n "${production_loid}" ]; then
+		uci set xpon.ani.loid="${production_loid}"
 	fi
-	if [ -n $production_loidpwd ]; then
-		uci set xpon.ani.loid_password=$production_loidpwd
+	if [ -n "${production_loidpwd}" ]; then
+		uci set xpon.ani.loid_password="${production_loidpwd}"
 	fi
 
 }
 
 if [ -s "/etc/config/xpon" ]; then
-        if uci -q get xpon.ani >/dev/null; then
-                # generate serial number in case its not present and return
-		serial_number="$(uci -q get xpon.ani.serial_number)"
-		if [ ${#serial_number} -ne 12 ]; then
+	if uci -q get xpon.ani >/dev/null; then
+		# generate serial number in case its not present and return
+		SERIAL_NUMBER="$(uci -q get xpon.ani.serial_number)"
+		if [ ${#SERIAL_NUMBER} -ne 12 ]; then
 			configure_serial_number
 		fi
 		configure_loid_authentication
-                exit                                  
-        else                                          
-                rm -f /etc/config/xpon
-        fi                           
-fi                                   
+		exit
+	else
+		rm -f /etc/config/xpon
+	fi
+fi
 touch /etc/config/xpon
 
 uci set xpon.ani=ani