map-agent: 5.0.1

2025-12-27 22:50:19 +08:00 · 2021-07-06 13:03:32 +02:00
122 changed files with 1788 additions and 4693 deletions
--- a/bbf/Config_bbfdm.in
+++ b/bbf/Config_bbfdm.in
@@ -1,7 +1,5 @@
 if PACKAGE_libbbfdm

-menu "Configuration"
-
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -26,12 +24,4 @@ config BBF_TR143
 	bool "Enable TR-143 Data Model Support"
 	default y

-config BBFDM_ENABLE_JSON_PLUGIN
-	bool "Enable json plugin to extend datamodel"
-	default n
-
-config BBFDM_ENABLE_DOTSO_PLUGIN
-	bool "Enable shared library plugin to extend datamodel"
-	default n
-endmenu
 endif
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.4.18
+PKG_VERSION:=4.3.6
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2758c0380e9dbec87b119df239aee29c7ed1ec48
+PKG_SOURCE_VERSION:=ece9282e8f1de4405c5e58a4c6a6263fd0cd7f81
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -23,19 +23,19 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk

 define Package/libbbf_api
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=BBF
  TITLE:=Library for libbbfdm API
  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef

 define Package/libbbfdm
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=BBF
  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls +libcurl
 endef

 define Package/libbbfdm/config
@@ -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,58 +83,50 @@ 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

-ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
-CONFIGURE_ARGS += \
-	--enable-json-plugin
-endif
-
-ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
-CONFIGURE_ARGS += \
-	--enable-shared-library
-endif
-
 define Package/libbbf_api/install
 	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
 endef

 define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
+	$(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef

 define Package/libbbfdm/prerm
 	#!/bin/sh
-	rm -rf /etc/bbfdm/dmmap/*
+	rm -rf /etc/bbfdm/*
 	exit 0
 endef

 define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
+	$(CP) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
 endef

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

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

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

--- a/crun/Makefile
+++ b/crun/Makefile
@@ -0,0 +1,81 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=crun
+PKG_VERSION:=0.20
+PKG_RELEASE:=$(AUTORELEASE)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/containers/crun.git
+PKG_SOURCE_DATE:=2021-06-07
+PKG_SOURCE_VERSION:=8d6a8b5ab80461cfed19f020a36584af13c32038
+PKG_MIRROR_HASH:=9ca1f0e530b33ce8820bd03329eb6731c5050d6e7f35bd2463d9a81cc00382e0
+
+PKG_BUILD_DEPENDS:=argp-standalone
+PKG_BUILD_PARALLEL:=1
+PKG_FIXUP:=autoreconf
+PKG_INSTALL:=1
+
+PKG_MAINTAINER:=Oskari Rauta <oskari.rauta@gmail.com>
+PKG_LICENSE:=GPL-2.0-or-later
+PKG_LICENSE_FILES:=COPYING
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/crun
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=crun
+  URL:=https://github.com/containers/crun
+  DEPENDS:=@!arc +libseccomp +libcap
+endef
+
+define Package/crun/description
+  A fast and low-memory footprint OCI Container Runtime fully written in C.
+endef
+
+CONFIGURE_ARGS+= \
+	--disable-systemd \
+	--enable-embedded-yajl \
+	--enable-caps \
+	--enable-dl \
+	--enable-seccomp \
+	--enable-bpf
+
+define Build/Prepare
+	$(call Build/Prepare/Default)
+	$(SED) '/#include <git-version.h>/d' $(PKG_BUILD_DIR)/src/crun.c
+endef
+
+define Build/Configure
+	$(call Build/Configure/Default)
+
+	$(SED) '/#define PACKAGE \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define VERSION \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define GIT_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_BUGREPORT \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_NAME \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_STRING \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_TARNAME \"/d' $(PKG_BUILD_DIR)/config.h
+	$(SED) '/#define PACKAGE_VERSION \"/d' $(PKG_BUILD_DIR)/config.h
+
+	echo "#define PACKAGE \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_NAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_VERSION \"$(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_STRING \"$(PKG_NAME) $(PKG_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_TARNAME \"$(PKG_NAME)\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define PACKAGE_BUGREPORT \"bugs@openwrt.org\"" >> $(PKG_BUILD_DIR)/config.h
+	echo "#define GIT_VERSION \"$(PKG_SOURCE_VERSION)\"" >> $(PKG_BUILD_DIR)/config.h
+endef
+
+define Package/crun/install
+	$(INSTALL_DIR) $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/crun $(1)/usr/bin/
+endef
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libcrun.* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,crun))
--- a/dectmngr/Config.in
+++ b/dectmngr/Config.in
@@ -1,11 +0,0 @@
-if PACKAGE_dectmngr
-
-menu "Configuration"
-
-config ENABLE_LINE_SETTINGS_EXTENSION
-	bool "Enable Line Settings List extension "
-	default y
-
-endmenu
-
-endif
--- a/dectmngr/Makefile
+++ b/dectmngr/Makefile
@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.4.7
+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:=1894596674aa655691ee5b6ff3d283ca4cf5d2eb
+PKG_SOURCE_VERSION:=f9095eca8404a8121cb4a1c56a25577f5a58773d
 PKG_MIRROR_HASH:=skip
 endif

@@ -34,40 +34,29 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
 	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2
+ 	DEPENDS:= +libubox +ubus
 endef

 define Package/$(PKG_NAME)/description
 	DECT manager is a daemon that provides UBUS RPC objects and sends UBUS events for communication with the DECT chip.
 endef

-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
-endef
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	rsync -av --exclude=.* ~/git/voip/dectmngr/* $(PKG_BUILD_DIR)/
 endef
 endif

-TARGET_CFLAGS += \
-	-Wall \
-	-I$(STAGING_DIR)/usr/include/libxml2
-
-ifeq ($(CONFIG_ENABLE_LINE_SETTINGS_EXTENSION),y)
-TARGET_CFLAGS += -DENABLE_LINE_SETTINGS_EXTENSION
-endif
+MAKE_FLAGS += \
+	CFLAGS+="-Wall"

 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d

 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/dectmngr
 	$(CP) ./files/etc/* $(1)/etc/
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dect $(1)/lib/upgrade/keep.d/dect
 endef

 $(eval $(call BuildPackage,$(PKG_NAME)))
--- a/dectmngr/files/etc/config/dect
+++ b/dectmngr/files/etc/config/dect
@@ -1,2 +0,0 @@
-config dect 'global'
-	option log_dect_cmbs 'syslog'
--- a/dectmngr/files/etc/dspg/04131C10.bin
+++ b/dectmngr/files/etc/dspg/04131C10.bin
--- a/dectmngr/files/etc/init.d/dectmngr
+++ b/dectmngr/files/etc/init.d/dectmngr
@@ -26,7 +26,6 @@ start_service() {
 	local opt_ext=
 	local rfpi=
 	local model_id=
-	local rxtun=

 	test $(db get hw.board.hasDect) = "0" && return

@@ -35,33 +34,14 @@ start_service() {
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"

-	model_id=$(db -q get hw.board.dect_model_id)
-	[ -n "$model_id" -a ${#model_id} -eq 8 ] || {
-		echo "Invalid hw.board.dect_model_id:$model_id. Set to 30.3B.06"
-		model_id="30.3B.06"
-	}
-	opt_ext="$opt_ext -model $model_id"
-
-	rxtun=$(db -q get hw.board.dect_rxtun)
-	[ -n "$rxtun" -a ${#rxtun} -eq 2 ] && opt_ext="$opt_ext -rxtun $rxtun"
-
-	config_load dect
-	config_get log_dect_cmbs global log_dect_cmbs syslog
+	# model_id=$(db -q get hw.board.dect_model_id)
+	# Setting model_id to 0x010203 is a workaround to reduce synchronisation time of some handset
+	# TODO: remove below line and uncomment the line above to get value from db when the problem is solved
+	model_id="01.02.03"
+	[ -n "$model_id" -a ${#model_id} -eq 8 ] && opt_ext="$opt_ext -model $model_id"

 	procd_open_instance
-	if [ "$log_dect_cmbs" = "none" ]; then
-		echo "Starting dectmngr with cmbs logging disabled"
-		procd_set_param command $PROG -comname ttyH0 $opt_ext
-		rm -f $LOG_PATH/*
-	elif [ "$log_dect_cmbs" = "file" ]; then
-		echo "Starting dectmngr with cmbs logging enabled to file"
-		procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
-	else
-		echo "Starting dectmngr with cmbs logging enabled to syslog"
-		procd_set_param command $PROG -comname ttyH0 -syslog $opt_ext
-		rm -f $LOG_PATH/*
-	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
@@ -76,13 +56,13 @@ stop_service() {
 }

 reload_service() {
-	ubus call dect reload
+	stop_and_wait_dectmngr
+	start
 }

 service_triggers()
 {
-	procd_add_config_trigger "config.change" "asterisk" /etc/init.d/dectmngr restart
-	procd_add_config_trigger "config.change" "dect" /etc/init.d/dectmngr reload
+	procd_add_reload_trigger asterisk
 }

 boot() {
--- a/dectmngr/files/lib/upgrade/keep.d/dect
+++ b/dectmngr/files/lib/upgrade/keep.d/dect
@@ -1 +0,0 @@
-/etc/dect/LA_DB
--- 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-qos/files/etc/init.d/easy_qos.classcfg
+++ b/easy-qos/files/etc/init.d/easy_qos.classcfg
@@ -33,7 +33,7 @@ exec_class_log() {
 }

 get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
+	local prio=$(echo $1|tr [A-Z] [a-z]);
 	case "${prio}" in
 		"lowest")
 			echo 8;;
@@ -55,7 +55,7 @@ get_priority() {
 }

 get_mark() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
+	local prio=$(echo $1|tr [A-Z] [a-z]);
 	case "${prio}" in
 		"lowest")
 			echo "0x41/0x3df";;
--- a/easy-qos/files/etc/init.d/easy_qos.ebtables
+++ b/easy-qos/files/etc/init.d/easy_qos.ebtables
@@ -15,7 +15,7 @@ exec_log() {
 }

 get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
+	local prio=$(echo $1|tr [A-Z] [a-z]);
 	case "${prio}" in
 		"lowest")
 			echo 0;;
@@ -98,7 +98,7 @@ manage_rule() {
 		return 1;
 	}

-	protocol=$(echo ${proto}|tr 'A-Z' 'a-z')
+	protocol=$(echo ${proto}|tr [A-Z] [a-z])
 	prio_num=$(get_priority ${priority})
 	if [ -n "${macaddr}" -a -n "${prio_num}" ]; then
 		for p in ${port}; do
--- a/easy-qos/files/etc/init.d/easy_qos.iptables
+++ b/easy-qos/files/etc/init.d/easy_qos.iptables
@@ -19,7 +19,7 @@ exec_log() {
 }

 get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
+	local prio=$(echo $1|tr [A-Z] [a-z]);
 	case "${prio}" in
 		"lowest")
 			echo 0;;
--- 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.34
+PKG_VERSION:=6.2.33
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=dd2ab2e5b83d585849aae3d539c1a8cd6dcb7146
+PKG_SOURCE_VERSION:=1e681f0a56a9fe8738a9eb19b8afd7961c79f23e
 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
@@ -7,16 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=endptmngr
-PKG_VERSION:=0.6
+PKG_VERSION:=0.5

-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=548fa04d2714feeadb500192905fa6fb8172e6dd
+PKG_SOURCE_VERSION:=c9a39d6e565b60e8185d3802ab831e1834543122
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif

 PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
@@ -30,7 +27,7 @@ PKG_BUILD_PARALLEL:=1
 # indirectly. This ensures that the package is rebuilt on config-changes.
 PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD

-export CONFIG_BRCM_SDK_VER_504021
+export CONFIG_BRCM_SDK_VER_504002
 export CONFIG_BCM_CHIP_ID

 include $(INCLUDE_DIR)/package.mk
@@ -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/endptmngr/files/etc/init.d/endptmngr
+++ b/endptmngr/files/etc/init.d/endptmngr
@@ -7,8 +7,6 @@ USE_PROCD=1
 NAME=endptmngr

 start_service() {
-	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
-
 	procd_open_instance
 	procd_set_param env hw_board_hasDect=$(db get hw.board.hasDect)
 	procd_set_param command $NAME
--- 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:=7e013f0afa68378d38a6bdc9b0c5a342bd3dd0a5
+PKG_SOURCE_VERSION:=573bf9543f8dc792b6d5dc8760cb69c64f11e932
 PKG_MIRROR_HASH:=skip

 PKG_LICENSE:=GPLv2
--- a/gryphon-led-module/Makefile
+++ b/gryphon-led-module/Makefile
@@ -28,7 +28,6 @@ define KernelPackage/$(PKG_NAME)
  FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
  KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
  AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):bcmkernel
  PKG_LICENSE:=GPLv2
  PKG_LICENSE_URL:=
 endef
@@ -41,21 +40,6 @@ EXTRA_KCONFIG:= CONFIG_RGB_LED=m

 MODULE_INCLUDE=-I$(PKG_BUILD_DIR)

-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
-	MODULES_SUBDIR:=lib/modules/4.19.183
-	TARGET_CROSS:=$(CONFIG_BCM_TOOLCHAIN)/bin/$(CONFIG_BCM_TOOLTUPLE)
-
-	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))
-		# These targets use a 64-bit kernel
-		LINUX_KARCH:=arm64
-		TARGET_CROSS:=/opt/toolchains/crosstools-aarch64-gcc-9.2-linux-4.19-glibc-2.30-binutils-2.32/bin/aarch64-buildroot-linux-gnu-
-	endif
-	# For some reason, Broadcom's kernel does not set the include paths correctly when compiling out-of-tree modules
-	EXTRA_KCPPFLAGS:="-I $(LINUX_DIR)/../bcmkernel/include -I $(LINUX_DIR)/arch/arm/mach-bcm963xx/include"
-endif
-
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/
 	$(CP) -s `pwd`/src/* $(PKG_BUILD_DIR)/kdevlinks/
--- 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/Config_cwmp.in
+++ b/icwmp/Config_cwmp.in
@@ -1,6 +1,5 @@
 if PACKAGE_icwmp

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

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

 PKG_NAME:=icwmp
-PKG_VERSION:=8.2.25
+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:=22a1606d972d2dd05b23abe94323f72232727b37
+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,19 +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/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/init.d/icwmpd $(1)/etc/init.d/icwmpd
-	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/95-icwmp-generate-ssl $(1)/etc/uci-defaults/
-	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
-	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
+	$(INSTALL_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
@@ -1,9 +1,11 @@
 config acs 'acs'
+	option url ''
 	option userid '' #$OUI-$SER
 	option passwd 'iopsys'
 	option periodic_inform_enable 'true'
 	option periodic_inform_interval '1800'
 	option periodic_inform_time '0001-01-01T00:00:00Z'
+	option ParameterKey ''
 	option dhcp_discovery 'enable'
 	# compression possible configs: GZIP, Deflate, Disabled
 	option compression 'Disabled'
@@ -37,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,81 +1,21 @@
-#!/bin/sh
-
-#created by the icwmp package
-log() {
-	echo "${@}"|logger -t firewall.cwmp -p info
-}
-
-if [ ! -f "/var/state/cwmp" ]; then
-	touch "/var/state/cwmp"
-	exit 0;
-fi
-
-zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
-port=$(uci -q get cwmp.cpe.port)
-ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
-ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
-incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
-
-if [ -z "${zone_name}" ]; then
-	log "empty firewall zone name"
+#created by the icwmp package 
+zone_name=""
+port=""
+if [ "$zone_name" = "" ]; then
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
 	iptables -nL zone_icwmp_input 2> /dev/null
 	if [ $? != 0 ]; then
-		iptables -w 1 -N zone_icwmp_input
-		iptables -w 1 -t filter -A INPUT -j zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -N zone_icwmp_input
+		iptables -t filter -A INPUT -j zone_icwmp_input
+		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
 	else			
-		iptables -w 1 -F zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -F zone_icwmp_input
+		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
 	fi			
 else
-	iptables -w 1 -F zone_icwmp_input 2> /dev/null
-	iptables -w 1 -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
-	iptables -w 1 -X zone_icwmp_input 2> /dev/null
+	iptables -F zone_icwmp_input 2> /dev/null
+	iptables -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
+	iptables -X zone_icwmp_input 2> /dev/null
 fi
-
-cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
-cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
-
-# default incoming rule is Port only
-if [ -z "${incoming_rule}" ]; then
-	incoming_rule="port_only"
-fi
-
-if [ "${incoming_rule}" = "ip_only" ]; then
-	if [ -n "${ipaddr}" ]; then
-		cmd="${cmd} -s ${ipaddr}"
-		cmd6="${cmd6} -s ${ip6addr}"
-	fi
-elif [ "${incoming_rule}" = "port_only" ]; then
-	if [ -n "${port}" ]; then
-		cmd="${cmd} --dport ${port}"
-		cmd6="${cmd6} --dport ${port}"
-	fi
-else
-	if [ -n "${ipaddr}" ]; then
-		cmd="${cmd} -s ${ipaddr}"
-		cmd6="${cmd6} -s ${ip6addr}"
-	fi
-
-	if [ -n "${port}" ]; then
-		cmd="${cmd} --dport ${port}"
-		cmd6="${cmd6} --dport ${port}"
-	fi
-fi
-
-echo ${cmd}|grep -q "\-\-dport \|\-s "
-if [ "$?" -eq 0 ]; then
-	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
-	${cmd}
-fi
-
-echo ${cmd6}|grep -q "\-\-dport \|\-s "
-if [ "$?" -eq 0 ]; then
-	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
-	${cmd6}
-fi
-
-uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
-uci -c /var/state -q commit cwmp
+#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
@@ -0,0 +1,87 @@
+#!/bin/sh
+
+. /lib/functions/network.sh
+
+[ "$ACTION" == "ifup" ] || exit 0
+
+[ -f /etc/config/cwmp ] || exit 0
+
+handle_icwmp_restart() {
+	[ -f /tmp/switching_mode ] && exit 0
+	[ -f /tmp/wificontrol.txt -a -f /tmp/netmode-conf.pid ] && exit 0
+
+	[ "$INTERFACE" == "loopback" ] && exit 0
+
+	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
+	[ -n "$defwan" -a "$(uci -q get network.$defwan)" == "interface" -a "$defwan" != "$INTERFACE" ] && exit 0
+
+	local islan="$(uci -q get network.$INTERFACE.is_lan)"
+	[ "$islan" == "1" ] && exit 0
+
+	local proto="$(uci -q get network.$INTERFACE.proto)"
+	[ "$proto" == "none" ] && exit 0
+
+	local ifname="$(uci -q get network.$INTERFACE.ifname)"
+	[ "${ifname:0:1}" == "@" ] && exit 0
+
+	mkdir -p /tmp/ipv4
+
+	network_flush_cache
+
+	local previpaddr=""
+	local curipaddr=""
+	local ipaddrfile=/tmp/ipv4/$INTERFACE-ipaddr
+	previpaddr=$(cat $ipaddrfile 2>/dev/null)
+	network_get_ipaddr curipaddr $INTERFACE
+	[ -n "$curipaddr" ] && echo $curipaddr > $ipaddrfile || rm -f $ipaddrfile
+
+	local prevgateway=""
+	local curgateway=""
+	local gatewayfile=/tmp/ipv4/$INTERFACE-gateway
+	prevgateway=$(cat $gatewayfile 2>/dev/null)
+	network_get_gateway curgateway $INTERFACE
+	[ -n "$curgateway" ] && echo $curgateway > $gatewayfile || rm -f $gatewayfile
+
+	local prevsubnets=""
+	local cursubnets=""
+	local subnetsfile=/tmp/ipv4/$INTERFACE-subnets
+	prevsubnets=$(cat $subnetsfile 2>/dev/null)
+	network_get_subnets cursubnets $INTERFACE
+	[ -n "$cursubnets" ] && echo $cursubnets > $subnetsfile || rm -f $subnetsfile
+
+	local prevdnsservers=""
+	local curdnsservers=""
+	local dnsserverfile=/tmp/ipv4/$INTERFACE-dnsservers
+	prevdnsservers=$(cat $dnsserverfile 2>/dev/null)
+	network_get_dnsserver curdnsservers $INTERFACE
+	[ -n "$curdnsservers" ] && echo $curdnsservers > $dnsserverfile || rm -f $dnsserverfile
+
+	local prevdev=""
+	local curdev=""
+	local devfile=/tmp/ipv4/$INTERFACE-dev
+	prevdev=$(cat $devfile 2>/dev/null)
+	network_get_device curdev $INTERFACE
+	[ -n "$curdev" ] && echo $curdev > $devfile || rm -f $devfile
+
+	local prevopt43url=""
+	local curopt43url=""
+	local opt43urlfile=/tmp/ipv4/$INTERFACE-opt43url
+	prevopt43url=$(cat $opt43urlfile 2>/dev/null)
+	curopt43url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
+	[ -n "$curopt43url" ] && echo $curopt43url > $opt43urlfile || rm -f $opt43urlfile
+
+	[ \
+		"$prevdev" == "$curdev" -a \
+		"$previpaddr" = "$curipaddr" -a \
+		"$prevgateway" = "$curgateway" -a \
+		"$prevsubnets" = "$cursubnets" -a \
+		"$prevdnsservers" = "$curdnsservers" \
+	] && {
+		[ "$prevopt43url" = "$curopt43url" ] &&	exit 0
+		[ -z "$prevopt43url" ] && exit 0
+	}
+
+	/etc/init.d/icwmpd reload &
+}
+
+handle_icwmp_restart
--- a/icwmp/files/etc/icwmpd/update.sh
+++ b/icwmp/files/etc/icwmpd/update.sh
@@ -1,43 +0,0 @@
-#!/bin/sh
-
-log() {
-	echo $@ |logger -t cwmp.update -p info
-}
-
-handle_icwmp_update() {
-	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
-	local vendorspecinf=`ifstatus ${defwan} | jsonfilter -e "@.data.vendorspecinf"`
-
-	log "Handling dhcp option value ${vendorspecinf}"
-	[ -n "$vendorspecinf" ] && {
-		local url=""
-		local old_url="$(uci -q get cwmp.acs.dhcp_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 [ -n "$url" ]; then
-			log "## icwmp url[${old_url}] changed to [${url}]"
-			if [ "${url}" != "${old_url}" ]; then
-				log "Restarting icwmp url[${old_url}] changed to [${url}]"
-				uci -q set cwmp.acs.dhcp_url="$url"
-				uci commit cwmp
-				ubus call uci commit '{"config":"cwmp"}'
-			fi
-		fi
-	}
-}
-
-handle_icwmp_update
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -6,41 +6,125 @@ include /lib/network
 . /usr/share/libubox/jshn.sh

 START=99
-STOP=2
+STOP=10

 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"

+EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
+
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }

-enable_dhcp_option43() {
-	local wan="${1}"
+validate_url() {
+	# SCHEMA_LIST: contain list of possible schemas that could be present in the acs url
+	# Example: SCHEMA_LIST="http https"
+	SCHEMA_LIST="http"

-	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local proto="$(uci -q get network.$wan.proto)"
-	local newreqopts=""
-	local option43_present=0
-
-	for ropt in $reqopts; do
-		case $ropt in
-			43) option43_present=1 ;;
-			*) ;;
-		esac
+	for schema in $SCHEMA_LIST;	do
+		dest=`echo $1 | sed 's/$schema:\/\///g' | cut -f1 -d \/ | cut -f1 -d:`
+		if [ "_$dest" != "_" ]; then
+			return 0
+		fi
 	done
+	return 1
+}

-	if [ ${option43_present} -eq 1 ]; then
-		return;
+get_acs_url() {
+	local default_acs="http://10.10.1.6:8000/openacs/acs"
+	local acs_dhcp_discovery="$(uci -q get cwmp.acs.dhcp_discovery)"
+	local url="$(uci -q get cwmp.acs.url)"
+	local dhcp_url="$(uci -P /var/state -q get cwmp.acs.dhcp_url)"
+
+	if [ "$acs_dhcp_discovery" == "enable" -a -n "$dhcp_url" -o -z "$url" ]; then
+		url="$dhcp_url"
+		log "ACS URL from DHCP server: $url"
+		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url" || url="$default_acs"
+	elif [ -n "$url" ];then
+		url="$(uci -q get cwmp.acs.url)"
+		log "ACS URL from configuration: $url"
+	else
+		url="$default_acs"
+		log "Using default ACS URL: $url"
+		[ -n "$url" ] && uci -P /var/state -q set cwmp.acs.url="$url"
 	fi

-	newreqopts="$reqopts 43"
+	validate_url "$url"
+	if [ "$?" != "0" ];then
+		echo "Invalid ACS URL: $url"
+		exit 1
+	fi
+}
+
+enable_dhcp_option43() {
+	local wan=$1
+	local discovery=0
+	case $2 in
+		enable|1) discovery=1 ;;
+	esac
+
+	### Ask for DHCP Option 43 only if CWMP is enabled ###
+	local enabled
+	local newreqopts=
+	local baseopts=
+	local reqopts="$(uci -q get network.$wan.reqopts)"
+	local proto="$(uci -q get network.$wan.proto)"
+	local tropts="43"
+	local oldreqopts="$reqopts"
+	local ropt iopt
+	for ropt in $reqopts; do
+		case $ropt in
+			43) ;;
+			*) baseopts="$baseopts $ropt" ;;
+		esac
+	done
+	ropt=""
+	reqopts="$baseopts $tropts"
+	for ropt in $reqopts; do
+		case $ropt in
+			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
+			*) newreqopts="$newreqopts $ropt" ;;
+		esac
+	done
 	if [ $proto == "dhcp" ]; then
+		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		[ "$newreqopts" == "$oldreqopts" ] && return
 		uci -q set network.$wan.reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
 	fi
+	########################################################
+}
+
+wait_for_option43() {
+	local time=$1
+	local default_wan_interface dhcp_discovery url
+
+	config_get default_wan_interface cpe default_wan_interface "wan"
+	config_get dhcp_discovery acs dhcp_discovery "0"
+	config_get url acs url
+
+	enable_dhcp_option43 $default_wan_interface $dhcp_discovery
+
+	local tm=0
+
+	if [ "$dhcp_discovery" == "enable" -o "$dhcp_discovery" == "1" ]
+	then
+		log "Waiting for discovery of ACS URL from dhcp server ..."
+		while [ $tm -le $time ]
+		do
+			acs_url=`uci -P /var/state -q get cwmp.acs.dhcp_url`
+			if [ "$acs_url" != "" ]
+			then
+				break
+			else
+				sleep 1
+			fi
+			tm=$((tm+1))
+		done
+	fi
 }

 wait_for_resolvfile() {
@@ -58,215 +142,55 @@ wait_for_resolvfile() {
 }

 set_wan_interface() {
-	local wan_interface="${1}"
 	local l3_device=""
+	local default_wan_interface=""

-	if [ -z "${wan_interface}" ]; then
-		return 0;
-	fi
-
-	json_load "$(ifstatus ${wan_interface})"
+	config_get default_wan_interface cpe default_wan_interface "wan"
+	json_load "$(ifstatus $default_wan_interface)"
 	json_get_var l3_device l3_device
-	if [ -n "$l3_device" ]; then
-		uci -q set cwmp.cpe.interface="${l3_device}"
+	if [ "$l3_device" != "" ];then
+		uci -q set cwmp.cpe.interface="$l3_device"
 		uci -q commit cwmp
 	fi
 }

-copy_cwmp_etc_files_to_varstate() {
-	if [ ! -f /var/state/cwmp ]
-	then
-		if [ -f /etc/icwmpd/cwmp ]
-		then
-			uci -q -c /etc/icwmpd delete cwmp.acs
-			uci -q -c /etc/icwmpd commit cwmp
-			cp /etc/icwmpd/cwmp /var/state/cwmp
-		else
-			touch /var/state/cwmp
-		fi
-	fi
-
-	mkdir -p /var/run/icwmpd
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
-	then
-		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
-	fi
-	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]
-	then
-		mv /etc/icwmpd/dm_enabled_notify /var/run/icwmpd 2>/dev/null
-	fi
-}
-
-copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/state/cwmp ]
-	then
-		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
-	fi
-	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]
-	then
-		cp /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
-	fi
-	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]
-	then
-		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
-	fi
-}
-
-validate_acs_section()
-{
-	uci_validate_section cwmp acs "acs" \
-		'passwd:string' \
-		'periodic_inform_enable:bool' \
-		'periodic_inform_interval:uinteger' \
-		'periodic_inform_time:string' \
-		'url:string' \
-		'dhcp_url:string' \
-		'compression:or("GZIP","Deflate","Disabled")' \
-		'retry_min_wait_interval:range(1, 65535)' \
-		'retry_interval_multiplier:range(1000, 65535)' \
-		'https_ssl_capath:file' \
-		'ipv6_enable:bool'
-
-}
-
-validate_cpe_section()
-{
-	uci_validate_section cwmp cpe "cpe" \
-		'interface:string' \
-		'default_wan_interface:string' \
-		'log_to_console:or("enable","disable")' \
-		'log_to_file:or("enable","disable")' \
-		'log_severity:or("EMERG", "ALERT", "CRITIC" ,"ERROR", "WARNING", "NOTICE", "INFO", "DEBUG")' \
-		'log_file_name:string' \
-		'log_max_size:uinteger' \
-		'userid:string' \
-		'passwd:string' \
-		'port:uinteger' \
-		'provisioning_code:string:""' \
-		'amd_version:range(1, 6)' \
-		'instance_mode:or("InstanceNumber","InstanceAlias")' \
-		'session_timeout:uinteger' \
-		'notification:bool' \
-		'exec_download:bool' \
-		'periodic_notify_enable:bool' \
-		'enable:bool' \
-		'periodic_notify_interval:uinteger'
-}
-
-validate_defaults() {
-	config_load cwmp
-
-	validate_acs_section || {
-		log "Validation of acs section failed"
-		return 1;
-	}
-
-	[ -z "${url}" -a -z "${dhcp_url}" ] && {
-		log "ACS url is empty can't start"
-		return 1;
-	}
-
-	validate_cpe_section || {
-		log "Validation of cpe section failed"
-		return 1;
-	}
-
-	[ -z "${default_wan_interface}" ] && {
-		log "Wan interface is empty"
-		return 1;
-	}
-
-	return 0;
-}
-
-boot() {
-	local dhcp_url=""
-	local discovery="1"
-
-	config_load cwmp
-	config_get_bool dhcp_discovery acs dhcp_discovery 1
-	config_get dhcp_url acs dhcp_url ""
-
-	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
-		if [ -z "${dhcp_url}" ]; then
-			log "dhcp discovery enabled but no dhcp url, trigger update"
-			/etc/icwmpd/update.sh
-		fi
-	fi
-	start
-}
-
 start_service() {
-	local enable_cwmp
-	local wan_interface
-	local dhcp_discovery
+	if [ ! -f /tmp/.icwmpd_boot ]; then
+		touch /etc/icwmpd/.icwmpd_boot
+		touch /tmp/.icwmpd_boot
+	else
+		[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
+		[ -f /etc/config/wireless ] && log "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
+		[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
+		[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
+		[ -f /usr/sbin/asterisk ] && log "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk

-	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-	config_get dhcp_discovery acs dhcp_discovery
-	config_get wan_interface cpe default_wan_interface "wan"
+		config_load cwmp
+		set_wan_interface
+		wait_for_option43 20
+		get_acs_url

-	if [ "$enable_cwmp" = "0" -o "$enable_cwmp" = "false" ]; then
-		log "CWMP is not enabled"
-		return 0
+		procd_open_instance icwmp
+		procd_set_param command "$PROG"
+		if [ "$1" = "GetRPCMethods" ];then
+			procd_append_param command -g
+		elif [ -f /etc/icwmpd/.icwmpd_boot ]; then
+			procd_append_param command -b
+		fi
+		procd_set_param respawn \
+			${respawn_threshold:-5} \
+			${respawn_timeout:-10} ${respawn_retry:-3}
+			
+		procd_close_instance
 	fi
-
-	# Set wan interface if not configured
-	set_wan_interface "${wan_interface}"
-
-	# Set dhcp option 43 if dhcp discovery enabled
-	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
-		enable_dhcp_option43 "${wan_interface}"
-	fi
-
-	[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
-	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-
-	# Copy backup data so that if it restart latter on it gets the info
-	copy_cwmp_etc_files_to_varstate
-
-	validate_defaults || {
-		log "Validation of defaults failed"
-		return 1;
-	}
-
-	procd_open_instance icwmp
-	procd_set_param command "$PROG"
-	procd_append_param command -b
-	procd_set_param respawn \
-		${respawn_threshold:-5} \
-		${respawn_timeout:-10} ${respawn_retry:-3}
-
-	procd_set_param watch network.interface
-	procd_close_instance
-}
-
-stop_service()
-{
-	copy_cwmp_varstate_files_to_etc
 }

 reload_service() {
-	log "Restarting CWMP client"
 	stop
 	start
 }

 service_triggers() {
-       procd_add_reload_trigger "cwmp"
-
-       procd_open_trigger
-               json_add_array
-                       json_add_string "" "interface.update"
-                       json_add_array
-                               json_add_array
-                                       json_add_string "" "run_script"
-                                       json_add_string "" "/etc/icwmpd/update.sh"
-                               json_close_array
-                       json_close_array
-                       json_add_int "" "2000"
-               json_close_array
-       procd_close_trigger
+	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
 }

--- a/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
+++ b/icwmp/files/etc/uci-defaults/85-cwmp-set-userid
@@ -1,18 +1,18 @@
 # Copy defaults by the factory to the cwmp UCI user section.

-# Get Manufacturer OUI.
-oui=$(uci -q get cwmp.cpe.manufacturer_oui)
-if [ -z "${oui}" ]; then
-	oui=$(db -q get device.deviceinfo.ManufacturerOUI)
-fi

-oui=$(echo "${oui}" | tr 'a-f' 'A-F')
+# Get factory base MAC.
+baseMac=$(db -q get hw.board.basemac)
+
+# Erase colon and space characters.
+baseMac=${baseMac//:/}
+baseMac=${baseMac// /}
+
+# Caseing and fixed length string.
+mac=$(printf "%12.12X" $((0x$baseMac)))

 # Get system serial number.
-serial=$(uci -q get cwmp.cpe.serial_number)
-if [ -z "${serial}" ]; then
-	serial=$(db -q get device.deviceinfo.SerialNumber)
-fi
+serial=$(db -q get hw.board.serial_number)

 # Get userid values
 acs_userid=$(uci -q get cwmp.acs.userid)
@@ -21,12 +21,12 @@ cpe_userid=$(uci -q get cwmp.cpe.userid)
 # Only set if they are empty
 if [ -z "$acs_userid" ]
 then
-    uci -q set cwmp.acs.userid="${oui}-${serial}"
+    uci -q set cwmp.acs.userid="${mac:0:6}-${serial}"
 fi

 if [ -z "$cpe_userid" ]
 then
-    uci -q set cwmp.cpe.userid="${oui}-${serial}"
+    uci -q set cwmp.cpe.userid="${mac:0:6}-${serial}"
 fi

 # No need for commit here, it is done by uci_apply_defaults().
--- a/icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts
+++ b/icwmp/files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts
@@ -0,0 +1,54 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+set_cwmp_reqopts() {
+	### Ask for DHCP Option 43 only if CWMP is enabled ###
+	local wan=$(uci -q get cwmp.cpe.default_wan_interface)
+	local dhcp_discovery=$(uci -q get cwmp.acs.dhcp_discovery)
+	local discovery=0
+	case $dhcp_discovery in
+		enable|1) discovery=1 ;;
+	esac
+
+	local newreqopts=
+	local baseopts=
+	local reqopts="$(uci -q get network.$wan.reqopts)"
+	local proto="$(uci -q get network.$wan.proto)"
+	local tropts="43"
+	local oldreqopts="$reqopts"
+	local ropt iopt
+	for ropt in $reqopts; do
+		case $ropt in
+			43) ;;
+			*) baseopts="$baseopts $ropt" ;;
+		esac
+	done
+	ropt=""
+	reqopts="$baseopts $tropts"
+	for ropt in $reqopts; do
+		case $ropt in
+			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
+			*) newreqopts="$newreqopts $ropt" ;;
+		esac
+	done
+	if [ "$proto" == "dhcp" ]; then
+		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
+		[ "$newreqopts" == "$oldreqopts" ] && return
+		uci -q set network.$wan.reqopts="$newreqopts"
+		uci commit network
+	fi
+}
+
+regenerate_ssl_link(){
+	local cert_dir="/etc/ssl/certs"
+	local all_file=$(ls $cert_dir/*.pem)
+	for cfile in $all_file
+	do
+		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
+	done
+}
+
+set_cwmp_reqopts
+regenerate_ssl_link
--- a/icwmp/files/etc/uci-defaults/95-icwmp-generate-ssl
+++ b/icwmp/files/etc/uci-defaults/95-icwmp-generate-ssl
@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-regenerate_ssl_link(){
-	[ ! -d "/etc/ssl/certs" ] && return 0;
-	[ ! -f "/etc/ssl/certs/*.pem" ] && return 0;
-
-	local cert_dir="/etc/ssl/certs"
-	local all_file=$(ls $cert_dir/*.pem)
-
-	for cfile in $all_file
-	do
-		ln -s $cfile $cert_dir/$(openssl x509 -hash -noout -in $cfile).0
-	done
-}
-
-regenerate_ssl_link
--- a/icwmp/files/lib/upgrade/keep.d/icwmp
+++ b/icwmp/files/lib/upgrade/keep.d/icwmp
@@ -1 +1 @@
-/var/run/icwmpd/icwmpd_backup_session.xml
+/etc/icwmpd/.icwmpd_backup_session.xml
--- 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/Config.in
+++ b/ieee1905/Config.in
@@ -6,9 +6,5 @@ config IEEE1905_EXTENSION_ALLOWED
 	bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
 	default y

-config IEEE1905_PLATFORM_HAS_WIFI
-	bool "Platform has WiFi"
-	default y if PACKAGE_libwifi
-
 endmenu
 endif
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

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

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=373602c3644ead5c61aece58e1f88f52838bb38b
+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
@@ -37,23 +37,23 @@ endef
 define Package/libieee1905
 $(call Package/ieee1905/Default,$(1))
  TITLE+= (library for CMDU and TLV handling)
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
 	   +libjson-c +libblobmsg-json
 endef

 define Package/ieee1905
 $(call Package/ieee1905/Default,$(1))
  TITLE+= ieee1905d (daemon implementing 1905.1 and provides cli)
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +ubus +libpthread \
-	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+	   +libjson-c +libblobmsg-json +libwifi +ubus +libpthread \
+	   +libnl-genl +libieee1905
 endef


 define Package/map-plugin
 $(call Package/ieee1905/Default,$(1))
  TITLE:=Multi-AP (Easymesh) plugin
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef

@@ -70,10 +70,6 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

-ifeq ($(CONFIG_IEEE1905_PLATFORM_HAS_WIFI),y)
-TARGET_CFLAGS += -DHAS_WIFI
-endif
-
 MAKE_PATH:=src


@@ -102,9 +98,8 @@ define Build/InstallDev/map-plugin
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map2.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map22.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module22.h
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
 endef
@@ -115,7 +110,6 @@ define Build/InstallDev/libieee1905
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/src/cmdu_ackq.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
@@ -129,11 +123,6 @@ define Build/InstallDev
 	$(call Build/InstallDev/map-plugin,$(1),$(2))
 endef

-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/ieee1905/ $(PKG_BUILD_DIR)/
-endef
-endif

 $(eval $(call BuildPackage,ieee1905))
 $(eval $(call BuildPackage,libieee1905))
--- a/iop/config
+++ b/iop/config
@@ -1,3 +1,4 @@
+CONFIG_BUILD_NLS=y
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
@@ -17,6 +18,7 @@ CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
 CONFIG_PACKAGE_ethtool=y
 CONFIG_PACKAGE_getopt=y
+CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_gre=y
 CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_ieee1905=y
@@ -24,7 +26,6 @@ CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_wfadatad=y
-CONFIG_PACKAGE_wfadatad-collector=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_ip-full=y
@@ -188,6 +189,8 @@ CONFIG_LIBCURL_CRYPTO_AUTH=y
 CONFIG_LIBCURL_OPENSSL=y
 CONFIG_OPENVPN_openssl_ENABLE_IPROUTE2=y
 # CONFIG_SIGNED_PACKAGES is not set
+CONFIG_KERNEL_DEVTMPFS=y
+CONFIG_KERNEL_DEVTMPFS_MOUNT=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
 CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"

@@ -216,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"
@@ -13,9 +14,12 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_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"

@@ -111,15 +115,21 @@ function genconfig {
 			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 ] &&
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $bcm27xx/genconfig ] &&
+			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)

 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_mediatek iopsys_econet iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -144,6 +154,14 @@ function genconfig {
 		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"
@@ -152,6 +170,14 @@ function genconfig {
 		fi
 	    done

+	    for p in $iopsys_intel_mips; do
+		if [ $p == $profile ]; then
+		    target="intel_mips"
+			target_config_path="$intel_mips/config"
+		    return
+		fi
+	    done
+
 	    for p in $iopsys_x86; do
 		if [ $p == $profile ]; then
 		    target="iopsys_x86"
@@ -167,10 +193,25 @@ function genconfig {
 		    return
 		fi
 	    done
+
+	    for p in $iopsys_bcm27xx; do
+		if [ $p == $profile ]; then
+		    target="iopsys_bcm27xx"
+			target_config_path="$bcm27xx/config"
+		    return
+		fi
+	    done
+
 	}

 	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() {
@@ -203,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
@@ -220,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"
@@ -274,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()
@@ -318,16 +366,37 @@ function genconfig {
 		    echo "" >> .config
 		fi

-		# Special handling for targets which use TARGET_DEVICES 
-		if [ "$target" = "iopsys_ramips" ]; then
+		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
+		if [ "$target" = "intel_mips" ]; then
+			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
+			echo "CONFIG_TARGET_${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
+			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
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -346,6 +415,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
@@ -361,14 +435,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 ?
@@ -376,8 +447,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,12 +9,14 @@ 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"
-	econet="target/linux/iopsys-econet"
+	intel_mips="target/linux/intel_mips"
 	x86="target/linux/iopsys-x86"
 	armvirt="target/linux/iopsys-armvirt"

@@ -78,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

@@ -100,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
@@ -110,15 +112,17 @@ function genconfig_min {
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $econet/genconfig ] &&
-			iopsys_econet=$(cd $econet; ./genconfig)
+		[ -e $intel_mips/genconfig ] &&
+			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
 		[ -e $x86/genconfig ] &&
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
+		[ -e $bcm27xx/genconfig ] &&
+			iopsys_bcm27xx=$(cd $bcm27xx; ./genconfig)

 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; 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"
@@ -130,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
@@ -138,15 +142,15 @@ function genconfig_min {
 	    for p in $iopsys_ramips; do
 		if [ $p == $profile ]; then
 		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
+			config_path="$ramips/config"
 		    return
 		fi
 	    done

-	    for p in $iopsys_econet; do
+	    for p in $iopsys_intel_mips; do
 		if [ $p == $profile ]; then
-		    target="iopsys_econet"
-			target_config_path="$econet/config"
+		    target="intel_mips"
+			config_path="$intel_mips/config"
 		    return
 		fi
 	    done
@@ -154,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
@@ -162,13 +166,22 @@ 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
+
+	    for p in $iopsys_bcm27xx; do
+		if [ $p == $profile ]; then
+		    target="iopsys_bcm27xx"
+		        config_path="$bcm27xx/config"
+		    return
+		fi
+	    done
+
 	}

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

 		bcmAllowed=0
@@ -197,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
 	}
@@ -248,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()
@@ -300,25 +312,35 @@ 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 targets which use TARGET_DEVICES
-		if [ "$target" = "iopsys_ramips" ]; then
+		#special handling for intel_mips/iopsys_ramips which use TARGET_DEVICES
+		if [ "$target" = "intel_mips" ]; then
+			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_econet" ]; then
-			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
+                        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
@@ -340,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

@@ -431,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/iop/scripts/install_key.sh
+++ b/iop/scripts/install_key.sh
@@ -1,29 +1,12 @@
 # this is a developer helper script to install the public ssh key in the created image

-DROPBEAR_AUTHORIZED_KEYS_FILE=/etc/dropbear/authorized_keys
-
-function get_ssh_public_keys {
-    (
-        shopt -s nullglob
-        # home directory, not all of those are supported by dropbear,
-        # but let's include them now already to decrease future maintenance
-        cat /dev/null ~/.ssh/{id_rsa,id_dsa,id_ecdsa,id_ecdsa_sk,id_ed25519,id_ed25519_sk,id_xmss}.pub 2> /dev/null
-        # keys added manually or automatically to the build dir
-        cat "files${DROPBEAR_AUTHORIZED_KEYS_FILE}" 2>/dev/null
-        # keys in the agent (useful when using SSH agent forwarding)
-        ssh-add -L 2> /dev/null
-    ) | sort | uniq
-}
-
 function install_key {
-    local build_dir_dropbear_authorized_keys_file="files${DROPBEAR_AUTHORIZED_KEYS_FILE}"
-    mkdir -p "$(dirname "$build_dir_dropbear_authorized_keys_file")"
-    get_ssh_public_keys > "$build_dir_dropbear_authorized_keys_file"
-    chmod 0644 "$build_dir_dropbear_authorized_keys_file"
-    echo "Keys in "$build_dir_dropbear_authorized_keys_file" are now:"
-    cat "$build_dir_dropbear_authorized_keys_file"
-    echo
-    echo "Disabling login on serial console..."
+
+    mkdir -p files/etc/dropbear
+    test -e ~/.ssh/id_dsa.pub && cat ~/.ssh/id_dsa.pub >>files/etc/dropbear/authorized_keys
+    test -e ~/.ssh/id_rsa.pub && cat ~/.ssh/id_rsa.pub >>files/etc/dropbear/authorized_keys
+    chmod 0644 files/etc/dropbear/authorized_keys
+
    echo "::sysinit:/etc/init.d/rcS S boot" >files/etc/inittab
    echo "::shutdown:/etc/init.d/rcS K shutdown" >>files/etc/inittab
    echo "console::askconsolelate:/bin/cttyhack /bin/ash --login" >>files/etc/inittab
@@ -31,25 +14,4 @@ function install_key {
    echo Done
 }

-function ssh_install_key_help() {
-    echo Usage: $0 ssh_install_key HOSTNAME
-    echo
-    echo "Installs SSH public keys to a device's authorized_keys file"
-}
-
-
-# this is a developer helper script to install the public ssh key on host running dropbear
-function ssh_install_key {
-    if [ $# -ne 1 ] || [ "$1" == '--help' ]; then
-        ssh_install_key_help
-        [ $# -eq 1 ]; return
-    fi
-    host="$1"
-    local keys="$(get_ssh_public_keys)"
-    echo "Adding the following keys to $DROPBEAR_AUTHORIZED_KEYS_FILE on $host:"
-    echo "$keys"
-    ssh root@$host "echo '$keys' >> '$DROPBEAR_AUTHORIZED_KEYS_FILE'" && echo ok
-}
-
-register_command "ssh_install_key" "Install the users public ssh key on host running dropbear"
 register_command "install_key" "Install the user's public ssh key in the created image"
--- a/iop/scripts/ssh_install_key.sh
+++ b/iop/scripts/ssh_install_key.sh
@@ -0,0 +1,17 @@
+# this is a developer helper script to install the public ssh key on host running dropbear
+
+function ssh_install_key {
+	if [ -e ~/.ssh/id_rsa.pub ]; then
+		echo "Adding public RSA key to $1"
+		KEY=`cat ~/.ssh/id_rsa.pub`
+	elif [ -e ~/.ssh/id_dsa.pub ]; then
+		echo "Adding public DSA key to $1"
+		KEY=`cat ~/.ssh/id_dsa.pub`
+	else
+		echo "No public key found"
+		exit 1
+	fi
+	ssh root@$1 "echo '$KEY' >> /etc/dropbear/authorized_keys" && echo ok
+}
+
+register_command "ssh_install_key" "Install the users public ssh key on host running dropbear"
--- 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,21 +5,20 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=6.6.2
+PKG_VERSION:=5.0.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=ca0a34926e155338964ff55f8c9e28a80b38bc78
+PKG_SOURCE_VERSION:=9dd2e8f541a48037d3cff10052cccee287b800a8
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE

-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-agent
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-agent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
-endif
+
+PKG_BUILD_DEPENDS:=map-plugin

 include $(INCLUDE_DIR)/package.mk

@@ -31,24 +30,10 @@ define Package/map-agent
 	  +map-plugin
 endef

-
-define Package/dynbhd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Dynamic Backhaul Daemon
-  DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	  +map-plugin +map-agent
-endef
-
-
 define Package/map-agent/description
 This package implements EasyMesh R2 compliant WiFi Agent.
 endef

-define Package/dynbhd/description
- Dyanmic LAN/WAN port detection and loop avoidance.
-endef
-
 define Package/map-agent/config
 	#source "$(SOURCE)/Config.in"
 endef
@@ -68,21 +53,4 @@ define Package/map-agent/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef

-define Package/dynbhd/install
-	$(INSTALL_DIR) $(1)/etc
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/lib/wifi/dynbhd
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/ethernet
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/dynbhd $(1)/usr/sbin/dynbhd
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/api $(1)/lib/wifi/dynbhd/api
-#	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/dynbh/map-dynamic-backhaul $(1)/etc/hotplug.d/ethernet/map-dynamic-backhaul
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/map-agent/ $(PKG_BUILD_DIR)/
-endef
-endif
-
 $(eval $(call BuildPackage,map-agent))
-$(eval $(call BuildPackage,dynbhd))
--- a/map-agent/files/etc/config/mapagent
+++ b/map-agent/files/etc/config/mapagent
@@ -4,7 +4,7 @@ config agent 'agent'
 	option profile '2'
 	option al_bridge 'br-lan'

-#config ap
+#config fh-iface
 #	option ifname 'wl0'
 #	option steer 'rssi bssload'
 #	list exclude '00:11:22:33:44:55'
@@ -17,17 +17,15 @@ config agent 'agent'
 #	option steer_legacy_retry_secs '3600'
 #	option assoc_ctrl_secs '30'
 #	option band '2'
-#	option type 'fronthaul'

-#config ap
+#config fh-iface
 #	option ifname 'wl1'
 #	option steer 'rssi bssload'
 #	list exclude '00:11:22:33:44:55'
 #	list exclude_btm '00:aa:bb:cc:dd:ee'
 #	option band '5'
-#	option type 'fronthaul'

-#config bsta
+#config bk-iface
 #	option ifname 'apclii0'
 #	option enabled '1'
 #	option onboarded '0'
--- a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
+++ b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
@@ -1,49 +0,0 @@
-#!/bin/sh
-
-wan=$(db -q get hw.board.ethernetWanPort)
-MAPFILE="/tmp/multiap.backhaul"
-
-
-[ -z "$wan" ] && exit 1 # no configuration
-[ "$PORT" != "$wan" ] && exit 0
-
-remove_from_bridge() {
-	config_get ifname "$section" ifname
-
-	ubus call network.interface.$bridge remove_device '{"name":"$ifname"}'
-}
-
-update_bstas() {
-	local section="$1"
-	local action="$2"
-	local ifname onboarded
-
-	config_get ifname "$section" ifname
-	config_get_bool enabled "$section" enabled 0
-
-	if [ "$action" = "down" ]; then
-		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" disable_network 0  > /dev/null 2>&1
-#		wpa_cli -i "$ifname" save_config  > /dev/null 2>&1
-	elif [ "$action" = "up" ]; then
-		[ "$enabled" -eq 0 ] && return
-		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" enable_network 0  > /dev/null 2>&1
-#		wpa_cli -i "$ifname" save_config  > /dev/null 2>&1
-	fi
-}
-
-if [ "$LINK" = "up" ]; then
-	#touch "$MAPFILE"
-
-	config_load "mapagent"
-	bridge=$(uci get mapagent.agent.al_bridge | cut -d '-' -f2)
-	config_foreach remove_from_bridge bsta $bridge
-	config_foreach update_bstas bsta down
-
-	/lib/wifi/multiap set_uplink "eth" "$PORT"
-else
-	rm -f "$MAPFILE"
-	config_load "mapagent"
-	config_foreach update_bstas bsta up
-fi
--- a/map-agent/files/etc/hotplug.d/ethernet/map-loop-detection
+++ b/map-agent/files/etc/hotplug.d/ethernet/map-loop-detection
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+wan=$(db -q get hw.board.ethernetWanPort)
+
+[ -z "$wan" ] && exit 1 # no configuration
+[ "$PORT" != "$wan" ] && exit 0
+
+update_bstas() {
+	local section="$1"
+	local action="$2"
+	local ifname onboarded
+
+	config_get ifname "$section" ifname
+	config_get_bool onboarded "$section" onboarded 0
+
+	[ "$onboarded" -eq 0 ] && return
+
+	wpa_cli -i "$ifname" "$action" > /dev/null 2>&1
+}
+
+if [ "$LINK" = "up" ]; then
+	touch /tmp/map.agent.bsta_global_disable
+	config_load "mapagent"
+	config_foreach update_bstas bk-iface disconnect
+else
+	rm -f /tmp/map.agent.bsta_global_disable
+	config_load "mapagent"
+	config_foreach update_bstas bk-iface reconnect
+fi
--- a/map-agent/files/etc/init.d/mapagent
+++ b/map-agent/files/etc/init.d/mapagent
@@ -5,60 +5,7 @@ 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_dynbhd_service() {
-	rm -f /tmp/map.agent.bsta_global_disable
-	procd_open_instance
-	procd_set_param command "/usr/sbin/dynbhd"
-	procd_set_param respawn
-#	procd_set_param stdout 1
-#	procd_set_param stderr 1
-	procd_close_instance
-}
-
 start_service() {
-	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
-
 	config_load "mapagent"

 	ubus -t 5 wait_for wifi
@@ -69,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
@@ -81,13 +24,9 @@ start_service() {
 	procd_close_instance
 }

-#stop_service() {
-#	remove_map
-#}
-
 service_triggers()
 {
-	procd_add_reload_trigger "mapagent"
+	procd_add_reload_trigger "ieee1905"
 }

 reload_service() {
--- a/map-agent/files/lib/wifi/multiap
+++ b/map-agent/files/lib/wifi/multiap
@@ -7,14 +7,8 @@
 # write_credentials - write bBSS credentials to fBSS

 . /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-. /lib/wifi/traffic_separation
-
-MAPFILE="/tmp/multiap.backhaul"

 diff=0
-onbrd_bssid=0
-onbrd_band=0

 usage() {
 	cat <<EOF
@@ -29,41 +23,12 @@ EOF
 	exit 1
 }

-
-type_to_multi_ap () {
-	type="$1"
-
-	if [ "$type" = "backhaul" ]; then
-		echo "1"
-		return
-	elif [ "$type" = "fronthaul" ]; then
-		echo "2"
-		return
-	elif [ "$type" = "combined" ]; then
-		echo "3"
-		return
-	fi
-
-	echo "0"
-}
-
-get_type_by_section() {
-	section="$1"
-
-	config_get type $section type "0"
-
-	echo "$(type_to_multi_ap $type)"
-}
-
 brcm_sync_credentials() {
 	bands=""
 	mapagent_process_fh() {
 		local section=$1
 		local dev=$2

-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
-
 		config_get device $section device

 		[ "$dev" != "$device" ] && return
@@ -76,10 +41,10 @@ brcm_sync_credentials() {
 		section=$(uci add ieee1905 ap)
 		[ "$section" == "" ] && return

-		uci -q set ieee1905.${section}.band=$band
-		uci -q set ieee1905.${section}.ssid="$ssid"
-		uci -q set ieee1905.${section}.encryption=$encryption
-		uci -q set ieee1905.${section}.key="$key"
+		uci set ieee1905.${section}.band=$band
+		uci set ieee1905.${section}.ssid=$ssid
+		uci set ieee1905.${section}.encryption=$encryption
+		uci set ieee1905.${section}.key=$key
 	}

 	mapagent_process_radio() {
@@ -97,7 +62,7 @@ brcm_sync_credentials() {
 			fi
 		done

-		config_foreach mapagent_process_fh ap $device
+		config_foreach mapagent_process_fh fh-iface $device
 		bands="$bands $band"
 	}

@@ -111,7 +76,7 @@ brcm_sync_credentials() {
 	config_foreach ieee1905_del_ap ap

 	config_load mapagent
-	config_foreach mapagent_process_radio radio
+	config_foreach mapagent_process_radio wifi-radio

 	uci commit ieee1905
 }
@@ -124,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

@@ -133,26 +98,24 @@ 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"
-
-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
+		local bk_ssid=$3
+		local bk_key=$4

 		config_get device $section device
+		config_get multi_ap $section multi_ap "0"

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

@@ -161,34 +124,30 @@ 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() {
 		local section=$1
 		local dev=$2

-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
-
 		config_get device $section device
-		config_get enabled $section enabled "1"
+		config_get multi_ap $section multi_ap "0"

 		#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 ap $dev "$ssid" "$key"
+		config_foreach mapagent_find_fbss fh-iface $dev $ssid $key
 	}

 	mapagent_process_radio() {
@@ -198,38 +157,21 @@ brcm_write_credentials() {

 		#echo found dev=$dev

-		config_foreach mapagent_find_bbss ap $device
+		config_foreach mapagent_find_bbss fh-iface $device
 	}


-	config_foreach mapagent_process_radio radio
+	config_foreach mapagent_process_radio wifi-radio

 	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() {
@@ -237,7 +179,6 @@ write_bsta_config() {

 	#echo diff = $diff > /dev/console

-
 	config_load mapagent

 	mapagent_apply_wl_bsta() {
@@ -250,7 +191,7 @@ write_bsta_config() {

 			[ "$bsta" == "$ifname" ] || return
 			#echo setting diff = $diff > /dev/console
-			uci -q set wireless.${section}.bssid=$bssid
+			uci set wireless.${section}.bssid=$bssid
 			echo 1
 		}
 		config_load wireless
@@ -263,7 +204,6 @@ write_bsta_config() {
 		local section=$1
 		local bsta=$2

-
 		config_get ifname $section ifname
 		#echo bsta = $bsta > /dev/console

@@ -271,469 +211,21 @@ write_bsta_config() {
 		#echo found ifname=$ifname > /dev/console

 		config_get bssid $section bssid
-		config_get band $section band
 		ret=$(mapagent_apply_wl_bsta $ifname $bssid)
-		[ "$ret" == "1" ] && {
-			diff=1
-			onbrd_bssid=$bssid
-			onbrd_band=$band
-		}
+		[ "$ret" == "1" ] && diff=1
 	}

-	mapagent_apply_bssid_same_band() {
-		apply_config() {
-			local section=$1
-			local bsta=$2

-			config_get ifname $section ifname
-
-			[ "$bsta" == "$ifname" ] || return
-			uci -q set wireless.${section}.bssid=$bssid
-		}
-
-		config_get band $1 band
-		config_get onboarded $1 onboarded "0"
-
-		[ "$onbrd_band" != "$band" -o "$onboarded" = "1" ] && return
-
-		config_get ifname $1 ifname
-
-		config_load wireless
-		config_foreach apply_config wifi-iface $ifname $onbrd_bssid
-		uci commit wireless
-	}
-
-	config_foreach mapagent_process_bk bsta $ifname
+	config_foreach mapagent_process_bk bk-iface $ifname

 	#echo result diff = $diff > /dev/console
 	[ "$diff" == "1" ] && {
-		config_foreach mapagent_apply_bssid_same_band bsta
 		ubus call uci commit '{"config":"wireless"}'
 		#echo reloading wireless > /dev/console
 	}

 }

-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
-
-		multi_ap=$(get_type_by_section $section)
-		[ "$multi_ap" == "0" ] && return
-
-		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 ap $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 bsta
-		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 bssid=$7
-				local disabled="0"
-
-				config_get ifname $section ifname
-
-				[ -z "$enabled" -o "$enabled" = "0" ] && disabled="1"
-
-				[ "$bsta" == "$ifname" ] || return
-
-				uci -q set wireless.${section}.ssid="$ssid"
-				uci -q set wireless.${section}.key="$key"
-				uci -q set wireless.${section}.encryption=$encryption
-				uci -q set wireless.${section}.bssid="$bssid"
-				#uci -q set wireless.${section}.disabled=$disabled
-
-				[ "$disabled" != "1" ] && return
-				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
-				wpa_cli -i "$bsta" disable_network 0 > /dev/null 2>&1
-				wpa_cli -i "$bsta" save_config > /dev/null 2>&1
-
-				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"
-			config_get bssid $1 bssid
-
-			echo $(mapagent_apply_wl_bsta $2 "$ssid" "$key" $encryption $4 "$bssid")
-		}
-
-		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 bsta $ifname $band $enabled
-		else
-			config_get ssid $1 ssid
-			config_get key $1 key
-			config_get encryption $1 encryption
-			config_get bssid $1 bssid
-
-			echo $(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
-		fi
-	}
-
-#	best=$(mapagent_find_lowest_prio_onboarded)
-#
-#	[ -z "$best" ] && return
-#
-#	band=$1
-#	sec=""
-#	prio=""
-#
-#	config_foreach mapagent_enable_best bsta $best
-#	uci commit mapagent
-	config_load mapagent
-
-	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
-
-#	[ "$diff" != "" ] && {
-		ubus call uci commit '{"config":"wireless"}'
-#	}
-}
-
-
-sync_mapcontroller_from_wireless() {
-	ubus -t 5 wait_for wifi
-	[ "$?" != "0" ] && return
-
-	[ ! -f "/etc/config/wireless" ] && return
-
-	status=$(ubus -S call wifi status)
-
-	device_to_band() {
-		local ifname=$1
-		json_load "$status"
-		json_select "radios"
-		json_get_keys keys
-
-		for key in $keys; do
-			json_select $key
-			json_get_var name name
-
-			if [ "$name" != "$ifname" ]; then
-				json_select ..
-				continue
-			fi
-
-			json_get_var band band
-
-			if [ "$band" == "5GHz" ]; then
-				echo "5"
-			elif [ "$band" == "2.4GHz" ]; then
-				echo "2"
-			fi
-
-			break
-		done
-
-		json_cleanup
-	}
-
-	wireless_process_iface() {
-		local section=$1
-		local type="ap"
-		local enabled="1"
-
-		config_get multi_ap $section multi_ap 0
-		[ "$multi_ap" != "1" ] && [ "$multi_ap" != "2" ] && return
-
-		config_get mode $section mode "ap"
-		[ "$mode" != "ap" ] && return
-
-		config_get device $section device
-		band=$(device_to_band $device)
-		[ "$band" == "" ] && return
-
-		config_get ssid $section ssid
-		config_get key $section key
-		config_get encryption $section encryption
-		config_get start_disabled $section start_disabled "0"
-		config_get network $section network
-
-
-		cntlr_section=$(uci add mapcontroller ${type})
-		uci -q set mapcontroller.${cntlr_section}.ssid="$ssid"
-		uci -q set mapcontroller.${cntlr_section}.key="$key"
-		uci -q set mapcontroller.${cntlr_section}.encryption="$encryption"
-		uci -q set mapcontroller.${cntlr_section}.band="$band"
-		uci -q set mapcontroller.${cntlr_section}.vid="1"
-		uci -q set mapcontroller.${cntlr_section}.network="$network"
-
-		[ "$multi_ap" == "1" ] && map_type="backhaul" || map_type="fronthaul"
-		uci -q set mapcontroller.${cntlr_section}.type="$map_type"
-
-		[ "$start_disabled" == "1" ] && enabled="0"
-		uci -q set mapcontroller.${cntlr_section}.enabled="$enabled"
-	}
-
-	mapcontroller_teardown() {
-		local section=$1
-
-		uci delete mapcontroller.$1
-	}
-
-	config_load mapcontroller
-	config_foreach mapcontroller_teardown ap
-
-	config_load wireless
-	config_foreach wireless_process_iface wifi-iface
-	uci commit mapcontroller
-}
-
-bsta_scan_on_enabled() {
-	config_load mapagent
-
-	mapagent_enable_bk() {
-		config_get ifname $1 ifname
-		config_get enabled $1 enabled
-
-		echo ifname $ifname enabled $enabled
-
-		[ "$enabled" = "0" ] && return
-
-		wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
-		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-	}
-
-	config_foreach mapagent_enable_bk bsta
-}
-
-bsta_enable_all() {
-	mapagent_enable_bk() {
-		config_get ifname $1 ifname "2"
-		uci -q set mapagent.$1.enabled="1"
-	}
-
-	config_load mapagent
-
-	config_foreach mapagent_enable_bk bsta
-	uci commit mapagent
-	bsta_scan_on_enabled
-}
-
-bsta_disable_lower_priority() {
-	config_load mapagent
-
-	mapagent_get_priority() {
-		config_get ifname $1 ifname
-
-		[ "$ifname" != "$2" ] && return
-
-		config_get priority $1 priority "2"
-
-		echo "$priority"
-	}
-
-	mapagent_disable_lower_bk() {
-		mapagent_apply_wl_bsta() {
-			apply_config() {
-				local section="$1"
-				local bsta="$2"
-				local enabled="$3"
-
-				config_get ifname $section ifname
-
-				[ "$bsta" == "$ifname" ] || return
-
-				[ "$enabled" != "0" ] && return
-
-				wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
-				wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
-				wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-			}
-			local ifname="$1"
-			local enabled="$2"
-
-			[ "$enabled" != "0" ] && return
-
-			config_load wireless
-
-			config_foreach apply_config wifi-iface $ifname $enabled
-		}
-
-		local enabled="1"
-
-		config_get ifname $1 ifname
-		config_get priority $1 priority
-
-		[ "$ifname" != "$2" -a "$priority" -gt "$3" ] && enabled="0"
-
-		uci -q set mapagent.$1.enabled="$enabled"
-
-		echo $(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
-	}
-
-	local bsta=$1
-
-	prio=$(config_foreach mapagent_get_priority bsta $bsta)
-	#echo bsta $bsta has prio $prio > /dev/console
-
-	config_foreach mapagent_disable_lower_bk bsta $bsta $prio
-	uci commit mapagent
-
-#	ubus call uci commit '{"config":"wireless"}'
-}
-
-
-bsta_use_link() {
-	config_load mapagent
-
-	mapagent_disable_bk() {
-		local bsta="$2"
-
-		config_get ifname $1 ifname
-		config_get enabled $1 enabled
-
-		[ "$bsta" = "$ifname" ] && return
-
-		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
-		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-	}
-
-	local bsta=$1
-
-	config_foreach mapagent_disable_bk bsta $bsta
-}
-
-bsta_swap_to_link() {
-	bsta_disable_lower_priority $1
-	bsta_use_link $1
-
-	wpa_cli -i "$1" enable_network 0 > /dev/null
-	wpa_cli -i "$1" reconnect > /dev/null
-	wpa_cli -i "$1" save_config > /dev/null
-}
-
-set_uplink_backhaul_info() {
-	local ul_1905id=$1
-	local ul_mac=$2
-
-	json_load "$(cat $MAPFILE)"
-	json_add_string "backhaul_device_id" "$ul_1905id"
-	json_add_string "backhaul_macddr" "$ul_mac"
-	json_dump > "$MAPFILE"
-	json_cleanup
-}
-
-set_uplink() {
-	local type=$1
-	local ifname=$2
-	local hwaddr
-
-	hwaddr="$(ifconfig $ifname | grep -i hwaddr | awk '{print $5}' | awk '{print tolower($0)}')"
-
-	json_init
-	json_add_string "type" "$type"
-	json_add_string "ifname" "$ifname"
-	json_add_string "macaddr" "$hwaddr"
-	json_dump > "$MAPFILE"
-	json_cleanup
-}
-
-unset_uplink() {
-	rm "$MAPFILE" > /dev/null 2>&1
-}
-
 func=$1
 shift

@@ -744,20 +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 $@;;
-	bsta_enable_all) bsta_enable_all $@;;
-	bsta_disable_lower_priority) bsta_disable_lower_priority $@;;
-	bsta_scan_on_enabled) bsta_scan_on_enabled $@;;
-	bsta_use_link) bsta_use_link $@;;
-	bsta_swap_to_link) bsta_swap_to_link $@;;
-	set_uplink) set_uplink $@;;
-	set_uplink_backhaul_info) set_uplink_backhaul_info $@;;
-	unset_uplink) unset_uplink $@;;
 	--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,20 +5,20 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=5.4.5
+PKG_VERSION:=3.0.11
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=99ef60cc1ef7c00706cd1053c17d8f6a429f52d4
+PKG_SOURCE_VERSION:=3545f418887d8ac0404cbe44d192ab20626e5268

 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE

-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-controller
+PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-controller.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
-endif
+
+
+PKG_BUILD_DEPENDS:=map-plugin

 include $(INCLUDE_DIR)/package.mk

@@ -51,10 +51,4 @@ define Package/map-controller/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapcontroller $(1)/usr/sbin/
 endef

-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -r --exclude=.* ~/git/map-controller/ $(PKG_BUILD_DIR)/
-endef
-endif
-
 $(eval $(call BuildPackage,map-controller))
--- 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-controller/files/etc/init.d/mapcontroller
+++ b/map-controller/files/etc/init.d/mapcontroller
@@ -48,8 +48,6 @@ reload_service() {
 	config_get_bool enabled controller enabled 1
 	if [ "$enabled" -eq 0 ]; then
 		stop
-		# Start but without instance so reload trigger works.
-		start
 		return
 	fi

--- 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.2.0
+PKG_VERSION:=2.1.1

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=d1fae1ff7a8bc8daea08799b9ffbdeb424903e54
+PKG_SOURCE_VERSION:=908ab0defe9535144fced2012a819a2e58f3e8c6
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
@@ -30,9 +30,7 @@ define Package/map-topology
 endef

 TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-D_GNU_SOURCE
+	-I$(STAGING_DIR)/usr/include

 define Package/map-topology/description
 	Constructs network topology and show it as json structure over UBUS
--- 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.0

 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"
@@ -35,6 +35,7 @@ generate_mcast_config(){
 	uci set mcast.@proxy[-1].last_member_query_interval="10"
 	uci set mcast.@proxy[-1].fast_leave="1"
 	uci set mcast.@proxy[-1].snooping_mode="2"
+	uci set mcast.@proxy[-1].lan_to_lan="0"
 	uci add_list mcast.@proxy[-1].downstream_interface="br-lan"

 	IFS=" "
--- a/mcastmngr/files/lib/mcast/broadcom.sh
+++ b/mcastmngr/files/lib/mcast/broadcom.sh
@@ -59,6 +59,10 @@ mld_p_up_interfaces=""
 mld_p_down_interfaces=""
 mld_p_exceptions=""

+# Standard parameters need by BCM's multicast daemon
+l_2_l_mcast=0
+allow_brdevice=0
+
 proxdevs=""
 ethwan="$(db -q get hw.board.ethernetWanPort)"

@@ -85,6 +89,7 @@ read_snooping() {
 		config_get igmp_s_mode "$config" snooping_mode 0
 		config_get igmp_s_iface "$config" interface
 		config_get igmp_s_exceptions "$config" filter
+		config_get l_2_l_mcast "$config" lan_to_lan
 		return
 	fi

@@ -99,6 +104,7 @@ read_snooping() {
 		config_get mld_s_mode "$config" snooping_mode 0
 		config_get mld_s_iface "$config" interface
 		config_get mld_s_exceptions "$config" filter
+		config_get l_2_l_mcast "$config" lan_to_lan
 		return
 	fi
 }
@@ -127,6 +133,7 @@ read_proxy() {
 		config_get igmp_p_up_interfaces "$config" upstream_interface
 		config_get igmp_p_down_interfaces "$config" downstream_interface
 		config_get igmp_p_exceptions "$config" filter
+		config_get l_2_l_mcast "$config" lan_to_lan
 		return
 	fi

@@ -142,6 +149,7 @@ read_proxy() {
 		config_get mld_p_up_interfaces "$config" upstream_interface
 		config_get mld_p_down_interfaces "$config" downstream_interface
 		config_get mld_p_exceptions "$config" filter
+		config_get l_2_l_mcast "$config" lan_to_lan
 		return
 	fi
 }
@@ -167,36 +175,6 @@ config_mcast_querier_params() {
 	echo "${protocol}-last-member-query-interval $last_mem_q_int" >> $CONFFILE
 }

-config_snooping_upstream_interface() {
-	local snooping_upstream_intf=""
-
-	json_load "$(devstatus $1)"
-	logger -t "mcastconf" "$(devstatus $1)"
-	itr=1
-	json_select bridge-members
-
-	# loop over the bridge and find the device on wan port
-	while json_get_var dev $itr; do
-		case "$dev" in
-			*.*)
-				port="$(echo "$dev" | cut -d'.' -f 1)"
-				if [ $port == $ethwan ]; then
-					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
-				fi
-				;;
-		esac
-		itr=$(($itr + 1))
-	done
-	json_select ..
-
-	# if none of the bridge members are on wan port, set the wan port itself
-	if [ -n "$snooping_upstream_intf" ]; then
-		echo "upstream-interface $snooping_upstream_intf" >>$CONFFILE
-	else
-		echo "upstream-interface $ethwan" >>$CONFFILE
-	fi
-}
-
 config_snooping_on_bridge() {
 	local protocol="$1"
 	local bcm_mcast_p=1
@@ -209,11 +187,46 @@ config_snooping_on_bridge() {
 			br-*)
 				# set snooping mode on the bridge
 				bcmmcastctl mode -i $snpif -p $bcm_mcast_p -m $3
+				# set L2L snooping mode on the bridge
+				bcmmcastctl l2l -i $snpif -p $bcm_mcast_p -e $l_2_l_mcast # set L2L snooping mode on the bridge
 			;;
 		esac
 	done
 }

+handle_bridged_proxy_interface() {
+	local p2="$1"
+	local p_enable=0
+
+	if [ "$p2" == "igmp" ]; then
+		p_enable=$igmp_p_enable
+	else
+		p_enable=$mld_p_enable
+	fi
+
+	if [ $p_enable -eq 1 -a $allow_brdevice -eq 1 ]
+	then
+		proxdevs="$proxdevs $2"
+		echo "upstream-interface $2" >>$CONFFILE
+	else
+		json_load "$(devstatus $2)"
+		itr=1
+		json_select bridge-members
+		while json_get_var dev $itr; do
+			case "$dev" in
+				*.*)
+					port="$(echo "$dev" | cut -d'.' -f 1)"
+					if [ $port == $ethwan ]; then
+						ifconfig $dev | grep RUNNING >/dev/null && proxdevs="$proxdevs $dev" && break
+					fi
+					;;
+			esac
+			itr=$(($itr + 1))
+		done
+		json_select ..
+	fi
+}
+
 config_mcast_proxy_interface() {
 	local itr
 	local p1="$1"
@@ -228,8 +241,7 @@ config_mcast_proxy_interface() {
 	for proxif in $2; do
 		case "$proxif" in
 			br-*)
-				proxdevs="$proxdevs $proxif"
-				echo "upstream-interface $proxif" >>$CONFFILE
+				handle_bridged_proxy_interface $p1 $proxif
 			;;
 			*)
 				ifconfig $proxif | grep RUNNING >/dev/null && proxdevs="$proxdevs $proxif"
@@ -241,12 +253,7 @@ config_mcast_proxy_interface() {
 		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
 	fi

-	# if proxdevs is empty set the wan port as mcast-interface
-	if [ -n "$proxdevs" ]; then
-		echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
-	else
-		echo "${p1}-mcast-interfaces $ethwan" >> $CONFFILE
-	fi
+	[ -n "$proxdevs" ] && echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
 }

 configure_mcpd_snooping() {
@@ -259,14 +266,14 @@ configure_mcpd_snooping() {
 	if [ "$protocol" == "igmp" ]; then
 		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
 		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
-		config_snooping_upstream_interface "$igmp_s_iface"
+		config_mcast_proxy_interface $protocol "$igmp_s_iface"
 		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
 		exceptions=$igmp_s_exceptions
 		fast_leave=$igmp_s_fast_leave
 	elif [ "$protocol" == "mld" ]; then
 		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
 		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
-		config_snooping_upstream_interface "$mld_s_iface"
+		config_mcast_proxy_interface $protocol "$mld_s_iface"
 		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
 		exceptions=$mld_s_exceptions
 		fast_leave=$mld_s_fast_leave
@@ -343,6 +350,7 @@ disable_snooping() {

 	for br in $(brctl show | grep 'br-' | awk '{print$1}' | tr '\n' ' '); do
 		bcmmcastctl mode -i $br -p $bcm_mcast_p -m 0 # disable snooping on all bridges
+		bcmmcastctl l2l -i $br -p $bcm_mcast_p -e 0 # disable L2L snooping on all bridges
 	done
 }

@@ -458,7 +466,7 @@ read_mcast_stats() {
 		case $line in
 		br-*)
 			found_ip=0
-			grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
+			grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
 			if [ -z "$mcast_addrs" ]; then
 				mcast_addrs="$grp_ip"
 				continue
@@ -510,7 +518,7 @@ read_mcast_stats() {
 					if [ "$snoop_iface" != "$intf" ]; then
 						continue
 					fi
-					grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
+					grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
 					if [ "$grp_ip" != "$gip_addr" ]; then
 						continue
 					fi
@@ -523,12 +531,12 @@ read_mcast_stats() {
 					fi

 					json_add_object ""
-					host_ip="$(echo $line | awk -F ' ' '{ print $14 }')"
+					host_ip="$(echo $line | awk -F ' ' '{ print $13 }')"
 					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
 					json_add_string "ipaddr" "$h_ip"
 					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
 					json_add_string "device" "$src_port"
-					timeout="$(echo $line | awk -F ' ' '{ print $15 }')"
+					timeout="$(echo $line | awk -F ' ' '{ print $14 }')"
 					json_add_int "timeout" "$timeout"
 					json_close_object #close the associated device object
 					;;
--- 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/Config.in
+++ b/obuspa/Config.in
@@ -1,7 +1,5 @@
 if PACKAGE_obuspa

-menu "Configuration"
-
 config OBUSPA_MTP_ENABLE_STOMP
 	bool "Enable STOMP as mtp protocol"
 	default y
@@ -13,5 +11,5 @@ config OBUSPA_MTP_ENABLE_MQTT
 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
 	default y
-endmenu
+
 endif
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,15 +5,15 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=4.1.0.18
+PKG_VERSION:=4.0.0.8

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=af3d4663d66942e3b0e3253375c5620629769aa5
+PKG_SOURCE_VERSION:=09a6dc8ec0aed68f1952f2c81c73d9b8745a19d1
 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
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

@@ -29,7 +29,6 @@ include $(INCLUDE_DIR)/package.mk
 define Package/obuspa
  SECTION:=utils
  CATEGORY:=Utilities
-  SUBMENU:=TRx69
  TITLE:=USP agent
  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto
 endef
@@ -81,11 +80,13 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-obuspa $(1)/etc/hotplug.d/iface/
 endef

 $(eval $(call BuildPackage,obuspa))
--- a/obuspa/files/etc/config/obuspa
+++ b/obuspa/files/etc/config/obuspa
@@ -1,10 +1,9 @@
 config obuspa 'global'
 	option enabled '1'
-	option interface 'loopback'
-	#option ifname 'lo'
-	option debug '1'
+	option interface 'wan'
+	#option ifname 'eth0.1'
+	option debug '0'
 	option log_level '1'
-	option prototrace '0'
 	#option db_file '/etc/obuspa/usp.db'
 	#option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
@@ -47,7 +46,7 @@ config subscription
 #	option Description 'Request to get Administrative access'
 #	option role_name 'full_access'
 #	option Enable '1'
-#	option Value 'YWRtaW4='
+#	option Value 'admin'
 #	option Retries 2
 #	option LockoutPeriod 60

@@ -55,6 +54,6 @@ config subscription
 #	option Description 'Request to get User access'
 #	option role_name 'user'
 #	option Enable '1'
-#	option Value 'dXNlcg=='
+#	option Value 'user'
 #	option Retries 3
 #	option LockoutPeriod 30
--- a/obuspa/files/etc/hotplug.d/iface/85-obuspa
+++ b/obuspa/files/etc/hotplug.d/iface/85-obuspa
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+[ "$(uci -q get obuspa.global.interface)" == "$INTERFACE" ] || exit 0
+
+[ "$ACTION" = ifup -o "$ACTION" = ifupdate ] || exit 0
+[ "$ACTION" = ifupdate -a -z "$IFUPDATE_ADDRESSES" ] && exit 0
+
+/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
@@ -64,41 +52,39 @@ get_index() {

 get_role_index_from_json() {
 	local role="${@}"
-	local num=0

 	# In case of role is empty or file not present
-	if [ -z "${role}" -o ! -f "${role_def_file}" ]; then
+	if [ -z "${role}" -o ! -f ${role_def_file} ]; then
+		echo 0
 		return 0
 	fi

 	json_init
 	json_load_file ${role_def_file}
+	if [ $? -ne 0 ]; then # In case of invalid json file
+		echo 0
+		return 0
+	fi

 	json_select roles
 	json_get_keys roles_obj

 	for k in ${roles_obj}; do
-		local rname
 		json_select $k
-		json_get_var rname name
+		json_get_var name name
 		json_select ..
-
-		if [ "${rname}" != "Untrusted" -a "${rname}" != "full_access" ]; then
-			num=$(( num + 1 ))
-		fi
-
-		if [ "${role}" = "${rname}" ]; then
-			return ${num}
+		if [ "${role}" = "${name}" ]; then
+			echo "${k}"
+			return 0
 		fi
 	done
-
-	return 0
+	echo 0
 }

 get_uci_ref_index() {
 	local val;

-	[ -f "${USP_TEMP_FILE}" ] && rm -f ${USP_TEMP_FILE}
+	[ -f ${USP_TEMP_FILE} ] && rm -f ${USP_TEMP_FILE}

 	index=0
 	config_load $CONFIGURATION
@@ -123,7 +109,6 @@ validate_obuspa_section()
 		'interface:string' \
 		'ifname:string:br-lan' \
 		'debug:bool:false' \
-		'prototrace:bool:false' \
 		'log_level:uinteger' \
 		'log_dest:string' \
 		'db_file:string' \
@@ -134,6 +119,7 @@ validate_localagent_section()
 {
 	uci_validate_section ${CONFIGURATION} localagent "${1}" \
 		'Enable:bool:true' \
+		'ParameterName:string:Device.DeviceInfo.SoftwareVersion' \
 		'EndpointID:string'
 }

@@ -153,7 +139,6 @@ validate_controller_section()
 		'Reference:string' \
 		'Destination:string:controller-notify-dest' \
 		'Topic:string' \
-		'ParameterName:list(string)' \
 		'coap_host:host' \
 		'coap_path:string' \
 		'coap_port:port' \
@@ -223,55 +208,9 @@ validate_mqtt_client_section()
 		'ConnectRetryMaxInterval:uinteger:60'
 }

-get_oui_from_db() {
-	local oui="$(db get device.deviceinfo.ManufacturerOUI)"
-
-	echo "${oui}"
-}
-
-get_serial_from_db() {
-	local serial="$(db get device.deviceinfo.SerialNumber)"
-
-	# this can encoded further
-	echo "${serial}"
-}
-
-publish_endpoint() {
-	local AgentEndpointID serial oui user pass
-	local opt=""
-
-	# return if mosquitto_pub is not present
-	if [ ! "$(which mosquitto_pub)" ]; then
-		log "mosquitto_pub not present can't publish EndpointID"
-		return 0;
-	fi
-
-	# Get endpoint id from obuspa config first
-	config_load obuspa
-	config_get AgentEndpointID localagent EndpointID ""
-	if [ -z "${AgentEndpointID}" ]; then
-		serial=$(get_serial_from_db)
-		oui=$(get_oui_from_db)
-		AgentEndpointID="os::${oui}-${serial}"
-	fi
-
-	config_get user localmqtt Username
-	if [ -n "${user}" ]; then
-		opt="-u ${user}"
-	fi
-	config_get pass localmqtt Password
-	if [ -n "${pass}" ]; then
-		opt="${opt} -P ${pass}"
-	fi
-
-	# publish Agent's EndpointID in mosquito broker for discovery by usp-js
-	# This is a work around till obuspa adds supports for mDNS discovery
-	log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
-	mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" ${opt}
-}
-
 configure_localagent() {
 	local Enable ParameterName EndpointID
+	local _num

 	validate_localagent_section 'localagent' || {
 		log "Validation of localagent section failed"
@@ -282,6 +221,14 @@ configure_localagent() {
 		db_set Device.LocalAgent.EndpointID "${EndpointID}"
 	fi

+	_num=1
+	while [ ${_num} -le ${controller_num} ]
+	do
+		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.Enable "${Enable}"
+		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.ParameterName "${ParameterName}"
+		_num=$(( ${_num} + 1 ))
+	done
+
 	db_set
 }

@@ -305,17 +252,17 @@ configure_controller() {
 		return 1;
 	fi

-	if [ -z "${Reference}" ]; then
-		if [ "${Protocol}" = "STOMP" ]; then
+	if [ -z ${Reference} ]; then
+		if [ ${Protocol} = "STOMP" ]; then
 			val=$(get_uci_ref_index stomp ${stomp})
-			if [ "${val}" -eq 0 ]; then
+			if [ ${val} -eq 0 ]; then
 				log "Not able to find the referred stomp section"
 				return 1;
 			fi
 			Reference="Device.STOMP.Connection.${val}"
-		elif [ "${Protocol}" = "MQTT" ]; then
+		elif [ ${Protocol} = "MQTT" ]; then
 			val=$(get_uci_ref_index mqtt ${mqtt})
-			if [ "${val}" -eq 0 ]; then
+			if [ ${val} -eq 0 ]; then
 				log "Not able to find the referred mqtt section"
 				return 1;
 			fi
@@ -365,17 +312,6 @@ configure_controller() {
 		log "Unsupported Protocol ${Protocol}"
 	fi

-	local param
-	local _pnum=1
-
-	for param in ${ParameterName}
-	do
-		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.Alias "cpe-${_pnum}"
-		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.Enable "${Enable}"
-		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.ParameterName "${param}"
-		_pnum=$(( ${_pnum} + 1 ))
-	done
-
 	db_set
 }

@@ -392,9 +328,9 @@ configure_subscription(){
 		log "No recipient for subscription"
 	fi

-	if [ -z "${Recipient}" ]; then
+	if [ -z ${Recipient} ]; then
 		val=$(get_uci_ref_index controller ${controller})
-		if [ "${val}" -eq 0 ]; then
+		if [ ${val} -eq 0 ]; then
 			log "Not able to find the referred controller section"
 				return 1;
 		fi
@@ -425,45 +361,24 @@ validate_challenge_section()
 		'LockoutPeriod:uinteger:0'
 }

-check_json_load()
-{
-	local ret=0
-	if [ -f "${role_def_file}" ]; then
-		json_init
-		json_load_file "${role_def_file}" 2>&1 |grep -q Failed
-		if [ $? -eq 0 ]; then # In case of invalid json file
-			log "failed to load [${role_def_file}]"
-			ret=1
-		fi
-	fi
-	json_init
-	return ${ret}
-}
-
 get_role_index() {
 	local role="Device.LocalAgent.ControllerTrust.Role"
-	local idx=0
+	local index=0
 	local role_name="${@}"

 	case "${role_name}" in
 	'full_access')
-		idx=1;
-		;;
+	     index=1;
+	     ;;
 	'Untrusted')
-		idx=2;
-		;;
+	     index=2;
+	     ;;
 	 *)
-		local ji=0
-
-		check_json_load
-		if [ $? -eq 0 ]; then
-			get_role_index_from_json ${role_name}
-			ji=$?
-		fi
-		idx=$(( ji + 2 )) # Add predefined roles
+	     local ji=$(get_role_index_from_json ${role_name})
+	     index=$(( ji + 2 )) # Add predefined roles
 	 esac

-	 echo "${role}.${idx}"
+	 echo "${role}.${index}"
 }

 configure_challenges() {
@@ -474,7 +389,7 @@ configure_challenges() {
 		exit 1;
 	}

-	if [ -z "${role_name}" -a -z "${Role}" ]; then
+	if [ -z "${role_name}" -a -z ${Role} ]; then
 		log "Either role_name or Role must defined for a challenge";
 		return 1;
 	fi
@@ -510,17 +425,17 @@ configure_mtp() {
 		return 1;
 	}

-	if [ -z "${Reference}" ]; then
-		if [ "${Protocol}" = "STOMP" ]; then
+	if [ -z ${Reference} ]; then
+		if [ ${Protocol} = "STOMP" ]; then
 			val=$(get_uci_ref_index stomp ${stomp})
-			if [ "${val}" -eq 0 ]; then
+			if [ ${val} -eq 0 ]; then
 				log "Referred stomp section not found"
 				return 1;
 			fi
 			Reference="Device.STOMP.Connection.${val}"
-		elif [ "${Protocol}" = "MQTT" ]; then
+		elif [ ${Protocol} = "MQTT" ]; then
 			val=$(get_uci_ref_index mqtt ${mqtt})
-			if [ "${val}" -eq 0 ]; then
+			if [ ${val} -eq 0 ]; then
 				log "Referred mqtt section not found"
 				return 1;
 			fi
@@ -616,7 +531,7 @@ configure_mqtt_client(){


 configure_obuspa() {
-	local enabled trust_cert ifname interface debug prototrace log_level db_file log_dest role_file
+	local enabled trust_cert ifname interface debug log_level db_file log_dest role_file

 	validate_obuspa_section "global" || {
 		log "Validation of global section failed"
@@ -625,18 +540,15 @@ configure_obuspa() {

 	role_def_file="${role_file}"

-	if [ "${debug}" -eq 1 ]; then
+	if [ ${debug} -eq 1 ]; then
 		# Forward stdout of the command to logd
 		procd_set_param stdout 1
 		# Same for stderr
 		procd_set_param stderr 1
-	fi
-
-	if [ "${debug}" -eq 1 -a "${prototrace}" -eq 1 ]; then
 		procd_append_param command -p
 	fi

-	if [ "${debug}" -eq 1 -a -n "${log_level}" ]; then
+	if [ -n ${log_level} ]; then
 		procd_append_param command -v ${log_level}
 	fi

@@ -645,37 +557,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
@@ -686,6 +589,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
@@ -700,8 +607,50 @@ 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() {
-	publish_endpoint
+	local AgentEndpointID serial oui user pass
+	local opt=""
+
+	ubus -t 10 wait_for usp.raw
+	config_load obuspa
+	config_get AgentEndpointID localagent EndpointID ""
+	if [ -z "${AgentEndpointID}" ]; then
+		serial=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.SerialNumber"}'|jsonfilter -e '@["parameters"][0].value')
+		oui=$(ubus -t 1 call usp.raw get '{"path":"Device.DeviceInfo.ManufacturerOUI"}'|jsonfilter -e '@["parameters"][0].value')
+		AgentEndpointID="os::${oui}-${serial}"
+	fi
+
+	config_get user localmqtt Username
+	if [ -n "${user}" ]; then
+		opt="-u ${user}"
+	fi
+	config_get pass localmqtt Password
+	if [ -n "${pass}" ]; then
+		opt="${opt} -P ${pass}"
+	fi
+	# publish Agent's EndpointID in mosquito broker for discovery
+	# This is a work around till obuspa does not support advertising
+	log "Publishing EndpointID ${AgentEndpointID} to local mqtt broker"
+	mosquitto_pub -r -t "obuspa/EndpointID" -m "${AgentEndpointID}" ${opt}
+
+	procd_running ${CONFIGURATION}
 }

 start_service() {
@@ -715,6 +664,12 @@ start_service() {
 		return 0;
 	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}
 	db_init
@@ -728,19 +683,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() {
@@ -749,7 +692,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
@@ -768,7 +712,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/owsd/files/owsd.init
+++ b/owsd/files/owsd.init
@@ -289,8 +289,8 @@ parser_timeout()
 #data format is  digital with time unit
 #10s-10 seconds 10m-10 minutes 10h-10 hours 10d-10 days
 	if [ -n "$1" ]; then
-		flag=$(echo "$1"| tr -d '0-9' | tr 'A-Z' 'a-z')
-		data=$(echo "$1"| tr -cd '0-9')
+		flag=$(echo "$1"| tr -d [0-9] | tr '[A-Z]' '[a-z]')
+		data=$(echo "$1"| tr -cd [0-9])

 		case $flag in
 			m)
--- a/periodicstats/Makefile
+++ b/periodicstats/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

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

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7426c7458f792cc66920c206d62869c5620f1400
+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
@@ -26,7 +26,7 @@ define Package/periodicstats
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=Periodic Statistics Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbf_api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbfdm +libbbf_api +uspd
 endef

 define Package/periodicstats/description
--- a/periodicstats/files/etc/init.d/periodicstats
+++ b/periodicstats/files/etc/init.d/periodicstats
@@ -4,23 +4,26 @@ START=99
 STOP=10

 USE_PROCD=1
+NAME=periodicstatsd
 PROG=/usr/sbin/periodicstatsd

-service_running() {
-	ubus -t 10 wait_for usp.raw
-}
+. /lib/functions.sh

 start_service() {
-	enable=$(uci -q get periodicstats.globals.enable)
-
-	if [ "$(enable)" != "1" ]; then
-		return 0;
+	ubus wait_for usp
+	if [ -f "/etc/config/periodicstats" ]; then
+		if [ "$(uci -q get periodicstats.globals.enable)" == "1" ]; then
+			procd_open_instance periodicstatsd
+			procd_set_param command ${PROG}
+			procd_set_param respawn
+			procd_close_instance
+		fi
 	fi
+}

-	procd_open_instance periodicstatsd
-	procd_set_param command ${PROG}
-	procd_set_param respawn
-	procd_close_instance
+stop() {
+	#stop_service() is called after procd killed the service
+	echo ;
 }

 service_triggers() {
--- a/peripheral_manager/Makefile
+++ b/peripheral_manager/Makefile
@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.6
 PKG_RELEASE:=1

-PKG_SOURCE_VERSION:=15ba90f01914113e7c5e8f8a6df6279c882e8265
+PKG_SOURCE_VERSION:=785166a9861a119623556163179915727896156b
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager

--- a/peripheral_manager/files/sbin/ledctl
+++ b/peripheral_manager/files/sbin/ledctl
@@ -6,11 +6,11 @@ usage () {
 }

 [ $# -ne 1 ] && usage
-ledstate=$(echo $1 | tr 'A-Z' 'a-z')
+ledstate=$(echo $1 | tr '[A-Z]' '[a-z]')

 case $ledstate in
 	normal|test|allon|alloff|production)
-		ubus call leds set "{\"state\" : \"$ledstate\"}"
+		ubus call leds set  "{\"state\" : \"$ledstate\"}"
 	;;
 	*)
 		usage
--- a/ponmngr/Makefile
+++ b/ponmngr/Makefile
@@ -1,38 +0,0 @@
-#
-# Copyright (C) 2013-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
-	CATEGORY:=Utilities
-	TITLE:=ponmngr packets manager daemon
-endef
-
-define Package/ponmngr/description
-	Configures pon
-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/pon
+++ b/ponmngr/files/etc/init.d/pon
@@ -1,36 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=98
-STOP=10
-
-USE_PROCD=1
-NAME=ponmngr
-PROG="/usr/sbin/omcid start"
-
-include /lib/pon
-
-
-start_service() {
-       if [ -f "/etc/config/pon" ]; then
-		procd_open_instance $NAME
-		procd_set_param command ${PROG}
-		procd_set_param respawn
-		procd_close_instance
-                start_gpon
-       fi
-}
-
-boot() {
-        start
-}
-
-stop_service() {
-	service_stop ${PROG}
-        stop_gpon
-}
-
-reload_service() {
-        stop
-        start
-}
-
--- a/ponmngr/files/etc/uci-defaults/60-pon-generate
+++ b/ponmngr/files/etc/uci-defaults/60-pon-generate
@@ -1,27 +0,0 @@
-#!/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="BRCM$mac"
-                                           
-uci commit pon  
--- a/ponmngr/files/lib/pon/broadcom.sh
+++ b/ponmngr/files/lib/pon/broadcom.sh
@@ -1,70 +0,0 @@
-#!/bin/sh
-. /lib/functions.sh
-. /usr/share/libubox/jshn.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
-	vendor_id=$(echo $vendor_id | hexdump -e '4/1 "%02X" "\n"')
-	vendor_id=${vendor_id:0:8}
-
-        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
-		password=$(echo $password | hexdump -n ${#password} -e '16/1 "%02X""\n"')
-                bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure gpon password=$password
-        fi
-}
-
-configure_gpon() {
-        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_gpon() {
-        if [ -n "$(which gponctl)" ]; then
-                configure_gpon
-                gponctl start
-        fi
-}
-
-stop_gpon() {
-        if [ -n "$(which gponctl)" ]; then
-                gponctl stop
-        fi
-}
-
-get_gpon_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
@@ -1,19 +0,0 @@
-#!/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_gpon_status
-				;;
-		esac
-		;;
-esac
-
--- a/port-management/files/etc/uci-defaults/15-ports-config-generate
+++ b/port-management/files/etc/uci-defaults/15-ports-config-generate
@@ -1,9 +1,19 @@
 #!/bin/sh

-populate_config_from_db() {
-	. /lib/network/utils.sh
+. /lib/network/utils.sh

-	portorder="$(db -q get hw.board.ethernetPortOrder)"
+populate_config(){
+	if [ -s "/etc/config/ports" ]; then
+		if uci -q get ports.@ethport[0] >/dev/null; then
+			# return if there is any valid content
+			return 0
+		else
+			rm -f /etc/config/ports
+		fi
+	fi
+	touch /etc/config/ports
+
+	local portorder="$(db -q get hw.board.ethernetPortOrder)"
 	for port in $portorder; do
 		uci add ports ethport
 		uci rename ports.@ethport[-1]="$(get_port_name $port)"
@@ -25,44 +35,4 @@ populate_config_from_db() {
 	uci commit ports
 }

-populate_config_from_device_tree() {
-	for port in $(find /proc/device-tree/ -name "port@*"); do
-		port="$(cat $port/label)"
-		[ -n "$port" ] || continue
-		[ "$port" = "cpu" ] && continue
-		PORT="$(echo $port | tr '[a-z]' '[A-Z]')"
-		uci add ports ethport
-		uci rename ports.@ethport[-1]="$PORT"
-		uci set ports.@ethport[-1].enabled=1
-		uci set ports.@ethport[-1].name="$PORT"
-		uci set ports.@ethport[-1].ifname="$port"
-		uci set ports.@ethport[-1].speed=1000
-		uci set ports.@ethport[-1].duplex="full"
-		uci set ports.@ethport[-1].autoneg=1
-		uci set ports.@ethport[-1].eee=0
-		if [ "$port" = "wan" ]; then
-			uci set ports.@ethport[-1].pause=1
-			uci set ports.@ethport[-1].uplink=1
-		else
-			uci set ports.@ethport[-1].pause=0
-		fi
-	done
-	uci commit ports
-}
-
-if [ -s "/etc/config/ports" ]; then
-	if uci -q get ports.@ethport[0] >/dev/null; then
-		# exit if there is any valid content
-		exit 0
-	else
-		rm -f /etc/config/ports
-	fi
-fi
-
-touch /etc/config/ports
-
-if [ -f /sbin/db ] && [ -f /etc/board-db/config/hw ]; then
-	populate_config_from_db
-elif [ -d /proc/device-tree/ ]; then
-	populate_config_from_device_tree
-fi
+[ -f /sbin/db -a -f /etc/board-db/config/hw ] && populate_config
--- a/qosmngr/Makefile
+++ b/qosmngr/Makefile
@@ -6,14 +6,14 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.0

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e3d608e4bacd367fed99bcdd7f56b3fba7b02891
+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_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

--- 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/etc/uci-defaults/60-qos_queue_generate
+++ b/qosmngr/files/etc/uci-defaults/60-qos_queue_generate
@@ -21,10 +21,6 @@ generate_queue(){
 		case $cpu_model in
 			68*) no_of_q="0 1 2 3" ;;
 		esac
-
-                if grep -qE '[0-9]+ archer$' /proc/devices; then 
-                        no_of_q="0 1 2 3" 
-                fi 
 	fi

 	i=0
--- 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'
@@ -233,12 +231,6 @@ handle_shaper() {
 	fi

 	config_get rate "$sid" "rate"
-	# Convert the rate from bps to kbps.
-	if [ $rate -lt 1000 ];then
-		return
-	fi
-
-	rate=$(($rate / 1000))
 	config_get bs "$sid" "burst_size"
 	tmctl setportshaper --devtype 0 --if $ifname --shapingrate $rate --burstsize $bs
 }
@@ -253,17 +245,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 +273,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() {
@@ -307,44 +299,15 @@ broute_filter_on_dst_mac() {
 }

 broute_filter_on_pcp() {
-	# 5.04 onwards the vlan extension in ebtables is used for classification
-	# on the basis of vlan params which needs proto to be defined as 802_1Q in
-	# order to add a rule, now, proto can also be defined by specifying proto uci
-	# option as well as the rule may have a vlan id as well in which case the
-	# proto will already be present, hence, this check to not add --proto more
-	# than once
-	case "$BR_RULE" in
-	*proto*)
-		BR_RULE="$BR_RULE --vlan-prio $1"
-		;;
-	*)
-		BR_RULE="$BR_RULE --proto 802_1Q --vlan-prio $1"
-		;;
-	esac
+	BR_RULE="$BR_RULE --skbvlan-prio $1"
 }

 broute_filter_on_ether_type() {
 	BR_RULE="$BR_RULE --proto $1"
 }

-broute_filter_on_dscp() {
-	# The broadcom option --ip-dscp-extend actually accepts tos
-	# and not dscp and that too in hex, hence, perform the conversion
-	# from dscp in uci to tos first and then convert to hex
-	tos_val=$(($1<<2))
-	tos_hex=$(printf "%x" $tos_val)
-	BR_RULE="$BR_RULE --ip-dscp-extend $tos_hex"
-}
-
 broute_filter_on_vid() {
-	case "$BR_RULE" in
-	*proto*)
-		BR_RULE="$BR_RULE --vlan-id $1"
-		;;
-	*)
-		BR_RULE="$BR_RULE --proto 802_1Q --vlan-id $1"
-		;;
-	esac
+	BR_RULE="$BR_RULE --skbvlan-id $1"
 }

 broute_rule_set_traffic_class() {
@@ -366,7 +329,6 @@ handle_ebtables_rules() {
 	config_get src_if "$sid" "ifname"
 	config_get src_mac "$sid" "src_mac"
 	config_get dst_mac "$sid" "dst_mac"
-	config_get dscp_filter "$sid" "dscp_filter"
 	config_get pcp_check "$sid" "pcp_check"
 	config_get eth_type "$sid" "ethertype"
 	config_get vid "$sid" "vid_check"
@@ -405,13 +367,6 @@ handle_ebtables_rules() {
 		is_l2_rule=1
 	fi

-	if [ -n "$dscp_filter" ]; then
-		# filter on ethertype and proto is same thing
-		broute_filter_on_ether_type IPv4
-		broute_filter_on_dscp $dscp_filter
-		is_l2_rule=1
-	fi
-
 	if [ -n "$eth_type" ]; then
 		broute_filter_on_ether_type $eth_type
 		is_l2_rule=1
@@ -553,12 +508,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
 }

@@ -690,20 +645,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
 }

@@ -767,6 +719,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
@@ -780,10 +737,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
@@ -856,7 +810,6 @@ configure_queue() {
 		for i in 0 1 2 3 4 5 6 7; do
 			tmctl delqcfg --devtype 0 --if $intf --qid $i &>/dev/null
 		done
-		tmctl porttminit --devtype 0 --if $intf --flag 0 --numqueues 8

 		mkdir -p /tmp/qos/$intf
 		touch /tmp/qos/$intf/q_order
@@ -875,14 +828,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
@@ -910,11 +859,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/Makefile
+++ b/questd/Makefile
@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=questd
-PKG_VERSION:=5.2.3
+PKG_VERSION:=5.2.2

-PKG_SOURCE_VERSION:=cf54bd65ec821ac67f3aa1caeebcd3ea9aae07ad
+PKG_SOURCE_VERSION:=cd05311b505cc5025a8559c616b55e9fb4d1857d
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd

--- a/questd/files/etc/init.d/quest
+++ b/questd/files/etc/init.d/quest
@@ -12,3 +12,12 @@ start_service() {
 	procd_set_param respawn
 	procd_close_instance
 }
+
+service_triggers()
+{
+	procd_add_reload_trigger network wireless
+}
+
+reload_service() {
+	ubus -t 5 call router.network reload
+}
--- 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/quickjs-websocket/Makefile
+++ b/quickjs-websocket/Makefile
@@ -1,55 +0,0 @@
-#
-# Copyright (c) 2020 Genexis B.V.
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=quickjs-websocket
-PKG_LICENSE:=MIT
-PKG_VERSION:=1
-PKG_RELEASE:=1
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/quickjs-websocket
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=WebSocket API for QuickJS
-  MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
-  DEPENDS:=+quickjs +libwebsockets
-endef
-
-define Package/quickjs-websocket/description
-  Implementation of the W3C WebSocket API in QuickJS on top of the
-  libwebsockets C library.
-endef
-
-define Package/quickjs-websocket/install
-	$(INSTALL_DIR) $(1)/usr/lib/quickjs
-	$(CP) $(PKG_BUILD_DIR)/lws-client.so $(1)/usr/lib/quickjs/
-	$(CP) $(PKG_BUILD_DIR)/websocket.js $(1)/usr/lib/quickjs/
-endef
-
-$(eval $(call BuildPackage,quickjs-websocket))
--- a/quickjs-websocket/README
+++ b/quickjs-websocket/README
@@ -1,23 +0,0 @@
-WebSocket API for QuickJS
-===============
-
-Introduction
------------
-This is an implementation of the W3C WebSocket API for the QuickJS
-JavaScript engine on top of the libwebsockets C library.
-
-Usage
------------
-import { WebSocket } from '/usr/lib/quickjs/websocket.js'
-
-const w = new WebSocket('wss://example.com/', ['protocol1', 'protocol2'])
-
-globalThis.WebSocket = WebSocket // To make the API available globally
-
-Limitations
------------
-Events emitted by WebSocket objects do not implement the full DOM
-event specification. Only a subset of properties is available. The
-EventTarget interface, i.e. addEventListener/removeEventListener, is
-unimplemented. The onopen/onerror/onclose/onmesseage handlers have to
-be used instead.
--- a/quickjs-websocket/src/Makefile
+++ b/quickjs-websocket/src/Makefile
@@ -1,38 +0,0 @@
-#
-# Copyright (c) 2020 Genexis B.V.
-#
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation
-# files (the "Software"), to deal in the Software without
-# restriction, including without limitation the rights to use, copy,
-# modify, merge, publish, distribute, sublicense, and/or sell copies
-# of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
-# BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
-# ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-#
-
-TARGETS = lws-client.so
-
-CFLAGS += -Os -Wall -Werror
-
-all: $(TARGETS)
-
-%.pic.o: %.c
-	$(CC) $(CFLAGS) -fPIC -c -o $@ $<
-
-lws-client.so: lws-client.pic.o
-	$(CC) $(LDFLAGS) -shared -o $@ $^ -lwebsockets
-
-clean:
-	rm -f *.o $(TARGETS)
--- a/quickjs-websocket/src/lws-client.c
+++ b/quickjs-websocket/src/lws-client.c
@@ -1,958 +0,0 @@
-/*
- * Copyright (c) 2020 Genexis B.V.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <stdint.h>
-#include <string.h>
-#include <quickjs/quickjs.h>
-#include <quickjs/quickjs-libc.h>
-#include <libwebsockets.h>
-
-#define countof(x) (sizeof(x) / sizeof((x)[0]))
-
-#define CDEF(name) JS_PROP_INT32_DEF(#name, name, JS_PROP_CONFIGURABLE)
-
-#if LWS_LIBRARY_VERSION_NUMBER < 3002000
-#define MAX_WAIT 1000
-#else
-#define MAX_WAIT INT32_MAX
-#ifndef LWS_WITH_EXTERNAL_POLL
-#error "LWS_WITH_EXTERNAL_POLL is needed for LWS versions >= 3.2.0"
-#endif
-#if LWS_LIBRARY_VERSION_NUMBER < 4001002
-#error "External poll is broken for 3.2.0 <= LWS version < 4.1.2"
-#endif
-#endif
-
-#define WSI_DATA_USE_OBJECT (1 << 0)
-#define WSI_DATA_USE_LINKED (1 << 1)
-
-typedef struct js_lws_wsi_data {
-    struct js_lws_wsi_data *next;
-    struct lws *wsi;
-    JSValue object;
-    JSValue context;
-    JSValue user;
-    uint8_t in_use;
-} js_lws_wsi_data_t;
-
-typedef struct {
-    struct lws_context *context;
-    JSContext *ctx;
-    JSValue callback;
-    js_lws_wsi_data_t *wsi_list;
-} js_lws_context_data_t;
-
-static JSClassID js_lws_context_class_id;
-static JSClassID js_lws_wsi_class_id;
-
-static void free_wsi_data_rt(JSRuntime *rt, js_lws_wsi_data_t *data)
-{
-    JS_FreeValueRT(rt, data->object);
-    JS_FreeValueRT(rt, data->context);
-    JS_FreeValueRT(rt, data->user);
-    js_free_rt(rt, data);
-}
-
-static void unlink_wsi_rt(JSRuntime *rt, js_lws_context_data_t *data,
-                          js_lws_wsi_data_t *wsi_data)
-{
-    js_lws_wsi_data_t **p;
-    for (p = &data->wsi_list; *p; p = &(*p)->next) {
-        if (*p == wsi_data) {
-            *p = (*p)->next;
-            break;
-        }
-    }
-    wsi_data->next = NULL;
-    wsi_data->wsi = NULL;
-    JS_FreeValueRT(rt, wsi_data->object);
-    wsi_data->object = JS_UNDEFINED;
-    wsi_data->in_use &= ~WSI_DATA_USE_LINKED;
-    if (wsi_data->in_use == 0)
-        free_wsi_data_rt(rt, wsi_data);
-}
-
-static void unlink_wsi(JSContext *ctx, js_lws_context_data_t *data,
-                       js_lws_wsi_data_t *wsi_data)
-{
-    unlink_wsi_rt(JS_GetRuntime(ctx), data, wsi_data);
-}
-
-static JSValue convert_pollargs(JSContext *ctx, const struct lws_pollargs *pa)
-{
-    JSValue obj;
-
-    if (pa == NULL)
-        return JS_NULL;
-
-    obj = JS_NewObject(ctx);
-    if (JS_IsException(obj))
-        return obj;
-
-    if (JS_SetPropertyStr(ctx, obj, "fd", JS_NewInt32(ctx, pa->fd)) < 0
-        || JS_SetPropertyStr(ctx, obj, "events",
-                             JS_NewInt32(ctx, pa->events)) < 0
-        || JS_SetPropertyStr(ctx, obj, "prev_events",
-                             JS_NewInt32(ctx, pa->prev_events)) < 0) {
-        JS_FreeValue(ctx, obj);
-        return JS_EXCEPTION;
-    }
-
-    return obj;
-}
-
-static JSValue convert_close_payload(JSContext *ctx,
-                                     uint8_t *payload, size_t len)
-{
-    JSValue array;
-    uint16_t status;
-    JSValue reason;
-
-    if (payload == NULL || len < 2)
-        return JS_NULL;
-
-    array = JS_NewArray(ctx);
-    if (JS_IsException(array))
-        return array;
-
-    status = (payload[0] << 8) | payload[1];
-    if (JS_SetPropertyUint32(ctx, array, 0, JS_NewInt32(ctx, status)) < 0) {
-        JS_FreeValue(ctx, array);
-        return JS_EXCEPTION;
-    }
-
-    reason = JS_NewStringLen(ctx, (const char *)(payload + 2), len - 2);
-    if (JS_IsException(reason)
-        || JS_SetPropertyUint32(ctx, array, 1, reason) < 0) {
-        JS_FreeValue(ctx, array);
-        return JS_EXCEPTION;
-    }
-
-    return array;
-}
-
-static int client_callback(struct lws *wsi, enum lws_callback_reasons reason,
-                           void *user, void *in, size_t len)
-{
-    js_lws_context_data_t *data = lws_context_user(lws_get_context(wsi));
-    js_lws_wsi_data_t *wsi_data = lws_wsi_user(wsi);
-    JSContext *ctx;
-    JSValue args[3];
-    JSValue ret;
-    int32_t ret_int;
-    int i;
-
-    if (data == NULL || data->ctx == NULL || JS_IsUndefined(data->callback))
-        return 0;
-
-    ctx = data->ctx;
-    args[0] = wsi_data ? JS_DupValue(ctx, wsi_data->object) : JS_NULL;
-    args[1] = JS_NewInt32(ctx, reason);
-    args[2] = JS_NULL;
-
-    switch (reason) {
-    case LWS_CALLBACK_ADD_POLL_FD:
-    case LWS_CALLBACK_DEL_POLL_FD:
-    case LWS_CALLBACK_CHANGE_MODE_POLL_FD:
-        args[2] = convert_pollargs(ctx, in);
-        break;
-    case LWS_CALLBACK_CLIENT_CONNECTION_ERROR:
-        if (in)
-            args[2] = JS_NewStringLen(ctx, in, len);
-        break;
-    case LWS_CALLBACK_WS_PEER_INITIATED_CLOSE:
-        args[2] = convert_close_payload(ctx, in, len);
-        break;
-    case LWS_CALLBACK_RECEIVE:
-    case LWS_CALLBACK_CLIENT_RECEIVE:
-        if (in)
-            args[2] = JS_NewArrayBufferCopy(ctx, in, len);
-        break;
-    case LWS_CALLBACK_WSI_DESTROY:
-        if (wsi_data)
-            unlink_wsi(ctx, data, wsi_data);
-        break;
-    default:
-        break;
-    }
-
-    if (JS_IsException(args[2]))
-        ret = JS_EXCEPTION;
-    else
-        ret = JS_Call(ctx, data->callback, JS_UNDEFINED, countof(args), args);
-
-    if (JS_IsException(ret) || JS_ToInt32(ctx, &ret_int, ret) < 0) {
-        js_std_dump_error(ctx);
-        ret_int = -1;
-    }
-
-    JS_FreeValue(ctx, ret);
-    for (i = 0; i < countof(args); i++) {
-        JS_FreeValue(ctx, args[i]);
-    }
-
-    return ret_int;
-}
-
-static const struct lws_protocols client_protocols[] = {
-    { "lws-client", client_callback, 0, 0, 0, NULL, 0 },
-    { NULL, NULL, 0, 0, 0, NULL, 0 }
-};
-
-static JSValue js_decode_utf8(JSContext *ctx, JSValueConst this_val,
-                              int argc, JSValueConst *argv)
-{
-    size_t size;
-    uint8_t *ptr = JS_GetArrayBuffer(ctx, &size, argv[0]);
-    if (ptr == NULL)
-        return JS_EXCEPTION;
-    return JS_NewStringLen(ctx, (const char *)ptr, size);
-}
-
-static JSValue js_lws_set_log_level(JSContext *ctx, JSValueConst this_val,
-                                    int argc, JSValueConst *argv)
-{
-    int32_t level;
-    if (JS_ToInt32(ctx, &level, argv[0]) < 0)
-        return JS_EXCEPTION;
-    lws_set_log_level(level, NULL);
-    return JS_UNDEFINED;
-}
-
-static JSValue js_lws_create_context(JSContext *ctx, JSValueConst this_val,
-                                     int argc, JSValueConst *argv)
-{
-    int secure;
-    JSValue obj;
-    js_lws_context_data_t *data;
-    struct lws_context_creation_info info;
-    struct lws_context *context;
-
-    if (!JS_IsFunction(ctx, argv[0]))
-        return JS_ThrowTypeError(ctx, "not a function");
-
-    secure = JS_ToBool(ctx, argv[1]);
-    if (secure < 0)
-        return JS_EXCEPTION;
-
-    obj = JS_NewObjectClass(ctx, js_lws_context_class_id);
-    if (JS_IsException(obj))
-        return obj;
-
-    data = js_mallocz(ctx, sizeof(js_lws_context_data_t));
-    if (data == NULL) {
-        JS_FreeValue(ctx, obj);
-        return JS_EXCEPTION;
-    }
-    data->callback = JS_UNDEFINED;
-
-    memset(&info, 0, sizeof(info));
-    info.port = CONTEXT_PORT_NO_LISTEN;
-    info.protocols = client_protocols;
-    info.gid = -1;
-    info.uid = -1;
-    info.options = secure ? LWS_SERVER_OPTION_DO_SSL_GLOBAL_INIT : 0;
-    info.user = data;
-    context = lws_create_context(&info);
-    if (context == NULL) {
-        JS_FreeValue(ctx, obj);
-        js_free(ctx, data);
-        return JS_ThrowOutOfMemory(ctx);
-    }
-
-    data->context = context;
-    data->ctx = JS_DupContext(ctx);
-    data->callback = JS_DupValue(ctx, argv[0]);
-    JS_SetOpaque(obj, data);
-
-    return obj;
-}
-
-static void js_lws_context_finalizer(JSRuntime *rt, JSValue val)
-{
-    js_lws_context_data_t *data = JS_GetOpaque(val, js_lws_context_class_id);
-    if (data) {
-        JS_FreeContext(data->ctx);
-        data->ctx = NULL;
-        JS_FreeValueRT(rt, data->callback);
-        data->callback = JS_UNDEFINED;
-
-        lws_context_destroy(data->context);
-
-        while (data->wsi_list) {
-            unlink_wsi_rt(rt, data, data->wsi_list);
-        }
-
-        js_free_rt(rt, data);
-    }
-}
-
-static void js_lws_context_mark(JSRuntime *rt, JSValue val,
-                                JS_MarkFunc *mark_func)
-{
-    js_lws_context_data_t *data = JS_GetOpaque(val, js_lws_context_class_id);
-    if (data) {
-        js_lws_wsi_data_t *wd;
-        mark_func(rt, (JSGCObjectHeader *)data->ctx);
-        JS_MarkValue(rt, data->callback, mark_func);
-        for (wd = data->wsi_list; wd; wd = wd->next) {
-            JS_MarkValue(rt, wd->object, mark_func);
-        }
-    }
-}
-
-static JSValue js_lws_context_get_connections(JSContext *ctx,
-                                              JSValueConst this_val)
-{
-    js_lws_context_data_t *data = JS_GetOpaque2(ctx, this_val,
-                                                js_lws_context_class_id);
-    int32_t connections = 0;
-    js_lws_wsi_data_t *wd;
-
-    if (data == NULL)
-        return JS_EXCEPTION;
-
-    for (wd = data->wsi_list; wd; wd = wd->next) {
-        connections++;
-    }
-
-    return JS_NewInt32(ctx, connections);
-}
-
-static JSValue js_lws_client_connect(JSContext *ctx, JSValueConst this_val,
-                                     int argc, JSValueConst *argv)
-{
-    js_lws_context_data_t *data = JS_GetOpaque2(ctx, this_val,
-                                                js_lws_context_class_id);
-    const char *address = NULL;
-    int32_t port;
-    int secure;
-    const char *path = NULL, *host = NULL, *origin = NULL, *protocol = NULL;
-    JSValue obj = JS_UNDEFINED, ret = JS_EXCEPTION;
-    js_lws_wsi_data_t *wsi_data;
-    struct lws_client_connect_info info;
-
-    if (data == NULL)
-        return JS_EXCEPTION;
-
-    address = JS_ToCString(ctx, argv[0]);
-    if (address == NULL)
-        goto exception;
-
-    if (JS_ToInt32(ctx, &port, argv[1]) < 0)
-        goto exception;
-
-    if (port < 1 || port > 65535) {
-        JS_ThrowRangeError(ctx, "port must be between 1 and 65535");
-        goto exception;
-    }
-
-    secure = JS_ToBool(ctx, argv[2]);
-    if (secure < 0)
-        goto exception;
-
-    path = JS_ToCString(ctx, argv[3]);
-    if (path == NULL)
-        goto exception;
-
-    host = JS_ToCString(ctx, argv[4]);
-    if (host == NULL)
-        goto exception;
-
-    if (!JS_IsUndefined(argv[5]) && !JS_IsNull(argv[5])) {
-        origin = JS_ToCString(ctx, argv[5]);
-        if (origin == NULL)
-            goto exception;
-    }
-
-    if (!JS_IsUndefined(argv[6]) && !JS_IsNull(argv[6])) {
-        protocol = JS_ToCString(ctx, argv[6]);
-        if (protocol == NULL)
-            goto exception;
-    }
-
-    obj = JS_NewObjectClass(ctx, js_lws_wsi_class_id);
-    if (JS_IsException(obj))
-        goto exception;
-
-    wsi_data = js_mallocz(ctx, sizeof(js_lws_wsi_data_t));
-    if (wsi_data == NULL)
-        goto exception;
-    wsi_data->next = data->wsi_list;
-    wsi_data->object = JS_DupValue(ctx, obj);
-    wsi_data->context = JS_DupValue(ctx, this_val);
-    wsi_data->user = JS_DupValue(ctx, argv[7]);
-    wsi_data->in_use = WSI_DATA_USE_OBJECT |  WSI_DATA_USE_LINKED;
-    data->wsi_list = wsi_data;
-    JS_SetOpaque(obj, wsi_data);
-
-    memset(&info, 0, sizeof(info));
-    info.context = data->context;
-    info.address = address;
-    info.port = port;
-    info.ssl_connection = secure ? LCCSCF_USE_SSL : 0;
-    info.local_protocol_name = "lws-client";
-    info.path = path;
-    info.host = host;
-    info.origin = origin;
-    info.protocol = protocol;
-    info.ietf_version_or_minus_one = -1;
-    info.userdata = wsi_data;
-    info.pwsi = &wsi_data->wsi;
-    lws_client_connect_via_info(&info);
-
-    if (wsi_data->wsi) {
-        ret = JS_DupValue(ctx, obj);
-    } else {
-        unlink_wsi(ctx, data, wsi_data);
-        JS_ThrowReferenceError(ctx, "cannot connect to [%s]:%d (%s)",
-                               address, port, secure ? "wss" : "ws");
-    }
-
-exception:
-    JS_FreeCString(ctx, address);
-    JS_FreeCString(ctx, path);
-    JS_FreeCString(ctx, host);
-    JS_FreeCString(ctx, origin);
-    JS_FreeCString(ctx, protocol);
-    JS_FreeValue(ctx, obj);
-
-    return ret;
-}
-
-static JSValue js_lws_service_fd(JSContext *ctx, JSValueConst this_val,
-                                 int argc, JSValueConst *argv)
-{
-    js_lws_context_data_t *data = JS_GetOpaque2(ctx, this_val,
-                                                js_lws_context_class_id);
-    int32_t fd, events, revents;
-    struct lws_pollfd pfd;
-
-    if (data == NULL)
-        return JS_EXCEPTION;
-
-    if (JS_ToInt32(ctx, &fd, argv[0]) < 0)
-        return JS_EXCEPTION;
-
-    if (JS_ToInt32(ctx, &events, argv[1]) < 0)
-        return JS_EXCEPTION;
-
-    if (JS_ToInt32(ctx, &revents, argv[2]) < 0)
-        return JS_EXCEPTION;
-
-    pfd.fd = fd;
-    pfd.events = events;
-    pfd.revents = revents;
-    lws_service_fd(data->context, &pfd);
-
-    return JS_NewInt32(ctx,
-                       lws_service_adjust_timeout(data->context, MAX_WAIT, 0));
-}
-
-static JSValue js_lws_service_periodic(JSContext *ctx, JSValueConst this_val,
-                                       int argc, JSValueConst *argv)
-{
-    js_lws_context_data_t *data = JS_GetOpaque2(ctx, this_val,
-                                                js_lws_context_class_id);
-    int timeout;
-
-    if (data == NULL)
-        return JS_EXCEPTION;
-
-#if LWS_LIBRARY_VERSION_NUMBER < 3002000
-    lws_service_fd(data->context, NULL);
-#endif
-
-    timeout = lws_service_adjust_timeout(data->context, MAX_WAIT, 0);
-    if (timeout == 0) {
-        lws_service(data->context, -1);
-        timeout = lws_service_adjust_timeout(data->context, MAX_WAIT, 0);
-    }
-
-    return JS_NewInt32(ctx, timeout);
-}
-
-static void js_lws_wsi_finalizer(JSRuntime *rt, JSValue val)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque(val, js_lws_wsi_class_id);
-    if (data) {
-        JS_FreeValueRT(rt, data->context);
-        data->context = JS_UNDEFINED;
-        JS_FreeValueRT(rt, data->user);
-        data->user = JS_UNDEFINED;
-
-        data->in_use &= ~WSI_DATA_USE_OBJECT;
-        if (data->in_use == 0)
-            free_wsi_data_rt(rt, data);
-    }
-}
-
-static void js_lws_wsi_mark(JSRuntime *rt, JSValue val,
-                            JS_MarkFunc *mark_func)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque(val, js_lws_wsi_class_id);
-    if (data) {
-        JS_MarkValue(rt, data->context, mark_func);
-        JS_MarkValue(rt, data->user, mark_func);
-    }
-}
-
-static JSValue js_lws_wsi_get_context(JSContext *ctx, JSValueConst this_val)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque2(ctx, this_val, js_lws_wsi_class_id);
-    if (data == NULL)
-        return JS_EXCEPTION;
-    return JS_DupValue(ctx, data->context);
-}
-
-static JSValue js_lws_wsi_get_user(JSContext *ctx, JSValueConst this_val)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque2(ctx, this_val, js_lws_wsi_class_id);
-    if (data == NULL)
-        return JS_EXCEPTION;
-    return JS_DupValue(ctx, data->user);
-}
-
-static JSValue js_lws_wsi_get_hdr(JSContext *ctx, JSValueConst this_val,
-                                  int magic)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque2(ctx, this_val, js_lws_wsi_class_id);
-    int len;
-    char *str;
-    JSValue ret;
-
-    if (data == NULL)
-        return JS_EXCEPTION;
-
-    if (data->wsi == NULL)
-        return JS_ThrowTypeError(ctx, "defunct WSI");
-
-    len = lws_hdr_total_length(data->wsi, magic);
-    if (len < 0)
-        return JS_ThrowReferenceError(ctx, "HTTP headers unavailable");
-
-    len++;
-    str = js_mallocz(ctx, len);
-    if (str == NULL)
-        return JS_EXCEPTION;
-
-    len = lws_hdr_copy(data->wsi, str, len, magic);
-    if (len < 0)
-        ret = JS_ThrowReferenceError(ctx, "HTTP headers unavailable");
-    else
-        ret = JS_NewStringLen(ctx, str, len);
-
-    js_free(ctx, str);
-
-    return ret;
-}
-
-static JSValue js_lws_is_final_fragment(JSContext *ctx, JSValueConst this_val,
-                                        int argc, JSValueConst *argv)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque2(ctx, this_val, js_lws_wsi_class_id);
-    if (data == NULL)
-        return JS_EXCEPTION;
-    if (data->wsi == NULL)
-        return JS_ThrowTypeError(ctx, "defunct WSI");
-    return JS_NewBool(ctx, lws_is_final_fragment(data->wsi));
-}
-
-static JSValue js_lws_is_first_fragment(JSContext *ctx, JSValueConst this_val,
-                                        int argc, JSValueConst *argv)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque2(ctx, this_val, js_lws_wsi_class_id);
-    if (data == NULL)
-        return JS_EXCEPTION;
-    if (data->wsi == NULL)
-        return JS_ThrowTypeError(ctx, "defunct WSI");
-    return JS_NewBool(ctx, lws_is_first_fragment(data->wsi));
-}
-
-static JSValue js_lws_frame_is_binary(JSContext *ctx, JSValueConst this_val,
-                                      int argc, JSValueConst *argv)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque2(ctx, this_val, js_lws_wsi_class_id);
-    if (data == NULL)
-        return JS_EXCEPTION;
-    if (data->wsi == NULL)
-        return JS_ThrowTypeError(ctx, "defunct WSI");
-    return JS_NewBool(ctx, lws_frame_is_binary(data->wsi));
-}
-
-static JSValue js_lws_callback_on_writable(JSContext *ctx,
-                                           JSValueConst this_val,
-                                           int argc, JSValueConst *argv)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque2(ctx, this_val, js_lws_wsi_class_id);
-    if (data == NULL)
-        return JS_EXCEPTION;
-    if (data->wsi == NULL)
-        return JS_ThrowTypeError(ctx, "defunct WSI");
-    lws_callback_on_writable(data->wsi);
-    return JS_UNDEFINED;
-}
-
-static JSValue js_lws_write(JSContext *ctx, JSValueConst this_val,
-                            int argc, JSValueConst *argv)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque2(ctx, this_val, js_lws_wsi_class_id);
-    const char *str = NULL;
-    const uint8_t *ptr;
-    uint8_t *buf;
-    size_t size;
-    enum lws_write_protocol protocol;
-    int ret;
-
-    if (data == NULL)
-        return JS_EXCEPTION;
-
-    if (data->wsi == NULL)
-        return JS_ThrowTypeError(ctx, "defunct WSI");
-
-    if (JS_IsString(argv[0])) {
-        str = JS_ToCStringLen(ctx, &size, argv[0]);
-        if (str == NULL)
-            return JS_EXCEPTION;
-        ptr = (const uint8_t *)str;
-        protocol = LWS_WRITE_TEXT;
-    } else {
-        ptr = JS_GetArrayBuffer(ctx, &size, argv[0]);
-        if (ptr == NULL)
-            return JS_EXCEPTION;
-        protocol = LWS_WRITE_BINARY;
-    }
-
-    buf = js_malloc(ctx, LWS_PRE + size);
-    if (buf)
-        memcpy(buf + LWS_PRE, ptr, size);
-    if (str)
-        JS_FreeCString(ctx, str);
-    if (buf == NULL)
-        return JS_EXCEPTION;
-    ret = lws_write(data->wsi, buf + LWS_PRE, size, protocol);
-    js_free(ctx, buf);
-
-    if (ret < 0)
-        return JS_ThrowTypeError(ctx, "WSI not writable");
-
-    return JS_UNDEFINED;
-}
-
-static JSValue js_lws_close_reason(JSContext *ctx, JSValueConst this_val,
-                                   int argc, JSValueConst *argv)
-{
-    js_lws_wsi_data_t *data = JS_GetOpaque2(ctx, this_val, js_lws_wsi_class_id);
-    int32_t status;
-    const char *reason = NULL;
-    size_t len = 0;
-
-    if (data == NULL)
-        return JS_EXCEPTION;
-
-    if (data->wsi == NULL)
-        return JS_ThrowTypeError(ctx, "defunct WSI");
-
-    if (JS_ToInt32(ctx, &status, argv[0]) < 0)
-        return JS_EXCEPTION;
-
-    if (status < 0 || status > 65535)
-        return JS_ThrowRangeError(ctx, "status must be between 0 and 65535");
-
-    if (!JS_IsUndefined(argv[1])) {
-        reason = JS_ToCStringLen(ctx, &len, argv[1]);
-        if (reason == NULL)
-            return JS_EXCEPTION;
-        if (len > 123) {
-            JS_FreeCString(ctx, reason);
-            return JS_ThrowTypeError(ctx, "reason too long (%zu > 123)", len);
-        }
-    }
-
-    lws_close_reason(data->wsi, status, (uint8_t *)reason, len);
-
-    if (reason)
-        JS_FreeCString(ctx, reason);
-
-    return JS_UNDEFINED;
-}
-
-static const JSCFunctionListEntry js_lws_funcs[] = {
-    CDEF(LLL_ERR),
-    CDEF(LLL_WARN),
-    CDEF(LLL_NOTICE),
-    CDEF(LLL_INFO),
-    CDEF(LLL_DEBUG),
-    CDEF(LLL_PARSER),
-    CDEF(LLL_HEADER),
-    CDEF(LLL_EXT),
-    CDEF(LLL_CLIENT),
-    CDEF(LLL_LATENCY),
-    CDEF(LLL_USER),
-    CDEF(LLL_THREAD),
-    CDEF(LLL_COUNT),
-    CDEF(LWS_CALLBACK_PROTOCOL_INIT),
-    CDEF(LWS_CALLBACK_PROTOCOL_DESTROY),
-    CDEF(LWS_CALLBACK_WSI_CREATE),
-    CDEF(LWS_CALLBACK_WSI_DESTROY),
-    CDEF(LWS_CALLBACK_OPENSSL_LOAD_EXTRA_CLIENT_VERIFY_CERTS),
-    CDEF(LWS_CALLBACK_OPENSSL_LOAD_EXTRA_SERVER_VERIFY_CERTS),
-    CDEF(LWS_CALLBACK_OPENSSL_PERFORM_CLIENT_CERT_VERIFICATION),
-    CDEF(LWS_CALLBACK_OPENSSL_CONTEXT_REQUIRES_PRIVATE_KEY),
-    CDEF(LWS_CALLBACK_SSL_INFO),
-    CDEF(LWS_CALLBACK_OPENSSL_PERFORM_SERVER_CERT_VERIFICATION),
-    CDEF(LWS_CALLBACK_SERVER_NEW_CLIENT_INSTANTIATED),
-    CDEF(LWS_CALLBACK_HTTP),
-    CDEF(LWS_CALLBACK_HTTP_BODY),
-    CDEF(LWS_CALLBACK_HTTP_BODY_COMPLETION),
-    CDEF(LWS_CALLBACK_HTTP_FILE_COMPLETION),
-    CDEF(LWS_CALLBACK_HTTP_WRITEABLE),
-    CDEF(LWS_CALLBACK_CLOSED_HTTP),
-    CDEF(LWS_CALLBACK_FILTER_HTTP_CONNECTION),
-    CDEF(LWS_CALLBACK_ADD_HEADERS),
-    CDEF(LWS_CALLBACK_CHECK_ACCESS_RIGHTS),
-    CDEF(LWS_CALLBACK_PROCESS_HTML),
-    CDEF(LWS_CALLBACK_HTTP_BIND_PROTOCOL),
-    CDEF(LWS_CALLBACK_HTTP_DROP_PROTOCOL),
-    CDEF(LWS_CALLBACK_HTTP_CONFIRM_UPGRADE),
-    CDEF(LWS_CALLBACK_ESTABLISHED_CLIENT_HTTP),
-    CDEF(LWS_CALLBACK_CLOSED_CLIENT_HTTP),
-    CDEF(LWS_CALLBACK_RECEIVE_CLIENT_HTTP_READ),
-    CDEF(LWS_CALLBACK_RECEIVE_CLIENT_HTTP),
-    CDEF(LWS_CALLBACK_COMPLETED_CLIENT_HTTP),
-    CDEF(LWS_CALLBACK_CLIENT_HTTP_WRITEABLE),
-    CDEF(LWS_CALLBACK_CLIENT_HTTP_BIND_PROTOCOL),
-    CDEF(LWS_CALLBACK_CLIENT_HTTP_DROP_PROTOCOL),
-    CDEF(LWS_CALLBACK_ESTABLISHED),
-    CDEF(LWS_CALLBACK_CLOSED),
-    CDEF(LWS_CALLBACK_SERVER_WRITEABLE),
-    CDEF(LWS_CALLBACK_RECEIVE),
-    CDEF(LWS_CALLBACK_RECEIVE_PONG),
-    CDEF(LWS_CALLBACK_WS_PEER_INITIATED_CLOSE),
-    CDEF(LWS_CALLBACK_FILTER_PROTOCOL_CONNECTION),
-    CDEF(LWS_CALLBACK_CONFIRM_EXTENSION_OKAY),
-    CDEF(LWS_CALLBACK_WS_SERVER_BIND_PROTOCOL),
-    CDEF(LWS_CALLBACK_WS_SERVER_DROP_PROTOCOL),
-    CDEF(LWS_CALLBACK_CLIENT_CONNECTION_ERROR),
-    CDEF(LWS_CALLBACK_CLIENT_FILTER_PRE_ESTABLISH),
-    CDEF(LWS_CALLBACK_CLIENT_ESTABLISHED),
-    CDEF(LWS_CALLBACK_CLIENT_CLOSED),
-    CDEF(LWS_CALLBACK_CLIENT_APPEND_HANDSHAKE_HEADER),
-    CDEF(LWS_CALLBACK_CLIENT_RECEIVE),
-    CDEF(LWS_CALLBACK_CLIENT_RECEIVE_PONG),
-    CDEF(LWS_CALLBACK_CLIENT_WRITEABLE),
-    CDEF(LWS_CALLBACK_CLIENT_CONFIRM_EXTENSION_SUPPORTED),
-    CDEF(LWS_CALLBACK_WS_EXT_DEFAULTS),
-    CDEF(LWS_CALLBACK_FILTER_NETWORK_CONNECTION),
-    CDEF(LWS_CALLBACK_WS_CLIENT_BIND_PROTOCOL),
-    CDEF(LWS_CALLBACK_WS_CLIENT_DROP_PROTOCOL),
-    CDEF(LWS_CALLBACK_GET_THREAD_ID),
-    CDEF(LWS_CALLBACK_ADD_POLL_FD),
-    CDEF(LWS_CALLBACK_DEL_POLL_FD),
-    CDEF(LWS_CALLBACK_CHANGE_MODE_POLL_FD),
-    CDEF(LWS_CALLBACK_LOCK_POLL),
-    CDEF(LWS_CALLBACK_UNLOCK_POLL),
-    CDEF(LWS_CALLBACK_CGI),
-    CDEF(LWS_CALLBACK_CGI_TERMINATED),
-    CDEF(LWS_CALLBACK_CGI_STDIN_DATA),
-    CDEF(LWS_CALLBACK_CGI_STDIN_COMPLETED),
-    CDEF(LWS_CALLBACK_CGI_PROCESS_ATTACH),
-    CDEF(LWS_CALLBACK_SESSION_INFO),
-    CDEF(LWS_CALLBACK_GS_EVENT),
-    CDEF(LWS_CALLBACK_HTTP_PMO),
-    CDEF(LWS_CALLBACK_RAW_RX),
-    CDEF(LWS_CALLBACK_RAW_CLOSE),
-    CDEF(LWS_CALLBACK_RAW_WRITEABLE),
-    CDEF(LWS_CALLBACK_RAW_ADOPT),
-    CDEF(LWS_CALLBACK_RAW_SKT_BIND_PROTOCOL),
-    CDEF(LWS_CALLBACK_RAW_SKT_DROP_PROTOCOL),
-    CDEF(LWS_CALLBACK_RAW_ADOPT_FILE),
-    CDEF(LWS_CALLBACK_RAW_RX_FILE),
-    CDEF(LWS_CALLBACK_RAW_WRITEABLE_FILE),
-    CDEF(LWS_CALLBACK_RAW_CLOSE_FILE),
-    CDEF(LWS_CALLBACK_RAW_FILE_BIND_PROTOCOL),
-    CDEF(LWS_CALLBACK_RAW_FILE_DROP_PROTOCOL),
-    CDEF(LWS_CALLBACK_TIMER),
-    CDEF(LWS_CALLBACK_EVENT_WAIT_CANCELLED),
-    CDEF(LWS_CALLBACK_CHILD_CLOSING),
-    CDEF(LWS_CALLBACK_VHOST_CERT_AGING),
-    CDEF(LWS_CALLBACK_VHOST_CERT_UPDATE),
-    CDEF(LWS_CALLBACK_USER),
-    CDEF(LWS_POLLHUP),
-    CDEF(LWS_POLLIN),
-    CDEF(LWS_POLLOUT),
-    JS_CFUNC_DEF("decode_utf8", 1, js_decode_utf8),
-    JS_CFUNC_DEF("set_log_level", 1, js_lws_set_log_level),
-    JS_CFUNC_DEF("create_context", 2, js_lws_create_context),
-};
-
-static const JSClassDef js_lws_context_class = {
-    "Context",
-    .finalizer = js_lws_context_finalizer,
-    .gc_mark = js_lws_context_mark,
-};
-
-static const JSCFunctionListEntry js_lws_context_proto_funcs[] = {
-    JS_CGETSET_DEF("connections", js_lws_context_get_connections, NULL),
-    JS_CFUNC_DEF("client_connect", 8, js_lws_client_connect),
-    JS_CFUNC_DEF("service_fd", 3, js_lws_service_fd),
-    JS_CFUNC_DEF("service_periodic", 0, js_lws_service_periodic),
-};
-
-static const JSClassDef js_lws_wsi_class = {
-    "WSI",
-    .finalizer = js_lws_wsi_finalizer,
-    .gc_mark = js_lws_wsi_mark,
-};
-
-#define HDRGET(name) JS_CGETSET_MAGIC_DEF(#name, js_lws_wsi_get_hdr, NULL, name)
-
-static const JSCFunctionListEntry js_lws_wsi_proto_funcs[] = {
-    JS_CGETSET_DEF("context", js_lws_wsi_get_context, NULL),
-    JS_CGETSET_DEF("user", js_lws_wsi_get_user, NULL),
-    HDRGET(WSI_TOKEN_GET_URI),
-    HDRGET(WSI_TOKEN_POST_URI),
-    HDRGET(WSI_TOKEN_OPTIONS_URI),
-    HDRGET(WSI_TOKEN_HOST),
-    HDRGET(WSI_TOKEN_CONNECTION),
-    HDRGET(WSI_TOKEN_UPGRADE),
-    HDRGET(WSI_TOKEN_ORIGIN),
-    HDRGET(WSI_TOKEN_DRAFT),
-    HDRGET(WSI_TOKEN_CHALLENGE),
-    HDRGET(WSI_TOKEN_EXTENSIONS),
-    HDRGET(WSI_TOKEN_KEY1),
-    HDRGET(WSI_TOKEN_KEY2),
-    HDRGET(WSI_TOKEN_PROTOCOL),
-    HDRGET(WSI_TOKEN_ACCEPT),
-    HDRGET(WSI_TOKEN_NONCE),
-    HDRGET(WSI_TOKEN_HTTP),
-    HDRGET(WSI_TOKEN_HTTP2_SETTINGS),
-    HDRGET(WSI_TOKEN_HTTP_ACCEPT),
-    HDRGET(WSI_TOKEN_HTTP_AC_REQUEST_HEADERS),
-    HDRGET(WSI_TOKEN_HTTP_IF_MODIFIED_SINCE),
-    HDRGET(WSI_TOKEN_HTTP_IF_NONE_MATCH),
-    HDRGET(WSI_TOKEN_HTTP_ACCEPT_ENCODING),
-    HDRGET(WSI_TOKEN_HTTP_ACCEPT_LANGUAGE),
-    HDRGET(WSI_TOKEN_HTTP_PRAGMA),
-    HDRGET(WSI_TOKEN_HTTP_CACHE_CONTROL),
-    HDRGET(WSI_TOKEN_HTTP_AUTHORIZATION),
-    HDRGET(WSI_TOKEN_HTTP_COOKIE),
-    HDRGET(WSI_TOKEN_HTTP_CONTENT_LENGTH),
-    HDRGET(WSI_TOKEN_HTTP_CONTENT_TYPE),
-    HDRGET(WSI_TOKEN_HTTP_DATE),
-    HDRGET(WSI_TOKEN_HTTP_RANGE),
-    HDRGET(WSI_TOKEN_HTTP_REFERER),
-    HDRGET(WSI_TOKEN_KEY),
-    HDRGET(WSI_TOKEN_VERSION),
-    HDRGET(WSI_TOKEN_SWORIGIN),
-    HDRGET(WSI_TOKEN_HTTP_COLON_AUTHORITY),
-    HDRGET(WSI_TOKEN_HTTP_COLON_METHOD),
-    HDRGET(WSI_TOKEN_HTTP_COLON_PATH),
-    HDRGET(WSI_TOKEN_HTTP_COLON_SCHEME),
-    HDRGET(WSI_TOKEN_HTTP_COLON_STATUS),
-    HDRGET(WSI_TOKEN_HTTP_ACCEPT_CHARSET),
-    HDRGET(WSI_TOKEN_HTTP_ACCEPT_RANGES),
-    HDRGET(WSI_TOKEN_HTTP_ACCESS_CONTROL_ALLOW_ORIGIN),
-    HDRGET(WSI_TOKEN_HTTP_AGE),
-    HDRGET(WSI_TOKEN_HTTP_ALLOW),
-    HDRGET(WSI_TOKEN_HTTP_CONTENT_DISPOSITION),
-    HDRGET(WSI_TOKEN_HTTP_CONTENT_ENCODING),
-    HDRGET(WSI_TOKEN_HTTP_CONTENT_LANGUAGE),
-    HDRGET(WSI_TOKEN_HTTP_CONTENT_LOCATION),
-    HDRGET(WSI_TOKEN_HTTP_CONTENT_RANGE),
-    HDRGET(WSI_TOKEN_HTTP_ETAG),
-    HDRGET(WSI_TOKEN_HTTP_EXPECT),
-    HDRGET(WSI_TOKEN_HTTP_EXPIRES),
-    HDRGET(WSI_TOKEN_HTTP_FROM),
-    HDRGET(WSI_TOKEN_HTTP_IF_MATCH),
-    HDRGET(WSI_TOKEN_HTTP_IF_RANGE),
-    HDRGET(WSI_TOKEN_HTTP_IF_UNMODIFIED_SINCE),
-    HDRGET(WSI_TOKEN_HTTP_LAST_MODIFIED),
-    HDRGET(WSI_TOKEN_HTTP_LINK),
-    HDRGET(WSI_TOKEN_HTTP_LOCATION),
-    HDRGET(WSI_TOKEN_HTTP_MAX_FORWARDS),
-    HDRGET(WSI_TOKEN_HTTP_PROXY_AUTHENTICATE),
-    HDRGET(WSI_TOKEN_HTTP_PROXY_AUTHORIZATION),
-    HDRGET(WSI_TOKEN_HTTP_REFRESH),
-    HDRGET(WSI_TOKEN_HTTP_RETRY_AFTER),
-    HDRGET(WSI_TOKEN_HTTP_SERVER),
-    HDRGET(WSI_TOKEN_HTTP_SET_COOKIE),
-    HDRGET(WSI_TOKEN_HTTP_STRICT_TRANSPORT_SECURITY),
-    HDRGET(WSI_TOKEN_HTTP_TRANSFER_ENCODING),
-    HDRGET(WSI_TOKEN_HTTP_USER_AGENT),
-    HDRGET(WSI_TOKEN_HTTP_VARY),
-    HDRGET(WSI_TOKEN_HTTP_VIA),
-    HDRGET(WSI_TOKEN_HTTP_WWW_AUTHENTICATE),
-    HDRGET(WSI_TOKEN_PATCH_URI),
-    HDRGET(WSI_TOKEN_PUT_URI),
-    HDRGET(WSI_TOKEN_DELETE_URI),
-    HDRGET(WSI_TOKEN_HTTP_URI_ARGS),
-    HDRGET(WSI_TOKEN_PROXY),
-    HDRGET(WSI_TOKEN_HTTP_X_REAL_IP),
-    HDRGET(WSI_TOKEN_HTTP1_0),
-    HDRGET(WSI_TOKEN_X_FORWARDED_FOR),
-    HDRGET(WSI_TOKEN_CONNECT),
-    HDRGET(WSI_TOKEN_HEAD_URI),
-    HDRGET(WSI_TOKEN_TE),
-    HDRGET(WSI_TOKEN_REPLAY_NONCE),
-    HDRGET(WSI_TOKEN_COLON_PROTOCOL),
-    HDRGET(WSI_TOKEN_X_AUTH_TOKEN),
-    JS_CFUNC_DEF("is_final_fragment", 0, js_lws_is_final_fragment),
-    JS_CFUNC_DEF("is_first_fragment", 0, js_lws_is_first_fragment),
-    JS_CFUNC_DEF("frame_is_binary", 0, js_lws_frame_is_binary),
-    JS_CFUNC_DEF("callback_on_writable", 0, js_lws_callback_on_writable),
-    JS_CFUNC_DEF("write", 1, js_lws_write),
-    JS_CFUNC_DEF("close_reason", 2, js_lws_close_reason),
-};
-
-static int js_lws_init(JSContext *ctx, JSModuleDef *m)
-{
-    JSValue proto;
-
-    JS_NewClassID(&js_lws_context_class_id);
-    JS_NewClass(JS_GetRuntime(ctx), js_lws_context_class_id,
-                &js_lws_context_class);
-    proto = JS_NewObject(ctx);
-    JS_SetPropertyFunctionList(ctx, proto, js_lws_context_proto_funcs,
-                               countof(js_lws_context_proto_funcs));
-    JS_SetClassProto(ctx, js_lws_context_class_id, proto);
-
-    JS_NewClassID(&js_lws_wsi_class_id);
-    JS_NewClass(JS_GetRuntime(ctx), js_lws_wsi_class_id, &js_lws_wsi_class);
-    proto = JS_NewObject(ctx);
-    JS_SetPropertyFunctionList(ctx, proto, js_lws_wsi_proto_funcs,
-                               countof(js_lws_wsi_proto_funcs));
-    JS_SetClassProto(ctx, js_lws_wsi_class_id, proto);
-
-    return JS_SetModuleExportList(ctx, m, js_lws_funcs, countof(js_lws_funcs));
-}
-
-JSModuleDef *js_init_module(JSContext *ctx, const char *module_name)
-{
-    JSModuleDef *m = JS_NewCModule(ctx, module_name, js_lws_init);
-    if (m == NULL)
-        return NULL;
-    JS_AddModuleExportList(ctx, m, js_lws_funcs, countof(js_lws_funcs));
-    return m;
-}
--- a/quickjs-websocket/src/websocket.js
+++ b/quickjs-websocket/src/websocket.js
@@ -1,415 +0,0 @@
-/*
- * Copyright (c) 2020 Genexis B.V.
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-import * as os from 'os'
-import * as lws from './lws-client.so'
-
-const CONNECTING = 0
-const OPEN = 1
-const CLOSING = 2
-const CLOSED = 3
-
-const CLOSING1 = 0x10 | CLOSING
-const CLOSING2 = 0x20 | CLOSING
-
-function serviceScheduler (context) {
-  let running = false
-  let timeout = null
-
-  function schedule (time) {
-    if (timeout) os.clearTimeout(timeout)
-    timeout = running ? os.setTimeout(callback, time) : null
-  }
-
-  function callback () {
-    schedule(context.service_periodic())
-  }
-
-  return {
-    start: function () {
-      running = true
-      schedule(0)
-    },
-    stop: function () {
-      running = false
-      schedule(0)
-    },
-    reschedule: schedule
-  }
-}
-
-function fdHandler (fd, events, revents) {
-  return function () {
-    service.reschedule(context.service_fd(fd, events, revents))
-  }
-}
-
-function contextCallback (wsi, reason, arg) {
-  switch (reason) {
-    case lws.LWS_CALLBACK_ADD_POLL_FD:
-      service.start()
-      // fallthrough
-    case lws.LWS_CALLBACK_CHANGE_MODE_POLL_FD:
-      os.setReadHandler(
-        arg.fd,
-        (arg.events & lws.LWS_POLLIN)
-          ? fdHandler(arg.fd, arg.events, lws.LWS_POLLIN)
-          : null
-      )
-      os.setWriteHandler(
-        arg.fd,
-        (arg.events & lws.LWS_POLLOUT)
-          ? fdHandler(arg.fd, arg.events, lws.LWS_POLLOUT)
-          : null
-      )
-      break
-    case lws.LWS_CALLBACK_DEL_POLL_FD:
-      os.setReadHandler(arg.fd, null)
-      os.setWriteHandler(arg.fd, null)
-      break
-    case lws.LWS_CALLBACK_CLIENT_CONNECTION_ERROR:
-      wsi.user.error(typeof arg === 'string' ? arg : '')
-      break
-    case lws.LWS_CALLBACK_CLIENT_FILTER_PRE_ESTABLISH:
-      if (wsi.user.readyState !== CONNECTING) {
-        return -1
-      }
-      wsi.user.protocol = wsi.WSI_TOKEN_PROTOCOL
-      wsi.user.extensions = wsi.WSI_TOKEN_EXTENSIONS
-      break
-    case lws.LWS_CALLBACK_CLIENT_ESTABLISHED:
-      if (wsi.user.readyState !== CONNECTING) {
-        return -1
-      }
-      wsi.user.wsi = wsi
-      wsi.user.open()
-      break
-    case lws.LWS_CALLBACK_WS_PEER_INITIATED_CLOSE:
-      if (wsi.user.readyState === CLOSED) {
-        return -1
-      }
-      if (arg instanceof Array) {
-        wsi.user.closeEvent.code = arg[0]
-        wsi.user.closeEvent.reason = arg[1]
-      } else {
-        wsi.user.closeEvent.code = 1005
-        wsi.user.closeEvent.reason = ''
-      }
-      wsi.user.readyState = CLOSING2
-      break
-    case lws.LWS_CALLBACK_CLIENT_CLOSED:
-      wsi.user.close()
-      break
-    case lws.LWS_CALLBACK_CLIENT_RECEIVE:
-      if (!(arg instanceof ArrayBuffer) ||
-          wsi.user.readyState === CONNECTING ||
-          wsi.user.readyState === CLOSED) {
-        return -1
-      }
-      if (wsi.is_first_fragment()) {
-        wsi.user.inbuf = []
-      }
-      wsi.user.inbuf.push(arg)
-      if (wsi.is_final_fragment()) {
-        wsi.user.message(wsi.frame_is_binary())
-      }
-      break
-    case lws.LWS_CALLBACK_CLIENT_WRITEABLE:
-      if ((wsi.user.readyState === OPEN || wsi.user.readyState === CLOSING1) &&
-          wsi.user.outbuf.length > 0) {
-        const msg = wsi.user.outbuf.shift()
-        if (msg === null) {
-          wsi.user.readyState = CLOSING2
-          return -1
-        }
-        wsi.write(msg)
-        if (wsi.user.outbuf.length > 0) {
-          wsi.callback_on_writable()
-        }
-      }
-      break
-    case lws.LWS_CALLBACK_WSI_DESTROY:
-      if (wsi.context.connections === 0) service.stop()
-      break
-  }
-
-  return 0
-}
-
-lws.set_log_level(lws.LLL_ERR | lws.LLL_WARN)
-const context = lws.create_context(contextCallback, true)
-const service = serviceScheduler(context)
-
-function arrayBufferJoin (bufs) {
-  if (!(bufs instanceof Array)) {
-    throw new TypeError('Array expected')
-  }
-
-  if (!bufs.every(function (val) { return val instanceof ArrayBuffer })) {
-    throw new TypeError('ArrayBuffer expected')
-  }
-
-  const len = bufs.reduce(function (acc, val) {
-    return acc + val.byteLength
-  }, 0)
-  const array = new Uint8Array(len)
-
-  let offset = 0
-  for (const b of bufs) {
-    array.set(new Uint8Array(b), offset)
-    offset += b.byteLength
-  }
-
-  return array.buffer
-}
-
-export function WebSocket (url, protocols) {
-  const pattern = /^(ws|wss):\/\/([^/?#]*)([^#]*)$/i
-  const match = pattern.exec(url)
-  if (match === null) {
-    throw new TypeError('invalid WebSocket URL')
-  }
-  const secure = match[1].toLowerCase() === 'wss'
-  const host = match[2]
-  const path = match[3].startsWith('/') ? match[3] : '/' + match[3]
-
-  const hostPattern = /^(?:([a-z\d.-]+)|\[([\da-f:]+:[\da-f.]*)\])(?::(\d*))?$/i
-  const hostMatch = hostPattern.exec(host)
-  if (hostMatch === null) {
-    throw new TypeError('invalid WebSocket URL')
-  }
-  const address = hostMatch[1] || hostMatch[2]
-  const port = hostMatch[3] ? parseInt(hostMatch[3]) : (secure ? 443 : 80)
-
-  const validPath = /^\/[A-Za-z0-9_.!~*'()%:@&=+$,;/?-]*$/
-  if (!validPath.test(path)) {
-    throw new TypeError('invalid WebSocket URL')
-  }
-  if (!(port >= 1 && port <= 65535)) {
-    throw new RangeError('port must be between 1 and 65535')
-  }
-
-  if (protocols === undefined) {
-    protocols = []
-  } else if (!(protocols instanceof Array)) {
-    protocols = [protocols]
-  }
-  const validProto = /^[A-Za-z0-9!#$%&'*+.^_|~-]+$/
-  if (!protocols.every(function (val) { return validProto.test(val) })) {
-    throw new TypeError('invalid WebSocket subprotocol name')
-  }
-  const proto = protocols.length > 0 ? protocols.join(', ') : null
-
-  const self = this
-  const state = {
-    url: url,
-    readyState: CONNECTING,
-    extensions: '',
-    protocol: '',
-    onopen: null,
-    onerror: null,
-    onclose: null,
-    onmessage: null,
-    wsi: null,
-    inbuf: [],
-    outbuf: [],
-    closeEvent: {
-      type: 'close',
-      code: 1005,
-      reason: '',
-      wasClean: false
-    },
-    open: function () {
-      if (state.readyState === CONNECTING) {
-        state.readyState = OPEN
-        if (state.onopen) {
-          state.onopen.call(self, { type: 'open' })
-        }
-      }
-    },
-    error: function (e) {
-      if (state.readyState !== CLOSED) {
-        state.closeEvent.code = 1006
-        state.closeEvent.reason = String(e)
-        state.readyState = CLOSED
-        try {
-          if (state.onerror) {
-            state.onerror.call(self, { type: 'error' })
-          }
-        } finally {
-          if (state.onclose) {
-            state.onclose.call(self, Object.assign({}, state.closeEvent))
-          }
-        }
-      }
-    },
-    close: function () {
-      if (state.readyState !== CLOSED) {
-        state.closeEvent.wasClean = true
-        state.readyState = CLOSED
-        if (state.onclose) {
-          state.onclose.call(self, Object.assign({}, state.closeEvent))
-        }
-      }
-    },
-    message: function (binary) {
-      if (state.inbuf.length > 0) {
-        const msg = state.inbuf.length === 1
-          ? state.inbuf[0]
-          : arrayBufferJoin(state.inbuf)
-        state.inbuf = []
-        if (state.readyState === OPEN && state.onmessage) {
-          state.onmessage.call(self, {
-            type: 'messasge',
-            data: binary ? msg : lws.decode_utf8(msg)
-          })
-        }
-      }
-    }
-  }
-  this._wsState = state
-
-  os.setTimeout(function () {
-    try {
-      context.client_connect(
-        address, port, secure, path, host, null, proto, state
-      )
-    } catch (e) {
-      state.error(e)
-    }
-  }, 0)
-}
-
-const readyStateConstants = {
-  CONNECTING: { value: CONNECTING },
-  OPEN: { value: OPEN },
-  CLOSING: { value: CLOSING },
-  CLOSED: { value: CLOSED }
-}
-
-Object.defineProperties(WebSocket, readyStateConstants)
-Object.defineProperties(WebSocket.prototype, readyStateConstants)
-
-function checkNullOrFunction (val) {
-  if (val !== null && typeof val !== 'function') {
-    throw new TypeError('null or Function expected')
-  }
-}
-
-Object.defineProperties(WebSocket.prototype, {
-  url: { get: function () { return this._wsState.url } },
-  readyState: { get: function () { return this._wsState.readyState & 0xf } },
-  extensions: { get: function () { return this._wsState.extensions } },
-  protocol: { get: function () { return this._wsState.protocol } },
-  bufferedAmount: {
-    get: function () {
-      return this._wsState.outbuf.reduce(function (acc, val) {
-        if (val instanceof ArrayBuffer) {
-          acc += val.byteLength
-        } else if (typeof val === 'string') {
-          acc += val.length
-        }
-        return acc
-      }, 0)
-    }
-  },
-  binaryType: {
-    get: function () { return 'arraybuffer' },
-    set: function (val) {
-      if (val !== 'arraybuffer') {
-        throw new TypeError('only "arraybuffer" allowed for "binaryType"')
-      }
-    }
-  },
-  onopen: {
-    get: function () { return this._wsState.onopen },
-    set: function (val) {
-      checkNullOrFunction(val)
-      this._wsState.onopen = val
-    }
-  },
-  onerror: {
-    get: function () { return this._wsState.onerror },
-    set: function (val) {
-      checkNullOrFunction(val)
-      this._wsState.onerror = val
-    }
-  },
-  onclose: {
-    get: function () { return this._wsState.onclose },
-    set: function (val) {
-      checkNullOrFunction(val)
-      this._wsState.onclose = val
-    }
-  },
-  onmessage: {
-    get: function () { return this._wsState.onmessage },
-    set: function (val) {
-      checkNullOrFunction(val)
-      this._wsState.onmessage = val
-    }
-  }
-})
-
-WebSocket.prototype.close = function (code, reason) {
-  if (code !== undefined) {
-    code = Math.trunc(code)
-    reason = reason === undefined ? '' : String(reason)
-    if (code !== 1000 && !(code >= 3000 && code <= 4999)) {
-      throw new RangeError('code must be 1000 or between 3000 and 4999')
-    }
-  }
-  const state = this._wsState
-  if (state.readyState === OPEN) {
-    if (code !== undefined) {
-      state.wsi.close_reason(code, reason)
-      state.closeEvent.code = code
-      state.closeEvent.reason = reason
-    }
-    state.readyState = CLOSING1
-    state.outbuf.push(null)
-    state.wsi.callback_on_writable()
-  } else if (state.readyState === CONNECTING) {
-    state.readyState = CLOSING2
-  }
-}
-
-WebSocket.prototype.send = function (msg) {
-  const state = this._wsState
-  if (state.readyState === CONNECTING) {
-    throw new TypeError('send() not allowed in CONNECTING state')
-  }
-  if (msg instanceof ArrayBuffer) {
-    state.outbuf.push(msg.slice(0))
-  } else if (ArrayBuffer.isView(msg)) {
-    state.outbuf.push(
-      msg.buffer.slice(msg.byteOffset, msg.byteOffset + msg.byteLength)
-    )
-  } else {
-    state.outbuf.push(String(msg))
-  }
-  if (state.readyState === OPEN) {
-    state.wsi.callback_on_writable()
-  }
-}
--- a/quickjs/Makefile
+++ b/quickjs/Makefile
@@ -1,55 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=quickjs
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://github.com/bellard/quickjs.git
-PKG_SOURCE_DATE:=2020-11-08
-PKG_SOURCE_VERSION:=204682fb87ab9312f0cf81f959ecd181180457bc
-PKG_MIRROR_HASH:=skip
-PKG_LICENSE:=MIT
-
-PKG_INSTALL:=1
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/quickjs
-  SECTION:=lang
-  CATEGORY:=Languages
-  TITLE:=QuickJS Javascript engine
-  URL:=https://bellard.org/quickjs/
-  MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
-  DEPENDS:=+libatomic
-endef
-
-define Package/quickjs/description
-  QuickJS is a small and embeddable Javascript engine. It supports
-  the ES2020 specification including modules, asynchronous
-  generators, proxies and BigInt.
-endef
-
-MAKE_VARS += \
-	LIBS="-latomic"
-
-MAKE_FLAGS = \
-	prefix=/usr \
-	CONFIG_SMALL=y \
-	CROSS_PREFIX="$(TARGET_CROSS)"
-
-define Build/InstallDev
-	$(INSTALL_DIR) $(1)/usr/lib/quickjs
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/quickjs/libquickjs.a $(1)/usr/lib/quickjs/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/quickjs/libquickjs.lto.a $(1)/usr/lib/quickjs/
-	$(INSTALL_DIR) $(1)/usr/include/quickjs
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/quickjs/quickjs.h $(1)/usr/include/quickjs/
-	$(CP) $(PKG_INSTALL_DIR)/usr/include/quickjs/quickjs-libc.h $(1)/usr/include/quickjs/
-endef
-
-define Package/quickjs/install
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/qjs $(1)/usr/bin/
-endef
-
-$(eval $(call BuildPackage,quickjs))
--- a/quickjs/patches/000-build-options.patch
+++ b/quickjs/patches/000-build-options.patch
@@ -1,96 +0,0 @@
-diff --git a/Makefile b/Makefile
-index e6ae827..bbd3ce8 100644
--- a/Makefile
-+++ b/Makefile
-@@ -33,6 +33,8 @@ CONFIG_LTO=y
- #CONFIG_WERROR=y
- # force 32 bit build for some utilities
- #CONFIG_M32=y
-+# build with -Os instead of -O2
-+#CONFIG_SMALL=y
- 
- ifdef CONFIG_DARWIN
- # use clang instead of gcc
-@@ -52,6 +54,13 @@ CONFIG_BIGNUM=y
- 
- OBJDIR=.obj
- 
-+CFLAGS_ENV:=$(CFLAGS)
-+LDFLAGS_ENV:=$(LDFLAGS)
-+
-+HOST_BUILD=
-+CFLAGS=$(if $(HOST_BUILD),,$(CFLAGS_ENV))
-+LDFLAGS=$(if $(HOST_BUILD),,$(LDFLAGS_ENV))
-+
- ifdef CONFIG_WIN32
-   ifdef CONFIG_M32
-     CROSS_PREFIX=i686-w64-mingw32-
-@@ -66,7 +75,7 @@ endif
- ifdef CONFIG_CLANG
-   HOST_CC=clang
-   CC=$(CROSS_PREFIX)clang
-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
-+  CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
-   CFLAGS += -Wextra
-   CFLAGS += -Wno-sign-compare
-   CFLAGS += -Wno-missing-field-initializers
-@@ -87,7 +96,7 @@ ifdef CONFIG_CLANG
- else
-   HOST_CC=gcc
-   CC=$(CROSS_PREFIX)gcc
-  CFLAGS=-g -Wall -MMD -MF $(OBJDIR)/$(@F).d
-+  CFLAGS += -g -Wall -MMD -MF $(OBJDIR)/$(@F).d
-   CFLAGS += -Wno-array-bounds -Wno-format-truncation
-   ifdef CONFIG_LTO
-     AR=$(CROSS_PREFIX)gcc-ar
-@@ -110,9 +119,13 @@ endif
- CFLAGS+=$(DEFINES)
- CFLAGS_DEBUG=$(CFLAGS) -O0
- CFLAGS_SMALL=$(CFLAGS) -Os
-+ifdef CONFIG_SMALL
-+CFLAGS_OPT=$(CFLAGS) -Os
-+else
- CFLAGS_OPT=$(CFLAGS) -O2
-+endif
- CFLAGS_NOLTO:=$(CFLAGS_OPT)
-LDFLAGS=-g
-+LDFLAGS+=-g
- ifdef CONFIG_LTO
- CFLAGS_SMALL+=-flto
- CFLAGS_OPT+=-flto
-@@ -175,7 +188,7 @@ QJS_OBJS+=$(OBJDIR)/qjscalc.o
- endif
- 
- HOST_LIBS=-lm -ldl -lpthread
-LIBS=-lm
-+LIBS+=-lm
- ifndef CONFIG_WIN32
- LIBS+=-ldl -lpthread
- endif
-@@ -194,6 +207,8 @@ qjsc$(EXE): $(OBJDIR)/qjsc.o $(QJS_LIB_OBJS)
- 
- ifneq ($(CROSS_PREFIX),)
- 
-+$(QJSC): HOST_BUILD=1
-+
- $(QJSC): $(OBJDIR)/qjsc.host.o \
-     $(patsubst %.o, %.host.o, $(QJS_LIB_OBJS))
- 	$(HOST_CC) $(LDFLAGS) -o $@ $^ $(HOST_LIBS)
-@@ -261,6 +276,8 @@ run-test262-32: $(patsubst %.o, %.m32.o, $(OBJDIR)/run-test262.o $(QJS_LIB_OBJS)
- $(OBJDIR)/%.o: %.c | $(OBJDIR)
- 	$(CC) $(CFLAGS_OPT) -c -o $@ $<
- 
-+$(OBJDIR)/%.host.o: HOST_BUILD=1
-+
- $(OBJDIR)/%.host.o: %.c | $(OBJDIR)
- 	$(HOST_CC) $(CFLAGS_OPT) -c -o $@ $<
- 
-@@ -285,6 +302,8 @@ $(OBJDIR)/%.check.o: %.c | $(OBJDIR)
- regexp_test: libregexp.c libunicode.c cutils.c
- 	$(CC) $(LDFLAGS) $(CFLAGS) -DTEST -o $@ libregexp.c libunicode.c cutils.c $(LIBS)
- 
-+unicode_gen: HOST_BUILD=1
-+
- unicode_gen: $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o libunicode.c unicode_gen_def.h
- 	$(HOST_CC) $(LDFLAGS) $(CFLAGS) -o $@ $(OBJDIR)/unicode_gen.host.o $(OBJDIR)/cutils.host.o
- 
--- a/quickjs/patches/001-no-fenv-dtoa-libbf.patch
+++ b/quickjs/patches/001-no-fenv-dtoa-libbf.patch
@@ -1,106 +0,0 @@
-diff --git a/quickjs.c b/quickjs.c
-index a39ff8f..635c506 100644
--- a/quickjs.c
-+++ b/quickjs.c
-@@ -65,6 +65,16 @@
- #define CONFIG_PRINTF_RNDN
- #endif
- 
-+#ifdef CONFIG_PRINTF_RNDN
-+#if !defined(FE_DOWNWARD) || !defined(FE_UPWARD)
-+#ifdef CONFIG_BIGNUM
-+#define CONFIG_DTOA_LIBBF
-+#else
-+#error "CONFIG_BIGNUM required if printf is RNDN and there is no fenv support"
-+#endif
-+#endif
-+#endif
-+
- /* define to include Atomics.* operations which depend on the OS
-    threads */
- #if !defined(EMSCRIPTEN)
-@@ -11253,6 +11263,11 @@ static char *i64toa(char *buf_end, int64_t n, unsigned int base)
-     return q;
- }
- 
-+/* maximum buffer size for js_dtoa */
-+#define JS_DTOA_BUF_SIZE 128
-+
-+#ifndef CONFIG_DTOA_LIBBF
-+
- /* buf1 contains the printf result */
- static void js_ecvt1(double d, int n_digits, int *decpt, int *sign, char *buf,
-                      int rounding_mode, char *buf1, int buf1_size)
-@@ -11272,9 +11287,6 @@ static void js_ecvt1(double d, int n_digits, int *decpt, int *sign, char *buf,
-     *decpt = atoi(buf1 + n_digits + 2 + (n_digits > 1)) + 1;
- }
- 
-/* maximum buffer size for js_dtoa */
-#define JS_DTOA_BUF_SIZE 128
-
- /* needed because ecvt usually limits the number of digits to
-    17. Return the number of digits. */
- static int js_ecvt(double d, int n_digits, int *decpt, int *sign, char *buf,
-@@ -11383,6 +11395,8 @@ static void js_fcvt(char *buf, int buf_size, double d, int n_digits)
-     js_fcvt1(buf, buf_size, d, n_digits, rounding_mode);
- }
- 
-+#endif /* CONFIG_DTOA_LIBBF */
-+
- /* radix != 10 is only supported with flags = JS_DTOA_VAR_FORMAT */
- /* use as many digits as necessary */
- #define JS_DTOA_VAR_FORMAT   (0 << 0)
-@@ -11396,8 +11410,10 @@ static void js_fcvt(char *buf, int buf_size, double d, int n_digits)
- /* XXX: slow and maybe not fully correct. Use libbf when it is fast enough.
-    XXX: radix != 10 is only supported for small integers
- */
-static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
-+static JSValue js_dtoa(JSContext *ctx,
-+                       double d, int radix, int n_digits, int flags)
- {
-+    char buf[JS_DTOA_BUF_SIZE];
-     char *q;
- 
-     if (!isfinite(d)) {
-@@ -11419,6 +11435,25 @@ static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
-         ptr = i64toa(buf1 + sizeof(buf1), i64, radix);
-         strcpy(buf, ptr);
-     } else {
-+#ifdef CONFIG_DTOA_LIBBF
-+        bf_flags_t bf_flags;
-+    generic_conv:
-+        bf_flags = BF_RNDNA;
-+        switch (flags & 3) {
-+        case JS_DTOA_VAR_FORMAT:
-+            bf_flags |= BF_FTOA_FORMAT_FREE_MIN;
-+            break;
-+        case JS_DTOA_FIXED_FORMAT:
-+            bf_flags |= BF_FTOA_FORMAT_FIXED;
-+            break;
-+        case JS_DTOA_FRAC_FORMAT:
-+            bf_flags |= BF_FTOA_FORMAT_FRAC;
-+            break;
-+        }
-+        if (flags & JS_DTOA_FORCE_EXP)
-+            bf_flags |= BF_FTOA_FORCE_EXP;
-+        return js_ftoa(ctx, JS_NewFloat64(ctx, d), radix, n_digits, bf_flags);
-+#else /* CONFIG_DTOA_LIBBF */
-         if (d == 0.0)
-             d = 0.0; /* convert -0 to 0 */
-         if (flags == JS_DTOA_FRAC_FORMAT) {
-@@ -11482,14 +11517,8 @@ static void js_dtoa1(char *buf, double d, int radix, int n_digits, int flags)
-                 sprintf(q, "%d", p);
-             }
-         }
-+#endif /* CONFIG_DTOA_LIBBF */
-     }
-}
-
-static JSValue js_dtoa(JSContext *ctx,
-                       double d, int radix, int n_digits, int flags)
-{
-    char buf[JS_DTOA_BUF_SIZE];
-    js_dtoa1(buf, d, radix, n_digits, flags);
-     return JS_NewString(ctx, buf);
- }
- 
--- a/rulengd/Makefile
+++ b/rulengd/Makefile
@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=rulengd
-PKG_VERSION:=1.2.6
+PKG_VERSION:=1.2.3
 PKG_RELEASE:=1
 PKG_BUILD_PARALLEL:=1
 PKG_INSTALL:=1

 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=e323bebe85cd7fb4eeb6cee535188227bc9b81e3
+PKG_SOURCE_VERSION:=f5ded45562189a05f3912182d708bcb1427912f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
--- a/sulu/Makefile
+++ b/sulu/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu
-PKG_VERSION:=0.2.27
+PKG_VERSION:=0.2.17

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

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
--- a/sulu/files/etc/init.d/sulu
+++ b/sulu/files/etc/init.d/sulu
@@ -1,27 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=10
-
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t sulu.init -p debug
-}
-
-start_service() {
-	procd_open_instance sulu
-	# append sulu connection injection
-	procd_close_instance
-
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers()
-{
-	procd_add_config_trigger "config.change" "obuspa" /etc/init.d/sulu reload
-}
--- a/sulu/files/etc/nginx/conf.d/sulu.locations
+++ b/sulu/files/etc/nginx/conf.d/sulu.locations
@@ -0,0 +1,18 @@
+# proxy required for nginx to save the file
+location /upload_proxy {
+    return 200 "File upload is successful \n";
+}
+
+location /upload {
+	limit_except POST { deny all; }
+	client_body_temp_path /tmp/sulu; # the directory to which uploads will be saved, make sure to create the directory you wish to use
+	client_body_in_file_only on;
+	client_body_buffer_size 128K;
+	client_max_body_size 50M;
+	proxy_pass_request_headers on;
+	proxy_set_header X-FILE $request_body_file;
+	proxy_set_body $request_body_file;
+	proxy_redirect off;
+	#proxy_pass is necessary. body is only stored when being passed to middleware, so we are providing a proxy that just returns 200.
+	proxy_pass http://127.0.0.1:8080/upload_proxy;
+}
--- a/sulu/files/etc/uci-defaults/90-sulu-set-nginx-conf
+++ b/sulu/files/etc/uci-defaults/90-sulu-set-nginx-conf
@@ -1,9 +1,7 @@
 mkdir -p /tmp/sulu
-
-uci -q get nginx._sulu && exit 0
-
 uci -q set nginx._sulu=server
 uci -q add_list nginx._sulu.listen='8080'
 uci -q add_list nginx._sulu.listen='[::]:8080'
+uci -q add_list nginx._sulu.include='conf.d/sulu.locations'
 uci -q set nginx._sulu.root='/sulu'
 uci -q set nginx._sulu.server_name='_sulu'
--- a/Show More
+++ b/Show More