icwmp: Remove set dhcp reqopt from uci-defaults && set dhcp_url to icwmp config

Added support to specify the boot params for each controller separately in the controller UCI section.

bbf/Config_bbfdm.in

@@ -1,5 +1,7 @@
 if PACKAGE_libbbfdm
 
+menu "Configuration"
+
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -24,4 +26,12 @@ config BBF_TR143
 	bool "Enable TR-143 Data Model Support"
 	default y
 
+config BBFDM_ENABLE_JSON_PLUGIN
+	bool "Enable json plugin to extend datamodel"
+	default n
+
+config BBFDM_ENABLE_DOTSO_PLUGIN
+	bool "Enable shared library plugin to extend datamodel"
+	default n
+endmenu
 endif

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.0.6
+PKG_VERSION:=6.2.6
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9842552d421adb529b8771b8f9dc41ddc89f5b62
+PKG_SOURCE_VERSION:=bbb44b4061ff531b198c11d6117c35631c778d91
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -23,17 +23,17 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libbbf_api
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=BBF
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
   TITLE:=Library for libbbfdm API
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
 define Package/libbbfdm
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=BBF
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
   TITLE:=Library for broadband-forum data model
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libcurl
 endef
@@ -91,36 +91,46 @@ CONFIGURE_ARGS += \
 
 endif ##CONFIG_BBF_VENDOR_EXTENSION
 
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+CONFIGURE_ARGS += \
+	--enable-json-plugin
+endif
+
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+CONFIGURE_ARGS += \
+	--enable-shared-library
+endif
+
 define Package/libbbf_api/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
 endef
 
 define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef
 
 define Package/libbbfdm/prerm
 	#!/bin/sh
-	rm -rf /etc/bbfdm/*
+	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
 endef
 
 define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(CP) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
 endef
 
 $(eval $(call BuildPackage,libbbf_api))

bulkdata/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
 
-PKG_SOURCE_VERSION:=150eb3122c969d1646c8ca8c8152154990f91823
+PKG_SOURCE_VERSION:=b35e7862bc17fc11dc1f757c7b93900995a28633
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
 

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.1.18
+PKG_VERSION:=3.2.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0e937cfb839f845cf28922c4dde0572ec2842f85
+PKG_SOURCE_VERSION:=8f777088767d3fe4d751ca36e166c96e7f6de4ab
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci
+	DEPENDS:= +libubox +ubus +uci +libxml2
 endef
 
 define Package/$(PKG_NAME)/description
@@ -47,16 +47,19 @@ define Build/Prepare
 endef
 endif
 
-MAKE_FLAGS += \
-	CFLAGS+="-Wall"
+TARGET_CFLAGS += \
+	-Wall \
+	-I$(STAGING_DIR)/usr/include/libxml2
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/dectmngr
 	$(CP) ./files/etc/* $(1)/etc/
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dect $(1)/lib/upgrade/keep.d/dect
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

dectmngr/files/lib/upgrade/keep.d/dect

@@ -0,0 +1 @@
+/etc/dect/LA_DB

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.5
+PKG_VERSION:=6.4.28
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=23028753fdfc5f4a0e8da33fb6b813e21c5d6c23
+PKG_SOURCE_VERSION:=a6f80b4c7f3f9f6c8d8785516e83df4f12dcfc1b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

endptmngr/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=endptmngr
-PKG_VERSION:=0.5
+PKG_VERSION:=0.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=debfc47348d6e1fc1c8b126ad50a7f5f8db3e19d
+PKG_SOURCE_VERSION:=1d4f1aafcb929e64597d226a710fd0c1b949ba08
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -30,7 +30,7 @@ PKG_BUILD_PARALLEL:=1
 # indirectly. This ensures that the package is rebuilt on config-changes.
 PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
 
-export CONFIG_BRCM_SDK_VER_504002
+export CONFIG_BRCM_SDK_VER_504021
 export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk

fdtextract/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=1.0
 
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=45575262de7a9690bcb2c760f35e2c74e88e1176
+PKG_SOURCE_VERSION:=ef46eb3be68ae1216d8699234f237fb2243289f1
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2

gryphon-led-module/Makefile

@@ -28,6 +28,7 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
+  DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):bcmkernel
   PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef
@@ -40,6 +41,21 @@ EXTRA_KCONFIG:= CONFIG_RGB_LED=m
 
 MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
 
+
+ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
+	MODULES_SUBDIR:=lib/modules/4.19.183
+	TARGET_CROSS:=$(CONFIG_BCM_TOOLCHAIN)/bin/$(CONFIG_BCM_TOOLTUPLE)
+
+	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))
+		# These targets use a 64-bit kernel
+		LINUX_KARCH:=arm64
+		TARGET_CROSS:=/opt/toolchains/crosstools-aarch64-gcc-9.2-linux-4.19-glibc-2.30-binutils-2.32/bin/aarch64-buildroot-linux-gnu-
+	endif
+	# For some reason, Broadcom's kernel does not set the include paths correctly when compiling out-of-tree modules
+	EXTRA_KCPPFLAGS:="-I $(LINUX_DIR)/../bcmkernel/include -I $(LINUX_DIR)/arch/arm/mach-bcm963xx/include"
+endif
+
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
 	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/

icwmp/Config_cwmp.in

@@ -1,5 +1,6 @@
 if PACKAGE_icwmp
 
+menu "Configuration"
 choice
 	prompt "Select ACS sever"
 	default CWMP_ACS_MULTI
@@ -18,6 +19,6 @@ config CWMP_DEBUG
 config CWMP_DEVEL_DEBUG
 	bool "Compile with development debug options"
 	default n
-
+endmenu
 endif
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.0-2021-10-05
+PKG_VERSION:=8.2.11-2021-11-23
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ab875277578d851a9f8eed57883ca05c886b127d
+PKG_SOURCE_VERSION:=5401894b4e447aa72d0acf82bd938a04a0330dc5
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -89,11 +89,11 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/90-icwmp $(1)/etc/hotplug.d/iface/90-icwmp
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/99-icwmp $(1)/etc/hotplug.d/iface/99-icwmp
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-icwmp-generate-ssl $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 endef
 

icwmp/files/etc/config/cwmp

@@ -5,7 +5,6 @@ config acs 'acs'
 	option periodic_inform_enable 'true'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
-	option ParameterKey ''
 	option dhcp_discovery 'enable'
 	# compression possible configs: GZIP, Deflate, Disabled
 	option compression 'Disabled'

icwmp/files/etc/firewall.cwmp

@@ -5,9 +5,9 @@ if [ ! -f "/var/state/cwmp" ]; then
 fi
 
 zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
-port=$(uci -c /var/state -q get cwmp.acs.port)
+port=$(uci -q get cwmp.cpe.port)
 ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
-ipv6enable=$(uci -c /var/state -q get cwmp.acs.ipv6_enable)
+ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
 incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr [A-Z] [a-z])
 
 if [ "$zone_name" = "" ]; then
@@ -28,15 +28,8 @@ else
 	iptables -X zone_icwmp_input 2> /dev/null
 fi
 
-cmd=""
-
-if [ "${ipv6enable}" = "1" ]; then
-	cmd="ip6tables"
-else
-	cmd="iptables"
-fi
-
-cmd="${cmd} -I zone_${zone_name}_input -p tcp"
+cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
+cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
 
 # default incoming rule is Port only
 if [ -z "${incoming_rule}" ]; then
@@ -46,26 +39,36 @@ fi
 if [ "${incoming_rule}" = "ip_only" ]; then
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
+		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 elif [ "${incoming_rule}" = "port_only" ]; then
 	if [ -n "${port}" ]; then
 		cmd="${cmd} --dport ${port}"
+		cmd6="${cmd6} --dport ${port}"
 	fi
 else
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
+		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 
 	if [ -n "${port}" ]; then
 		cmd="${cmd} --dport ${port}"
+		cmd6="${cmd6} --dport ${port}"
 	fi
 fi
 
 echo ${cmd}|grep -q "\-\-dport \|\-s "
-if [ "$?" -ne 0 ]; then
-	exit 0;
+if [ "$?" -eq 0 ]; then
+	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+	${cmd}
 fi
 
-cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+echo ${cmd6}|grep -q "\-\-dport \|\-s "
+if [ "$?" -eq 0 ]; then
+	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
+	${cmd6}
+fi
 
-${cmd}
+uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
+uci -c /var/state -q commit cwmp

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

@@ -2,8 +2,7 @@
 
 . /lib/functions/network.sh
 
-
-[ "$ACTION" == "ifup" ] || exit 0
+[ "$ACTION" == "ifup" -o "$ACTION" == "ifupdate" ] || exit 0
 
 [ -f /etc/config/cwmp ] || exit 0
 
@@ -64,8 +63,25 @@ handle_icwmp_restart() {
 	network_get_device curdev $INTERFACE
 	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
 
-	local wan_iface=`uci get cwmp.cpe.default_wan_interface`
-	local vendorspecinf=`ubus call network.interface.wan status | jsonfilter -e "@.data.vendorspecinf"`
+	if [ ! -f /var/state/cwmp ]
+	then
+		if [ -f /etc/icwmpd/cwmp ]
+		then
+			uci -c /etc/icwmpd delete cwmp.acs
+			uci -c /etc/icwmpd commit cwmp
+			cp /etc/icwmpd/cwmp /var/state/cwmp
+		else
+			touch /var/state/cwmp
+		fi
+	fi
+	
+	uci -q -c /var/state/ get cwmp.cpe
+	if [ "$?" -ne 0 ]; then
+		unnamedcpe=`uci -q -c /var/state/ add cwmp cpe`
+		uci -c /var/state/ -q rename cwmp.$unnamedcpe='cpe'
+	fi 
+	
+	local vendorspecinf=`ubus call network.interface.${defwan} status | jsonfilter -e "@.data.vendorspecinf"`
 	[ -n "$vendorspecinf" ] && {
 		local url=""
 		case $vendorspecinf in
@@ -82,16 +98,8 @@ handle_icwmp_restart() {
 				done
 			;;
 		esac
-		if [ ! -f /var/state/cwmp ]; then
-			touch /var/state/cwmp
-		fi
-		uci -q -c /var/state/ get cwmp.acs
-		if [ "$?" -ne 0 ]; then
-			unnamed=`uci -q -c /var/state/ add cwmp acs`
-			uci -c /var/state/ -q rename cwmp.$unnamed='acs'
-		fi
-		[ -n "$url" ] && uci -c /var/state -q set cwmp.acs.dhcp_url="$url"
-		uci -c /var/state commit cwmp
+		[ -n "$url" ] && uci -q set cwmp.acs.dhcp_url="$url"
+		uci commit cwmp
 	}
                 
 	local prevopt43url=""

icwmp/files/etc/init.d/icwmpd

@@ -6,125 +6,60 @@ include /lib/network
 . /usr/share/libubox/jshn.sh
 
 START=99
-STOP=10
+STOP=2
 
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
 
-EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
-
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
 
-validate_url() {
-	# SCHEMA_LIST: contain list of possible schemas that could be present in the acs url
-	# Example: SCHEMA_LIST="http https"
-	SCHEMA_LIST="http"
-
-	for schema in $SCHEMA_LIST;	do
-		dest=`echo $1 | sed 's/$schema:\/\///g' | cut -f1 -d \/ | cut -f1 -d:`
-		if [ "_$dest" != "_" ]; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-get_acs_url() {
-	local default_acs="http://10.10.1.6:8000/openacs/acs"
-	local acs_dhcp_discovery="$(uci -q get cwmp.acs.dhcp_discovery)"
-	local url="$(uci -q get cwmp.acs.url)"
-	local dhcp_url="$(uci -c /var/state -q get cwmp.acs.dhcp_url)"
-
-	if [ "$acs_dhcp_discovery" == "enable" -a -n "$dhcp_url" -o -z "$url" ]; then
-		url="$dhcp_url"
-		log "ACS URL from DHCP server: $url"
-		[ -n "$url" ] && uci -c /var/state -q set cwmp.acs.url="$url" || url="$default_acs"
-	elif [ -n "$url" ];then
-		url="$(uci -q get cwmp.acs.url)"
-		log "ACS URL from configuration: $url"
-	else
-		url="$default_acs"
-		log "Using default ACS URL: $url"
-		[ -n "$url" ] && uci -c /var/state -q set cwmp.acs.url="$url"
-	fi
-
-	validate_url "$url"
-	if [ "$?" != "0" ];then
-		echo "Invalid ACS URL: $url"
-		exit 1
-	fi
-}
-
 enable_dhcp_option43() {
 	local wan=$1
-	local discovery=0
-	case $2 in
-		enable|1) discovery=1 ;;
-	esac
 
 	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local enabled
-	local newreqopts=
-	local baseopts=
 	local reqopts="$(uci -q get network.$wan.reqopts)"
 	local proto="$(uci -q get network.$wan.proto)"
-	local tropts="43"
-	local oldreqopts="$reqopts"
-	local ropt iopt
+	local newreqopts=""
+	local option43_present=0
+
 	for ropt in $reqopts; do
 		case $ropt in
-			43) ;;
-			*) baseopts="$baseopts $ropt" ;;
-		esac
-	done
-	ropt=""
-	reqopts="$baseopts $tropts"
-	for ropt in $reqopts; do
-		case $ropt in
-			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
-			*) newreqopts="$newreqopts $ropt" ;;
+			43) option43_present=1 ;;
+			*) ;;
 		esac
 	done
+
+	if [ ${option43_present} -eq 1 ]; then
+		return;
+	fi
+
+	newreqopts="$reqopts 43"
 	if [ $proto == "dhcp" ]; then
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		[ "$newreqopts" == "$oldreqopts" ] && return
 		uci -q set network.$wan.reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
 	fi
-	########################################################
 }
 
 wait_for_option43() {
 	local time=$1
-	local default_wan_interface dhcp_discovery url
-
-	config_get default_wan_interface cpe default_wan_interface "wan"
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get url acs url
-
-	enable_dhcp_option43 $default_wan_interface $dhcp_discovery
 
 	local tm=0
 
-	if [ "$dhcp_discovery" == "enable" -o "$dhcp_discovery" == "1" ]
-	then
-		log "Waiting for discovery of ACS URL from dhcp server ..."
-		while [ $tm -le $time ]
-		do
-			acs_url=`uci -c /var/state -q get cwmp.acs.dhcp_url`
-			if [ "$acs_url" != "" ]
-			then
-				break
-			else
-				sleep 1
-			fi
-			tm=$((tm+1))
-		done
-	fi
+	log "Waiting for discovery of ACS URL from dhcp server ..."
+	while [ $tm -le $time ]
+	do
+		acs_url=`uci -q get cwmp.acs.dhcp_url`
+		if [ "$acs_url" != "" ]
+		then
+			break
+		else
+			sleep 1
+		fi
+		tm=$((tm+1))
+	done
 }
 
 wait_for_resolvfile() {
@@ -154,42 +89,163 @@ set_wan_interface() {
 	fi
 }
 
-service_running() {
-	ubus wait_for usp.raw
+copy_cwmp_etc_files_to_varstate() {
+	if [ ! -f /var/state/cwmp ]
+	then
+		if [ -f /etc/icwmpd/cwmp ]
+		then
+			uci -q -c /etc/icwmpd delete cwmp.acs
+			uci -q -c /etc/icwmpd commit cwmp
+			cp /etc/icwmpd/cwmp /var/state/cwmp
+		else
+			touch /var/state/cwmp
+		fi
+	fi
+	
+	mkdir -p /var/state/icwmpd
+	if [ -f /etc/icwmpd/.icwmpd_backup_session.xml ]
+	then
+		mv /etc/icwmpd/.icwmpd_backup_session.xml /var/state/icwmpd 2>/dev/null
+	fi
+	if [ -f /etc/icwmpd/.dm_enabled_notify.xml ]
+	then
+		mv /etc/icwmpd/.dm_enabled_notify /var/state/icwmpd 2>/dev/null
+	fi
+}
+
+copy_cwmp_varstate_files_to_etc() {
+	if [ -f /var/state/cwmp ]
+	then
+		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
+	fi
+	if [ -f /var/state/icwmpd/.icwmpd_backup_session.xml ]
+	then
+		cp /var/state/icwmpd/.icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
+	fi
+	if [ -f /var/state/icwmpd/.dm_enabled_notify.xml ]
+	then
+		cp /var/state/icwmpd/.dm_enabled_notify /etc/icwmpd 2>/dev/null
+	fi
+}
+
+validate_acs_section()
+{
+	uci_validate_section cwmp acs "acs" \
+		'passwd:string' \
+		'periodic_inform_enable:bool' \
+		'periodic_inform_interval:uinteger' \
+		'periodic_inform_time:string' \
+		'url:string:http://192.168.1.1' \
+		'dhcp_discovery:or("enable", "disable")' \
+		'compression:or("GZIP","Deflate","Disabled")' \
+		'retry_min_wait_interval:range(1, 65535)' \
+		'retry_interval_multiplier:range(1000, 65535)' \
+		'https_ssl_capath:file' \
+		'ipv6_enable:bool'
+		
+}
+
+validate_cpe_section()
+{
+	uci_validate_section cwmp cpe "cpe" \
+		'interface:string' \
+		'default_wan_interface:string' \
+		'log_to_console:or("enable","disable")' \
+		'log_to_file:or("enable","disable")' \
+		'log_severity:or("EMERG", "ALERT", "CRITIC" ,"ERROR", "WARNING", "NOTICE", "INFO", "DEBUG")' \
+		'log_file_name:string' \
+		'log_max_size:uinteger' \
+		'userid:string' \
+		'passwd:string' \
+		'port:uinteger' \
+		'provisioning_code:string:""' \
+		'amd_version:range(1, 6)' \
+		'instance_mode:or("InstanceNumber","InstanceAlias")' \
+		'session_timeout:uinteger' \
+		'notification:bool' \
+		'exec_download:bool' \
+		'periodic_notify_enable:bool' \
+		'enable:bool' \
+		'periodic_notify_interval:uinteger'		
+}
+
+validate_defaults() {
+	config_load cwmp
+
+	validate_acs_section || {
+		log "Validation of acs section failed"
+		return 1;
+	}
+
+	validate_cpe_section || {
+		log "Validation of cpe section failed"
+		return 1;
+	}
+
+	[ -z "${default_wan_interface}" ] && {
+		log "Wan interface is empty"
+		return 1;
+	}
+
+	return 0;
+}
+
+validate_acs_url() {
+	dhcp_url=`uci -q get cwmp.acs.dhcp_url`
+	[ -z "${url}" -a -z "${dhcp_url}" ] && {
+		log "ACS url is empty"
+		return 1;
+	}
+	
+	return 0
 }
 
 start_service() {
-	if [ ! -f /tmp/.icwmpd_boot ]; then
-		touch /etc/icwmpd/.icwmpd_boot
-		touch /tmp/.icwmpd_boot
-	else
-		[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-		[ -f /etc/config/wireless ] && log "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
-		[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
-		[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-		[ -f /usr/sbin/asterisk ] && log "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
-
-		log "Waiting for usp.raw to be started"
-		ubus wait_for usp.raw
-
-		config_load cwmp
-		set_wan_interface
-		wait_for_option43 20
-		get_acs_url
-
-		procd_open_instance icwmp
-		procd_set_param command "$PROG"
-		if [ "$1" = "GetRPCMethods" ];then
-			procd_append_param command -g
-		elif [ -f /etc/icwmpd/.icwmpd_boot ]; then
-			procd_append_param command -b
-		fi
-		procd_set_param respawn \
-			${respawn_threshold:-5} \
-			${respawn_timeout:-10} ${respawn_retry:-3}
-
-		procd_close_instance
+	enable_cwmp=`uci -q get cwmp.cpe.enable`
+	if [ "$enable_cwmp" = "0" -o "$enable_cwmp" = "false" ]; then
+		log "CWMP is not enabled"
+		return
 	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
+	
+	log "Waiting for usp.raw to be started"
+	ubus wait_for usp.raw
+	
+	validate_defaults || {
+		log "Validation of defaults failed"
+		return 1;
+	}
+	
+	# Set wan interface if not configured
+	set_wan_interface
+	
+	# Set dhcp option 43 if dhcp discovery enabled
+	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
+		enable_dhcp_option43 $default_wan_interface
+		wait_for_option43 30
+	fi
+	
+	validate_acs_url || {
+		log "Validation of ACS URL failed"
+		return 1;
+	}
+	
+	copy_cwmp_etc_files_to_varstate
+	procd_open_instance icwmp
+	procd_set_param command "$PROG"
+	procd_append_param command -b
+	procd_set_param respawn \
+		${respawn_threshold:-5} \
+		${respawn_timeout:-10} ${respawn_retry:-3}
+	
+	procd_close_instance
+}
+
+stop_service()
+{
+	copy_cwmp_varstate_files_to_etc
 }
 
 reload_service() {

icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts

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

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

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

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

@@ -1 +1 @@
-/etc/icwmpd/.icwmpd_backup_session.xml
+/var/state/icwmpd/.icwmpd_backup_session.xml

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.0.1
+PKG_VERSION:=4.0.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c4e6275434c65d64a90edbefa225f582f2ce356e
+PKG_SOURCE_VERSION:=67ace7d344e287cd8b1d90003ed487cd021e5223
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -110,6 +110,7 @@ define Build/InstallDev/libieee1905
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(1)/usr/include/
+	$(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/

iop/config

@@ -1,4 +1,3 @@
-CONFIG_BUILD_NLS=y
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y

map-agent/Makefile

@@ -5,18 +5,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.0.2
+PKG_VERSION:=6.1.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=184fcb9b10fcb5978da22058792af859424dbb8d
+PKG_SOURCE_VERSION:=11c7b8686a936262d25123a3c1eb822da31078a5
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-agent.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-agent
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
+endif
 
 PKG_BUILD_DEPENDS:=map-plugin
 
@@ -53,4 +56,10 @@ define Package/map-agent/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef
 
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        rsync -r --exclude=.* ~/git/map-agent/ $(PKG_BUILD_DIR)/
+endef
+endif
+
 $(eval $(call BuildPackage,map-agent))

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

@@ -0,0 +1,45 @@
+#!/bin/sh
+
+wan=$(db -q get hw.board.ethernetWanPort)
+
+[ -z "$wan" ] && exit 1 # no configuration
+[ "$PORT" != "$wan" ] && exit 0
+
+remove_from_bridge() {
+	config_get ifname "$section" ifname
+
+	ubus call network.interface.$bridge remove_device '{"name":"$ifname"}'
+}
+
+update_bstas() {
+	local section="$1"
+	local action="$2"
+	local ifname onboarded
+
+	config_get ifname "$section" ifname
+	config_get_bool enabled "$section" enabled 0
+
+	if [ "$action" = "down" ]; then
+		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
+		wpa_cli -i "$ifname" disable_network 0  > /dev/null 2>&1
+#		wpa_cli -i "$ifname" save_config  > /dev/null 2>&1
+	elif [ "$action" = "up" ]; then
+		[ "$enabled" -eq 0 ] && return
+		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
+		wpa_cli -i "$ifname" enable_network 0  > /dev/null 2>&1
+#		wpa_cli -i "$ifname" save_config  > /dev/null 2>&1
+	fi
+}
+
+if [ "$LINK" = "up" ]; then
+	touch /tmp/map.agent.bsta_global_disable
+
+	config_load "mapagent"
+	bridge=$(uci get mapagent.agent.al_bridge | cut -d '-' -f2)
+	config_foreach remove_from_bridge bk-iface $bridge
+	config_foreach update_bstas bk-iface down
+else
+	rm -f /tmp/map.agent.bsta_global_disable
+	config_load "mapagent"
+	config_foreach update_bstas bk-iface up
+fi

map-agent/files/etc/hotplug.d/ethernet/map-loop-detection

@@ -1,29 +0,0 @@
-#!/bin/sh
-
-wan=$(db -q get hw.board.ethernetWanPort)
-
-[ -z "$wan" ] && exit 1 # no configuration
-[ "$PORT" != "$wan" ] && exit 0
-
-update_bstas() {
-	local section="$1"
-	local action="$2"
-	local ifname onboarded
-
-	config_get ifname "$section" ifname
-	config_get_bool onboarded "$section" onboarded 0
-
-	[ "$onboarded" -eq 0 ] && return
-
-	wpa_cli -i "$ifname" "$action" > /dev/null 2>&1
-}
-
-if [ "$LINK" = "up" ]; then
-	touch /tmp/map.agent.bsta_global_disable
-	config_load "mapagent"
-	config_foreach update_bstas bk-iface disconnect
-else
-	rm -f /tmp/map.agent.bsta_global_disable
-	config_load "mapagent"
-	config_foreach update_bstas bk-iface reconnect
-fi

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

@@ -75,7 +75,7 @@ start_service() {
 
 service_triggers()
 {
-	procd_add_reload_trigger "ieee1905"
+	procd_add_reload_trigger "mapagent"
 }
 
 reload_service() {

map-agent/files/lib/wifi/multiap

@@ -43,10 +43,10 @@ brcm_sync_credentials() {
 		section=$(uci add ieee1905 ap)
 		[ "$section" == "" ] && return
 
-		uci set ieee1905.${section}.band=$band
-		uci set ieee1905.${section}.ssid="$ssid"
-		uci set ieee1905.${section}.encryption=$encryption
-		uci set ieee1905.${section}.key="$key"
+		uci -q set ieee1905.${section}.band=$band
+		uci -q set ieee1905.${section}.ssid="$ssid"
+		uci -q set ieee1905.${section}.encryption=$encryption
+		uci -q set ieee1905.${section}.key="$key"
 	}
 
 	mapagent_process_radio() {
@@ -212,7 +212,7 @@ write_bsta_config() {
 
 			[ "$bsta" == "$ifname" ] || return
 			#echo setting diff = $diff > /dev/console
-			uci set wireless.${section}.bssid=$bssid
+			uci -q set wireless.${section}.bssid=$bssid
 			echo 1
 		}
 		config_load wireless
@@ -338,6 +338,7 @@ brcm_bsta_to_wireless() {
 				local key="$4"
 				local encryption=$5
 				local enabled=$6
+				local bssid=$7
 				local disabled="0"
 
 				config_get ifname $section ifname
@@ -346,10 +347,17 @@ brcm_bsta_to_wireless() {
 
 				[ "$bsta" == "$ifname" ] || return
 
-				uci set wireless.${section}.ssid="$ssid"
-				uci set wireless.${section}.key="$key"
-				uci set wireless.${section}.encryption=$encryption
-				uci set wireless.${section}.disabled=$disabled
+				uci -q set wireless.${section}.ssid="$ssid"
+				uci -q set wireless.${section}.key="$key"
+				uci -q set wireless.${section}.encryption=$encryption
+				uci -q set wireless.${section}.bssid="$bssid"
+				#uci -q set wireless.${section}.disabled=$disabled
+
+				[ "$disabled" != "1" ] && return
+				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
+				wpa_cli -i "$bsta" disable_network 0 > /dev/null 2>&1
+				wpa_cli -i "$bsta" save_config > /dev/null 2>&1
+
 				echo 1
 			}
 
@@ -370,8 +378,9 @@ brcm_bsta_to_wireless() {
 			config_get key $1 key
 			config_get encryption $1 encryption
 			config_get enabled $1 enabled "0"
+			config_get bssid $1 bssid
 
-			echo $(mapagent_apply_wl_bsta $2 "$ssid" "$key" $encryption $4) 2> /dev/null
+			echo $(mapagent_apply_wl_bsta $2 "$ssid" "$key" $encryption $4 "$bssid")
 		}
 
 		config_get band $1 band
@@ -385,32 +394,32 @@ brcm_bsta_to_wireless() {
 			config_get ssid $1 ssid
 			config_get key $1 key
 			config_get encryption $1 encryption
+			config_get bssid $1 bssid
 
-			echo $(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled) 2> /dev/null
+			echo $(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
 		fi
 	}
 
-	best=$(mapagent_find_lowest_prio_onboarded)
-
-	[ -z "$best" ] && return
-
-	band=$1
-	sec=""
-	prio=""
-
-	config_foreach mapagent_enable_best bk-iface $best
-	uci commit mapagent
+#	best=$(mapagent_find_lowest_prio_onboarded)
+#
+#	[ -z "$best" ] && return
+#
+#	band=$1
+#	sec=""
+#	prio=""
+#
+#	config_foreach mapagent_enable_best bk-iface $best
+#	uci commit mapagent
 	config_load mapagent
 
 	diff=$(config_foreach mapagent_bsta_to_wireless bk-iface)
 
-	[ "$diff" != "" ] && {
+#	[ "$diff" != "" ] && {
 		ubus call uci commit '{"config":"wireless"}'
-	}
+#	}
 }
 
 
-
 sync_mapcontroller_from_wireless() {
 	ubus -t 5 wait_for wifi
 	[ "$?" != "0" ] && return
@@ -471,18 +480,18 @@ sync_mapcontroller_from_wireless() {
 
 
 		cntlr_section=$(uci add mapcontroller ${type})
-		uci set mapcontroller.${cntlr_section}.ssid="$ssid"
-		uci set mapcontroller.${cntlr_section}.key="$key"
-		uci set mapcontroller.${cntlr_section}.encryption="$encryption"
-		uci set mapcontroller.${cntlr_section}.band="$band"
-		uci set mapcontroller.${cntlr_section}.vid="1"
-		uci set mapcontroller.${cntlr_section}.network="$network"
+		uci -q set mapcontroller.${cntlr_section}.ssid="$ssid"
+		uci -q set mapcontroller.${cntlr_section}.key="$key"
+		uci -q set mapcontroller.${cntlr_section}.encryption="$encryption"
+		uci -q set mapcontroller.${cntlr_section}.band="$band"
+		uci -q set mapcontroller.${cntlr_section}.vid="1"
+		uci -q set mapcontroller.${cntlr_section}.network="$network"
 
 		[ "$multi_ap" == "1" ] && map_type="backhaul" || map_type="fronthaul"
-		uci set mapcontroller.${cntlr_section}.type="$map_type"
+		uci -q set mapcontroller.${cntlr_section}.type="$map_type"
 
 		[ "$start_disabled" == "1" ] && enabled="0"
-		uci set mapcontroller.${cntlr_section}.enabled="$enabled"
+		uci -q set mapcontroller.${cntlr_section}.enabled="$enabled"
 	}
 
 	mapcontroller_teardown() {
@@ -499,6 +508,131 @@ sync_mapcontroller_from_wireless() {
 	uci commit mapcontroller
 }
 
+bsta_scan_on_enabled() {
+	config_load mapagent
+
+	mapagent_enable_bk() {
+		config_get ifname $1 ifname
+		config_get enabled $1 enabled
+
+		echo ifname $ifname enabled $enabled
+
+		[ "$enabled" = "0" ] && return
+
+		wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
+		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+	}
+
+	config_foreach mapagent_enable_bk bk-iface
+}
+
+bsta_enable_all() {
+	mapagent_enable_bk() {
+		config_get ifname $1 ifname "2"
+		uci -q set mapagent.$1.enabled="1"
+	}
+
+	config_load mapagent
+
+	config_foreach mapagent_enable_bk bk-iface
+	uci commit mapagent
+	bsta_scan_on_enabled
+}
+
+bsta_disable_lower_priority() {
+	config_load mapagent
+
+	mapagent_get_priority() {
+		config_get ifname $1 ifname
+
+		[ "$ifname" != "$2" ] && return
+
+		config_get priority $1 priority "2"
+
+		echo "$priority"
+	}
+
+	mapagent_disable_lower_bk() {
+		mapagent_apply_wl_bsta() {
+			apply_config() {
+				local section="$1"
+				local bsta="$2"
+				local enabled="$3"
+
+				config_get ifname $section ifname
+
+				[ "$bsta" == "$ifname" ] || return
+
+				[ "$enabled" != "0" ] && return
+
+				wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
+				wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
+				wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+			}
+			local ifname="$1"
+			local enabled="$2"
+
+			[ "$enabled" != "0" ] && return
+
+			config_load wireless
+
+			config_foreach apply_config wifi-iface $ifname $enabled
+		}
+
+		local enabled="1"
+
+		config_get ifname $1 ifname
+		config_get priority $1 priority
+
+		[ "$ifname" != "$2" -a "$priority" -gt "$3" ] && enabled="0"
+
+		uci -q set mapagent.$1.enabled="$enabled"
+
+		echo $(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
+	}
+
+	local bsta=$1
+
+	prio=$(config_foreach mapagent_get_priority bk-iface $bsta)
+	#echo bsta $bsta has prio $prio > /dev/console
+
+	config_foreach mapagent_disable_lower_bk bk-iface $bsta $prio
+	uci commit mapagent
+
+#	ubus call uci commit '{"config":"wireless"}'
+}
+
+
+bsta_use_link() {
+	config_load mapagent
+
+	mapagent_disable_bk() {
+		local bsta="$2"
+
+		config_get ifname $1 ifname
+		config_get enabled $1 enabled
+
+		[ "$bsta" = "$ifname" ] && return
+
+		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
+		wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+	}
+
+	local bsta=$1
+
+	config_foreach mapagent_disable_bk bk-iface $bsta
+}
+
+bsta_swap_to_link() {
+	bsta_disable_lower_priority $1
+	bsta_use_link $1
+
+	wpa_cli -i "$1" enable_network 0 > /dev/null
+	wpa_cli -i "$1" reconnect > /dev/null
+	wpa_cli -i "$1" save_config > /dev/null
+}
 
 
 func=$1
@@ -517,6 +651,11 @@ case "$func" in
 	bsta_to_wireless) brcm_bsta_to_wireless $@;;
 	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
 	ts) ts_sub $@;;
+	bsta_enable_all) bsta_enable_all $@;;
+	bsta_disable_lower_priority) bsta_disable_lower_priority $@;;
+	bsta_scan_on_enabled) bsta_scan_on_enabled $@;;
+	bsta_use_link) bsta_use_link $@;;
+	bsta_swap_to_link) bsta_swap_to_link $@;;
 	--help|help) usage;;
 	*) usage; exit 1;;
 esac

map-controller/Makefile

@@ -5,15 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=5.0.2
+PKG_VERSION:=5.1.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6ba4d74bbd196b781ba2418eb596a550d34c1028
+PKG_SOURCE_VERSION:=234cff05ee7987f50e3d5e76d920f59f9c680212
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-controller.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-controller
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 

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

@@ -19,6 +19,12 @@ start_service() {
 	config_get_bool enabled controller enabled 1
 	[ "$enabled" -eq 0 ] && return
 
+	config_get_bool sync_from_uci_wireless controller sync_from_uci_wireless 0
+
+	if [ "$sync_from_uci_wireless" -eq 1 ]; then
+		/lib/wifi/multiap sync_mapcontroller_from_wireless
+	fi
+
 	procd_open_instance
 	procd_set_param command "/usr/sbin/mapcontroller" "-d"
 
@@ -38,16 +44,30 @@ start_service() {
 
 service_triggers()
 {
+	config_load "mapcontroller"
+
 	procd_add_reload_trigger "mapcontroller"
+	config_get_bool sync_from_uci_wireless controller sync_from_uci_wireless 0
+	if [ "$sync_from_uci_wireless" -eq 1 ]; then
+		procd_add_reload_trigger "wireless"
+	fi
 }
 
 reload_service() {
 	local enabled
 
 	config_load "mapcontroller"
+
+	config_get_bool sync_from_uci_wireless controller sync_from_uci_wireless 0
+	if [ "$sync_from_uci_wireless" -eq 1 ]; then
+		/lib/wifi/multiap sync_mapcontroller_from_wireless
+	fi
+
 	config_get_bool enabled controller enabled 1
 	if [ "$enabled" -eq 0 ]; then
 		stop
+		# Start but without instance so reload trigger works.
+		start
 		return
 	fi
 

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=3.0.1
+PKG_VERSION:=3.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=d1fb7e76cb0fe93167648cf32193e73b1ca3522a
+PKG_SOURCE_VERSION:=5763d405ed896140f5ca5ed9073b98d4bb728b14
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
@@ -30,7 +30,9 @@ define Package/map-topology
 endef
 
 TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
 
 define Package/map-topology/description
 	Constructs network topology and show it as json structure over UBUS

mcastmngr/files/lib/mcast/broadcom.sh

@@ -458,7 +458,7 @@ read_mcast_stats() {
 		case $line in
 		br-*)
 			found_ip=0
-			grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
+			grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
 			if [ -z "$mcast_addrs" ]; then
 				mcast_addrs="$grp_ip"
 				continue
@@ -510,7 +510,7 @@ read_mcast_stats() {
 					if [ "$snoop_iface" != "$intf" ]; then
 						continue
 					fi
-					grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
+					grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
 					if [ "$grp_ip" != "$gip_addr" ]; then
 						continue
 					fi
@@ -523,12 +523,12 @@ read_mcast_stats() {
 					fi
 
 					json_add_object ""
-					host_ip="$(echo $line | awk -F ' ' '{ print $13 }')"
+					host_ip="$(echo $line | awk -F ' ' '{ print $14 }')"
 					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
 					json_add_string "ipaddr" "$h_ip"
 					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
 					json_add_string "device" "$src_port"
-					timeout="$(echo $line | awk -F ' ' '{ print $14 }')"
+					timeout="$(echo $line | awk -F ' ' '{ print $15 }')"
 					json_add_int "timeout" "$timeout"
 					json_close_object #close the associated device object
 					;;

obuspa/Config.in

@@ -1,5 +1,7 @@
 if PACKAGE_obuspa
 
+menu "Configuration"
+
 config OBUSPA_MTP_ENABLE_STOMP
 	bool "Enable STOMP as mtp protocol"
 	default y
@@ -11,5 +13,5 @@ config OBUSPA_MTP_ENABLE_MQTT
 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
 	default y
-
+endmenu
 endif

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=4.1.0.8
+PKG_VERSION:=4.1.0.11
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=588a3506c197fdb9b7ea50dae5680f2aadf33b51
+PKG_SOURCE_VERSION:=a52205791ef71cb54fa468064075ff85c7f5a638
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -29,6 +29,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/obuspa
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=TRx69
   TITLE:=USP agent
   DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto
 endef

obuspa/files/etc/config/obuspa

@@ -1,8 +1,8 @@
 config obuspa 'global'
 	option enabled '1'
-	option interface 'wan'
-	#option ifname 'eth0.1'
-	option debug '0'
+	option interface 'loopback'
+	#option ifname 'lo'
+	option debug '1'
 	option log_level '1'
 	#option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'

obuspa/files/etc/hotplug.d/iface/85-obuspa

@@ -5,7 +5,7 @@
 [ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0
 [ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" ] && exit 0
 
-echo "Restarting obuspa"|logger -t obuspa.hotplug -p debug
+echo "Restarting obuspa bcz ${ACTION} and ${IFUPDATE_ADDRESSES} change"|logger -t obuspa.hotplug -p debug
 
 /etc/init.d/obuspa reload
 

obuspa/files/etc/init.d/obuspa

@@ -133,7 +133,6 @@ validate_localagent_section()
 {
 	uci_validate_section ${CONFIGURATION} localagent "${1}" \
 		'Enable:bool:true' \
-		'ParameterName:string:Device.DeviceInfo.SoftwareVersion' \
 		'EndpointID:string'
 }
 
@@ -153,6 +152,7 @@ validate_controller_section()
 		'Reference:string' \
 		'Destination:string:controller-notify-dest' \
 		'Topic:string' \
+		'ParameterName:list(string)' \
 		'coap_host:host' \
 		'coap_path:string' \
 		'coap_port:port' \
@@ -222,9 +222,42 @@ validate_mqtt_client_section()
 		'ConnectRetryMaxInterval:uinteger:60'
 }
 
+publish_endpoint() {
+	local AgentEndpointID serial oui user pass
+	local opt=""
+
+	# return if mosquitto_pub is not present
+	if ! which mosquitto_pub; then
+		log "mosquitto_pub not present can't publish endpointid"
+		return 0;
+	fi
+
+	# Get endpoint id from obuspa config first
+	config_load obuspa
+	config_get AgentEndpointID localagent EndpointID ""
+	if [ -z "${AgentEndpointID}" ]; then
+		serial=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.SerialNumber"}'|jsonfilter -e '@["parameters"][0].value')
+		oui=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.ManufacturerOUI"}'|jsonfilter -e '@["parameters"][0].value')
+		AgentEndpointID="os::${oui}-${serial}"
+	fi
+
+	config_get user localmqtt Username
+	if [ -n "${user}" ]; then
+		opt="-u ${user}"
+	fi
+	config_get pass localmqtt Password
+	if [ -n "${pass}" ]; then
+		opt="${opt} -P ${pass}"
+	fi
+
+	# publish Agent's EndpointID in mosquito broker for discovery
+	# This is a work around till obuspa does not support advertising
+	log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
+	mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" ${opt}
+}
+
 configure_localagent() {
 	local Enable ParameterName EndpointID
-	local _num
 
 	validate_localagent_section 'localagent' || {
 		log "Validation of localagent section failed"
@@ -235,14 +268,6 @@ configure_localagent() {
 		db_set Device.LocalAgent.EndpointID "${EndpointID}"
 	fi
 
-	_num=1
-	while [ ${_num} -le ${controller_num} ]
-	do
-		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.Enable "${Enable}"
-		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.ParameterName "${ParameterName}"
-		_num=$(( ${_num} + 1 ))
-	done
-
 	db_set
 }
 
@@ -326,6 +351,17 @@ configure_controller() {
 		log "Unsupported Protocol ${Protocol}"
 	fi
 
+	local param
+	local _pnum=1
+
+	for param in ${ParameterName}
+	do
+		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.Alias "cpe-${_pnum}"
+		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.Enable "${Enable}"
+		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.ParameterName "${param}"
+		_pnum=$(( ${_pnum} + 1 ))
+	done
+
 	db_set
 }
 
@@ -648,6 +684,11 @@ db_init() {
 	db_set Internal.Reboot.Cause "LocalFactoryReset"
 }
 
+service_running() {
+	ubus wait_for usp.raw
+	publish_endpoint
+}
+
 start_service() {
 	local enabled
 

periodicstats/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=312573b91b2ae10d0fe04a4d11ae37898f526fdb
+PKG_SOURCE_VERSION:=17a22d2a74f0ab2af6cec17b9b51ad5aac6fdd48
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

qosmngr/files/lib/qos/broadcom.sh

@@ -839,6 +839,7 @@ configure_queue() {
 		for i in 0 1 2 3 4 5 6 7; do
 			tmctl delqcfg --devtype 0 --if $intf --qid $i &>/dev/null
 		done
+		tmctl porttminit --devtype 0 --if $intf --flag 0 --numqueues 8
 
 		mkdir -p /tmp/qos/$intf
 		touch /tmp/qos/$intf/q_order

questd/files/etc/init.d/quest

@@ -12,12 +12,3 @@ start_service() {
 	procd_set_param respawn
 	procd_close_instance
 }
-
-service_triggers()
-{
-	procd_add_reload_trigger network wireless
-}
-
-reload_service() {
-	ubus -t 5 call router.network reload
-}

quickjs/Makefile

@@ -0,0 +1,55 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=quickjs
+PKG_RELEASE:=1
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/bellard/quickjs.git
+PKG_SOURCE_DATE:=2020-11-08
+PKG_SOURCE_VERSION:=204682fb87ab9312f0cf81f959ecd181180457bc
+PKG_MIRROR_HASH:=skip
+PKG_LICENSE:=MIT
+
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/quickjs
+  SECTION:=lang
+  CATEGORY:=Languages
+  TITLE:=QuickJS Javascript engine
+  URL:=https://bellard.org/quickjs/
+  MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
+  DEPENDS:=+libatomic
+endef
+
+define Package/quickjs/description
+  QuickJS is a small and embeddable Javascript engine. It supports
+  the ES2020 specification including modules, asynchronous
+  generators, proxies and BigInt.
+endef
+
+MAKE_VARS += \
+	LIBS="-latomic"
+
+MAKE_FLAGS = \
+	prefix=/usr \
+	CONFIG_SMALL=y \
+	CROSS_PREFIX="$(TARGET_CROSS)"
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib/quickjs
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/quickjs/libquickjs.a $(1)/usr/lib/quickjs/
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/quickjs/libquickjs.lto.a $(1)/usr/lib/quickjs/
+	$(INSTALL_DIR) $(1)/usr/include/quickjs
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/quickjs/quickjs.h $(1)/usr/include/quickjs/
+	$(CP) $(PKG_INSTALL_DIR)/usr/include/quickjs/quickjs-libc.h $(1)/usr/include/quickjs/
+endef
+
+define Package/quickjs/install
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qjs $(1)/usr/bin/
+endef
+
+$(eval $(call BuildPackage,quickjs))

quickjs/patches/000-build-options.patch

@@ -0,0 +1,96 @@
+diff --git a/Makefile b/Makefile
+index e6ae827..bbd3ce8 100644
+--- a/Makefile
++++ b/Makefile
+@@ -33,6 +33,8 @@ CONFIG_LTO=y
+ #CONFIG_WERROR=y
+ # force 32 bit build for some utilities
+ #CONFIG_M32=y
++# build with -Os instead of -O2
++#CONFIG_SMALL=y
+ 
+ ifdef CONFIG_DARWIN
+ # use clang instead of gcc
+@@ -52,6 +54,13 @@ CONFIG_BIGNUM=y
+ 
+ OBJDIR=.obj
+ 
++CFLAGS_ENV:=$(CFLAGS)
++LDFLAGS_ENV:=$(LDFLAGS)
++
++HOST_BUILD=
++CFLAGS=$(if $(HOST_BUILD),,$(CFLAGS_ENV))
++LDFLAGS=$(if $(HOST_BUILD),,$(LDFLAGS_ENV))
++
+ ifdef CONFIG_WIN32
+   ifdef CONFIG_M32
+     CROSS_PREFIX=i686-w64-mingw32-
+@@ -66,7 +75,7 @@ endif
+ ifdef CONFIG_CLANG
+   HOST_CC=clang
+   CC=$(CROSS_PREFIX)clang
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wextra
+   CFLAGS += -Wno-sign-compare
+   CFLAGS += -Wno-missing-field-initializers
+@@ -87,7 +96,7 @@ ifdef CONFIG_CLANG
+ else
+   HOST_CC=gcc
+   CC=$(CROSS_PREFIX)gcc
+-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
++  CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
+   CFLAGS += -Wno-array-bounds -Wno-format-truncation
+   ifdef CONFIG_LTO
+     AR=$(CROSS_PREFIX)gcc-ar
+@@ -110,9 +119,13 @@ endif
+ CFLAGS+=$(DEFINES)
+ CFLAGS_DEBUG=$(CFLAGS) -O0
+ CFLAGS_SMALL=$(CFLAGS) -Os
++ifdef CONFIG_SMALL
++CFLAGS_OPT=$(CFLAGS) -Os
++else
+ CFLAGS_OPT=$(CFLAGS) -O2
++endif
+ CFLAGS_NOLTO:=$(CFLAGS_OPT)
+-LDFLAGS=-g
++LDFLAGS+=-g
+ ifdef CONFIG_LTO
+ CFLAGS_SMALL+=-flto
+ CFLAGS_OPT+=-flto
+@@ -175,7 +188,7 @@ QJS_OBJS+=$(OBJDIR)/qjscalc.o
+ endif
+ 
+ HOST_LIBS=-lm -ldl -lpthread
+-LIBS=-lm
++LIBS+=-lm
+ ifndef CONFIG_WIN32
+ LIBS+=-ldl -lpthread
+ endif
+@@ -194,6 +207,8 @@ qjsc$(EXE): $(OBJDIR)/qjsc.o $(QJS_LIB_OBJS)
+ 
+ ifneq ($(CROSS_PREFIX),)
+ 
++$(QJSC): HOST_BUILD=1
++
+ $(QJSC): $(OBJDIR)/qjsc.host.o \
+     $(patsubst %.o, %.host.o, $(QJS_LIB_OBJS))
+ 	$(HOST_CC) $(LDFLAGS) -o $@ $^ $(HOST_LIBS)
+@@ -261,6 +276,8 @@ run-test262-32: $(patsubst %.o, %.m32.o, $(OBJDIR)/run-test262.o $(QJS_LIB_OBJS)
+ $(OBJDIR)/%.o: %.c | $(OBJDIR)
+ 	$(CC) $(CFLAGS_OPT) -c -o $@ $<
+ 
++$(OBJDIR)/%.host.o: HOST_BUILD=1
++
+ $(OBJDIR)/%.host.o: %.c | $(OBJDIR)
+ 	$(HOST_CC) $(CFLAGS_OPT) -c -o $@ $<
+ 
+@@ -285,6 +302,8 @@ $(OBJDIR)/%.check.o: %.c | $(OBJDIR)
+ regexp_test: libregexp.c libunicode.c cutils.c
+ 	$(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ libregexp.c libunicode.c cutils.c $(LIBS)
+ 
++unicode_gen: HOST_BUILD=1
++
+ unicode_gen: $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o libunicode.c unicode_gen_def.h
+ 	$(HOST_CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o
+ 

quickjs/patches/001-no-fenv-dtoa-libbf.patch

@@ -0,0 +1,106 @@
+diff --git a/quickjs.c b/quickjs.c
+index a39ff8f..635c506 100644
+--- a/quickjs.c
++++ b/quickjs.c
+@@ -65,6 +65,16 @@
+ #define CONFIG_PRINTF_RNDN
+ #endif
+ 
++#ifdef CONFIG_PRINTF_RNDN
++#if !defined(FE_DOWNWARD) || !defined(FE_UPWARD)
++#ifdef CONFIG_BIGNUM
++#define CONFIG_DTOA_LIBBF
++#else
++#error "CONFIG_BIGNUM required if printf is RNDN and there is no fenv support"
++#endif
++#endif
++#endif
++
+ /* define to include Atomics.* operations which depend on the OS
+    threads */
+ #if !defined(EMSCRIPTEN)
+@@ -11253,6 +11263,11 @@ static char *i64toa(char *buf_end, int64_t n, unsigned int base)
+     return q;
+ }
+ 
++/* maximum buffer size for js_dtoa */
++#define JS_DTOA_BUF_SIZE 128
++
++#ifndef CONFIG_DTOA_LIBBF
++
+ /* buf1 contains the printf result */
+ static void js_ecvt1(double d, int n_digits, int *decpt, int *sign, char *buf,
+                      int rounding_mode, char *buf1, int buf1_size)
+@@ -11272,9 +11287,6 @@ static void js_ecvt1(double d, int n_digits, int *decpt, int *sign, char *buf,
+     *decpt = atoi(buf1 + n_digits + 2 + (n_digits > 1)) + 1;
+ }
+ 
+-/* maximum buffer size for js_dtoa */
+-#define JS_DTOA_BUF_SIZE 128
+-
+ /* needed because ecvt usually limits the number of digits to
+    17. Return the number of digits. */
+ static int js_ecvt(double d, int n_digits, int *decpt, int *sign, char *buf,
+@@ -11383,6 +11395,8 @@ static void js_fcvt(char *buf, int buf_size, double d, int n_digits)
+     js_fcvt1(buf, buf_size, d, n_digits, rounding_mode);
+ }
+ 
++#endif /* CONFIG_DTOA_LIBBF */
++
+ /* radix != 10 is only supported with flags = JS_DTOA_VAR_FORMAT */
+ /* use as many digits as necessary */
+ #define JS_DTOA_VAR_FORMAT   (0 << 0)
+@@ -11396,8 +11410,10 @@ static void js_fcvt(char *buf, int buf_size, double d, int n_digits)
+ /* XXX: slow and maybe not fully correct. Use libbf when it is fast enough.
+    XXX: radix != 10 is only supported for small integers
+ */
+-static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
++static JSValue js_dtoa(JSContext *ctx,
++                       double d, int radix, int n_digits, int flags)
+ {
++    char buf[JS_DTOA_BUF_SIZE];
+     char *q;
+ 
+     if (!isfinite(d)) {
+@@ -11419,6 +11435,25 @@ static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
+         ptr = i64toa(buf1 + sizeof(buf1), i64, radix);
+         strcpy(buf, ptr);
+     } else {
++#ifdef CONFIG_DTOA_LIBBF
++        bf_flags_t bf_flags;
++    generic_conv:
++        bf_flags = BF_RNDNA;
++        switch (flags & 3) {
++        case JS_DTOA_VAR_FORMAT:
++            bf_flags |= BF_FTOA_FORMAT_FREE_MIN;
++            break;
++        case JS_DTOA_FIXED_FORMAT:
++            bf_flags |= BF_FTOA_FORMAT_FIXED;
++            break;
++        case JS_DTOA_FRAC_FORMAT:
++            bf_flags |= BF_FTOA_FORMAT_FRAC;
++            break;
++        }
++        if (flags & JS_DTOA_FORCE_EXP)
++            bf_flags |= BF_FTOA_FORCE_EXP;
++        return js_ftoa(ctx, JS_NewFloat64(ctx, d), radix, n_digits, bf_flags);
++#else /* CONFIG_DTOA_LIBBF */
+         if (d == 0.0)
+             d = 0.0; /* convert -0 to 0 */
+         if (flags == JS_DTOA_FRAC_FORMAT) {
+@@ -11482,14 +11517,8 @@ static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
+                 sprintf(q, "%d", p);
+             }
+         }
++#endif /* CONFIG_DTOA_LIBBF */
+     }
+-}
+-
+-static JSValue js_dtoa(JSContext *ctx,
+-                       double d, int radix, int n_digits, int flags)
+-{
+-    char buf[JS_DTOA_BUF_SIZE];
+-    js_dtoa1(buf, d, radix, n_digits, flags);
+     return JS_NewString(ctx, buf);
+ }
+ 

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=0.2.19
+PKG_VERSION:=0.2.20
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
-PKG_SOURCE_VERSION:=86de40b6ebdf937419290f6a0c5c0fb79eaa5ed1
+PKG_SOURCE_VERSION:=1cb1723f36718997968e923732fd6327a354689a
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

swmodd/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.0.8
+PKG_VERSION:=2.0.11
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f0054f9413d6369bb6d9a66e7c49414b946ef0df
+PKG_SOURCE_VERSION:=6e30dfc3582b3a52a786b1177bc5d070a4bdc178
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -22,10 +22,11 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/swmodd
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:= Software Modules Daemon
-	DEPENDS:=+libuci +libubox +ubus +libuuid +libbbf_api +opkg \
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:= Software Modules Daemon
+  DEPENDS:=+libuci +libubox +ubus +libuuid +libbbf_api +opkg \
 	    +PACKAGE_liblxc:liblxc +PACKAGE_liblxc:cgroupfs-mount \
 	    +@BUSYBOX_CONFIG_BUSYBOX +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT
 endef

uspd/Config.in

@@ -1,3 +1,6 @@
+if PACKAGE_uspd
+
+menu "Configuration"
 config USPD_MAX_MSG_LEN
     int "Maximum message length"
     default 10485760
@@ -7,3 +10,5 @@ config USPD_MAX_MSG_LEN
 	This value should not be larger than UBUS_MAX_MSGLEN from ubusd.
 	The maximum blob message length allowed is:
 	(configured value - 128) bytes
+endmenu
+endif

uspd/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.1.28
+PKG_VERSION:=2.1.37
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4f449cc787f07b1543c7e51dc5b3d03de4b3db8f
+PKG_SOURCE_VERSION:=14347b98036c21cb5b775e33762a96354bcfef44
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -25,8 +25,10 @@ include $(INCLUDE_DIR)/package.mk
 define Package/uspd
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=TRx69
   TITLE:=USP ubus backend
-  DEPENDS:=+libubox +ubus +libbbfdm
+  DEPENDS:=+libubox +ubus +libbbfdm +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
+           +@BBF_TR181 +@BBF_TR104 +@BBF_TR143
 endef
 
 define Package/uspd/description
@@ -52,8 +54,10 @@ endif
 define Package/uspd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_BIN) ./files/uspd.init $(1)/etc/init.d/uspd
-	$(INSTALL_CONF) ./files/uspd.config $(1)/etc/config/uspd
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
+	$(INSTALL_BIN) ./files/etc/init.d/uspd $(1)/etc/init.d/uspd
+	$(INSTALL_CONF) ./files/etc/config/uspd $(1)/etc/config/uspd
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/transferComplete.json $(1)/etc/bbfdm/json/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uspd $(1)/usr/sbin/
 endef

uspd/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
+          }
+        ]
+      }
+    }
+  }
+}

uspd/files/etc/config/uspd

@@ -2,3 +2,4 @@ config uspd 'usp'
 	option granularitylevel  '0'
 	option debug '0'
 	option loglevel  '1'
+	option bbf_caching_time '5'

wfa-capi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfa-capi
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=03d5eb8ed61b298709061458661d089474b38604
+PKG_SOURCE_VERSION:=189c59448ff33fd713a6a218206b18f0c613793a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfa-capi.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

wfa-capi/files/etc/init.d/capiagent

@@ -7,7 +7,7 @@ USE_PROCD=1
 
 start_service() {
 	procd_open_instance
-        procd_set_param command "/usr/sbin/capiagent"
+        procd_set_param command "/usr/sbin/capiagent" "-p 9000"
 	procd_set_param limits core="unlimited"
 #	procd_set_param respawn
 #	procd_set_param stdout 1

wfadatad/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=5.0.2
+PKG_VERSION:=5.0.5
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f62f7d4795fcba7e4b2906fdba8e5c390c771cba
+PKG_SOURCE_VERSION:=988a20b25f90a9095b0d4e168b4c471fa556a83e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=13.0.1
+PKG_VERSION:=14.0.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6b1f24c940efdc563e0bfec06fdb803235494b6f
+PKG_SOURCE_VERSION:=04b6b7d52f810bf3b1ff59fe6e26e02f2ae3b088
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

wifimngr/files/etc/hotplug.d/button/05-wifi

@@ -57,6 +57,11 @@ supp_status() {
 		return
 	fi
 
+	if [ -f "/tmp/map.agent.bsta_global_disable" ]; then
+		echo "CONFIGURED"
+		return
+	fi
+
 	echo "UNCONFIGURED"
 }