ponmngr: add ubus call

Add ubus call to get gpon status
ponmngr: first commit
2025-12-28 06:59:28 +08:00 · 2021-07-30 15:59:10 +05:30 · 2021-07-27 12:51:07 +05:30
67 changed files with 1130 additions and 1323 deletions
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.0.6
+PKG_VERSION:=4.4.0
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9842552d421adb529b8771b8f9dc41ddc89f5b62
+PKG_SOURCE_VERSION:=5c1a146fdb8123d38cf2e074d9a4103ab6ed34ff
 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 +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls +libcurl
 endef

 define Package/libbbfdm/config
@@ -57,9 +57,11 @@ define Build/Prepare
 endef
 endif

+TARGET_CFLAGS += -DBBF_VENDOR_LIST=\\\"$(CONFIG_BBF_VENDOR_LIST)\\\"
+TARGET_CFLAGS += -DBBF_VENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
+
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror \
+	-D_GNU_SOURCE -D_AADJ

 ifeq ($(CONFIG_BBF_TR181),y)
 CONFIGURE_ARGS += \
@@ -81,13 +83,17 @@ 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

 CONFIGURE_ARGS += \
-	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)" \
-	BBF_VENDOR_PREFIX="$(CONFIG_BBF_VENDOR_PREFIX)"
+	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)"

 endif ##CONFIG_BBF_VENDOR_EXTENSION

--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.1

-PKG_SOURCE_VERSION:=150eb3122c969d1646c8ca8c8152154990f91823
+PKG_SOURCE_VERSION:=e4f39d1bf4678fc05b9d02e81b194c70719909e4
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git

--- a/dectmngr/Makefile
+++ b/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.9

 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:=3d13dfba69e6a1f6ed1f14e0d8d502cb574d350e
 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
--- a/dectmngr/files/etc/config/dect
+++ b/dectmngr/files/etc/config/dect
@@ -1,2 +0,0 @@
-config dect 'global'
-	option log_dect_cmbs '0'
--- a/dectmngr/files/etc/dspg/04131410.bin
+++ b/dectmngr/files/etc/dspg/04131410.bin
--- a/dectmngr/files/etc/init.d/dectmngr
+++ b/dectmngr/files/etc/init.d/dectmngr
@@ -40,18 +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
-
 	procd_open_instance
-	if [ $log_dect_cmbs -eq 0 ]; then
-		echo "Starting dectmngr with cmbs logging disabled"
-		procd_set_param command $PROG -comname ttyH0 $opt_ext
-		rm -f $LOG_PATH/*
-	else
-		echo "Starting dectmngr with cmbs logging enabled"
-		procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
-	fi
+	procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
 	procd_set_param respawn 6 2 3
 	procd_set_param term_timeout 20
 	procd_set_param triggers asterisk
@@ -72,7 +62,7 @@ reload_service() {

 service_triggers()
 {
-	procd_add_reload_trigger asterisk dect
+	procd_add_reload_trigger asterisk
 }

 boot() {
--- a/dslmngr/Makefile
+++ b/dslmngr/Makefile
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=dslmngr
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bb754ae620a9fc66fd6fc0745f0fead0708c7a17
+PKG_SOURCE_VERSION:=b7aa02e86a383e2f9eedd1333b2148270daf5242
 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
--- a/easy-soc-libs/Makefile
+++ b/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.2.33
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=23028753fdfc5f4a0e8da33fb6b813e21c5d6c23
+PKG_SOURCE_VERSION:=5c2f2f46843ac6f02613cdfcd0a901033d6882c7
 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
--- a/easy-soc-libs/easy.mk
+++ b/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

--- a/easy-soc-libs/qos.mk
+++ b/easy-soc-libs/qos.mk
@@ -16,7 +16,7 @@ endef
 define Build/InstallDev/libqos
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/include/qos.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libqos/qos.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/libqos/libqos.so $(1)/usr/lib/
 endef

--- a/endptmngr/Makefile
+++ b/endptmngr/Makefile
@@ -9,14 +9,11 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=endptmngr
 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:=debfc47348d6e1fc1c8b126ad50a7f5f8db3e19d
+PKG_SOURCE_VERSION:=f50a507a1a8d1dbf83ecf1e5f27dc18a318ef492
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif

 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
@@ -50,12 +47,6 @@ define Package/endptmngr/description
 	endptmngr
 endef

-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -av --exclude=.* ~/git/endptmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 define Package/endptmngr/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
--- a/fdtextract/Makefile
+++ b/fdtextract/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=1.0

 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=45575262de7a9690bcb2c760f35e2c74e88e1176
+PKG_SOURCE_VERSION:=573bf9543f8dc792b6d5dc8760cb69c64f11e932
 PKG_MIRROR_HASH:=skip

 PKG_LICENSE:=GPLv2
--- a/gryphon-led-module/src/main.c
+++ b/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;
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.0-2021-10-05
+PKG_VERSION:=7.4.1-2021-07-05
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ab875277578d851a9f8eed57883ca05c886b127d
+PKG_SOURCE_VERSION:=40b08ae2f1500a3a3c8029486c062738d4f49b67
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -29,6 +29,8 @@ 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)
@@ -55,8 +57,24 @@ endef
 endif

 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
+	-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

 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
 CONFIGURE_ARGS += \
@@ -81,20 +99,26 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(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
+	$(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
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/icwmp/files/etc/config/cwmp
+++ b/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'
--- a/icwmp/files/etc/firewall.cwmp
+++ b/icwmp/files/etc/firewall.cwmp
@@ -1,15 +1,6 @@
-#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)
-ipv6enable=$(uci -c /var/state -q get cwmp.acs.ipv6_enable)
-incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr [A-Z] [a-z])
-
+#created by the icwmp package 
+zone_name=""
+port=""
 if [ "$zone_name" = "" ]; then
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
@@ -27,45 +18,4 @@ else
 	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
 	iptables -X zone_icwmp_input 2> /dev/null
 fi
-
-cmd=""
-
-if [ "${ipv6enable}" = "1" ]; then
-	cmd="ip6tables"
-else
-	cmd="iptables"
-fi
-
-cmd="${cmd} -I zone_${zone_name}_input -p tcp"
-
-# 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}"
-	fi
-elif [ "${incoming_rule}" = "port_only" ]; then
-	if [ -n "${port}" ]; then
-		cmd="${cmd} --dport ${port}"
-	fi
-else
-	if [ -n "${ipaddr}" ]; then
-		cmd="${cmd} -s ${ipaddr}"
-	fi
-
-	if [ -n "${port}" ]; then
-		cmd="${cmd} --dport ${port}"
-	fi
-fi
-
-echo ${cmd}|grep -q "\-\-dport \|\-s "
-if [ "$?" -ne 0 ]; then
-	exit 0;
-fi
-
-cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
-
-${cmd}
+#iptables -I FW_ZONE -p tcp -s ACS_ADDRESS --dport PORT -j ACCEPT --comment "Open ACS port"
--- a/icwmp/files/etc/hotplug.d/iface/90-icwmp
+++ b/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,41 +63,11 @@ handle_icwmp_restart() {
 	network_get_device curdev $INTERFACE
 	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile

-	local wan_iface=`uci get cwmp.cpe.default_wan_interface`
-	local vendorspecinf=`ubus call network.interface.wan status | jsonfilter -e "@.data.vendorspecinf"`
-	[ -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

 	[ \
@@ -112,8 +81,6 @@ handle_icwmp_restart() {
 		[ -z "$prevopt43url" ] && exit 0
 	}

-	echo "Restarting icwmp"|logger -t cwmp.hotplug -p info
-
 	/etc/init.d/icwmpd reload &
 }

--- a/icwmp/files/etc/init.d/icwmpd
+++ b/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
@@ -154,10 +154,6 @@ set_wan_interface() {
 	fi
 }

-service_running() {
-	ubus wait_for usp.raw
-}
-
 start_service() {
 	if [ ! -f /tmp/.icwmpd_boot ]; then
 		touch /etc/icwmpd/.icwmpd_boot
@@ -169,9 +165,6 @@ start_service() {
 		[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
 		[ -f /usr/sbin/asterisk ] && log "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk

-		log "Waiting for usp.raw to be started"
-		ubus wait_for usp.raw
-
 		config_load cwmp
 		set_wan_interface
 		wait_for_option43 20
@@ -187,7 +180,7 @@ start_service() {
 		procd_set_param respawn \
 			${respawn_threshold:-5} \
 			${respawn_timeout:-10} ${respawn_retry:-3}
-
+			
 		procd_close_instance
 	fi
 }
--- a/icwmp/files/lib/upgrade/post-rootfs-fixup.d/215-icwmp
+++ b/icwmp/files/lib/upgrade/post-rootfs-fixup.d/215-icwmp
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# As part of sysupgrade we copy CWMP Backup Session XML file.
+
+
+# Abort on any error.
+set -e
+
+
+# Do nothing if user want to discard old settings.
+if [ -n "$SAVE_CONFIG" ] && [ $SAVE_CONFIG -eq 0 ]; then
+	exit 0
+fi
+
+# Source functions.
+for f in /lib/upgrade/iopsys*.sh; do
+	[ -r "$f" -a -s "$f" ] || continue
+	source $f
+done
+
+
+if [ -s "${2}/etc/icwmpd/.icwmpd_backup_session.xml" ]; then
+	cat "${2}/etc/icwmpd/.icwmpd_backup_session.xml" > "/etc/icwmpd/.icwmpd_backup_session.xml"
+fi
+
+# Report success.
+log "post-hooks" "CWMP Backup Session XML file migrated"
+
+exit 0
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ieee1905
-PKG_VERSION:=4.0.1
+PKG_VERSION:=3.3.2

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c4e6275434c65d64a90edbefa225f582f2ce356e
+PKG_SOURCE_VERSION:=b7c3f2b45ff232415d32eb97badeb43845ae878d
 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
--- a/iop/config
+++ b/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
--- a/iop/scripts/feeds_update.sh
+++ b/iop/scripts/feeds_update.sh
@@ -14,7 +14,7 @@ function feeds_update {
    done


-    git remote -v | grep -qE '(git@|ssh://)' && developer=1
+    git remote -v | grep -q http || developer=1

    cp .config .genconfig_config_bak

--- a/iop/scripts/genconfig.sh
+++ b/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"
@@ -205,6 +206,12 @@ function genconfig {

 	git remote -v | grep -qE '(git@|ssh://)' && {
 		DEVELOPER=1
+
+		bcmAllowed=0
+		endptAllowed=0
+
+		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
+		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 	}

 	v() {
@@ -237,7 +244,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 +261,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 +315,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()
@@ -357,12 +371,16 @@ function genconfig {
 			subtarget="xrx500"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			device=$(echo $BOARDTYPE | tr a-z A-Z)
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
 		elif [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		elif [ "$target" = "iopsys_mediatek" ]; then
 			subtarget="mt7622"
@@ -373,10 +391,13 @@ function genconfig {
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		elif [ "$target" = "iopsys_bcm27xx" ]; then
 			subtarget="iopsys_bcm2711"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
@@ -396,6 +417,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
@@ -411,14 +437,11 @@ function genconfig {

 		# Set target version
 		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		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_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config

-		# Enable Package source tree override if selected
+		# Enable Pckage source tree override if selected
 		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config

 		# developer mode selected ?
@@ -426,8 +449,12 @@ function genconfig {
 		if [ $DEVELOPER -eq 1 ]; then
 			# rewrite url to clone with ssh instead of http
 			echo "CONFIG_GITMIRROR_REWRITE=y" >>.config
+			[ $bcmAllowed -eq 0 ] && echo "CONFIG_BCM_OPEN=y" >> .config
+			[ $endptAllowed -eq 0 ] && echo "CONFIG_ENDPT_OPEN=y" >> .config
 		else
 			echo "# CONFIG_GITMIRROR_REWRITE is not set" >>.config
+			echo "CONFIG_BCM_OPEN=y" >> .config
+			echo "CONFIG_ENDPT_OPEN=y" >> .config
 		fi

 		if [ -n "$BRCM_MAX_JOBS" ]
--- a/iop/scripts/genconfig_min.sh
+++ b/iop/scripts/genconfig_min.sh
@@ -9,14 +9,13 @@ function genconfig_min {
 	CUSTPATH="customerconfigs"
 	export CUSTCONF="customerconfigs/customers"
 	export VERBOSE=0
+	#always use the mirror
 	export DEVELOPER=0
 	target="bogus"
-	target_config_path=""
+	config_path=""
 	bcm27xx="target/linux/iopsys-bcm27xx"
 	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
 	ramips="target/linux/iopsys-ramips"
-	mediatek="target/linux/iopsys-mediatek"
-	econet="target/linux/iopsys-econet"
 	intel_mips="target/linux/intel_mips"
 	x86="target/linux/iopsys-x86"
 	armvirt="target/linux/iopsys-armvirt"
@@ -81,7 +80,7 @@ function genconfig_min {

 	# Takes a board name and returns the target name in global var $target
 	set_target() {
-		local profile=$1
+	    local profile=$1

 		[ -n "$profile" ] || return

@@ -103,7 +102,7 @@ function genconfig_min {

 			if [ $pfound -eq 1 ]; then
 				target="$(echo $TARGET | tr '-' '_')"
-				target_config_path="$targetpath/config"
+				config_path="$targetpath/config"
 			fi

 			return
@@ -113,10 +112,6 @@ function genconfig_min {
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
-		[ -e $econet/genconfig ] &&
-			iopsys_econet=$(cd $econet; ./genconfig)
 		[ -e $intel_mips/genconfig ] &&
 			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
 		[ -e $x86/genconfig ] &&
@@ -127,7 +122,7 @@ function genconfig_min {
 			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)

 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_mediatek iopsys_econet iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -139,7 +134,7 @@ function genconfig_min {
 	    for p in $iopsys_brcm63xx_arm; do
 		if [ $p == $profile ]; then
 		    target="iopsys_brcm63xx_arm"
-			target_config_path="$brcm63xx_arm/config"
+			config_path="$brcm63xx_arm/config"
 		    return
 		fi
 	    done
@@ -147,23 +142,7 @@ function genconfig_min {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
-		    return
-		fi
-	    done
-
-	    for p in $iopsys_mediatek; do
-		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
-		    return
-		fi
-	    done
-
-	    for p in $iopsys_econet; do
-		if [ $p == $profile ]; then
-		    target="iopsys_econet"
-			target_config_path="$econet/config"
+			config_path="$ramips/config"
 		    return
 		fi
 	    done
@@ -171,7 +150,7 @@ function genconfig_min {
 	    for p in $iopsys_intel_mips; do
 		if [ $p == $profile ]; then
 		    target="intel_mips"
-			target_config_path="$intel_mips/config"
+			config_path="$intel_mips/config"
 		    return
 		fi
 	    done
@@ -179,7 +158,7 @@ function genconfig_min {
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
-			target_config_path="$x86/config"
+			config_path="$x86/config"
 		    return
 		fi
 	    done
@@ -187,7 +166,7 @@ function genconfig_min {
 	    for p in $iopsys_armvirt; do
 		if [ $p == $profile ]; then
 		    target="iopsys_armvirt"
-			target_config_path="$armvirt/config"
+			config_path="$armvirt/config"
 		    return
 		fi
 	    done
@@ -195,14 +174,14 @@ function genconfig_min {
 	    for p in $iopsys_bcm27xx; do
 		if [ $p == $profile ]; then
 		    target="iopsys_bcm27xx"
-			target_config_path="$bcm27xx/config"
+		        config_path="$bcm27xx/config"
 		    return
 		fi
 	    done

 	}

-	git remote -v | grep -qE '(git@|ssh://)' && {
+	git remote -v | grep -q http || {
 		DEVELOPER=1

 		bcmAllowed=0
@@ -231,8 +210,7 @@ function genconfig_min {
 		echo -e "  -a|--list-all\t\tList all Customers and their board types"
 		echo -e "  -b|--boards\t\tList all board types"
 		echo
-		echo "Example ./iop genconfig eg400 OPERATORX"
-		echo "(if no customerconfig is chosen, iopsys config will be used)"
+		echo "Example ./iop genconfig dg400prime IOPSYS"
 		echo
 		exit 0
 	}
@@ -282,12 +260,12 @@ function genconfig_min {

 	generate_config()
 	{
-		DIFFFILE="$1"
-		MASTERFILE="$2"
-		while read p; do
-			v "$p"
-			sed -r -i "$p" $MASTERFILE
-		done < $DIFFFILE
+	DIFFFILE="$1"
+	MASTERFILE="$2"
+	while read p; do
+		v "$p"
+		sed -r -i "$p" $MASTERFILE
+	done < $DIFFFILE
 	}

 	setup_dirs()
@@ -334,13 +312,11 @@ function genconfig_min {
 		v "cp $CONFIGPATH/config .config"
 		cp $CONFIGPATH/config .config

-		if [ -f $target_config_path/config ]; then
-		    cat $target_config_path/config >> .config
-		    echo "" >> .config
+		if [ -f $config_path/config ]; then
+		    cat $config_path/config >> .config
 		fi
-		if [ -f $target_config_path/$BOARDTYPE/config ]; then
-		    cat $target_config_path/$BOARDTYPE/config >> .config
-		    echo "" >> .config
+		if [ -f $config_path/$BOARDTYPE/config ]; then
+		    cat $config_path/$BOARDTYPE/config >> .config
 		fi

 		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
@@ -348,29 +324,23 @@ function genconfig_min {
 			subtarget="xrx500"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
 			device=$(echo $BOARDTYPE | tr a-z A-Z)
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
 		elif [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_mediatek" ]; then
-			subtarget="mt7622"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_econet" ]; then
-			subtarget="en7562"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 		elif [ "$target" = "iopsys_bcm27xx" ]; then
 			subtarget="iopsys_bcm2711"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
+                        echo "CONFIG_TARGET_${target}=y" >> .config
+                        echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
+                        echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
+                        echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
+                        device=$(echo $BOARDTYPE | tr a-z A-Z)
+                        echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -392,25 +362,21 @@ function genconfig_min {
 				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
 					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config
-					echo "" >> .config
 				fi
 				if [ -e "$CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff"
 					cat $CUSTCONF/$CUSTOMER/$BOARDTYPE/$BOARDTYPE.diff >> .config
-					echo "" >> .config
 				fi
 			done
 		fi

 		# Set target version
 		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		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_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config

+
 		# Enable Package source tree override if selected
 		[ $SRCTREEOVERR -eq 1 ] && echo CONFIG_SRC_TREE_OVERRIDE=y >> .config

@@ -483,8 +449,6 @@ function genconfig_min {
 			shift;
 		done

-		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
-
 		setup_dirs
 		create_and_copy_files "$@"
 	fi
--- a/juci/Makefile
+++ b/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)))))
--- a/juci/files/etc/config/juci
+++ b/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'
+
--- a/juci/files/etc/init.d/juci
+++ b/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
+}
+
--- a/juci/files/etc/uci-defaults/00-default-juci-rpcd-acl
+++ b/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
+
--- a/juci/files/usr/share/rpcd/acl.d/administrator.json
+++ b/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"]
+			}
+		}
+	}
+}
--- a/juci/files/usr/share/rpcd/acl.d/enduser.json
+++ b/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"
+			]
+		}
+	}
+}
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=6.0.2
+PKG_VERSION:=5.0.2
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=184fcb9b10fcb5978da22058792af859424dbb8d
+PKG_SOURCE_VERSION:=bb9da8c46308570b36449dcb73e3df1e8c145d30
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 PKG_LICENSE:=PROPRIETARY IOPSYS
--- a/map-agent/files/etc/init.d/mapagent
+++ b/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"
--- a/map-agent/files/lib/wifi/multiap
+++ b/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

@@ -44,9 +42,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() {
@@ -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() {
@@ -138,20 +136,18 @@ brcm_write_credentials() {

 		config_get device $section device
 		config_get multi_ap $section multi_ap "0"
-		config_get enabled $section enabled "1"

 		#echo found dev=$dev device=$device map=$multi_ap

-		[ "$enabled" == "0" ] && return
 		[ "$device" != "$dev" ] && return
 		[ "$multi_ap" != "1" ] && return

 		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() {
@@ -170,29 +166,12 @@ brcm_write_credentials() {
 	uci commit wireless
 }

-brcm_set_network() {
-	local ifname=$1
-	local num=$2
-	local bssid=$3
-
-	wpa_cli -i $ifname set_n $num bssid $bssid
-}
-
 bsta_steer() {
 	local ifname=$1
 	local bssid=$2

-	rc=$(wpa_cli -i $ifname set_n 0 bssid $bssid)
-	[ "$rc" == "FAIL" ] && {
-		echo "1"
-		return;
-	}
-
-	rc=$(wpa_cli -i $ifname roam $bssid)
-	[ "$rc" == "FAIL" ] && {
-		echo "1"
-		return;
-	}
+	wpa_cli -i $ifname set_n 0 bssid $bssid
+	wpa_cli -i $ifname roam $bssid
 }

 write_bsta_config() {
@@ -247,260 +226,6 @@ write_bsta_config() {

 }

-brcm_teardown_iface() {
-	config_load mapagent
-
-	local iface=$1
-
-	mapagent_teardown_wireless() {
-		write_wireless() {
-			local section=$1
-			local map_ifname=$2
-
-			config_get ifname $section ifname
-
-			[ "$ifname" != "$map_ifname" ] && return
-
-			uci -q set wireless.${section}.start_disabled="1"
-			uci -q set wireless.${section}.ssid="DISABLED-SSID"
-			uci -q set wireless.${section}.key="DISABLED-KEY"
-			uci -q delete wireless.${section}.multi_ap_backhaul_ssid
-			uci -q delete wireless.${section}.multi_ap_backhaul_key
-		}
-
-		config_load wireless
-
-		config_foreach write_wireless wifi-iface $1
-	}
-
-	mapagent_teardown_bss() {
-		local section=$1
-		local iface=$2
-
-		config_get ifname $section ifname
-
-		[ "$iface" != "$ifname" ] && return
-
-		config_get ifname $section ifname
-		uci -q set mapagent.${section}.enabled="0"
-		uci -q set mapagent.${section}.ssid="DISABLED-SSID"
-		uci -q set mapagent.${section}.key="DISABLED-KEY"
-
-		# subshell in hopes to maintain mapagent config loaded
-		$(mapagent_teardown_wireless $ifname)
-	}
-
-
-	config_foreach mapagent_teardown_bss fh-iface $iface
-
-	uci commit wireless
-	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
 shift

@@ -511,12 +236,7 @@ case "$func" in
 	write_credentials) brcm_write_credentials;;
 	sync_credentials) brcm_sync_credentials;;
 	bsta_steer) bsta_steer $@;;
-	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
--- a/map-agent/files/lib/wifi/traffic_separation
+++ b/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
-}
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=5.0.2
+PKG_VERSION:=4.0.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6ba4d74bbd196b781ba2418eb596a550d34c1028
+PKG_SOURCE_VERSION:=3e6e113fdbfdb8a2e230fc74ebe8a36f9696ede2

 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
--- a/map-controller/files/etc/config/mapcontroller
+++ b/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'
--- a/map-topology/Makefile
+++ b/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.4

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=d1fb7e76cb0fe93167648cf32193e73b1ca3522a
+PKG_SOURCE_VERSION:=eb6500963156865b74c2373c11366861ad75bf45
 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
--- a/mcastmngr/Makefile
+++ b/mcastmngr/Makefile
@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.1

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

--- a/mcastmngr/files/etc/uci-defaults/61-mcast_config_generate
+++ b/mcastmngr/files/etc/uci-defaults/61-mcast_config_generate
@@ -22,7 +22,7 @@ generate_igmp_global_params(){

 generate_mcast_config(){

-	up_itf="$(uci -q get network.wan.device)"
+	up_itf="$(uci -q get network.wan.ifname)"

 	uci add mcast proxy
 	uci rename mcast.@proxy[-1]="igmp_proxy_1"
--- a/obudpst/Makefile
+++ b/obudpst/Makefile
@@ -1,42 +0,0 @@
-#
-# 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))
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=4.1.0.8
+PKG_VERSION:=4.0.0.10

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=588a3506c197fdb9b7ea50dae5680f2aadf33b51
+PKG_SOURCE_VERSION:=56dca342de0704b479f408b72712e282a413557a
 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
--- a/obuspa/files/etc/hotplug.d/iface/85-obuspa
+++ b/obuspa/files/etc/hotplug.d/iface/85-obuspa
@@ -5,7 +5,5 @@
 [ "$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

--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -1,12 +1,14 @@
 #!/bin/sh /etc/rc.common

 START=99
-STOP=2
 USE_PROCD=1
 PROG=/usr/sbin/obuspa

-CONFIGURATION=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
 KEEP_FILES="/lib/upgrade/keep.d/obuspa"
 USP_TEMP_FILE="/tmp/usp.tmp"
 controller_num=0
@@ -17,7 +19,6 @@ subs_num=0
 challenge_num=0
 index=0
 role_def_file=""
-PROFILE="/root/.profile"

 . /lib/functions/network.sh
 . /usr/share/libubox/jshn.sh
@@ -42,19 +43,6 @@ 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
@@ -592,38 +580,28 @@ configure_obuspa() {
 	fi

 	if [ -n "${interface}" ]; then
-		network_get_physdev ifname ${interface}
+		network_get_device ifname ${interface}
 		log "ifname from ${interface} is ${ifname}"
 	fi

 	# Set this variable for root user and obuspa -c tool
-	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
+	grep -q "export USP_BOARD_IFNAME=${ifname}" /root/.profile || \
+		echo "export USP_BOARD_IFNAME=${ifname}" >> /root/.profile

 	if [ -n "${db_file}" ]; then
-		update_keep "${db_file}"
+		echo "${db_file}" >>${KEEP_FILES}
 		procd_append_param command -f ${db_file}
 	fi

 	if [ -n "${trust_cert}" ]; then
-		update_keep "${trust_cert}"
+		echo "${trust_cert}" >>${KEEP_FILES}
 		if [ -f "${trust_cert}" ]; then
 			procd_append_param command -t ${trust_cert}
 		fi
 	fi

 	if [ -n "${client_cert}" ]; then
-		update_keep "${client_cert}"
+		echo "${client_cert}" >>${KEEP_FILES}
 		if [ -f "${client_cert}" ]; then
 			procd_append_param command -a ${client_cert}
 		fi
@@ -634,6 +612,10 @@ 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
@@ -648,6 +630,28 @@ 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

@@ -660,6 +664,10 @@ 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}
@@ -674,19 +682,7 @@ 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() {
@@ -695,7 +691,8 @@ reload_service() {
 }

 service_triggers() {
-	procd_add_reload_trigger "obuspa" "mosquitto"
+	procd_add_reload_trigger "uspd" "mosquitto"
+	procd_add_config_trigger "config.change" "${CONFIGURATION}" /etc/init.d/obuspa remove_db

 	# Create a reload trigger if schema update avaialble
 	procd_open_trigger
@@ -714,7 +711,13 @@ service_triggers() {
 					json_add_string "" "reload"
 				json_close_array
 			json_close_array
-			json_add_int "" "2000"
+			json_add_int "" "1000"
 		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
 }
--- a/owsd/files/owsd.hotplug
+++ b/owsd/files/owsd.hotplug
@@ -2,6 +2,19 @@

 [ "$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

@@ -11,6 +24,13 @@ 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
--- a/periodicstats/Makefile
+++ b/periodicstats/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=periodicstats
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=312573b91b2ae10d0fe04a4d11ae37898f526fdb
+PKG_SOURCE_VERSION:=d53b540a89165753922707ed624b315d58abd10a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/ponmngr/Makefile
+++ b/ponmngr/Makefile
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2021 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ponmngr
+PKG_VERSION:=1.0.0
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ponmngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=PON Manager
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm) +xxd
+endef
+
+define Package/ponmngr/description
+	Configures pon manager
+endef
+
+#define Build/Prepare
+#        $(CP) -rf ./ponmngr/* $(PKG_BUILD_DIR)/
+#endef
+
+define Build/Compile
+endef
+
+define Package/ponmngr/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,ponmngr))
--- a/ponmngr/files/etc/init.d/ponmngr
+++ b/ponmngr/files/etc/init.d/ponmngr
@@ -0,0 +1,37 @@
+#!/bin/sh /etc/rc.common
+
+# Uncomment this if functions need to called inside /lib/pon
+# include /lib/pon
+
+START=22
+STOP=11
+
+USE_PROCD=1
+NAME=ponmngr
+
+. /lib/functions.sh
+include /lib/pon
+
+start_service() {
+	if [ -f "/etc/config/pon" ]; then
+		start_pon
+	fi
+
+}
+
+stop_service() {
+	stop_pon
+}
+
+boot() {
+	start
+}
+
+service_triggers() {
+	procd_add_reload_trigger pon
+}
+
+reload_service() {
+	stop
+	start
+}
--- a/ponmngr/files/etc/uci-defaults/60-pon_generate
+++ b/ponmngr/files/etc/uci-defaults/60-pon_generate
@@ -0,0 +1,27 @@
+#!/bin/sh
+
+basemac="$(db -q get hw.board.basemac | tr -d ':')"
+             
+if [ -s "/etc/config/pon" ]; then
+        if uci -q get pon.globals >/dev/null; then
+                # return if there is any valid content
+                exit                                  
+        else                                          
+                rm -f /etc/config/pon
+        fi                           
+fi                                   
+touch /etc/config/pon
+                     
+mac=''               
+if [ -z "$basemac" ]; then
+        mac="12345678"    
+else                      
+        # read last 8 characters of basemac without :
+        mac=${basemac: -8}                           
+fi                                                   
+                          
+uci set pon.globals=globals
+uci set pon.globals.enabled="1"
+uci set pon.globals.serial_number="ISSW$mac"
+                                           
+uci commit pon  
--- a/ponmngr/files/lib/pon/broadcom.sh
+++ b/ponmngr/files/lib/pon/broadcom.sh
@@ -0,0 +1,72 @@
+#!/bin/sh
+. /lib/functions.sh
+
+configure_snpwd() {
+	local serial_no password
+	serial_no="$1"
+	password="$2"
+
+	# serial number comprises of 2 parts, vendor id and vendor specific, the vendor id is
+	# a string while the vendor specific is a hex, so split the 2 and set accordingly
+	local vendor_id vendor_specific
+	vendor_id=${serial_no:0:4}
+	vendor_specific=${serial_no: -8}
+
+	# attempt to conver vendor_id from string to hex
+	if [ -n "$(which xxd)" ]; then
+		vendor_id=$(echo $vendor_id | xxd  -c 256 -ps | sed "s/..$//")
+	else
+		# if cannot convert to hex, return as cli will not accept non hex input
+		return
+	fi
+
+	bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure gpon onu_sn={vendor_id=$vendor_id,vendor_specific=$vendor_specific}
+	if [ -n "$password" ]; then
+		bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure gpon password=$password
+	fi
+}
+
+configure_pon() {
+	local enabled serial_no password
+	config_load pon
+	config_get enabled globals "enabled"
+
+	if [ "$enabled" == "0" ]; then
+		exit
+	fi
+
+	config_get serial_no globals "serial_number"
+	config_get password globals "password"
+
+	configure_snpwd $serial_no $password
+}
+
+start_pon() {
+	if [ -n "$(which gponctl)" ]; then
+		configure_pon
+		gponctl start
+	fi
+}
+
+stop_pon() {
+	if [ -n "$(which gponctl)" ]; then
+		gponctl stop
+	fi
+}
+
+get_pon_status() {
+	json_init
+	status="$(gponctl getstate)"
+	admin_status="$(echo $status | head -n1 | awk '{print $8;}')"
+	json_add_string "admin_status" "$admin_status"
+	op_status="$(echo $status | head -n1 | awk '{print $12;}')"
+	case $op_status in
+	NUMBER)
+		op_status="$(echo $status | head -n1 | awk '{print $13;}')"
+		;;
+	esac
+
+	op_status=${op_status:1:2}
+	json_add_string "operational_status" "$op_status"
+	json_dump
+}
--- a/ponmngr/files/usr/libexec/rpcd/pon
+++ b/ponmngr/files/usr/libexec/rpcd/pon
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+include /lib/pon
+
+case "$1" in
+	list)
+		echo '{ "status": {} }'
+		;;
+	call)
+		case "$2" in
+			status)
+				get_pon_status
+				;;
+		esac
+		;;
+esac
+
--- a/qosmngr/Makefile
+++ b/qosmngr/Makefile
@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.1

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=460327011d932580f55c7b70acb1e652dd3c95a3
+PKG_SOURCE_VERSION:=03df56c6eb7c6737ce95576e89c915df77396953
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/qosmngr/files/etc/init.d/qos
+++ b/qosmngr/files/etc/init.d/qos
@@ -23,6 +23,11 @@ start_service() {
 	fi
 }

+stop() {
+	#stop_service() is called after procd killed the service
+	echo ;
+}
+
 boot() {
 	setup_qos
 	start
@@ -32,8 +37,12 @@ service_triggers() {
 	procd_add_reload_trigger qos
 }

+reload_service() {
+	# Call functions to configure QoS
+	start
+}
+
 restart() {
-	stop
 	setup_qos
 	start
 }
--- a/qosmngr/files/lib/qos/broadcom.sh
+++ b/qosmngr/files/lib/qos/broadcom.sh
@@ -1,6 +1,5 @@
 #!/bin/sh
 . /lib/functions.sh
-. /lib/network/port.sh

 IP_RULE=""
 BR_RULE=""
@@ -14,7 +13,6 @@ PREV_ORDER=""
 CURR_ORDER=""
 MAX_ORDER=""

-
 # Function to handle a queue order and
 # update total number of queues
 handle_q_order() {
@@ -54,7 +52,7 @@ configure_precedence_to_file() {
 	line="$2"
 	order_file="$3"

-	if [ $order == "$PREV_ORDER" ]; then
+	if [ $order == $PREV_ORDER ]; then
 		queue_id=${line#*_}
 		val=${CURR_ORDER}_${queue_id}
 		echo $val >> $order_file
@@ -124,7 +122,7 @@ handle_queue() {
 	fi

 	# This is to get the qid per interface.
-	if [ "$INTF_NAME" == $ifname ]; then
+	if [ $INTF_NAME == $ifname ]; then
 		Q_COUNT=$((Q_COUNT + 1))
 	else
 		Q_COUNT='0'
@@ -253,17 +251,17 @@ setup_qos() {
 		ebtables -t broute -I BROUTING -j qos
 	fi

-	iptables -w -t mangle -N qos_forward
+	iptables -t mangle -N qos_forward
 	ret=$?
-	[ $ret -eq 0 ] && iptables -w -t mangle -I FORWARD -j qos_forward
+	[ $ret -eq 0 ] && iptables -t mangle -I FORWARD -j qos_forward

-	iptables -w -t mangle -N qos_prerouting
+	iptables -t mangle -N qos_prerouting
 	ret=$?
-	[ $ret -eq 0 ] && iptables -w -t mangle -I PREROUTING -j qos_prerouting
+	[ $ret -eq 0 ] && iptables -t mangle -I PREROUTING -j qos_prerouting

-	iptables -w -t mangle -N qos_output
+	iptables -t mangle -N qos_output
 	ret=$?
-	[ $ret -eq 0 ] && iptables -w -t mangle -I OUTPUT -j qos_output
+	[ $ret -eq 0 ] && iptables -t mangle -I OUTPUT -j qos_output

 	ip6tables -t mangle -N qos_forward
 	ret=$?
@@ -281,13 +279,13 @@ setup_qos() {
 flush_chains() {
 	echo "ebtables -t broute -F qos" > /tmp/qos/classify.ebtables

-	echo "iptables -w -t mangle -F qos_forward" > /tmp/qos/classify.iptables
-	echo "iptables -w -t mangle -F qos_prerouting" >> /tmp/qos/classify.iptables
-	echo "iptables -w -t mangle -F qos_output" >> /tmp/qos/classify.iptables
+	echo "iptables -t mangle -F qos_forward" > /tmp/qos/classify.iptables
+	echo "iptables -t mangle -F qos_prerouting" >> /tmp/qos/classify.iptables
+	echo "iptables -t mangle -F qos_output" >> /tmp/qos/classify.iptables

-	echo "ip6tables -w -t mangle -F qos_forward" > /tmp/qos/classify.ip6tables
-	echo "ip6tables -w -t mangle -F qos_prerouting" >> /tmp/qos/classify.ip6tables
-	echo "ip6tables -w -t mangle -F qos_output" >> /tmp/qos/classify.ip6tables
+	echo "ip6tables -t mangle -F qos_forward" > /tmp/qos/classify.ip6tables
+	echo "ip6tables -t mangle -F qos_prerouting" >> /tmp/qos/classify.ip6tables
+	echo "ip6tables -t mangle -F qos_output" >> /tmp/qos/classify.ip6tables
 }

 init_broute_rule() {
@@ -536,12 +534,12 @@ iptables_set_traffic_class() {

 append_rule_to_mangle_table() {
 	if [ $2 == 4 ]; then
-		echo "iptables -w -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
+		echo "iptables -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
 	elif [ $2 == 6 ]; then
-		echo "ip6tables -w -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
+		echo "ip6tables -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
 	elif [ $2 == 1 ]; then
-		echo "iptables -w -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
-		echo "ip6tables -w -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
+		echo "iptables -t mangle -A $1 $IP_RULE"  >> /tmp/qos/classify.iptables
+		echo "ip6tables -t mangle -A $1 $IP_RULE" >> /tmp/qos/classify.ip6tables
 	fi
 }

@@ -673,20 +671,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 +745,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
@@ -763,10 +763,7 @@ config_ingress_rate_limit() {
 		in_burst_size=$((in_burst_size / 1000))
 	fi

-	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
+	ethswctl -c rxratectrl -n 1 -p $ifname -x $ingress_rate -y $in_burst_size
 }

 #function to handle a classify section
@@ -857,14 +854,10 @@ 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
-			if [ $port != "" -a $unit != "" ]; then
-				ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
-			fi
+			ethswctl -c rxratectrl -n 1 -p $intf -x 0 -y 0
 		done
+		return
 	fi

 	# Delete policer
@@ -892,11 +885,8 @@ configure_policer() {
 }

 configure_qos() {
-	#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_shaper
 	configure_policer
 	configure_classify
 }
--- a/questd/files/usr/libexec/rpcd/router.network
+++ b/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
+
--- a/sulu/Makefile
+++ b/sulu/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu
-PKG_VERSION:=0.2.19
+PKG_VERSION:=0.2.18

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
-PKG_SOURCE_VERSION:=86de40b6ebdf937419290f6a0c5c0fb79eaa5ed1
+PKG_SOURCE_VERSION:=06411282a6c2d02d21599786c0dd12c00c711847

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
--- a/swmodd/Makefile
+++ b/swmodd/Makefile
@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=swmodd
-PKG_VERSION:=2.0.8
+PKG_VERSION:=2.0.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f0054f9413d6369bb6d9a66e7c49414b946ef0df
+PKG_SOURCE_VERSION:=5738d3da3dce67f225e5217022f670feaae54788
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -25,9 +25,7 @@ define Package/swmodd
 	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
+	DEPENDS:=+libuci +libubox +ubus +libuuid +libbbf_api +PACKAGE_liblxc:liblxc
 endef

 define Package/swmodd/description
@@ -54,15 +52,10 @@ 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
-ifeq ($(CONFIG_PACKAGE_liblxc),y)
-	$(INSTALL_DIR) $(1)/usr/share/lxc/templates/
-	$(INSTALL_DIR) $(1)/usr/share/swmodd/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/templates/lxc-iopsys $(1)/usr/share/lxc/templates/lxc-iopsys
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/opkg_offline.sh $(1)/usr/share/swmodd/opkg_offline
-endif
 endef

 $(eval $(call BuildPackage,swmodd))
--- a/swmodd/files/map_du
+++ b/swmodd/files/map_du
--- a/twamp/Makefile
+++ b/twamp/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=twamp
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.0

-PKG_SOURCE_VERSION:=dbddaa0c4d826dfdf37bb92f98a2b2ad23035ca3
+PKG_SOURCE_VERSION:=f6e914508aa1f7458f87bd68026f56262595d9a5
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp.git

--- a/uspd/Config.in
+++ b/uspd/Config.in
@@ -1,9 +0,0 @@
-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
--- a/uspd/Makefile
+++ b/uspd/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=uspd
-PKG_VERSION:=2.1.28
+PKG_VERSION:=2.1.23

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4f449cc787f07b1543c7e51dc5b3d03de4b3db8f
+PKG_SOURCE_VERSION:=77e84a151e6c8cecbe80bc31159475db294c1f90
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -34,14 +34,10 @@ 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 \
-	-DUSPD_MAX_MSG_LEN=$(CONFIG_USPD_MAX_MSG_LEN)
+	-D_GNU_SOURCE
+

 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
--- a/uspd/files/uspd.init
+++ b/uspd/files/uspd.init
@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common

-START=96
+START=98
 STOP=10

 USE_PROCD=1
@@ -59,5 +59,5 @@ reload_service() {

 service_triggers()
 {
-	procd_add_reload_trigger "uspd"
+	procd_add_config_trigger "config.change" "uspd" /etc/init.d/uspd restart
 }
--- a/wfa-capi/Makefile
+++ b/wfa-capi/Makefile
@@ -1,57 +0,0 @@
-#
-# Copyright (C) 2021 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=wfa-capi
-PKG_VERSION:=1.0.0
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-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
-endif
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
-PKG_LICENSE:=PROPRIETARY IOPSYS
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-
-#define Package/wfa-capi/config
-#  source "$(SOURCE)/Config.in"
-#endef
-
-define Package/wfa-capi
-  TITLE+= wfa-capi (agent daemon for Wi-Fi Alliance's CAPI commands)
-  DEPENDS= +libubox +libuci +libubus +libnl-genl +libeasy +libwifi \
-	   +libjson-c +libblobmsg-json +ubus +libieee1905
-endef
-
-define Package/wfa-capi/description
- This package provides agent for WiFi Alliance's CAPI specification.
-endef
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
-
-MAKE_PATH:=src
-
-
-define Package/wfa-capi/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/lib/wifi/capi
-	$(CP) $(PKG_BUILD_DIR)/src/capiagent $(1)/usr/sbin
-	$(CP) $(PKG_BUILD_DIR)/src/scripts/* $(1)/lib/wifi/capi
-endef
-
-$(eval $(call BuildPackage,wfa-capi))
--- a/wfa-capi/files/etc/init.d/capiagent
+++ b/wfa-capi/files/etc/init.d/capiagent
@@ -1,26 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=98
-STOP=20
-
-USE_PROCD=1
-
-start_service() {
-	procd_open_instance
-        procd_set_param command "/usr/sbin/capiagent"
-	procd_set_param limits core="unlimited"
-#	procd_set_param respawn
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "capiagent"
-}
-
-reload_service() {
-	stop
-	start
-}
--- a/wfadatad/Makefile
+++ b/wfadatad/Makefile
@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wfadatad
-PKG_VERSION:=5.0.2
+PKG_VERSION:=4.0.6

 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f62f7d4795fcba7e4b2906fdba8e5c390c771cba
+PKG_SOURCE_VERSION:=43a3a5fd64d6476f07640e1b7ba1a2c5f242cb78
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifimngr
-PKG_VERSION:=13.0.1
+PKG_VERSION:=11.2.0

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6b1f24c940efdc563e0bfec06fdb803235494b6f
+PKG_SOURCE_VERSION:=505bc2c4f6f126f3d35d36d8db5a8d42b149d9c2
 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
--- a/wifimngr/files/etc/hotplug.d/button/05-wifi
+++ b/wifimngr/files/etc/hotplug.d/button/05-wifi
@@ -60,45 +60,17 @@ 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)"
-
-	logger -t button "WPS checking: $wpasupp"
+	wpasupp="$(ubus list wpa_supplicant.* 2>/dev/null | head -1)"
 	if [ -n "$wpasupp" ]; then
-		status=$(supp_configured "$wpasupp")
+		status=$(supp_status $wpasupp)
 		logger -t button "status $status"
 		if [ "$status" = "CONFIGURED" ]; then
 			start_ap_wps
 		else
-			supp_wps "$wpasupp"
+			logger -t button "WPS start $wpasupp"
+			ubus -t 1 call $wpasupp wps_start
 		fi
 	else
 		start_ap_wps
--- a/xmppc/Makefile
+++ b/xmppc/Makefile
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=xmppc
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.1

-PKG_SOURCE_VERSION:=4a09b8689d67dcbf3fd1b7e80e53816b7cd12614
+PKG_SOURCE_VERSION:=a98cdda759418dab1c12a18c345112d94ed4c02e
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/xmppc.git
Author	SHA1	Message	Date
Rahul	6b31f08b32	ponmngr: add ubus call Add ubus call to get gpon status	2021-07-30 15:59:10 +05:30
Rahul	2750ca42c3	ponmngr: first commit Script based ponmngr first commit	2021-07-27 12:51:07 +05:30