Implemented Device.Time as per datamodel 2.16

bbfdm/Config_bbfdm.in

@@ -18,6 +18,14 @@ config BBF_TR471
 	bool "Enable TR-471 Data Model Support"
 	default y
 
+config BBFDM_ENABLE_JSON_PLUGIN
+	bool "Enable json plugin to extend datamodel"
+	default y
+
+config BBFDM_ENABLE_DOTSO_PLUGIN
+	bool "Enable shared library plugin to extend datamodel"
+	default y
+
 config BBF_MAX_OBJECT_INSTANCES
 	int "Maximum number of instances per object"
 	default 255

bbfdm/Makefile

@@ -5,16 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.4.23
+PKG_VERSION:=1.3.4
 
-USE_LOCAL:=0
-ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=c10303fc51a1034cb87040e0eaf23c95d2b1c658
+PKG_SOURCE_VERSION:=93b023b75ed97bf2efba5e010348c66fb1779fb7
 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
@@ -37,7 +34,7 @@ define Package/libbbfdm/default
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
-	    +BBF_TR471:obudpst
+	    +BBF_TR471:obudpst +ntpd
 endef
 
 define Package/libbbfdm
@@ -105,9 +102,10 @@ define Package/libbbfdm/description
  Library contains the data model tree. It includes TR181, TR143 data models
 endef
 
-ifeq ($(USE_LOCAL),1)
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
 define Build/Prepare
-	$(CP) ~/git/bbfdm/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -136,6 +134,16 @@ CMAKE_OPTIONS += \
 
 endif ##CONFIG_BBF_VENDOR_EXTENSION
 
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+CMAKE_OPTIONS += \
+	-DBBF_JSON_PLUGIN=ON
+endif
+
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+CMAKE_OPTIONS += \
+	-DBBF_DOTSO_PLUGIN=ON
+endif
+
 ifeq ($(BUILD_VARIANT),default)
 CMAKE_OPTIONS += -DWITH_OPENSSL=ON
 endif
@@ -163,23 +171,30 @@ define Package/libbbfdm-api/install
 endef
 
 define Package/libbbfdm/default/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/lib/
 	$(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/firewall.portmap $(1)/etc/firewall.portmap
-	$(INSTALL_BIN) ./files/etc/firewall.service $(1)/etc/firewall.service
 ifeq ($(CONFIG_BBF_TR143),y)
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm
 	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+	$(INSTALL_CONF) ./files/etc/config/ntp $(1)/etc/config/ntp
+	$(INSTALL_BIN) ./files/etc/uci-defaults/96-system-ntp-migrate $(1)/etc/uci-defaults/96-system-ntp-migrate
+	$(INSTALL_BIN) ./files/etc/init.d/ntp $(1)/etc/init.d/ntp
+	$(LN) /usr/share/bbfdm/ntpstat $(1)/usr/libexec/rpcd/ntpstat
+endif
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+endif
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 endif
 endef
 
@@ -195,12 +210,12 @@ define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(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_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_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/ubus/bbfdmd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/json/input.json $(1)/etc/bbfdm/
+	$(INSTALL_BIN) ./files/etc/bbfdm/bbfdm_services.sh $(1)/etc/bbfdm/
 endef
 
 define Package/userinterface/install
@@ -213,7 +228,9 @@ define Package/userinterface/install
 	$(INSTALL_BIN) ./files/etc/init.d/userinterface $(1)/etc/init.d/userinterface
 	$(INSTALL_BIN) ./files/etc/uci-defaults/93-userinterface-firewall $(1)/etc/uci-defaults/93-userinterface-firewall
 	$(INSTALL_BIN) ./files/etc/uci-defaults/94-userinterface-json $(1)/etc/uci-defaults/94-userinterface-json
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
 	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
+	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
 endef
 
 Package/libbbfdm/prerm = $(Package/libbbfdm/default/prerm)

bbfdm/bbfdm.mk

@@ -1,9 +0,0 @@
-#
-# Copyright (C) 2023 IOPSYS
-#
-
-
-define BbfdmInstallPlugin
-	$(INSTALL_DIR) $(1)/etc/bbfdm/plugins
-	$(INSTALL_DATA) $(2) $(1)/etc/bbfdm/plugins/
-endef

bbfdm/files/etc/bbfdm/bbfdm_services.sh

@@ -13,35 +13,5 @@ bbfdm_add_service()
 		return 0;
 	fi
 
-	ubus call service add "{'name':'bbfdm.services','instances':{'$name':{'command':['$BBFDMD','-m','$path']}}}"
+	ubus call service add "{'name':'bbfdm.services','instances':{'$name':{'command':['$BBFDMD','-m','$path'], 'respawn': [0]}}}"
 }
-
-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

@@ -1,28 +0,0 @@
-{
-        "daemon": {
-                "config": {
-                },
-                "input": {
-                        "type": "DotSo",
-                        "name": "/lib/libbbfdm.so",
-                        "plugin_dir": "/etc/bbfdm/plugins"
-                },
-                "output": {
-                        "type": "UBUS",
-                        "name": "bbfdm"
-                }
-        },
-        "cli": {
-                "config": {
-                        "proto": "both",
-                        "instance_mode": 0
-                },
-                "input": {
-                        "type": "UBUS",
-                        "name": "bbfdm"
-                },
-                "output": {
-                        "type": "CLI"
-                }
-        }
-}

bbfdm/files/etc/config/bbfdm

@@ -3,6 +3,5 @@ config bbfdmd 'bbfdmd'
 	option enabled '1'
 	option loglevel '1'
 	option refresh_time '10'
-	option transaction_timeout '30'
-	option subprocess_level '2'
+	option transaction_timeout '10'
 

bbfdm/files/etc/config/ntp

@@ -0,0 +1,28 @@
+config global 'global'
+	option enable '1'
+
+config timeclient 'client'
+	option enable_client '1'
+	option iburst '1'
+	option version '4'
+	option peer '0'
+	option minpoll '6'
+	option maxpoll '10'
+	option client_mode 'Unicast'
+	option server 'ntp1.sth.netnod.se,ntp1.gbg.netnod.se'
+
+config timeclient 'dhcp_driven'
+	option enable_client '0'
+	option iburst '1'
+	option version '4'
+	option peer '0'
+	option minpoll '6'
+	option maxpoll '10'
+	option client_mode 'Unicast'
+	option client_interface 'wan'
+	option client_alias 'DHCP-driven'
+
+config timeserver 'server'
+	option enable_server '1'
+	option server_mode 'Unicast'
+	option ttl '255'

bbfdm/files/etc/firewall.service

@@ -1,163 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-log() {
-	echo "${@}"|logger -t firewall.service -p info
-}
-
-exec_cmd() {
-	if ! eval "$*"; then
-		log "Failed to run [$*]"
-		echo "-1"
-		return 0
-	fi
-
-	echo "0"
-	return 0
-}
-
-add_iptable_rule() {
-	chain_name=$1
-	protocol=$2
-	dest_port=$3
-	icmp_type=$4
-	family=$5
-	src_prefix=$6
-	action=$7
-	res=-1
-
-	cmd="-I ${chain_name}"
-
-	if [ -n "${protocol}" ]; then
-		cmd="${cmd} -p $protocol"
-
-		if [ "${protocol}" -eq 41 ] || [ "${protocol}" -eq 43 ] || [ "${protocol}" -eq 44 ] ||
-		   [ "${protocol}" -eq 58 ] || [ "${protocol}" -eq 59 ] || [ "${protocol}" -eq 60 ]; then
-		   	# Explicit v6 protocols
-			if [ "${family}" = "ipv4" ]; then
-				echo $res
-				return 0
-			else
-				family="ipv6"
-			fi
-		elif [ "${protocol}" -eq 1 ]; then
-		   	# Explicit v4 protocols
-			if [ "${family}" = "ipv6" ]; then
-				echo $res
-				return 0
-			else
-				family="ipv4"
-			fi
-		fi
-
-		# Limitation:: iptables do not accept dport without specific protocol
-		count=$(echo "${dest_port}" | sed -n "/-1/p" | wc -l)
-
-		if [ "${count}" -eq 0 ]; then
-			# dest_port not contains -1 so need to have this match criteria
-			count=$(echo "${dest_port}" | wc -w)
-			if [ "${count}" -gt 1 ]; then
-				# multiple ports present
-				port=$(echo "${dest_port}" | sed "s/ /,/g")
-				cmd="${cmd} -m multiport --dports ${port}"
-			else
-				cmd="${cmd} --dport ${dest_port}"
-			fi
-		fi
-	fi
-
-	if [ "${family}" = "ipv4" ] || [ "${family}" = "-1" ]; then
-		if [ "${protocol}" -eq 1 ] && [ "${icmp_type}" -ge 0 ]; then
-			cmd="${cmd} --icmp-type ${icmp_type}"
-		fi
-
-		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd "iptables ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
-		else
-			#Add ipv4 sources if any
-			src_list=""
-			for src in $src_prefix; do
-				ret=$(echo $src | grep ":" | wc -l)
-				if [ "${ret}" -eq 0 ]; then
-					src_list="$src,$src_list"
-				fi
-			done
-
-			if [ -n "$src_list" ]; then
-				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd "iptables -s $src_list ${cmd} -m comment --comment IPtables_service_rule -j ${action}")
-			fi
-		fi
-	fi
-
-	if [ "${family}" = "ipv6" ] || [ "${family}" = "-1" ]; then
-		if [ "${protocol}" -eq 58 ] && [ "${icmp_type}" -ge 0 ]; then
-			cmd="${cmd} --icmpv6-type ${icmp_type}"
-		fi
-
-		if [ -z "${src_prefix}" ]; then
-			res=$(exec_cmd "ip6tables ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
-		else
-			#Add ipv6 sources if any
-			src_list=""
-			for src in $src_prefix; do
-				ret=$(echo $src | grep ":" | wc -l)
-				if [ "${ret}" -eq 1 ]; then
-					src_list="$src,$src_list"
-				fi
-			done
-
-			if [ -n "$src_list" ]; then
-				src_list=$(echo "${src_list}" | sed "s/,$//")
-				res=$(exec_cmd "ip6tables -s $src_list ${cmd} -m comment --comment IP6tables_service_rule -j ${action}")
-			fi
-		fi
-	fi
-
-	echo $res
-}
-
-add_service() {
-	local enable proto family dest_port interface target icmp_type
-
-	config_get enable "$1" enable "0"
-	config_get icmp_type "$1" icmp_type "-1"
-	config_get target "$1" target "Accept"
-	config_get interface "$1" interface ""
-	config_get family "$1" family "-1"
-	config_get dest_port "$1" dest_port "-1"
-	config_get proto "$1" proto "-1"
-	config_get src_prefix "$1" src_prefix ""
-
-	if [ "${enable}" -eq 0 ] || [ -z "${interface}" ]; then
-		return 0
-	fi
-
-	action=$(echo "${target}" | tr a-z A-Z)
-	chain_name="zone_${interface}_input"
-	res=0
-
-	count=$(echo "${proto}" | sed -n "/-1/p" | wc -l)
-
-	if [ "${count}" -eq 0 ]; then
-		# proto not contains -1 so need to have this match criteria
-		for protocol in $proto; do
-			res=$(add_iptable_rule "$chain_name" "$protocol" "$dest_port" "$icmp_type" "$family" "$src_prefix" "$action")
-		done
-	else
-		# proto contains -1 so no need to have this match criteria
-		res=$(add_iptable_rule "$chain_name" "" "$dest_port" "$icmp_type" "$family" "$src_prefix" "$action")
-	fi
-
-	if [ "${res}" -ne 0 ]; then
-		uci -q set firewall."${1}".status="Error"
-	else
-		uci -q set firewall."${1}".status=""
-	fi
-
-	uci commit firewall
-}
-
-config_load firewall
-config_foreach add_service "service"

bbfdm/files/etc/init.d/bbfdmd

@@ -1,13 +1,12 @@
 #!/bin/sh /etc/rc.common
 
-START=65
+START=96
 STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
 BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
-BBFDM_TEMP_JSON="/tmp/bbfdm/input.json"
 
 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
@@ -17,21 +16,20 @@ validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enabled:bool:true' \
-		'sock:string' \
 		'debug:bool:false' \
-		'loglevel:uinteger:1' \
-		'refresh_time:uinteger:0' \
-		'transaction_timeout:uinteger:30' \
+		'loglevel:uinteger' \
+		'sock:string' \
+		'refresh_time:uinteger' \
+		'transaction_timeout:uinteger' \
 		'subprocess_level:uinteger'
 }
 
 configure_bbfdmd()
 {
-	local enabled debug sock update
-	local jlog jrefresh jtimeout jlevel
+	local enabled debug sock
 
-	update=0
 	config_load bbfdm
+
 	validate_bbfdm_bbfdmd_section || {
 		log "Validation of bbfdmd section failed"
 		return 1;
@@ -39,8 +37,22 @@ configure_bbfdmd()
 
 	[ "${enabled}" -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}
+	[ ! -f "${BBFDM_JSON_INPUT}" ] && return 0
+
+	if [ -n "${loglevel}" ]; then
+		echo "$(jq --arg res ${loglevel} '.daemon.config += {"loglevel": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${refresh_time}" ]; then
+		echo "$(jq --arg res ${refresh_time} '.daemon.config += {"refresh_time": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${transaction_timeout}" ]; then
+		echo "$(jq --arg res ${transaction_timeout} '.daemon.config += {"transaction_timeout": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${subprocess_level}" ]; then
+		echo "$(jq --arg res ${subprocess_level} '.daemon.config += {"subprocess_level": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
 	fi
 
 	procd_set_param command ${PROG}
@@ -56,18 +68,10 @@ configure_bbfdmd()
 
 start_service()
 {
-	mkdir -p /tmp/bbfdm
 	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/init.d/ntp

@@ -1,45 +1,43 @@
-#!/bin/sh
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2006-2011 OpenWrt.org
 
-. /lib/functions.sh
+START=65
+STOP=65
 
-CONF_FILE=/tmp/timemngr/timemngr.conf
+USE_PROCD=1
+PROG=/sbin/ntpd
+HOTPLUG_HELPER=/usr/sbin/ntpd.hotplug-helper
+
+config_file=/var/etc/ntpd.conf
 
 trunc() {
-	mkdir -p $(dirname ${CONF_FILE})
-	chown -R ntp:ntp $(dirname ${CONF_FILE})
-	echo -n "" > ${CONF_FILE}
+	echo -n "" > $config_file
 }
 
 emit() {
-	echo -e "$@" >> ${CONF_FILE}
+	echo -e "$@" >> $config_file
+}
+
+validate_client_section() {
+	uci_validate_section ntp timeclient $1 \
+		'enable_client:bool:1' 'iburst:bool:1'\
+		'version:uinteger:4' 'peer:bool:0' \
+		'minpoll:uinteger:6' 'maxpoll:uinteger:10' \
+		'client_mode:string:Unicast' 'server:string'
 }
 
 validate_global_section() {
-	uci_validate_section time global global \
+	uci_validate_section ntp global global \
 	    'enable:bool:1'
 }
 
 validate_server_section() {
-	uci_validate_section time server server \
-		'enable:bool:1'\
-		'mode:string:Unicast'\
-		'ttl:uinteger:255'\
-		'interface:string'
+	uci_validate_section ntp timeserver server \
+		'enable_server:bool:1' 'server_mode:string:Unicast'\
+		'ttl:uinteger:255' 'interface:string'
 }
 
-validate_client_section() {
-	uci_validate_section time client $1 \
-		'enable:bool:1'\
-		'iburst:bool:1'\
-		'version:uinteger:4'\
-		'peer:bool:0'\
-		'minpoll:uinteger:6'\
-		'maxpoll:uinteger:10'\
-		'mode:string:Unicast'\
-		'server:list(host)'
-}
-
-generate_config() {
+start_ntpd_instance() {
 	local enable
 	validate_global_section || {
 		return 1
@@ -49,41 +47,27 @@ generate_config() {
 		return 1
 	fi
 
-	local enable_client_sec
-	enabled_sec=$(uci -q show time | grep enable=\'1\' | cut -d'.' -f 2)
-	for sec in $enabled_sec; do
-		type=$(uci -q get time.$sec)
-		if [ "${type}" == "client" ]; then
-			enable_client_sec=$sec
-			break
-		fi
-	done
-
-	local client_mode enable_client
-	local enable iburst version peer minpoll maxpoll mode server
+	enable_client_sec=$(uci -q show ntp | grep enable_client=\'1\' | cut -d'.' -f 2)
+	local enable_client iburst version peer minpoll maxpoll client_mode server
 	if [ -n $enable_client_sec ]; then
 		validate_client_section $enable_client_sec || {
 			return 1
 		}
-		client_mode=$mode
-		enable_client=$enable
 	else
 		enable_client=0
 	fi
 
-	local server_mode enable_server
-	local enable mode ttl interface
+	local enable_server server_mode ttl interface
 	validate_server_section || {
 		return 1
 	}
 
-	server_mode=$mode
-	enable_server=$enable
-
 	[ "$enable_client" = 0 ] && [ "$enable_server" = 0 ] && return
 
+	mkdir -p "$(dirname "$config_file")"
+
 	trunc
-	emit "driftfile /tmp/timemngr/ntp.drift\n"
+	emit "driftfile /var/lib/ntp/ntp.drift\n"
 
 	str1="restrict -4 default noserve"
 	str2="restrict -6 default noserve"
@@ -113,7 +97,8 @@ generate_config() {
 		elif [ "$client_mode" = "Manycast" ]; then
 			emit "manycastclient 224.0.1.1 minpoll $minpoll maxpoll $maxpoll version $version\n"
 		else
-			for i in $server; do
+			for i in ${server//,/ }
+			do
 				str="server $i minpoll $minpoll maxpoll $maxpoll version $version"
 				if [ "$iburst" != 0 ]; then
 					str="${str} iburst"
@@ -122,7 +107,8 @@ generate_config() {
 			done
 
 			if [ "$peer" != 0 ]; then
-				for i in $server; do
+				for i in ${server//,/ }
+				do
 					str="peer $i minpoll $minpoll maxpoll $maxpoll version $version"
 					if [ "$iburst" != 0 ]; then
 						str="${str} iburst"
@@ -175,11 +161,53 @@ generate_config() {
 		fi
 	fi
 
-}
+	if [ -d "/etc/ntpd.d" ]; then
+		local entry
+		for entry in "/etc/ntpd.d"/*.conf; do
+			emit "includefile ${entry}\n"
+		done
+	fi
 
-create_service() {
-	procd_open_instance timemngr
-	procd_set_param command "/sbin/ntpd" -g -u ntp:ntp -n -c ${CONF_FILE}
-	procd_set_param respawn
+	if [ -d "/tmp/ntpd.d" ]; then
+		local entry
+		for entry in "/tmp/ntpd.d"/*.conf; do
+			emit "includefile ${entry}\n"
+		done
+	fi
+
+	mkdir -p /var/lib/ntp
+	chown -R ntp:ntp /var/lib/ntp
+
+	procd_open_instance
+	procd_set_param command $PROG -g -u ntp:ntp -p /var/run/ntpd.pid -n \
+		-c $config_file
+	procd_close_instance
+
+	procd_open_instance
+	procd_set_param command $HOTPLUG_HELPER
 	procd_close_instance
 }
+
+start_service() {
+	start_ntpd_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger "ntp"
+
+	local enable_server server_mode ttl interface
+	validate_server_section || {
+		return 1
+	}
+
+	if [ "$enable_server" != 0 ] && [ "$server_mode" = "Broadcast" ] && [ -n "$interface" ]; then
+		procd_open_trigger
+		procd_add_interface_trigger "interface.*.up" $interface /etc/init.d/ntp restart
+		procd_close_trigger
+	fi
+}

bbfdm/files/etc/uci-defaults/96-sysctl-translation

@@ -1,62 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-bbfdm_sysctl_conf="/etc/bbfdm/sysctl.conf"
-
-update_device_section() {
-	local section="${1}"
-	local dev_name="${2}"
-	local ipv6="${3}"
-	local name
-
-	# Get name value
-	config_get name "${section}" name
-
-	# Retrun if the name value is different to the dev_name value
-	[ "${name}" != "${dev_name}" ] && return
-	
-	if [ "${ipv6}" = "0" ]; then
-		ipv6="1"
-	else
-		ipv6="0"
-	fi
-
-	# Add ipv6 option
-	uci -q set network.${section}.ipv6="${ipv6}"
-}
-
-parse_bbfdm_sysctl_conf_file() {
-	# Check if the file exists
-	[ -f "${bbfdm_sysctl_conf}" ] || return
-
-	# Create a temporary file
-	tmpfile=$(mktemp)
-
-	# Load network config
-	config_load network
-
-	# Read each line of the file
-	while read -r line; do
-		if echo "$line" | grep -Eq '^net\.ipv6\.conf\.(.+)\.disable_ipv6=([0-1])$'; then
-			name=$(echo "$line" | sed -n 's/^net\.ipv6\.conf\.\(.*\)\.disable_ipv6=[0-1]$/\1/p')
-			value=$(echo "$line" | sed -n 's/^net\.ipv6\.conf\.\(.*\)\.disable_ipv6=\([0-1]\)$/\2/p')
-
-			config_foreach update_device_section device "${name}" "${value}"
-		else
-			# If the line doesn't match, preserve it in the temporary file
-			echo "$line" >> "$tmpfile"
-		fi
-	done < "${bbfdm_sysctl_conf}"
-
-	# Replace the original file with the modified content
-	mv "$tmpfile" "${bbfdm_sysctl_conf}"
-
-	# Apply the changes
-	uci commit network
-	sysctl -e -p "${bbfdm_sysctl_conf}" >&-
-}
-
-parse_bbfdm_sysctl_conf_file
-
-exit 0

bbfdm/files/etc/uci-defaults/96-system-ntp-migrate

@@ -0,0 +1,75 @@
+#!/bin/sh
+
+ntpd_config=$(uci -q get system.ntp)
+if [ -n "${ntpd_config}" ]; then
+	rm -rf /etc/config/ntp
+	touch /etc/config/ntp
+
+	global_section=$(uci -q add ntp global)
+	uci -q rename ntp."${global_section}"="global"
+	uci -q set ntp.global.enable="1"
+
+	client_section=$(uci -q add ntp timeclient)
+	uci -q rename ntp."${client_section}"="client"
+
+	client_enable=$(uci -q get system.ntp.enabled)
+	if [ $client_enable -eq 0 ]; then
+		uci -q set ntp.client.enable_client="0"
+	else
+		uci -q set ntp.client.enable_client="1"
+	fi
+
+	uci -q set ntp.client.iburst="1"
+	uci -q set ntp.client.version="4"
+	uci -q set ntp.client.peer="0"
+	uci -q set ntp.client.minpoll="6"
+	uci -q set ntp.client.maxpoll="10"
+	uci -q set ntp.client.client_mode="Unicast"
+
+	servers=$(uci -q get system.ntp.server)
+	serv=""
+	for server in $servers; do
+		if [ -z "${serv}" ]; then
+			serv="${server}"
+		else
+			serv="${serv},${server}"
+		fi
+	done
+
+	uci -q set ntp.client.server=${serv}
+
+	client_section=$(uci -q add ntp timeclient)
+	uci -q rename ntp."${client_section}"="dhcp_driven"
+
+	uci -q set ntp.dhcp_driven.enable_client="0"
+	uci -q set ntp.dhcp_driven.iburst="1"
+	uci -q set ntp.dhcp_driven.version="4"
+	uci -q set ntp.dhcp_driven.peer="0"
+	uci -q set ntp.dhcp_driven.minpoll="6"
+	uci -q set ntp.dhcp_driven.maxpoll="10"
+	uci -q set ntp.dhcp_driven.client_mode="Unicast"
+	uci -q set ntp.dhcp_driven.client_interface="wan"
+	uci -q set ntp.dhcp_driven.client_alias="DHCP-driven"
+
+	server_section=$(uci -q add ntp timeserver)
+	uci -q rename ntp."${server_section}"="server"
+
+	server_enable=$(uci -q get system.ntp.enable_server)
+	if [ $server_enable -eq 1 ]; then
+		uci -q set ntp.server.enable_server="1"
+	else
+		uci -q set ntp.server.enable_server="0"
+	fi
+
+	uci -q set ntp.server.server_mode="Unicast"
+	uci -q set ntp.server.ttl="255"
+
+	uci -q commit ntp
+
+	uci -q batch <<-EOT
+		delete system.ntp
+		commit system
+	EOT
+fi
+
+exit 0

bbfdm/files/etc/uci-defaults/97-firewall-service

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

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

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-UNIFIED_PATH="/etc/bbfdm/plugins/"
-
-# Link JSON plugins
-for f in `ls -1 /etc/bbfdm/json/*.json`; do
-	echo "# 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 #"
-	ln -s ${f} "${UNIFIED_PATH}"
-done
-
-exit 0
-

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=f556410b51a2248f11358793f11ae54d3e53e85e
+PKG_SOURCE_VERSION:=2dd55d9c9eb01ed1b11e16bad9e2c3e8badfffeb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

bulkdata/files/etc/init.d/bulkdatad

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=60
+START=99
 STOP=10
 
 . /etc/bbfdm/bbfdm_services.sh

decollector/Makefile

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

decollector/files/decollector.init

@@ -7,7 +7,7 @@ USE_PROCD=1
 PROG=/usr/sbin/decollector
 
 service_running() {
-	ubus -t 2 wait_for ieee1905 ieee1905.map
+	ubus -t 2 wait_for ieee1905 ieee1905.map topology
 }
 
 start_service() {

dectmngr/Makefile

@@ -1,14 +1,20 @@
+#
+# Copyright (C) 2021 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.6.4
+PKG_VERSION:=3.5.12
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d9cc11c81ce1ff625e4e789afa180b301c7fcf74
+PKG_SOURCE_VERSION:=27f69239e95c7e7c2c9673825bdafde446ae5ae2
 PKG_MIRROR_HASH:=skip
 endif
 

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

@@ -302,8 +302,6 @@ xdsl_stop() {
 }
 
 xdsl_init() {
-	[ -d /sys/class/net/dsl0/ ] || exit
-
 	prioritize_arp
 
 	echo "Starting DSL"

dslmngr/files/common/etc/init.d/dsl

@@ -26,6 +26,10 @@ stop_service() {
 }
 
 boot() {
+	local HASADSL="$(db -q get hw.board.hasAdsl)"
+	local HASVDSL="$(db -q get hw.board.hasVdsl)"
+	[ "$HASADSL" == "1" -o "$HASVDSL" == "1" ] || return
+
 	xdsl_init
 
 	start

ethmngr/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.0
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b81d06867d895245ef47004c6949f9d6dedd10ef
+PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ethmngr.git
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -43,7 +43,12 @@ endef
 endif
 
 define Package/ethmngr/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/common/* $(1)/
+ifneq ($(CONFIG_TARGET_brcmbca),)
+	$(CP) ./files/broadcom/* $(1)/
+else
+	$(CP) ./files/linux/* $(1)/
+endif
 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/

ethmngr/files/broadcom/lib/ethernet/broadcom.sh

@@ -0,0 +1,144 @@
+# arg1: port ifname, ex: eth0
+get_max_port_speed() {
+	if [ -z "$1" ]; then
+		echo 0
+		return
+	fi
+
+	local ifname="$1"
+	local phycap="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Speed Capabilities' | awk '{print$NF}')"
+	local speed=1000
+
+	case "$phycap" in
+		10GFD*) speed=10000 ;;
+		5GFD*) speed=5000 ;;
+		2.5GFD*) speed=2500 ;;
+		1GFD*) speed=1000 ;;
+		100MFD*|100MHD*) speed=100 ;;
+		10MFD*|10MHD*) speed=10 ;;
+	esac
+
+	echo $speed
+}
+
+# arg1: port name, ex: eth0
+get_port_number() {
+	[ -z "$1" ] && return
+	local ports="0 1 2 3 4 5 6 7 8"
+	local units="0 1"
+	local port="$1"
+	local ifname
+
+	for unit in $units; do
+		for prt in $ports; do
+			ifname="$(ethswctl getifname $unit $prt 2>/dev/null | awk '{print$NF}')"
+			if [ "$ifname" == "$port" ]; then
+				echo "$unit $prt"
+				return
+			fi
+		done
+	done
+}
+
+# arg1: port ifname, ex: eth0
+reset_port() {
+        local ifname="$1"
+        ethctl $ifname phy-reset >/dev/null
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+power_updown() {
+	local ifname="$1"
+	local enabled=$2
+
+	local updown="up"
+	[ $enabled -eq 0 ] && updown="down"
+	ethctl $ifname phy-power $updown >/dev/null
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+# arg3: port speed, ex: 1000
+# arg4: port duplex, ex: full
+# arg5: port autoneg, ex: on
+# arg6: port eee, ex: 0
+# arg7: port pause, ex: 0
+set_port_settings() {
+	local ifname="$1"
+	local enabled=$2
+	local speed="$3"
+	local duplex=$4
+	local autoneg=$5
+	local eee=$6
+	local pause=$7
+
+	[ -d /sys/class/net/$ifname ] || return
+
+	local unitport="$(get_port_number $ifname)"
+	local unit=$(echo $unitport | cut -d ' ' -f 1)
+	local port=$(echo $unitport | cut -d ' ' -f 2)
+
+	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
+	[ "$duplex" == "half" ] && duplex=0 || duplex=1
+	[ "$duplex" == 0 ] && dplx="HD" || dplx="FD"
+	[ "$autoneg" == "on" ] && media_type="auto" || media_type="$speed$dplx"
+
+	phycaps="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Speed Capabilities' | awk '{print$NF}')"
+	numofcaps="$(echo $phycaps | tr ':' ' ' | wc -w)"
+
+        # Reset the port before setting new params
+        reset_port $ifname
+
+	if [ "$numofcaps" == "1" ]; then
+		logger -t "ethmngr" "$ifname is capable of $phycaps only; not setting speed/duplex"
+	else
+		logger -t "ethmngr" "$ifname is capable of $phycaps; setting speed/duplex to $media_type"
+		ethctl $ifname media-type $media_type ${pyhendpoint:+ port $pyhendpoint} &>/dev/null
+	fi
+
+	[ $eee -eq 1 ] && eee="on" || eee="off"
+	ethtool --set-eee $ifname eee $eee 2>/dev/null
+
+	case $pause in
+		off|0)
+			pause=0x0
+			auto=off
+			rx=off
+			tx=off
+		;;
+		on|1)
+			pause=0x2
+			auto=off
+			rx=on
+			tx=on
+		;;
+		auto)
+			pause=0x1
+			auto=on
+			rx=on
+			tx=on
+		;;
+		tx)
+			pause=0x3
+			auto=off
+			rx=off
+			tx=on
+		;;
+		rx)
+			pause=0x4
+			auto=off
+			rx=on
+			tx=off
+		;;
+	esac
+	if [ "$auto" == "on" ]; then
+		# Use ethswctl utility to set pause autoneg
+		# as ethtool is not setting it properly
+		ethswctl -c pause -n $unit -p $port -v $pause 2>&1 >/dev/null
+	else
+		ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
+	fi
+
+	power_updown $ifname $enabled
+}

ethmngr/files/common/etc/init.d/ethmngr

@@ -0,0 +1,50 @@
+#!/bin/sh /etc/rc.common
+
+START=15
+STOP=90
+
+USE_PROCD=1
+PROG=/usr/sbin/ethmngr
+
+. /lib/functions.sh
+include /lib/ethernet
+
+configure_ethernet_port(){
+	local cfg=$1
+	local ifname enabled speed duplex autoneg eee pause
+
+	config_get ifname $cfg ifname
+	[ -d /sys/class/net/$ifname ] || return
+
+	config_get enabled $cfg enabled 1
+	config_get speed $cfg speed 1000
+	config_get duplex $cfg duplex "full"
+	config_get autoneg $cfg autoneg 1
+	config_get eee $cfg eee 0
+	config_get pause $cfg pause 0
+
+	set_port_settings $ifname $enabled $speed $duplex $autoneg $eee $pause
+}
+
+start_service() {
+	if [ -s /etc/config/ports ]; then
+		config_load ports
+		config_foreach configure_ethernet_port ethport
+	fi
+
+	if [ -f $PROG ]; then
+		procd_open_instance
+		procd_set_param command ${PROG}
+		procd_set_param respawn
+		procd_close_instance
+	fi
+}
+
+reload_service() {
+        stop
+        start
+}
+
+service_triggers() {
+	procd_add_reload_trigger ports
+}

ethmngr/files/common/etc/uci-defaults/15-ports-config-generate

@@ -0,0 +1,81 @@
+#!/bin/sh
+
+populate_config_from_db() {
+	. /lib/functions.sh
+	. /lib/network/utils.sh
+	include /lib/ethernet
+
+	portorder="$(db -q get hw.board.ethernetPortOrder)"
+	for port in $portorder; do
+		speed="$(get_max_port_speed $port 2>/dev/null)"
+		speed="${speed:-1000}"
+
+		uci add ports ethport
+		uci rename ports.@ethport[-1]="$(get_port_name $port)"
+		uci set ports.@ethport[-1].enabled=1
+		uci set ports.@ethport[-1].name="$(get_port_name $port)"
+		uci set ports.@ethport[-1].ifname="$port"
+		uci set ports.@ethport[-1].speed="$speed"
+		uci set ports.@ethport[-1].duplex="full"
+		uci set ports.@ethport[-1].autoneg=1
+		uci set ports.@ethport[-1].eee=0
+		if [ "$(db -q get hw.board.ethernetWanPort)" = "$port" ]; then
+			uci set ports.@ethport[-1].pause=1
+			uci set ports.@ethport[-1].uplink=1
+		else
+			uci set ports.@ethport[-1].pause=0
+		fi
+	done
+
+	uci commit ports
+}
+
+populate_config_from_device_tree() {
+	for path in $(find /proc/device-tree/ -name "port@*"); do
+		port="$(cat $path/label)"
+		[ -n "$port" ] || continue
+		[ "$port" = "cpu" ] && continue
+		speed=1000
+		if [ -e "$path/phy-mode" ]; then
+			phymode="$(cat $path/phy-mode)"
+			case "$phymode" in
+				10000*) speed=10000 ;;
+				2500*) speed=2500 ;;
+			esac
+		fi
+		PORT="$(echo $port | tr '[a-z]' '[A-Z]')"
+		uci add ports ethport
+		uci rename ports.@ethport[-1]="$PORT"
+		uci set ports.@ethport[-1].enabled=1
+		uci set ports.@ethport[-1].name="$PORT"
+		uci set ports.@ethport[-1].ifname="$port"
+		uci set ports.@ethport[-1].speed="$speed"
+		uci set ports.@ethport[-1].duplex="full"
+		uci set ports.@ethport[-1].autoneg=1
+		uci set ports.@ethport[-1].eee=0
+		if [ "$port" = "wan" ]; then
+			uci set ports.@ethport[-1].pause=1
+			uci set ports.@ethport[-1].uplink=1
+		else
+			uci set ports.@ethport[-1].pause=0
+		fi
+	done
+	uci commit ports
+}
+
+if [ -s "/etc/config/ports" ]; then
+	if uci -q get ports.@ethport[0] >/dev/null; then
+		# exit if there is any valid content
+		exit 0
+	else
+		rm -f /etc/config/ports
+	fi
+fi
+
+touch /etc/config/ports
+
+if [ -f /sbin/db -a -n "$(db get hw.board.ethernetPortOrder 2>/dev/null)" ]; then
+	populate_config_from_db
+elif [ -d /proc/device-tree/ ]; then
+	populate_config_from_device_tree
+fi

ethmngr/files/etc/init.d/ethmngr

@@ -1,28 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=15
-STOP=90
-
-USE_PROCD=1
-PROG=/usr/sbin/ethmngr
-
-. /lib/functions.sh
-include /lib/ethernet
-
-start_service() {
-	if [ -f $PROG ]; then
-		procd_open_instance
-		procd_set_param command ${PROG}
-		procd_set_param respawn
-		procd_close_instance
-	fi
-}
-
-reload_service() {
-        stop
-        start
-}
-
-service_triggers() {
-	procd_add_reload_trigger network
-}

ethmngr/files/linux/lib/ethernet/linux.sh

@@ -0,0 +1,95 @@
+# arg1: port ifname, ex: eth0
+get_max_port_speed() {
+	if [ -z "$1" ]; then
+		echo 0
+		return
+	fi
+
+	local ifname="$1"
+	local phycap="$(ethtool $ifname | grep -A 10 "Supported link modes" | grep 00 | tail -n 1 | awk '{print$NF}')"
+	local speed=1000
+
+	case "$phycap" in
+		10000*) speed=10000 ;;
+		5000*) speed=5000 ;;
+		2500*) speed=2500 ;;
+		1000*) speed=1000 ;;
+		100*) speed=100 ;;
+		10*) speed=10 ;;
+	esac
+
+	echo $speed
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+power_updown() {
+	local ifname="$1"
+	local enabled=$2
+
+	local updown="up"
+	[ $enabled -eq 0 ] && updown="down"
+	ip link set dev $ifname $updown
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+# arg3: port speed, ex: 1000
+# arg4: port duplex, ex: full
+# arg5: port autoneg, ex: on
+# arg6: port eee, ex: 0
+# arg7: port pause, ex: 0
+set_port_settings() {
+	local ifname="$1"
+	local enabled=$2
+	local speed="$3"
+	local duplex=$4
+	local autoneg=$5
+	local eee=$6
+	local pause=$7
+
+	[ -d /sys/class/net/$ifname ] || return
+
+	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
+	ethtool --change $ifname speed $speed duplex $duplex autoneg $autoneg
+
+	[ $eee -eq 1 ] && eee="on" || eee="off"
+	ethtool --set-eee $ifname eee $eee 2>/dev/null
+
+	case $pause in
+		off|0)
+			pause=0x0
+			auto=off
+			rx=off
+			tx=off
+		;;
+		on|1)
+			pause=0x2
+			auto=off
+			rx=on
+			tx=on
+		;;
+		auto)
+			pause=0x1
+			auto=on
+			rx=on
+			tx=on
+		;;
+		tx)
+			pause=0x3
+			auto=off
+			rx=off
+			tx=on
+		;;
+		rx)
+			pause=0x4
+			auto=off
+			rx=on
+			tx=off
+		;;
+	esac
+
+	ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
+
+	power_updown $ifname $enabled
+}

fscryptctl/Makefile

@@ -1,42 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0-only
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=fscryptctl
-PKG_VERSION:=1.1.0
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/google/fscryptctl.git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/$(PKG_NAME)
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=Encryption
-  TITLE:=Fscryptctl
-endef
-
-define Package/$(PKG_NAME)/description
-	fscryptctl is a low-level tool written in C that handles raw keys and manages policies for Linux filesystem encryption,
-	specifically the "fscrypt" kernel interface which is supported by the ext4, f2fs, and UBIFS filesystems
-endef
-
-define Build/Compile
-	$(MAKE) -C $(PKG_BUILD_DIR) \
-		CC="$(TARGET_CC)" \
-		LDFLAGS="$(TARGET_LDFLAGS)" \
-		fscryptctl
-endef
-
-define Package/$(PKG_NAME)/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/fscryptctl $(1)/usr/bin/fscryptctl
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)))

hostmngr/Config.in

@@ -1,15 +0,0 @@
-if (PACKAGE_hostmngr)
-
-menu "Configuration"
-
-config HOSTMNGR_HOSTS_HISTORY
-	bool "Keep history of hosts"
-	default y
-
-config HOSTMNGR_PLATFORM_HAS_WIFI
-	bool "Platform has WiFi"
-	default y if PACKAGE_libwifi
-
-endmenu
-
-endif

hostmngr/Makefile

@@ -1,76 +0,0 @@
-#
-# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=hostmngr
-PKG_VERSION:=1.1.4
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=edb5bbe57c5bc83035e217c73071c9b3e878dc22
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
-PKG_MIRROR_HASH:=skip
-endif
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/hostmngr
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Show and manage hosts in the network
-  DEPENDS= +libubox +libuci +libubus +ubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +libnfnetlink +libmnl \
-	   +libnetfilter-conntrack \
-	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api
-
-endef
-
-define Package/hostmngr/config
-  source "$(SOURCE)/Config.in"
-endef
-
-define Package/hostmngr/description
- This package provides hostmngr that can detect and show host devices
- present in the network.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
-	-D_GNU_SOURCE
-
-ifeq ($(CONFIG_HOSTMNGR_PLATFORM_HAS_WIFI),y)
-TARGET_CFLAGS += -DHAS_WIFI
-endif
-
-MAKE_PATH:=src
-
-define Package/hostmngr/install
-	$(CP) ./files/* $(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/
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/hostmngr/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-$(eval $(call BuildPackage,hostmngr))

hostmngr/files/etc/config/hosts

@@ -1,9 +0,0 @@
-
-config global 'global'
-	option enabled '1'
-	option history '1'
-	option history_file '/etc/hosts_history.json'
-	option history_timeout '86400'
-
-config interface
-	list ifname 'br-lan'

hostmngr/files/etc/firewall.hosts

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-sh /usr/share/hostmngr/hosts_acl.sh

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

@@ -1,33 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-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"
-#	procd_set_param respawn
-	procd_set_param limits core="unlimited"
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
-	
-	bbfdm_add_service "bbfdm.hosts" "${HOSTS_JSON_INPUT}"
-	sh /usr/share/hostmngr/hosts_acl.sh
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "hosts"
-}
-
-reload_service() {
-	stop
-	start
-}

hostmngr/files/etc/uci-defaults/993-topology-hosts-to-hostmngr-hosts-config

@@ -1,23 +0,0 @@
-#!/bin/sh
-
-uci -q get hosts.global.ageing_timer || exit 0
-
-
-# Old hosts UCI config is detected; Convert to new format
-
-ageing_timer="$(uci -q get hosts.global.ageing_timer)"
-history_timeout=$((ageing_timer*60))
-
-uci -q set hosts.global.enabled=1
-uci -q delete hosts.global.ageing_timer
-uci -q set hosts.global.history_timeout="$history_timeout"
-uci -q rename hosts.global.reboot_persistent=history
-uci -q set hosts.global.history_file="/etc/hosts_history.json"
-
-uci -q add hosts interface
-for ifname in $(uci -q get hosts.global.ifname); do
-	uci -q add_list hosts.@interface[-1].ifname="$ifname"
-done
-
-uci -q delete hosts.global.ifname
-exit 0

hostmngr/files/scripts/hosts_acl.sh

@@ -1,233 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-day=""
-next_days=""
-prev_days=""
-IP_RULE=""
-IP_RULE1=""
-
-get_next_day() {
-	local weekday="$1"
-	case "$weekday" in
-		"Mon"|"Monday") echo "Tuesday"
-		;;
-		"Tue"|"Tuesday") echo "Wednesday"
-		;;
-		"Wed"|"Wednesday") echo "Thursday"
-		;;
-		"Thu"|"Thursday") echo "Friday"
-		;;
-		"Fri"|"Friday") echo "Saturday"
-		;;
-		"Sat"|"Saturday") echo "Sunday"
-		;;
-		"Sun"|"Sunday") echo "Monday"
-		;;
-	esac
-}
-
-get_previous_day() {
-	local weekday="$1"
-	case "$weekday" in
-		"Mon"|"Monday") echo "Sunday"
-		;;
-		"Tue"|"Tuesday") echo "Monday"
-		;;
-		"Wed"|"Wednesday") echo "Tuesday"
-		;;
-		"Thu"|"Thursday") echo "Wednesday"
-		;;
-		"Fri"|"Friday") echo "Thursday"
-		;;
-		"Sat"|"Saturday") echo "Friday"
-		;;
-		"Sun"|"Sunday") echo "Saturday"
-		;;
-	esac
-}
-
-ip_rule_west_zone() {
-	local utc_start_t_h="$1"
-	local utc_stop_t_h="$2"
-	local local_start_t_h="$3"
-	local local_stop_t_h="$4"
-	local utc_start_time="$5"
-	local utc_stop_time="$6"
-
-	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
-		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		if [ -n "$next_days" ]; then
-			IP_RULE="$IP_RULE --weekdays $next_days"
-		fi
-	else
-		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
-			IP_RULE1="$IP_RULE"
-			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop 23:59"
-			IP_RULE1="$IP_RULE1 -m time --timestart 00:00 --timestop $utc_stop_time"
-			if [ -n "$next_days" ]; then
-				IP_RULE1="$IP_RULE1 --weekdays $next_days"
-			fi
-		else
-			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		fi
-		if [ -n "$day" ]; then
-			IP_RULE="$IP_RULE --weekdays $day"
-		fi
-	fi
-}
-
-ip_rule_east_zone() {
-	local utc_start_t_h="$1"
-	local utc_stop_t_h="$2"
-	local local_start_t_h="$3"
-	local local_stop_t_h="$4"
-	local utc_start_time="$5"
-	local utc_stop_time="$6"
-
-	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
-		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		if [ -n "$day" ]; then
-			IP_RULE="$IP_RULE --weekdays $day"
-		fi
-	else
-		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
-			IP_RULE1="$IP_RULE"
-			IP_RULE="$IP_RULE -m time --timestart 00:00 --timestop $utc_stop_time"
-			IP_RULE1="$IP_RULE1 -m time --timestart $utc_start_time --timestop 23:59"
-			if [ -n "$prev_days" ]; then
-				IP_RULE1="$IP_RULE1 --weekdays $prev_days"
-			fi
-		else
-			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
-		fi
-		if [ -n "$day" ]; then
-			IP_RULE="$IP_RULE --weekdays $day"
-		fi
-	fi
-}
-
-process_ac_schedule() {
-	local acs_id="$1"
-	local is_enabled
-	local access_control
-	local start_time=""
-	local mac=""
-
-
-	handle_day_list() {
-		local value=$1
-
-		val=$(echo $value | cut -c 1-3)
-		next_day_val=$(get_next_day $val)
-		prev_day_val=$(get_previous_day $val)
-		if [ -z $day ]; then
-			day="$val"
-			next_days="$next_day_val"
-			prev_days="$prev_day_val"
-		else
-			day="$day,$val"
-			next_days="$next_days,$next_day_val"
-			prev_days="$prev_days,$prev_day_val"
-		fi
-	}
-
-	config_list_foreach "$acs_id" "day" handle_day_list
-	config_get is_enabled "$acs_id" "enable" 1
-	config_get access_control "$acs_id" "dm_parent"
-
-	if [ "$is_enabled" == "0" ] || [ -z "$access_control" ]; then
-		return
-	fi
-
-	IP_RULE=""
-	IP_RULE1=""
-
-	config_get is_enabled "$access_control" "enable" 1
-	if [ "$is_enabled" == "0" ]; then
-		return
-	fi
-
-	mac=$(uci -q get hosts.$access_control.macaddr)
-	access_policy=$(uci -q get hosts.$access_control.access_policy)
-
-	config_get start_time "$acs_id" "start_time"
-	config_get duration "$acs_id" "duration"
-
-	if [ -z "$mac" ] && [ -z "$start_time" ] && [ -z "$duration" ] && [ -z "$day" ] && [ -z "$access_policy" ]; then
-		return
-	fi
-	if [ -n "$mac" ]; then
-		IP_RULE="$IP_RULE -m mac --mac-source $mac"
-	fi
-
-	zone=$(date +%z | cut -c 1)
-	local_start_time=$start_time
-        if [ -n "$duration" ]; then
-		hh=$(echo $local_start_time | awk -F: '{ print $1 }')
-                mm=$(echo $local_start_time | awk -F: '{ print $2 }')
-                hh_s=`expr $hh \* 3600`
-                mm_s=`expr $mm \* 60`
-                ss=$(( hh_s + mm_s ))
-		local_start_hh=$hh
-
-                stop_ss=$(( ss + duration ))
-                hh=$(( stop_ss / 3600 ))
-               	rem_ss=$(( stop_ss % 3600 ))
-               	mm=$(( rem_ss / 60 ))
-               	ss=$(( rem_ss % 60 ))
-		local_stop_time="$hh:$mm:$ss"
-		local_stop_hh=$hh
-	fi
-
-	utc_start_time=$(date -u -d @$(date "+%s" -d "$local_start_time") +%H:%M)
-	utc_stop_time=$(date -u -d @$(date "+%s" -d "$local_stop_time") +%H:%M)
-	utc_start_hh=$(echo $utc_start_time | awk -F: '{ print $1 }')
-	utc_stop_hh=$(echo $utc_stop_time | awk -F: '{ print $1 }')
-	if [ "$zone" == "-" ]; then
-		ip_rule_west_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
-	else
-		ip_rule_east_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
-	fi
-
-	if [ "$access_policy" == "Deny" ]; then
-		IP_RULE="$IP_RULE -j DROP"
-		if [ -n "$IP_RULE1" ]; then
-			IP_RULE1="$IP_RULE1 -j DROP"
-		fi
-	else
-		IP_RULE="$IP_RULE -j ACCEPT"
-		if [ -n "$IP_RULE1" ]; then
-			IP_RULE1="$IP_RULE1 -j ACCEPT"
-		fi
-	fi
-
-	iptables -w -A hosts_forward ${IP_RULE}
-	ip6tables -w -A hosts_forward ${IP_RULE}
-	if [ -n "$IP_RULE1" ]; then
-		iptables -w -A hosts_forward ${IP_RULE1}
-		ip6tables -w -A hosts_forward ${IP_RULE1}
-	fi
-
-	day=""
-	next_days=""
-	prev_days=""
-}
-
-iptables -w -F hosts_forward
-ip6tables -w -F hosts_forward
-
-hosts_forward=$(iptables -t filter --list | grep hosts_forward)
-if [ -z "$hosts_forward" ]; then
-	iptables -w -t filter -N hosts_forward
-	ret=$?
-	[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
-	ip6tables -w -t filter -N hosts_forward
-	ret=$?
-	[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
-fi
-
-# Load /etc/config/hosts UCI file
-config_load hosts
-config_foreach process_ac_schedule ac_schedule

icwmp/Makefile

@@ -8,23 +8,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.27
+PKG_VERSION:=9.5.1
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=ce1f7e01f0f5e7cc3a5dfeb5378d488f3e2938a0
+PKG_SOURCE_VERSION:=8167cfa5a0ce77f467ad173e44d0012a6cb9b3e3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
-include ../bbfdm/bbfdm.mk
 
 define Package/icwmp/default
   SECTION:=utils
@@ -81,9 +79,10 @@ ifeq ($(BUILD_VARIANT),mbedtls)
 CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif
 
-ifeq ($(LOCAL_DEV),1)
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
 define Build/Prepare
-	$(CP) -rf ~/git/icwmp/* $(PKG_BUILD_DIR)/
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -94,19 +93,21 @@ define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libcwmpdm.so $(1)/usr/lib/bbfdm/libcwmpdm.so
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-set-random-inform-time $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
+	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
-	$(call BbfdmInstallPlugin,$(1),./files/etc/bbfdm/json/CWMPManagementServer.json)
-	$(call BbfdmInstallPlugin,$(1),$(PKG_BUILD_DIR)/libcwmpdm.so)
 endef
 
 Package/icwmp/install = $(Package/icwmp/default/install)

icwmp/files/etc/config/cwmp

@@ -11,7 +11,6 @@ config acs 'acs'
 	option retry_min_wait_interval '5'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
-	option skip_dhcp_boot_options '0'
 
 config cpe 'cpe'
 	option enable '1'
@@ -21,7 +20,7 @@ config cpe 'cpe'
 	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
-	option log_severity 'ERROR'
+	option log_severity 'INFO'
 	option log_file_name '/var/log/icwmpd.log'
 	option log_max_size '102400'
 	option userid '' #$OUI-$SER
@@ -38,8 +37,6 @@ config cpe 'cpe'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
 	option active_notif_throttle '0'
-	option disable_gatewayinfo '0'
-	option fw_upgrade_keep_settings '1'
 	
 config lwn 'lwn'
 	option enable '0'

icwmp/files/etc/icwmpd/update.sh

@@ -0,0 +1,34 @@
+#!/bin/sh
+. /lib/functions.sh
+
+log() {
+	echo "$@" |logger -t cwmp.update -p info
+}
+
+handle_icwmp_update() {
+	local cwmp_enable
+	config_load cwmp
+
+	config_get_bool cwmp_enable cpe enable 1
+	if [ "$cwmp_enable" = "0" ]; then
+		return 0
+	fi
+
+	# wait for some time to avoid interface fluctuation
+	sleep 10
+	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
+
+	if [ "$ret" = "true" ]; then
+		# read status from var/state/icwmp
+		status=$(uci -q -c /var/state get icwmp.sess_status.current_status)
+		if [ "$status" != "running" ]; then
+			log "Trigger out of bound inform, since last inform status was failure"
+			ubus -t 10 call tr069 inform >/dev/null 2>&1
+		fi
+	else
+		log "Restarting icwmp tr069 object"
+		/etc/init.d/icwmpd restart
+	fi
+}
+
+handle_icwmp_update "$@"

icwmp/files/etc/init.d/icwmpd

@@ -407,7 +407,6 @@ validate_acs_section()
 		'periodic_inform_time:string' \
 		'url:string' \
 		'dhcp_discovery:string' \
-		'skip_dhcp_boot_options:bool:0' \
 		'dhcp_url:string' \
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
@@ -437,8 +436,7 @@ validate_cpe_section()
 		'exec_download:bool' \
 		'periodic_notify_enable:bool' \
 		'enable:bool' \
-		'periodic_notify_interval:uinteger' \
-		'fw_upgrade_keep_settings:bool'
+		'periodic_notify_interval:uinteger'
 }
 
 validate_defaults() {
@@ -469,32 +467,33 @@ validate_defaults() {
 }
 
 boot() {
-	local dhcp_discovery wan_interface skip_dhcp_boot_options disable_gatewayinfo
+	local enable_cwmp="0"
+	local dhcp_discovery="0"
 
 	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+	local wan_interface=""
+	
 	config_get wan_interface cpe default_wan_interface "wan"
-	config_get disable_gatewayinfo cpe disable_gatewayinfo "0"
+	
+	if [ "$enable_cwmp" = "0" ]; then
+		return 0
+	fi
 
 	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get skip_dhcp_boot_options acs skip_dhcp_boot_options "0"
 
 	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
-		if [ "${skip_dhcp_boot_options}" -ne 1 ]; then
-			# Set dhcp option 43 if not already configured
-			enable_dhcp_option43 "${wan_interface}"
-			# Set dhcp option 60
-			set_vendor_id "${wan_interface}"
-		fi
+		# Set dhcp option 43 if not already configured
+		enable_dhcp_option43 "${wan_interface}"
+		# Set dhcp option 60
+		set_vendor_id "${wan_interface}"
 	fi
 
 	config_get lan_interface cpe default_lan_interface ""
 	if [ -n "${lan_interface}" ]; then
-		if [ "${disable_gatewayinfo}" -ne 1 ]; then
-			# Set dhcp_option 125 if not already configured
-			enable_dhcp_option125 "${wan_interface}"
-			enable_dnsmasq_option125 "${lan_interface}"
-		fi
+		# Set dhcp_option 125 if not already configured
+		enable_dhcp_option125 "${wan_interface}"
+		enable_dnsmasq_option125 "${lan_interface}"
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -512,31 +511,27 @@ boot() {
 }
 
 start_service() {
-	local enable_cwmp url dhcp_url
+	local enable_cwmp
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
-	config_get url acs url ""
-	config_get dhcp_url acs dhcp_url ""
-
-	procd_open_instance icwmp
 
 	if [ "$enable_cwmp" = "0" ]; then
-		procd_close_instance
 		return 0
 	fi
 
+	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
+	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
+	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
+
 	validate_defaults || {
 		log "Validation of defaults failed"
-		procd_close_instance
 		return 1;
 	}
 
-	if [ -n "${url}" ] || [ -n "${dhcp_url}" ]; then
-		procd_set_param command "$PROG"
-		procd_append_param command -b
-	fi
-
+	procd_open_instance icwmp
+	procd_set_param command "$PROG"
+	procd_append_param command -b
 	procd_set_param respawn \
 		"${respawn_threshold:-5}" \
 		"${respawn_timeout:-10}" "${respawn_retry:-3}"
@@ -556,7 +551,6 @@ reload_service() {
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
 
-	log "Reload service $ret"
 	ret="0"
 	if [ "$enable_cwmp" = "0" ]; then
 		stop
@@ -564,15 +558,38 @@ reload_service() {
 		return 0
 	fi
 
-	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
-	if [ "$ret" != "true" ]; then
-		log "Reloading cwmp service ..."
+	tr069_status="$(ubus -t 1 call tr069 status)"
+	ret="$?"
+	if [ "$ret" = "7" ]; then
+		# ubus timed out may be due to uloop is busy in some task so returning
+		return 0
+	fi
+
+	status="$(echo "${tr069_status}" | jsonfilter -qe '@.cwmp.status')"
+	ret="$?"
+	if [ "$status" = "up" ]; then
+		ubus -t 1 call tr069 command '{"command":"reload"}'
+		ret="$?"
+	fi
+
+	if [ "$status" = "init" ] || [ "$ret" -ne "0" ]; then
+		log "Restarting CWMP client"
 		stop
 		start
 	fi
 }
 
-service_triggers() {
-       procd_add_reload_trigger "cwmp"
+add_interface_trigger() {
+        procd_add_interface_trigger "interface.update" "$1" /etc/icwmpd/update.sh
+}
+
+service_triggers() {
+       local wan_interface
+
+       config_load cwmp
+       config_get wan_interface cpe default_wan_interface "wan"
+
+       procd_add_reload_trigger "cwmp"
+       add_interface_trigger ${default_wan_interface}
 }
 

icwmp/files/etc/uci-defaults/95-set-random-inform-time

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_inform_time()
-{
-	local sec inform_time value
-
-	config_load cwmp
-	config_get inform_time acs periodic_inform_time '0001-01-01T00:00:00Z'
-
-	if [ "${inform_time}" == "0001-01-01T00:00:00Z" ]; then
-		sec=$(date +%s)
-		value="$(date -d @$(($sec-$RANDOM)) +%Y-%m-%dT%H:%M:%SZ)"
-
-		uci_set cwmp acs periodic_inform_time "$value"
-	fi
-}
-
-set_inform_time

ieee1905/Config.in

@@ -20,6 +20,7 @@ config IEEE1905_WIFI_EASYMESH
 
 config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
 	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
+	default y
 
 endmenu
 

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.3.4
+PKG_VERSION:=8.1.15
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=526690993c93720ee1707bba6b7a08e8c28f2dd9
+PKG_SOURCE_VERSION:=a6d1c5c3e6a23129ce260613cadfaad3b2b31cc8
 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
@@ -123,6 +123,7 @@ define Build/InstallDev/libieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/cmdu_ackq.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/timer_impl.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_extension.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/

ieee1905/files/etc/config/ieee1905

@@ -2,17 +2,13 @@ config ieee1905 'ieee1905'
 	option enabled '1'
 	option extension '1'
 	list extmodule 'map'
-	list extmodule 'topology'
 	option registrar '2 5 6'
-	list exclude_tagging '/eth.*'
 #	option macaddress '0a:1b:2c:3d:4e:50'
 
 config al-iface
 	option enabled '1'
-	list ifname 'br-lan'
-	list ifname '/eth.*'
-	list ifname '/wl.*'
-	list ifname '/wds.*'
+	option ifname 'br-lan'
+	option type 'bridge'
 
 # ap sections are auto-generated/overwritten during onboarding
 #

ieee1905/files/etc/init.d/ieee1905

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=60
+START=96
 STOP=21
 
 USE_PROCD=1

iop/config

@@ -11,19 +11,10 @@ CONFIG_DEVEL=y
 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
@@ -71,14 +62,15 @@ CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
-CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
 CONFIG_PACKAGE_topology-plugin=y
 CONFIG_PACKAGE_decollector=y
 CONFIG_PACKAGE_map-agent=y
 CONFIG_PACKAGE_map-controller=y
+CONFIG_PACKAGE_map-topology=y
+
+CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
 
 # Network #
-CONFIG_PACKAGE_hostmngr=y
 CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_urlfilter=y
 
@@ -102,8 +94,6 @@ 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
@@ -180,6 +170,7 @@ CONFIG_PACKAGE_iptables-mod-ipopt=y
 CONFIG_PACKAGE_iptables-mod-nflog=y
 CONFIG_PACKAGE_iptables-mod-nfqueue=y
 CONFIG_PACKAGE_ndisc6=y
+CONFIG_PACKAGE_nping=y
 CONFIG_PACKAGE_rdisc6=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_socat=y
@@ -195,7 +186,6 @@ 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
@@ -253,6 +243,7 @@ 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_DEVMEM is not set
 CONFIG_BUSYBOX_CONFIG_FEATURE_UDHCP_8021Q=y
 CONFIG_BUSYBOX_CONFIG_FIRST_SYSTEM_ID=100
 # CONFIG_BUSYBOX_CONFIG_HTTPD is not set
@@ -329,4 +320,3 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
-CONFIG_BUSYBOX_CONFIG_FEATURE_DEFAULT_PASSWD_ALGO="sha512"

iop/scripts/feeds_update.sh

@@ -4,18 +4,7 @@ function feeds_update {
 	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
+	while getopts "inh" opt; do
 		case $opt in
 		i)
 			heads=0
@@ -23,16 +12,12 @@ function feeds_update {
 		n)
 			override=0
 			;;
-		F)
-			force=0
-			;;
 		h|\?)
-			echo "Usage: ./iop feeds_update [-i] [-n] [-F] [-h]"
+			echo "Usage: ./iop feeds_update [-i] [-n] [-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
 			;;
@@ -45,9 +30,9 @@ function feeds_update {
 
 	if [ $heads == 1 ]; then
 		if [ $developer == 1 ]; then
-			./scripts/feeds update -g || update_failure
+			./scripts/feeds update -g
 		else
-			./scripts/feeds update || update_failure
+			./scripts/feeds update
 		fi
 	fi
 	./scripts/feeds update -ai || exit 1
@@ -55,7 +40,6 @@ function feeds_update {
 	# 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
 
 	(

iop/scripts/genconfig.sh

@@ -2,7 +2,6 @@
 
 function genconfig {
 	export CLEAN=0
-	export DIRTY="--dirty"
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
@@ -17,7 +16,7 @@ function genconfig {
 	brcmbca_feed="target/linux/feeds/brcmbca"
 	airoha_feed="target/linux/feeds/airoha"
 	x86_feed="target/linux/feeds/x86"
-	armsr_feed="target/linux/feeds/armsr"
+	armvirt_feed="target/linux/feeds/armvirt"
 	mediatek_feed="target/linux/feeds/mediatek"
 	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
 	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
@@ -109,8 +108,8 @@ function 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 $armvirt_feed/genconfig ] &&
+			armvirt=$(cd $armvirt_feed; ./genconfig)
 		[ -e $mediatek_feed/genconfig ] &&
 			mediatek=$(cd $mediatek_feed; ./genconfig)
 		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
@@ -119,7 +118,7 @@ function genconfig {
 			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armsr mediatek ipq95xx ipq53xx; do
+			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
 				a=$(echo "${!list}" | sort)
 				for b in $a; do
@@ -145,10 +144,10 @@ function genconfig {
 		fi
 	    done
 
-	    for p in $armsr; do
+	    for p in $armvirt; do
 		if [ $p == $profile ]; then
-		    target="armsr"
-			target_config_path="$armsr_feed/config"
+		    target="armvirt"
+			target_config_path="$armvirt_feed/config"
 		    return
 		fi
 	    done
@@ -199,7 +198,6 @@ function genconfig {
 		echo 1>&2 "Usage: $0 [ 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"
@@ -418,7 +416,7 @@ function genconfig {
 
 		# Set target version
 		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+		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
@@ -485,7 +483,6 @@ function genconfig {
 			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;;

iop/scripts/genconfig_min.sh

@@ -2,7 +2,6 @@
 
 function genconfig_min {
 	export CLEAN=0
-	export DIRTY="--dirty"
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
 	CURRENT_CONFIG_FILE=".current_config_file"
@@ -16,7 +15,7 @@ function genconfig_min {
 	brcmbca_feed="target/linux/feeds/brcmbca"
 	airoha_feed="target/linux/feeds/airoha"
 	x86_feed="target/linux/feeds/x86"
-	armsr_feed="target/linux/feeds/armsr"
+	armvirt_feed="target/linux/feeds/armvirt"
 	mediatek_feed="target/linux/feeds/mediatek"
 	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
 	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
@@ -108,8 +107,8 @@ function genconfig_min {
 			airoha=$(cd $airoha_feed; ./genconfig)
 		[ -e $x86_feed/genconfig ] &&
 			x86=$(cd $x86_feed; ./genconfig)
-		[ -e $armsr_feed/genconfig ] &&
-			armsr=$(cd $armsr_feed; ./genconfig)
+		[ -e $armvirt_feed/genconfig ] &&
+			armvirt=$(cd $armvirt_feed; ./genconfig)
 		[ -e $mediatek_feed/genconfig ] &&
 			mediatek=$(cd $mediatek_feed; ./genconfig)
 		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
@@ -118,7 +117,7 @@ function genconfig_min {
 			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armsr mediatek ipq95xx ipq53xx; do
+			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
 				a=$(echo "${!list}" | sort)
 				for b in $a; do
@@ -144,10 +143,10 @@ function genconfig_min {
 		fi
 	    done
 
-	    for p in $armsr; do
+	    for p in $armvirt; do
 		if [ $p == $profile ]; then
-		    target="armsr"
-			target_config_path="$armsr_feed/config"
+		    target="armvirt"
+			target_config_path="$armvirt_feed/config"
 		    return
 		fi
 	    done
@@ -198,7 +197,6 @@ function genconfig_min {
 		echo 1>&2 "Usage: $0 [ 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"
@@ -392,7 +390,7 @@ function genconfig_min {
 
 		# Set target version
 		local git_version
-		if ! git_version="$(git describe --always $DIRTY --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+		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
@@ -453,7 +451,6 @@ function genconfig_min {
 			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;;

iop/scripts/generate_tarballs.sh

@@ -0,0 +1,108 @@
+#!/bin/bash
+# shellcheck disable=SC2029
+
+build_bcmkernel_consumer() {
+	local tarfile bcmkernelcommith sdkversion serverpath serverlink
+
+	sdkversion="$(grep "CONFIG_BRCM_SDK_VER.*=y" .config | awk -F'[_,=]' '{print$5}')"
+	sdkversion="${sdkversion:0:4}${sdkversion:(-1)}"
+	bcmkernelcommith="$(grep -w "PKG_SOURCE_VERSION:" "$curdir/feeds/broadcom/bcmkernel/${sdkversion:0:5}"*".mk" | cut -d'=' -f2)"
+
+	[ -n "$board" ] && [ -n "$bcmkernelcommith" ] || return
+
+	serverpath="$FPATH/bcmopen-$board-$bcmkernelcommith.tar.gz"
+	serverlink="$FPATH/bcmopen-$board-$majver.$minver-latest"
+
+	# do not build bcmopen sdk if it was already built before
+	# if it was, check if there's a symlink in place and create it if missing
+	ssh "$SERVER" "test -f '$serverpath' && { test -L '$serverlink' || ln -sf '$serverpath' '$serverlink'; }" && return
+
+	cd "./build_dir/target-"*"/bcmkernel-"*"-${sdkversion:0:4}"*"/bcm963xx/release"
+	bash do_consumer_release -p "$profile" -y -F
+
+	tarfile='out/bcm963xx_*_consumer.tar.gz'
+	[ $(ls -1 $tarfile | wc -l) -ne 1 ] && echo "Too many tar files: '$tarfile'" && return
+
+	scp -pv $tarfile "$SERVER":"$serverpath"
+	ssh "$SERVER" "test -f '$serverpath' && ln -sf '$serverpath' '$serverlink'"
+	rm -f $tarfile
+
+	cd "$curdir"
+}
+
+build_endptmngr_consumer() {
+	# create endptmngr open version tar file
+	local endptversion endptcommith
+	grep -q "CONFIG_TARGET_NO_VOICE=y" .config && return
+	endptversion=$(grep -w "PKG_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
+	endptcommith=$(grep -w "PKG_SOURCE_VERSION:" ./feeds/iopsys/endptmngr/Makefile | cut -d'=' -f2)
+	[ -n "$profile" ] && [ -n "$endptversion" ] && [ -n "$endptcommith" ] || return
+	ssh $SERVER "test -f $FPATH/endptmngr-$profile-$endptversion-$endptcommith.tar.gz" && return
+	cd ./build_dir/target-*/endptmngr-$endptversion/
+	mkdir endptmngr-open-$endptversion
+	mkdir endptmngr-open-$endptversion/src
+	cp ./src/endptmngr endptmngr-open-$endptversion/src
+	cp -r ./files/ endptmngr-open-$endptversion/
+	tar -czv  endptmngr-open-$endptversion/ -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
+	scp -pv endptmngr-$profile-$endptversion-$endptcommith.tar.gz $SERVER:$FPATH/
+	cp endptmngr-$profile-$endptversion-$endptcommith.tar.gz $curdir/
+	rm -rf endptmngr-open-$endptversion
+	rm -f endptmngr-$profile-$endptversion-$endptcommith.tar.gz
+	cd "$curdir"
+}
+
+function print_usage {
+	echo "Usage: $0 generate_tarballs"
+	echo "  -t <target>"
+}
+
+function generate_tarballs {
+
+    SERVER="god@download.iopsys.eu"
+    FPATH="/var/www/html/iopsys/opensdk"
+
+    set -e
+    git remote -v | grep -q http && return # do not continue if this is an open SDK environment
+
+    board=$(grep CONFIG_TARGET_FAMILY .config | cut -d'=' -f2 | tr -d '"')
+    profile=$(grep CONFIG_BCM_KERNEL_PROFILE .config | cut -d'=' -f2 | tr -d '"')
+    majver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f1 -d .)
+    minver=$(grep CONFIG_TARGET_VERSION .config | cut -d'=' -f2 | tr -d '"' | cut -f2 -d .)
+    curdir="$PWD"
+
+
+	# Execute user command
+	while getopts "t:h" opt; do
+		case $opt in
+			t)
+				stk_target=${OPTARG}
+				;;
+			h)
+				print_usage
+				exit 1
+				;;
+			\?)
+				print_usage
+				exit 1
+				;;
+		esac
+	done
+
+	if [ -z "$stk_target" ]; then
+		print_usage
+		exit 1
+	fi
+
+	if [ "$stk_target" == "broadcom" ]; then
+		build_bcmkernel_consumer
+		build_endptmngr_consumer
+	else
+		echo "Invalid target: $stk_target"
+		print_usage
+		exit 1
+	fi
+
+}
+
+register_command "generate_tarballs" "Generate tarballs for Open SDK"
+

libdpp/Makefile

@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2020-2023 Iopsys
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libdpp
-PKG_VERSION:=2.0.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f22959b107a8bf443d04d6261d00074b5514dfe8
-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
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_LICENSE:=LGPL-2.1-only
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-
-define Package/libdpp/description
-  Library providing APIs for DPP EasyConnect frame generation and handling
-endef
-
-define Package/libdpp
-  TITLE:= DPP EasyConnect library (libdpp)
-  DEPENDS:= +libeasy +libopenssl +libgcrypt +libubox +libwifiutils
-endef
-
-MAKE_PATH:=lib
-
-
-define Build/InstallDev/libdpp
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/dpp_api.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/dpputils.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/lib/libdpp.so* $(1)/usr/lib/
-endef
-
-
-define Build/InstallDev
-	$(call Build/InstallDev/libdpp,$(1),$(2))
-endef
-
-define Package/libdpp/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/lib/libdpp.so* $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libdpp))

libdsl/Makefile

@@ -24,9 +24,8 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_x86),y)

libeasy/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libeasy
-PKG_VERSION:=7.4.2
+PKG_VERSION:=7.2.100
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=11eb263666556c419220e2a50c3a67422e79f884
+PKG_SOURCE_VERSION:=32db1b79bd88eba85a3e7518dbbbd1e29f4b06d9
 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
@@ -50,9 +50,6 @@ define Build/InstallDev/libeasy
 	$(CP) $(PKG_BUILD_DIR)/easy.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/event.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/bufutil.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/cryptutil.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/ecc_cryptutil.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/if_utils.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/debug.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/hlist.h $(1)/usr/include/easy/

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.107
+PKG_VERSION:=7.2.104
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9c0e9ecd62b79d4e89b4f013f04124870d237395
+PKG_SOURCE_VERSION:=d777636ca43302a95e571ab030ec44ef50905570
 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
@@ -24,9 +24,8 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include

libqos/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libqos
-PKG_VERSION:=7.2.106
+PKG_VERSION:=7.2.101
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=02dba6571fddd9b4c5b4b671270604b4c0faf9ae
+PKG_SOURCE_VERSION:=93ca0a66d6f82bca208bbe52b75ed582b20aa094
 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
@@ -24,9 +24,8 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_x86),y)
@@ -38,11 +37,14 @@ else ifeq ($(CONFIG_TARGET_armvirt),y)
 else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_PLATFORM=ECONET
   TARGET_CFLAGS +=-DIOPSYS_ECONET
+else ifeq ($(CONFIG_TARGET_ipq95xx),y)
+  TARGET_PLATFORM=IPQ95XX
+  TARGET_CFLAGS +=-DIPQ95XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
-  TARGET_PLATFORM=MEDIATEK
-  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
+  TARGET_PLATFORM=LINUX
+  TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
-  $(info Using default LINUX)
+  $(info Unexpected CONFIG_TARGET, use default LINUX)
   TARGET_PLATFORM=LINUX
   TARGET_CFLAGS +=-DIOPSYS_LINUX
 endif

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.10
+PKG_VERSION:=1.0.5
 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:=e6ba6fca814f6c83a3d6ff4a5b7560fbc36d3101
+PKG_SOURCE_VERSION:=3f4cdca981b30d54ec5a426775fdcec2a63f83d9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-airoha/files/lib/voice/codecs.json

@@ -2,7 +2,7 @@
 	"ulaw": {
 		"name": "G.711MuLaw",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 64
@@ -10,7 +10,7 @@
 	"alaw": {
 		"name": "G.711ALaw",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 64
@@ -18,16 +18,15 @@
 	"g726": {
 		"name": "G.726",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
-		"bitrate": 16,
-		"rtp_payload": 80
+		"bitrate": 16
 	},
 	"g723": {
 		"name": "G.723.1",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 30,
 		"ptime_increment": 30,
 		"bitrate": 5.3
@@ -35,18 +34,26 @@
 	"g729": {
 		"name": "G.729",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 8
 	},
-	"g722": {
-		"name": "G.722",
+	"ilbc": {
+		"name": "iLBC",
 		"ptime_min": 10,
-		"ptime_max": 60,
+		"ptime_max": 30,
 		"ptime_default": 20,
-		"ptime_increment": 10,
-		"bitrate": 64
+		"ptime_increment": 30,
+		"bitrate": 15.2
+	},
+	"gsm": {
+		"name": "AMR",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 20,
+		"bitrate": 12.2
 	}
 }
 

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.1
 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:=e1de60c2c05935fb2f4adfc1f73feba0bb32ade6
+PKG_SOURCE_VERSION:=548f8fccc9f8f0b5dd6bb39bdd9cac8659400cb6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,7 @@ PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
 
 LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
 
-export BCM_CHIP_ID:=$(SUBTARGET)
+export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk
 

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.0.6
 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:=e6d689334000bc57498d9a3f203a8933160e1ef4
+PKG_SOURCE_VERSION:=062a265754b93a865cfcd2745f200aa09fb4a668
 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.16
+PKG_VERSION:=7.2.110
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dfafd5f7ea387d6119a9eb692e435f98b16f75a3
+PKG_SOURCE_VERSION:=433fb28e80e867180bd0335334544dbb652ea331
 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
@@ -26,9 +26,8 @@ include $(INCLUDE_DIR)/package.mk
 ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
   TARGET_WIFI_TYPE=BROADCOM
-  CONFIG_ID=$(SUBTARGET:bcm%=BCM%)
-  CHIP_ID=$(CONFIG_ID:BCM9%=%)
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_$(CONFIG_ID) \
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_x86),y)
@@ -47,13 +46,9 @@ else ifeq ($(CONFIG_TARGET_ipq95xx),y)
   TARGET_PLATFORM=IPQ95XX
   TARGET_WIFI_TYPE=QUALCOMM MAC80211
   TARGET_CFLAGS +=-DIPQ95XX
-else ifeq ($(CONFIG_TARGET_ipq53xx),y)
-  TARGET_PLATFORM=IPQ53XX
-  TARGET_WIFI_TYPE=QUALCOMM MAC80211
-  TARGET_CFLAGS +=-DIPQ53XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
   TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MAC80211
+  TARGET_WIFI_TYPE=MEDIATEK MAC80211
   TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
@@ -62,12 +57,6 @@ else
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
-ifneq ($(CONFIG_PACKAGE_kmod-mt7915e),)
-  TARGET_CFLAGS=-DMT7915_VENDOR_EXT
-endif
-
-PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e:mt76
-
 ifneq ($(CONFIG_PACKAGE_libwifi),)
 TARGET_CFLAGS +=-DHAS_WIFI
 endif

map-agent/Config.in

@@ -22,14 +22,14 @@ config AGENT_EASYMESH_VENDOR_EXT
 	default y
 
 config AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	hex "Vendor OUI default"
-	default 0xB456FA
+	string
+	default "\\\\x11\\\\x22\\\\x33"
 
 config AGENT_EASYMESH_VENDOR_EXT_OUI
-	hex "Vendor OUI in 0xAABBCC format"
+	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
 	default AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	help
-	Extra features not covered by the base EasyMesh specification can be
+	Extra features not covered by the base Easymesh specification can be
 	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 
@@ -45,15 +45,5 @@ config AGENT_LOCAL_ACS_SERVICE
 config AGENT_STRICT_OPER_CHANNEL_REPORT
 	bool "Report operation channel strictly, skip some unsolicited reports"
 
-config AGENT_WIRELESS_EXPLICIT_RELOAD
-	bool "Reload wireless after UCI commit"
-
-config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
-	bool "Use config opt to determine if Oper Channel Report CMDU is send as relayed multicast or directly to controller"
-	default y
-
-config AGENT_USE_LIBDPP
-	bool "Depend on libdpp for DPP EasyConnect"
-
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.5.0.10
+PKG_VERSION:=4.3.4.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a03ea6bee6856000496d858f3b4c8d161612472d
+PKG_SOURCE_VERSION:=0fed22f5ed1ff6a2a6833d4ef32f147e8f65b7fc
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:multi-ap/map-agent.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-agent
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,12 +28,9 @@ define Package/map-agent
   CATEGORY:=Utilities
   TITLE:=WiFi multi-AP Agent (EasyMesh R2)
   DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	   +map-plugin +ip-bridge +AGENT_USE_LIBDPP:libdpp
+	  +map-plugin +ip-bridge
 endef
 
-ifeq ($(CONFIG_AGENT_USE_LIBDPP),y)
-  TARGET_CFLAGS += -DUSE_LIBDPP
-endif
 
 define Package/dynbhd
   SECTION:=utils
@@ -77,7 +74,7 @@ TARGET_CFLAGS += -DEASYMESH_R2_CERT
 endif
 
 ifeq ($(CONFIG_AGENT_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_AGENT_EASYMESH_VENDOR_EXT_OUI)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_AGENT_EASYMESH_VENDOR_EXT_OUI)\\\"
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 
@@ -97,14 +94,6 @@ ifeq ($(CONFIG_AGENT_STRICT_OPER_CHANNEL_REPORT),y)
 TARGET_CFLAGS += -DSTRICT_OPER_CHANNEL_REPORT
 endif
 
-ifeq ($(CONFIG_AGENT_WIRELESS_EXPLICIT_RELOAD),y)
-TARGET_CFLAGS += -DWIRELESS_EXPLICIT_RELOAD
-endif
-
-ifeq ($(CONFIG_AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST),y)
-TARGET_CFLAGS += -DOPER_CHAN_CHANGE_RELAY_MCAST
-endif
-
 MAKE_PATH:=src
 
 define Package/map-agent/install

map-agent/files/etc/config/mapagent

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

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

@@ -2,7 +2,7 @@
 
 . /lib/network/utils.sh
 
-conn_ports_file="/var/run/multiap/map.connected.ports"
+conn_ports_file="/tmp/map.connected.ports"
 map_bh_file="/var/run/multiap/multiap.backhaul"
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
@@ -19,7 +19,6 @@ if [ -n "$(which dynbhd)" ]; then
 	pidof dynbhd >/dev/null && exit 0 # dynbhd is managing the links
 
 	if [ ! -f $conn_ports_file ]; then
-		mkdir -p /var/run/multiap
 		touch $conn_ports_file
 		if [ "$LINK" = "up" ]; then
 			touch $conn_ports_file

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

@@ -219,8 +219,3 @@ reload_service() {
 	stop
 	start
 }
-
-boot() {
-	/lib/wifi/multiap conf
-	start
-}

map-agent/files/lib/multiap/map_genconfig

@@ -1,201 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-. /lib/functions.sh
-
-generate_mapagent_config=0
-generate_wireless_sta_config=0
-
-network_mode="$(fw_printenv -n netmode)"
-multiap_mode="$(fw_printenv -n multiap_mode)"
-
-is_airoha() {
-	[ -f /proc/device-tree/compatible ] || return
-	strings /proc/device-tree/compatible | grep -qE '^(econet,|airoha,)'; return
-}
-
-is_broadcom() {
-	[ -e /dev/bcm ] && return 0
-	return 1
-}
-
-is_qualcomm() {
-	[ -d /sys/module/ath12k ] && return 0
-	return 1
-}
-
-generate_multiap_config() {
-	devidx=0
-
-	generate_config() {
-		dev="$1"
-
-		[ -n "$dev" ] || continue
-
-		config_get band $dev band
-
-		mode_band=""
-		priority=
-		dpp_chan=
-		channels=
-
-		case "$band" in
-			2g)
-				mode_band=2
-				priority=2
-				dpp_chan="81/1"
-				channels="1 6 11"
-			;;
-			5g)
-				mode_band=5
-				priority=1
-				dpp_chan="128/36"
-				channels="36-64 100-112"
-			;;
-			6g)
-				mode_band=6
-				priority=0
-				dpp_chan="133/49"
-			;;
-		esac
-
-		[ -n "$mode_band" ] || continue
-
-		devidx=$(echo ${dev} |tr -dc '0-9')
-
-		device="$dev"
-
-		if is_airoha; then
-			ifprefix="wlan%_%"
-			ifname="wlan${devidx}_0"
-			ifname_bh="wlan${devidx}_1"
-			uci set wireless.$dev.channels="$channels"
-			uci commit wireless
-		elif is_broadcom; then
-			ifprefix="wl"
-			ifname="wl${devidx}"
-			ifname_bh="$ifname.1"
-			device="wl${devidx}"
-			brcm_setup="1"
-		elif is_qualcomm; then
-			ifprefix="wlan0%-"
-			ifname="wlan${devidx}"
-			ifname_bh="wlan${devidx}-1"
-			ap_follow_sta_dfs="1"
-		else
-			ifprefix="wlan%-"
-			ifname="wlan$devidx"
-			ifname_bh="$ifname-1"
-		fi
-
-		if [ $generate_mapagent_config -eq 1 ]; then
-			uci set mapagent.agent.ifprefix="$ifprefix"
-			uci set mapagent.agent.brcm_setup="$brcm_setup"
-			uci set mapagent.agent.ap_follow_sta_dfs="$ap_follow_sta_dfs"
-			uci add mapagent radio
-			uci set mapagent.@radio[-1].device="$device"
-			uci set mapagent.@radio[-1].band="$mode_band"
-
-			if [ "$network_mode" == "extender" ]; then
-				uci add mapagent bsta
-				uci set mapagent.@bsta[-1].device="$device"
-				uci set mapagent.@bsta[-1].ifname="$ifname"
-				uci set mapagent.@bsta[-1].band="$mode_band"
-				uci set mapagent.@bsta[-1].priority="$priority"
-
-				#uci add mapagent dpp_uri
-				#uci set mapagent.@dpp_uri[-1].type="qrcode"
-				#uci set mapagent.@dpp_uri[-1].device="$device"
-				#uci set mapagent.@dpp_uri[-1].ifname="$ifname"
-				#uci set mapagent.@dpp_uri[-1].band="$mode_band"
-				#uci set mapagent.@dpp_uri[-1].chirp_interval="10"
-				#uci add_list mapagent.@dpp_uri[-1].dpp_chan="$dpp_chan"
-
-				if [ $generate_wireless_sta_config -eq 1 ]; then
-					secname="default_sta_${device}"
-					uci set wireless.$secname=wifi-iface
-					uci set wireless.$secname.device="$device"
-					uci set wireless.$secname.mode="sta"
-					uci set wireless.$secname.ifname="$ifname"
-					uci set wireless.$secname.disabled="0"
-					uci set wireless.$secname.default_disabled="1"
-					uci set wireless.$secname.multi_ap="1"
-					uci commit wireless
-					wifi reload
-				else
-					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
-						\"match\":{\"mode\":\"sta\", \"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null
-				fi
-			else
-				uci add mapagent ap
-				uci set mapagent.@ap[-1].type="fronthaul"
-				uci set mapagent.@ap[-1].device="$device"
-				uci set mapagent.@ap[-1].ifname="$ifname"
-				uci set mapagent.@ap[-1].band="$mode_band"
-				uci add mapagent ap
-				uci set mapagent.@ap[-1].type="backhaul"
-				uci set mapagent.@ap[-1].device="$device"
-				uci set mapagent.@ap[-1].ifname="$ifname_bh"
-				uci set mapagent.@ap[-1].band="$mode_band"
-
-				if [ "$multiap_mode" != "none" ]; then
-					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
-						\"match\":{\"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"2\"}}" 2>/dev/null
-					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
-						\"match\":{\"ifname\":\"$ifname_bh\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null
-				fi
-			fi
-		fi
-	}
-
-	config_load wireless
-	config_foreach generate_config wifi-device
-}
-
-map_genconf () {
-	if [ -f /etc/config/mapagent -a -z "$(uci -q get mapagent.@radio[0].band)" ]; then
-		generate_mapagent_config=1
-	fi
-
-	if [ "$network_mode" == "extender" ]; then
-		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
-		fi
-	fi
-
-	generate_multiap_config
-
-	if [ $generate_mapagent_config -eq 1 ]; then
-		uci set mapagent.agent.enabled="1"
-		if [ "$multiap_mode" == "agent" ]; then
-			uci -q set mapagent.@controller_select[0].autostart=0
-			uci -q set mapagent.@controller_select[0].local=0
-		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"
-		fi
-		uci -q commit mapagent
-	fi
-
-
-	if [ "$multiap_mode" == "agent" -o "$multiap_mode" == "none" ]; then
-		uci set mapcontroller.controller.enabled="0"
-	else
-		uci set mapcontroller.controller.enabled="1"
-	fi
-	uci -q commit mapcontroller
-}

map-controller/Config.in

@@ -11,24 +11,20 @@ config CONTROLLER_EASYMESH_VENDOR_EXT
 	default y
 
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	hex "Vendor OUI default"
-	default 0xB456FA
+	string
+	default "\\\\x11\\\\x22\\\\x33"
 
 config CONTROLLER_EASYMESH_VERSION
 	int "Support Easymesh version"
 	default 4
 
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
-	hex "Vendor OUI in 0xAABBCC format"
+	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
 	default CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	help
-	Extra features not covered by the base EasyMesh specification can be
+	Extra features not covered by the base Easymesh specification can be
 	enabled through CONTROLLER_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 
-config CONTROLLER_USE_LIBDPP
-	bool "Depend on libdpp for DPP EasyConnect"
-
-
 endmenu
 endif

map-controller/Makefile

@@ -5,15 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.5.0.2
+PKG_VERSION:=4.3.1.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3c915f5f17ff339487a3b8533d384a23888b9c9a
+PKG_SOURCE_VERSION:=63f82561bafac72487e3ea114e10b6e96b57d445
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:multi-ap/map-controller.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-controller
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,15 +27,9 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin \
-	   +CONTROLLER_USE_LIBDPP:libdpp
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin
 endef
 
-ifeq ($(CONFIG_CONTROLLER_USE_LIBDPP),y)
-  TARGET_CFLAGS += -DUSE_LIBDPP
-endif
-
-
 define Package/map-controller/description
  This package provides WiFi MultiAP Controller as per the EasyMesh-R2 specs.
 endef
@@ -59,7 +53,7 @@ TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
 
 ifeq ($(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)\\\"
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 

map-controller/files/etc/config/mapcontroller

@@ -1,6 +1,6 @@
 config controller 'controller'
-	option enabled '1'	# may be modified by other package start-up scripts (i.e. map-agent)
-	option profile '3'
+	option enabled '0'
+	option profile '4'
 	option registrar '2 5 6'
 	option debug '0'
 	option bcn_metrics_max_num '10'
@@ -28,58 +28,39 @@ config sta_steering
 	option report_rcpi_threshold_5g '96'
 	option report_rcpi_threshold_6g '96'
 
-###################
-# Default AP sections credentials will by updated
-# by uci-defaults script 99-mapcntlr
-###################
+#config ap
+#	option band '2'
+#	option encryption 'sae-mixed'
+#	option vid '1'
+#	option ssid 'IOWRT-2.4GHz'
+#	option encryption 'sae-mixed'
+#	option key '1234567890'
 
-config ap
-	option band '2'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
-	option encryption 'sae-mixed'
-	option key '$WIFI_FH_KEY'
-	option vid '1'
-	option type 'fronthaul'
+#config ap
+#	option band '5'
+#	option type 'fronthaul'
+#	option vid '1'
+#	option ssid 'IOWRT-5GHz'
+#	option encryption 'sae-mixed'
+#	option key '1234567890'
 
-config ap
-	option band '5'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
-	option encryption 'sae-mixed'
-	option key '$WIFI_FH_KEY'
-	option vid '1'
-	option type 'fronthaul'
+#config ap
+#	option band '2'
+#	option type 'backhaul'
+#	option vid '1'
+#	list disallow_bsta '0'
+#	option ssid 'MAP-BH-2.4GHz'
+#	option encryption 'sae'
+#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
 
-config ap
-	option band '6'
-	option ssid '$DEVICE_MANUFACTURER-$BASEMAC_ADDR'
-	option encryption 'sae'
-	option key '$WIFI_FH_KEY'
-	option vid '1'
-	option type 'fronthaul'
-
-config ap
-	option band '2'
-	option ssid 'MAP-$BASEMAC_ADDR-BH-2.4GHz'
-	option encryption 'sae'
-	option key '$WIFI_BH_KEY'
-	option type 'backhaul'
-	option vid '1'
-
-config ap
-	option band '5'
-	option ssid 'MAP-$BASEMAC_ADDR-BH-5GHz'
-	option encryption 'sae'
-	option key '$WIFI_BH_KEY'
-	option type 'backhaul'
-	option vid '1'
-
-config ap
-	option band '6'
-	option ssid 'MAP-$BASEMAC_ADDR-BH-6GHz'
-	option encryption 'sae'
-	option key '$WIFI_BH_KEY'
-	option type 'backhaul'
-	option vid '1'
+#config ap
+#	option band '5'
+#	option type 'backhaul'
+#	option vid '1'
+#	list disallow_bsta '0'
+#	option ssid 'MAP-BH-5GHz'
+#	option encryption 'sae'
+#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
 
 # node and radio sections (per node) are auto
 # generated per Multi-AP Agent in the network
@@ -90,6 +71,8 @@ config ap
 #	option backhaul_ul_macaddr '00:00:00:00:00:00'
 #	option backhaul_dl_macaddr '00:00:00:00:00:00'
 #	option backhaul_type 'none'
+#	option primary_vid '1'
+#	option primary_pcp '0'
 #	option report_sta_assocfails '0'
 #	option report_sta_assocfails_rate '0'
 #	option report_metric_periodic '0'

map-controller/files/etc/uci-defaults/99-mapcntlr

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /etc/device_info
-
-WIFI_BH_KEY=$(openssl rand -rand /dev/urandom -hex 64 2>/dev/null | openssl dgst -hex -sha256 | cut -d " " -f 2)
-WIFI_BH_KEY=${WIFI_BH_KEY::-1}
-
-BASEMAC_ADDR="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-[ ${#BASEMAC_ADDR} -eq 12 ] || BASEMAC_ADDR="$(db -q get device.deviceinfo.BaseMACAddress | tr -d ':')"
-
-WIFI_FH_KEY="$(db get hw.board.wpa_key)"
-WIFI_FH_KEY="${WIFI_FH_KEY:-1234567890}"
-
-sed -i  -e "s/\$BASEMAC_ADDR/$BASEMAC_ADDR/g" \
-	-e "s/\$WIFI_FH_KEY/$WIFI_FH_KEY/g" \
-	-e "s/\$WIFI_BH_KEY/$WIFI_BH_KEY/g" \
-	-e "s/\$DEVICE_MANUFACTURER/$DEVICE_MANUFACTURER/g" \
-	/etc/config/mapcontroller	2>/dev/null

map-topology/Config.in

@@ -7,14 +7,14 @@ config TOPOLOGYD_EASYMESH_VENDOR_EXT
 	default y
 
 config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	hex "Vendor OUI default"
-	default 0xB456FA
+	string
+	default "\\\\x11\\\\x22\\\\x33"
 
 config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI
-	hex "Vendor OUI in 0xAABBCC format"
+	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
 	default TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	help
-	Extra features not covered by the base EasyMesh specification can be
+	Extra features not covered by the base Easymesh specification can be
 	enabled through TOPOLOGYD_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.2.1
+PKG_VERSION:=2.5.1.24
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=914f1ead2e65c1e24ed2d8786aa883730db2208f
+PKG_SOURCE_VERSION:=9f15e813c39ff23cef27975ce138bd3286f30adf
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
@@ -49,7 +49,7 @@ endef
 MAKE_PATH:=src
 
 ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)
+TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)\\\"
 endif
 
 ifeq ($(CONFIG_TOPOLOGYD_HOST_WAN_STATS),y)

map-topology/files/etc/config/hosts

@@ -0,0 +1,5 @@
+
+config global 'global'
+	option ageing_timer '1440'
+	option reboot_persistent '0'
+	list ifname 'br-lan'

map-topology/files/etc/firewall.hosts

@@ -0,0 +1,126 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+day=""
+IP_RULE=""
+
+process_ac_schedule() {
+	local acs_id="$1"
+	local is_enabled
+	local access_control
+	local start_time=""
+	local stop_time=""
+	local mac=""
+
+	handle_day_list() {
+		local value=$1
+
+		val=$(echo $value | cut -c 1-3)
+		if [ -z $day ]; then
+			day="$val"
+		else
+			day="$day,$val"
+		fi
+	}
+
+	config_list_foreach "$acs_id" "day" handle_day_list
+	config_get is_enabled "$acs_id" "enable" 1
+	config_get access_control "$acs_id" "dm_parent"
+
+	if [ "$is_enabled" == "0" ] || [ -z "$access_control" ]; then
+		return
+	fi
+
+	IP_RULE=""
+
+	mac=$(uci -q get hosts.$access_control.macaddr)
+	access_policy=$(uci -q get hosts.$access_control.access_policy)
+
+	config_get start_time "$acs_id" "start_time"
+	config_get duration "$acs_id" "duration"
+
+	if [ -z "$mac" ] && [ -z "$start_time" ] && [ -z "$duration" ] && [ -z "$day" ] && [ -z "$access_policy" ]; then
+		return
+	fi
+	if [ -n "$mac" ]; then
+		IP_RULE="$IP_RULE -m mac --mac-source $mac"
+	fi
+
+	# as per iptables manual default starttime is 00:00
+	# default stoptime is 23:59
+	if [ -z "$start_time" ]; then
+		start_time="0:0"
+	fi
+
+        if [ -n "$duration" ]; then
+		hh=$(echo $start_time | awk -F: '{ print $1 }')
+                mm=$(echo $start_time | awk -F: '{ print $2 }')
+                hh_s=`expr $hh \* 3600`
+                mm_s=`expr $mm \* 60`
+                ss=$(( hh_s + mm_s ))
+
+                stop_ss=$(( ss + duration ))
+                hh=$(( stop_ss / 3600 ))
+                if [ $hh -lt 24 ]; then
+                	rem_ss=$(( stop_ss % 3600 ))
+                	mm=$(( rem_ss / 60 ))
+                	ss=$(( rem_ss % 60 ))
+                	stop_time="$hh:$mm:$ss"
+                else
+                	stop_time="23:59"
+                fi
+        else
+        	stop_time="23:59"
+        fi
+
+	# conversion to utc
+	zone=$(date +%z | cut -c 1)
+	utc_h=$(date -u -d @$(date "+%s" -d "$start_time") +%H)
+	local_h=$(echo $start_time | awk -F: '{ print $1 }')
+	if [ "$zone" == "+" ] && [ $utc_h -gt $local_h ]; then
+		start_utc="0:0"
+	else
+		start_utc=$(date -u -d @$(date "+%s" -d "$start_time") +%H:%M)
+	fi
+
+	utc_h=$(date -u -d @$(date "+%s" -d "$stop_time") +%H)
+	local_h=$(echo $stop_time | awk -F: '{ print $1 }')
+	if [ "$zone" == "-" ] && [ $utc_h -lt $local_h ]; then
+		stop_utc="23:59"
+	else
+		stop_utc=$(date -u -d @$(date "+%s" -d "$stop_time") +%H:%M)
+	fi
+
+
+	IP_RULE="$IP_RULE -m time --timestart $start_utc --timestop $stop_utc"
+	if [ -n "$day" ]; then
+		IP_RULE="$IP_RULE --weekdays $day"
+	fi
+
+	if [ "$access_policy" == "Deny" ]; then
+		IP_RULE="$IP_RULE -j DROP"
+	else
+		IP_RULE="$IP_RULE -j ACCEPT"
+	fi
+
+	iptables -w -A hosts_forward ${IP_RULE}
+	ip6tables -w -A hosts_forward ${IP_RULE}
+
+	day=""
+}
+
+iptables -w -F hosts_forward
+ip6tables -w -F hosts_forward
+
+iptables -w -t filter -N hosts_forward
+ret=$?                        
+[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
+ip6tables -w -t filter -N hosts_forward
+ret=$?                        
+[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
+
+# Load /etc/config/hosts UCI file
+config_load hosts
+config_foreach process_ac_schedule ac_schedule
+

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

@@ -89,24 +89,16 @@ interfaces_ok(){
 	# check if upstream untagged
 	IFS=" "
 	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)
+		# check if there exist a device section for this upstream interface, if yes the
+		# do nothing, if no then split the it at . and use the native interface as
+		# upstream interface
+		dev_section=$(ubus call uci get '{"config":"network", "type":"device", "match":{"name":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[])
 
 		# mcast config is outdated, simply generate as per new logic
 		if [ -z "$dev_section" ]; then
 		       # check if the itf is a native interface	&& return 1
-			return 1
-		else
-			section_type=$(uci get network.$dev_section)
-			if [ "$section_type" == "interface" ]; then
-				# interface section exits, hence, sync has already happened
-				# nothing to do further, just return
-				return 0
-			else
-				# mcast config is outdated
-				return 1
-			fi
+			native=$(ubus call uci get '{"config":"ports", "type":"ethport", "match":{"ifname":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[])
+			[ -z "native" ] && return 1
 		fi
 	done
 	return 0

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

@@ -10,12 +10,10 @@ PROG_EXE=/usr/sbin/mcproxy
 PROG_PARAMS=
 PROG_PARAMS_SEPARATOR=:
 
-snooping_bridges=
-
 
 __device_is_bridge() {
 	local device="$2"
-	local devsec__="$(uci show network | grep name=.*$device | grep -v ifname | cut -d'.' -f2)"
+	local devsec__="$(uci show network | grep name=.*$device | cut -d'.' -f2)"
 	local sectype="$(uci -q get network.$devsec__)"
 	local devtype="$(uci -q get network.$devsec__.type)"
 	[ "$sectype" != "device" -o "$devtype" != "bridge" ] && return 1
@@ -116,11 +114,10 @@ config_mcproxy_interfaces() {
 
 config_sysfs_mcast_snooping() {
 	local downstreams="$1"
-	local snooping="$2"
 
 	for downstream in $downstreams; do
 		if device_is_bridge "$downstream"; then
-			echo $snooping > /sys/class/net/$downstream/bridge/multicast_snooping
+			echo 1 > /sys/class/net/$downstream/bridge/multicast_snooping
 		fi
 	done
 }
@@ -139,53 +136,7 @@ config_sysfs_mcast_fastleave() {
 	done
 }
 
-config_sysfs_mcast_version() {
-	local protocol="$1"
-	local interfaces="$2"
-	local version="$3"
-
-	for iface in $interfaces; do
-		echo $version > /sys/class/net/$iface/bridge/multicast_"$protocol"_version
-	done
-}
-
-config_sysfs_mcast_robustness() {
-	local interfaces="$1"
-	local robustness="$2"
-
-	for iface in $interfaces; do
-		echo $robustness > /sys/class/net/$iface/bridge/multicast_last_member_count
-	done
-}
-
-config_sysfs_mcast_query_interval() {
-	local interfaces="$1"
-	local query_interval="$2"
-
-	for iface in $interfaces; do
-		echo $query_interval > /sys/class/net/$iface/bridge/multicast_query_interval
-	done
-}
-
-config_sysfs_mcast_q_resp_interval() {
-	local interfaces="$1"
-	local q_resp_interval="$2"
-
-	for iface in $interfaces; do
-		echo $q_resp_interval > /sys/class/net/$iface/bridge/multicast_query_response_interval
-	done
-}
-
-config_sysfs_mcast_last_mem_q_int() {
-	local interfaces="$1"
-	local last_mem_q_int="$2"
-
-	for iface in $interfaces; do
-		echo $last_mem_q_int > /sys/class/net/$iface/bridge/multicast_last_member_interval
-	done
-}
-
-config_sysfs_mcast_flood() {
+config_sysfs_mcast_mode() {
 	local downstreams=$1
 	local mcast_mode=$2
 	local prt
@@ -206,25 +157,6 @@ config_sysfs_mcast_flood() {
 	done
 }
 
-config_snooping_mode() {
-	local interfaces="$1"
-	local snooping="$2"
-
-	# snooping_mode:
-	#  0 - snooping is disabled
-	#  1 - multicast flood is enabled
-	#  2 - multicast flood is disabled
-	[ -z "$snooping_mode" ] && snooping_mode=2
-
-	if [ "$snooping_mode" == 0 ]; then
-		config_sysfs_mcast_snooping "$interfaces" 0
-	else
-		config_sysfs_mcast_snooping "$interfaces" 1
-	fi
-
-	config_sysfs_mcast_flood "$interfaces" "$snooping_mode"
-}
-
 config_mcproxy_instance() {
 	local protocol="$1"
 	local version="$2"
@@ -263,11 +195,6 @@ config_mcproxy_instance() {
 		upstreams=$igmp_p_up_interfaces
 		downstreams=$igmp_p_down_interfaces
 		mcast_mode=$igmp_p_mode
-
-		# mcproxy reserves two multicast subscriptions for igmp router service groups
-		local mg=$(cat /proc/sys/net/ipv4/igmp_max_memberships)
-		mg=$((mg+2))
-		echo $mg > /proc/sys/net/ipv4/igmp_max_memberships
 	elif [ "$protocol" == "mld" ]; then
 		case "$version" in
 			[1-2])
@@ -301,119 +228,32 @@ config_mcproxy_instance() {
 
 	# for snooping to work we should enable it on the bridge, doing it from
 	# here instead of from inside network config
-	if [ "$downstreams" != "$snooping_bridges" ]; then
-		config_sysfs_mcast_snooping "$downstreams" 1
-		[ -n $fast_leave ] &&
-			config_sysfs_mcast_fastleave "$downstreams" "$fast_leave"
-		config_sysfs_mcast_flood "$downstreams" "$mcast_mode"
-	fi
+	config_sysfs_mcast_snooping "$downstreams"
+	[ -n $fast_leave ] &&
+		config_sysfs_mcast_fastleave "$downstreams" "$fast_leave"
+	config_sysfs_mcast_mode "$downstreams" "$mcast_mode"
 
 	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
 }
 
-disable_snooping_iface() {
-	local iface="$(uci -q get network.$1.name)"
-	config_sysfs_mcast_snooping "$iface" 0
-}
-
-disable_snooping() {
-	config_load network
-	config_foreach disable_snooping_iface device
-}
-
-config_snooping() {
-	local protocol="$1"
-
-	local version=
-	local robustness=
-	local query_interval=
-	local q_resp_interval=
-	local last_mem_q_int=
-	local fast_leave=0
-	local snooping_mode=
-	local interfaces=
-
-	local HZ=100
-
-	local all_interfaces=
-	if [ "$protocol" == "igmp" ]; then
-		all_interfaces=$igmp_s_iface
-	elif [ "$protocol" == "mld" ]; then
-		all_interfaces=$mld_s_iface
-	fi
-	for iface in $all_interfaces; do
-		device_is_bridge "$iface" || continue
-		interfaces="$interfaces $iface"
-	done
-	[ -z "$interfaces" ] && return
-	snooping_bridges="$interfaces"
-
-	if [ "$protocol" == "igmp" ]; then
-		case "$igmp_s_version" in
-			[1-3])
-				version="$igmp_s_version"
-				;;
-			*)
-				version="2"
-				;;
-		esac
-
-		robustness=$igmp_s_robustness
-		query_interval=$(( igmp_s_query_interval * HZ ))
-		q_resp_interval=$(( igmp_s_q_resp_interval * HZ / 10 ))
-		last_mem_q_int=$(( igmp_s_last_mem_q_int * HZ / 10 ))
-		fast_leave=$igmp_s_fast_leave
-		snooping_mode=$igmp_s_mode
-	elif [ "$protocol" == "mld" ]; then
-		case "$mld_s_version" in
-			[1-2])
-				version="$mld_s_version"
-				;;
-			*)
-				version="2"
-				;;
-		esac
-
-		robustness=$mld_s_robustness
-		query_interval=$(( mld_s_query_interval * HZ ))
-		q_resp_interval=$(( mld_s_q_resp_interval * HZ / 10 ))
-		last_mem_q_int=$(( mld_s_last_mem_q_int * HZ / 10 ))
-		fast_leave=$mld_s_fast_leave
-		snooping_mode=$mld_s_mode
-	fi
-
-	config_snooping_mode "$interfaces" "$snooping_mode"
-
-	[ -n "$version" ] && config_sysfs_mcast_version "$protocol" "$interfaces" "$version"
-	[ -n "$robustness" ] && config_sysfs_mcast_robustness "$interfaces" "$robustness"
-	[ -n "$query_interval" ] && config_sysfs_mcast_query_interval "$interfaces" "$query_interval"
-	[ -n "$q_resp_interval" ] && config_sysfs_mcast_q_resp_interval "$interfaces" "$q_resp_interval"
-	[ -n "$last_mem_q_int" ] && config_sysfs_mcast_last_mem_q_int "$interfaces" "$last_mem_q_int"
-	[ -n "$fast_leave" ] && config_sysfs_mcast_fastleave "$interfaces" "$fast_leave"
-}
-
 config_mcproxy() {
-	disable_snooping
 	if [ "$igmp_p_enable" == "1" ]; then
 		config_mcproxy_instance igmp "$igmp_p_version"
-	elif [ "$igmp_s_enable" == "1" ]; then
-		config_snooping igmp "$igmp_s_version"
 	fi
 
 	if [ "$mld_p_enable" == "1" ]; then
 		config_mcproxy_instance mld "$mld_p_version"
-	elif [ "$mld_s_enable" == "1" ]; then
-		config_snooping mld "$mld_s_version"
 	fi
 }
 
-setup_mcast_mode() {
-	:
-}
-
 configure_mcast() {
 	config_global_params "set_max_groups_and_sources"
 
+	# mcproxy reserves two multicast subscriptions for igmp router service groups
+	local mg=$(cat /proc/sys/net/ipv4/igmp_max_memberships)
+	mg=$((mg+2))
+	echo $mg > /proc/sys/net/ipv4/igmp_max_memberships
+
 	read_mcast_snooping_params
 	read_mcast_proxy_params
 	config_mcproxy

mosquitto-auth-shadow/src/mosquitto_auth_shadow.c

@@ -11,7 +11,6 @@
  *   Erik Karlsson - initial implementation
  */
 
-#define _GNU_SOURCE
 #include <string.h>
 #include <shadow.h>
 #include <crypt.h>

obuspa/Config.in

@@ -1,4 +1,8 @@
 if PACKAGE_obuspa
+config OBUSPA_DB_PATH
+	string "Configure path for usp.db file"
+	default "/tmp/"
+
 config OBUSPA_MTP_ENABLE_MQTT
 	bool "Enable MQTT as mtp protocol"
 	default y

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.5.5
+PKG_VERSION:=7.0.2.25
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=ad32d70ccbe3942b945bf6caf74988bd5660cf96
+PKG_SOURCE_VERSION:=3f3fdb4581276ce28547a920a93d7e43e2eff879
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -19,12 +19,12 @@ endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
+PKG_FIXUP:=autoreconf
+
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-include ../bbfdm/bbfdm.mk
 
 define Package/obuspa
   SECTION:=utils
@@ -45,40 +45,48 @@ endef
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
-	-DHAVE_STRERROR_R \
 	-Wall \
-	-D_DM_VENDOR_PREFIX=$(CONFIG_BBF_VENDOR_PREFIX) \
 	-Werror
 
-CMAKE_OPTIONS += -DCMAKE_INSTALL_PREFIX=/tmp
-CMAKE_OPTIONS += -DCMAKE_INSTALL_LOCALSTATEDIR=""
-
 ifneq ($(CONFIG_OBUSPA_CONTROLLER_MTP_VERIFY),)
   TARGET_CFLAGS += -DOBUSPA_CONTROLLER_MTP_VERIFY
 endif
 
+ifneq ($(CONFIG_OBUSPA_DB_PATH),)
+  CONFIGURE_ARGS += \
+	--localstatedir="$(CONFIG_OBUSPA_DB_PATH)"
+endif
+
 ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_STOMP),y)
-CMAKE_OPTIONS += -DENABLE_STOMP=ON
+  CONFIGURE_ARGS += \
+	--enable-stomp
 else
-CMAKE_OPTIONS += -DENABLE_STOMP=OFF
+  CONFIGURE_ARGS += \
+	--disable-stomp
 endif
 
 ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_MQTT),y)
-CMAKE_OPTIONS += -DENABLE_MQTT=ON
+  CONFIGURE_ARGS += \
+	--enable-mqtt
 else
-CMAKE_OPTIONS += -DENABLE_MQTT=OFF
+  CONFIGURE_ARGS += \
+	--disable-mqtt
 endif
 
 ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_COAP),y)
-CMAKE_OPTIONS += -DENABLE_COAP=ON
+  CONFIGURE_ARGS += \
+	--enable-coap
 else
-CMAKE_OPTIONS += -DENABLE_COAP=OFF
+  CONFIGURE_ARGS += \
+	--disable-coap
 endif
 
 ifeq ($(CONFIG_OBUSPA_MTP_ENABLE_WEBSOCKETS),y)
-CMAKE_OPTIONS += -DENABLE_WEBSOCKETS=ON
+  CONFIGURE_ARGS += \
+	--enable-websockets
 else
-CMAKE_OPTIONS += -DENABLE_WEBSOCKETS=OFF
+  CONFIGURE_ARGS += \
+	--disable-websockets
 endif
 
 ifeq ($(LOCAL_DEV),1)
@@ -93,6 +101,7 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
@@ -100,11 +109,11 @@ 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_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/TransferComplete.json $(1)/etc/bbfdm/json/TransferComplete.json
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 	$(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)
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user
 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/bbfdm/json/TransferComplete.json

@@ -0,0 +1,132 @@
+{
+  "Device.LocalAgent.": {
+    "type": "object",
+    "version": "2.12",
+    "protocols": [
+      "usp"
+    ],
+    "access": false,
+    "array": false,
+    "TransferComplete!": {
+      "type": "event",
+      "version": "2.12",
+      "protocols": [
+        "usp"
+      ],
+      "Command": {
+        "type": "string",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "string"
+      },
+      "CommandKey": {
+        "type": "string",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "string"
+      },
+      "Requestor": {
+        "type": "string",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "string"
+      },
+      "TransferType": {
+        "type": "string",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "string",
+        "enumerations": [
+          "Download",
+          "Upload"
+        ]
+      },
+      "Affected": {
+        "type": "string",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "string"
+      },
+      "TransferURL": {
+        "type": "string",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "URL",
+        "range": [
+          {
+            "max": 2048
+          }
+        ]
+      },
+      "StartTime": {
+        "type": "dateTime",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "dateTime"
+      },
+      "CompleteTime": {
+        "type": "dateTime",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "dateTime"
+      },
+      "FaultCode": {
+        "type": "unsignedInt",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "unsignedInt"
+      },
+      "FaultString": {
+        "type": "string",
+        "read": true,
+        "write": true,
+        "version": "2.12",
+        "protocols": [
+          "usp"
+        ],
+        "datatype": "string",
+        "range": [
+          {
+            "max": 256
+          }
+        ]
+      }
+    }
+  }
+}

obuspa/files/etc/config/obuspa

@@ -1,13 +1,14 @@
 config obuspa 'global'
 	option enabled '1'
-	option debug '1'
+	option debug '0'
 	option dhcp_discovery '1'
-	option log_level '2'
+	option interface 'wan'
+	option log_level '1'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
-	option role_file '/etc/obuspa/roles.json'
+	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
-	#option log_dest '/tmp/obuspa.log'
+	#option log_dest '/var/log/obuspa'
 

obuspa/files/etc/init.d/obuspa

@@ -1033,30 +1033,37 @@ db_init()
 	return 0;
 }
 
+register_service()
+{
+	procd_open_instance ${CONFIGURATION}
+	procd_set_param command ${PROG}
+
+	configure_obuspa
+	procd_set_param respawn \
+			"${respawn_threshold:-10}" \
+			"${respawn_timeout:-10}" "${respawn_retry:-5}"
+
+	procd_set_param watch bbfdm
+	procd_close_instance
+}
+
 start_service() {
 	local enabled
 
-	mkdir -p /tmp/obuspa/
 	config_load obuspa
 	config_get_bool enabled global enabled 0
 
-	procd_open_instance ${CONFIGURATION}
-	if [ "${enabled}" -eq 1 ]; then
-		db_init "${1}"
-		procd_set_param command ${PROG}
-		configure_obuspa
-		procd_set_param respawn \
-			"${respawn_threshold:-10}" \
-			"${respawn_timeout:-10}" "${respawn_retry:-5}"
-		#procd_set_param limits core="unlimited"
+	if [ "${enabled}" -eq 0 ]; then
+		return 0;
 	fi
-	procd_close_instance ${CONFIGURATION}
+
+	mkdir -p /tmp/obuspa/
+	db_init "${1}"
+	register_service
 }
 
 stop_service() {
-	if command -v timeout >/dev/null 2>&1; then
-		timeout 5 ${PROG} -c stop
-	fi
+	${PROG} -c stop >/dev/null 2>&1
 }
 
 reload_service() {
@@ -1066,4 +1073,25 @@ reload_service() {
 
 service_triggers() {
 	procd_add_reload_trigger "obuspa"
+
+	# Create a reload trigger if schema update avaialble
+	procd_open_trigger
+		json_add_array
+			json_add_string "" "bbfdm"
+			json_add_array
+				json_add_string "" "if"
+				json_add_array
+					json_add_string "" "eq"
+					json_add_string "" "action"
+					json_add_string "" "schema_update_available"
+				json_close_array
+				json_add_array
+					json_add_string "" "run_script"
+					json_add_string "" "/etc/init.d/obuspa"
+					json_add_string "" "restart"
+				json_close_array
+			json_close_array
+			json_add_int "" "2000"
+		json_close_array
+	procd_close_trigger
 }

obuspa/files/etc/obuspa/roles.json

@@ -1,548 +1,43 @@
 {
   "roles": [
-    {
-      "name": "full_access",
-      "permission": [
-        {
-          "object": "Device.",
-          "perm": [
-            "PERMIT_ALL"
-          ]
-        }
-      ]
-    },
-    {
-      "name": "Untrusted",
-      "permission": [
-        {
-          "object": "Device.",
-          "perm": [
-            "PERMIT_NONE"
-          ]
-        },
-        {
-          "object": "Device.DeviceInfo.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object": "Device.DeviceInfo.ProcessStatus.",
-          "perm": [
-            "PERMIT_NONE"
-          ]
-        },
-        {
-          "object": "Device.DeviceInfo.VendorConfigFile.",
-          "perm": [
-            "PERMIT_NONE"
-          ]
-        },
-        {
-          "object": "Device.DeviceInfo.VendorLogFile.",
-          "perm": [
-            "PERMIT_NONE"
-          ]
-        },
-        {
-          "object": "Device.DeviceInfo.Processor.",
-          "perm": [
-            "PERMIT_NONE"
-          ]
-        }
-      ]
-    },
     {
       "name": "admin",
       "permission": [
         {
           "object": "Device.",
           "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.Reboot()",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.FactoryReset()",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_EVT_OPER_COMP"
+            "PERMIT_NONE"
           ]
         },
         {
           "object": "Device.DeviceInfo.",
           "perm": [
             "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Time.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.UPnP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Bridging.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Ethernet.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DHCPv4.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DHCPv4.Server.Pool.{i}.StaticAddress.",
-          "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.DHCPv6.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Hosts.",
-          "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.{BBF_VENDOR_PREFIX}URLFilter.",
-          "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": [
-            "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.PPP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Routing.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.IEEE1905.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.InterfaceStack.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DynamicDNS.",
-          "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.LANConfigSecurity.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Security.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.RouterAdvertisement.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Services.",
-          "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.UserInterface.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.PeriodicStatistics.",
-          "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.SoftwareModules.",
-          "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.Users.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.LocalAgent.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.LocalAgent.Subscription.",
-          "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"
+            "PERMIT_GET_INST"
           ]
         },
         {
           "object": "Device.WiFi.",
           "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.DNS.",
-          "perm": [
-            "PERMIT_GET",
+            "PERMIT_SUBS_EVT_OPER_COMP",
             "PERMIT_GET_INST",
             "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
+            "PERMIT_CMD_INFO"
           ]
         },
         {
           "object": "Device.IP.",
           "perm": [
             "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
+            "PERMIT_GET_INST"
           ]
         }
       ]
@@ -553,311 +48,47 @@
         {
           "object": "Device.",
           "perm": [
-            "PERMIT_NONE",
-            "PERMIT_SUBS_EVT_OPER_COMP"
+            "PERMIT_NONE"
           ]
         },
         {
           "object": "Device.DeviceInfo.",
           "perm": [
             "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Time.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.UPnP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Bridging.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Ethernet.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DHCPv4.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DHCPv6.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Hosts.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.NAT.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.PPP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Routing.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.IEEE1905.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.InterfaceStack.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.DynamicDNS.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.LANConfigSecurity.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Security.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.RouterAdvertisement.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Services.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.UserInterface.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.PeriodicStatistics.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.SoftwareModules.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object":"Device.Users.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.LocalAgent.Subscription.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_ADD",
-            "PERMIT_SET",
-            "PERMIT_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
+            "PERMIT_GET_INST"
           ]
         },
         {
           "object": "Device.WiFi.",
           "perm": [
             "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL"
-          ]
-        },
-        {
-          "object": "Device.DNS.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
             "PERMIT_OPER",
             "PERMIT_SUBS_VAL_CHANGE",
             "PERMIT_SUBS_OBJ_ADD",
             "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
+            "PERMIT_SUBS_EVT_OPER_COMP",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
           ]
         },
         {
           "object": "Device.IP.",
           "perm": [
             "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
+            "PERMIT_GET_INST"
           ]
         }
       ]
     },
     {
-      "name": "extender",
-      "permission": [
-        {
-          "object": "Device.",
-          "perm": [
-            "PERMIT_NONE"
-          ]
-        },
-        {
-          "object": "Device.SSH.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        }
-      ]
+      "name": "undefined-1"
+    },
+    {
+      "name": "undefined-2"
+    },
+    {
+      "name": "undefined-3"
     },
     {
       "name": "undefined-4"

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

@@ -1,314 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-URL=""
-PROV_CODE=""
-RETRY_MIN_INTERVAL="5"
-RETRY_INTERVAL_MUL="2000"
-ENDPOINT_ID=""
-
-get_oui_from_db() {
-	db -q get device.deviceinfo.ManufacturerOUI
-}
-
-get_serial_from_db() {
-	db -q get device.deviceinfo.SerialNumber
-}
-
-get_vivsoi() {
-	# opt125 environment variable has data in below format
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	# |      enterprise-number1       |
-	# |                               |
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-	# |   data-len1   |               |
-	# +-+-+-+-+-+-+-+-+ option-data1  |
-	# /                               /
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
-	# |      enterprise-number2       |   ^
-	# |                               |   |
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
-	# |   data-len2   |               | optional
-	# +-+-+-+-+-+-+-+-+ option-data2  |   |
-	# /                               /   |
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
-	# ~            ...                ~   V
-	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
-
-	#  Enterprise Id  Len  Sub Op  SLen  Data Sub Op  SLen Data       Sub Op  SLen Data
-	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
-	# |     id      |  n  |   1  |  n1  | D1 |   2  |  n2 | D2 | ... |   6  |  n6 | D6 |
-	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
-
-	local opt125="$1"
-	local len="$2"
-	local ent_id
-
-	#hex-string 2 character=1 Byte
-	# length in hex string will be twice of actual Byte length
-	[ "$len" -gt "8" ] || return
-
-	data="${opt125}"
-	rem_len="${len}"
-	while [ $rem_len -gt 0 ]; do
-		ent_id=${data:0:8}
-		ent_id=$(printf "%d\n" "0x$ent_id")
-
-		if [ $ent_id -ne  3561 ]; then
-			len_val=${data:8:2}
-			data_len=$(printf "%d\n" "0x$len_val")
-			# add 4 byte for ent_id and 1 byte for len
-			data_len=$(( data_len * 2 + 10 ))
-			# move ahead data to next enterprise id
-			data=${data:"${data_len}":"${rem_len}"}
-			rem_len=$(( rem_len - $data_len ))
-			continue
-		fi
-
-		# read the length of enterprise data
-		len_val=${data:8:2}
-		data_len=$(printf "%d\n" "0x$len_val")
-		# add 4 byte for ent_id and 1 byte for len
-		data_len=$(( data_len * 2 + 10 ))
-
-		opt_len=$(printf "%d\n" "0x$len_val")
-		[ $opt_len -eq 0 ] && return
-
-		# populate the option data of enterprise id
-		sub_data_len=$(( opt_len * 2))
-		# starting 10 means ahead of length field
-		sub_data=${data:10:"${sub_data_len}"}
-
-		# parsing of suboption of option 125
-		while [ $sub_data_len -gt 0 ]; do
-			# get the suboption id
-			sub_opt_id=${sub_data:0:2}
-			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
-
-			# get the length of suboption
-			sub_opt_len=${sub_data:2:2}
-			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
-			sub_opt_len=$(( sub_opt_len * 2 ))
-
-			# get the value of sub option starting 4 means starting after length
-			sub_opt_val=${sub_data:4:${sub_opt_len}}
-
-			# assign the value found in sub option
-			case "${sub_opt_id}" in
-				"25") URL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				;;
-				"26") PROV_CODE=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				;;
-				"27") RETRY_MIN_INTERVAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				;;
-				"28") RETRY_INTERVAL_MUL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				;;
-				"29") ENDPOINT_ID=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
-				;;
-			esac
-
-			# add 2 bytes for sub_opt id and sub_opt len field
-			sub_opt_end=$(( sub_opt_len + 4 ))
-
-			# update the remaining sub option hex string length
-			sub_data_len=$((sub_data_len - sub_opt_end))
-
-			# fetch next sub option hex string
-			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
-		done
-
-		# move ahead data to next enterprise id
-		data=${data:"${data_len}":"${rem_len}"}
-		rem_len=$(( rem_len - data_len ))
-	done
-}
-
-get_netmode()
-{
-	local mode
-
-	if command -v fw_printenv; then
-		mode="$(fw_printenv -n netmode)"
-	fi
-
-	if [ "$mode" != "extender" ]; then
-		mode="full_access"
-	fi
-
-	echo "$mode"
-}
-
-config_load obuspa
-config_get_bool enable_obuspa global enabled 1
-config_get wan_intf global interface "wan"
-config_get_bool dhcp_discovery global dhcp_discovery 1
-
-if [ "$enable_obuspa" = "0" ] || [ "$dhcp_discovery" = "0" ]; then
-	return 0
-fi
-
-if [ "${wan_intf}" == "${INTERFACE}" ]; then
-	if [ -n "$opt125" ]; then
-		len=$(printf "$opt125"|wc -c)
-		get_vivsoi "$opt125" "$len"
-	fi
-
-	if [ -z "$URL" ] || [ -z "$ENDPOINT_ID" ]; then
-		return 0
-	fi
-
-	proto=""
-	ip=""
-	port=""
-	topic=""
-	is_fqdn=1
-
-	case $URL in
-	ws://*) is_fqdn=0;;
-	wss://*) is_fqdn=0;;
-	mqtt://*) is_fqdn=0;;
-	mqtts://*) is_fqdn=0;;
-	*) is_fqdn=1
-	esac;
-
-	if [ ${is_fqdn} -eq 1 ]; then
-		# This is an FQDN, perform DNS query
-		nslookup -type=a $URL > /tmp/fqdn_ip
-		nslookup -type=ptr $URL > /tmp/fqdn_ptr
-		return 0
-	else
-		proto=$(echo "${URL}" | awk -F: '{print $1}')
-		dest=$(echo "${URL}" | awk -F/ '{print $3}')
-		ip=$(echo "${dest}" | awk -F: '{print $1}')
-		port=$(echo "${dest}" | awk -F: '{print $2}')
-		topic=$(echo "${URL}" | sed  's/^.*:'"${port}"'/\1/g')
-	fi
-
-	offered_proto=""
-	if [ "${proto}" == "mqtt" ] || [ "${proto}" == "mqtts" ]; then
-		offered_proto="MQTT"
-	elif [ "${proto}" == "ws" ] || [ "${proto}" == "wss" ]; then
-		offered_proto="WebSocket"
-	else
-		return 0
-	fi
-
-	uci_change=0
-	mtp_encrypt="0"
-	## Handling of controller section
-	ct_endpoint=$(uci -q get obuspa.dhcpcontroller.EndpointID)
-	ct_proto=$(uci -q get obuspa.dhcpcontroller.Protocol)
-	ct_topic=$(uci -q get obuspa.dhcpcontroller.Topic)
-	ct_enable=$(uci -q get obuspa.dhcpcontroller.Enable)
-	ct_prov=$(uci -q get obuspa.dhcpcontroller.ProvisioningCode)
-
-	if [ "${ct_endpoint}" != "${ENDPOINT_ID}" ] || [ "${ct_proto}" != "${offered_proto}" ] || [ "${ct_topic}" != "${topic}" ] || [ "${ct_enable}" != "1" ] || [ "${ct_prov}" != "${PROV_CODE}" ]; then
-		uci -q del obuspa.dhcpcontroller
-		sec=$(uci -q add obuspa controller)
-		uci -q rename obuspa."${sec}"='dhcpcontroller'
-		uci -q set obuspa.dhcpcontroller.EndpointID="${ENDPOINT_ID}"
-		uci -q set obuspa.dhcpcontroller.ProvisioningCode="${PROV_CODE}"
-		uci -q set obuspa.dhcpcontroller.Protocol="${offered_proto}"
-		if [ "${offered_proto}" == "MQTT" ]; then
-			uci -q set obuspa.dhcpcontroller.Topic="${topic}"
-			uci -q set obuspa.dhcpcontroller.mqtt='dhcpmqtt'
-		else
-			uci -q set obuspa.dhcpcontroller.Path="${topic}"
-			uci -q set obuspa.dhcpcontroller.Host="${ip}"
-			uci -q set obuspa.dhcpcontroller.Port="${port}"
-			if [ "${proto}" == "wss" ]; then
-				uci -q set obuspa.dhcpcontroller.EnableEncryption='1'
-				mtp_encrypt="1"
-			else
-				uci -q set obuspa.dhcpcontroller.EnableEncryption='0'
-				mtp_encrypt="0"
-			fi
-		fi
-
-		uci -q set obuspa.dhcpcontroller.assigned_role_name="$(get_netmode)"
-		uci -q set obuspa.dhcpcontroller.Enable='1'
-		uci_change=1
-	fi
-
-	if [ "${offered_proto}" == "WebSocket" ]; then
-		ex_mqtt=$(uci -q get obuspa.dhcpmqtt)
-		if [ -n "${ex_mqtt}" ]; then
-			uci -q del obuspa.dhcpmqtt
-			uci_change=1
-		fi
-
-		## Handling of mtp section
-		ct_proto=$(uci -q get obuspa.dhcpmtp.Protocol)
-		ct_port=$(uci -q get obuspa.dhcpmtp.Port)
-		ct_enable=$(uci -q get obuspa.dhcpmtp.Enable)
-		ct_encrypt=$(uci -q get obuspa.dhcpmtp.EnableEncryption)
-
-		if [ "${ct_proto}" != "WebSocket" ] || [ "${ct_port}" != "${port}" ] || [ "${ct_enable}" != "1" ] || [ "${ct_encrypt}" != "${mtp_encrypt}" ]; then
-			uci -q del obuspa.dhcpmtp
-			sec=$(uci -q add obuspa mtp)
-			uci -q rename obuspa."${sec}"='dhcpmtp'
-			uci -q set obuspa.dhcpmtp.Protocol='WebSocket'
-			uci -q set obuspa.dhcpmtp.Port="${port}"
-			uci -q set obuspa.dhcpmtp.Enable='1'
-			uci -q set obuspa.dhcpmtp.EnableEncryption="${mtp_encrypt}"
-			uci_change=1
-		fi
-	else
-		if [ "${proto}" == "mqtt" ]; then
-			transport_proto="TCP/IP"
-		else
-			transport_proto="TLS"
-		fi
-
-		## Handling of mqtt section
-		ct_address=$(uci -q get obuspa.dhcpmqtt.BrokerAddress)
-		ct_port=$(uci -q get obuspa.dhcpmqtt.BrokerPort)
-		ct_proto=$(uci -q get obuspa.dhcpmqtt.TransportProtocol)
-		ct_enable=$(uci -q get obuspa.dhcpmqtt.Enable)
-		ct_ver=$(uci -q get obuspa.dhcpmqtt.ProtocolVersion)
-
-		if [ "${ct_address}" != "${ip}" ] || [ "${ct_port}" != "${port}" ] || [ "${ct_proto}" != "${transport_proto}" ] || [ "${ct_enable}" != "1" ] || [ "${ct_ver}" != "5.0" ]; then
-			uci -q del obuspa.dhcpmqtt
-			sec=$(uci -q add obuspa mqtt)
-			uci -q rename obuspa."${sec}"='dhcpmqtt'
-			uci -q set obuspa.dhcpmqtt.BrokerAddress="${ip}"
-			uci -q set obuspa.dhcpmqtt.BrokerPort="${port}"
-			uci -q set obuspa.dhcpmqtt.TransportProtocol="${transport_proto}"
-			uci -q set obuspa.dhcpmqtt.Enable='1'
-			uci -q set obuspa.dhcpmqtt.ProtocolVersion='5.0'
-			uci_change=1
-		fi
-
-		## Handling of mtp section
-		ct_proto=$(uci -q get obuspa.dhcpmtp.Protocol)
-		ct_topic=$(uci -q get obuspa.dhcpmtp.ResponseTopicConfigured)
-		ct_enable=$(uci -q get obuspa.dhcpmtp.Enable)
-
-		config_load obuspa
-		config_get AgentEndpointID localagent EndpointID ""
-		if [ -z "${AgentEndpointID}" ]; then
-			serial=$(get_serial_from_db)
-			oui=$(get_oui_from_db)
-			AgentEndpointID=$(echo "${oui}-${serial//+/%2B}")
-		fi
-
-		topic_base=$(echo "${AgentEndpointID}" | sed -E 's/[^[:alnum:]]/_/g')
-		agent_topic="/usp/${topic_base}/endpoint"
-
-		if [ "${ct_proto}" != "MQTT" ] || [ "${ct_topic}" != "${agent_topic}" ] || [ "${ct_enable}" != "1" ]; then
-			uci -q del obuspa.dhcpmtp
-			sec=$(uci -q add obuspa mtp)
-			uci -q rename obuspa."${sec}"='dhcpmtp'
-			uci -q set obuspa.dhcpmtp.Protocol='MQTT'
-			uci -q set obuspa.dhcpmtp.ResponseTopicConfigured="${agent_topic}"
-			uci -q set obuspa.dhcpmtp.Enable='1'
-			uci -q set obuspa.dhcpmtp.mqtt='dhcpmqtt'
-			uci_change=1
-		fi
-	fi
-
-	if [ ${uci_change} -eq 1 ]; then
-		ubus call uci commit '{"config":"obuspa"}'
-	fi
-fi

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

@@ -20,7 +20,7 @@
  void DM_PRIV_RequestInit(dm_req_t *req, dm_node_t *node, char *path, dm_instances_t *inst);
 --- a/src/core/msg_handler.c
 +++ b/src/core/msg_handler.c
-@@ -902,6 +902,20 @@ char *MtpSendItemToString(mtp_send_item_
+@@ -893,6 +893,20 @@ char *MtpSendItemToString(mtp_send_item_
  
  /*********************************************************************//**
  **

obuspa/patches/0004-suppress-notification-logs.patch

@@ -1,6 +1,6 @@
 --- a/src/core/data_model.c
 +++ b/src/core/data_model.c
-@@ -1243,7 +1243,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
+@@ -1242,7 +1242,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
      // Exit if instance already exists - nothing to do
      if (exists)
      {
@@ -9,7 +9,7 @@
          return USP_ERR_CREATION_FAILURE;
      }
  
-@@ -1328,7 +1328,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
+@@ -1327,7 +1327,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
      // Exit if instance does not exist - nothing to do
      if (exists == false)
      {

obuspa/patches/0005-optimise_ubus_calls_cli.patch

@@ -1,14 +1,16 @@
+diff --git a/src/core/data_model.c b/src/core/data_model.c
+index 2cf4b6c..b92cf59 100644
 --- a/src/core/data_model.c
 +++ b/src/core/data_model.c
-@@ -137,6 +137,7 @@ int GetVendorParam(dm_node_t *node, char
+@@ -136,6 +136,7 @@ void DumpDataModelNodeMap(void);
+ int GetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *buf, int len, dm_req_t *req);
  int SetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *value, dm_req_t *req);
- double_link_t *FindLinkToFirstObject(double_linked_list_t *list);
  
 +extern bool is_running_cli_local_command;
  /*********************************************************************//**
  **
  ** DATA_MODEL_Init
-@@ -224,7 +225,9 @@ int DATA_MODEL_Init(void)
+@@ -223,7 +224,9 @@ int DATA_MODEL_Init(void)
      }
  
      // Set the default values of OUI, Serial Number and (LocalAgent) EndpointID, and cache EndpointID

obuspa/patches/0008-fix_cmake_warning.patch

@@ -1,12 +0,0 @@
-diff --git a/src/protobuf-c/protobuf-c.c b/src/protobuf-c/protobuf-c.c
-index 3dc5473..0a6bde7 100644
---- a/src/protobuf-c/protobuf-c.c
-+++ b/src/protobuf-c/protobuf-c.c
-@@ -1926,6 +1926,7 @@ repeated_field_pack_to_buffer(const ProtobufCFieldDescriptor *field,
- 		buffer->append(buffer, rv, scratch);
- 		tmp = pack_buffer_packed_payload(field, count, array, buffer);
- 		assert(tmp == payload_len);
-+		(void)tmp; // Keep cmake production build happy
- 		return rv + payload_len;
- 	} else {
- 		size_t siz;

obuspa/patches/0009-Implement-non-failing-version-of-asprintf-and-use-it.patch

@@ -1,121 +0,0 @@
-diff --git a/src/core/device_bulkdata.c b/src/core/device_bulkdata.c
-index 8e44f59..a77bd71 100755
---- a/src/core/device_bulkdata.c
-+++ b/src/core/device_bulkdata.c
-@@ -2995,6 +2995,33 @@ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timesta
-     return result;
- }
- 
-+/*********************************************************************//**
-+**
-+**  safe_asprintf
-+**
-+** Wrapper around asprintf that calls terminate in case of error
-+**
-+** \param   strp -- pointer to the output string
-+** \param   fmt -- printing format
-+**
-+** \return  None
-+**
-+**************************************************************************/
-+static void safe_asprintf(char **strp, const char *fmt, ...)
-+{
-+	int ret;
-+	va_list argp;
-+
-+	va_start(argp, fmt);
-+	ret = vasprintf(strp, fmt, argp);
-+	va_end(argp);
-+
-+	if (ret == -1) {
-+		USP_ERR_Terminate("%s (%d): asprintf(%s) failed",
-+				  __FUNCTION__, __LINE__, fmt);
-+	}
-+}
-+
- /*********************************************************************//**
- **
- ** append_string_to_target
-@@ -3024,7 +3051,7 @@ void append_string_to_target(char *str, char **output)
-     }
- 
-     assert(tmp != NULL);
--    asprintf(output, "%s%s", tmp, str);
-+    safe_asprintf(output, "%s%s", tmp, str);
-     free(tmp);
- }
- 
-@@ -3072,9 +3099,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
- 
-     if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
-         if (strcmp(row_timestamp, "None") == 0)
--            asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-+            safe_asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
-         else
--            asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
-+            safe_asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
- 
-         assert(str != NULL);
-         append_string_to_target(str, &output);
-@@ -3091,14 +3118,14 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-         // Add Collection time to each csv report element (only if specified and not 'None')
-         if (strcmp(row_timestamp, "Unix-Epoch")==0)
-         {
--            asprintf(&timestamp, "%lld", (long long int)report->collection_time);
-+            safe_asprintf(&timestamp, "%lld", (long long int)report->collection_time);
-         }
-         else if (strcmp(row_timestamp, "ISO-8601")==0)
-         {
-             char *result = iso8601_from_unix_time(report->collection_time, buf, sizeof(buf));
-             if (result != NULL)
-             {
--                asprintf(&timestamp, "%s", buf);
-+                safe_asprintf(&timestamp, "%s", buf);
-             }
-         }
- 
-@@ -3151,9 +3178,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-             if (type) {
-                 if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
-                     if (timestamp == NULL)
--                        asprintf(&str, "%s%c%s%c%s%c", param_path, separator, param_value, separator, type, rowseparator);
-+                        safe_asprintf(&str, "%s%c%s%c%s%c", param_path, separator, param_value, separator, type, rowseparator);
-                     else
--                        asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, param_path, separator, param_value, separator, type, rowseparator);
-+                        safe_asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, param_path, separator, param_value, separator, type, rowseparator);
- 
-                     assert(str != NULL);
-                     append_string_to_target(str, &output);
-@@ -3161,9 +3188,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-                     str = NULL;
-                 } else {
-                     if (str1 == NULL || strlen(str1) == 0)
--                        asprintf(&str, "%s", param_path);
-+                        safe_asprintf(&str, "%s", param_path);
-                     else
--                        asprintf(&str, "%c%s", separator, param_path);
-+                        safe_asprintf(&str, "%c%s", separator, param_path);
- 
-                     assert(str != NULL);
-                     append_string_to_target(str, &str1);
-@@ -3171,9 +3198,9 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-                     str = NULL;
- 
-                     if (str2 == NULL || strlen(str2) == 0)
--                        asprintf(&str, "%s", param_value);
-+                        safe_asprintf(&str, "%s", param_value);
-                     else
--                        asprintf(&str, "%c%s", separator, param_value);
-+                        safe_asprintf(&str, "%c%s", separator, param_value);
- 
-                     assert(str != NULL);
-                     append_string_to_target(str, &str2);
-@@ -3190,7 +3217,7 @@ char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator
-     }
- 
-     if (strcasecmp(csv_format, "ParameterPerColumn") == 0) {
--        asprintf(&str, "%c", rowseparator);
-+        safe_asprintf(&str, "%c", rowseparator);
-         assert(str != NULL);
-         append_string_to_target(str, &str1);
-         append_string_to_target(str, &str2);

obuspa/patches/0010-Return-error-when-XSI-compliant-strerror_r-fails-in-.patch

@@ -1,15 +0,0 @@
-diff --git a/src/core/usp_err.c b/src/core/usp_err.c
-index 1626e58..6db1d42 100755
---- a/src/core/usp_err.c
-+++ b/src/core/usp_err.c
-@@ -189,7 +189,9 @@ char *USP_ERR_ToString(int err, char *buf, int len)
- {
- #if HAVE_STRERROR_R && !STRERROR_R_CHAR_P
-     // XSI version of strerror_r
--    strerror_r(err, buf, len);
-+    if (strerror_r(err, buf, len) != 0) {
-+        snprintf(buf, len, "Unknown error %d", err);
-+    }
-     return buf;
- #else
-     // GNU version of strerror_r

obuspc/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspc
-PKG_VERSION:=1.0.1.6
+PKG_VERSION:=1.0.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa-test-controller.git
-PKG_SOURCE_VERSION:=61f14c5a1fba8c251cf1cfb18c163eab62d5674d
+PKG_SOURCE_VERSION:=f1f721bc1a4feaf63c7f7837eb7b0c86111e2f71
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -61,13 +61,12 @@ define Package/obuspc/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(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) $(PKG_BUILD_DIR)/obuspc $(1)/usr/sbin/
+	$(INSTALL_BIN) ./files/etc/init.d/obuspc $(1)/etc/init.d/
 	$(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/
+	$(INSTALL_DATA) ./files/etc/config/obuspc $(1)/etc/config/
 endef
 
 $(eval $(call BuildPackage,obuspc))

obuspc/files/etc/config/obuspc

@@ -0,0 +1,19 @@
+config obuspc 'global'
+	option enabled '1'
+	option debug '1'
+	option log_level '1'
+	option prototrace '1'
+
+config mqtt 'mqtt'
+	option BrokerAddress '127.0.0.1'
+	option BrokerPort '1883'
+	option TransportProtocol 'TCP/IP'
+
+config controller 'controller'
+	option EndpointID 'proto::interop-usp-controller'
+	option Protocol 'MQTT'
+	option ResponseTopicConfigured '/usp/controller'
+	option mqtt 'mqtt'
+
+config agent 'agent'
+	option Topic '/usp/endpoint'

obuspc/files/etc/config/uspc

@@ -1,24 +0,0 @@
-config global 'global'
-	option enabled '1'
-	option debug '1'
-	option log_level '1'
-	option prototrace '0'
-
-config mqtt 'mqtt'
-	option BrokerAddress '127.0.0.1'
-	option BrokerPort '9006'
-	option TransportProtocol 'TCP/IP'
-
-config controller 'controller'
-	option EndpointID 'proto::discovery-usp-controller'
-	option Protocol 'MQTT'
-	option ResponseTopicConfigured '/usp/discovery/controller'
-	option mqtt 'mqtt'
-
-config proxy 'usp'
-	option protocol 'USP'
-	option parent_dm 'Device.'
-	option mount_point 'Node'
-
-config agent 'agent'
-	option Topic '/usp/endpoint'

obuspc/files/etc/init.d/obuspc

@@ -4,17 +4,16 @@ START=99
 STOP=01
 USE_PROCD=1
 
-PROG=/usr/sbin/uspc
-CONFIGURATION=uspc
+PROG=/usr/sbin/obuspc
+CONFIGURATION=obuspc
 
-RESET_FILE="/tmp/usp/uspc_param_reset.txt"
+RESET_FILE="/tmp/usp/obuspc_param_reset.txt"
 SQL_DB_FILE="/tmp/usp/uspc.db"
 
 BASEPATH=""
 INSTANCE_COUNT=0
 
 . /usr/share/libubox/jshn.sh
-. /lib/functions.sh
 
 global_init()
 {
@@ -24,7 +23,7 @@ global_init()
 
 log()
 {
-	echo "$*"|logger -t uspc.init -p debug
+	echo "$*"|logger -t obuspc.init -p debug
 }
 
 db_set_reset_file()
@@ -79,264 +78,9 @@ get_refrence_path()
 	echo "${path}"
 }
 
-convert_to_hex() {
-	local val=""
-	local optval="${1}"
-	OPTIND=1
-	while getopts ":" opt "-$optval"
-	do
-		temp=$(printf "%02X" "'${OPTARG:-:}")
-		val="${val}:${temp}"
-	done
-
-	echo "${val}"
-}
-
-check_for_suboptions() {
-	new_opt=""
-	# Check if option 25 and 29 present inside enterprise id 3561
-	data=$(echo "${1}" | sed 's/://g')
-	len=$(printf "${data}"|wc -c)
-
-	rem_len="${len}"
-	while [ $rem_len -gt 8 ]; do
-		subopt_present=0
-
-		ent_id="${data:0:8}"
-		ent_id=$(printf "%d\n" "0x$ent_id")
-		if [ $ent_id -ne 3561 ]; then
-			len_val=${data:8:2}
-			data_len=$(printf "%d\n" "0x$len_val")
-			# add 4 byte for ent_id and 1 byte for len
-			data_len=$(( data_len * 2 + 10 ))
-
-			opt=${data:0:"${data_len}"}
-			if [ -n "${new_opt}" ]; then
-				new_opt="${new_opt}:$(echo ${opt} | sed 's/../&:/g;s/:$//')"
-			else
-				new_opt="$(echo ${opt} | sed 's/../&:/g;s/:$//')"
-			fi
-
-			# move ahead data to next enterprise id
-			data=${data:"${data_len}":"${rem_len}"}
-			rem_len=$(( rem_len - data_len ))
-			continue
-		fi
-
-		# read the length of enterprise data
-		len_val=${data:8:2}
-		data_len=$(printf "%d\n" "0x$len_val")
-		# add 4 byte for ent_id and 1 byte for len
-		data_len=$(( data_len * 2 + 10 ))
-
-		len_val=${data:8:2}
-		opt_len=$(printf "%d\n" "0x$len_val")
-		if [ $opt_len -eq 0 ]; then
-			echo "${new_opt}"
-			return 0
-		fi
-
-		# populate the option data of enterprise id
-		sub_data_len=$(( opt_len * 2))
-		# starting 10 means ahead of length field
-		sub_data=${data:10:"${sub_data_len}"}
-
-		# parsing of suboption of option 125
-		while [ $sub_data_len -gt 0 ]; do
-			# get the suboption id
-			sub_opt_id=${sub_data:0:2}
-			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
-			case "${sub_opt_id}" in
-			"25") subopt_present=1
-			;;
-			"26") subopt_present=1
-			;;
-			"27") subopt_present=1
-			;;
-			"28") subopt_present=1
-			;;
-			"29") subopt_present=1
-			;;
-			esac
-
-			if [ $subopt_present -eq 1 ]; then
-				break;
-			fi
-
-			# get the length of suboption
-			sub_opt_len=${sub_data:2:2}
-			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
-			sub_opt_len=$(( sub_opt_len * 2 ))
-
-			# add 2 bytes for sub_opt id and sub_opt len field
-			sub_opt_end=$(( sub_opt_len + 4 ))
-
-			# update the remaining sub option hex string length
-			sub_data_len=$((sub_data_len - sub_opt_end))
-
-			# fetch next sub option hex string
-			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
-		done
-
-		if [ $subopt_present -eq 1 ]; then
-			# move ahead data to next enterprise id
-			rem_len=$(( rem_len - $data_len ))
-			data=${data:"${data_len}":"${rem_len}"}
-		else
-			opt=${data:0:"${data_len}"}
-			if [ -n "${new_opt}" ]; then
-				new_opt="${new_opt}:$(echo ${opt} | sed 's/../&:/g;s/:$//')"
-			else
-				new_opt="$(echo ${opt} | sed 's/../&:/g;s/:$//')"
-			fi
-
-			# move ahead data to next enterprise id
-			rem_len=$(( rem_len - $data_len ))
-			data=${data:"${data_len}":"${rem_len}"}
-		fi
-	done
-
-	echo "${new_opt}"
-}
-
-configure_dnsmasq_op125() {
-	intf="${1}"
-
-	endpoint=""
-	proto=""
-	address=""
-	port=""
-	topic=""
-	prov_code="obusp-client"
-	interval="5"
-	multiplier="2000"
-
-	config_load ${CONFIGURATION}
-	config_get endpoint controller EndpointID
-	config_get proto controller Protocol
-	if [ -z "${endpoint}" ] || [ -z "${proto}" ]; then
-		return 0
-	fi
-
-	if [ "${proto}" = "MQTT" ]; then
-		config_get port mqtt BrokerPort "1883"
-		config_get topic controller ResponseTopicConfigured
-		proto="mqtt://"
-	else
-		return 0
-	fi
-
-	address=$(ifstatus "${intf}" | jsonfilter -q -e '@["ipv4-address"][0].address')
-	if [ -z "${address}" ] || [ -z "${topic}" ]; then
-		return 0
-	fi
-
-	subop_present=0
-	opt125="125,"
-	base_opt=""
-
-	service="$(uci -q get dhcp."${intf}".dhcpv4)"
-	if [ "${service}" = "server" ]; then
-		opt_list="$(uci -q get dhcp."${intf}".dhcp_option)"
-		for sopt in $opt_list; do
-			if [[ "$sopt" == "$opt125"* ]]; then
-				base_opt=$(check_for_suboptions "${sopt:4}")
-				uci -q del_list dhcp."${intf}".dhcp_option="$sopt"
-				uci -q commit dhcp
-				break
-			fi
-		done
-	else
-		return 0
-	fi
-
-	if [ -z "${base_opt}" ]; then
-		opt125="125,00:00:0D:E9"
-	else
-		opt125="125,${base_opt}:00:00:0D:E9"
-	fi
-
-	url="${proto}${address}:${port}${topic}"
-	url_len=$(echo -n "${url}" | wc -m)
-	prov_code_len=$(echo -n "${prov_code}" | wc -m)
-	endpoint_len=$(echo -n "${endpoint}" | wc -m)
-	interval_len=$(echo -n "${interval}" | wc -m)
-	multiplier_len=$(echo -n "${multiplier}" | wc -m)
-
-	([ ${url_len} -gt 255 ] || [ ${prov_code_len} -gt 255 ] || [ ${endpoint_len} -gt 255 ]) && return 0
-	([ ${interval_len} -gt 255 ] || [ ${multiplier_len} -gt 255 ]) && return 0
-
-	opt125_len=$((url_len + prov_code_len + endpoint_len + interval_len + multiplier_len))
-	opt125_len=$((opt125_len + 10))
-
-	[ $opt125_len -gt 255 ] && return 0
-
-        hex_opt125_len=$(printf "%02X" "${opt125_len}")
-        opt125="${opt125}:${hex_opt125_len}"
-        hex_url=$(convert_to_hex "${url}")
-        if [ -z "${hex_url}" ]; then
-                return 0
-        fi
-
-        hex_url_len=$(printf "%02X" "${url_len}")
-        opt125="${opt125}:19:${hex_url_len}${hex_url}"
-
-        hex_prov_code=$(convert_to_hex "${prov_code}")
-        if [ -z "${hex_prov_code}" ]; then
-                return 0
-        fi
-
-        hex_prov_len=$(printf "%02X" "${prov_code_len}")
-	opt125="${opt125}:1A:${hex_prov_len}${hex_prov_code}"
-
-	hex_interval=$(convert_to_hex "${interval}")
-	if [ -z "${hex_interval}" ]; then
-		return 0
-	fi
-
-	hex_interval_len=$(printf "%02X" "${interval_len}")
-	opt125="${opt125}:1B:${hex_interval_len}${hex_interval}"
-
-	hex_multiplier=$(convert_to_hex "${multiplier}")
-	if [ -z "${hex_multiplier}" ]; then
-		return 0
-	fi
-
-	hex_multiplier_len=$(printf "%02X" "${multiplier_len}")
-	opt125="${opt125}:1C:${hex_multiplier_len}${hex_multiplier}"
-
-	hex_endpoint=$(convert_to_hex "${endpoint}")
-	if [ -z "${hex_endpoint}" ]; then
-		return 0
-	fi
-
-	hex_endpoint_len=$(printf "%02X" "${endpoint_len}")
-	opt125="${opt125}:1D:${hex_endpoint_len}${hex_endpoint}"
-
-	uci -q add_list dhcp."${intf}".dhcp_option="$opt125"
-	ubus call uci commit '{"config":"dhcp"}'
-}
-
-boot() {
-	local enabled
-	local interface
-
-	config_load ${CONFIGURATION}
-	config_get_bool enabled global enabled 0
-	config_get interface global interface "lan"
-
-	if [ "${enabled}" -eq 0 ]; then
-		return 0;
-	fi
-
-	configure_dnsmasq_op125 "${interface}"
-
-	start
-}
-
 validate_global_section()
 {
-	uci_validate_section ${CONFIGURATION} uspc "${1}" \
+	uci_validate_section ${CONFIGURATION} obuspc "${1}" \
 		'enabled:bool:1' \
 		'debug:bool:0' \
 		'prototrace:bool:0' \
@@ -513,7 +257,7 @@ configure_mqtt_client() {
 	db_set
 }
 
-configure_uspc() {
+configure_obuspc() {
 	local enabled trust_cert ifname interface debug prototrace log_level db_file log_dest
 	local client_cert
 
@@ -573,7 +317,7 @@ register_service()
 	procd_open_instance ${CONFIGURATION}
 	procd_set_param command ${PROG}
 
-	configure_uspc
+	configure_obuspc
 	procd_set_param respawn \
 			"${respawn_threshold:-5}" \
 			"${respawn_timeout:-10}" "${respawn_retry:-3}"
@@ -582,7 +326,7 @@ register_service()
 }
 
 start_service() {
-	local enabled mode
+	local enabled
 
 	config_load ${CONFIGURATION}
 	config_get_bool enabled global enabled 0
@@ -600,11 +344,6 @@ stop_service() {
 	${PROG} -c stop >/dev/null 2>&1
 }
 
-reload_service() {
-	stop
-	start
-}
-
 service_triggers() {
-	procd_add_reload_trigger "uspc"
+	procd_add_reload_trigger "obuspc"
 }

obuspc/files/etc/uci-defaults/100-add-mosquitto-listener

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-# exit if running in an extender
-enabled="$(uci -q get uspc.global.enabled)"
-if [ "$enabled" -eq 0 ]; then
-	return 0;
-fi
-
-section_exist=$(uci -q get mosquitto.uspc)
-if [ -z "${section_exist}" ]; then
-	uci set mosquitto.uspc=listener
-fi
-
-port=$(uci -q get uspc.mqtt.BrokerPort)
-uci -q set mosquitto.uspc.enabled="1"
-uci -q set mosquitto.uspc.port=$port
-uci -q set mosquitto.uspc.allow_anonymous="1"
-uci commit mosquitto

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