qosmngr: error redirection

bbf/Config_bbfdm.in

@@ -1,7 +1,5 @@
 if PACKAGE_libbbfdm
 
-menu "Configuration"
-
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -26,12 +24,4 @@ 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.1.2
+PKG_VERSION:=5.0.5
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0d04be3ad46f662db8cb83f41cf88da7256403c5
+PKG_SOURCE_VERSION:=7aa510359934c708fd89c945d170505f5a1bbd86
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -23,19 +23,19 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libbbf_api
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=BBF
   TITLE:=Library for libbbfdm API
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
 define Package/libbbfdm
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=BBF
   TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls +libcurl
 endef
 
 define Package/libbbfdm/config
@@ -81,6 +81,11 @@ 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
@@ -91,46 +96,36 @@ 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
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
+	$(CP) $(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/dmmap/*
+	rm -rf /etc/bbfdm/*
 	exit 0
 endef
 
 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/*.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/
 endef
 
 $(eval $(call BuildPackage,libbbf_api))

bulkdata/Makefile

@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.2
 
-PKG_SOURCE_VERSION:=b35e7862bc17fc11dc1f757c7b93900995a28633
+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.18
+PKG_VERSION:=3.1.15
 
 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:=95ff8c53c8ba6fe3d253f911b965430f6e08e707
 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
 endef
 
 define Package/$(PKG_NAME)/description

dectmngr/files/etc/config/dectmngr

@@ -1,2 +1,2 @@
-config dect 'global'
+config dectmngr 'general'
 	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 dect
-	config_get_bool log_dect_cmbs global log_dect_cmbs 0
+	config_load dectmngr
+	config_get_bool log_dect_cmbs general 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 dect
+	procd_add_reload_trigger asterisk
 }
 
 boot() {

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.3.2
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=23028753fdfc5f4a0e8da33fb6b813e21c5d6c23
+PKG_SOURCE_VERSION:=c4ed79faffbf27b38e0c34b080858ef1a72d4bfc
 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,7 +18,6 @@ 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
 

endptmngr/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=endptmngr
-PKG_VERSION:=0.6
+PKG_VERSION:=0.5
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=6d7b2e9c90234767cb56a1e7885f42825bd6287a
+PKG_SOURCE_VERSION:=debfc47348d6e1fc1c8b126ad50a7f5f8db3e19d
 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_504021
+export CONFIG_BRCM_SDK_VER_504002
 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:=ef46eb3be68ae1216d8699234f237fb2243289f1
+PKG_SOURCE_VERSION:=45575262de7a9690bcb2c760f35e2c74e88e1176
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2

gryphon-led-module/src/main.c

@@ -43,15 +43,10 @@
 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);
 
-	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);
+	len = scnprintf(buf, PAGE_SIZE, "%d\n", 123);
 	if (len <= 0) {
 		dev_err(dev, "sk9822: Invalid sprintf len: %d\n", len);
 		return -EIO;

icwmp/Config_cwmp.in

@@ -1,6 +1,5 @@
 if PACKAGE_icwmp
 
-menu "Configuration"
 choice
 	prompt "Select ACS sever"
 	default CWMP_ACS_MULTI
@@ -19,6 +18,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.5-2021-10-26
+PKG_VERSION:=8.1.10-2021-09-21
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bf33885bf7a4c61fa32d19a96d48acf0abf92d25
+PKG_SOURCE_VERSION:=2e55c12d13af617f9c5b1551e9d67287efd52715
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

icwmp/files/etc/config/cwmp

@@ -39,7 +39,6 @@ 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

@@ -4,10 +4,10 @@ if [ ! -f "/var/state/cwmp" ]; then
 	exit 0;
 fi
 
-zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
-port=$(uci -q get cwmp.cpe.port)
-ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
-ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
+zone_name=$(uci -P /var/state -q get cwmp.acs.zonename)
+port=$(uci -P /var/state -q get cwmp.acs.port)
+ipaddr=$(uci -P /var/state -q get cwmp.acs.ip)
+ipv6enable=$(uci -P /var/state -q get cwmp.acs.ipv6enable)
 incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr [A-Z] [a-z])
 
 if [ "$zone_name" = "" ]; then
@@ -28,44 +28,39 @@ else
 	iptables -X zone_icwmp_input 2> /dev/null
 fi
 
-cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
-cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
+cmd=""
 
-# default incoming rule is Port only
-if [ -z "${incoming_rule}" ]; then
-	incoming_rule="port_only"
+if [ "${ipv6enable}" = "1" ]; then
+	cmd="ip6tables"
+else
+	cmd="iptables"
 fi
 
+cmd="${cmd} -I zone_${zone_name}_input -p tcp"
+
 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}
+if [ "$?" -ne 0 ]; then
+	exit 0;
 fi
 
-echo ${cmd6}|grep -q "\-\-dport \|\-s "
-if [ "$?" -eq 0 ]; then
-	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
-	${cmd6}
-fi
+cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+
+${cmd}

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

@@ -2,7 +2,6 @@
 
 . /lib/functions/network.sh
 
-
 [ "$ACTION" == "ifup" ] || exit 0
 
 [ -f /etc/config/cwmp ] || exit 0
@@ -24,7 +23,7 @@ handle_icwmp_restart() {
 
 	local ifname="$(uci -q get network.$INTERFACE.ifname)"
 	[ "${ifname:0:1}" == "@" ] && exit 0
-	
+
 	mkdir -p /tmp/ipv4
 
 	network_flush_cache
@@ -64,40 +63,11 @@ handle_icwmp_restart() {
 	network_get_device curdev $INTERFACE
 	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
 
-	local vendorspecinf=`ubus call network.interface.${defwan} status | jsonfilter -e "@.data.vendorspecinf"`
-	[ -n "$vendorspecinf" ] && {
-		local url=""
-		case $vendorspecinf in
-			http://*|https://*)
-					url="$vendorspecinf"
-				;;
-			*)
-				for optval in $vendorspecinf; do
-				        case $optval in
-				                1=*)
-				                        url="$(echo $optval | cut -d"=" -f2-)"
-				                ;;
-				        esac
-				done
-			;;
-		esac
-		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
-	}
-                
 	local prevopt43url=""
 	local curopt43url=""
 	local opt43urlfile=/tmp/ipv4/$INTERFACE-opt43url
 	prevopt43url=$(cat $opt43urlfile 2>/dev/null)
-	curopt43url="$(uci -c /var/state -q get cwmp.acs.dhcp_url)"
+	curopt43url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
 	[ -n "$curopt43url" ] && echo $curopt43url > $opt43urlfile || rm -f $opt43urlfile
 
 	[ \

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 -c /var/state -q get cwmp.acs.dhcp_url)"
+	local dhcp_url="$(uci -P /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"
+		[ -n "$url" ] && uci -P /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"
+		[ -n "$url" ] && uci -P /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 -c /var/state -q get cwmp.acs.dhcp_url`
+			acs_url=`uci -P /var/state -q get cwmp.acs.dhcp_url`
 			if [ "$acs_url" != "" ]
 			then
 				break

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.0.4
+PKG_VERSION:=3.3.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e99c9ad752ee165c37d40a3ac139e0906bf03e3c
+PKG_SOURCE_VERSION:=3fc90a1597bd06360e62fd70f4f7301a2499e267
 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,7 +219,3 @@ 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/genconfig.sh

@@ -5,6 +5,7 @@ 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"
@@ -237,7 +238,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)"
+			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common | grep -v juci-theme)"
 			if [ "$boards" ]; then
 				echo "$CUSTOMER has following boards:"
 				for board in $boards; do
@@ -254,7 +255,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)"
+					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common | grep -v juci-theme)"
 					if [ "$boards" ]; then
 						for board in $boards; do
 							echo -e "\t$board"
@@ -308,6 +309,13 @@ 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()
@@ -396,6 +404,11 @@ 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

juci/Makefile

@@ -0,0 +1,122 @@
+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

@@ -0,0 +1,66 @@
+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

@@ -0,0 +1,41 @@
+#!/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

@@ -0,0 +1,49 @@
+#!/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

@@ -0,0 +1,21 @@
+{
+	"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

@@ -0,0 +1,217 @@
+{
+	"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,16 +5,16 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=6.0.8
+PKG_VERSION:=5.2.4
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=3f0bb9c156dd334df6927dc7e6d7fc2ebbc7d520
+PKG_SOURCE_VERSION:=9467804d0739b0c6f87be9e8c75139a245b4cf1d
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-agent
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-agent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 

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

@@ -5,41 +5,25 @@ 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
+	config_get_bool onboarded "$section" onboarded 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
+	[ "$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"
-	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
+	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 up
+	config_foreach update_bstas bk-iface reconnect
 fi

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

@@ -5,47 +5,6 @@ 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"
 
@@ -57,10 +16,6 @@ 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
@@ -69,10 +24,6 @@ start_service() {
 	procd_close_instance
 }
 
-#stop_service() {
-#	remove_map
-#}
-
 service_triggers()
 {
 	procd_add_reload_trigger "ieee1905"

map-agent/files/lib/wifi/multiap

@@ -7,8 +7,6 @@
 # write_credentials - write bBSS credentials to fBSS
 
 . /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-. /lib/wifi/traffic_separation
 
 diff=0
 
@@ -43,10 +41,10 @@ brcm_sync_credentials() {
 		section=$(uci add ieee1905 ap)
 		[ "$section" == "" ] && return
 
-		uci -q set ieee1905.${section}.band=$band
-		uci -q set ieee1905.${section}.ssid="$ssid"
-		uci -q set ieee1905.${section}.encryption=$encryption
-		uci -q set ieee1905.${section}.key="$key"
+		uci set ieee1905.${section}.band=$band
+		uci set ieee1905.${section}.ssid=$ssid
+		uci set ieee1905.${section}.encryption=$encryption
+		uci set ieee1905.${section}.key=$key
 	}
 
 	mapagent_process_radio() {
@@ -91,8 +89,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
 
@@ -100,21 +98,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"
@@ -126,10 +124,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
-		echo $(mapagent_apply_wireless $ifname "$bk_ssid" "$bk_key") 2> /dev/null
+		$(mapagent_apply_wireless $ifname $bk_ssid $bk_key)
 	}
 
 	mapagent_find_bbss() {
@@ -149,9 +147,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() {
@@ -212,7 +210,7 @@ write_bsta_config() {
 
 			[ "$bsta" == "$ifname" ] || return
 			#echo setting diff = $diff > /dev/console
-			uci -q set wireless.${section}.bssid=$bssid
+			uci set wireless.${section}.bssid=$bssid
 			echo 1
 		}
 		config_load wireless
@@ -297,6 +295,7 @@ brcm_teardown_iface() {
 	uci commit mapagent
 }
 
+
 brcm_bsta_to_wireless() {
 	config_load mapagent
 
@@ -321,7 +320,7 @@ brcm_bsta_to_wireless() {
 	}
 
 	mapagent_enable_best() {
-		#echo 1=$1 best=$best > /dev/console
+		echo 1=$1 best=$best > /dev/console
 		if [ "$1" = "$best" ]; then
 			uci -q set mapagent.$1.enabled='1'
 		else
@@ -334,11 +333,10 @@ brcm_bsta_to_wireless() {
 			apply_config() {
 				local section=$1
 				local bsta=$2
-				local ssid="$3"
-				local key="$4"
+				local ssid=$3
+				local key=$4
 				local encryption=$5
 				local enabled=$6
-				local bssid=$7
 				local disabled="0"
 
 				config_get ifname $section ifname
@@ -347,17 +345,10 @@ brcm_bsta_to_wireless() {
 
 				[ "$bsta" == "$ifname" ] || return
 
-				uci -q set wireless.${section}.ssid="$ssid"
-				uci -q set wireless.${section}.key="$key"
-				uci -q set wireless.${section}.encryption=$encryption
-				uci -q set wireless.${section}.bssid="$bssid"
-				#uci -q set wireless.${section}.disabled=$disabled
-
-				[ "$disabled" != "1" ] && return
-				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
-				wpa_cli -i "$bsta" disable_network 0 > /dev/null 2>&1
-				wpa_cli -i "$bsta" save_config > /dev/null 2>&1
-
+				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
 			}
 
@@ -368,7 +359,8 @@ brcm_bsta_to_wireless() {
 		}
 
 		mapagent_find_other_creds() {
-			#echo "trying to find other creds for $2" > /dev/console
+
+			echo "trying to find other creds for $2" > /dev/console
 			config_get band $1 band
 			config_get onboarded $1 onboarded "0"
 
@@ -378,9 +370,8 @@ 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 "$bssid")
+			echo "$(mapagent_apply_wl_bsta $2 $ssid $key $encryption $4)"
 		}
 
 		config_get band $1 band
@@ -394,247 +385,30 @@ 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 "$bssid")
+			echo "$(mapagent_apply_wl_bsta $ifname $ssid $key $encryption $enabled)"
 		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
-
-	[ ! -f "/etc/config/wireless" ] && return
-
-	status=$(ubus -S call wifi status)
-
-	device_to_band() {
-		local ifname=$1
-		json_load "$status"
-		json_select "radios"
-		json_get_keys keys
-
-		for key in $keys; do
-			json_select $key
-			json_get_var name name
-
-			if [ "$name" != "$ifname" ]; then
-				json_select ..
-				continue
-			fi
-
-			json_get_var band band
-
-			if [ "$band" == "5GHz" ]; then
-				echo "5"
-			elif [ "$band" == "2.4GHz" ]; then
-				echo "2"
-			fi
-
-			break
-		done
-
-		json_cleanup
-	}
-
-	wireless_process_iface() {
-		local section=$1
-		local type="ap"
-		local enabled="1"
-
-		config_get multi_ap $section multi_ap 0
-		[ "$multi_ap" != "1" ] && [ "$multi_ap" != "2" ] && return
-
-		config_get mode $section mode "ap"
-		[ "$mode" != "ap" ] && return
-
-		config_get device $section device
-		band=$(device_to_band $device)
-		[ "$band" == "" ] && return
-
-		config_get ssid $section ssid
-		config_get key $section key
-		config_get encryption $section encryption
-		config_get start_disabled $section start_disabled "0"
-		config_get network $section network
-
-
-		cntlr_section=$(uci add mapcontroller ${type})
-		uci -q set mapcontroller.${cntlr_section}.ssid="$ssid"
-		uci -q set mapcontroller.${cntlr_section}.key="$key"
-		uci -q set mapcontroller.${cntlr_section}.encryption="$encryption"
-		uci -q set mapcontroller.${cntlr_section}.band="$band"
-		uci -q set mapcontroller.${cntlr_section}.vid="1"
-		uci -q set mapcontroller.${cntlr_section}.network="$network"
-
-		[ "$multi_ap" == "1" ] && map_type="backhaul" || map_type="fronthaul"
-		uci -q set mapcontroller.${cntlr_section}.type="$map_type"
-
-		[ "$start_disabled" == "1" ] && enabled="0"
-		uci -q set mapcontroller.${cntlr_section}.enabled="$enabled"
-	}
-
-	mapcontroller_teardown() {
-		local section=$1
-
-		uci delete mapcontroller.$1
-	}
-
-	config_load mapcontroller
-	config_foreach mapcontroller_teardown ap
-
-	config_load wireless
-	config_foreach wireless_process_iface wifi-iface
-	uci commit mapcontroller
-}
-
-bsta_scan_on_enabled() {
-	config_load mapagent
-
-	mapagent_enable_bk() {
-		config_get ifname $1 ifname
-		config_get enabled $1 enabled
-
-		echo ifname $ifname enabled $enabled
-
-		[ "$enabled" = "0" ] && return
-
-		wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
-		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-	}
-
-	config_foreach mapagent_enable_bk 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
 shift
 
@@ -649,13 +423,6 @@ case "$func" in
 	write_bsta_config) write_bsta_config $@;;
 	teardown_iface) brcm_teardown_iface $@;;
 	bsta_to_wireless) brcm_bsta_to_wireless $@;;
-	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
-	ts) ts_sub $@;;
-	bsta_enable_all) bsta_enable_all $@;;
-	bsta_disable_lower_priority) bsta_disable_lower_priority $@;;
-	bsta_scan_on_enabled) bsta_scan_on_enabled $@;;
-	bsta_use_link) bsta_use_link $@;;
-	bsta_swap_to_link) bsta_swap_to_link $@;;
 	--help|help) usage;;
 	*) usage; exit 1;;
 esac

map-agent/files/lib/wifi/traffic_separation

@@ -1,381 +0,0 @@
-#!/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,15 +5,15 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=5.0.3
+PKG_VERSION:=4.1.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=40fbe4dfd9634bf06e0cab1cb2fc6a811487b5b4
+PKG_SOURCE_VERSION:=8f2be4eea31eecd5aa6dfda8bc6221195817825b
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-controller
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-controller.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 

map-controller/files/etc/config/mapcontroller

@@ -2,66 +2,43 @@ config controller 'controller'
 	option enabled '1'
 	option registrar '5 2'	    #bands on which wps registrar supported
 	option debug '6'
-	option enable_sta_steer '0'
-	option enable_bsta_steer '0'
-	option primary_vid '1'
-	option primary_pcp '0'
+	option al_bridge 'br-lan'
 
-config interface 'lan'
-	option 'dhcp'
+config vlan 'lan'
+	option network 'lan'
+	option id '1'
 
-config ap
+config fh-credentials
 	option band '5'
-	option encryption 'sae-mixed'
+	option encryption 'psk2'
 	option key '1234567890'
 	option ssid 'map-net5'
-	option vid '1'
-	option type 'fronthaul'
-	option network 'lan'
+	option vlan '1'
 
-config ap
+config fh-credentials
 	option band '2'
-	option encryption 'sae-mixed'
+	option encryption 'psk2'
 	option key '1234567890'
 	option ssid 'map-net2'
-	option vid '1'
-	option type 'fronthaul'
-	option network 'lan'
+#	option bk_ssid 'multiap_ssid123'
+#	option bk_key 'multiap_key123'
+	option vlan '1'
 
-config ap
+config bk-credentials
 	option band '5'
-	option encryption 'sae'
+	option encryption 'psk2'
 	option key '5555555555'
 	option ssid 'map-bkhaul-5'
-	option type 'backhaul'
+	option multi_ap '2'
 	option disallow_bsta '1'		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
-	option vid '1'
-	option network 'lan'
+	option vlan '1'
 
-config ap
+
+config bk-credentials
 	option band '2'
-	option encryption 'sae'
+	option encryption 'psk2'
 	option key '2222222222'
 	option ssid 'map-bkhaul-2'
-	list disallow_bsta '0'                # 0 or 1 profile-1 bSTA
-	option vid '1'
-	option type 'backhaul'
-	option network 'lan'
-
-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
+	option multi_ap '2'
+	option disallow_bsta '0'                # 0 or 1 profile-1 bSTA
+	option vlan '1'

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:=2.1.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=d1fb7e76cb0fe93167648cf32193e73b1ca3522a
+PKG_SOURCE_VERSION:=a00f747fafa5b029d24e2a571841f4cf92431bc7
 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

@@ -36,7 +36,7 @@ endef
 
 define Package/obudpst/install
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/udpst $(1)/usr/sbin/udpst
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/udpst $(1)/usr/sbin/obudpst
 endef
 
 $(eval $(call BuildPackage,obudpst))

obuspa/Config.in

@@ -1,7 +1,5 @@
 if PACKAGE_obuspa
 
-menu "Configuration"
-
 config OBUSPA_MTP_ENABLE_STOMP
 	bool "Enable STOMP as mtp protocol"
 	default y
@@ -13,5 +11,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.9
+PKG_VERSION:=4.1.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a52205791ef71cb54fa468064075ff85c7f5a638
+PKG_SOURCE_VERSION:=cf0a3526fbff0dc81af2d6011b69d7667ee0643a
 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,7 +29,6 @@ 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
@@ -81,7 +80,6 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
@@ -89,7 +87,6 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
 	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-obuspa $(1)/etc/hotplug.d/iface/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/86-obuspa-set-endpointid $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -5,7 +5,7 @@ config obuspa 'global'
 	option debug '0'
 	option log_level '1'
 	#option db_file '/etc/obuspa/usp.db'
-	option role_file '/etc/obuspa/roles.json'
+	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
@@ -34,44 +34,6 @@ config mqtt 'localmqtt'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
 
-config controller 'user_controller'
-	option EndpointID 'usp-gui-user'
-	option Protocol 'MQTT'
-	option Topic '$SERIAL/usp/user/response'
-	option mqtt 'user_mqtt'
-	option assigned_role_name 'user'
-
-# Adds Device.LocalAgent.MTP.
-config mtp
-	option Protocol 'MQTT'
-	option ResponseTopicConfigured '/$SERIAL/usp/user/request'
-	option mqtt 'user_mqtt'
-
-# Adds Device.MQTT.Client.
-config mqtt 'user_mqtt'
-	option BrokerAddress '127.0.0.1'
-	option BrokerPort '1883'
-	option TransportProtocol 'TCP/IP'
-
-config controller 'admin_controller'
-	option EndpointID 'usp-gui-admin'
-	option Protocol 'MQTT'
-	option Topic '$SERIAL/usp/admin/response'
-	option mqtt 'admin_mqtt'
-	option assigned_role_name 'admin'
-
-# Adds Device.LocalAgent.MTP.
-config mtp
-	option Protocol 'MQTT'
-	option ResponseTopicConfigured '/$SERIAL/usp/admin/request'
-	option mqtt 'admin_mqtt'
-
-# Adds Device.MQTT.Client.
-config mqtt 'admin_mqtt'
-	option BrokerAddress '127.0.0.1'
-	option BrokerPort '1883'
-	option TransportProtocol 'TCP/IP'
-
 # Add Device.LocalAgent.Subscription.
 config subscription
 	option ID 'default-boot-event-ACS'

obuspa/files/etc/init.d/obuspa

@@ -648,6 +648,11 @@ db_init() {
 	db_set Internal.Reboot.Cause "LocalFactoryReset"
 }
 
+service_running() {
+	ubus wait_for usp.raw
+	procd_running ${CONFIGURATION}
+}
+
 start_service() {
 	local enabled
 

obuspa/files/etc/uci-defaults/86-obuspa-set-endpointid

@@ -1,19 +0,0 @@
-# Copy defaults by the factory to the cwmp UCI user section.
-
-
-# Get factory base MAC.
-baseMac=$(db -q get hw.board.basemac)
-
-# Erase colon and space characters.
-baseMac=${baseMac//:/}
-baseMac=${baseMac// /}
-
-# Caseing and fixed length string.
-mac=$(printf "%12.12X" $((0x$baseMac)))
-oui=${mac:0:6}
-# Get system serial number.
-serial=$(db -q get hw.board.serial_number)
-
-echo "######### SERIAL[$serial] OUI[$oui] #####" >/dev/console
-
-sed -i "s/\$SERIAL/$serial/g" /etc/config/obuspa

qosmngr/files/lib/qos/broadcom.sh

@@ -673,20 +673,17 @@ 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 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}}
+				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}}
 			fi
 			break
 		fi
-		i=$((i+1))
 	done
 }
 
@@ -750,6 +747,11 @@ 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
@@ -764,8 +766,8 @@ config_ingress_rate_limit() {
 	fi
 
 	local unitport="$(get_port_number $ifname)"
-	local unit=$(echo $unitport | cut -d ' ' -f 1)
-	local port=$(echo $unitport | cut -d ' ' -f 2)
+        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
 }
 
@@ -862,7 +864,7 @@ configure_policer() {
 			local port=$(echo $unitport | cut -d ' ' -f 2)
 			# setting rate and burst size to 0 disables rate limiting
 			if [ $port != "" -a $unit != "" ]; then
-				ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
+				ethswctl -c rxratectrl -n $unit -p $intf -x 0 -y 0 2>/dev/null
 			fi
 		done
 	fi

questd/files/etc/init.d/quest

@@ -12,3 +12,12 @@ 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
+}

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

@@ -0,0 +1,54 @@
+#!/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.20
+PKG_VERSION:=0.2.19
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
-PKG_SOURCE_VERSION:=1cb1723f36718997968e923732fd6327a354689a
+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.9
+PKG_VERSION:=2.0.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2283abeca8f6beb58cbbbe5c4865ed329832f957
+PKG_SOURCE_VERSION:=f431bf9c4826af08d1186b52970b2d3ec94b523f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -22,11 +22,10 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 include $(INCLUDE_DIR)/package.mk
 
 define Package/swmodd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:= Software Modules Daemon
-  DEPENDS:=+libuci +libubox +ubus +libuuid +libbbf_api +opkg \
+	SECTION:=utils
+	CATEGORY:=Utilities
+	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
@@ -55,6 +54,7 @@ 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

uspd/Config.in

@@ -1,6 +1,3 @@
-if PACKAGE_uspd
-
-menu "Configuration"
 config USPD_MAX_MSG_LEN
     int "Maximum message length"
     default 10485760
@@ -10,5 +7,3 @@ 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.30
+PKG_VERSION:=2.1.27
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4cba636fa0870f8c314c7cc0a9574d449f1ac1fc
+PKG_SOURCE_VERSION:=98b10ab2cf3109d11c728e99829b042d1f6e4942
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -25,10 +25,8 @@ include $(INCLUDE_DIR)/package.mk
 define Package/uspd
   SECTION:=utils
   CATEGORY:=Utilities
-  SUBMENU:=TRx69
   TITLE:=USP ubus backend
-  DEPENDS:=+libubox +ubus +libbbfdm +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
-           +@BBF_TR181 +@BBF_TR104 +@BBF_TR143
+  DEPENDS:=+libubox +ubus +libbbfdm
 endef
 
 define Package/uspd/description

wfa-capi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfa-capi
-PKG_VERSION:=1.0.0
+PKG_VERSION:=0.0.17
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=03d5eb8ed61b298709061458661d089474b38604
+PKG_SOURCE_VERSION:=1079c7a76b3439f8f96ea478f34c59be4aaa99c6
 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:=5.0.2
+PKG_VERSION:=4.0.10
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f62f7d4795fcba7e4b2906fdba8e5c390c771cba
+PKG_SOURCE_VERSION:=bb7d6e5ee04803bca2391c30cc035a7fab0f1353
 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:=12.0.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6b1f24c940efdc563e0bfec06fdb803235494b6f
+PKG_SOURCE_VERSION:=4426f003faac796d978092419959adf4cf6440c3
 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,11 +57,6 @@ supp_status() {
 		return
 	fi
 
-	if [ -f "/tmp/map.agent.bsta_global_disable" ]; then
-		echo "CONFIGURED"
-		return
-	fi
-
 	echo "UNCONFIGURED"
 }