Dectmngr: add a uci option dect.global.log_level for log level configuration

Change the way to configure tx/rx gain

bbf/Config_bbfdm.in

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

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=5.0.8
+PKG_VERSION:=6.4.27
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3b1b7b37e0bc0eeec5c3da69773f16b9e4efa60b
+PKG_SOURCE_VERSION:=710485a57e311a5b4c5434efe3e79fc58cb6c429
 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:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=BBF
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
   TITLE:=Library for libbbfdm API
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
 define Package/libbbfdm
-  SECTION:=libs
-  CATEGORY:=Libraries
-  SUBMENU:=BBF
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
   TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libmbedtls +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libcurl
 endef
 
 define Package/libbbfdm/config
@@ -81,11 +81,6 @@ CONFIGURE_ARGS += \
 	--enable-libopenssl
 endif
 
-ifeq ($(CONFIG_PACKAGE_libmbedtls),y)
-CONFIGURE_ARGS += \
-	--enable-libmbedtls
-endif
-
 ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
 CONFIGURE_ARGS += \
 	--enable-vendor-extension
@@ -96,36 +91,48 @@ CONFIGURE_ARGS += \
 
 endif ##CONFIG_BBF_VENDOR_EXTENSION
 
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+CONFIGURE_ARGS += \
+	--enable-json-plugin
+endif
+
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+CONFIGURE_ARGS += \
+	--enable-shared-library
+endif
+
 define Package/libbbf_api/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
 endef
 
 define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef
 
 define Package/libbbfdm/prerm
 	#!/bin/sh
-	rm -rf /etc/bbfdm/*
+	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
 endef
 
 define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
 	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(CP) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(CP) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/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/
 endef
 
 $(eval $(call BuildPackage,libbbf_api))

bulkdata/Makefile

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

crun/Makefile

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

dectmngr/Config.in

@@ -0,0 +1,11 @@
+if PACKAGE_dectmngr
+
+menu "Configuration"
+
+config ENABLE_LINE_SETTINGS_EXTENSION
+	bool "Enable Line Settings List extension "
+	default y
+
+endmenu
+
+endif

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.1.17
+PKG_VERSION:=3.5.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0a0b9cb7ef5f82c6f129681a76d8ebc671b7cbd2
+PKG_SOURCE_VERSION:=ef9d4c6124d0ca66f048f3d678d9a25f13aa4207
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,29 +34,40 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci
+	DEPENDS:= +libubox +ubus +uci +libxml2
 endef
 
 define Package/$(PKG_NAME)/description
 	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
 
-MAKE_FLAGS += \
-	CFLAGS+="-Wall"
+TARGET_CFLAGS += \
+	-Wall \
+	-I$(STAGING_DIR)/usr/include/libxml2
+
+ifeq ($(CONFIG_ENABLE_LINE_SETTINGS_EXTENSION),y)
+TARGET_CFLAGS += -DENABLE_LINE_SETTINGS_EXTENSION
+endif
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/app/dectmngr $(1)/usr/sbin/
 	$(STRIP) $(1)/usr/sbin/dectmngr
 	$(CP) ./files/etc/* $(1)/etc/
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/dect $(1)/lib/upgrade/keep.d/dect
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

dectmngr/files/etc/config/dect

@@ -1,2 +1,3 @@
 config dect 'global'
-	option log_dect_cmbs '0'
+ 	option log_dect_cmbs 'syslog'
+        option log_level 'realtime,warning,error'

dectmngr/files/etc/init.d/dectmngr

@@ -26,6 +26,7 @@ start_service() {
 	local opt_ext=
 	local rfpi=
 	local model_id=
+	local rxtun=
 
 	test $(db get hw.board.hasDect) = "0" && return
 
@@ -34,24 +35,33 @@ 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)
-	# 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"
+	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_bool log_dect_cmbs global log_dect_cmbs 0
+	config_get log_dect_cmbs global log_dect_cmbs syslog
 
 	procd_open_instance
-	if [ $log_dect_cmbs -eq 0 ]; then
+	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/*
-	else
-		echo "Starting dectmngr with cmbs logging enabled"
+	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 respawn 6 2 3
 	procd_set_param term_timeout 20
 	procd_set_param triggers asterisk
@@ -66,13 +76,13 @@ stop_service() {
 }
 
 reload_service() {
-	stop_and_wait_dectmngr
-	start
+	ubus call dect reload
 }
 
 service_triggers()
 {
-	procd_add_reload_trigger asterisk dect
+	procd_add_config_trigger "config.change" "asterisk" /etc/init.d/dectmngr restart
+	procd_add_config_trigger "config.change" "dect" /etc/init.d/dectmngr reload
 }
 
 boot() {

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

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

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";;

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

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;;

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.3.4
+PKG_VERSION:=6.4.40
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a82d64c15dec32e032ff36f6b9bbbb707010c93e
+PKG_SOURCE_VERSION:=699744d5ae9e043715c260f9b58bbc18747895f9
 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
@@ -32,7 +32,6 @@ define Package/easy-soc-libs
   CATEGORY:=Libraries
   TITLE:=IOPSYS Easy SoC libraries
   SUBMENU:=IOPSYS Easy SoC libraries
-  DEPENDS:=+libopenssl
   MENU:=1
 endef
 
@@ -79,7 +78,6 @@ endif
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/openssl \
 	-I$(STAGING_DIR)/usr/include/libnl3
 
 MAKE_FLAGS += \

easy-soc-libs/easy.mk

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

endptmngr/Makefile

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

endptmngr/files/etc/init.d/endptmngr

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

fdtextract/Makefile

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

gryphon-led-module/Makefile

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

gryphon-led-module/src/main.c

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

icwmp/Config_cwmp.in

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

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.1.10-2021-09-25
+PKG_VERSION:=8.2.27
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2e55c12d13af617f9c5b1551e9d67287efd52715
+PKG_SOURCE_VERSION:=da88c8c28656b2db54ab205d26faccda68546c05
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -82,19 +82,18 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
-	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
-	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/90-icwmp $(1)/etc/hotplug.d/iface/90-icwmp
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
-	$(INSTALL_BIN) ./files/etc/uci-defaults/90-icwmp-set-dhcp-reqopts $(1)/etc/uci-defaults/
+	$(INSTALL_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
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

icwmp/files/etc/config/cwmp

@@ -1,11 +1,9 @@
 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'

icwmp/files/etc/firewall.cwmp

@@ -1,42 +1,42 @@
+#!/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 -P /var/state -q get cwmp.acs.zonename)
-port=$(uci -P /var/state -q get cwmp.acs.port)
-ipaddr=$(uci -P /var/state -q get cwmp.acs.ip)
-ipv6enable=$(uci -P /var/state -q get cwmp.acs.ipv6enable)
-incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr [A-Z] [a-z])
+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 [ "$zone_name" = "" ]; then
+if [ -z "${zone_name}" ]; then
+	log "empty firewall zone name"
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
 	iptables -nL zone_icwmp_input 2> /dev/null
 	if [ $? != 0 ]; then
-		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
+		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
 	else			
-		iptables -F zone_icwmp_input
-		iptables -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -w 1 -F zone_icwmp_input
+		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
 	fi			
 else
-	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
+	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
 fi
 
-cmd=""
-
-if [ "${ipv6enable}" = "1" ]; then
-	cmd="ip6tables"
-else
-	cmd="iptables"
-fi
-
-cmd="${cmd} -I zone_${zone_name}_input -p tcp"
+cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
+cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
 
 # default incoming rule is Port only
 if [ -z "${incoming_rule}" ]; then
@@ -46,26 +46,36 @@ fi
 if [ "${incoming_rule}" = "ip_only" ]; then
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
+		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 elif [ "${incoming_rule}" = "port_only" ]; then
 	if [ -n "${port}" ]; then
 		cmd="${cmd} --dport ${port}"
+		cmd6="${cmd6} --dport ${port}"
 	fi
 else
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
+		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 
 	if [ -n "${port}" ]; then
 		cmd="${cmd} --dport ${port}"
+		cmd6="${cmd6} --dport ${port}"
 	fi
 fi
 
 echo ${cmd}|grep -q "\-\-dport \|\-s "
-if [ "$?" -ne 0 ]; then
-	exit 0;
+if [ "$?" -eq 0 ]; then
+	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+	${cmd}
 fi
 
-cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
+echo ${cmd6}|grep -q "\-\-dport \|\-s "
+if [ "$?" -eq 0 ]; then
+	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
+	${cmd6}
+fi
 
-${cmd}
+uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
+uci -c /var/state -q commit cwmp

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

@@ -1,89 +0,0 @@
-#!/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
-	}
-
-	echo "Restarting icwmp"|logger -t cwmp.hotplug -p info
-
-	/etc/init.d/icwmpd reload &
-}
-
-handle_icwmp_restart

icwmp/files/etc/icwmpd/update.sh

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

icwmp/files/etc/init.d/icwmpd

@@ -6,125 +6,41 @@ include /lib/network
 . /usr/share/libubox/jshn.sh
 
 START=99
-STOP=10
+STOP=2
 
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
 
-EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
-
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
 
-validate_url() {
-	# SCHEMA_LIST: contain list of possible schemas that could be present in the acs url
-	# Example: SCHEMA_LIST="http https"
-	SCHEMA_LIST="http"
-
-	for schema in $SCHEMA_LIST;	do
-		dest=`echo $1 | sed 's/$schema:\/\///g' | cut -f1 -d \/ | cut -f1 -d:`
-		if [ "_$dest" != "_" ]; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-get_acs_url() {
-	local default_acs="http://10.10.1.6:8000/openacs/acs"
-	local acs_dhcp_discovery="$(uci -q get cwmp.acs.dhcp_discovery)"
-	local url="$(uci -q get cwmp.acs.url)"
-	local dhcp_url="$(uci -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
-
-	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
+	local wan="${1}"
 
 	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local enabled
-	local newreqopts=
-	local baseopts=
 	local reqopts="$(uci -q get network.$wan.reqopts)"
 	local proto="$(uci -q get network.$wan.proto)"
-	local tropts="43"
-	local oldreqopts="$reqopts"
-	local ropt iopt
+	local newreqopts=""
+	local option43_present=0
+
 	for ropt in $reqopts; do
 		case $ropt in
-			43) ;;
-			*) baseopts="$baseopts $ropt" ;;
-		esac
-	done
-	ropt=""
-	reqopts="$baseopts $tropts"
-	for ropt in $reqopts; do
-		case $ropt in
-			43) [ $discovery -eq 1 ] && newreqopts="$newreqopts $ropt" ;;
-			*) newreqopts="$newreqopts $ropt" ;;
+			43) option43_present=1 ;;
+			*) ;;
 		esac
 	done
+
+	if [ ${option43_present} -eq 1 ]; then
+		return;
+	fi
+
+	newreqopts="$reqopts 43"
 	if [ $proto == "dhcp" ]; then
-		newreqopts="$(echo $newreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		oldreqopts="$(echo $oldreqopts | tr ' ' '\n' | sort -n | tr '\n' ' ' | sed 's/^[ \t]*//;s/[ \t]*$//')"
-		[ "$newreqopts" == "$oldreqopts" ] && return
 		uci -q set network.$wan.reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
 	fi
-	########################################################
-}
-
-wait_for_option43() {
-	local time=$1
-	local default_wan_interface dhcp_discovery url
-
-	config_get default_wan_interface cpe default_wan_interface "wan"
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get url acs url
-
-	enable_dhcp_option43 $default_wan_interface $dhcp_discovery
-
-	local tm=0
-
-	if [ "$dhcp_discovery" == "enable" -o "$dhcp_discovery" == "1" ]
-	then
-		log "Waiting for discovery of ACS URL from dhcp server ..."
-		while [ $tm -le $time ]
-		do
-			acs_url=`uci -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() {
@@ -142,62 +58,215 @@ wait_for_resolvfile() {
 }
 
 set_wan_interface() {
+	local wan_interface="${1}"
 	local l3_device=""
-	local default_wan_interface=""
 
-	config_get default_wan_interface cpe default_wan_interface "wan"
-	json_load "$(ifstatus $default_wan_interface)"
+	if [ -z "${wan_interface}" ]; then
+		return 0;
+	fi
+
+	json_load "$(ifstatus ${wan_interface})"
 	json_get_var l3_device l3_device
-	if [ "$l3_device" != "" ];then
-		uci -q set cwmp.cpe.interface="$l3_device"
+	if [ -n "$l3_device" ]; then
+		uci -q set cwmp.cpe.interface="${l3_device}"
 		uci -q commit cwmp
 	fi
 }
 
-service_running() {
-	ubus wait_for usp.raw
-}
-
-start_service() {
-	if [ ! -f /tmp/.icwmpd_boot ]; then
-		touch /etc/icwmpd/.icwmpd_boot
-		touch /tmp/.icwmpd_boot
-	else
-		[ -f /sbin/netifd ] && log "Waiting for Network to be started ..." && ubus -t 5 wait_for network.interface
-		[ -f /etc/config/wireless ] && log "Waiting for WiFi to be started ..." && ubus -t 5 wait_for network.wireless
-		[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
-		[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20
-		[ -f /usr/sbin/asterisk ] && log "Waiting for Voice to be started ..." && ubus -t 5 wait_for asterisk
-
-		log "Waiting for usp.raw to be started"
-		ubus wait_for usp.raw
-
-		config_load cwmp
-		set_wan_interface
-		wait_for_option43 20
-		get_acs_url
-
-		procd_open_instance icwmp
-		procd_set_param command "$PROG"
-		if [ "$1" = "GetRPCMethods" ];then
-			procd_append_param command -g
-		elif [ -f /etc/icwmpd/.icwmpd_boot ]; then
-			procd_append_param command -b
+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
-		procd_set_param respawn \
-			${respawn_threshold:-5} \
-			${respawn_timeout:-10} ${respawn_retry:-3}
+	fi
 
-		procd_close_instance
+	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
+
+	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"
+
+	if [ "$enable_cwmp" = "0" -o "$enable_cwmp" = "false" ]; then
+		log "CWMP is not enabled"
+		return 0
+	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_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
+       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
 }
 

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
 
-# Get factory base MAC.
-baseMac=$(db -q get hw.board.basemac)
-
-# Erase colon and space characters.
-baseMac=${baseMac//:/}
-baseMac=${baseMac// /}
-
-# Caseing and fixed length string.
-mac=$(printf "%12.12X" $((0x$baseMac)))
+oui=$(echo "${oui}" | tr 'a-f' 'A-F')
 
 # Get system serial number.
-serial=$(db -q get hw.board.serial_number)
+serial=$(uci -q get cwmp.cpe.serial_number)
+if [ -z "${serial}" ]; then
+	serial=$(db -q get device.deviceinfo.SerialNumber)
+fi
 
 # 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="${mac:0:6}-${serial}"
+    uci -q set cwmp.acs.userid="${oui}-${serial}"
 fi
 
 if [ -z "$cpe_userid" ]
 then
-    uci -q set cwmp.cpe.userid="${mac:0:6}-${serial}"
+    uci -q set cwmp.cpe.userid="${oui}-${serial}"
 fi
 
 # No need for commit here, it is done by uci_apply_defaults().

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

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

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

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

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

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

ieee1905/Config.in

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

ieee1905/Config.map-plugin.in

@@ -0,0 +1,14 @@
+if (PACKAGE_map-plugin)
+
+menu "Configurations"
+
+config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
+	bool "Sync configuration between dynamic controllers in the network"
+	default n
+
+config MULTIAP_FUZZ_1905_CMDUS
+	bool "Include support to fuzz 1905 CMDUs for testing purpose"
+	default n
+
+endmenu
+endif

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=3.3.7
+PKG_VERSION:=4.6.19
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=3fc90a1597bd06360e62fd70f4f7301a2499e267
+PKG_SOURCE_VERSION:=7267a76fafa264792415a1cdc697a9e47934a1e6
 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,26 +37,30 @@ endef
 define Package/libieee1905
 $(call Package/ieee1905/Default,$(1))
   TITLE+= (library for CMDU and TLV handling)
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
-	   +libjson-c +libblobmsg-json
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +libopenssl
 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 +libwifi \
-	   +libjson-c +libblobmsg-json +libwifi +ubus +libpthread \
-	   +libnl-genl +libieee1905
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +ubus +libpthread \
+	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
 endef
 
 
 define Package/map-plugin
 $(call Package/ieee1905/Default,$(1))
   TITLE:=Multi-AP (Easymesh) plugin
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl +libwifi \
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
 endef
 
+define Package/map-plugin/config
+  source "$(SOURCE)/Config.map-plugin.in"
+endef
+
 define Package/ieee1905/description
  This package provides IEEE Std 1905.1 stack.
 endef
@@ -68,8 +72,18 @@ endef
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(STAGING_DIR)/usr/include/openssl \
 	-D_GNU_SOURCE
 
+ifeq ($(CONFIG_IEEE1905_PLATFORM_HAS_WIFI),y)
+TARGET_CFLAGS += -DHAS_WIFI
+endif
+
+ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
+TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
+endif
+
+
 MAKE_PATH:=src
 
 
@@ -100,6 +114,7 @@ define Build/InstallDev/map-plugin
 	$(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/map.so $(1)/usr/lib/ieee1905/map.so
 	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
 endef
@@ -110,6 +125,7 @@ define Build/InstallDev/libieee1905
 	$(INSTALL_DIR) $(1)/usr/include
 	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
 	$(CP) $(PKG_BUILD_DIR)/src/cmdu.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/src/cmdu_ackq.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/1905_tlvs.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/i1905_wsc.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/src/bufutil.h $(1)/usr/include/
@@ -123,6 +139,11 @@ 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))

ieee1905/files/etc/init.d/ieee1905

@@ -5,7 +5,82 @@ STOP=21
 
 USE_PROCD=1
 
+IS_CFG_VALID=1
+
+validate_ieee1905_section() {
+	uci_validate_section ieee1905 ieee1905 "ieee1905" \
+			'enabled:bool:true' \
+			'macaddress:or("auto",macaddr)' \
+			'registrar:string' \
+			'extension:bool:false' \
+			'extmodule:list(string)' \
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "ieee1905" "Validation of ieee1905 section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_ali_section() {
+	local section="$1"
+
+	uci_validate_section ieee1905 $section "${1}" \
+			'ifname:string' \
+			'type:or("bridge",string)'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "ieee1905" "Validation of al-iface section $section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_ap_section() {
+	local section="$1"
+
+	uci_validate_section ieee1905 $section "${1}" \
+			'band:or("2", "5", "60")' \
+			'ssid:string' \
+			'encryption:or("psk2", "sae-mixed", "sae", string)' \
+			'key:string' \
+			'uuid:string' \
+			'manufacturer:string' \
+			'model_name:string' \
+			'device_name:string' \
+			'model_number:string' \
+			'serial_number:string' \
+			'device_type:string' \
+			'os_version:uinteger'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "ieee1905" "Validation of ap section $section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_ieee1905_config() {
+	IS_CFG_VALID=1
+
+	validate_ieee1905_section &&
+		config_foreach validate_ali_section "al-iface" &&
+		config_foreach validate_ap_section ap
+
+	[ "$IS_CFG_VALID" -ne 1 ] && {
+		logger -s -t "ieee1905" "Validation of ieee1905 UCI file failed"
+		return 1
+	}
+	return 0
+}
+
 start_service() {
+	config_load "ieee1905"
+	validate_ieee1905_config || return 1;
+
 	procd_open_instance
         procd_set_param command "/usr/sbin/ieee1905d"
 	procd_set_param respawn

iop/config

@@ -1,4 +1,3 @@
-CONFIG_BUILD_NLS=y
 CONFIG_BUSYBOX_CUSTOM=y
 CONFIG_CCACHE=y
 CONFIG_DEBUG=y
@@ -18,7 +17,6 @@ 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
@@ -26,6 +24,7 @@ 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
@@ -189,8 +188,6 @@ 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/"
 
@@ -219,3 +216,7 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 # Disable it. Most SoCs nowadays has HW random generators anyway.
 # CONFIG_PACKAGE_urandom-seed is not set
 # CONFIG_PACKAGE_urngd is not set
+
+# We use OpenSSL, no need to ship multiple TLS libraries
+CONFIG_PACKAGE_libustream-openssl=y
+# CONFIG_PACKAGE_libustream-wolfssl is not set

iop/scripts/genconfig.sh

@@ -5,7 +5,6 @@ function genconfig {
 	export IMPORT=1
 	export SRCTREEOVERR=0
 	export FILEDIR="files/"
-	export THEMEDIR="tmp/juci-themes"
 	CURRENT_CONFIG_FILE=".current_config_file"
 	export CONFIGPATH="package/feeds/iopsys/iop"
 	CUSTPATH="customerconfigs"
@@ -14,12 +13,9 @@ 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"
 
@@ -115,21 +111,15 @@ 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_mediatek iopsys_econet iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -154,14 +144,6 @@ 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"
@@ -170,14 +152,6 @@ 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"
@@ -193,15 +167,6 @@ 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://)' && {
@@ -238,7 +203,7 @@ function genconfig {
 		local ALL="$1"
 		local CUSTOMER="$2"
 		if [ "$CUSTOMER" -a -d "$CUSTCONF/$CUSTOMER" ]; then
-			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common | grep -v juci-theme)"
+			local boards="$(ls -1 "$CUSTCONF/$CUSTOMER" | grep -v common)"
 			if [ "$boards" ]; then
 				echo "$CUSTOMER has following boards:"
 				for board in $boards; do
@@ -255,7 +220,7 @@ function genconfig {
 			if [ "$customers" -a "$ALL" == 1 ]; then
 				for customer in $customers; do
 					echo $customer
-					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common | grep -v juci-theme)"
+					local boards="$(ls -1 $CUSTCONF/$customer | grep -v common)"
 					if [ "$boards" ]; then
 						for board in $boards; do
 							echo -e "\t$board"
@@ -309,13 +274,6 @@ function genconfig {
 			v "rm -rf $FILEDIR*"
 			rm -rf $FILEDIR*
 		fi
-
-		if [ ! -d "$THEMEDIR" ]; then
-			mkdir -p $THEMEDIR
-		elif [ -d "$THEMEDIR" -a $CLEAN -eq 1 ]; then
-			v "rm -rf $THEMEDIR/*"
-			rm -rf $THEMEDIR/*
-		fi
 	}
 
 	create_and_copy_files()
@@ -360,32 +318,16 @@ function genconfig {
 		    echo "" >> .config
 		fi
 
-		#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
-			device=$(echo $BOARDTYPE | tr a-z A-Z)
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
-		elif [ "$target" = "iopsys_ramips" ]; then
+		# Special handling for targets which use TARGET_DEVICES 
+		if [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_mediatek" ]; then
-			subtarget="mt7622"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		elif [ "$target" = "iopsys_econet" ]; then
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-		elif [ "$target" = "iopsys_bcm27xx" ]; then
-			subtarget="iopsys_bcm2711"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config
@@ -404,11 +346,6 @@ function genconfig {
 					v "cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR"
 					cp -ar $CUSTCONF/$CUSTOMER/$BOARDTYPE/fs/* $FILEDIR
 				fi
-				if [ -d "$CUSTCONF/$CUSTOMER/juci-theme" ]; then
-					customer="$(echo $CUSTOMER | tr 'A-Z' 'a-z')"
-					v "cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer"
-					cp -ar $CUSTCONF/$CUSTOMER/juci-theme $THEMEDIR/juci-theme-$customer
-				fi
 				if [ -e "$CUSTCONF/$CUSTOMER/common/common.diff" ]; then
 					v "Apply $CUSTCONF/$CUSTOMER/common/common.diff"
 					cat $CUSTCONF/$CUSTOMER/common/common.diff >> .config

iop/scripts/genconfig_min.sh

@@ -12,12 +12,9 @@ function genconfig_min {
 	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"
 
@@ -113,21 +110,15 @@ function genconfig_min {
 			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
 		[ -e $ramips/genconfig ] &&
 			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 		[ -e $econet/genconfig ] &&
 			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $intel_mips/genconfig ] &&
-			iopsys_intel_mips=$(cd $intel_mips; ./genconfig)
 		[ -e $x86/genconfig ] &&
 			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_mediatek iopsys_econet iopsys_intel_mips iopsys_x86 iopsys_armvirt iopsys_bcm27xx; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -152,14 +143,6 @@ function genconfig_min {
 		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"
@@ -168,14 +151,6 @@ function genconfig_min {
 		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"
@@ -191,15 +166,6 @@ function genconfig_min {
 		    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://)' && {
@@ -343,34 +309,16 @@ function genconfig_min {
 		    echo "" >> .config
 		fi
 
-		#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
-			device=$(echo $BOARDTYPE | tr a-z A-Z)
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${device}=y" >> .config
-		elif [ "$target" = "iopsys_ramips" ]; then
+		# Special handling for targets which use TARGET_DEVICES
+		if [ "$target" = "iopsys_ramips" ]; then
 			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-		elif [ "$target" = "iopsys_mediatek" ]; then
-			subtarget="mt7622"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		elif [ "$target" = "iopsys_econet" ]; then
 			subtarget="en7562"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-		elif [ "$target" = "iopsys_bcm27xx" ]; then
-			subtarget="iopsys_bcm2711"
-			echo "CONFIG_TARGET_${target}=y" >> .config
-			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
-			echo "CONFIG_TARGET_MULTI_PROFILE=y" >> .config
-			echo "CONFIG_TARGET_PER_DEVICE_ROOTFS=y" >> .config
-			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
 		else
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${BOARDTYPE}=y" >> .config

juci/Makefile

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

juci/files/etc/config/juci

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

juci/files/etc/init.d/juci

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

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

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

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

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

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

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

map-agent/Config.in

@@ -0,0 +1,10 @@
+if (PACKAGE_map-agent)
+
+menu "Configurations"
+
+config AGENT_SYNC_DYNAMIC_CNTLR_CONFIG
+	bool "Support Dynamic Controller configuration sync"
+	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
+
+endmenu
+endif

map-agent/Makefile

@@ -5,20 +5,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=5.3.1
+PKG_VERSION:=7.1.10
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=aa4048fdca6b42f78ffe40aec63a48732af696bf
+PKG_SOURCE_VERSION:=8d2fa1af3b0cbdb65f791b490e72c5925cccaa05
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-agent.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-agent
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
-
-PKG_BUILD_DEPENDS:=map-plugin
+endif
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -30,12 +31,26 @@ 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"
+	source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
@@ -43,6 +58,10 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
+ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
+TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
+endif
+
 MAKE_PATH:=src
 
 define Package/map-agent/install
@@ -53,4 +72,21 @@ 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))

map-agent/files/etc/config/mapagent

@@ -4,7 +4,7 @@ config agent 'agent'
 	option profile '2'
 	option al_bridge 'br-lan'
 
-#config fh-iface
+#config ap
 #	option ifname 'wl0'
 #	option steer 'rssi bssload'
 #	list exclude '00:11:22:33:44:55'
@@ -17,15 +17,17 @@ config agent 'agent'
 #	option steer_legacy_retry_secs '3600'
 #	option assoc_ctrl_secs '30'
 #	option band '2'
+#	option type 'fronthaul'
 
-#config fh-iface
+#config ap
 #	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 bk-iface
+#config bsta
 #	option ifname 'apclii0'
 #	option enabled '1'
 #	option onboarded '0'

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

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

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

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

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

@@ -5,8 +5,200 @@ STOP=20
 
 USE_PROCD=1
 
+IS_CFG_VALID=1
+
+MAP_DEV="map_dev"
+MAP_IF="map"
+
+create_map() {
+	ip link add lei type veth peer name lei_map 2>/dev/null
+	ip link add link lei name lei_lan type vlan id 1 2>/dev/null
+
+	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 show network.${MAP_DEV}.ports | grep -q lei_map || {
+		uci -q add_list network.${MAP_DEV}.ports='lei_map'
+	}
+
+	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 show network.br_lan.ports | grep -q lei_lan || {
+		uci -q add_list network.br_lan.ports="lei_lan"
+	}
+
+	uci -q set mapagent.agent.al_bridge=br-map
+
+	uci -q commit
+
+	ubus call network reload
+	ubus -t 5 wait_for network.interface.map
+
+	brctl addif br-map lei_map 2>/dev/null
+	brctl addif br-lan lei_lan 2>/dev/null
+
+	ip link set lei up 2>/dev/null
+	ip link set lei_map up 2>/dev/null
+	ip link set lei_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
+}
+
+validate_agent_section() {
+	uci_validate_section mapagent agent "agent" \
+		'enabled:bool:true' \
+		'debug:range(0,16)' \
+		'profile:range(1,2):2' \
+		'brcm_setup:bool:false' \
+		'controller_macaddr:macaddr' \
+		'al_bridge:string' \
+		'netdev:string' \
+		'vlan_segregation:bool:false' \
+		'resend_num:uinteger:0' \
+		'dyn_cntlr_sync:bool:true'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapagent" "Validation of agent section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_cs_section() {
+	local section="$1"
+
+	uci_validate_section mapagent $section "${section}" \
+		'local:bool:false' \
+		'id:string' \
+		'probe_int:range(0,1000):20' \
+		'retry_int:range(0,255):3' \
+		'autostart:bool:false'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapagent" "Validation of controller_select section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_ap_section() {
+	local section="$1"
+
+	uci_validate_section mapagent $section "${1}" \
+			'ifname:string' \
+			'device:string' \
+			'band:or("2", "5")' \
+			'enabled:bool:true' \
+			'onboarded:bool:false' \
+			'ssid:string' \
+			'key:string' \
+			'encryption:string' \
+			'disallow_bsta_p1:bool:false' \
+			'disallow_bsta_p2:bool:false'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapagent" "Validation of ap section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_radio_section() {
+	local section="$1"
+
+	uci_validate_section mapagent $section "${1}" \
+			'device:string' \
+			'band:or("2", "5")' \
+			'configured:bool:false' \
+			'onboarded:bool:false' \
+			'dedicated_backhaul:bool:false' \
+            'steer_policy:range(0,255)' \
+			'util_threshold:range(0,255)' \
+			'rcpi_threshold:range(0,255)' \
+			'report_rcpi_threshold:range(0,255)' \
+			'include_sta_stats:bool:false' \
+			'include_sta_metric:bool:false' \
+			'rcpi_hysteresis_margin:range(0,255)' \
+			'report_util_threshold:range(0,255)'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapagent" "Validation of radio section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_policy_section() {
+	local section="$1"
+
+	uci_validate_section mapagent $section "${1}" \
+			'report_interval:range(0,255)' \
+			'pvid:uinteger' \
+			'report_interval:range(0,255)' \
+			'pcp_default:range(0,255)' \
+			'report_scan:bool' \
+			'report_sta_assocfails:bool' \
+			'report_sta_assocfails_rate:uinteger' \
+			'steer_exclude:list(macaddr)' \
+			'steer_exclude_btm:list(macaddr)' \
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapagent" "Validation of policy section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_agent_config() {
+	IS_CFG_VALID=1
+
+	validate_agent_section &&
+		config_foreach validate_cs_section controller_select &&
+		config_foreach validate_ap_section ap &&
+        config_foreach validate_radio_section radio &&
+        config_foreach validate_policy_section policy
+
+	[ "$IS_CFG_VALID" -ne 1 ] && {
+		logger -s -t "mapagent" "Validation of mapagent UCI file failed"
+		return 1
+	}
+	return 0
+}
+
 start_service() {
+	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
+
 	config_load "mapagent"
+	validate_agent_config || return 1;
 
 	ubus -t 5 wait_for wifi
 
@@ -16,6 +208,10 @@ start_service() {
 	config_get_bool enabled agent enabled 1
 	[ "$enabled" -eq 0 ] && return 1
 
+	local ts
+	config_get_bool ts agent vlan_segregation 0
+	[ "$ts" -eq 1 ] && create_map #|| remove_map
+
 	procd_open_instance
         procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
@@ -24,9 +220,13 @@ start_service() {
 	procd_close_instance
 }
 
+#stop_service() {
+#	remove_map
+#}
+
 service_triggers()
 {
-	procd_add_reload_trigger "ieee1905"
+	procd_add_reload_trigger "mapagent"
 }
 
 reload_service() {

map-agent/files/lib/wifi/multiap

@@ -7,8 +7,14 @@
 # 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
@@ -23,12 +29,42 @@ 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=""
+	json_init
 	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
@@ -41,10 +77,21 @@ brcm_sync_credentials() {
 		section=$(uci add ieee1905 ap)
 		[ "$section" == "" ] && return
 
-		uci set ieee1905.${section}.band=$band
-		uci set ieee1905.${section}.ssid=$ssid
-		uci set ieee1905.${section}.encryption=$encryption
-		uci set ieee1905.${section}.key=$key
+		uci -q set ieee1905.${section}.band=$band
+		uci -q set ieee1905.${section}.ssid="$ssid"
+		uci -q set ieee1905.${section}.encryption=$encryption
+		uci -q set ieee1905.${section}.key="$key"
+		json_select "$band" > /dev/null
+		if [ "$?" = "0" ]; then
+			json_get_keys keys
+
+			for key in ${keys};
+			do
+				json_get_var val "$key"
+				uci -q set ieee1905.${section}.$key="$val"
+			done
+			json_select ..
+		fi
 	}
 
 	mapagent_process_radio() {
@@ -62,12 +109,43 @@ brcm_sync_credentials() {
 			fi
 		done
 
-		config_foreach mapagent_process_fh fh-iface $device
+		config_foreach mapagent_process_fh ap $device
 		bands="$bands $band"
 	}
 
 	ieee1905_del_ap() {
+		append_value() {
+			local section=$1
+			local key=$2
+			shift
+			shift
+
+			while [ "$key" != "" ]; do
+				val=$(uci -q get ieee1905.$section.$key)
+				[ "$val" = "" ] && {
+					key=$1
+					shift
+					continue
+				}
+				json_add_string "$key" ${val}
+				key=$1
+				shift
+			done
+		}
+
 		local section=$1
+		local band
+
+		config_get band $section band
+		json_select "$band" > /dev/null
+		rc=$?
+		[ "$rc" != "0" ] && json_add_object "$band"
+		append_value $section "manufacturer" "model_name" "device_name" "model_number" "serial_number" "device_type" "os_version"
+		if [ "$rc" != "0" ]; then
+			json_close_object
+		else
+			json_select ..
+		fi
 
 		uci -q delete ieee1905.${section}
 	}
@@ -76,12 +154,12 @@ brcm_sync_credentials() {
 	config_foreach ieee1905_del_ap ap
 
 	config_load mapagent
-	config_foreach mapagent_process_radio wifi-radio
+	config_foreach mapagent_process_radio radio
 
 	uci commit ieee1905
+	json_cleanup
 }
 
-
 brcm_write_credentials() {
 	config_load mapagent
 
@@ -89,8 +167,8 @@ brcm_write_credentials() {
 		write_wireless() {
 			local section=$1
 			local map_ifname=$2
-			local bk_ssid=$3
-			local bk_key=$4
+			local bk_ssid="$3"
+			local bk_key="$4"
 
 			config_get ifname $section ifname
 
@@ -98,24 +176,26 @@ brcm_write_credentials() {
 
 			[ "$ifname" != "$map_ifname" ] && return
 
-			#echo applying bk_ssid = $bk_ssid bk_key = $bk_key
+			#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
 
 			uci -q set wireless.${section}.multi_ap_backhaul_ssid="$bk_ssid"
 			uci -q set wireless.${section}.multi_ap_backhaul_key="$bk_key"
 		}
 		config_load wireless
 
-		config_foreach write_wireless wifi-iface $1 $2 $3
+		config_foreach write_wireless wifi-iface "$1" "$2" "$3"
 	}
 
 	mapagent_find_fbss() {
 		local section=$1
 		local dev=$2
-		local bk_ssid=$3
-		local bk_key=$4
+		local bk_ssid="$3"
+		local bk_key="$4"
+
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
 
 		config_get device $section device
-		config_get multi_ap $section multi_ap "0"
 
 		#echo found dev=$dev device=$device map=$multi_ap
 
@@ -124,18 +204,20 @@ brcm_write_credentials() {
 
 		config_get ifname $section ifname
 
-		#echo applying bk_ssid = $bk_ssid bk_key = $bk_key
+		#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
 
 		# subshell in hopes to maintain mapagent config loaded
-		$(mapagent_apply_wireless $ifname $bk_ssid $bk_key)
+		echo $(mapagent_apply_wireless $ifname "$bk_ssid" "$bk_key") 2> /dev/null
 	}
 
 	mapagent_find_bbss() {
 		local section=$1
 		local dev=$2
 
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
 		config_get device $section device
-		config_get multi_ap $section multi_ap "0"
 		config_get enabled $section enabled "1"
 
 		#echo found dev=$dev device=$device map=$multi_ap
@@ -147,9 +229,9 @@ brcm_write_credentials() {
 		config_get ssid $1 ssid
 		config_get key $1 key
 
-		#echo found ssid=$ssid key=$key
+		#echo found ssid="$ssid" key="$key"
 
-		config_foreach mapagent_find_fbss fh-iface $dev $ssid $key
+		config_foreach mapagent_find_fbss ap $dev "$ssid" "$key"
 	}
 
 	mapagent_process_radio() {
@@ -159,11 +241,11 @@ brcm_write_credentials() {
 
 		#echo found dev=$dev
 
-		config_foreach mapagent_find_bbss fh-iface $device
+		config_foreach mapagent_find_bbss ap $device
 	}
 
 
-	config_foreach mapagent_process_radio wifi-radio
+	config_foreach mapagent_process_radio radio
 
 	uci commit wireless
 }
@@ -198,6 +280,7 @@ write_bsta_config() {
 
 	#echo diff = $diff > /dev/console
 
+
 	config_load mapagent
 
 	mapagent_apply_wl_bsta() {
@@ -210,7 +293,7 @@ write_bsta_config() {
 
 			[ "$bsta" == "$ifname" ] || return
 			#echo setting diff = $diff > /dev/console
-			uci set wireless.${section}.bssid=$bssid
+			uci -q set wireless.${section}.bssid=$bssid
 			echo 1
 		}
 		config_load wireless
@@ -223,6 +306,7 @@ write_bsta_config() {
 		local section=$1
 		local bsta=$2
 
+
 		config_get ifname $section ifname
 		#echo bsta = $bsta > /dev/console
 
@@ -230,15 +314,43 @@ 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
+		[ "$ret" == "1" ] && {
+			diff=1
+			onbrd_bssid=$bssid
+			onbrd_band=$band
+		}
 	}
 
+	mapagent_apply_bssid_same_band() {
+		apply_config() {
+			local section=$1
+			local bsta=$2
 
-	config_foreach mapagent_process_bk bk-iface $ifname
+			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
 
 	#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
 	}
@@ -275,6 +387,9 @@ brcm_teardown_iface() {
 		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
@@ -289,13 +404,12 @@ brcm_teardown_iface() {
 	}
 
 
-	config_foreach mapagent_teardown_bss fh-iface $iface
+	config_foreach mapagent_teardown_bss ap $iface
 
 	uci commit wireless
 	uci commit mapagent
 }
 
-
 brcm_bsta_to_wireless() {
 	config_load mapagent
 
@@ -315,12 +429,12 @@ brcm_bsta_to_wireless() {
 		local sec=""
 		local prio="-1"
 
-		config_foreach mapagent_process_bk bk-iface
+		config_foreach mapagent_process_bk bsta
 		echo $sec
 	}
 
 	mapagent_enable_best() {
-		echo 1=$1 best=$best > /dev/console
+		#echo 1=$1 best=$best > /dev/console
 		if [ "$1" = "$best" ]; then
 			uci -q set mapagent.$1.enabled='1'
 		else
@@ -333,10 +447,11 @@ brcm_bsta_to_wireless() {
 			apply_config() {
 				local section=$1
 				local bsta=$2
-				local ssid=$3
-				local key=$4
+				local ssid="$3"
+				local key="$4"
 				local encryption=$5
 				local enabled=$6
+				local bssid=$7
 				local disabled="0"
 
 				config_get ifname $section ifname
@@ -345,10 +460,17 @@ brcm_bsta_to_wireless() {
 
 				[ "$bsta" == "$ifname" ] || return
 
-				uci set wireless.${section}.ssid=$ssid
-				uci set wireless.${section}.key=$key
-				uci set wireless.${section}.encryption=$encryption
-				uci set wireless.${section}.disabled=$disabled
+				uci -q set wireless.${section}.ssid="$ssid"
+				uci -q set wireless.${section}.key="$key"
+				uci -q set wireless.${section}.encryption=$encryption
+				uci -q set wireless.${section}.bssid="$bssid"
+				#uci -q set wireless.${section}.disabled=$disabled
+
+				[ "$disabled" != "1" ] && return
+				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
+				wpa_cli -i "$bsta" disable_network 0 > /dev/null 2>&1
+				wpa_cli -i "$bsta" save_config > /dev/null 2>&1
+
 				echo 1
 			}
 
@@ -359,8 +481,7 @@ brcm_bsta_to_wireless() {
 		}
 
 		mapagent_find_other_creds() {
-
-			echo "trying to find other creds for $2" > /dev/console
+			#echo "trying to find other creds for $2" > /dev/console
 			config_get band $1 band
 			config_get onboarded $1 onboarded "0"
 
@@ -370,8 +491,9 @@ brcm_bsta_to_wireless() {
 			config_get key $1 key
 			config_get encryption $1 encryption
 			config_get enabled $1 enabled "0"
+			config_get bssid $1 bssid
 
-			echo "$(mapagent_apply_wl_bsta $2 $ssid $key $encryption $4)"
+			echo $(mapagent_apply_wl_bsta $2 "$ssid" "$key" $encryption $4 "$bssid")
 		}
 
 		config_get band $1 band
@@ -380,35 +502,281 @@ brcm_bsta_to_wireless() {
 		config_get enabled $1 enabled "0"
 
 		if [ "$onboarded" = "0" ]; then
-			config_foreach mapagent_find_other_creds bk-iface $ifname $band $enabled
+			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)"
+			echo $(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
 		fi
 	}
 
-	best=$(mapagent_find_lowest_prio_onboarded)
-
-	[ -z "$best" ] && return
-
-	band=$1
-	sec=""
-	prio=""
-
-	config_foreach mapagent_enable_best bk-iface $best
-	uci commit mapagent
+#	best=$(mapagent_find_lowest_prio_onboarded)
+#
+#	[ -z "$best" ] && return
+#
+#	band=$1
+#	sec=""
+#	prio=""
+#
+#	config_foreach mapagent_enable_best bsta $best
+#	uci commit mapagent
 	config_load mapagent
 
-	diff=$(config_foreach mapagent_bsta_to_wireless bk-iface)
+	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
 
-	[ "$diff" != "" ] && {
+#	[ "$diff" != "" ] && {
 		ubus call uci commit '{"config":"wireless"}'
+#	}
+}
+
+
+sync_mapcontroller_from_wireless() {
+	ubus -t 5 wait_for wifi
+	[ "$?" != "0" ] && return
+
+	[ ! -f "/etc/config/wireless" ] && return
+
+	status=$(ubus -S call wifi status)
+
+	device_to_band() {
+		local ifname=$1
+		json_load "$status"
+		json_select "radios"
+		json_get_keys keys
+
+		for key in $keys; do
+			json_select $key
+			json_get_var name name
+
+			if [ "$name" != "$ifname" ]; then
+				json_select ..
+				continue
+			fi
+
+			json_get_var band band
+
+			if [ "$band" == "5GHz" ]; then
+				echo "5"
+			elif [ "$band" == "2.4GHz" ]; then
+				echo "2"
+			fi
+
+			break
+		done
+
+		json_cleanup
 	}
 
+	wireless_process_iface() {
+		local section=$1
+		local type="ap"
+		local enabled="1"
+
+		config_get multi_ap $section multi_ap 0
+		[ "$multi_ap" != "1" ] && [ "$multi_ap" != "2" ] && return
+
+		config_get mode $section mode "ap"
+		[ "$mode" != "ap" ] && return
+
+		config_get device $section device
+		band=$(device_to_band $device)
+		[ "$band" == "" ] && return
+
+		config_get ssid $section ssid
+		config_get key $section key
+		config_get encryption $section encryption
+		config_get start_disabled $section start_disabled "0"
+		config_get network $section network
+
+
+		cntlr_section=$(uci add mapcontroller ${type})
+		uci -q set mapcontroller.${cntlr_section}.ssid="$ssid"
+		uci -q set mapcontroller.${cntlr_section}.key="$key"
+		uci -q set mapcontroller.${cntlr_section}.encryption="$encryption"
+		uci -q set mapcontroller.${cntlr_section}.band="$band"
+		uci -q set mapcontroller.${cntlr_section}.vid="1"
+		uci -q set mapcontroller.${cntlr_section}.network="$network"
+
+		[ "$multi_ap" == "1" ] && map_type="backhaul" || map_type="fronthaul"
+		uci -q set mapcontroller.${cntlr_section}.type="$map_type"
+
+		[ "$start_disabled" == "1" ] && enabled="0"
+		uci -q set mapcontroller.${cntlr_section}.enabled="$enabled"
+	}
+
+	mapcontroller_teardown() {
+		local section=$1
+
+		uci delete mapcontroller.$1
+	}
+
+	config_load mapcontroller
+	config_foreach mapcontroller_teardown ap
+
+	config_load wireless
+	config_foreach wireless_process_iface wifi-iface
+	uci commit mapcontroller
 }
+
+bsta_scan_on_enabled() {
+	config_load mapagent
+
+	mapagent_enable_bk() {
+		config_get ifname $1 ifname
+		config_get enabled $1 enabled
+
+		echo ifname $ifname enabled $enabled
+
+		[ "$enabled" = "0" ] && return
+
+		wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
+		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+	}
+
+	config_foreach mapagent_enable_bk 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
 
@@ -423,6 +791,16 @@ case "$func" in
 	write_bsta_config) write_bsta_config $@;;
 	teardown_iface) brcm_teardown_iface $@;;
 	bsta_to_wireless) brcm_bsta_to_wireless $@;;
+	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
+	ts) ts_sub $@;;
+	bsta_enable_all) bsta_enable_all $@;;
+	bsta_disable_lower_priority) bsta_disable_lower_priority $@;;
+	bsta_scan_on_enabled) bsta_scan_on_enabled $@;;
+	bsta_use_link) bsta_use_link $@;;
+	bsta_swap_to_link) bsta_swap_to_link $@;;
+	set_uplink) set_uplink $@;;
+	set_uplink_backhaul_info) set_uplink_backhaul_info $@;;
+	unset_uplink) unset_uplink $@;;
 	--help|help) usage;;
 	*) usage; exit 1;;
 esac

map-agent/files/lib/wifi/traffic_separation

@@ -0,0 +1,511 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+### Traffic Separation ###
+
+dbg() {
+	logger -t traffic_separation $@
+}
+
+ts_sub() {
+
+	ts_usage() {
+		cat <<EOF
+Usage: $0 [create|delete|populate|primary|reload]
+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)
+reload     				- reload network with new configuration
+EOF
+	exit 1
+	}
+
+	_get_bridge() {
+		local bridge=$(ip link show $1 | grep -o "master [^\s]*" | cut -d ' ' -f 2)
+		echo $bridge
+	}
+
+	set_wireless_bridge() {
+		config_load wireless
+
+		_set_network() {
+			local sec=$1
+			local iface=$2
+			local bridge=$3
+
+			config_get ifname $sec ifname
+			[ "$iface" != "$ifname" ] && continue
+
+			config_get mode $sec mode
+			config_get multi_ap $sec multi_ap "0"
+			[ "$mode" = "sta" -a "$multi_ap" = "1" ] && continue
+
+			config_get network $sec network
+			local new_network=${bridge##br-}
+			if [ "$new_network" != "$network" ] ; then
+				uci -q set wireless.${sec}.network=${new_network}
+				uci commit wireless
+			fi
+
+			brctl addif $bridge $iface &> /dev/null
+		}
+
+		config_foreach _set_network wifi-iface ${1} ${2}
+	}
+
+	ts_create() {
+
+		_create_vlan_dev() {
+			iface=$1				# real iface
+			vid=$2					# Vlan ID
+			bridge=$3				# bridge iface should be connected
+			vlan_dev=$4
+
+			old_bridge="$(_get_bridge $iface)"	# bridge iface is connected to
+
+			# remove interface from bridge if it is in one
+			[ -n "$old_bridge" ] && brctl delif $old_bridge $iface &> /dev/null
+
+			# (re)create vlan device
+			ip link show $vlan_dev && vlanctl --if-delete $vlan_dev
+			vlanctl --mcast --if-create-name $iface $vlan_dev --if $iface --set-if-mode-rg
+
+			vlanctl --if $iface --tx --tags 0 --default-miss-drop
+			vlanctl --if $iface --tx --tags 1 --default-miss-drop
+			vlanctl --if $iface --tx --tags 2 --default-miss-drop
+			vlanctl --if $iface --rx --tags 0 --default-miss-drop
+			vlanctl --if $iface --rx --tags 1 --default-miss-drop
+			vlanctl --if $iface --rx --tags 2 --default-miss-drop
+
+			# bring the vlan device up and add back to bridge if it was in one
+			brctl addif $bridge $vlan_dev &> /dev/null
+		}
+
+		ts_create_fh() {
+			iface=$1				# fh iface
+			vid=$2					# SSID specific (secondary) or primary vid
+			bridge=$3
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$bridge" ]  || {
+				cat <<EOF
+Adding FH device requires IFACE, VID and bridge
+EOF
+				exit 1
+			}
+
+			# create vlan device
+			#set_wireless_bridge $iface $bridge
+
+			vlan_dev=${iface}_vlan${vid}
+			ip link set $vlan_dev down
+			_create_vlan_dev $iface $vid $bridge $vlan_dev
+
+			# add rules
+#			vlanctl --if $iface --rx --tags 0 --filter-ethertype 0x886c --set-rxif $vlan_dev --rule-append		# incoming brcm
+
+			# EAPOL frames
+			vlanctl --if $iface --rx --tags 0 --filter-ethertype 34958 --set-rxif $vlan_dev --rule-append
+			vlanctl --if $iface --rx --tags 1 --filter-ethertype 34958 --pop-tag --set-rxif $vlan_dev --rule-append
+			vlanctl --if $iface --tx --tags 0 --filter-txif $vlan_dev --filter-ethertype 34958 --rule-append
+
+			# 8021q vlan id TAG/UNTAG
+			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
+
+			ip link set $iface up
+			ip link set $vlan_dev up
+		}
+
+		ts_create_bh() {
+			iface=$1				# bh iface
+			vid=$2					# primary vid
+			profile=$3				# agent profile (1 or 2)
+			bridge=$4				# bridge interface should be connected to
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$profile" ] || {
+				cat <<EOF
+Adding BH device requires IFACE, VID and PROFILE (1 or 2).
+EOF
+				exit 1
+			}
+
+			#[ -n "$bridge" ] && set_wireless_bridge $iface $bridge
+
+			old_vid=$(wl -i $1 map_8021q_settings)
+			old_vid=${old_vid##* }
+			old_profile=$(wl -i $1 map_profile | cut -d ' ' -f 3)
+
+			[ "$old_vid" = "$vid" -a "$old_profile" = "$profile" ] && return
+
+			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_lei() {
+			vid=$1					# primary vid
+			pbits=$2				# default pbits to apply
+			vlan_bridge=$3				# name of ts subsystem bridge
+			lan_bridge=$4				# name of node local bridge
+
+			[ -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
+			}
+
+			ip link show lei &> /dev/null || {
+				ip link add link lei name lei_lan type vlan id 1 2>/dev/null
+			}
+
+			old_vid=$(ip -d link show lei_lan | sed -n 's/vlan.*id \([0-9][0-9]*\) .*/\1/p')
+
+			[ "$old_vid" != "$vid" ] && {
+				ip link del lei_lan
+				ip link add link lei name lei_lan type vlan id ${vid}
+			}
+
+			brctl addif ${lan_bridge} lei_lan &>/dev/null
+			brctl addif ${vlan_bridge} lei_map &>/dev/null
+
+			ip link set lei up
+			ip link set lei_map up
+			ip link set lei_lan up
+		}
+
+		_create_eth() {
+			iface=$1				# Multi-AP Logical Ethernet Interface
+			vid=$2					# primary vid
+			bridge=$3				# name of ts subsystem bridge
+			pbits=0
+
+			[ -n "$iface" ] && [ -n "$vid" ] && [ -n "$bridge" ] || {
+				cat <<EOF
+Adding ETH device requires IFACE, VID, PBITS and name of vlan and lan bridges.
+EOF
+				exit 1
+			}
+
+			dbg create $@
+
+			ip link set $iface down
+
+			vlan_dev=${iface}_vlan${vid}
+			ip link set $vlan_dev down
+			_create_vlan_dev $iface $vid $bridge $vlan_dev
+
+			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
+
+			[ $# -le 3 ] && exit 0
+			shift 3
+
+			while [ -n "$1" ] ; do
+				vid=$1
+				vlanctl --if $iface --rx --tags 1 --filter-vid $vid 0 --set-rxif $vlan_dev --rule-append
+				vlanctl --if $iface --tx --tags 1 --filter-vid $vid 0 --filter-txif $vlan_dev --rule-append
+				shift
+			done
+
+			ip link set $iface up
+			ip link set $vlan_dev up
+		}
+
+		ts_create_eths() {
+			pvid=$1					# primary vid
+			bridge=$2				# name of ts subsystem bridge
+
+			shift 2
+			# TODO use ieee1905 bridge
+			for iface in $(uci get network.br_lan.ports) ; do
+				[ "$iface" = "lei_lan" ] && continue
+				_create_eth $iface $pvid $bridge $@
+				ubus call ieee1905 del_interface "{\"ifname\":\"$iface\"}"
+			done
+		}
+
+		ts_create_dhcp() {
+			local diff=""
+
+                        _net_setup() {
+				local name=$1
+				local devname=$2
+				local vid=$3
+
+				[ -z "$(uci -q get network.${name})" ] && {
+					uci -q set network.${name}="interface"
+					uci -q set network.${name}.device="$devname"
+					uci -q set network.${name}.is_lan="1"
+					uci -q set network.${name}.proto="static"
+					# TODO vid > 255
+					local ip_addr="192.168.${vid}.1"
+					[ "${vid}" = "1" ] && ip_addr="192.168.${vid}.2"
+					uci -q set network.${name}.ipaddr="${ip_addr}"
+					uci -q set network.${name}.netmask="255.255.255.0"
+
+					diff="1"
+				}
+
+				[ "$diff" = "1" ] && uci -q commit network
+			}
+
+			_br_setup() {
+				local name=$1
+				local sinkname=$2
+				local vid=$3
+
+				[ -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
+			}
+
+			_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"
+
+				diff="1"
+				uci -q commit dhcp
+			}
+
+			_firewall_setup() {
+				local name=$1
+				local network=$2
+				local zone_exist=0
+
+				config_load firewall
+
+				_process_zone() {
+					local section=$1
+					local new_name=$2
+					local name
+
+					config_get name $section name
+
+					[ "$name" == "$new_name" ] && zone_exist=1
+				}
+
+				config_foreach _process_zone zone $name
+
+				[ "$zone_exist" != "0" ] && return
+
+				uci -q add firewall zone
+				uci -q set firewall.@zone[-1].name="$name"
+				uci -q add_list firewall.@zone[-1].network="$network"
+				uci -q set firewall.@zone[-1].input='ACCEPT'
+				uci -q set firewall.@zone[-1].output='ACCEPT'
+				uci -q set firewall.@zone[-1].forward='ACCEPT'
+
+				uci -q add firewall forwarding
+				uci -q set firewall.@forwarding[-1].src="$name"
+				uci -q set firewall.@forwarding[-1].dest="wan"
+
+				diff="1"
+				uci -q commit firewall
+			}
+
+			vid=$1					# primary vid
+
+			[ -n "$vid" ] || {
+				cat <<EOF
+VID required to configure DHCP.
+EOF
+				exit 1
+			}
+
+			ip link show sink${vid} || {
+				ip link add sink${vid} type veth peer name sink${vid}_vlan
+				ip link add link sink${vid} name sink${vid}_peer type vlan id ${vid}
+			}
+
+			ip link set sink${vid} up
+			ip link set sink${vid}_peer up
+			ip link set sink${vid}_vlan up
+
+			diff=""
+			_net_setup sink${vid} sink${vid}_peer ${vid}
+			_dhcp_setup sink${vid}
+			_firewall_setup lan${vid} sink${vid}
+
+			[ "$diff" = "1" ] && {
+				ubus call network reload
+				ubus -t 5 wait_for network.interface.sink${vid}
+			}
+
+			brctl addif br-map sink${vid}_vlan &> /dev/null
+		}
+
+	local type=$1
+	shift
+
+	case "$type" in
+		fh) ts_create_fh $@;;
+		bh) ts_create_bh $@;;
+		lei) ts_create_lei $@;;
+		eths) ts_create_eths $@;;
+		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)"
+
+		[ -n "$bridge" ] && {
+			vlanctl --if-delete $vlan_dev		# note: also removes rules and removes from bridge
+			brctl addif $bridge $iface &> /dev/null # needed to add again
+                }
+
+	}
+
+	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
+	}
+
+	ts_reload() {
+		local dhcp_reload=$1
+
+		# workaround for missing backhaul wifi.ap.* ubus obj's:
+		# iterate in config and setup bh
+		config_load wireless
+
+		_setup_bh_iface() {
+			local sec=$1
+			local iface=$2
+			local bridge=$3
+
+			config_get ifname $sec ifname
+
+			config_get mode $sec mode
+			config_get multi_ap $sec multi_ap "0"
+			[ "$mode" = "ap" -a "$multi_ap" = "1" ] && {
+				ts_create bh $ifname 1 2 br-map
+			}
+		}
+
+		config_foreach _setup_bh_iface wifi-iface
+
+		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
+
+		# another workaround for netif? removed
+		# sink devices for br-map bridge
+		for sink in $(ubus list network.interface.sink*) ; do
+			local sink_vlan=${sink/network.interface./}_vlan
+			brctl addif br-map $sink_vlan &> /dev/null
+		done
+	}
+
+	local func=$1
+	shift
+
+	case "$func" in
+		create) dbg "create $@"; ts_create $@;;
+		delete) dbg "delete $@"; ts_delete $@;;
+		populate) dbg "populate $@"; ts_populate $@;;
+		primary) dbg "primary $@"; ts_primary $@;;
+		unicast) dbg "unicast $@"; ts_unicast $@;;
+		multicast) dbg "multicast $@"; ts_multicast $@;;
+		reload) dbg "reload $@"; ts_reload $@;;
+		--help|help) ts_usage;;
+		*) ts_usage; exit 1;;
+	esac
+}

map-controller/Config.in

@@ -0,0 +1,10 @@
+if (PACKAGE_map-controller)
+
+menu "Configurations"
+
+config CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
+	bool "Support Dynamic Controller configuration sync"
+	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
+
+endmenu
+endif

map-controller/Makefile

@@ -5,20 +5,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.2.4
+PKG_VERSION:=6.0.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=df83b5150688588921677cba96a303af0f204b12
+PKG_SOURCE_VERSION:=3562b7f774e6dffda2e58ad2acb382fc439273fb
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=git@dev.iopsys.eu:iopsys/map-controller.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-controller
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
-
-
-PKG_BUILD_DEPENDS:=map-plugin
+endif
 
 include $(INCLUDE_DIR)/package.mk
 
@@ -34,7 +34,7 @@ define Package/map-controller/description
 endef
 
 define Package/map-controller/config
-	#source "$(SOURCE)/Config.in"
+	source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
@@ -44,6 +44,10 @@ TARGET_CFLAGS += \
 
 MAKE_PATH:=src
 
+ifeq ($(CONFIG_CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG),y)
+TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
+endif
+
 define Package/map-controller/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/
@@ -51,4 +55,10 @@ 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))

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

@@ -5,6 +5,8 @@ STOP=20
 
 USE_PROCD=1
 
+IS_CFG_VALID=1
+
 handle_controller_select() {
 	local section="$1"
 
@@ -12,10 +14,122 @@ handle_controller_select() {
 	return 1
 }
 
+validate_controller_section() {
+	uci_validate_section mapcontroller controller "controller" \
+		'enabled:bool:true' \
+		'registrar:string' \
+		'debug:range(0,16)' \
+		'resend_num:uinteger:0' \
+		'enable_sta_steer:bool:false' \
+		'enable_bsta_steer:bool:false' \
+		'use_bcn_metrics:bool:false' \
+		'use_usta_metrics:bool:false'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapcontroller" "Validation of controller section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_ap_section() {
+	local section="$1"
+
+	uci_validate_section mapcontroller $section "${1}" \
+			'band:or("2", "5")' \
+			'ssid:string' \
+			'encryption:or("sae", "sae+aes", "psk2",
+				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
+			'key:string' \
+			'vid:range(1,65535):1' \
+			'type:or("backhaul", "fronthaul", "combined")' \
+			'disallow_bsta:list(range(0,255)):0' \
+			'enabled:bool:true'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapcontroller" "Validation of ap section $section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_node_section() {
+	local section="$1"
+
+	uci_validate_section mapcontroller $section "${1}" \
+			'agent_id:macaddr' \
+			'backhaul_ul_macaddr:macaddr' \
+			'backhaul_dl_macaddr:macaddr' \
+			'backhaul_type:or("none")' \
+			'primary_vid:range(0,255):1' \
+			'primary_pcp:range(0,255):0' \
+			'report_sta_assocfails:bool:false' \
+			'report_sta_assocfails_rate:uinteger' \
+			'report_metric_periodic:range(0,255)' \
+			'report_scan:bool:false' \
+			'steer_exclude:list(macaddr)' \
+			'steer_exclude_btm:list(macaddr)' \
+			'steer_disallow:bool:false' \
+			'coordinated_cac:bool:false' \
+			'traffic_separation:bool:false' \
+			'sta_steer:bool:false'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapcontroller" "Validation of node section $section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_radio_section() {
+	local section="$1"
+
+	uci_validate_section mapcontroller $section "${1}" \
+			'agent_id:macaddr' \
+			'macaddr:macaddr' \
+			'band:or("2", "5")' \
+			'steer_policy:range(0,2)' \
+			'util_threshold:range(0,255)' \
+			'rcpi_threshold:range(0,255)' \
+			'report_rcpi_threshold:range(0,255)' \
+			'report_util_threshold:range(0,255)' \
+			'report_rcpi_hysteresis_margin:range(0,255)' \
+			'include_sta_stats:bool:false' \
+			'include_sta_metric:bool:false'
+
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "mapcontroller" "Validation of radio section $section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_controller_config() {
+	IS_CFG_VALID=1
+
+	validate_controller_section &&
+		config_foreach validate_ap_section ap &&
+		config_foreach validate_node_section node &&
+		config_foreach validate_radio_section radio
+
+	[ "$IS_CFG_VALID" -ne 1 ] && {
+		logger -s -t "mapcontroller" "Validation of mapcontroller UCI file failed"
+		return 1
+	}
+	return 0
+}
+
 start_service() {
 	local enabled
 
 	config_load "mapcontroller"
+	validate_controller_config || return 1;
+
 	config_get_bool enabled controller enabled 1
 	[ "$enabled" -eq 0 ] && return
 
@@ -48,6 +162,8 @@ 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
 

map-topology/Makefile

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

map-topology/files/etc/init.d/topologyd

@@ -5,7 +5,72 @@ STOP=21
 
 USE_PROCD=1
 
+IS_CFG_VALID=1
+
+validate_topology_config() {
+	uci_validate_section topology topology "topology" \
+			'enabled:bool:true' \
+			'depth:range(0,16)' \
+			'interval:range(0,65535)' \
+			'maxlog:range(0,128)' \
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "topology" "Validation of topology UCI file failed"
+		return 1
+	}
+	return 0
+}
+
+validate_global_section() {
+	uci_validate_section hosts global "global" \
+		'ageing_timer:uinteger' \
+		'reboot_persistent:bool'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "hosts" "Validation of global section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_host_section() {
+	local section="$1"
+
+	uci_validate_section hosts $section "${1}" \
+			'macaddr:macaddr' \
+			'interface_type:or("wifi","eth")' \
+			'active:bool' \
+			'active_last_change:string'
+
+	[ "$?" -ne 0 ] && {
+		logger -s -t "hosts" "Validation of host section $section failed"
+		IS_CFG_VALID=0
+		return 1
+	}
+	return 0
+}
+
+validate_hosts_config() {
+	IS_CFG_VALID=1
+
+	validate_global_section &&
+		config_foreach validate_host_section host
+
+	[ "$IS_CFG_VALID" -ne 1 ] && {
+		logger -s -t "topology" "Validation of hosts UCI file failed"
+		return 1
+	}
+	return 0
+}
+
 start_service() {
+	config_load "topology"
+	validate_topology_config || return 1;
+
+	config_load "hosts"
+	validate_hosts_config || return 1;
+
 	procd_open_instance
         procd_set_param command "/usr/sbin/topologyd"
 	procd_set_param respawn

mcastmngr/files/lib/mcast/broadcom.sh

@@ -59,9 +59,6 @@ mld_p_up_interfaces=""
 mld_p_down_interfaces=""
 mld_p_exceptions=""
 
-# Standard parameters need by BCM's multicast daemon
-allow_brdevice=0
-
 proxdevs=""
 ethwan="$(db -q get hw.board.ethernetWanPort)"
 
@@ -170,6 +167,36 @@ 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
@@ -187,39 +214,6 @@ config_snooping_on_bridge() {
 	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"
@@ -234,7 +228,8 @@ config_mcast_proxy_interface() {
 	for proxif in $2; do
 		case "$proxif" in
 			br-*)
-				handle_bridged_proxy_interface $p1 $proxif
+				proxdevs="$proxdevs $proxif"
+				echo "upstream-interface $proxif" >>$CONFFILE
 			;;
 			*)
 				ifconfig $proxif | grep RUNNING >/dev/null && proxdevs="$proxdevs $proxif"
@@ -246,7 +241,12 @@ config_mcast_proxy_interface() {
 		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
 	fi
 
-	[ -n "$proxdevs" ] && echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
+	# 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
 }
 
 configure_mcpd_snooping() {
@@ -259,14 +259,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_mcast_proxy_interface $protocol "$igmp_s_iface"
+		config_snooping_upstream_interface "$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_mcast_proxy_interface $protocol "$mld_s_iface"
+		config_snooping_upstream_interface "$mld_s_iface"
 		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
 		exceptions=$mld_s_exceptions
 		fast_leave=$mld_s_fast_leave
@@ -458,7 +458,7 @@ read_mcast_stats() {
 		case $line in
 		br-*)
 			found_ip=0
-			grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
+			grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
 			if [ -z "$mcast_addrs" ]; then
 				mcast_addrs="$grp_ip"
 				continue
@@ -510,7 +510,7 @@ read_mcast_stats() {
 					if [ "$snoop_iface" != "$intf" ]; then
 						continue
 					fi
-					grp_ip="$(echo $line | awk -F ' ' '{ print $9 }')"
+					grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
 					if [ "$grp_ip" != "$gip_addr" ]; then
 						continue
 					fi
@@ -523,12 +523,12 @@ read_mcast_stats() {
 					fi
 
 					json_add_object ""
-					host_ip="$(echo $line | awk -F ' ' '{ print $13 }')"
+					host_ip="$(echo $line | awk -F ' ' '{ print $14 }')"
 					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
 					json_add_string "ipaddr" "$h_ip"
 					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
 					json_add_string "device" "$src_port"
-					timeout="$(echo $line | awk -F ' ' '{ print $14 }')"
+					timeout="$(echo $line | awk -F ' ' '{ print $15 }')"
 					json_add_int "timeout" "$timeout"
 					json_close_object #close the associated device object
 					;;

netmode/Makefile

@@ -8,35 +8,26 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=netmode
-PKG_VERSION:=0.2.0
-
-PKG_SOURCE_VERSION:=5c8abbdf86e4651c7c6f14f784cfb52e69979f96
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/netmoded
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
+PKG_VERSION:=0.3.0
+PKG_RELEASE:=1
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=GPL-2.0-only
 include $(INCLUDE_DIR)/package.mk
 
 define Package/netmode
-	CATEGORY:=Base system
-	DEPENDS:=+fping +ubus +libubox +libuci
-	TITLE:=Predefined Network Modes
+  CATEGORY:=Utilities
+  TITLE:=Network Modes and Utils
 endef
 
 define Package/netmode/description
-	Predefined Network Modes
+	Network Modes and Utils
+endef
+
+define Build/Compile
 endef
 
 define Package/netmode/install
 	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/netmoded $(1)/sbin/
 endef
 
 $(eval $(call BuildPackage,netmode))

netmode/files/etc/config/netmode

@@ -1,8 +1,10 @@
-config netmoded 'netmoded'
-	option enabled '0'
-
-config setup 'setup'
-	option enabled '0'
-        option dir '/etc/netmodes'
+config netmode global
+	option enabled 0
 #	option mode 'router'
 
+#config testnet testnet
+#	option enabled 1
+#	option destination '8.8.8.8'
+	
+#config shiftrange shiftrange
+#	option enabled 1

netmode/files/etc/hotplug.d/iface/05-testnet

@@ -1,16 +1,16 @@
 #!/bin/sh
 
+# do not start testnet if the feature is explicitly disabled
+[ "$(uci -q get netmode.testnet.enabled)" = "0" ] && exit 0
+
 [ "$ACTION" == "ifup" -o "$ACTION" == "ifdown" ] || exit 0
 
 interface_check() {
-	local islan="$(uci -q get network.$INTERFACE.is_lan)"
-	[ "$islan" == "1" ] && exit 0
+	[ "$(uci -q get network.$INTERFACE.is_lan)" = "1" ] && exit 0
 
-	local proto="$(uci -q get network.$INTERFACE.proto)"
-	[ "$proto" == "none" ] && exit 0
+	[ "$(uci -q get network.$INTERFACE.proto)" = "none" ] && exit 0
 
-	local defroute="$(uci -q get network.$INTERFACE.defaultroute)"
-	[ "$defroute" == "0" ] && exit 0
+	[ "$(uci -q get network.$INTERFACE.defaultroute)" = "0" ] && exit 0
 }
 
 interface_check
@@ -19,4 +19,3 @@ if [ -n "$(pgrep -f testnet)" ]; then
 else
 	testnet &
 fi
-

netmode/files/etc/hotplug.d/iface/70-shiftrange

@@ -2,6 +2,9 @@
 # this scripts shifts the lan network prefixes
 # if a wan interface has the same network prefix.
 
+# do not shift range if the feature is explicitly disabled
+[ "$(uci -q get netmode.shiftrange.enabled)" == "0" ] && exit 0
+
 . /lib/functions.sh
 . /lib/functions/network.sh
 

netmode/files/etc/init.d/netmode

@@ -3,44 +3,71 @@
 START=10
 USE_PROCD=1
 
-NETMODED="/sbin/netmoded"
-
 . /lib/functions.sh
-. /lib/functions/netmode.sh
 
-start_netmoded() {
-	config_load netmode
+MODEDIR="/etc/netmodes"
 
-        config_get enabled netmoded enabled 0
-        if [ "$enabled" != "1" ]; then
-		return
+libnetmode_exec() {
+	when="$1"
+	# Execute /lib/netmode scripts
+	if [ -d /lib/netmode/$when ]; then
+		logger -s -p user.info -t "netmode" "Executing /lib/netmode/$when scripts"
+		for script in $(ls /lib/netmode/$when/); do
+			sh /lib/netmode/$when/$script
+		done
 	fi
-
-	procd_open_instance
-	procd_set_param command $NETMODED
-
-	procd_append_param command --verbose warning -i macaddr
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-
-	procd_set_param respawn
-	procd_close_instance
 }
 
 start_service() {
-	populate_netmodes
+	[ -f /etc/config/netmode ] || return
 
-	start_netmoded
-}
+	config_load netmode
 
-reload_service() {
-        switch_netmode
+	config_get_bool enabled global enabled '0'
+	[ $enabled -eq 0 ] && return
 
-	start_netmoded
+	# Get the desired netmode from config
+	config_get mode global mode
+	# Check if netmode is set as boot environment parameter
+	[ -n "$mode" ] || mode="$(fw_printenv -n netmode 2>/dev/null)"
+	# Return if mode is not set
+	[ -n "$mode" ] || return
+
+	# Get the last saved mode
+	lastmode="$(cat /etc/netmodes/.last_mode 2>/dev/null)"
+	# Return if desired mode is same as last saved mode
+	[ "$mode" == "$lastmode" ] && return
+
+	# Save mode as last mode
+	echo "$mode" > /etc/netmodes/.last_mode
+
+	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
+
+	# Execute netmode generic pre-mode-switch scripts
+	libnetmode_exec "pre"
+
+	# Copy netmode UCI config files
+	if [ -d $MODEDIR/$mode/uci ]; then
+		logger -s -p user.info -t "netmode" "Copying $MODEDIR/$mode/uci/* to /etc/config/"
+		cp $MODEDIR/$mode/uci/* /etc/config/ 2>/dev/null
+	fi
+
+	# Execute netmode generic scripts
+	libnetmode_exec
+
+	# Execute mode specific scripts
+	if [ -d $MODEDIR/$mode/scripts ]; then
+		logger -s -p user.info -t "netmode" "Executing $MODEDIR/$mode/scripts/* scripts"
+		for script in $(ls $MODEDIR/$mode/scripts/); do
+			sh $MODEDIR/$mode/scripts/$script
+		done
+	fi
+
+	# Execute netmode generic post-mode-switch scripts
+	libnetmode_exec "post"
 }
 
 service_triggers()
 {
 	procd_add_reload_trigger netmode
 }
-

netmode/files/etc/netmodes/bridge/DETAILS

@@ -1,9 +0,0 @@
-{
-	"description": [
-		{ "en" : "Bridge Mode" }
-	],
-	"explanation": [
-		{ "en" : "NAT is disabled." }
-	],
-	"reboot" : 0
-}

netmode/files/etc/netmodes/bridge/scripts/pre/bridge_mode.sh

@@ -1,92 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions.sh
-
-BRIDGEPORTS=""
-
-get_vlan() {
-	local device="$1"
-	for section in $(uci show network | grep "=device" | cut -d '=' -f1); do
-		if [ "$(uci -q get $section.ifname)" == "$device" ]; then
-			uci -q get $section.name
-			break
-		fi
-	done
-}
-
-add_wifi_devs()
-{
-
-	add_wdev()
-	{
-		local cfg=$1
-#		local disabled
-
-#		config_get_bool disabled $cfg disabled 0
-#		config_get_bool ifname $cfg ifname
-	
-#		if [ $disabled -eq 0 -a -n "$ifname" ]; then
-#			BRIDGEPORTS="$ifname"
-#		fi
-
-		uci -q set wireless.$cfg.network="wan"
-	}
-
-	config_load wireless
-	config_foreach add_wdev "wifi-iface"
-
-	uci -q commit wireless
-}
-
-add_xtm_devs() {
-	local section device vlan
-
-	for section in $(uci show dsl | grep "=.*tm-device" | cut -d'=' -f1); do
-		if [ -n "$(uci -q get $section.device)" ]; then
-
-			vlan="$(get_vlan $device)"
-			[ -n "$vlan" ] && device="$vlan"
-		
-			if [ -n "$device" ]; then
-				BRIDGEPORTS="$BRIDGEPORTS $device"
-			fi
-
-		fi
-	done
-}
-
-add_eth_ports() {
-
-	add_port()
-	{
-		local cfg=$1
-		local ifname vlan
-
-		config_get ifname $cfg ifname
-
-		vlan="$(get_vlan $ifname)"
-		[ -n "$vlan" ] && ifname="$vlan"
-	
-		if [ -n "$ifname" ]; then
-			BRIDGEPORTS="$BRIDGEPORTS $ifname"
-		fi
-	}
-
-	config_load ports
-	config_foreach add_port "ethport"
-}
-
-add_xtm_devs
-add_eth_ports
-add_wifi_devs
-
-BRIDGEPORTS="$(echo $BRIDGEPORTS | sed -e 's/[[:space:]]*$//')"
-
-uci -q set network.wan.type="bridge"
-uci -q set network.wan.ifname="$BRIDGEPORTS"
-uci -q set network.wan6.ifname="@wan"
-uci -q delete network.lan.ifname
-
-ubus call uci commit '{"config":"network"}'
-

netmode/files/etc/netmodes/router/DETAILS

@@ -1,9 +0,0 @@
-{
-	"description": [
-		{ "en" : "Router Mode" }
-	],
-	"explanation": [
-		{ "en" : "NAT is enabled." }
-	],
-	"reboot" : 0
-}

netmode/files/etc/netmodes/router/scripts/pre/router_mode.sh

@@ -1,94 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions.sh
-
-WANPORTS=""
-LANPORTS=""
-
-get_vlan() {
-	local device="$1"
-	for section in $(uci show network | grep "=device" | cut -d '=' -f1); do
-		if [ "$(uci -q get $section.ifname)" == "$device" ]; then
-			uci -q get $section.name
-			break
-		fi
-	done
-}
-
-add_wifi_devs()
-{
-
-	add_wdev()
-	{
-		local cfg=$1
-
-		config_get mode $cfg mode "ap"
-
-		if [ "$mode" == "ap" ]; then
-			uci -q set wireless.$cfg.network="lan"
-		fi
-	}
-
-	config_load wireless
-	config_foreach add_wdev "wifi-iface"
-
-	uci -q commit wireless
-}
-
-add_xtm_devs() {
-	local section device vlan
-
-	for section in $(uci show dsl | grep "=.*tm-device" | cut -d'=' -f1); do
-		device="$(uci -q get $section.device)"
-
-		if [ -n "$device" ]; then
-			vlan="$(get_vlan $device)"
-			[ -n "$vlan" ] && device="$vlan"
-
-			if [ -n "$device" ]; then
-				WANPORTS="$WANPORTS $device"
-			fi
-		fi
-	done
-}
-
-add_eth_ports() {
-
-	add_port()
-	{
-		local cfg=$1
-		local uplink ifname vlan
-
-		config_get ifname $cfg ifname
-		config_get_bool uplink $cfg uplink 0
-	
-		vlan="$(get_vlan $ifname)"
-		[ -n "$vlan" ] && ifname="$vlan"
-
-		if [ $uplink -eq 1 ]; then
-			WANPORTS="$WANPORTS $ifname"
-		else
-			LANPORTS="$LANPORTS $ifname"
-		fi
-	}
-
-	config_load ports
-	config_foreach add_port "ethport"
-}
-
-add_xtm_devs
-add_eth_ports
-add_wifi_devs
-
-WANPORTS="$(echo $WANPORTS | sed -e 's/[[:space:]]*$//')"
-LANPORTS="$(echo $LANPORTS | sed -e 's/[[:space:]]*$//')"
-
-uci -q set network.wan.type="anywan"
-uci -q set network.wan.ifname="$WANPORTS"
-uci -q set network.wan6.ifname="@wan"
-uci -q set network.lan.type="bridge"
-uci -q set network.lan.ifname="$LANPORTS"
-
-ubus call uci commit '{"config":"network"}'
-

netmode/files/etc/uci-defaults/998-netmode-opreqs

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-add_owsd_ubusproxy_object_netmode() {
-	local netmd=$(uci -q get owsd.ubusproxy.object | grep netmode)
-	if [ -z "$netmd" ]; then
-		uci -q add_list owsd.ubusproxy.object="netmode"
-		uci commit owsd
-	fi
-}
-
-add_owsd_ubusproxy_object_netmode

netmode/files/lib/functions/netmode.sh

@@ -1,150 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-
-MODEDIR=$(uci -q get netmode.setup.dir)
-
-[ -n "$MODEDIR" ] || MODEDIR="/etc/netmodes"
-
-run_netmode_scripts() {
-	local mode=$1
-	local when=$2
-	local script
-	local path
-
-	path=$(readlink -f /etc/netmodes/$mode/)
-	[ "${path:0:14}" == "/etc/netmodes/" ] || exit
-
-	if [ -d /etc/netmodes/$mode/scripts/$when ]; then
-		logger -s -p user.info -t "netmode" "Executing $when netmode scripts" >/dev/console
-		for script in $(ls /etc/netmodes/$mode/scripts/$when/); do
-			sh /etc/netmodes/$mode/scripts/$when/$script
-		done
-	fi
-}
-
-switch_netmode() {
-	[ -f /etc/config/netmode -a -d $MODEDIR ] || return
-
-	config_load netmode
-
-	local enabled
-	config_get_bool enabled setup enabled '0'
-	[ $enabled -eq 0 ] && return 
-
-	local mode
-	config_get mode setup mode
-
-	[ -d "/etc/netmodes/$mode" ] || return
-
-	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
-
-	run_netmode_scripts $mode "pre"
-
-	local reboot=$(uci -q get netmode.$mode.reboot)
-
-	if [ "$reboot" == "1" ]; then
-		#run_netmode_scripts $mode "post"
-		reboot &
-		exit
-	fi
-
-	#run_netmode_scripts $mode "post"
-}
-
-populate_netmodes() {
-	[ -f /etc/config/netmode -a -d $MODEDIR ] || return
-
-	config_load netmode
-
-	local enabled
-	config_get_bool enabled setup enabled '0'
-	[ $enabled -eq 0 ] && return 
-
-	delete_netmode() {
-		uci delete netmode.$1
-	}
-
-	config_foreach delete_netmode netmode
-	uci commit netmode
-
-	local hardware=$(db -q get hw.board.model_name)
-	local keys lang desc exp exclude support
-	for mode in $(ls $MODEDIR); do
-			lang=""
-			desc=""
-			exp=""
-			uci -q set netmode.$mode=netmode
-			json_load "$(cat $MODEDIR/$mode/DETAILS)"
-
-			if json_select excluded_boards; then
-				exclude=0
-				_i=1
-				while json_get_var board $_i; do
-					case "$hardware" in
-						$board)
-							uci -q delete netmode.$mode
-							exclude=1
-							break
-						;;
-					esac
-					_i=$((_i+1))
-				done
-				json_select ..
-				[ $exclude -eq 1 ] && continue
-			elif json_select supported_boards; then
-				support=0
-				_i=1
-				while json_get_var board $_i; do
-					case "$hardware" in
-						$board)
-							support=1
-							break
-						;;
-					esac
-					_i=$((_i+1))
-				done
-				json_select ..
-				[ $support -eq 1 ] || {
-					uci -q delete netmode.$mode
-					continue
-				}
-			fi
-
-			json_select description
-			json_get_keys keys
-			for k in $keys; do
-				json_get_keys lang $k
-				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
-				json_select $k
-				json_get_var desc $lang
-				uci -q set netmode.$mode."desc_$lang"="$desc"
-				[ "$lang" == "en" ] && uci -q set netmode.$mode."desc"="$desc"
-				json_select ..
-			done
-			json_select ..
-
-			json_select explanation
-			json_get_keys keys
-			for k in $keys; do
-				json_get_keys lang $k
-				lang=$(echo $lang | sed 's/^[ \t]*//;s/[ \t]*$//')
-				json_select $k
-				json_get_var exp $lang
-				uci -q set netmode.$mode."exp_$lang"="$exp"
-				[ "$lang" == "en" ] && uci -q set netmode.$mode."exp"="$exp"
-				json_select ..
-			done
-			json_select ..
-
-			json_get_var cred credentials
-			uci -q set netmode.$mode.askcred="$cred"
-			json_get_var ulb uplink_band
-			uci -q set netmode.$mode.uplink_band="$ulb"
-			json_get_var reboot reboot
-			uci -q set netmode.$mode.reboot="$reboot"
-	done
-
-	uci commit netmode
-}

netmode/files/sbin/testnet

@@ -31,7 +31,10 @@ test_connection() {
 internet_test() {
 	local link dest
 
-	dest="$(uci -q get diagnostics.@connectivity[0].destination)"
+	# use the destination address given in config for connectivity check
+	dest="$(uci -q get netmode.testnet.destination)"
+	# for backwards compatibility
+	[ -n "$dest" ] || dest="$(uci -q get diagnostics.@connectivity[0].destination)"
 
 	test_connection $dest
 

obudpst/Makefile

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

obuspa/Config.in

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

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=4.1.0.6
+PKG_VERSION:=4.1.0.18
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=817cb955fe010e2c3a1cdcc22c4daac3b9064126
+PKG_SOURCE_VERSION:=af3d4663d66942e3b0e3253375c5620629769aa5
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -29,6 +29,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/obuspa
   SECTION:=utils
   CATEGORY:=Utilities
+  SUBMENU:=TRx69
   TITLE:=USP agent
   DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto
 endef
@@ -80,13 +81,11 @@ 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))

obuspa/files/etc/config/obuspa

@@ -1,9 +1,10 @@
 config obuspa 'global'
 	option enabled '1'
-	option interface 'wan'
-	#option ifname 'eth0.1'
-	option debug '0'
+	option interface 'loopback'
+	#option ifname 'lo'
+	option debug '1'
 	option log_level '1'
+	option 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'
@@ -46,7 +47,7 @@ config subscription
 #	option Description 'Request to get Administrative access'
 #	option role_name 'full_access'
 #	option Enable '1'
-#	option Value 'admin'
+#	option Value 'YWRtaW4='
 #	option Retries 2
 #	option LockoutPeriod 60
 
@@ -54,6 +55,6 @@ config subscription
 #	option Description 'Request to get User access'
 #	option role_name 'user'
 #	option Enable '1'
-#	option Value 'user'
+#	option Value 'dXNlcg=='
 #	option Retries 3
 #	option LockoutPeriod 30

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

@@ -1,11 +0,0 @@
-#!/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
-
-echo "Restarting obuspa"|logger -t obuspa.hotplug -p debug
-
-/etc/init.d/obuspa reload
-

obuspa/files/etc/init.d/obuspa

@@ -67,7 +67,7 @@ get_role_index_from_json() {
 	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
 		return 0
 	fi
 
@@ -98,7 +98,7 @@ get_role_index_from_json() {
 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,6 +123,7 @@ validate_obuspa_section()
 		'interface:string' \
 		'ifname:string:br-lan' \
 		'debug:bool:false' \
+		'prototrace:bool:false' \
 		'log_level:uinteger' \
 		'log_dest:string' \
 		'db_file:string' \
@@ -133,7 +134,6 @@ validate_localagent_section()
 {
 	uci_validate_section ${CONFIGURATION} localagent "${1}" \
 		'Enable:bool:true' \
-		'ParameterName:string:Device.DeviceInfo.SoftwareVersion' \
 		'EndpointID:string'
 }
 
@@ -153,6 +153,7 @@ validate_controller_section()
 		'Reference:string' \
 		'Destination:string:controller-notify-dest' \
 		'Topic:string' \
+		'ParameterName:list(string)' \
 		'coap_host:host' \
 		'coap_path:string' \
 		'coap_port:port' \
@@ -222,9 +223,55 @@ 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"
@@ -235,14 +282,6 @@ configure_localagent() {
 		db_set Device.LocalAgent.EndpointID "${EndpointID}"
 	fi
 
-	_num=1
-	while [ ${_num} -le ${controller_num} ]
-	do
-		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.Enable "${Enable}"
-		db_set Device.LocalAgent.Controller.${_num}.BootParameter.1.ParameterName "${ParameterName}"
-		_num=$(( ${_num} + 1 ))
-	done
-
 	db_set
 }
 
@@ -266,17 +305,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
@@ -326,6 +365,17 @@ configure_controller() {
 		log "Unsupported Protocol ${Protocol}"
 	fi
 
+	local param
+	local _pnum=1
+
+	for param in ${ParameterName}
+	do
+		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.Alias "cpe-${_pnum}"
+		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.Enable "${Enable}"
+		db_set Device.LocalAgent.Controller.${controller_num}.BootParameter.${_pnum}.ParameterName "${param}"
+		_pnum=$(( ${_pnum} + 1 ))
+	done
+
 	db_set
 }
 
@@ -342,9 +392,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
@@ -378,9 +428,9 @@ validate_challenge_section()
 check_json_load()
 {
 	local ret=0
-	if [ -f ${role_def_file} ]; then
+	if [ -f "${role_def_file}" ]; then
 		json_init
-		json_load_file ${role_def_file} 2>&1 |grep -q Failed
+		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
@@ -424,7 +474,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
@@ -460,17 +510,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
@@ -566,7 +616,7 @@ configure_mqtt_client(){
 
 
 configure_obuspa() {
-	local enabled trust_cert ifname interface debug log_level db_file log_dest role_file
+	local enabled trust_cert ifname interface debug prototrace log_level db_file log_dest role_file
 
 	validate_obuspa_section "global" || {
 		log "Validation of global section failed"
@@ -575,15 +625,18 @@ 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 [ -n ${log_level} ]; then
+	if [ "${debug}" -eq 1 -a -n "${log_level}" ]; then
 		procd_append_param command -v ${log_level}
 	fi
 
@@ -593,7 +646,6 @@ configure_obuspa() {
 
 	if [ -n "${interface}" ]; then
 		network_get_physdev ifname ${interface}
-		log "ifname from ${interface} is ${ifname}"
 	fi
 
 	# Set this variable for root user and obuspa -c tool
@@ -649,8 +701,7 @@ db_init() {
 }
 
 service_running() {
-	ubus wait_for usp.raw
-	procd_running ${CONFIGURATION}
+	publish_endpoint
 }
 
 start_service() {
@@ -664,8 +715,6 @@ start_service() {
 		return 0;
 	fi
 
-	ubus wait_for usp.raw
-
 	procd_open_instance ${CONFIGURATION}
 	procd_set_param command ${PROG}
 	db_init
@@ -690,8 +739,8 @@ stop_service() {
 		db_file="/tmp/usp.db"
 	fi
 
-	[ -f ${db_file} ] && rm -f ${db_file}
-	[ -f ${PARAM_FILE} ] && rm -f ${PARAM_FILE}
+	[ -f "${db_file}" ] && rm -f ${db_file}
+	[ -f "${PARAM_FILE}" ] && rm -f ${PARAM_FILE}
 }
 
 reload_service() {

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)

periodicstats/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=312573b91b2ae10d0fe04a4d11ae37898f526fdb
+PKG_SOURCE_VERSION:=7426c7458f792cc66920c206d62869c5620f1400
 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 +libbbfdm +libbbf_api +uspd
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbf_api
 endef
 
 define Package/periodicstats/description

periodicstats/files/etc/init.d/periodicstats

@@ -4,26 +4,23 @@ START=99
 STOP=10
 
 USE_PROCD=1
-NAME=periodicstatsd
 PROG=/usr/sbin/periodicstatsd
 
-. /lib/functions.sh
-
-start_service() {
-	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
+service_running() {
+	ubus -t 10 wait_for usp.raw
 }
 
-stop() {
-	#stop_service() is called after procd killed the service
-	echo ;
+start_service() {
+	enable=$(uci -q get periodicstats.globals.enable)
+
+	if [ "$(enable)" != "1" ]; then
+		return 0;
+	fi
+
+	procd_open_instance periodicstatsd
+	procd_set_param command ${PROG}
+	procd_set_param respawn
+	procd_close_instance
 }
 
 service_triggers() {

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=785166a9861a119623556163179915727896156b
+PKG_SOURCE_VERSION:=15ba90f01914113e7c5e8f8a6df6279c882e8265
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 

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

ponmngr/Makefile

@@ -0,0 +1,38 @@
+#
+# 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))

ponmngr/files/etc/init.d/pon

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

ponmngr/files/etc/uci-defaults/60-pon-generate

@@ -0,0 +1,27 @@
+#!/bin/sh
+
+basemac="$(db -q get hw.board.basemac | tr -d ':')"
+             
+if [ -s "/etc/config/pon" ]; then
+        if uci -q get pon.globals >/dev/null; then
+                # return if there is any valid content
+                exit                                  
+        else                                          
+                rm -f /etc/config/pon
+        fi                           
+fi                                   
+touch /etc/config/pon
+                     
+mac=''               
+if [ -z "$basemac" ]; then
+        mac="12345678"    
+else                      
+        # read last 8 characters of basemac without :
+        mac=${basemac: -8}                           
+fi                                                   
+                          
+uci set pon.globals=globals
+uci set pon.globals.enabled="1"
+uci set pon.globals.serial_number="BRCM$mac"
+                                           
+uci commit pon  

ponmngr/files/lib/pon/broadcom.sh

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

ponmngr/files/usr/libexec/rpcd/pon

@@ -0,0 +1,19 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+include /lib/pon
+
+case "$1" in
+	list)
+		echo '{ "status": {} }'
+		;;
+	call)
+		case "$2" in
+			status)
+				get_gpon_status
+				;;
+		esac
+		;;
+esac
+

port-management/files/etc/uci-defaults/15-ports-config-generate

@@ -1,19 +1,9 @@
 #!/bin/sh
 
-. /lib/network/utils.sh
+populate_config_from_db() {
+	. /lib/network/utils.sh
 
-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)"
+	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)"
@@ -35,4 +25,44 @@ populate_config(){
 	uci commit ports
 }
 
-[ -f /sbin/db -a -f /etc/board-db/config/hw ] && populate_config
+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

qosmngr/Makefile

@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.0.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=460327011d932580f55c7b70acb1e652dd3c95a3
+PKG_SOURCE_VERSION:=e3d608e4bacd367fed99bcdd7f56b3fba7b02891
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

qosmngr/files/etc/uci-defaults/60-qos_queue_generate

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

qosmngr/files/lib/qos/broadcom.sh

@@ -327,6 +327,15 @@ 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*)
@@ -357,6 +366,7 @@ 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"
@@ -395,6 +405,13 @@ 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
@@ -673,17 +690,20 @@ assign_policer_to_port() {
 	local pindex="$2"
 	local portorder="$(db -q get hw.board.ethernetPortOrder)"
 	local wanport="$(db -q get hw.board.ethernetWanPort)"
+	local runner_lan_ports="$(bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/examine port | grep ': port/index=lan' | sed -e 's#\.##g' | cut -f2 -d' ' | sort -u | xargs)"
+	local i=1
 
 	for port in $portorder; do
 		if [ "$ifname" == "$port" ]; then
 			if [ "$wanport" == "$port" ]; then
 				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
 			else
-				local i="${port: -1}"
-				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
+				local lanport="$(echo -n "$runner_lan_ports" | cut -f${i} -d' ')"
+				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure $lanport ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
 			fi
 			break
 		fi
+		i=$((i+1))
 	done
 }
 
@@ -747,11 +767,6 @@ config_ingress_rate_limit() {
 	local in_burst_size=$3
 	local wanport="$(db -q get hw.board.ethernetWanPort)"
 
-	if [ "$ifname" == "$wanport" ]; then
-		logger -t qosmngr "policing is not support on port $ifname"
-		return
-	fi
-
 	# Unit in uci file is in bps while that accepted by ethswctl is kbits
 	if [ $ingress_rate -lt 1000 ]; then
 		return
@@ -766,8 +781,8 @@ config_ingress_rate_limit() {
 	fi
 
 	local unitport="$(get_port_number $ifname)"
-        local unit=$(echo $unitport | cut -d ' ' -f 1)
-        local port=$(echo $unitport | cut -d ' ' -f 2)
+	local unit=$(echo $unitport | cut -d ' ' -f 1)
+	local port=$(echo $unitport | cut -d ' ' -f 2)
 	ethswctl -c rxratectrl -n $unit -p $port -x $ingress_rate -y $in_burst_size
 }
 
@@ -827,7 +842,7 @@ configure_classify() {
 	fcctl flush
 }
 
-configure_queue() {
+pre_configure_queue() {
 	# Delete queues
 	rm -rf /tmp/qos/queue_stats
 
@@ -841,12 +856,15 @@ 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
 		touch /tmp/qos/$intf/q_precedence
 	done
+}
 
+configure_queue() {
 	# Load UCI file
 	config_load qos
 	config_foreach handle_q_order queue
@@ -864,7 +882,7 @@ configure_policer() {
 			local port=$(echo $unitport | cut -d ' ' -f 2)
 			# setting rate and burst size to 0 disables rate limiting
 			if [ $port != "" -a $unit != "" ]; then
-				ethswctl -c rxratectrl -n $unit -p $intf -x 0 -y 0
+				ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
 			fi
 		done
 	fi
@@ -897,6 +915,7 @@ 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.
+	pre_configure_queue
 	configure_shaper
 	configure_queue
 	configure_policer
@@ -916,6 +935,7 @@ reload_qos() {
 	elif [ "$service_name" == "shaper" ]; then
 		configure_shaper
 	elif [ "$service_name" == "queue" ]; then
+		pre_configure_queue
 		configure_queue
 	elif [ "$service_name" == "classify" ]; then
 		configure_classify

questd/Makefile

@@ -6,9 +6,9 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=5.2.2
+PKG_VERSION:=5.2.3
 
-PKG_SOURCE_VERSION:=cd05311b505cc5025a8559c616b55e9fb4d1857d
+PKG_SOURCE_VERSION:=cf54bd65ec821ac67f3aa1caeebcd3ea9aae07ad
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
 

questd/files/etc/init.d/quest

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

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

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

quickjs-websocket/Makefile

@@ -0,0 +1,55 @@
+#
+# 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))

quickjs-websocket/README

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

quickjs-websocket/src/Makefile

@@ -0,0 +1,38 @@
+#
+# 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)

quickjs-websocket/src/lws-client.c

@@ -0,0 +1,958 @@
+/*
+ * 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;
+}

quickjs-websocket/src/websocket.js

@@ -0,0 +1,415 @@
+/*
+ * 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()
+  }
+}

quickjs/Makefile

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