bbf: "Updated the package version with the latest commit id"

0e937cf Set the HS name during registration if it has the name set in uci
62421c0 Do not send LocateSuggest req when registration mode is opened

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=4.5.9
+PKG_VERSION:=6.0.6
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0e101a4c48e6a27f3f0a71eab434d8590bc0560a
+PKG_SOURCE_VERSION:=0a459cbdeb3c4bfdfd44d44ecfb056b7c94aef86
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -35,7 +35,7 @@ define Package/libbbfdm
   CATEGORY:=Libraries
   SUBMENU:=BBF
   TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libcurl
 endef
 
 define Package/libbbfdm/config
@@ -81,11 +81,6 @@ CONFIGURE_ARGS += \
 	--enable-libopenssl
 endif
 
-ifeq ($(CONFIG_PACKAGE_libmbedtls),y)
-CONFIGURE_ARGS += \
-	--enable-libmbedtls
-endif
-
 ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
 CONFIGURE_ARGS += \
 	--enable-vendor-extension

bulkdata/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
-PKG_SOURCE_VERSION:=e4f39d1bf4678fc05b9d02e81b194c70719909e4
+PKG_SOURCE_VERSION:=150eb3122c969d1646c8ca8c8152154990f91823
 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.12
+PKG_VERSION:=3.1.18
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3de3dd2c45a0e95d875880c084f468a2f4010e2b
+PKG_SOURCE_VERSION:=0e937cfb839f845cf28922c4dde0572ec2842f85
 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
+	DEPENDS:= +libubox +ubus +uci
 endef
 
 define Package/$(PKG_NAME)/description

dectmngr/files/etc/config/dect

@@ -1,2 +1,2 @@
-config dectmngr 'general'
+config dect 'global'
 	option log_dect_cmbs '0'

dectmngr/files/etc/init.d/dectmngr

@@ -40,8 +40,8 @@ start_service() {
 	model_id="01.02.03"
 	[ -n "$model_id" -a ${#model_id} -eq 8 ] && opt_ext="$opt_ext -model $model_id"
 
-	config_load dectmngr
-	config_get_bool log_dect_cmbs general log_dect_cmbs 0
+	config_load dect
+	config_get_bool log_dect_cmbs global log_dect_cmbs 0
 
 	procd_open_instance
 	if [ $log_dect_cmbs -eq 0 ]; then
@@ -72,7 +72,7 @@ reload_service() {
 
 service_triggers()
 {
-	procd_add_reload_trigger asterisk
+	procd_add_reload_trigger asterisk dect
 }
 
 boot() {

dslmngr/Makefile

@@ -13,7 +13,7 @@ PKG_VERSION:=1.1.2
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=82d7208b3182a9cd1e6aec70872bf30f2fa8c82b
+PKG_SOURCE_VERSION:=bb754ae620a9fc66fd6fc0745f0fead0708c7a17
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.3.2
+PKG_VERSION:=6.4.5
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a1eedd39d2a1444045fc2a772fd62795cd6d2017
+PKG_SOURCE_VERSION:=23028753fdfc5f4a0e8da33fb6b813e21c5d6c23
 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

easy-soc-libs/easy.mk

@@ -18,6 +18,7 @@ define Build/InstallDev/libeasy
 	$(CP) $(PKG_BUILD_DIR)/libeasy/utils.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/libeasy/if_utils.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/libeasy/debug.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/libeasy/hlist.h $(1)/usr/include/easy/
 	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
 endef
 

gryphon-led-module/src/main.c

@@ -43,10 +43,15 @@
 static ssize_t get_led_color(struct device *dev,
 		struct device_attribute *attr, char *buf)
 {
-	/* [ln] todo: dummy implementation */
 	int len;
+	struct sk9822_leds *sk9822 = dev_get_drvdata(dev);
 
-	len = scnprintf(buf, PAGE_SIZE, "%d\n", 123);
+	if (IS_ERR(sk9822)) {
+		printk(KERN_ERR "Platform get drvdata returned NULL\n");
+		return -EIO;
+	}
+
+	len = scnprintf(buf, PAGE_SIZE, "%02x%02x%02x\n", sk9822->led_colors[0].r, sk9822->led_colors[0].g, sk9822->led_colors[0].b);
 	if (len <= 0) {
 		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
 		return -EIO;

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.1.5-2021-09-03
+PKG_VERSION:=8.2.2-2021-10-12
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=393e67dec2a1a924423761e73fb376209b871a10
+PKG_SOURCE_VERSION:=ecb82332ce36b54ce5376bb9ffda16c04c30a8e3
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -29,8 +29,6 @@ PKG_CONFIG_DEPENDS:= \
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-CWMP_REVISION=$(shell svnversion ./src/ -n|cut -f2 -d:)
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/$(PKG_NAME)
@@ -57,24 +55,8 @@ endef
 endif
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE -D_AADJ
-
-ifneq ($(CWMP_REVISION)_,_)
-ifneq ($(CWMP_REVISION),exported)
-ifneq ($(CWMP_REVISION),Unversioned directory)
-TARGET_CFLAGS += "-DCWMP_REVISION=\\\"$(CWMP_REVISION)\\\""
-TARGET_LDFLAGS += "-DCWMP_REVISION=\\\"$(CWMP_REVISION)\\\""
-endif
-endif
-endif
-
-TARGET_LDFLAGS += \
-	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib
-
-CONFIGURE_ARGS += \
-	--with-uci-include-path=$(STAGING_DIR)/usr/include \
-	--with-libubox-include-path=$(STAGING_DIR)/usr/include \
-	--with-libubus-include-path=$(STAGING_DIR)/usr/include
+	-D_GNU_SOURCE \
+	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
 
 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
 CONFIGURE_ARGS += \
@@ -99,26 +81,20 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/
-	$(CP) ./files/* $(1)/
-endef
-
-define Package/$(PKG_NAME)/postinst
-	#!/bin/sh
-	if [ -z "$${IPKG_INSTROOT}" ]; then
-		echo "Enabling rc.d symlink for icwmpd"
-		/etc/init.d/icwmpd enable
-	fi
-	exit 0
-endef
-
-define Package/$(PKG_NAME)/prerm
-	#!/bin/sh
-	if [ -z "$${IPKG_INSTROOT}" ]; then
-		echo "Disabling rc.d symlink for icwmpd"
-		/etc/init.d/icwmpd disable
-	fi
-	exit 0
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/icwmpd
+	$(INSTALL_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/init.d/icwmpd $(1)/etc/init.d/icwmpd
+	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

icwmp/files/etc/config/cwmp

@@ -39,6 +39,7 @@ config cpe 'cpe'
 	option exec_download '0'
 	option periodic_notify_enable '1'
 	option periodic_notify_interval '10'
+	option incoming_rule 'Port_Only'
 	
 config lwn 'lwn'
 	option enable '1'

icwmp/files/etc/firewall.cwmp

@@ -1,6 +1,15 @@
-#created by the icwmp package 
-zone_name=""
-port=""
+#created by the icwmp package
+
+if [ ! -f "/var/state/cwmp" ]; then
+	exit 0;
+fi
+
+zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
+port=$(uci -c /var/state -q get cwmp.acs.port)
+ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
+ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
+incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr [A-Z] [a-z])
+
 if [ "$zone_name" = "" ]; then
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
@@ -18,4 +27,45 @@ else
 	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
 	iptables -X zone_icwmp_input 2> /dev/null
 fi
-#iptables -I FW_ZONE -p tcp -s ACS_ADDRESS --dport PORT -j ACCEPT --comment "Open ACS port"
+
+cmd="iptables -I zone_${zone_name}_input -p tcp"
+cmd6="ip6tables -I zone_${zone_name}_input -p tcp"
+
+# default incoming rule is Port only
+if [ -z "${incoming_rule}" ]; then
+	incoming_rule="port_only"
+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 [ "$?" -eq 0 ]; then
+	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+	${cmd}
+fi
+
+echo ${cmd6}|grep -q "\-\-dport \|\-s "
+if [ "$?" -eq 0 ]; then
+	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
+	${cmd6}
+fi

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

@@ -67,7 +67,7 @@ handle_icwmp_restart() {
 	local curopt43url=""
 	local opt43urlfile=/tmp/ipv4/$INTERFACE-opt43url
 	prevopt43url=$(cat $opt43urlfile 2>/dev/null)
-	curopt43url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
+	curopt43url="$(uci -c /var/state -q get cwmp.acs.dhcp_url)"
 	[ -n "$curopt43url" ] && echo $curopt43url > $opt43urlfile || rm -f $opt43urlfile
 
 	[ \
@@ -81,6 +81,8 @@ handle_icwmp_restart() {
 		[ -z "$prevopt43url" ] && exit 0
 	}
 
+	echo "Restarting icwmp"|logger -t cwmp.hotplug -p info
+
 	/etc/init.d/icwmpd reload &
 }
 

icwmp/files/etc/init.d/icwmpd

@@ -35,19 +35,19 @@ 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 -P /var/state -q get cwmp.acs.dhcp_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 -P /var/state -q set cwmp.acs.url="$url" || url="$default_acs"
+		[ -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 -P /var/state -q set cwmp.acs.url="$url"
+		[ -n "$url" ] && uci -c /var/state -q set cwmp.acs.url="$url"
 	fi
 
 	validate_url "$url"
@@ -115,7 +115,7 @@ wait_for_option43() {
 		log "Waiting for discovery of ACS URL from dhcp server ..."
 		while [ $tm -le $time ]
 		do
-			acs_url=`uci -P /var/state -q get cwmp.acs.dhcp_url`
+			acs_url=`uci -c /var/state -q get cwmp.acs.dhcp_url`
 			if [ "$acs_url" != "" ]
 			then
 				break
@@ -154,74 +154,42 @@ set_wan_interface() {
 	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' \
-		'periodic_notify_interval:uinteger'		
+service_running() {
+	ubus wait_for usp.raw
 }
 
 start_service() {
-	config_load cwmp
-	set_wan_interface
-	wait_for_option43 20
-	get_acs_url
+	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
 
-	validate_acs_section || {
-		log "Validation of acs section failed"
-		return 1;
-	}
-	
-	validate_cpe_section || {
-		log "Validation of cpe section failed"
-		return 1;
-	}
-	
-	procd_open_instance icwmp
-	procd_set_param command "$PROG"
-	if [ "$1" = "GetRPCMethods" ]; then
-		procd_append_param command -g
+		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
 	fi
-	procd_append_param command -b
-	
-	procd_set_param respawn \
-		${respawn_threshold:-5} \
-		${respawn_timeout:-10} ${respawn_retry:-3}
-		
-	procd_close_instance
 }
 
 reload_service() {

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=3.3.6
+PKG_VERSION:=4.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e224f6280173aa0e190f10d38aa0ae3714667c9b
+PKG_SOURCE_VERSION:=c4e6275434c65d64a90edbefa225f582f2ce356e
 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

iop/config

@@ -219,3 +219,7 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 # Disable it. Most SoCs nowadays has HW random generators anyway.
 # CONFIG_PACKAGE_urandom-seed is not set
 # CONFIG_PACKAGE_urngd is not set
+
+# We use OpenSSL, no need to ship multiple TLS libraries
+CONFIG_PACKAGE_libustream-openssl=y
+# CONFIG_PACKAGE_libustream-wolfssl is not set

iop/scripts/feeds_update.sh

@@ -14,7 +14,7 @@ function feeds_update {
     done
 
 
-    git remote -v | grep -q http || developer=1
+    git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
     cp .config .genconfig_config_bak
 

iop/scripts/genconfig.sh

@@ -5,7 +5,6 @@ function genconfig {
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
-	export THEMEDIR="tmp/juci-themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
 	export CONFIGPATH="package/feeds/iopsys/iop"
 	CUSTPATH="customerconfigs"
@@ -238,7 +237,7 @@ function genconfig {
 		local ALL="$1"
 		local CUSTOMER="$2"
 		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
-			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common | grep -v juci-theme)"
+			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common)"
 			if [ "$boards" ]; then
 				echo "$CUSTOMER has following boards:"
 				for board in $boards; do
@@ -255,7 +254,7 @@ function genconfig {
 			if [ "$customers" -a "$ALL" == 1 ]; then
 				for customer in $customers; do
 					echo $customer
-					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common | grep -v juci-theme)"
+					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common)"
 					if [ "$boards" ]; then
 						for board in $boards; do
 							echo -e "\t$board"
@@ -309,13 +308,6 @@ function genconfig {
 			v "rm -rf $FILEDIR*"
 			rm -rf $FILEDIR*
 		fi
-
-		if [ ! -d "$THEMEDIR" ]; then
-			mkdir -p $THEMEDIR
-		elif [ -d "$THEMEDIR" -a $CLEAN -eq 1 ]; then
-			v "rm -rf $THEMEDIR/*"
-			rm -rf $THEMEDIR/*
-		fi
 	}
 
 	create_and_copy_files()
@@ -404,11 +396,6 @@ function genconfig {
 					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
 					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
 				fi
-				if [ -d "$CUSTCONF/$CUSTOMER/juci-theme" ]; then
-					customer="$(echo $CUSTOMER | tr 'A-Z' 'a-z')"
-					v "cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer"
-					cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer
-				fi
 				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
 					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
@@ -424,8 +411,11 @@ function genconfig {
 
 		# Set target version
 		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
+		local GIT_REV=$(git rev-parse --short HEAD)
+		local GIT_VER="$GIT_TAG"
+		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
+		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Package source tree override if selected

iop/scripts/genconfig_min.sh

@@ -404,11 +404,13 @@ function genconfig_min {
 
 		# Set target version
 		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
+		local GIT_REV=$(git rev-parse --short HEAD)
+		local GIT_VER="$GIT_TAG"
+		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
+		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
-
 		# Enable Package source tree override if selected
 		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config
 

juci/Makefile

@@ -1,122 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=juci
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/juci.git
-PKG_SOURCE_VERSION:=70b66bfc7f0e25e77b6920c3d44e5b05f4bfcf95
-PKG_VERSION:=2020-05-27
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_SOURCE_SUBDIR)
-
-PKG_RELEASE=$(PKG_VERSION)-$(PKG_SOURCE_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/juci
-  $(Package/juci/default)
-  SECTION:=juci
-  CATEGORY:=JUCI
-  MENU=1
-  TITLE:=JUCI Core Package (select this to select default plugins)
-  DEPENDS:=+libubox +libubus +owsd +rpcd +rpcd-mod-file +questd
-endef
-
-define Build/InstallDev 
-	$(INSTALL_DIR) $(1)/usr/src/
-	ln -s $(PKG_BUILD_DIR) $(1)/usr/src/juci
-endef 
-
-define Build/Compile
-	$(call Build/Compile/Default,THEME_PATH="$(TOPDIR)/tmp/juci-themes/")
-endef
-
-define Package/juci/description
- JUCI Javascript UCI Web interface.
-endef
-
-define Package/juci/install
-	$(INSTALL_DIR) $(1)/
-	$(CP) $(PKG_BUILD_DIR)/bin/juci/* $(1)/
-	$(CP) ./files/* $(1)/
-endef
-
-define Package/juci/postinst
-#!/bin/sh
-
-juci-update
-exit 0
-endef
-
-$(eval $(call BuildPackage,juci))
-
-####### Extensions / Themes and Plugins
-
-define RegisterAddonInner
-define Package/$(2)
-	SECTION:=juci
-	CATEGORY:=JUCI
-	TITLE:=default
-	SUBMENU:=$(1)
-	TITLE:=$(if $(3),$(3),JUCI $(2) plugin)
-	DEPENDS:=$(4)
-endef
-
-define Package/$(2)/install
-	$(INSTALL_DIR) $$(1)/
-	$(CP) $(PKG_BUILD_DIR)/bin/$(2)/* $$(1)/
-endef
-endef
-
-define RegisterAddon
-	$(eval $(call RegisterAddonInner,$(1),$(2),$(3),$(4),$(5)))
-	$(eval $(call BuildPackage,$(2)))
-endef
-
-$(eval $(call RegisterAddon,Plugins,juci-catv, CATV Module,@(PACKAGE_catv)))
-$(eval $(call RegisterAddon,Plugins,juci-cgroups, CGroups Module,@(PACKAGE_icgroupd)))
-$(eval $(call RegisterAddon,Plugins,juci-ddns, DDNS Configuration,@(PACKAGE_ddns-scripts)))
-$(eval $(call RegisterAddon,Plugins,juci-diagnostics, Simple Diagnostics,@(PACKAGE_busybox)))
-$(eval $(call RegisterAddon,Plugins,juci-ndt, NDT Speed Test client,@(PACKAGE_ndt)))
-$(eval $(call RegisterAddon,Plugins,juci-dnsmasq-dhcp, DHCP/DNSMasq Configuration,@(PACKAGE_dnsmasq||PACKAGE_dnsmasq-full)))
-$(eval $(call RegisterAddon,Plugins,juci-dropbear, Dropbear Configuration,@(PACKAGE_dropbear)))
-$(eval $(call RegisterAddon,Plugins,juci-easyqos, Easy QoS module,@(PACKAGE_easy-qos)))
-$(eval $(call RegisterAddon,Plugins,juci-event, Event Module,@(PACKAGE_owsd)))
-$(eval $(call RegisterAddon,Plugins,juci-firewall-fw3, Firewall Configuration,@(PACKAGE_firewall)))
-$(eval $(call RegisterAddon,Plugins,juci-icwmp, TR-069 Module,@(PACKAGE_icwmp)))
-$(eval $(call RegisterAddon,Plugins,juci-config-backup, Config Backup Module))
-$(eval $(call RegisterAddon,Plugins,juci-qos, QoS module,@(PACKAGE_qos-scripts)))
-$(eval $(call RegisterAddon,Plugins,juci-voice-client, Asterisk Voice Client Module,@(PACKAGE_asterisk)))
-$(eval $(call RegisterAddon,Plugins,juci-minidlna, MiniDLNA Configuration,@(PACKAGE_minidlna)))
-$(eval $(call RegisterAddon,Plugins,juci-mcproxy, Multicast Proxy Configuration,@(PACKAGE_mcproxy)))
-$(eval $(call RegisterAddon,Plugins,juci-mod-status, Status Reporting Module,@(PACKAGE_questd)))
-$(eval $(call RegisterAddon,Plugins,juci-mod-system, System Administration Module))
-$(eval $(call RegisterAddon,Plugins,juci-mwan3, mwan3 Configuration,@(PACKAGE_mwan3)))
-$(eval $(call RegisterAddon,Plugins,juci-natalie-dect, DECT Module,@(PACKAGE_dectmngr2)))
-$(eval $(call RegisterAddon,Plugins,juci-netmode, Netmode Module,@(PACKAGE_netmode)))
-$(eval $(call RegisterAddon,Plugins,juci-network-device, Network Device Configuration,@(PACKAGE_netifd)))
-$(eval $(call RegisterAddon,Plugins,juci-network-dsl, DSL Module))
-$(eval $(call RegisterAddon,Plugins,juci-network-netifd, Network Module,@(PACKAGE_netifd)))
-$(eval $(call RegisterAddon,Plugins,juci-network-port, Ethernet Port Configuration,@(PACKAGE_port-management)))
-$(eval $(call RegisterAddon,Plugins,juci-openvpn, OpenVPN configuration,@(PACKAGE_openvpn)))
-$(eval $(call RegisterAddon,Plugins,juci-owsd, OWSD configuration,@(PACKAGE_owsd)))
-$(eval $(call RegisterAddon,Plugins,juci-printer, p910nd Printer Server Configuration,@(PACKAGE_p910nd)))
-#$(eval $(call RegisterAddon,Plugins,juci-realtime-graphs, Realtime Graphs))
-$(eval $(call RegisterAddon,Plugins,juci-samba, Samba Configuration,@(PACKAGE_samba3)))
-$(eval $(call RegisterAddon,Plugins,juci-sfp, SFP Configuration,@(PACKAGE_peripheral_manager)))
-$(eval $(call RegisterAddon,Plugins,juci-snmpd, SNMP Module,@(PACKAGE_snmpd)))
-$(eval $(call RegisterAddon,Plugins,juci-sysupgrade, Sysupgrade Firmware Upgrade,@(PACKAGE_rpcd-mod-rpcsys)))
-$(eval $(call RegisterAddon,Plugins,juci-uhttpd, uHTTPD Configuration,@(PACKAGE_uhttpd)))
-$(eval $(call RegisterAddon,Plugins,juci-upnp, UPnP Configuration Module,@(PACKAGE_miniupnpd)))
-#$(eval $(call RegisterAddon,Plugins,juci-usb, USB Module))
-$(eval $(call RegisterAddon,Plugins,juci-wireless, Wireless Management Module))
-$(eval $(call RegisterAddon,Plugins,juci-wifilife, WiFi Life Module,@(PACKAGE_wifilife)))
-$(eval $(call RegisterAddon,Themes,juci-theme-iopsys))
-
-####### dynamically publish themes as packages #######
-$(foreach th,$(wildcard $(TOPDIR)/tmp/juci-themes/*),$(eval $(call RegisterAddon,Themes,$(notdir $(th)))))

juci/files/etc/config/juci

@@ -1,66 +0,0 @@
-config juci 'juci'
-	option homepage 'overview'
-	option theme 'juci-theme-iopsys'
-	option favicon 'favicon.ico'
-
-config login 'login'
-	option showusername '1'
-	option defaultuser 'user'
-
-config localization 'localization'
-	option default_language 'en'
-	list languages 'en'
-
-config wiki 'wiki'
-	option visible '0'
-	option version 'v4.2.x'
-
-config widget
-	list name 'overviewWidget11WAN'
-	list require 'ubus:network.interface'
-
-config widget
-	list name 'overviewWidget10Network'
-	list require 'ubus:network.interface'
-	list require 'ubus:router.network->hosts'
-
-config widget
-	list name 'overviewWidget00WiFi'
-	list require 'ubus:wifi'
-	list require 'ubus:wifi.wps'
-
-config menu
-	option path 'overview'
-	option page 'overview'
-
-config menu
-	option path 'system'
-	option page 'system'
-	option redirect 'first'
-
-config menu
-	option path 'status'
-	option page 'status'
-	option redirect 'first'
-
-config menu
-	option path 'status/system'
-	option page 'status-system'
-	list require 'ubus:router.system->info'
-
-config menu
-	option path 'status/network'
-	option page 'status-network'
-	list require 'ubus:network.interface'
-
-config menu
-	option path 'status/dsl'
-	option page 'network-dsl-status'
-	list require 'ubus:dsl->stats'
-	list require 'ubus:dsl->status'
-
-config menu
-	option path 'system/upgrade'
-	option page 'settings-upgrade'
-	list expose 'admin'
-

juci/files/etc/init.d/juci

@@ -1,41 +0,0 @@
-#!/bin/sh /etc/rc.common
-. /lib/functions.sh
-
-START=94
-STOP=06
-
-USE_PROCD=1
-NAME=juci
-
-start_service() {
-	mkdir -p /tmp/juci
-	touch /www/index.html.gz
-	chmod 755 /www/cgi-bin/luci
-	# this will simply update index.html to include any files that are for some reason not included
-	# a good way to make sure all plugins are properly included at each boot
-	config_load juci
-	local theme
-	config_get theme juci theme
-	if [ "$theme" ]
-	then
-		if [ -f /www/themes/theme.js.gz ] 
-			then
-			rm -f /www/themes/theme.js.gz
-		fi
-		if [ -f /www/themes/*$theme.js.gz ]
-			then
-			ln -s /www/themes/*$theme.js.gz /www/themes/theme.js.gz
-		fi
-	fi
-	juci-update
-}
-
-stop() {
-	service_stop /sbin/juci
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger juci
-}
-

juci/files/etc/uci-defaults/00-default-juci-rpcd-acl

@@ -1,49 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-USER_SECTION=""
-USER_EXISTS=0
-
-find_user(){
-	local section="$1"
-	local user="$2"
-	config_get username $section username
-	if [ "$username" == "$user" ]; then
-		USER_SECTION="$section"
-		USER_EXISTS=1
-	fi
-}
-
-config_load rpcd
-
-USER_EXISTS=0
-config_foreach find_user login root
-if [ $USER_EXISTS -eq 1 ]; then
-	uci delete rpcd.$USER_SECTION
-fi
-
-USER_EXISTS=0
-config_foreach find_user login admin
-if [ $USER_EXISTS -eq 0 ]; then
-	uci -q add rpcd login >/dev/null
-	uci -q set rpcd.@login[-1].username="admin"
-	uci -q set rpcd.@login[-1].password="\$p\$admin"
-	uci -q add_list rpcd.@login[-1].read="enduser"
-	uci -q add_list rpcd.@login[-1].read="administrator"
-	uci -q add_list rpcd.@login[-1].write="enduser"
-	uci -q add_list rpcd.@login[-1].write="administrator"
-fi
-
-USER_EXISTS=0
-config_foreach find_user login user
-if [ $USER_EXISTS -eq 0 ]; then
-	uci -q add rpcd login >/dev/null
-	uci -q set rpcd.@login[-1].username="user"
-	uci -q set rpcd.@login[-1].password="\$p\$user"
-	uci -q add_list rpcd.@login[-1].read="enduser"
-	uci -q add_list rpcd.@login[-1].write="enduser"
-fi
-
-uci commit rpcd
-

juci/files/usr/share/rpcd/acl.d/administrator.json

@@ -1,21 +0,0 @@
-{
-	"administrator": {
-		"description": "Administrator Access Rights",
-		"read": {
-			"ubus": {
-				"file": [
-					"write"
-				],
-				"rpc-sys": [
-					"upgrade_start",
-					"upgrade_test"
-				]
-			}
-		},
-		"write": {
-			"file": {
-				"/tmp/firmware.bin": ["write"]
-			}
-		}
-	}
-}

juci/files/usr/share/rpcd/acl.d/enduser.json

@@ -1,217 +0,0 @@
-{
-	"enduser": {
-		"description": "End User Access Rights",
-		"read": {
-			"ubus": {
-				"dect": [
-					"state",
-					"handset",
-					"status",
-					"call"
-				],
-				"dsl": [
-					"status",
-					"stats"
-				],
-				"network.device": [
-					"status"
-				],
-				"network.interface*": [
-					"status",
-					"dump",
-					"up",
-					"down"
-				],
-				"router.network": [
-					"clients",
-					"hosts",
-					"dump"
-				],
-				"router.system": [
-					"info",
-					"memory",
-					"filesystem",
-					"process",
-					"processes"
-				],
-				"session": [
-					"access",
-					"list",
-					"destroy",
-					"login"
-				],
-				"system": [
-					"info",
-					"board",
-					"reboot"
-				],
-				"testnet": [
-					"status"
-				],
-				"uci": [
-					"*"
-				],
-				"voice.asterisk": [
-					"status",
-					"call_log",
-					"platform",
-					"supported_countries"
-				],
-				"wifi": [
-					"status"
-				],
-				"wifi.ap.*": [
-					"status",
-					"stats",
-					"assoclist",
-					"stations"
-				],
-				"wifi.radio.*": [
-					"status",
-					"stats",
-					"scan",
-					"scanresults",
-					"autochannel"
-				],
-				"wifi.wps": [
-					"start",
-					"stop",
-					"status",
-					"showpin"
-				]
-			},
-			"uci": [
-				"dhcp",
-				"firewall",
-				"juci",
-				"network",
-				"voice_client",
-				"wireless"
-			],
-			"owsd": [
-				"client",
-				"wifi.radio",
-				"wifi.sta",
-				"wifi.wps"
-			]
-		},
-		"write": {
-			"uci": [
-				"dhcp",
-				"firewall",
-				"network",
-				"wireless"
-			],
-			"uci_granular": {
-				"dhcp": [
-					{
-						"match": {
-							".type": "dhcp"
-						},
-						"option": [
-							"*"
-						]
-					},
-					{
-						"match": {
-							".type": "host"
-						},
-						"option": [
-							"*"
-						]
-					}
-				],
-				"firewall": [
-					{
-						"match": {
-							".type": "settings",
-							".name": "settings"
-						},
-						"option": [
-							"disabled"
-						]
-					},
-					{
-						"match": {
-							".type": "zone"
-						},
-						"option": [
-							"masq",
-							"name",
-							"network"
-						]
-					},
-					{
-						"match": {
-							".type": "redirect"
-						},
-						"option": [
-							"*"
-						]
-					},
-					{
-						"match": {
-							".type": "rule"
-						},
-						"option": [
-							"*"
-						]
-					},
-					{
-						"match": {
-							".type": "dmz"
-						},
-						"option": [
-							"enabled",
-							"host",
-							"ip6addr"
-						]
-					}
-				],
-				"network": [
-					{
-						"match": {
-							".type": "interface"
-						},
-						"option": [
-							"*"
-						]
-					}
-				],
-				"wireless": [
-					{
-						"match": {
-							".type": "wifi-status"
-						},
-						"option": [
-							"wps"
-						]
-					},
-					{
-						"match": {
-							".type": "wifi-iface",
-							"mode": "ap"
-						},
-						"option": [
-							"*"
-						]
-					},
-					{
-						"match": {
-							".type": "wifi-device"
-						},
-						"option": [
-							"channel"
-						]
-					}
-				]
-			},
-			"owsd": [
-				"client",
-				"wifi.radio",
-				"wifi.sta",
-				"wifi.wps"
-			]
-		}
-	}
-}

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=5.2.2
+PKG_VERSION:=6.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=e9248b872711e7b6242974684478bdba0f14a7cb
+PKG_SOURCE_VERSION:=184fcb9b10fcb5978da22058792af859424dbb8d
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS

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

@@ -5,6 +5,47 @@ STOP=20
 
 USE_PROCD=1
 
+MAP_DEV="map_dev"
+MAP_IF="map"
+MAP_VETH="lei"
+
+create_map() {
+	uci -q set network.${MAP_DEV}=device
+	uci -q set network.${MAP_DEV}.name=br-map
+	uci -q set network.${MAP_DEV}.type=bridge
+	uci -q set network.${MAP_DEV}.bridge_empty=1
+
+	uci -q set network.${MAP_IF}=interface
+	uci -q set network.${MAP_IF}.device=br-map
+	uci -q set network.${MAP_IF}.is_lan=1
+
+	uci -q set mapagent.agent.al_bridge=br-map
+
+	uci -q commit
+
+	ubus call network reload
+	ubus -t 5 wait_for network.device
+
+	ip link add ${MAP_VETH} type veth peer name ${MAP_VETH}_lan 2>/dev/null
+	brctl addif br-map ${MAP_VETH} 2>/dev/null
+	brctl addif br-lan ${MAP_VETH}_lan 2>/dev/null
+	ip link set ${MAP_VETH} up 2>/dev/null
+	ip link set ${MAP_VETH}_lan up 2>/dev/null
+}
+
+remove_map() {
+	ip link delete ${MAP_VETH} &>/dev/null
+
+	uci -q delete network.${MAP_DEV}
+	uci -q delete network.${MAP_IF}
+
+	uci -q set mapagent.agent.al_bridge=br-lan
+
+	uci -q commit
+
+	ubus call network reload
+}
+
 start_service() {
 	config_load "mapagent"
 
@@ -16,6 +57,10 @@ start_service() {
 	config_get_bool enabled agent enabled 1
 	[ "$enabled" -eq 0 ] && return 1
 
+	local ts
+	config_get_bool ts agent vlan_segregation 0
+	[ "$ts" -eq 1 ] && create_map #|| remove_map
+
 	procd_open_instance
         procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
@@ -24,6 +69,10 @@ start_service() {
 	procd_close_instance
 }
 
+#stop_service() {
+#	remove_map
+#}
+
 service_triggers()
 {
 	procd_add_reload_trigger "ieee1905"

map-agent/files/lib/wifi/multiap

@@ -7,6 +7,8 @@
 # write_credentials - write bBSS credentials to fBSS
 
 . /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+. /lib/wifi/traffic_separation
 
 diff=0
 
@@ -42,9 +44,9 @@ brcm_sync_credentials() {
 		[ "$section" == "" ] && return
 
 		uci set ieee1905.${section}.band=$band
-		uci set ieee1905.${section}.ssid=$ssid
+		uci set ieee1905.${section}.ssid="$ssid"
 		uci set ieee1905.${section}.encryption=$encryption
-		uci set ieee1905.${section}.key=$key
+		uci set ieee1905.${section}.key="$key"
 	}
 
 	mapagent_process_radio() {
@@ -89,8 +91,8 @@ brcm_write_credentials() {
 		write_wireless() {
 			local section=$1
 			local map_ifname=$2
-			local bk_ssid=$3
-			local bk_key=$4
+			local bk_ssid="$3"
+			local bk_key="$4"
 
 			config_get ifname $section ifname
 
@@ -98,21 +100,21 @@ brcm_write_credentials() {
 
 			[ "$ifname" != "$map_ifname" ] && return
 
-			#echo applying bk_ssid = $bk_ssid bk_key = $bk_key
+			#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
 
 			uci -q set wireless.${section}.multi_ap_backhaul_ssid="$bk_ssid"
 			uci -q set wireless.${section}.multi_ap_backhaul_key="$bk_key"
 		}
 		config_load wireless
 
-		config_foreach write_wireless wifi-iface $1 $2 $3
+		config_foreach write_wireless wifi-iface "$1" "$2" "$3"
 	}
 
 	mapagent_find_fbss() {
 		local section=$1
 		local dev=$2
-		local bk_ssid=$3
-		local bk_key=$4
+		local bk_ssid="$3"
+		local bk_key="$4"
 
 		config_get device $section device
 		config_get multi_ap $section multi_ap "0"
@@ -124,10 +126,10 @@ brcm_write_credentials() {
 
 		config_get ifname $section ifname
 
-		#echo applying bk_ssid = $bk_ssid bk_key = $bk_key
+		#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
 
 		# subshell in hopes to maintain mapagent config loaded
-		$(mapagent_apply_wireless $ifname $bk_ssid $bk_key)
+		echo $(mapagent_apply_wireless $ifname "$bk_ssid" "$bk_key") 2> /dev/null
 	}
 
 	mapagent_find_bbss() {
@@ -147,9 +149,9 @@ brcm_write_credentials() {
 		config_get ssid $1 ssid
 		config_get key $1 key
 
-		#echo found ssid=$ssid key=$key
+		#echo found ssid="$ssid" key="$key"
 
-		config_foreach mapagent_find_fbss fh-iface $dev $ssid $key
+		config_foreach mapagent_find_fbss fh-iface $dev "$ssid" "$key"
 	}
 
 	mapagent_process_radio() {
@@ -295,6 +297,208 @@ brcm_teardown_iface() {
 	uci commit mapagent
 }
 
+brcm_bsta_to_wireless() {
+	config_load mapagent
+
+	mapagent_find_lowest_prio_onboarded() {
+		mapagent_process_bk() {
+			config_get priority $1 priority "2"
+			config_get onboarded $1 onboarded "0"
+
+			[ "$onboarded" = "0" ] && return
+
+			if [ -z "$sec" -o "$prio" = "-1" -o "$priority" -lt "$prio" ]; then
+				sec=$1
+				prio=$priority
+			fi
+		}
+
+		local sec=""
+		local prio="-1"
+
+		config_foreach mapagent_process_bk bk-iface
+		echo $sec
+	}
+
+	mapagent_enable_best() {
+		#echo 1=$1 best=$best > /dev/console
+		if [ "$1" = "$best" ]; then
+			uci -q set mapagent.$1.enabled='1'
+		else
+			uci -q set mapagent.$1.enabled='0'
+		fi
+	}
+
+	mapagent_bsta_to_wireless() {
+		mapagent_apply_wl_bsta() {
+			apply_config() {
+				local section=$1
+				local bsta=$2
+				local ssid="$3"
+				local key="$4"
+				local encryption=$5
+				local enabled=$6
+				local disabled="0"
+
+				config_get ifname $section ifname
+
+				[ -z "$enabled" -o "$enabled" = "0" ] && disabled="1"
+
+				[ "$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
+				echo 1
+			}
+
+			config_load wireless
+
+			config_foreach apply_config wifi-iface $@
+			uci commit wireless
+		}
+
+		mapagent_find_other_creds() {
+			#echo "trying to find other creds for $2" > /dev/console
+			config_get band $1 band
+			config_get onboarded $1 onboarded "0"
+
+			[ "$3" != "$band" -o "$onboarded" = "0" ] && return
+
+			config_get ssid $1 ssid
+			config_get key $1 key
+			config_get encryption $1 encryption
+			config_get enabled $1 enabled "0"
+
+			echo $(mapagent_apply_wl_bsta $2 "$ssid" "$key" $encryption $4) 2> /dev/null
+		}
+
+		config_get band $1 band
+		config_get ifname $1 ifname
+		config_get onboarded $1 onboarded "0"
+		config_get enabled $1 enabled "0"
+
+		if [ "$onboarded" = "0" ]; then
+			config_foreach mapagent_find_other_creds bk-iface $ifname $band $enabled
+		else
+			config_get ssid $1 ssid
+			config_get key $1 key
+			config_get encryption $1 encryption
+
+			echo $(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled) 2> /dev/null
+		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
+	config_load mapagent
+
+	diff=$(config_foreach mapagent_bsta_to_wireless bk-iface)
+
+	[ "$diff" != "" ] && {
+		ubus call uci commit '{"config":"wireless"}'
+	}
+}
+
+
+
+sync_mapcontroller_from_wireless() {
+	ubus -t 5 wait_for wifi
+	[ "$?" != "0" ] && return
+
+	[ ! -f "/etc/config/wireless" ] && return
+
+	status=$(ubus -S call wifi status)
+
+	device_to_band() {
+		local ifname=$1
+		json_load "$status"
+		json_select "radios"
+		json_get_keys keys
+
+		for key in $keys; do
+			json_select $key
+			json_get_var name name
+
+			if [ "$name" != "$ifname" ]; then
+				json_select ..
+				continue
+			fi
+
+			json_get_var band band
+
+			if [ "$band" == "5GHz" ]; then
+				echo "5"
+			elif [ "$band" == "2.4GHz" ]; then
+				echo "2"
+			fi
+
+			break
+		done
+
+		json_cleanup
+	}
+
+	wireless_process_iface() {
+		local section=$1
+		local type="ap"
+		local enabled="1"
+
+		config_get multi_ap $section multi_ap 0
+		[ "$multi_ap" != "1" ] && [ "$multi_ap" != "2" ] && return
+
+		config_get mode $section mode "ap"
+		[ "$mode" != "ap" ] && return
+
+		config_get device $section device
+		band=$(device_to_band $device)
+		[ "$band" == "" ] && return
+
+		config_get ssid $section ssid
+		config_get key $section key
+		config_get encryption $section encryption
+		config_get start_disabled $section start_disabled "0"
+		config_get network $section network
+
+
+		cntlr_section=$(uci add mapcontroller ${type})
+		uci 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"
+
+		[ "$multi_ap" == "1" ] && map_type="backhaul" || map_type="fronthaul"
+		uci set mapcontroller.${cntlr_section}.type="$map_type"
+
+		[ "$start_disabled" == "1" ] && enabled="0"
+		uci set mapcontroller.${cntlr_section}.enabled="$enabled"
+	}
+
+	mapcontroller_teardown() {
+		local section=$1
+
+		uci delete mapcontroller.$1
+	}
+
+	config_load mapcontroller
+	config_foreach mapcontroller_teardown ap
+
+	config_load wireless
+	config_foreach wireless_process_iface wifi-iface
+	uci commit mapcontroller
+}
+
 
 
 func=$1
@@ -310,6 +514,9 @@ case "$func" in
 	set_network) brcm_set_network $@;;
 	write_bsta_config) write_bsta_config $@;;
 	teardown_iface) brcm_teardown_iface $@;;
+	bsta_to_wireless) brcm_bsta_to_wireless $@;;
+	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
+	ts) ts_sub $@;;
 	--help|help) usage;;
 	*) usage; exit 1;;
 esac

map-agent/files/lib/wifi/traffic_separation

@@ -0,0 +1,381 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+### Traffic Separation ###
+
+ts_sub() {
+
+	ts_usage() {
+		cat <<EOF
+Usage: $0 [create|delete|populate]
+Traffic Separation related functions.
+create fh <iface> <vid>			- create vlan device and rules for wifi fronthaul
+create bh <iface> <vid> <profile>	- create vlan device and rules for wifi backhaul
+create eth <iface> <vid> <pbits>	- create vlan device and rules for logical ethernet interface
+delete <iface>				- delete vlan device
+populate eth <iface> <vid>		- add secondary network rules for logical ethernet interface
+primary get <iface>			- read primary VID for interface from driver (from Association Response frame IE)
+     
+EOF
+	exit 1
+	}
+
+	_get_bridge() {
+		local bridge=$(ip link show $1 | grep -o "master [^\s]*" | cut -d ' ' -f 2)
+		echo $bridge
+	}
+
+	ts_create() {
+
+		_create_vlan_dev() {
+			iface=$1				# real iface
+			vid=$2					# Vlan ID
+			bridge="$(_get_bridge $iface)"		# bridge iface is connected to
+			vlan_dev=${iface}_vlan${vid}		# name of vlan device to create
+
+			# remove interface from bridge if it is in one
+			[ -n "$bridge" ] && brctl delif $bridge $iface &> /dev/null
+
+			# create vlan device
+			vlanctl --mcast --if-create-name $iface $vlan_dev --if $iface --set-if-mode-rg
+
+			# bring the vlan device up and add back to bridge if it was in one
+			[ -n "$bridge" ] && brctl addif $bridge $vlan_dev &> /dev/null
+			ip link set dev $vlan_dev up
+
+			echo $vlan_dev
+		}
+
+		ts_create_fh() {
+			iface=$1				# fh iface
+			vid=$2					# SSID specific (secondary) or primary vid
+
+			[ -n "$iface" ] && [ -n "$vid" ] || {
+				cat <<EOF
+Adding FH device requires IFACE and VID.
+EOF
+				exit 1
+			}
+
+			# create vlan device
+			vlan_dev=$(_create_vlan_dev $iface $vid)
+
+			# add rules
+			# Note: removing these for now since these packets are read directly from the iface anyway
+#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x888e --set-rxif $vlan_dev --rule-append		# incoming EAPOL
+#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x886c --set-rxif $vlan_dev --rule-append		# incoming brcm
+			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --rule-append
+			vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --filter-vid $vid 0 --pop-tag --dscp2pbits 0 --rule-append
+		}
+
+# Note: Currently not used (will be needed for Profile 1)
+		ts_create_bh() {
+			iface=$1				# bh iface
+			vid=$2					# primary vid
+			profile=$3				# agent profile (1 or 2)
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
+				cat <<EOF
+Adding BH device requires IFACE, VID and PROFILE (1 or 2).
+EOF
+				exit 1
+			}
+
+			# create vlan device
+			vlan_dev=$(_create_vlan_dev $iface $vid)
+
+			# add rules
+			case "$profile" in
+				1 | profile_1 | profile1 | Profile_1 | Profile1)
+					vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --rule-append
+					vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --pop-tag --rule-append
+					;;
+				2 | profile_2 | profile2 | Profile_2 | Profile2)
+					vlanctl --if $iface --rx --tags 1 --set-rxif $vlan_dev --rule-append
+					vlanctl --if $iface --tx --tags 1 --filter-txif $vlan_dev --rule-append								# note: already default
+					vlanctl --if $iface --tx --tags 0 --filter-ethertype 0x893a --filter-txif $vlan_dev --push-tag --set-vid $vid 0 --rule-append	# note: outgoing IEEE1905.1
+					vlanctl --if $iface --tx --tags 0 --filter-ethertype 0x888e --filter-txif $vlan_dev --push-tag --set-vid $vid 0 --rule-append	# note: outgoing EAPOL
+					;;
+				*)
+					ts_delete $iface
+					ts_usage
+					exit 1
+					;;
+			esac
+		}
+
+		ts_create_bh_drv() {
+			iface=$1				# bh iface
+			vid=$2					# primary vid
+			profile=$3				# agent profile (1 or 2)
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
+				cat <<EOF
+Adding BH device requires IFACE, VID and PROFILE (1 or 2).
+EOF
+				exit 1
+			}
+
+			wl vlan_mode 0 &> /dev/null				# make sure this is OFF, else driver won't handle vlan
+			wl -i $iface down &> /dev/null
+			wl -i $iface map_profile $profile &> /dev/null		# only has effect on profile 2
+			wl -i $iface map_8021q_settings $vid &> /dev/null	# can only be set on bBSS (read-only on bSTA)
+			wl -i $iface up &> /dev/null
+		}
+
+		ts_create_eth() {
+
+			_ts_setup() {
+				vlan_bridge=$1
+				lan_bridge=$2
+				vlan_dev=$3
+				lan_dev=${vlan_dev}_lan
+
+				ip link show $vlan_dev &> /dev/null || ip link add $vlan_dev type veth peer name $lan_dev
+				brctl addif $vlan_bridge $vlan_dev &> /dev/null
+				brctl addif $lan_bridge $lan_dev &> /dev/null
+				ip link set $vlan_dev up
+				ip link set $lan_dev up
+			}
+
+			iface=$1				# Multi-AP Logical Ethernet Interface
+			vid=$2					# primary vid
+			pbits=$3				# default pbits to apply
+			vlan_bridge=$4				# name of ts subsystem bridge
+			lan_bridge=$5				# name of node local bridge
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$pbits" ] && [ -n "$vlan_bridge" ] && [ -n "$lan_bridge" ] || {
+				cat <<EOF
+Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
+EOF
+				exit 1
+			}
+
+			# create virtual eth device between bridges (if it doesn't exist))
+			_ts_setup $vlan_bridge $lan_bridge $iface
+
+			# create vlan device
+			vlan_dev=$(_create_vlan_dev $iface $vid)
+
+			# TODO: how to disable returning traffic back to incoming interface?
+
+			# add rules
+			vlanctl --if $iface --rx --tags 0 --set-rxif $vlan_dev --push-tag --set-vid $vid 0 --set-pbits $pbits 0 --rule-append
+			vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --pop-tag --rule-append
+		}
+
+		ts_create_dhcp() {
+			_br_setup() {
+				local name=$1
+				local sinkname=$2
+				local vid=$3
+				local diff=""
+
+				[ -z "$(uci -q get network.${name}_dev)" ] && {
+					uci -q set network.${name}_dev="device"
+					uci -q set network.${name}_dev.name="br-${name}"
+					uci -q set network.${name}_dev.type="bridge"
+					uci -q set network.${name}_dev.bridge_empty="1"
+					uci -q add_list network.${name}_dev.ports="${sinkname}"
+
+					diff="1"
+				}
+
+				[ -z "$(uci -q get network.${name})" ] && {
+					uci -q set network.${name}="interface"
+					uci -q set network.${name}.device="br-${name}"
+					uci -q set network.${name}.is_lan="1"
+					uci -q set network.${name}.proto="static"
+					uci -q set network.${name}.ipaddr="192.168.${vid}.1"
+					uci -q set network.${name}.netmask="255.255.255.0"
+
+					diff="1"
+				}
+
+				[ "$diff" = "1" ] && {
+					uci -q commit network
+					ubus call network reload
+					ubus -t 5 wait_for network.device
+				}
+			}
+
+			_dhcp_setup() {
+				local name=$1
+
+				[ -n "$(uci -q get dhcp.${name})" ] && return
+
+				uci -q set dhcp.${name}=dhcp
+				uci -q set dhcp.${name}.interface="${name}"
+				uci -q set dhcp.${name}.start="100"
+				uci -q set dhcp.${name}.limit="150"
+				uci -q set dhcp.${name}.leasetime="1h"
+				uci -q set dhcp.${name}.dhcpv4="server"
+				uci -q set dhcp.${name}.dhcpv6="server"
+				uci -q set dhcp.${name}.ra="server"
+				uci -q set dhcp.${name}.ra_slaac="1"
+				uci -q add_list dhcp.${name}.ra_flags="managed-config"
+				uci -q add_list dhcp.${name}.ra_flags="other-config"
+
+				uci -q commit dhcp
+				ubus call uci commit '{"config":"dhcp"}'
+			}
+
+			_wan_setup() {
+				local name=$1
+
+				config_load firewall
+
+				_process_zone() {
+					local section=$1
+					local sink=$2
+					local name
+					local exists=false
+
+					config_get name $section name
+
+					[ "$name" == "lan" ] || return
+
+					_process_list() {
+						local value=$1
+
+						[ "$value" == "$sink" ] && exists=true && return 1
+					}
+
+					config_list_foreach "$section" network _process_list 
+
+					[ $exists = false ] && {
+						uci -q add_list firewall.${section}.network="${sink}"
+						uci -q commit firewall
+						ubus call uci commit '{"config":"firewall"}'
+					}
+
+					return 1
+				}
+
+				config_foreach _process_zone zone $name
+			}
+
+			vid=$1					# primary vid
+
+			[ -n "$vid" ] || {
+				cat <<EOF
+VID required to configure DHCP.
+EOF
+				exit 1
+			}
+
+			br_dev=sink_vlan${vid}			# name of vlan device to create
+
+
+			ip l a sink1_vlan${vid} type veth peer name sink2_vlan${vid}
+			vlanctl --mcast --if-create-name sink2_vlan${vid} sink3_vlan${vid} --if sink2_vlan${vid} --set-if-mode-rg
+			vlanctl --if sink2_vlan${vid} --rx --tags 1 --filter-vid ${vid} 0 --set-rxif sink3_vlan${vid} --pop-tag --rule-append
+			vlanctl --if sink2_vlan${vid} --tx --tags 0 --filter-txif sink3_vlan${vid} --push-tag --set-vid ${vid} 0 --rule-append
+			ip l s sink1_vlan${vid} up
+			ip l s sink2_vlan${vid} up
+			ip l s sink3_vlan${vid} up
+
+			_br_setup $br_dev sink3_vlan${vid} $vid
+			_dhcp_setup $br_dev
+			_wan_setup $br_dev
+		}
+
+	local type=$1
+	shift
+
+	case "$type" in
+		fh) ts_create_fh $@;;
+#		bh) ts_create_bh $@;;
+		bh) ts_create_bh_drv $@;;
+		eth) ts_create_eth $@;;
+		dhcp) ts_create_dhcp $@;;
+		--help|help) ts_usage;;
+		*) ts_usage; exit 1;;
+	esac
+	}
+
+	ts_delete() {
+		iface=$1
+
+		path=$(ls -d /sys/class/net/${iface}/upper_*)
+		[ -z "$path" ] && exit 0
+		vlan_dev=${path##*upper_}
+		bridge="$(_get_bridge $vlan_dev)"
+
+		vlanctl --if-delete $vlan_dev		# note: also removes rules and removes from bridge
+
+		brctl addif $bridge $iface &> /dev/null
+	}
+
+	ts_populate() {
+		local type=$1
+		shift
+
+		[ "$type" == "eth" ] || {
+			cat <<EOF
+Populating ETH rules requires IFACE and VID.
+EOF
+			exit 1
+		}
+
+		iface=$1				# Multi-AP Logical Ethernet Interface
+		vid=$2					# secondary vid
+
+		path=$(ls -d /sys/class/net/${iface}/upper_*)
+		[ -z "$path" ] && exit 1
+		vlan_dev=${path##*upper_}
+
+		# add rules
+		vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append		# note: retain secondary vids
+		vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append		# note: already default
+	}
+
+	ts_primary() {
+		local func=$1
+		shift
+
+		case "$func" in
+			get) vid=$(wl -i $1 map_8021q_settings); echo ${vid##* };;
+			*) ts_usage; exit 1;;
+		esac
+	}
+
+	ts_unicast() {
+		local mac=$1
+		local iface=$2
+
+		# TODO: improve?
+		res=$(ebtables -t broute -L | grep -i "$mac" | grep "$iface")
+		[ -n "$res" ] && return
+
+		ebtables -t broute -D BROUTING -d "$mac" -p 0x893a -j DROP
+		ebtables -t broute -I BROUTING -i "$iface" -d "$mac" -p 0x893a -j DROP
+	}
+
+	ts_multicast() {
+		local iface=$1
+
+		# TODO: improve?
+		res=$(ebtables -t broute -L | grep -i "1:80:C2:00:00:13" | grep "$iface")
+		[ -n "$res" ] && return
+
+		ebtables -t broute -D BROUTING -d 01:80:C2:00:00:13 -p 0x893a -j DROP
+		ebtables -t broute -D BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
+		ebtables -t broute -I BROUTING -i "$iface" -d 01:80:C2:00:00:13 -p 0x893a -j DROP
+	}
+
+	local func=$1
+	shift
+
+	case "$func" in
+		create) ts_create $@;;
+		delete) ts_delete $@;;
+		populate) ts_populate $@;;
+		primary) ts_primary $@;;
+		unicast) ts_unicast $@;;
+		multicast) ts_multicast $@;;
+		--help|help) ts_usage;;
+		*) ts_usage; exit 1;;
+	esac
+}

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.1.0
+PKG_VERSION:=5.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=34e239d8bb0dfade22bce3a4fb583ada826d3736
+PKG_SOURCE_VERSION:=6ba4d74bbd196b781ba2418eb596a550d34c1028
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE

map-controller/files/etc/config/mapcontroller

@@ -2,43 +2,66 @@ config controller 'controller'
 	option enabled '1'
 	option registrar '5 2'	    #bands on which wps registrar supported
 	option debug '6'
-	option al_bridge 'br-lan'
+	option enable_sta_steer '0'
+	option enable_bsta_steer '0'
+	option primary_vid '1'
+	option primary_pcp '0'
 
-config vlan 'lan'
-	option network 'lan'
-	option id '1'
+config interface 'lan'
+	option 'dhcp'
 
-config fh-credentials
+config ap
 	option band '5'
-	option encryption 'psk2'
+	option encryption 'sae-mixed'
 	option key '1234567890'
 	option ssid 'map-net5'
-	option vlan '1'
+	option vid '1'
+	option type 'fronthaul'
+	option network 'lan'
 
-config fh-credentials
+config ap
 	option band '2'
-	option encryption 'psk2'
+	option encryption 'sae-mixed'
 	option key '1234567890'
 	option ssid 'map-net2'
-#	option bk_ssid 'multiap_ssid123'
-#	option bk_key 'multiap_key123'
-	option vlan '1'
+	option vid '1'
+	option type 'fronthaul'
+	option network 'lan'
 
-config bk-credentials
+config ap
 	option band '5'
-	option encryption 'psk2'
+	option encryption 'sae'
 	option key '5555555555'
 	option ssid 'map-bkhaul-5'
-	option multi_ap '2'
+	option type 'backhaul'
 	option disallow_bsta '1'		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
-	option vlan '1'
+	option vid '1'
+	option network 'lan'
 
-
-config bk-credentials
+config ap
 	option band '2'
-	option encryption 'psk2'
+	option encryption 'sae'
 	option key '2222222222'
 	option ssid 'map-bkhaul-2'
-	option multi_ap '2'
-	option disallow_bsta '0'                # 0 or 1 profile-1 bSTA
-	option vlan '1'
+	list disallow_bsta '0'                # 0 or 1 profile-1 bSTA
+	option vid '1'
+	option type 'backhaul'
+	option network 'lan'
+
+config policy 'policy'
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_sta_assocfails_rate '2'      # reporting rate for STA assoc fails (attempts per minute)
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option rcpi_hysteresis_margin '0'          # 0, or > 0 - hysteresis margin
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.1.8
+PKG_VERSION:=3.0.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=68c8ebb9ffd72873bb35971b9ea854a6c1e1df5c
+PKG_SOURCE_VERSION:=d1fb7e76cb0fe93167648cf32193e73b1ca3522a
 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

obudpst/Makefile

@@ -0,0 +1,42 @@
+#
+# Copyright (c) 2020, Broadband Forum
+# Copyright (c) 2020, AT&T Communications
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=obudpst
+PKG_VERSION:=7.2.1
+PKG_SOURCE_VERSION:=9c448095c9773bd7e5cea143af07817ad9f3c6ba
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/BroadbandForum/obudpst.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/obudpst
+	CATEGORY:=Utilities
+	DEPENDS+=+libopenssl
+	TITLE:=Open Broadband-UDP Speed Test (OB-UDPST)
+endef
+
+define Build/Install
+	:
+endef
+
+define Package/obudpst/description
+	Open Broadband-UDP Speed Test (OB-UDPST) is a client/server software utility to demonstrate
+	one approach of doing IP capacity measurements described by Broadband Forum TR-471.
+endef
+
+define Package/obudpst/install
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/udpst $(1)/usr/sbin/udpst
+endef
+
+$(eval $(call BuildPackage,obudpst))

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=4.1.0.1
+PKG_VERSION:=4.1.0.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bb552093a94b0e6afd01a815cfad08236b2ea7e2
+PKG_SOURCE_VERSION:=588a3506c197fdb9b7ea50dae5680f2aadf33b51
 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

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

@@ -5,5 +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
+
 /etc/init.d/obuspa reload
 

obuspa/files/etc/init.d/obuspa

@@ -1,14 +1,12 @@
 #!/bin/sh /etc/rc.common
 
 START=99
+STOP=2
 USE_PROCD=1
 PROG=/usr/sbin/obuspa
 
-EXTRA_COMMANDS="remove_db"
-EXTRA_HELP="	remove_db Removes obuspa persistent db before restarting, self trigger with uci change"
-
-PARAM_FILE="/tmp/obuspa_param_reset.txt"
 CONFIGURATION=obuspa
+PARAM_FILE="/tmp/obuspa_param_reset.txt"
 KEEP_FILES="/lib/upgrade/keep.d/obuspa"
 USP_TEMP_FILE="/tmp/usp.tmp"
 controller_num=0
@@ -19,6 +17,7 @@ subs_num=0
 challenge_num=0
 index=0
 role_def_file=""
+PROFILE="/root/.profile"
 
 . /lib/functions/network.sh
 . /usr/share/libubox/jshn.sh
@@ -43,6 +42,19 @@ db_set() {
 	fi
 }
 
+update_keep() {
+	keep_file=${1}
+
+	if [ -z "${keep_file}" ]; then
+		return;
+	fi
+
+	grep -q "${keep_file}" ${KEEP_FILES}
+	if [ "$?" -ne 0 ]; then
+		echo ${keep_file} >> ${KEEP_FILES}
+	fi
+}
+
 get_index() {
 	index=$(( index + 1 ))
 	if [ "$1" = "$2" ]; then
@@ -580,28 +592,38 @@ configure_obuspa() {
 	fi
 
 	if [ -n "${interface}" ]; then
-		network_get_device ifname ${interface}
+		network_get_physdev ifname ${interface}
 		log "ifname from ${interface} is ${ifname}"
 	fi
 
 	# Set this variable for root user and obuspa -c tool
-	grep -q "export USP_BOARD_IFNAME=${ifname}" /root/.profile || \
-		echo "export USP_BOARD_IFNAME=${ifname}" >> /root/.profile
+	if [ -f "${PROFILE}" ]; then
+		grep -q "export USP_BOARD_IFNAME=${ifname}" ${PROFILE}
+		if [ "$?" -ne 0 ]; then
+			grep -q "export USP_BOARD_IFNAME" ${PROFILE}
+			if [ "$?" -eq 0 ]; then
+				sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
+			fi
+			echo "export USP_BOARD_IFNAME=${ifname}" >> ${PROFILE}
+		fi
+	else
+		echo "export USP_BOARD_IFNAME=${ifname}" > ${PROFILE}
+	fi
 
 	if [ -n "${db_file}" ]; then
-		echo "${db_file}" >>${KEEP_FILES}
+		update_keep "${db_file}"
 		procd_append_param command -f ${db_file}
 	fi
 
 	if [ -n "${trust_cert}" ]; then
-		echo "${trust_cert}" >>${KEEP_FILES}
+		update_keep "${trust_cert}"
 		if [ -f "${trust_cert}" ]; then
 			procd_append_param command -t ${trust_cert}
 		fi
 	fi
 
 	if [ -n "${client_cert}" ]; then
-		echo "${client_cert}" >>${KEEP_FILES}
+		update_keep "${client_cert}"
 		if [ -f "${client_cert}" ]; then
 			procd_append_param command -a ${client_cert}
 		fi
@@ -612,10 +634,6 @@ configure_obuspa() {
 
 # Create factory reset file
 db_init() {
-	[ -f ${PARAM_FILE} ] && rm -f ${PARAM_FILE}
-	[ -f /tmp/usp.db ] && rm -f /tmp/usp.db
-	[ -f ${KEEP_FILES} ] && rm -f ${KEEP_FILES}
-
 	# Load configuration
 	config_load $CONFIGURATION
 	config_foreach configure_obuspa obuspa
@@ -630,28 +648,6 @@ db_init() {
 	db_set Internal.Reboot.Cause "LocalFactoryReset"
 }
 
-# if uci changes for obuspa remove persistent db and then reload
-remove_db() {
-	local db_file
-
-	config_load obuspa
-	config_get db_file global db_file
-
-	log "Removing db file (${db_file})"
-	[ -f ${db_file} ] && rm -f ${db_file}
-
-	sed -i "g/export USP_BOARD_IFNAME/d" /root/.profile
-
-	log "Restarting service"
-	stop
-	start
-}
-
-service_running() {
-	ubus -t 10 wait_for usp.raw
-	procd_running ${CONFIGURATION}
-}
-
 start_service() {
 	local enabled
 
@@ -664,10 +660,6 @@ start_service() {
 	fi
 
 	ubus wait_for usp.raw
-	if [ "$?" -ne 0 ]; then
-		log "OBUSPA failed to start usp.raw not available"
-		return 0
-	fi
 
 	procd_open_instance ${CONFIGURATION}
 	procd_set_param command ${PROG}
@@ -682,7 +674,19 @@ start_service() {
 }
 
 stop_service() {
+	local db_file
+
+	config_load obuspa
+	config_get db_file global db_file
+
 	${PROG} -c stop 2>&1 >/dev/null
+
+	if [ -z "${db_file}" ]; then
+		db_file="/tmp/usp.db"
+	fi
+
+	[ -f ${db_file} ] && rm -f ${db_file}
+	[ -f ${PARAM_FILE} ] && rm -f ${PARAM_FILE}
 }
 
 reload_service() {
@@ -691,8 +695,7 @@ reload_service() {
 }
 
 service_triggers() {
-	procd_add_reload_trigger "uspd" "mosquitto"
-	procd_add_config_trigger "config.change" "${CONFIGURATION}" /etc/init.d/obuspa remove_db
+	procd_add_reload_trigger "obuspa" "mosquitto"
 
 	# Create a reload trigger if schema update avaialble
 	procd_open_trigger
@@ -711,13 +714,7 @@ service_triggers() {
 					json_add_string "" "reload"
 				json_close_array
 			json_close_array
-			json_add_int "" "1000"
+			json_add_int "" "2000"
 		json_close_array
 	procd_close_trigger
-
-
-#	local interface
-#	config_load obuspa
-#	config_get interface global interface
-#	[ -n "$interface" ] && procd_add_interface_trigger "interface.*" "$interface" /etc/init.d/obuspa reload
 }

owsd/files/owsd.hotplug

@@ -2,19 +2,6 @@
 
 [ "$ACTION" = ifup ] || exit 0
 
-handle_interface() {
-	ifname=$(uci get network.$1.ifname)
-
-	case "$ifname" in
-		@*)
-			alias_interface="$1 $alias_interface"
-			;;
-	esac
-}
-
-config_load network
-config_foreach handle_interface "interface"
-
 compare_owsd_iface() {
 	local interface
 
@@ -24,13 +11,6 @@ compare_owsd_iface() {
 		/etc/init.d/owsd reload
 		exit
 	fi
-
-	for i in $alias_interface; do
-	if [ "$INTERFACE" == "$i" ]; then
-			/etc/init.d/owsd reload
-			exit
-		fi
-	done
 }
 
 config_load owsd

periodicstats/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d53b540a89165753922707ed624b315d58abd10a
+PKG_SOURCE_VERSION:=312573b91b2ae10d0fe04a4d11ae37898f526fdb
 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

@@ -1,5 +1,6 @@
 #!/bin/sh
 . /lib/functions.sh
+. /lib/network/port.sh
 
 IP_RULE=""
 BR_RULE=""
@@ -13,6 +14,7 @@ PREV_ORDER=""
 CURR_ORDER=""
 MAX_ORDER=""
 
+
 # Function to handle a queue order and
 # update total number of queues
 handle_q_order() {
@@ -671,17 +673,20 @@ assign_policer_to_port() {
 	local pindex="$2"
 	local portorder="$(db -q get hw.board.ethernetPortOrder)"
 	local wanport="$(db -q get hw.board.ethernetWanPort)"
+	local runner_lan_ports="$(bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/examine port | grep ': port/index=lan' | sed -e 's#\.##g' | cut -f2 -d' ' | sort -u | xargs)"
+	local i=1
 
 	for port in $portorder; do
 		if [ "$ifname" == "$port" ]; then
 			if [ "$wanport" == "$port" ]; then
 				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
 			else
-				local i="${port: -1}"
-				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
+				local lanport="$(echo -n "$runner_lan_ports" | cut -f${i} -d' ')"
+				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure $lanport ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
 			fi
 			break
 		fi
+		i=$((i+1))
 	done
 }
 
@@ -745,11 +750,6 @@ config_ingress_rate_limit() {
 	local in_burst_size=$3
 	local wanport="$(db -q get hw.board.ethernetWanPort)"
 
-	if [ "$ifname" == "$wanport" ]; then
-		logger -t qosmngr "policing is not support on port $ifname"
-		return
-	fi
-
 	# Unit in uci file is in bps while that accepted by ethswctl is kbits
 	if [ $ingress_rate -lt 1000 ]; then
 		return
@@ -763,7 +763,10 @@ config_ingress_rate_limit() {
 		in_burst_size=$((in_burst_size / 1000))
 	fi
 
-	ethswctl -c rxratectrl -n 1 -p $ifname -x $ingress_rate -y $in_burst_size
+	local unitport="$(get_port_number $ifname)"
+	local unit=$(echo $unitport | cut -d ' ' -f 1)
+	local port=$(echo $unitport | cut -d ' ' -f 2)
+	ethswctl -c rxratectrl -n $unit -p $port -x $ingress_rate -y $in_burst_size
 }
 
 #function to handle a classify section
@@ -854,10 +857,14 @@ configure_policer() {
 	# the old config if any and return
 	if [ $POLICER_SKIP -eq 0 ]; then
 		for intf in $(db get hw.board.ethernetPortOrder); do
+			local unitport="$(get_port_number $intf)"
+			local unit=$(echo $unitport | cut -d ' ' -f 1)
+			local port=$(echo $unitport | cut -d ' ' -f 2)
 			# setting rate and burst size to 0 disables rate limiting
-			ethswctl -c rxratectrl -n 1 -p $intf -x 0 -y 0
+			if [ $port != "" -a $unit != "" ]; then
+				ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
+			fi
 		done
-		return
 	fi
 
 	# Delete policer
@@ -885,8 +892,11 @@ configure_policer() {
 }
 
 configure_qos() {
-	configure_queue
+	#queue configuration is being done after shaper configuration,
+	#If port shapingrate configuration on DISC device is called after queue configuration then
+	#driver overwrites the queue shaping rate with default value of port shaping rate.
 	configure_shaper
+	configure_queue
 	configure_policer
 	configure_classify
 }

questd/files/usr/libexec/rpcd/router.network

@@ -1,54 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions/network.sh
-. /lib/functions.sh
-
-case "$1" in
-	list)
-		echo '{ "dump" : {}, "hosts" : {} }'
-	;;
-	call)
-		case "$2" in
-			dump)
-				dump_network() {
-					local cfg="$1"
-					local is_lan type bool proto ipaddr netmask ifname
-
-					[ "$cfg" == "loopback" ] && return
-
-					config_get_bool is_lan $cfg is_lan 0
-					config_get type $cfg type
-					config_get_bool defaultroute $cfg defaultroute 1
-					config_get proto $cfg proto none
-					config_get ipaddr $cfg ipaddr
-					[ -z "$ipaddr" ] && network_get_ipaddr ipaddr $cfg
-					config_get netmask $cfg netmask "255.255.255.255"
-					config_get ifname $cfg ifname
-					
-					json_add_object "$cfg"
-				        json_add_boolean is_lan $is_lan
-				        json_add_string type "$type"
-				        json_add_boolean defaultroute $defaultroute
-				        json_add_string proto "$proto"
-				        json_add_string ipaddr "$ipaddr"
-				        json_add_string netmask "$netmask"
-				        json_add_string ifname "$ifname"
-					json_select ..			
-				}
-
-				config_load network
-				json_init
-				config_foreach dump_network interface
-				json_dump
-			;;		
-			hosts)
-				ubus call topology hosts | \
-					sed 's/interface_type/type/g' | \
-					sed 's/Ethernet/ethernet/g' | \
-					sed 's/Wi-Fi/wifi/g'
-			;;
-		esac
-	;;
-esac
-

sulu/Makefile

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

swmodd/Makefile

@@ -6,14 +6,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.0.5
+PKG_VERSION:=2.0.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=682967eaab558d7c4e4559d3a37e3a79a5492485
+PKG_SOURCE_VERSION:=f0054f9413d6369bb6d9a66e7c49414b946ef0df
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -54,7 +54,6 @@ define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_DIR) $(1)/etc/swmod
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_CONF) ./files/map_du $(1)/etc/swmod/map_du
 	$(INSTALL_BIN) ./files/swmodd.init $(1)/etc/init.d/swmodd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/swmodd $(1)/usr/sbin/swmodd
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libswmodd.so $(1)/usr/lib/bbfdm/libswmodd.so

twamp/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 
-PKG_SOURCE_VERSION:=f6e914508aa1f7458f87bd68026f56262595d9a5
+PKG_SOURCE_VERSION:=dbddaa0c4d826dfdf37bb92f98a2b2ad23035ca3
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp.git
 

uspd/Config.in

@@ -0,0 +1,9 @@
+config USPD_MAX_MSG_LEN
+    int "Maximum message length"
+    default 10485760
+    help
+        Set the maximum data length allowed over ubus in Bytes.
+
+	This value should not be larger than UBUS_MAX_MSGLEN from ubusd.
+	The maximum blob message length allowed is:
+	(configured value - 128) bytes

uspd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.1.25
+PKG_VERSION:=2.1.28
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b1c599287ee41b1af88d1fe9a5d553b3275cf225
+PKG_SOURCE_VERSION:=4f449cc787f07b1543c7e51dc5b3d03de4b3db8f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -34,10 +34,14 @@ define Package/uspd/description
  running on top of it.
 endef
 
+define Package/uspd/config
+	source "$(SOURCE)/Config.in"
+endef
+
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
-
+	-D_GNU_SOURCE \
+	-DUSPD_MAX_MSG_LEN=$(CONFIG_USPD_MAX_MSG_LEN)
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare

uspd/files/uspd.init

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=98
+START=96
 STOP=10
 
 USE_PROCD=1
@@ -59,5 +59,5 @@ reload_service() {
 
 service_triggers()
 {
-	procd_add_config_trigger "config.change" "uspd" /etc/init.d/uspd restart
+	procd_add_reload_trigger "uspd"
 }

wfa-capi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfa-capi
-PKG_VERSION:=0.0.17
+PKG_VERSION:=1.0.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1079c7a76b3439f8f96ea478f34c59be4aaa99c6
+PKG_SOURCE_VERSION:=03d5eb8ed61b298709061458661d089474b38604
 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

wfadatad/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=4.0.10
+PKG_VERSION:=5.0.2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bb7d6e5ee04803bca2391c30cc035a7fab0f1353
+PKG_SOURCE_VERSION:=f62f7d4795fcba7e4b2906fdba8e5c390c771cba
 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:=12.0.3
+PKG_VERSION:=13.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4426f003faac796d978092419959adf4cf6440c3
+PKG_SOURCE_VERSION:=6b1f24c940efdc563e0bfec06fdb803235494b6f
 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

@@ -60,17 +60,45 @@ supp_status() {
 	echo "UNCONFIGURED"
 }
 
+supp_configured() {
+	wpasupp=$1
+
+	for wpa in $wpasupp
+	do
+		logger -t button "WPS $wpa check if configured"
+		status=$(supp_status $wpa)
+		if [ "$status" = "CONFIGURED" ]; then
+			logger -t button "WPS $wpa CONFIGURED"
+			echo "CONFIGURED"
+			return
+		fi
+	done
+
+	echo "UNCONFIGURED"
+}
+
+supp_wps() {
+	wpasupp=$1
+
+	for wpa in $wpasupp
+	do
+		logger -t button "WPS $wpa start"
+		ubus -t 1 call $wpa wps_start
+	done
+}
+
 wps_button() {
 	logger -t button "WPS button is pressed"
-	wpasupp="$(ubus list wpa_supplicant.* 2>/dev/null | head -1)"
+	wpasupp="$(ubus list wpa_supplicant.* 2>/dev/null)"
+
+	logger -t button "WPS checking: $wpasupp"
 	if [ -n "$wpasupp" ]; then
-		status=$(supp_status $wpasupp)
+		status=$(supp_configured "$wpasupp")
 		logger -t button "status $status"
 		if [ "$status" = "CONFIGURED" ]; then
 			start_ap_wps
 		else
-			logger -t button "WPS start $wpasupp"
-			ubus -t 1 call $wpasupp wps_start
+			supp_wps "$wpasupp"
 		fi
 	else
 		start_ap_wps

xmppc/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.2
 
-PKG_SOURCE_VERSION:=a98cdda759418dab1c12a18c345112d94ed4c02e
+PKG_SOURCE_VERSION:=4a09b8689d67dcbf3fd1b7e80e53816b7cd12614
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/xmppc.git