map-topology: add ieee1905 dependency

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>

ated/Makefile

@@ -0,0 +1,78 @@
+#
+# Copyright (C) 2019 iopsys Software Solutions AB. All rights reserved.
+#
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# version 2 as published by the Free Software Foundation.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# General Public License for more details.
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=ated
+PKG_VERSION:=1.2.2
+PKG_RELEASE:=1
+
+PKG_SOURCE_VERSION:=f614cba983d827d5185c60a6a5a35530621d44d2
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mediatek/ated.git
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(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
+
+# support parallel build
+#PKG_BUILD_PARALLEL:=1
+
+#re create configure scripts if not present.
+#PKG_FIXUP:=autoreconf
+
+# run install target when cross compiling. basically, make install DESTDIR=$(PKG_INSTALL_DIR)
+# this way we don't need to pick out the resulting files from the build dir.
+PKG_INSTALL:=1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/ated
+	CATEGORY:=Utilities
+	TITLE:=Daemon for handling wifi calibration
+	URL:=
+	DEPENDS:= libc
+endef
+
+define Package/ated/description
+	Daemon for handling wifi calibration
+endef
+
+#TARGET_CFLAGS += -I$(LINUX_DIR)/include -I$(LINUX_DIR)/arch/mips/include
+
+MAKE_FLAGS += \
+	v=2 \
+	m=3
+
+
+#TARGET_CPPFLAGS := \
+#	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
+#	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
+#	$(TARGET_CPPFLAGS)
+
+# we donot wwant to have any install.
+define Build/Install/Default
+endef
+
+define Package/ated/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ated $(1)/sbin/
+endef
+
+$(eval $(call BuildPackage,ated))

bbf/Config_bbfdm.in

@@ -25,7 +25,3 @@ config BBFDM_ENABLE_JSON_PLUGIN
 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
 	default y
-
-config BBF_MAX_OBJECT_INSTANCES
-	int "Maximum number of instances per object"
-	default 255

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.10
+PKG_VERSION:=6.6.35
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=7ca14a3fcd848ec9d21878fe80aa567f149cf25b
+PKG_SOURCE_VERSION:=0159ecf5d84805d76dff8cb80831334e200989c7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -18,8 +18,8 @@ PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_FIXUP:=autoreconf
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
 
 define Package/libbbf_api
   SECTION:=utils
@@ -85,50 +85,56 @@ define Build/Prepare
 endef
 endif
 
-CMAKE_OPTIONS += \
-	-DBBF_TR181=ON
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE \
+	-Wall -Werror \
+
+CONFIGURE_ARGS += \
+	--enable-tr181
 
 ifeq ($(CONFIG_BBF_TR104),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR104=ON
+CONFIGURE_ARGS += \
+	--enable-tr104
 endif
 
 ifeq ($(CONFIG_BBF_TR143),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR143=ON
+CONFIGURE_ARGS += \
+	--enable-tr143
 endif
 
 ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
-CMAKE_OPTIONS += \
-	-DBBF_VENDOR_EXTENSION=ON
+CONFIGURE_ARGS += \
+	--enable-vendor-extension
 
-CMAKE_OPTIONS += \
-	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
-	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
+CONFIGURE_ARGS += \
+	BBF_VENDOR_LIST="$(CONFIG_BBF_VENDOR_LIST)" \
+	BBF_VENDOR_PREFIX="$(CONFIG_BBF_VENDOR_PREFIX)"
 
 endif ##CONFIG_BBF_VENDOR_EXTENSION
 
 ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
-CMAKE_OPTIONS += \
-	-DBBF_JSON_PLUGIN=ON
+CONFIGURE_ARGS += \
+	--enable-json-plugin
 endif
 
 ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
-CMAKE_OPTIONS += \
-	-DBBF_DOTSO_PLUGIN=ON
+CONFIGURE_ARGS += \
+	--enable-shared-library
 endif
 
 ifeq ($(BUILD_VARIANT),openssl)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+CONFIGURE_ARGS += --enable-libopenssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
 endif
 
 ifeq ($(BUILD_VARIANT),wolfssl)
-CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+CONFIGURE_ARGS += --enable-libwolfssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
-CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+CONFIGURE_ARGS += --enable-libmbedtls
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
 endif
 
 define Package/libbbf_api/install
@@ -142,7 +148,7 @@ define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef
 
@@ -168,7 +174,7 @@ define Build/InstallDev
 	$(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/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
 	touch $(1)/usr/lib/libbbf_api.so
 endef
 

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.4
+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:=54ebb54162fae9fdd6e327e430cf57aa217c176d
+PKG_SOURCE_VERSION:=8c94908eb230dc453dd2f5575be6c06b086b2e7d
 PKG_MIRROR_HASH:=skip
 endif
 

dectmngr/files/etc/init.d/dectmngr

@@ -11,8 +11,6 @@ PROG=/usr/sbin/dectmngr
 LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
 
-DECT_GPIO=$(db -q get hw.board.dect_gpio)
-
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
 	pidof $NAME && killall -q $NAME
@@ -32,7 +30,7 @@ start_service() {
 
 	test $(db get hw.board.hasDect) = "0" && return
 
-	[ -n "$DECT_GPIO" ] && echo 1 > /sys/class/gpio/gpio${DECT_GPIO}/value
+	echo 1 > /sys/class/gpio/gpio14/value
 
 	rfpi=$(db -q get hw.board.dect_rfpi)
 	[ -n "$rfpi" -a ${#rfpi} -eq 14 ] && opt_ext="$opt_ext -rfpi $rfpi"
@@ -73,7 +71,7 @@ start_service() {
 stop_service() {
 	test $(db get hw.board.hasDect) = "0" && return
 
-	[ -n "$DECT_GPIO" ] && echo 0 > /sys/class/gpio/gpio${DECT_GPIO}/value
+	echo 0 > /sys/class/gpio/gpio14/value
 	stop_and_wait_dectmngr
 }
 
@@ -88,10 +86,8 @@ service_triggers()
 }
 
 boot() {
-	[ -n "$DECT_GPIO" ] && {
-		echo ${DECT_GPIO} > /sys/class/gpio/export
-		echo out > /sys/class/gpio/gpio${DECT_GPIO}/direction
-	}
+	echo 14 > /sys/class/gpio/export
+	echo out > /sys/class/gpio/gpio14/direction
 
 	[ ! -d $LOG_PATH ] && mkdir -p $LOG_PATH
 	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.5.5
+PKG_VERSION:=6.4.44
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ce37bf403ab6d15b84fe2078b77fa3a2aad4973a
+PKG_SOURCE_VERSION:=e4f811b7cd2836cdcce5ea0f97f515a317da5bc3
 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
@@ -38,36 +38,26 @@ endef
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
-  TARGET_WIFI_TYPE=BROADCOM
   CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
   TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
 	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
 else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
   TARGET_PLATFORM=MEDIATEK
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
 else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
   TARGET_PLATFORM=TEST
-  TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
 else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
   TARGET_PLATFORM=TEST
-  TARGET_WIFI_TYPE=TEST
   TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
-  TARGET_PLATFORM=ECONET
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_ECONET
 else
   $(info Unexpected CONFIG_TARGET, use default MAC80211)
   TARGET_PLATFORM=MAC80211
-  TARGET_WIFI_TYPE=MAC80211
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
 export TARGET_PLATFORM
-export TARGET_WIFI_TYPE
 
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
@@ -97,7 +87,6 @@ MAKE_FLAGS += \
 	LDFLAGS="$(TARGET_LDFLAGS)" \
 	FPIC="$(FPIC)" \
 	PLATFORM="$(TARGET_PLATFORM)" \
-	WIFI_TYPE="$(TARGET_WIFI_TYPE)" \
 	subdirs="$(subdirs)"
 
 ifeq ($(LOCAL_DEV),1)

easy-soc-libs/ethernet.mk

@@ -2,7 +2,7 @@
 define Package/libethernet
   $(call Package/easy-soc-libs)
   TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_econet:ecnt_api
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig
 endef
 
 define Package/libethernet/config

endptmngr/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=7d43e471f0ffc4a54eb2ac35eced4b72fca4dafb
+PKG_SOURCE_VERSION:=2390a3503990e04e33e8e448ad9dccc00f206908
 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_504040
+export CONFIG_BRCM_SDK_VER_504021
 export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk

evoice/Makefile

@@ -5,23 +5,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=evoice
-PKG_VERSION:=0.2.14
+PKG_VERSION:=0.2.1
 
 LOCAL_DEV=0
-LOCAL_DEV_EVOICE_DIR=~/voip/evoice
-
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=cd21c95c150a841e441472b2623fbf8aabe74996
+PKG_SOURCE_VERSION:=f2477946f9e142d01820b38e32ce98a781e0310e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_BUILD_DEPENDS:=bbf
 
 # All config variable that are passed to the make invocation, directly or
 # indirectly. This ensures that the package is rebuilt on config-changes.
@@ -34,10 +31,7 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl\
-		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
-		+TARGET_iopsys_econet:kmod-voip_driver\
-		+TARGET_iopsys_econet:voip_app
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +TARGET_iopsys_brcm63xx_arm:bcmkernel +TARGET_iopsys_econet:kmod-voip_driver
 endef
 
 define Package/$(PKG_NAME)/description
@@ -46,54 +40,32 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 # If you want to build the code from your own local repositiory enable
-# LOCAL_DEV and set LOCAL_DEV_EVOICE_DIR to your own git repository.
+# LOCAL_DEV and change the path below to your own git repository.
 define Build/Prepare
-	@echo "======================================================="
-	@echo "DEVELOPMENT BUILD! rsync $(LOCAL_DEV_EVOICE_DIR) to $(PKG_BUILD_DIR)"
-	@echo "======================================================="
-	rsync -a $(LOCAL_DEV_EVOICE_DIR)/* $(PKG_BUILD_DIR)/
+	rsync -av /swdev/bide/evoice_clean/* $(PKG_BUILD_DIR)/
 endef
 endif
 
-IDIR = $(STAGING_DIR)/usr/include
-TONES_INI_REQUIRED=
-
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	TARGET_PLATFORM=BROADCOM
-	BDIR = bcm963xx/userspace/private/apps/voice
-	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
-		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
-		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
-	TRG=SVrgBcmFxs
+	export IDIR = $(STAGING_DIR)/usr/include
+	export BDIR = bcm963xx/userspace/private/apps/voice
+	export _XFLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc -I$(IDIR)/bcm963xx/xchg/bos/publicInc -I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
 else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
 	TARGET_PLATFORM=ECONET
-	TONES_INI_REQUIRED=y
-	TRG=SVrgMtekOwrt
 endif
 
-# disable temporarily some not important warnings, force PIC
-CC_FLAGS_VS=$(CC_FLAGS) -Wno-unused-parameter -Wno-unused-function -fPIC
-
 export TARGET_PLATFORM
 
-#used and altered by BIDE makefiles
-export _XFLAGS
-
-BIDE_MAKE_OPTS = -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk\
-	SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix LIF=cerder DBG=dbg
 
 define Build/Compile
 	@echo "TARGET_PLATFORM=${TARGET_PLATFORM}"
-	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS)" TRG=$(TRG)
-
-	@echo "clean libvoiceservice before building shared lib!"
-	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice cleanall
-	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice
+	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=SVrgBcmFxs LIF=cerder DBG=dbg
+	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=libvoiceservice LIF=cerder DBG=dbg
 endef
 
 define Package/evoice/install
 	$(CP) ./files/* $(1)/
-	$(if $(TONES_INI_REQUIRED),,$(RM) $(1)/etc/evoice/tones.ini)
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/

evoice/files/etc/config/voice

@@ -50,10 +50,10 @@ config CapabilitiesCodec 'Codec2'
 
 config CapabilitiesCodec 'Codec3'
 	option Codec 'G.726'
-	
+
 config CapabilitiesCodec 'Codec4'
 	option Codec 'G.722'
-	
+
 config CapabilitiesCodec 'Codec5'
 	option Codec 'G.729'
 
@@ -222,15 +222,15 @@ config NumberingPlan 'NumberingPlan2'
 	option InterDigitTimerStd '2000'
 	option InterDigitTimerOpen '2000'
 	option TerminationDigit ' '
-	list PrefixList '2PrefixInfo1'
-	list PrefixList '2PrefixInfo2'
-	list PrefixList '2PrefixInfo3'
-	list PrefixList '2PrefixInfo4'
-	list PrefixList '2PrefixInfo5'
-	list PrefixList '2PrefixInfo6'
-	list PrefixList '2PrefixInfo7'
-	list PrefixList '2PrefixInfo8'
-	list PrefixList '2PrefixInfo9'
+	list PrefixList '3PrefixInfo1'
+	list PrefixList '3PrefixInfo2'
+	list PrefixList '3PrefixInfo3'
+	list PrefixList '3PrefixInfo4'
+	list PrefixList '3PrefixInfo5'
+	list PrefixList '3PrefixInfo6'
+	list PrefixList '3PrefixInfo7'
+	list PrefixList '3PrefixInfo8'
+	list PrefixList '3PrefixInfo9'
 
 config NumberingPlan 'NumberingPlan3'
 	option MinimumNumberOfDigits '5'
@@ -238,9 +238,9 @@ config NumberingPlan 'NumberingPlan3'
 	option InterDigitTimerStd '2000'
 	option InterDigitTimerOpen '2000'
 	option TerminationDigit '#'
-	list PrefixList '3PrefixInfo1'
+	list PrefixList '4PrefixInfo1'
 
-config PrefixInfo '2PrefixInfo1'
+config PrefixInfo '3PrefixInfo1'
 	option Enable '1'
 	option PrefixRange '*43#'
 	option PrefixMinNumberOfDigits '4'
@@ -250,7 +250,7 @@ config PrefixInfo '2PrefixInfo1'
 	option FacilityAction 'CW_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo2'
+config PrefixInfo '3PrefixInfo2'
 	option Enable '1'
 	option PrefixRange '#43#'
 	option PrefixMinNumberOfDigits '4'
@@ -260,7 +260,7 @@ config PrefixInfo '2PrefixInfo2'
 	option FacilityAction 'CW_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo3'
+config PrefixInfo '3PrefixInfo3'
 	option Enable '1'
 	option PrefixRange '*21*(X+)#'
 	option PrefixMinNumberOfDigits '9'
@@ -270,7 +270,7 @@ config PrefixInfo '2PrefixInfo3'
 	option FacilityAction 'CFU_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo4'
+config PrefixInfo '3PrefixInfo4'
 	option Enable '1'
 	option PrefixRange '#21#'
 	option PrefixMinNumberOfDigits '4'
@@ -280,7 +280,7 @@ config PrefixInfo '2PrefixInfo4'
 	option FacilityAction 'CFU_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo5'
+config PrefixInfo '3PrefixInfo5'
 	option Enable '1'
 	option PrefixRange '*67*(X+)#'
 	option PrefixMinNumberOfDigits '9'
@@ -290,7 +290,7 @@ config PrefixInfo '2PrefixInfo5'
 	option FacilityAction 'CFB_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo6'
+config PrefixInfo '3PrefixInfo6'
 	option Enable '1'
 	option PrefixRange '#67#'
 	option PrefixMinNumberOfDigits '4'
@@ -300,7 +300,7 @@ config PrefixInfo '2PrefixInfo6'
 	option FacilityAction 'CFB_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo7'
+config PrefixInfo '3PrefixInfo7'
 	option Enable '1'
 	option PrefixRange '*61*(X+(*X+)?)#'
 	option PrefixMinNumberOfDigits '15'
@@ -310,7 +310,7 @@ config PrefixInfo '2PrefixInfo7'
 	option FacilityAction 'CFNR_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo8'
+config PrefixInfo '3PrefixInfo8'
 	option Enable '1'
 	option PrefixRange '#61#'
 	option PrefixMinNumberOfDigits '4'
@@ -320,7 +320,7 @@ config PrefixInfo '2PrefixInfo8'
 	option FacilityAction 'CFNR_DEACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '2PrefixInfo9'
+config PrefixInfo '3PrefixInfo9'
 	option Enable '1'
 	option PrefixRange '*31*'
 	option PrefixMinNumberOfDigits '4'
@@ -330,7 +330,7 @@ config PrefixInfo '2PrefixInfo9'
 	option FacilityAction 'CA_ACTIVATE'
 	option FacilityActionArgument ' '
 
-config PrefixInfo '3PrefixInfo1'
+config PrefixInfo '4PrefixInfo1'
 	option Enable '1'
 	option PrefixRange '110|112'
 	option PrefixMinNumberOfDigits '7'

evoice/files/etc/evoice/voicecap

@@ -0,0 +1,38 @@
+# Capabilties are platform dependent. Keep these separated from customer configuration
+ 
+config capabilities_prm 'limits'
+	option MaxCallLogCount '100'
+
+config capabilities_prm 'features'
+	option QIModelsSupported 'G.107'
+
+config CapabilitiesCodec 'Codec1'
+	option Codec 'G.711ALaw'
+	option BitRate '64000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '1'
+
+config CapabilitiesCodec 'Codec2'
+	option Codec 'G.711MuLaw'
+	option BitRate '64000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '1'
+
+config CapabilitiesCodec 'Codec3'
+	option Codec 'G.726'
+	option BitRate '32000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '0'
+	
+config CapabilitiesCodec 'Codec4'
+	option Codec 'G.722'
+	option BitRate '64000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '0'
+	
+config CapabilitiesCodec 'Codec4'
+	option Codec 'G.729'
+	option BitRate '8000'
+	option PacketizationPeriod '20,30'
+	option SilenceSupression '0'
+	

evoice/files/etc/evoice/voicedm

@@ -3,7 +3,6 @@ config account 'map_board'
    option HW_Has_Voice 'hw.board.hasVoice'
    option HW_Has_DECT 'hw.board.hasDect'
    option HW_Nr_Of_POTS_Ports 'hw.board.VoicePorts'
-   option HW_VoiceDSP 'hw.board.VoiceDSP'
    option ProductID 'device.deviceinfo.ModelName'
    option I3_VERSION 'device.deviceinfo.SoftwareVersion'
    option SerialNumber 'device.deviceinfo.SerialNumber'

evoice/files/etc/init.d/evoice

@@ -5,7 +5,6 @@ STOP=12
 
 USE_PROCD=1
 NAME=evoice
-VOICE_UCI_CONFIG=voice
 
 start_service() {
 	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
@@ -21,6 +20,3 @@ reload_service() {
 	start
 }
 
-service_triggers() {
-	procd_add_reload_trigger $VOICE_UCI_CONFIG
-}

gryphon-led-module/Makefile

@@ -44,17 +44,13 @@ 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.225
+	MODULES_SUBDIR:=lib/modules/4.19.183
 	TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)-
 
 	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:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX)-
-	else ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"6855" "6756" "47622" "63148" "63178"))
-		# These targets use a 32-bit arm-sfp kernel
-		LINUX_KARCH:=arm
-		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_PREFIX)-
 	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"

icwmp/Config_cwmp.in

@@ -0,0 +1,30 @@
+choice
+       prompt "Select ACS sever"
+       default CWMP_ACS_MULTI
+       depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
+
+config CWMP_ACS_MULTI
+	bool "No specific ACS, follow standard"
+
+config CWMP_ACS_HDM
+	bool "Select HDM as ACS server"
+endchoice
+
+config CWMP_DEBUG
+	bool "Compile with debug options"
+	depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
+	default y
+
+config CWMP_DEVEL_DEBUG
+	bool "Compile with development debug options (deprecated)"
+	depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
+	default n

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.5.4
+PKG_VERSION:=8.4.8
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=58a32f910bc4043454880177621f8eddfc1f93f7
+PKG_SOURCE_VERSION:=00d037ce851495aca6365f2189849c6030f305df
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -21,8 +21,14 @@ PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_LICENSE:=GPLv2
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_FIXUP:=autoreconf
+PKG_CONFIG_DEPENDS:= \
+	CONFIG_CWMP_ACS_MULTI \
+	CONFIG_CWMP_ACS_HDM \
+	CONFIG_CWMP_DEBUG \
+	CONFIG_CWMP_DEVEL_DEBUG
+
 include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
 
 define Package/icwmp/default
   SECTION:=utils
@@ -32,6 +38,20 @@ define Package/icwmp/default
   DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
 endef
 
+define Package/icwmp/config
+	source "$(SOURCE)/Config_cwmp.in"
+endef
+
+TARGET_CFLAGS += \
+	-D_GNU_SOURCE \
+	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""
+
+define Package/icwmp
+  $(Package/icwmp/default)
+  TITLE += (internal)
+  VARIANT:=internal
+endef
+
 define Package/icwmp-openssl
   $(Package/icwmp/default)
   TITLE += (openssl)
@@ -57,15 +77,41 @@ define Package/icwmp-mbedtls
 endef
 
 ifeq ($(BUILD_VARIANT),openssl)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+CONFIGURE_ARGS += --enable-libopenssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+TARGET_LDFLAGS += "-lssl"
 endif
 
 ifeq ($(BUILD_VARIANT),wolfssl)
-CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+CONFIGURE_ARGS += --enable-libwolfssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += "-lwolfssl"
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
-CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+CONFIGURE_ARGS += --enable-libmbedtls
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+TARGET_LDFLAGS += "-lmbedtls"
+endif
+
+ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
+CONFIGURE_ARGS += \
+	--enable-acs=multi
+endif
+
+ifeq ($(CONFIG_CWMP_ACS_HDM),y)
+CONFIGURE_ARGS += \
+	--enable-acs=hdm
+endif
+
+ifeq ($(CONFIG_CWMP_DEBUG),y)
+CONFIGURE_ARGS += \
+	--enable-debug
+endif
+
+ifeq ($(CONFIG_CWMP_DEVEL_DEBUG),y)
+CONFIGURE_ARGS += \
+	--enable-devel
 endif
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -82,22 +128,22 @@ define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
 	$(INSTALL_BIN) ./files/etc/init.d/icwmpd $(1)/etc/init.d/icwmpd
 	$(INSTALL_BIN) ./files/etc/uci-defaults/85-cwmp-set-userid $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/90-cwmpfirewall $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-icwmp-generate-ssl $(1)/etc/uci-defaults/
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
-	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
 endef
 
 Package/icwmp-openssl/install = $(Package/icwmp/default/install)
 Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
 Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
 
+$(eval $(call BuildPackage,icwmp))
 $(eval $(call BuildPackage,icwmp-openssl))
 $(eval $(call BuildPackage,icwmp-wolfssl))
 $(eval $(call BuildPackage,icwmp-mbedtls))

icwmp/files/etc/bbfdm/json/CWMPManagementServer.json

@@ -1,36 +0,0 @@
-{
-	"json_plugin_version": 1,
-	"Device.CWMPManagementServer.": {
-		"type": "object",
-		"version": "2.15",
-		"protocols": [
-			"usp"
-		],
-		"access": false,
-		"array": false,
-		"dependency": "file:/etc/config/cwmp",
-		"EnableCWMP": {
-			"type": "boolean",
-			"version": "2.15",
-			"read": true,
-			"write": true,
-			"protocols": [
-				"usp"
-			],
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "cwmp",
-						"section": {
-							"name": "cpe"
-						},
-						"option": {
-							"name": "enable"
-						}
-					}
-				}
-			]
-		}
-	}
-}

icwmp/files/etc/config/cwmp

@@ -15,7 +15,6 @@ config acs 'acs'
 	option ip_version '4'
 
 config cpe 'cpe'
-	option enable '1'
 	option default_wan_interface 'wan'
 	option log_to_console 'disable'
 	option log_to_file 'disable'

icwmp/files/etc/icwmpd/update.sh

@@ -1,27 +1,98 @@
 #!/bin/sh
-. /lib/functions.sh
 
 log() {
 	echo "$@" |logger -t cwmp.update -p info
 }
 
 handle_icwmp_update() {
-	local cwmp_enable
-	config_load cwmp
+	local defwan vendorspecinf update
+	local fallback_restart
 
-	config_get_bool cwmp_enable cpe enable 1
-	if [ "$cwmp_enable" = "0" ]; then
-		return 0
-	fi
+	fallback_restart="${1:-0}"
+	update="0"
+	defwan="$(uci -q get cwmp.cpe.default_wan_interface)"
+	vendorspecinf="$(ifstatus "${defwan}" | jsonfilter -e "@.data.vendorspecinf")"
 
-	status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
-	if [ "$status" != "running" ]; then
-		log "Trigger out of bound inform, since last inform status was failure"
-		ubus -t 10 call tr069 inform >/dev/null 2>&1
-		# Handle timeout or tr069 object not found
-		if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
-			log "Restarting icwmp tr069 object"
-			/etc/init.d/icwmpd restart
+	log "Handling dhcp option value [${vendorspecinf}]"
+	[ -n "$vendorspecinf" ] && {
+		local url old_url
+		local prov_code old_prov_code
+		local min_wait_interval old_min_wait_interval
+		local retry_interval_multiplier old_retry_interval_multiplier
+
+		old_url="$(uci -q get cwmp.acs.dhcp_url)"
+		old_prov_code="$(uci -q get cwmp.cpe.dhcp_provisioning_code)"
+		old_min_wait_interval="$(uci -q get cwmp.acs.dhcp_retry_min_wait_interval)"
+		old_retry_interval_multiplier="$(uci -q get cwmp.acs.dhcp_retry_interval_multiplier)"
+
+		case $vendorspecinf in
+			http://*|https://*)
+					url="${vendorspecinf}"
+				;;
+			*)
+				for optval in $vendorspecinf; do
+				        case $optval in
+				                1=*)
+				                        url="$(echo "$optval" | cut -d"=" -f2-)"
+				                ;;
+				                2=*)
+				                        prov_code="$(echo "$optval" | cut -d"=" -f2-)"
+				                ;;
+				                3=*)
+				                        min_wait_interval="$(echo "$optval" | cut -d"=" -f2-)"
+				                ;;
+				                4=*)
+				                        retry_interval_multiplier="$(echo "$optval" | cut -d"=" -f2-)"
+				                ;;
+				        esac
+				done
+			;;
+		esac
+
+		if [ -n "$url" ]; then
+			if [ "${url}" != "${old_url}" ]; then
+				log "## icwmp url[${old_url}] changed to [${url}]"
+				uci -q set cwmp.acs.dhcp_url="$url"
+				update=1
+			fi
+		fi
+		if [ -n "$prov_code" ]; then
+			if [ "${prov_code}" != "${old_prov_code}" ]; then
+				log "## icwmp prov_code[${old_prov_code}] changed to [${prov_code}]"
+				uci -q set cwmp.cpe.dhcp_provisioning_code="$prov_code"
+				update=1
+			fi
+		fi
+		if [ -n "$min_wait_interval" ]; then
+			if [ "${min_wait_interval}" != "${old_min_wait_interval}" ]; then
+				log "## icwmp min_wait_interval[${old_min_wait_interval}] changed to [${min_wait_interval}]"
+				uci -q set cwmp.acs.dhcp_retry_min_wait_interval="$min_wait_interval"
+				update=1
+			fi
+		fi
+		if [ -n "$retry_interval_multiplier" ]; then
+			if [ "${retry_interval_multiplier}" != "${old_retry_interval_multiplier}" ]; then
+				log "## icwmp retry_interval_multiplier[${old_retry_interval_multiplier}] changed to [${retry_interval_multiplier}]"
+				uci -q set cwmp.acs.dhcp_retry_interval_multiplier="$retry_interval_multiplier"
+				update=1
+			fi
+		fi
+	}
+
+	# In case of update restart icwmp
+	if [ "${update}" -eq "1" ]; then
+		log "CWMP uci changes, reload cwmp with uci commit"
+		ubus call uci commit '{"config":"cwmp"}'
+	else
+		status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
+		if [ "$status" = "failure" ]; then
+			log "Trigger out of bound inform, since last inform status was failure"
+			ubus -t 10 call tr069 inform >/dev/null 2>&1
+			# Handle timeout
+			if [ "$?" -eq 7 ]; then
+				log "Restarting icwmp tr069 object"
+				/etc/init.d/icwmpd restart
+			fi
 		fi
 	fi
 }

icwmp/files/etc/init.d/icwmpd

@@ -15,34 +15,6 @@ log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
 
-regenerate_ssl_link()
-{
-	local cert_dir all_file rehash
-
-	cert_dir="${1}"
-	[ ! -d "${cert_dir}" ] && return 0;
-
-	### Generate all ssl link for pem certicates ###
-	all_file=$(ls $cert_dir/*.pem 2>/dev/null)
-	if [ -n "${all_file}" ]; then
-		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in $cfile)"
-			[ -f ${cert_dir}/${rehash}.0 ] || \
-				ln -s $cfile $cert_dir/${rehash}.0
-		done
-	fi
-
-	### Generate all ssl link for crt certicates ###
-	all_file=$(ls $cert_dir/*.crt 2>/dev/null)
-	if [ -n "${all_file}" ]; then
-		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in $cfile)"
-			[ -f ${cert_dir}/${rehash}.0 ] || \
-				ln -s $cfile $cert_dir/${rehash}.0
-		done
-	fi
-}
-
 enable_dhcp_option43() {
 	local wan="${1}"
 
@@ -173,16 +145,18 @@ validate_defaults() {
 		return 1;
 	}
 
-	ssl_capath="${ssl_capath%/}"
 	# Put the cert pem file in keep list
 	if [ -d "${ssl_capath}" ]; then
-		if ! grep "*.pem\|*.crt" /lib/upgrade/keep.d/icwmp; then
+		if ! grep "${ssl_capath}" /lib/upgrade/keep.d/icwmp; then
 			echo "${ssl_capath}"'/*.pem' >> /lib/upgrade/keep.d/icwmp
-			echo "${ssl_capath}"'/*.crt' >> /lib/upgrade/keep.d/icwmp
-			echo "${ssl_capath}"'/*.0' >> /lib/upgrade/keep.d/icwmp
 		fi
 	fi
 
+	[ -z "${url}" ] && [ -z "${dhcp_url}" ] && {
+		log "ACS url is empty can't start"
+		return 1;
+	}
+
 	validate_cpe_section || {
 		log "Validation of cpe section failed"
 		return 1;
@@ -191,41 +165,39 @@ validate_defaults() {
 	return 0;
 }
 
-boot() {
-	local dhcp_discovery="0"
-
-	config_load cwmp
-	config_get dhcp_discovery acs dhcp_discovery "0"
-
-	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
-		# Set dhcp option 43 if not already configured
-		config_get wan_interface cpe default_wan_interface "wan"
-		enable_dhcp_option43 "${wan_interface}"
-	fi
-	
-	config_get ssl_capath acs ssl_capath
-
-	if [ -n "${ssl_capath}" ]; then
-		regenerate_ssl_link "${ssl_capath}"
-	fi
-
-	start
-}
-
 start_service() {
 	local enable_cwmp
+	local wan_interface
+	local dhcp_discovery
+	local dhcp_url
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
+	config_get dhcp_discovery acs dhcp_discovery "0"
+	config_get dhcp_url acs dhcp_url ''
+	config_get wan_interface cpe default_wan_interface "wan"
 
-	if [ "$enable_cwmp" = "0" ]; then
+	if [ "$enable_cwmp" = "0" ] || [ "$enable_cwmp" = "false" ]; then
+		log "CWMP is not enabled"
 		return 0
 	fi
 
+	# Set dhcp option 43 if dhcp discovery enabled
+	if [ "${dhcp_discovery}" == "enable" ] || [ "${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
 
+	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
+		if [ -z "${dhcp_url}" ]; then
+			log "Empty dhcp url, running update script"
+			/etc/icwmpd/update.sh
+		fi
+	fi
+
 	validate_defaults || {
 		log "Validation of defaults failed"
 		return 1;
@@ -251,25 +223,9 @@ service_stopped()
 }
 
 reload_service() {
-	local ret
-
-	config_load cwmp
-	config_get_bool enable_cwmp cpe enable 1
-
-	ret="0"
-	if [ "$enable_cwmp" = "0" ]; then
-		stop
-		return 0
-	fi
-
-	status="$(ubus -t 1 call tr069 status |jsonfilter -qe '@.cwmp.status')"
-	ret="$?"
-	if [ "$status" = "up" ]; then
-		ubus -t 1 call tr069 command '{"command":"reload"}'
-		ret="$?"
-	fi
-
-	if [ "$status" = "init" ] || [ "$ret" -ne "0" ]; then
+	log "Reloading CWMP client"
+	ubus -t 1 call tr069 command '{"command":"reload"}'
+	if [ "$?" -ne "0" ]; then
 		log "Restarting CWMP client"
 		stop
 		start
@@ -286,6 +242,7 @@ service_triggers() {
                                json_add_array
                                        json_add_string "" "run_script"
                                        json_add_string "" "/etc/icwmpd/update.sh"
+                                       json_add_string "" "1"
                                json_close_array
                        json_close_array
                        json_add_int "" "2000"

icwmp/files/etc/uci-defaults/85-cwmp-set-userid

@@ -1,11 +1,7 @@
-#!/bin/sh
-
-. /lib/functions.sh
 # Copy defaults by the factory to the cwmp UCI user section.
-config_load cwmp
 
 # Get Manufacturer OUI.
-config_get oui cpe manufacturer_oui ""
+oui=$(uci -q get cwmp.cpe.manufacturer_oui)
 if [ -z "${oui}" ]; then
 	oui=$(db -q get device.deviceinfo.ManufacturerOUI)
 fi
@@ -13,29 +9,24 @@ fi
 oui=$(echo "${oui}" | tr 'a-f' 'A-F')
 
 # Get system serial number.
-config_get serial cpe 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
-config_get acs_userid acs userid ""
-config_get cpe_userid cpe userid ""
+acs_userid=$(uci -q get cwmp.acs.userid)
+cpe_userid=$(uci -q get cwmp.cpe.userid)
 
 # Only set if they are empty
-if [ -z "${acs_userid}" ]; then
+if [ -z "$acs_userid" ]
+then
     uci -q set cwmp.acs.userid="${oui}-${serial}"
 fi
 
-if [ -z "${cpe_userid}" ]; then
+if [ -z "$cpe_userid" ]
+then
     uci -q set cwmp.cpe.userid="${oui}-${serial}"
 fi
 
-# Fix the cwmp.cpe.enable parameter
-# set default to 1 if not defined
-config_get enable_cwmp cpe enable ""
-if [ -z "${enable_cwmp}" ]; then
-    uci -q set cwmp.cpe.enable="1"
-fi
-
 # No need for commit here, it is done by uci_apply_defaults().

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

@@ -0,0 +1,38 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+regenerate_ssl_link_path()
+{
+        local cert_dir all_file rehash
+
+        cert_dir="${1}"
+
+        all_file=$(ls $cert_dir/*.pem 2>/dev/null)
+
+        [ ! -d "${cert_dir}" ] && return 0;
+        [ ! -f "${all_file}" ] && return 0;
+
+        for cfile in $all_file
+        do
+		rehash="$(openssl x509 -hash -noout -in $cfile)"
+		[ -f ${cert_dir}/${rehash}.0 ] || \
+			ln -s $cfile $cert_dir/${rehash}.0
+        done
+}
+
+regenerate_ssl_link()
+{
+        local cwmp_ca_path
+
+        regenerate_ssl_link_path "/etc/ssl/certs"
+
+        cwmp_ca_path=$(uci -q get cwmp.acs.ssl_capath)
+        if [[ "${cwmp_ca_path}" != "/etc/ssl/certs"* ]]; then
+                if [ -n "${cwmp_ca_path}" ]; then
+                        regenerate_ssl_link_path "${cwmp_ca_path}"
+                fi
+        fi
+}
+
+regenerate_ssl_link

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

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

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.10.5
+PKG_VERSION:=4.9.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=287aeb7120b9904d4c481ceb6ba2fa6c73d4f8a2
+PKG_SOURCE_VERSION:=69b27e3e1509b9192c529fbba6a329cc0532cfbb
 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
@@ -70,7 +70,6 @@ define Package/libieee1905/description
 endef
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

ieee1905/files/etc/uci-defaults/30-set-ieee1905-al-macaddr

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-
-BMAC=$(db -q get hw.board.basemac)
-BMAC=${BMAC//:/}
-BMAC=${BMAC// /}
-BMAC=$(printf "%12.12X" $((0x$BMAC)))
-
-[ "$BMAC" == "" ] && exit 1
-
-LMAC=$((0x$BMAC & 0xfeffffffffff))
-LMAC=$(($LMAC | 0x020000000000))
-LMAC=$(printf "%12.12X" $LMAC)
-LMAC=$(echo $LMAC | sed -e 's/[0-9A-F]\{2\}/&:/g' -e 's/:$//')
-
-mac=$(uci -q get ieee1905.ieee1905.macaddress)
-
-[ "$mac" != "" ] && exit 0
-
-uci set ieee1905.ieee1905.macaddress="$LMAC"
-uci commit ieee1905
-

inbd/Makefile

@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=inbd
-PKG_VERSION:=1.2.3
+PKG_VERSION:=1.2.2
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=d4e910a31039e0c0b7a539311eafcd716c36be77
+PKG_SOURCE_VERSION:=10f765f3d0fcc226b6ecf0c481598c9e7f76315e
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/inbd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_RELEASE)-$(PKG_SOURCE_VERSION).tar.gz

iop/config

@@ -50,8 +50,6 @@ CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-agent=y
-CONFIG_PACKAGE_map-controller=y
 CONFIG_PACKAGE_map-topology=y
 CONFIG_PACKAGE_wfadatad-collector=y
 
@@ -117,8 +115,7 @@ CONFIG_PACKAGE_xl2tpd=y
 CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
-CONFIG_PACKAGE_dnsmasq=y
-CONFIG_PACKAGE_miniupnpd-iptables=y
+CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -136,11 +133,10 @@ CONFIG_LIBCURL_CRYPTO_AUTH=y
 # CONFIG_LIBCURL_MBEDTLS is not set
 CONFIG_LIBCURL_OPENSSL=y
 CONFIG_PACKAGE_ethtool=y
-CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables-legacy=y
+CONFIG_PACKAGE_iptables=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
@@ -165,7 +161,6 @@ CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_nand-utils=y
 CONFIG_PACKAGE_openssl-util=y
 CONFIG_OPENSSL_WITH_COMPRESSION=y
-CONFIG_PACKAGE_procd-ujail=m
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-rpcsys=y
 CONFIG_PACKAGE_rpcd-mod-rrdns=y
@@ -289,10 +284,3 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
-
-# Use fw3 iptables-based instead of newer nftables-based fw4
-# TODO: for now we cannot build an image with fw3 and luci-app-firewall (i.e. fw3)
-# Enabling luci-app-firewall enables fw4
-# CONFIG_PACKAGE_luci-app-firewall is not set
-CONFIG_PACKAGE_firewall=y
-# CONFIG_PACKAGE_firewall4 is not set

iop/scripts/feeds_update.sh

@@ -2,65 +2,57 @@
 
 function feeds_update {
 
-	developer=0
-	override=1
-	start=$(date -u +'%s')
-	while getopts "n" opt; do
-		case $opt in
-		n)
-			override=0
-			;;
-		esac
-	done
+    developer=0
+    override=1
+    start=$(date -u +'%s');
+    while getopts "n" opt; do
+	case $opt in
+	    n)
+		override=0
+		;;
+	esac
+    done
 
-	git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
-	cp .config .genconfig_config_bak
+    git remote -v | grep -qE '(git@|ssh://)' && developer=1
 
-	#if -d argument is passed, clone feeds with ssh instead of http
-	if [ $developer == 1 ]; then
-		./scripts/feeds update -g
-	else
-		./scripts/feeds update
-	fi
+    cp .config .genconfig_config_bak
+
+    #if -d argument is passed, clone feeds with ssh instead of http
+    if [ $developer == 1 ]; then
+	./scripts/feeds update -g
+    else
+	./scripts/feeds update
+    fi
 	./scripts/feeds update -ai
 
-	# replace core packages with iopsys versions
-	if [ $override == 1 ]; then
+    # replace core packages with iopsys versions
+    if [ $override == 1 ]; then
 		./scripts/feeds install -f -p openwrt_core -a
-	fi
+    fi
 
-	# targets need to be installed explicitly
-	for target in $(ls ./feeds/targets); do
-		rm -f target/linux/$target
-		./scripts/feeds install -p targets $target
-	done
+    # targets need to be installed explicitly
+    for target in $(ls ./feeds/targets)
+    do
+	rm -f target/linux/$target
+	./scripts/feeds install -p targets $target
+    done
 
-	# Workaround for bug in 22.03.0-rc4 where installed target path has been
-	# moved to target/linux/feeds but Config.in and Makefile from installed
-	# targets are not properly included from the new location.
-	# This hack is to be removed once the issues are fixed.
-	# Note that the above block of code might no longer necessary because
-	# targets no longer need to be installed explicitly.
-	echo "Working around installed-target-bug"
-	for f in target/linux/feeds/*; do
-		ln -vsf "feeds/$(basename "$f")" "target/linux/$(basename "$f")"
-	done
+    # install all packages
+    ./scripts/feeds install -a
 
-	# install all packages
-	./scripts/feeds install -a
+    # remove broken symlinks ( for packages that are no longer in the feed )
+    find -L package/feeds -maxdepth 2 -type l -delete
 
-	# remove broken symlinks ( for packages that are no longer in the feed )
-	find -L package/feeds -maxdepth 2 -type l -delete
+    cp .genconfig_config_bak .config
+    make defconfig
 
-	cp .genconfig_config_bak .config
-	make defconfig
+    # record when we last run this script
+    touch tmp/.iop_bootstrap
 
-	# record when we last run this script
-	touch tmp/.iop_bootstrap
-
-	# always return true
-	exit 0
+    # always return true
+    exit 0
 }
 
 register_command "feeds_update" "Update feeds to point to commit hashes from feeds.conf"
+

iop/scripts/genconfig.sh

@@ -13,11 +13,11 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
+	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
+	ramips="target/linux/iopsys-ramips"
+	econet="target/linux/iopsys-econet"
+	x86="target/linux/iopsys-x86"
+	armvirt="target/linux/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -83,8 +83,8 @@ function genconfig {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
+			local targetpath="./target/linux/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -328,7 +328,6 @@ function genconfig {
 			subtarget="en7562"
 			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

iop/scripts/genconfig_min.sh

@@ -12,11 +12,11 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
+	brcm63xx_arm="target/linux/iopsys-brcm63xx-arm"
+	ramips="target/linux/iopsys-ramips"
+	econet="target/linux/iopsys-econet"
+	x86="target/linux/iopsys-x86"
+	armvirt="target/linux/iopsys-armvirt"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -82,8 +82,8 @@ function genconfig_min {
 
 		[ -n "$profile" ] || return
 
-		if [ -n "$TARGET" -a -d "./target/linux/feeds/$TARGET" ]; then
-			local targetpath="./target/linux/feeds/$TARGET"
+		if [ -n "$TARGET" -a -d "./target/linux/$TARGET" ]; then
+			local targetpath="./target/linux/$TARGET"
 			local profiles=
 			local pfound=0
 
@@ -319,7 +319,6 @@ function genconfig_min {
 			subtarget="en7562"
 			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

libmicroxml/Makefile

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2012-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libmicroxml
+PKG_VERSION:=2012-06-11
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/mirror/microxml.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=72965423184f24cc0b963d91c2d1863cdb01b6aa
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+PKG_LICENSE:=LGPL-2.0
+PKG_LICENSE_FILES:=COPYING
+
+PKG_FIXUP:=autoreconf
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libmicroxml
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=XML library
+  MAINTAINER:=Luka Perkov <luka@openwrt.org>
+endef
+
+define Package/libmicroxml/description
+ A micro sized XML library
+endef
+
+CONFIGURE_ARGS += \
+	--disable-threads \
+	--enable-static \
+	--enable-shared
+
+define Build/InstallDev
+	$(INSTALL_DIR) $(1)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/microxml.h $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/pkgconfig
+	$(CP) $(PKG_BUILD_DIR)/microxml.pc $(1)/usr/lib/pkgconfig
+endef
+
+define Package/libmicroxml/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libmicroxml.so* $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,libmicroxml))

libmicroxml/patches/100-fix-memleak.patch

@@ -0,0 +1,130 @@
+diff --git a/mxml-file.c b/mxml-file.c
+index 02eca9d..f10d202 100644
+--- a/mxml-file.c
++++ b/mxml-file.c
+@@ -363,9 +363,12 @@ mxmlSaveFile(mxml_node_t    *node,	/* I - Node to write */
+   * Write the node...
+   */
+ 
+-  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0)
++  if ((col = mxml_write_node(node, fp, cb, 0, mxml_file_putc, global)) < 0){
++    global_free(global);
+     return (-1);
+-
++  }
++  
++  global_free(global);
+   if (col > 0)
+     if (putc('\n', fp) < 0)
+       return (-1);
+@@ -1448,6 +1451,7 @@ mxml_load_data(
+   if ((buffer = malloc(64)) == NULL)
+   {
+     mxml_error("Unable to allocate string buffer!");
++    global_free(global);
+     return (NULL);
+   }
+ 
+@@ -2083,11 +2087,12 @@ mxml_load_data(
+ 		 node->parent ? node->parent->value.element.name : "(null)");
+ 
+       mxmlDelete(first);
+-
++      global_free(global);
+       return (NULL);
+     }
+   }
+ 
++  global_free(global);
+   if (parent)
+     return (parent);
+   else
+@@ -2102,7 +2107,7 @@ error:
+   mxmlDelete(first);
+ 
+   free(buffer);
+-
++  global_free(global);
+   return (NULL);
+ }
+ 
+diff --git a/mxml-private.c b/mxml-private.c
+index 4378ca3..ea6e452 100644
+--- a/mxml-private.c
++++ b/mxml-private.c
+@@ -41,6 +41,32 @@
+  * This code currently supports AIX, HP-UX, Linux, Mac OS X, Solaris, and
+  * Windows.  It might work on the BSDs and IRIX, but I haven't tested that.
+  */
++void *global_mem[16] = {0};
++
++static void *global_calloc(int x, int size)
++{
++  int i;
++  void *m = calloc(x, size);
++  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i > 0; i--) {
++    global_mem[i] = global_mem[i-1];
++  }
++  global_mem[0] = m;
++  return m;
++}
++
++void global_free(void *m)
++{
++  int i;
++  if (m == NULL)
++    return;
++  for (i = ((sizeof(global_mem)/sizeof(global_mem[0])) - 1); i >= 0; i--) {
++    if (global_mem[i] == m) {
++      global_mem[i] = NULL;
++      free(m);
++      break;
++    }
++  }
++}
+ 
+ #if defined(__sun) || defined(_AIX)
+ #  pragma fini(_mxml_fini)
+@@ -148,7 +174,6 @@ mxml_real_cb(mxml_node_t *node)		/* I - Current node */
+   return (MXML_REAL);
+ }
+ 
+-
+ #ifdef HAVE_PTHREAD_H			/**** POSIX threading ****/
+ #  include <pthread.h>
+ 
+@@ -190,7 +215,6 @@ _MXML_FINI(void)
+   }
+ }
+ 
+-
+ /*
+  * '_mxml_global()' - Get global data.
+  */
+@@ -205,7 +229,7 @@ _mxml_global(void)
+ 
+   if ((global = (_mxml_global_t *)pthread_getspecific(_mxml_key)) == NULL)
+   {
+-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
++    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
+     pthread_setspecific(_mxml_key, global);
+ 
+     global->num_entity_cbs = 1;
+@@ -288,7 +312,7 @@ _mxml_global(void)
+ 
+   if ((global = (_mxml_global_t *)TlsGetValue(_mxml_tls_index)) == NULL)
+   {
+-    global = (_mxml_global_t *)calloc(1, sizeof(_mxml_global_t));
++    global = (_mxml_global_t *)global_calloc(1, sizeof(_mxml_global_t));
+ 
+     global->num_entity_cbs = 1;
+     global->entity_cbs[0]  = _mxml_entity_cb;
+diff --git a/mxml-private.h b/mxml-private.h
+index c591208..72ed338 100644
+--- a/mxml-private.h
++++ b/mxml-private.h
+@@ -43,3 +43,4 @@ typedef struct _mxml_global_s
+ extern _mxml_global_t	*_mxml_global(void);
+ extern int		_mxml_entity_cb(const char *name);
+ 
++extern void global_free(void *m);

map-agent/Makefile

@@ -1,16 +1,16 @@
 #
-# Copyright (C) 2020-22 IOPSYS Software Solutions AB
+# Copyright (C) 2020-21 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.0.2
+PKG_VERSION:=7.2.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=78face98267fc46d7d227979b35fcb39a2e175c9
+PKG_SOURCE_VERSION:=b3e3a21c9a938ce719a0ea609c965852586d6778
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 LOCAL_DEV=0
@@ -56,7 +56,6 @@ endef
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)

map-agent/files/etc/config/mapagent

@@ -10,7 +10,6 @@ config agent 'agent'
 
 config dynamic_backhaul
 	option missing_bh_timer '60'
-	option missing_bh_reconfig_timer '1800'
 
 config controller_select
 	option id 'auto'

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

@@ -80,8 +80,7 @@ validate_agent_section() {
 		'vlan_segregation:bool:false' \
 		'resend_num:uinteger:0' \
 		'dyn_cntlr_sync:bool:true' \
-		'island_prevention:bool:false' \
-		'eth_onboards_wifi_bhs:bool:false'
+		'island_prevention:bool:true'
 
 
 	[ "$?" -ne 0 ] && {
@@ -116,7 +115,7 @@ validate_ap_section() {
 	uci_validate_section mapagent $section "${1}" \
 			'ifname:string' \
 			'device:string' \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'enabled:bool:true' \
 			'onboarded:bool:false' \
 			'ssid:string' \
@@ -149,8 +148,7 @@ validate_radio_section() {
 			'include_sta_stats:bool:false' \
 			'include_sta_metric:bool:false' \
 			'rcpi_hysteresis_margin:range(0,255)' \
-			'report_util_threshold:range(0,255)' \
-			'encryption:or("sae", "psk2", "sae-mixed")'
+			'report_util_threshold:range(0,255)'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of radio section failed"
@@ -187,8 +185,6 @@ validate_dyn_bh_section() {
 
 	uci_validate_section mapagent $section "${1}" \
 			'missing_bh_timer:range(1,255)'
-	uci_validate_section mapagent $section "${1}" \
-			'missing_bh_reconfig_timer:range(0,65535)'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of dynamic backhaul section failed"

map-agent/files/etc/uci-defaults/991-map-agent-unset-pvid

@@ -1,13 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-unset_pvid() {
-	local section=$1
-
-	uci -q set mapagent.${section}.pvid="0"
-}
-
-config_load mapagent
-
-config_foreach unset_pvid policy

map-agent/files/lib/wifi/multiap

@@ -207,7 +207,7 @@ write_credentials() {
 		#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() {
@@ -356,7 +356,7 @@ write_bsta_config() {
 
 	#echo result diff = $diff > /dev/console
 	[ "$diff" == "1" ] && {
-		(config_foreach mapagent_apply_bssid_same_band bsta)
+		config_foreach mapagent_apply_bssid_same_band bsta
 		#ubus call uci commit '{"config":"wireless"}'
 		#echo reloading wireless > /dev/console
 	}
@@ -406,7 +406,7 @@ teardown_iface() {
 		uci -q set mapagent.${section}.key="DISABLED-KEY"
 
 		# subshell in hopes to maintain mapagent config loaded
-		(mapagent_teardown_wireless $ifname)
+		$(mapagent_teardown_wireless $ifname)
 	}
 
 
@@ -488,12 +488,10 @@ bsta_to_wireless() {
 
 		mapagent_find_other_creds() {
 			#echo "trying to find other creds for $2" > /dev/console
-			local other_section="$2"
-
 			config_get band $1 band
 			config_get onboarded $1 onboarded "0"
 
-			[ "$4" != "$band" -o "$onboarded" = "0" ] && return
+			[ "$3" != "$band" -o "$onboarded" = "0" ] && return
 
 			config_get ssid $1 ssid
 			config_get key $1 key
@@ -501,12 +499,7 @@ bsta_to_wireless() {
 			config_get enabled $1 enabled "0"
 			config_get bssid $1 bssid
 
-			uci -q set mapagent.${other_section}.ssid="$ssid"
-			uci -q set mapagent.${other_section}.key="$key"
-			uci -q set mapagent.${other_section}.encryption=$encryption
-			uci -q set mapagent.${other_section}.bssid="$bssid"
-			uci commit mapagent
-			(mapagent_apply_wl_bsta "$3" "$ssid" "$key" $encryption "$5" "$bssid")
+			echo $(mapagent_apply_wl_bsta $2 "$ssid" "$key" $encryption $4 "$bssid")
 		}
 
 		config_get band $1 band
@@ -515,14 +508,14 @@ bsta_to_wireless() {
 		config_get enabled $1 enabled "0"
 
 		if [ "$onboarded" = "0" ]; then
-			config_foreach mapagent_find_other_creds bsta $1 $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
 
-			(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
+			echo $(mapagent_apply_wl_bsta $ifname "$ssid" "$key" $encryption $enabled "$bssid")
 		fi
 	}
 
@@ -672,7 +665,7 @@ bsta_scan_on_enabled() {
 
 bsta_enable_all() {
 	mapagent_enable_bk() {
-		config_get ifname $1 ifname
+		config_get ifname $1 ifname "2"
 		uci -q set mapagent.$1.enabled="1"
 	}
 
@@ -683,58 +676,6 @@ bsta_enable_all() {
 	bsta_scan_on_enabled
 }
 
-bsta_clear_all_bssid() {
-	mapagent_remove_bssid() {
-		uci -q set mapagent.$1.enabled="1"
-		uci -q del mapagent.$1.bssid
-	}
-
-	wireless_remove_bssid() {
-		config_get mode $1 mode
-		config_get ifname $1 ifname
-
-		[ "$mode" != "sta" ] && return
-
-		uci -q del wireless.$1.bssid
-		wpa_cli -i "$ifname" bssid 0 00:00:00:00:00:00 > /dev/null 2>&1
-		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-	}
-
-	config_load mapagent
-	config_foreach mapagent_remove_bssid bsta
-	uci commit mapagent
-
-	config_load wireless
-	config_foreach wireless_remove_bssid wifi-iface
-	uci commit wireless
-}
-
-# arg1 = ifname arg2 = bssid
-bsta_blacklist_bssid_set() {
-	local ifname="$1"
-	shift
-	local bssid="$@"
-
-	return
-
-	wpa_cli -i "$ifname" set_network 0 bssid_ignore "$bssid" > /dev/null 2>&1
-	wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-}
-
-bsta_blacklist_bssid_clear() {
-	mapagent_blacklist_by_band() {
-		config_get ifname $1 ifname
-
-		wpa_cli -i "$ifname" set_network 0 bssid_ignore "" > /dev/null 2>&1
-		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
-	}
-
-	return
-
-	config_load mapagent
-	config_foreach mapagent_blacklist_by_band bsta
-}
-
 bsta_disable_lower_priority() {
 	config_load mapagent
 
@@ -784,7 +725,7 @@ bsta_disable_lower_priority() {
 
 		uci -q set mapagent.$1.enabled="$enabled"
 
-		(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
+		echo $(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
 	}
 
 	local bsta=$1
@@ -833,14 +774,11 @@ set_uplink_backhaul_info() {
 	local ul_1905id=$1
 	local ul_mac=$2
 
-	(
-		flock -x 200
-		json_load "$(cat $MAPFILE)"
-		json_add_string "backhaul_device_id" "$ul_1905id"
-		json_add_string "backhaul_macddr" "$ul_mac"
-		json_dump > "$MAPFILE"
-		json_cleanup
-	) 200>/var/lock/map.backhaul.lock
+	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() {
@@ -854,10 +792,7 @@ set_uplink() {
 	json_add_string "type" "$type"
 	json_add_string "ifname" "$ifname"
 	json_add_string "macaddr" "$hwaddr"
-	(
-		flock -x 200
-		json_dump > "$MAPFILE"
-	) 200>/var/lock/map.backhaul.lock
+	json_dump > "$MAPFILE"
 	json_cleanup
 
 	config_load mapagent
@@ -881,14 +816,7 @@ unset_uplink() {
 		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
 	fi
 
-	(
-		flock -x 200
-		json_load "$(cat $MAPFILE)"
-		json_get_var bk_type type
-		json_cleanup
-
-		[ "$type" = "$bk_type" ] && rm -f "$MAPFILE" > /dev/null 2>&1
-	) 200>/var/lock/map.backhaul.lock
+	rm -f "$MAPFILE" > /dev/null 2>&1
 }
 
 func=$1
@@ -908,9 +836,6 @@ case "$func" in
 	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
 	ts) ts_sub $@;;
 	bsta_enable_all) bsta_enable_all $@;;
-	bsta_clear_all_bssid) bsta_clear_all_bssid $@;;
-	bsta_blacklist_bssid_set) bsta_blacklist_bssid_set $@;;
-	bsta_blacklist_bssid_clear) bsta_blacklist_bssid_clear $@;;
 	bsta_disable_lower_priority) bsta_disable_lower_priority $@;;
 	bsta_scan_on_enabled) bsta_scan_on_enabled $@;;
 	bsta_use_link) bsta_use_link $@;;

map-agent/files/lib/wifi/traffic_separation

@@ -2,9 +2,6 @@
 
 . /lib/functions.sh
 
-AL_BRIDGE=${AL_BRIDGE-"br-lan"}
-PRIMARY_VID=${PRIMARY_VID-1}
-
 ### Traffic Separation ###
 
 dbg() {
@@ -12,223 +9,489 @@ dbg() {
 }
 
 ts_sub() {
+
 	ts_usage() {
 		cat <<EOF
-Usage: $0 [create|reload]
+Usage: $0 [create|delete|populate|primary|reload]
 Traffic Separation related functions.
-create vid - create vlan configuration with vlan_id
-reload     - reload network with new configuration
+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
 	}
 
-	ts_create() {
-		_net_setup() {
-			local name=$1
-			local vid=$2
-			local proto=$3
-			local dev=$4
-			local port_dev=$5
+	_get_bridge() {
+		local bridge=$(ip link show $1 | grep -o "master [^\s]*" | cut -d ' ' -f 2)
+		echo $bridge
+	}
 
-			[ -z "$(uci -q get network.${name})" ] || return
+	set_wireless_bridge() {
+		config_load wireless
 
-			local ip_addr="192.168.${vid}.1"
-			local br_dev="${AL_BRIDGE/-/_}"
-			local tag=":t"
+		_set_network() {
+			local sec=$1
+			local iface=$2
+			local bridge=$3
 
-			[ "${vid}" = "${PRIMARY_VID}" ] && {
-				tag=""
+			config_get ifname $sec ifname
+			[ "$iface" != "$ifname" ] && continue
 
-				# Global options
-				[ -z "$(uci -q get network.${br_dev}.vlan_filtering)" ] && {
-					uci -q set network.${br_dev}.vlan_filtering=1;
-				}
+			config_get mode $sec mode
+			config_get multi_ap $sec multi_ap "0"
+			[ "$mode" = "sta" -a "$multi_ap" = "1" ] && continue
 
-				uci -q delete network.lan.proto
-				uci -q delete network.lan.ipaddr
-				uci -q delete network.lan.netmask
-				uci -q delete network.lan.ip6assign
-			}
-
-			uci -q set network.${name}="interface"
-			uci -q set network.${name}.device="$dev"
-			uci -q set network.${name}.is_lan="1"
-
-			if [ "$proto" = "static" ] ; then
-				uci -q set network.${name}.proto="static"
-				# TODO vid > 255
-				uci -q set network.${name}.ipaddr="${ip_addr}"
-				uci -q set network.${name}.netmask="255.255.255.0"
-				uci -q set network.${name}.ip6assign '60'
-			else
-				uci -q set network.${name}.proto="dhcp"
+			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
 
-			uci -q add network bridge-vlan
-			uci -q set network.@bridge-vlan[-1].device="$AL_BRIDGE"
-			uci -q set network.@bridge-vlan[-1].vlan="$vid"
+			brctl addif $bridge $iface &> /dev/null
+		}
 
-			for port in $(uci -q get network.${br_dev}.ports) ; do
-				echo $port | grep -q eth || continue
-				uci -q add_list network.@bridge-vlan[-1].ports="${port}${tag}"
+		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
 
-			uci -q add_list network.${br_dev}.ports="$port_dev"
-			uci -q add_list network.@bridge-vlan[-1].ports="$port_dev"
-
-			uci -q commit network
+			ip link set $iface up
+			ip link set $vlan_dev up
 		}
 
-		_dhcp_setup() {
-			local name=$1
+		ts_create_eths() {
+			pvid=$1					# primary vid
+			bridge=$2				# name of ts subsystem bridge
 
-			[ -n "$(uci -q get dhcp.${name})" ] && return
-
-			uci -q set dhcp.${name}=dhcp
-			uci -q set dhcp.${name}.interface="${name}"
-			uci -q set dhcp.${name}.start="100"
-			uci -q set dhcp.${name}.limit="150"
-			uci -q set dhcp.${name}.leasetime="1h"
-			uci -q set dhcp.${name}.dhcpv4="server"
-			uci -q set dhcp.${name}.dhcpv6="server"
-			uci -q set dhcp.${name}.ra="server"
-			uci -q set dhcp.${name}.ra_slaac="1"
-			uci -q add_list dhcp.${name}.ra_flags="managed-config"
-			uci -q add_list dhcp.${name}.ra_flags="other-config"
-
-			uci -q commit dhcp
+			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
 		}
 
-		_firewall_setup() {
-			local name=$1
-			local network=$1
-			local vid=$2
-			local zone_exist=0
+		ts_create_dhcp() {
+			local diff=""
 
-			config_load firewall
+                        _net_setup() {
+				local name=$1
+				local devname=$2
+				local vid=$3
 
-			_process_zone() {
-				local section=$1
-				local new_name=$2
-				local name
+				[ -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"
 
-				config_get name $section name
+					diff="1"
+				}
 
-				[ "$name" == "$new_name" ] && zone_exist=1
+				[ "$diff" = "1" ] && uci -q commit network
 			}
 
-			config_foreach _process_zone zone $name
+			_br_setup() {
+				local name=$1
+				local sinkname=$2
+				local vid=$3
 
-			[ "$zone_exist" != "0" ] && return
+				[ -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}"
 
-			[ "${vid}" = "${PRIMARY_VID}" ] && {
-				uci -q delete firewall.lan
+					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
 			}
 
-			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'
+			_dhcp_setup() {
+				local name=$1
 
-			uci -q add firewall forwarding
-			uci -q set firewall.@forwarding[-1].src="$name"
-			uci -q set firewall.@forwarding[-1].dest="wan"
+				[ -n "$(uci -q get dhcp.${name})" ] && return
 
-			uci -q commit firewall
+				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
 		}
 
-		vid=$1
+	local type=$1
+	shift
 
-		[ -n "$vid" ] || {
+	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
-VID required to configure.
+Populating ETH rules requires IFACE and VID.
 EOF
 			exit 1
 		}
 
-		ip link show sink${vid} 2> /dev/null || {
-			ip link add sink${vid} type veth peer name sink_peer${vid}
-		}
+		iface=$1				# Multi-AP Logical Ethernet Interface
+		vid=$2					# secondary vid
 
-		ip link set sink${vid} up
-		ip link set sink_peer${vid} up
+		path=$(ls -d /sys/class/net/${iface}/upper_*)
+		[ -z "$path" ] && exit 1
+		vlan_dev=${path##*upper_}
 
-		proto="dhcp"
-		[ -x "/usr/sbin/mapcontroller" ] && proto="static" ;
-		_net_setup "vlan${vid}" ${vid} ${proto} "sink${vid}" "sink_peer${vid}"
+		# 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
+	}
 
-		[ -x "/usr/sbin/mapcontroller" ] && {
-			_dhcp_setup vlan${vid}
-			_firewall_setup vlan${vid} ${vid}
-		}
+	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
-		restart=""
+
 		# workaround for missing backhaul wifi.ap.* ubus obj's:
 		# iterate in config and setup bh
-#		config_load wireless
+		config_load wireless
 
-# _setup_bh_iface() {
-#			local sec=$1
-#			local iface=$2
-#			local bridge=$3
+		_setup_bh_iface() {
+			local sec=$1
+			local iface=$2
+			local bridge=$3
 
-#			config_get ifname $sec ifname
+			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
-
-		bridge_verify_vid_mapping() {
-			local section=$1
-
-			check__port_vid() {
-				local port="$1"
-				local vlan="$2"
-
-				added=$(bridge vlan show dev $port | grep -w "$vlan")
-				if [ "$added" = "" ]; then
-					restart="1"
-					break
-				fi
+			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_get vlan "$section" vlan "0"
-
-			[ "$vlan" = "0" ] && continue
-
-			config_list_foreach "$section" "ports" check_port_vid "$vlan"
-			[ "$restart" = "1" ] && break
 		}
 
-
-
-		config_load network
-		config_foreach bridge_verify_vid_mapping bridge-vlan
-
+		config_foreach _setup_bh_iface wifi-iface
 
 		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
-		if [ "$restart" = "1" ]; then
-			dbg "trigger network restart"
-			/etc/init.d/network restart
-		else
-			ubus call uci commit '{"config":"network"}'
-		fi
-		/etc/init.d/firewall reload
 
-
-		#for sink in $(ubus list network.interface.sink*) ; do
-		#	local sink_vlan=${sink/network.interface./}_vlan
-		#done
+		# 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
@@ -236,6 +499,11 @@ EOF
 
 	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;;

map-controller/Makefile

@@ -1,13 +1,16 @@
 #
-# Copyright (C) 2020-22 IOPSYS Software Solutions AB
+# Copyright (C) 2020 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.2
+PKG_VERSION:=6.0.21
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=f74c6625967c6ab7f413a70fe72a876e5757ac22
+PKG_SOURCE_VERSION:=a388472887744d404825ee5602ab906bf1fc225c
+
+PKG_LICENSE:=PROPRIETARY IOPSYS
+PKG_LICENSE_FILES:=LICENSE
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -17,9 +20,6 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/map-controller
@@ -38,7 +38,6 @@ define Package/map-controller/config
 endef
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

map-controller/files/etc/config/mapcontroller

@@ -6,7 +6,7 @@ config controller 'controller'
 	option enable_bsta_steer '0'
 	option use_bcn_metrics '0'
 	option use_usta_metrics '0'
-	option primary_vid '0'
+	option primary_vid '1'
 	option primary_pcp '0'
 	option allow_bgdfs '0'
 	option channel_plan '0'

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

@@ -23,10 +23,7 @@ validate_controller_section() {
 		'enable_sta_steer:bool:false' \
 		'enable_bsta_steer:bool:false' \
 		'use_bcn_metrics:bool:false' \
-		'use_usta_metrics:bool:false' \
-		'allow_bgdfs:range(0,2629744)' \
-		'channel_plan:range(0,2629744)' \
-		'enable_ts:bool:false'
+		'use_usta_metrics:bool:false'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapcontroller" "Validation of controller section failed"
@@ -40,7 +37,7 @@ validate_ap_section() {
 	local section="$1"
 
 	uci_validate_section mapcontroller $section "${1}" \
-			'band:or("2", "5", "6")' \
+			'band:or("2", "5")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
 				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \

map-topology/Makefile

@@ -1,41 +1,38 @@
 #
-# Copyright (C) 2020-22 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys
 #
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.1
+PKG_VERSION:=4.0.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=58a75b5847ef807063b62cadef7048ecbdb44288
+PKG_SOURCE_VERSION:=f0c36d13b19c100639a8f657a6a027bbfd74b802
 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
 PKG_MIRROR_HASH:=skip
 endif
+
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=ieee1905
-
-PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/map-topology
 	CATEGORY:=Utilities
 	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy \
-		 +libavahi-nodbus-support +libnetfilter-conntrack +libnfnetlink +libmnl
+		 +libavahi-nodbus-support +ieee1905
 	TITLE:=Utility to build topology of a multi-AP network
 endef
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
-	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
 	-D_GNU_SOURCE
 
 define Package/map-topology/description

mosquitto-auth-shadow/Makefile

@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2022 Genexis B.V.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Erik Karlsson - initial implementation
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=mosquitto-auth-shadow
-PKG_VERSION:=1.0.0
-
-PKG_MAINTAINER:=Erik Karlsson <erik.karlsson@genexis.eu>
-PKG_LICENSE:=EPL-2.0
-
-PKG_BUILD_PARALLEL:=1
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/mosquitto-auth-shadow
-  SECTION:=net
-  CATEGORY:=Network
-  TITLE:=mosquitto - /etc/shadow authentication plugin
-  DEPENDS:=mosquitto
-  USERID:=mosquitto=200:mosquitto=200 mosquitto=200:shadow=11
-endef
-
-define Package/mosquitto-auth-shadow/description
-  Plugin for the mosquitto MQTT message broker that authenticates
-  users using /etc/shadow
-endef
-
-define Package/mosquitto-auth-shadow/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mosquitto_auth_shadow.so $(1)/usr/lib/
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,mosquitto-auth-shadow))

mosquitto-auth-shadow/files/etc/uci-defaults/14_set-shadow-permissions

@@ -1 +0,0 @@
-chown root:shadow /etc/shadow && chmod 0640 /etc/shadow

mosquitto-auth-shadow/src/Makefile

@@ -1,25 +0,0 @@
-#
-# Copyright (c) 2022 Genexis B.V.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License 2.0 which is available at
-# https://www.eclipse.org/legal/epl-2.0/
-#
-# SPDX-License-Identifier: EPL-2.0
-#
-# Contributors:
-#   Erik Karlsson - initial implementation
-#
-
-TARGETS = mosquitto_auth_shadow.so
-
-all: $(TARGETS)
-
-%.pic.o: %.c
-	$(CC) $(CFLAGS) -Wall -Werror -fPIC -c -o $@ $<
-
-mosquitto_auth_shadow.so: mosquitto_auth_shadow.pic.o
-	$(CC) $(LDFLAGS) -shared -o $@ $^
-
-clean:
-	rm -f *.o $(TARGETS)

mosquitto-auth-shadow/src/mosquitto_auth_shadow.c

@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2022 Genexis B.V.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License 2.0 which is available at
- * https://www.eclipse.org/legal/epl-2.0/
- *
- * SPDX-License-Identifier: EPL-2.0
- *
- * Contributors:
- *   Erik Karlsson - initial implementation
- */
-
-#include <string.h>
-#include <shadow.h>
-#include <crypt.h>
-#include <mosquitto.h>
-#include <mosquitto_broker.h>
-#include <mosquitto_plugin.h>
-
-static int basic_auth_callback(int event, void *event_data, void *userdata)
-{
-	struct mosquitto_evt_basic_auth *ed = event_data;
-	struct spwd spbuf, *sp = NULL;
-	char buf[256];
-	struct crypt_data data;
-	char *hash;
-
-	/* Let other plugins or broker decide about anonymous login */
-	if (ed->username == NULL)
-		return MOSQ_ERR_PLUGIN_DEFER;
-
-	getspnam_r(ed->username, &spbuf, buf, sizeof(buf), &sp);
-
-	if (sp == NULL || sp->sp_pwdp == NULL)
-		return MOSQ_ERR_AUTH;
-
-	/* Empty string as hash means password is not required */
-	if (sp->sp_pwdp[0] == 0)
-		return MOSQ_ERR_SUCCESS;
-
-	if (ed->password == NULL)
-		return MOSQ_ERR_AUTH;
-
-	memset(&data, 0, sizeof(data));
-	hash = crypt_r(ed->password, sp->sp_pwdp, &data);
-
-	if (hash == NULL)
-		return MOSQ_ERR_AUTH;
-
-	if (strcmp(hash, sp->sp_pwdp) == 0)
-		return MOSQ_ERR_SUCCESS;
-
-	return MOSQ_ERR_AUTH;
-}
-
-int mosquitto_plugin_version(int supported_version_count,
-			     const int *supported_versions)
-{
-	return 5;
-}
-
-int mosquitto_plugin_init(mosquitto_plugin_id_t *identifier,
-			  void **user_data,
-			  struct mosquitto_opt *opts, int opt_count)
-{
-	*user_data = identifier;
-
-	return mosquitto_callback_register(identifier, MOSQ_EVT_BASIC_AUTH,
-					   basic_auth_callback, NULL, NULL);
-}
-
-int mosquitto_plugin_cleanup(void *user_data,
-			     struct mosquitto_opt *opts, int opt_count)
-{
-	mosquitto_plugin_id_t *identifier = user_data;
-
-	return mosquitto_callback_unregister(identifier, MOSQ_EVT_BASIC_AUTH,
-					     basic_auth_callback, NULL);
-}

obuspa/Config.in

@@ -21,9 +21,5 @@ config OBUSPA_MTP_ENABLE_STOMP
 config OBUSPA_MTP_ENABLE_COAP
 	bool "Enable CoAP as mtp protocol"
 	default n
-
-config OBUSPA_CONTROLLER_MTP_VERIFY
-	bool "Enable verification of MQTT response topic before processing the message"
-	default n
 endmenu
 endif

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.17
+PKG_VERSION:=5.0.0.11
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cd47bcaf1cc82dfd5c10ea76491fd0dae4436cc6
+PKG_SOURCE_VERSION:=b8bc6a70f07b40c8512e8894461602f47981df97
 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
@@ -43,14 +43,11 @@ define Package/obuspa/config
 endef
 
 TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
 	-Wall \
 	-Werror
 
-ifneq ($(CONFIG_OBUSPA_CONTROLLER_MTP_VERIFY),)
-  TARGET_CFLAGS += -DOBUSPA_CONTROLLER_MTP_VERIFY
-endif
-
 ifneq ($(CONFIG_OBUSPA_DB_PATH),)
   CONFIGURE_ARGS += \
 	--localstatedir="$(CONFIG_OBUSPA_DB_PATH)"
@@ -106,7 +103,6 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
-	$(INSTALL_DATA) ./files/etc/bbfdm/json/TransferComplete.json $(1)/etc/bbfdm/json/TransferComplete.json
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,15 +1,28 @@
 config obuspa 'global'
 	option enabled '1'
+	option interface 'loopback'
+	#option ifname 'lo'
 	option debug '1'
 	option log_level '1'
-	option prototrace '1'
-	option db_file '/etc/obuspa/usp.db'
+	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'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
 	#option log_dest '/var/log/obuspa'
 
+config localagent 'localagent'
+	option Enable '1'
+
+# Adds Device.LocalAgent.Controller.
+config controller 'localcontroller'
+	option EndpointID 'proto::interop-usp-controller'
+	option Protocol 'MQTT'
+	option Topic '/usp/controller'
+	option mqtt 'localmqtt'
+	option assigned_role_name 'full_access'
+
 # Adds Device.LocalAgent.MTP.
 config mtp
 	option Protocol 'MQTT'
@@ -22,21 +35,13 @@ config mqtt 'localmqtt'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
 
-# Adds Device.LocalAgent.Controller.
-config controller 'localcontroller'
-	option EndpointID 'proto::interop-usp-controller'
-	option Protocol 'MQTT'
-	option Topic '/usp/controller'
-	option mqtt 'localmqtt'
-	option assigned_role_name 'full_access'
-
 # Add Device.LocalAgent.Subscription.
-#config subscription
-#	option ID 'default-boot-event-ACS'
-#	option NotifType 'Event'
-#	option ReferenceList 'Device.Boot!'
-#	option Persistent 'true'
-#	option controller 'localcontroller'
+config subscription
+	option ID 'default-boot-event-ACS'
+	option NotifType 'Event'
+	option ReferenceList 'Device.Boot!'
+	option Persistent 'true'
+	option controller 'localcontroller'
 
 #config challenge 'admin'
 #	option Description 'Request to get Administrative access'

periodicstats/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6c68428405bc88a9990e855f911aecc86f07f4a8
+PKG_SOURCE_VERSION:=2779815d2b87e5966e27cfafe88070d0a8970a25
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

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/init.d/xpon

@@ -1,25 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=19
-STOP=10
-
-USE_PROCD=1
-
-. /lib/functions.sh
-include /lib/xpon
-
-start_service() {
-	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
-		init_xpon
-	fi
-}
-
-stop_service() {
-	# stopping omcid does not bring down the pon link, which should happen
-	# if ANI is disabled or stopped (go to O1)
-	deinit_xpon
-}
-
-service_triggers() {
-	procd_add_reload_trigger "xpon"
-}

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/etc/uci-defaults/60-xpon-generate

@@ -1,17 +0,0 @@
-#!/bin/sh
-
-if [ -s "/etc/config/xpon" ]; then
-        if uci -q get xpon.ani >/dev/null; then
-                # return if there is any valid content
-                exit                                  
-        else                                          
-                rm -f /etc/config/xpon
-        fi                           
-fi                                   
-touch /etc/config/xpon
-                     
-                          
-uci set xpon.ani=ani
-uci set xpon.ani.enable="1"
-                                           
-uci commit xpon  

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/lib/xpon/broadcom.sh

@@ -1,20 +0,0 @@
-#!/bin/sh
-
-USE_PROCD=1
-
-. /lib/functions.sh
-
-init_xpon() {
-	procd_open_instance pon_msgd
-	procd_set_param command bcm_msgd -c gpon
-	procd_close_instance
-	procd_open_instance pon_daemon
-	procd_set_param command omcid start -n
-	procd_close_instance
-
-}
-
-deinit_xpon() {
-	gponctl stop
-}
-

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
+

qosmngr/files/lib/qos/broadcom.sh

@@ -4,7 +4,6 @@
 
 IP_RULE=""
 BR_RULE=""
-BR6_RULE=""
 
 POLICER_COUNT=0
 INTF_NAME=""
@@ -292,7 +291,6 @@ flush_chains() {
 
 init_broute_rule() {
 	BR_RULE=""
-	BR6_RULE=""
 }
 
 broute_filter_on_src_if() {
@@ -328,82 +326,6 @@ broute_filter_on_ether_type() {
 	BR_RULE="$BR_RULE --proto $1"
 }
 
-broute_filter_on_ether_type6() {
-	BR6_RULE="$BR6_RULE --proto IPv6"
-}
-
-ebt_match_src_ip() {
-        BR_RULE="$BR_RULE --ip-src $1"
-}
-
-ebt_match_dst_ip() {
-        BR_RULE="$BR_RULE --ip-dst $1"
-}
-
-ebt_match_ipv6_src_ip() {
-        BR_RULE="$BR_RULE --ip6-src $1"
-}
-
-ebt_match_ipv6_dst_ip() {
-        BR_RULE="$BR_RULE --ip6-dst $1"
-}
-
-ebt_match_ip_src_port() {
-        BR_RULE="$BR_RULE --ip-source-port $1"
-}
-
-ebt_match_ip_dst_port() {
-        BR_RULE="$BR_RULE --ip-destination-port $1"
-}
-
-ebt_match_ipv6_src_port() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
-	if [ ! -z "$BR6_RULE" ]; then
-		BR6_RULE="$BR6_RULE --ip6-source-port $1"
-	else
-		BR_RULE="$BR_RULE --ip6-source-port $1"
-	fi
-}
-
-ebt_match_ipv6_dst_port() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
-	if [ ! -z "$BR6_RULE" ]; then
-		BR6_RULE="$BR6_RULE --ip6-destination-port $1"
-	else
-		BR_RULE="$BR_RULE --ip6-destination-port $1"
-	fi
-}
-
-ebt_match_ip_protocol() {
-        BR_RULE="$BR_RULE --ip-proto $1"
-}
-
-ebt_match_ipv6_protocol() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
-	if [ ! -z "$BR6_RULE" ]; then
-		BR6_RULE="$BR6_RULE --ip6-proto $1"
-	else
-		BR_RULE="$BR_RULE --ip6-proto $1"
-	fi
-}
-
-ebt_match_ipv6_dscp() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
-	if [ ! -z "$BR6_RULE" ]; then
-		BR6_RULE="$BR6_RULE --ip6-tclass $1"
-	else
-		BR_RULE="$BR_RULE --ip6-tclass $1"
-	fi
-}
-
 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
@@ -430,145 +352,11 @@ broute_filter_on_vid() {
 }
 
 broute_rule_set_traffic_class() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed so update BR6_RULE string as well otherwise
-	#update BR_RULE only for installation of ipv6 proto rule only.
 	BR_RULE="$BR_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
-	if [ ! -z "$BR6_RULE" ]; then
-		BR6_RULE="$BR6_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
-	fi
 }
 
 broute_append_rule() {
-	#when ethertype is not configured by user then both proto rules of ipv4
-	#and ipv6 to be installed otherwise install ipv6 proto rule only.
 	echo "ebtables -t broute -A qos $BR_RULE" >> /tmp/qos/classify.ebtables
-	if [ -n "$BR6_RULE" ]; then
-		echo "ebtables -t broute -A qos $BR6_RULE" >> /tmp/qos/classify.ebtables
-	fi
-}
-
-set_ip_addr()
-{
-        local cid=$1
-        local match_src_ip_func=$2
-        local match_dst_ip_func=$3
-
-        config_get src_ip "$cid" "src_ip"
-        config_get dst_ip "$cid" "dest_ip"
-
-        if [ ! -z "$src_ip" ]; then
-                $match_src_ip_func "$src_ip"
-        fi
-
-        if [ ! -z "$dst_ip" ]; then
-                $match_dst_ip_func "$dst_ip"
-        fi
-}
-
-set_ports()
-{
-        local cid=$1
-        local match_src_port_func=$2
-        local match_dst_port_func=$3
-	local src_port=""
-	local dst_port=""
-	local src_port_range=""
-	local dst_port_range=""
-
-        config_get src_port "$cid" "src_port"
-        config_get dst_port "$cid" "dest_port"
-        config_get src_port_range "$cid" "src_port_range"
-        config_get dst_port_range "$cid" "dest_port_range"
-
-        if ! [ -z $src_port ] && ! [ -z $src_port_range ]; then
-                $match_src_port_func "$src_port:$src_port_range"
-        elif [ ! -z $src_port ]; then
-                $match_src_port_func $src_port
-        fi
-
-        if ! [ -z $dst_port ] && ! [ -z $dst_port_range ]; then
-                $match_dst_port_func "$dst_port:$dst_port_range"
-        elif [ ! -z $dst_port ]; then
-                $match_dst_port_func $dst_port
-	fi
-}
-
-protocol_string_to_num()
-{
-        local value=-1
-
-        case "$1" in
-		*[0-9]*)	value="$1"
-                ;;
-                TCP|tcp)        value=6
-                ;;
-                UDP|udp)        value=17
-                ;;
-                ICMP|icmp)      value=1
-                ;;
-                ICMPv6|icmpv6)  value=58
-                ;;
-                IGMP|igmp)      value=2
-                ;;
-                SCTP|sctp)      value=132
-                ;;
-                *) value=-1
-                ;;
-        esac
-        echo $value
-}
-
-broute_ipv4_rule_options()
-{
-	local cid=$1
-	config_get protocol "$cid" "proto"
-	config_get dscp_filter "$cid" "dscp_filter"
-
-	set_ip_addr $cid ebt_match_src_ip ebt_match_dst_ip
-
-	if [ ! -z $dscp_filter ]; then
-		broute_filter_on_dscp "$dscp_filter"
-	fi
-
-	if [ ! -z $protocol ]; then
-		local proto_num=$(protocol_string_to_num "$protocol")
-		ebt_match_ip_protocol "$proto_num"
-
-		#port installation for protol tcp/udp/sctp
-		if [ $proto_num = "6" ] || [ $proto_num = "17" ] || [ $proto_num = "132" ] ; then
-			set_ports "$cid" ebt_match_ip_src_port ebt_match_ip_dst_port
-		fi
-	fi
-}
-
-broute_ipv6_rule_options()
-{
-	local cid=$1
-
-	config_get protocol "$cid" "proto"
-	config_get dscp_filter "$cid" "dscp_filter"
-
-	set_ip_addr $cid ebt_match_ipv6_src_ip ebt_match_ipv6_dst_ip
-
-	if [ ! -z $dscp_filter ]; then
-		local tos_val
-		local tos_hex
-
-		tos_val=$(($dscp_filter<<2))
-		tos_hex=$(printf "%x" $tos_val)
-		ebt_match_ipv6_dscp "$tos_hex"
-	fi
-
-	if [ ! -z $protocol ]; then
-		local proto_num=$(protocol_string_to_num "$protocol")
-		ebt_match_ipv6_protocol "$proto_num"
-
-		#port installation for protol tcp/udp/sctp
-		if [ $proto_num = "6" ] || [ $proto_num = "17" ] || [ $proto_num = "132" ]; then
-			set_ports "$cid" ebt_match_ipv6_src_port ebt_match_ipv6_dst_port
-		fi
-	fi
 }
 
 handle_ebtables_rules() {
@@ -576,8 +364,6 @@ handle_ebtables_rules() {
 	local is_l2_rule=0
 	local src_dhcp_options=""
 	local dst_dhcp_options=""
-	local protocol=""
-	local ip_version=""
 
 	init_broute_rule
 
@@ -595,9 +381,8 @@ handle_ebtables_rules() {
 	config_get dst_clid "$sid" "dst_client_id" # dhcp option 61
 	config_get src_ucid "$sid" "src_user_class_id" # dhcp option 77
 	config_get dst_ucid "$sid" "dst_user_class_id" # dhcp option 77
-	config_get traffic_class "$sid" "traffic_class"
-	config_get protocol "$sid" "proto"
 
+	config_get traffic_class "$sid" "traffic_class"
 
 	if [ -n "$src_if" ]; then
 		for interf in $(db -q get hw.board.ethernetPortOrder); do
@@ -624,6 +409,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
@@ -634,47 +426,6 @@ handle_ebtables_rules() {
 		is_l2_rule=1
 	fi
 
-	case $eth_type in
-	IPv4|IPV4|0800)
-			ip_version=4
-		;;
-	IPv6|IPV6|86DD)
-			ip_version=6
-		;;
-	*)
-		if [ -z "$eth_type" ]; then
-			case $src_ip$dest_ip in
-			*.*)
-				ip_version=4
-				broute_filter_on_ether_type "IPv4"
-				;;
-			*:*)
-				ip_version=6
-				broute_filter_on_ether_type "IPv6"
-				;;
-			*)
-				if [ -n "$protocol" ] || [ -n "$dscp_filter" ]; then
-					ip_version=1 #neither ether_type nor ip address used
-					#ethertype is not configured by user so install 
-					#both proto ipv4 and ipv6 rule
-					BR6_RULE="$BR_RULE"
-					broute_filter_on_ether_type "IPv4"
-					broute_filter_on_ether_type6 "IPv6"
-				fi
-			esac
-		fi
-	esac
-
-	if [ $ip_version = "4" ] || [ $ip_version = "1" ]; then
-		broute_ipv4_rule_options "$sid"
-		is_l2_rule=1
-	fi
-
-	if [ $ip_version = "6" ] || [ $ip_version = "1" ]; then
-		broute_ipv6_rule_options "$sid"
-		is_l2_rule=1
-	fi
-
 	# first process options that will help figure our source mac address
 	# dhcp option for "vendor class id"
 	if [ -n "$src_vcid" ]; then
@@ -1100,16 +851,11 @@ pre_configure_queue() {
 		mkdir -p /tmp/qos/queue_stats/$intf
 		touch /tmp/qos/queue_stats/$intf/q_idx
 		echo 0 > /tmp/qos/queue_stats/$intf/q_idx
-
-#		tm initialization pushing ahead of delcfg as
-#		porttminit bydefault configures all queue as SP configuration.
-#		that was causing WRR queue configuration failure.
-		tmctl porttminit --devtype 0 --if $intf --flag 0 --numqueues 8
-
 		i=0
 		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

questd/Makefile

@@ -1,20 +1,21 @@
 #
-# Copyright (C) 2013-2022 iopsys
+# Copyright (C) 2013-2020 iopsys
 #
 
 include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=questd
-PKG_VERSION:=5.2.4
+PKG_VERSION:=5.2.3
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=cf54bd65ec821ac67f3aa1caeebcd3ea9aae07ad
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/questd
-PKG_SOURCE_VERSION:=2ca3ae0c29dcbbf01282f6118eb8d5e5bc9a1c45
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
@@ -22,6 +23,8 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
+PKG_INSTALL:=
+
 define Package/questd
 	CATEGORY:=Utilities
 	DEPENDS:=+libuci +libubox +ubus +libpthread
@@ -33,13 +36,6 @@ define Package/questd/description
 	this information via ubus
 endef
 
-ifeq ($(LOCAL_DEV),1)
-CMAKE_OPTIONS:=-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-define Build/Prepare
-	$(CP) -rf ~/git/code/questd/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 define Package/questd/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/sbin

rulengd/Makefile

@@ -1,22 +1,23 @@
 #
-# Copyright (C) 2018-2022 iopsys
+# Copyright (C) 2018 iopsys
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=rulengd
-PKG_VERSION:=1.2.7
+PKG_VERSION:=1.2.6
 PKG_RELEASE:=1
+PKG_BUILD_PARALLEL:=1
+PKG_INSTALL:=1
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=1f247e1afc845f47348febffa55fe40d8b552737
+PKG_SOURCE_VERSION:=e323bebe85cd7fb4eeb6cee535188227bc9b81e3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
-
+PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
+PKG_INSTALL:=1
+PKG_BUILD_PARALLEL:=1
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
@@ -34,14 +35,6 @@ define Package/rulengd/description
 	rulengd listens for events and executes speficied methods if the incoming event arguments contain speficied ones.
 endef
 
-#CMAKE_OPTIONS:=-DCMAKE_VERBOSE_MAKEFILE:BOOL=ON
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/code/rulengd/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 define Package/rulengd/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/bin

shflags/Makefile

@@ -0,0 +1,51 @@
+#
+# Copyright (C) 2012-2014 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=shflags
+PKG_VERSION:=2012-06-11
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://github.com/kward/shflags.git
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE_VERSION:=c12b30cebb92b49c5edb6df255c0952c65b4ddc6
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+PKG_LICENSE:=LGPL-2.1
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/shflags
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=shflags
+  DEPENDS:=+getopt
+  URL:=http://code.google.com/p/shflags/
+  MAINTAINER:=Luka Perkov <luka@openwrt.org>
+endef
+
+define Package/shflags/description
+ command-line flags module for Unix shell scripts
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Build/Install
+endef
+
+define Package/shflags/install
+	$(INSTALL_DIR) $(1)/usr/share/shflags
+	$(CP) $(PKG_BUILD_DIR)/source/1.0/src/shflags  $(1)/usr/share/shflags/shflags.sh
+endef
+
+$(eval $(call BuildPackage,shflags))

shflags/patches/000-strip.patch

@@ -0,0 +1,763 @@
+--- a/source/1.0/src/shflags
++++ b/source/1.0/src/shflags
+@@ -1,91 +1,10 @@
+-# $Id$
+-# vim:et:ft=sh:sts=2:sw=2
+-#
+-# Copyright 2008 Kate Ward. All Rights Reserved.
+-# Released under the LGPL (GNU Lesser General Public License)
+-#
+-# shFlags -- Advanced command-line flag library for Unix shell scripts.
+-# http://code.google.com/p/shflags/
+-#
+-# Author: kate.ward@forestent.com (Kate Ward)
+-#
+-# This module implements something like the google-gflags library available
+-# from http://code.google.com/p/google-gflags/.
+-#
+-# FLAG TYPES: This is a list of the DEFINE_*'s that you can do.  All flags take
+-# a name, default value, help-string, and optional 'short' name (one-letter
+-# name).  Some flags have other arguments, which are described with the flag.
+-#
+-# DEFINE_string: takes any input, and intreprets it as a string.
+-#
+-# DEFINE_boolean: typically does not take any argument: say --myflag to set
+-#   FLAGS_myflag to true, or --nomyflag to set FLAGS_myflag to false.
+-#   Alternately, you can say
+-#     --myflag=true  or --myflag=t or --myflag=0  or
+-#     --myflag=false or --myflag=f or --myflag=1
+-#   Passing an option has the same affect as passing the option once.
+-#
+-# DEFINE_float: takes an input and intreprets it as a floating point number. As
+-#   shell does not support floats per-se, the input is merely validated as
+-#   being a valid floating point value.
+-#
+-# DEFINE_integer: takes an input and intreprets it as an integer.
+-#
+-# SPECIAL FLAGS: There are a few flags that have special meaning:
+-#   --help (or -?)  prints a list of all the flags in a human-readable fashion
+-#   --flagfile=foo  read flags from foo.  (not implemented yet)
+-#   --              as in getopt(), terminates flag-processing
+-#
+-# EXAMPLE USAGE:
+-#
+-#   -- begin hello.sh --
+-#   #! /bin/sh
+-#   . ./shflags
+-#   DEFINE_string name 'world' "somebody's name" n
+-#   FLAGS "$@" || exit $?
+-#   eval set -- "${FLAGS_ARGV}"
+-#   echo "Hello, ${FLAGS_name}."
+-#   -- end hello.sh --
+-#
+-#   $ ./hello.sh -n Kate
+-#   Hello, Kate.
+-#
+-# NOTE: Not all systems include a getopt version that supports long flags. On
+-# these systems, only short flags are recognized.
+-
+-#==============================================================================
+-# shFlags
+-#
+-# Shared attributes:
+-#   flags_error: last error message
+-#   flags_return: last return value
+-#
+-#   __flags_longNames: list of long names for all flags
+-#   __flags_shortNames: list of short names for all flags
+-#   __flags_boolNames: list of boolean flag names
+-#
+-#   __flags_opts: options parsed by getopt
+-#
+-# Per-flag attributes:
+-#   FLAGS_<flag_name>: contains value of flag named 'flag_name'
+-#   __flags_<flag_name>_default: the default flag value
+-#   __flags_<flag_name>_help: the flag help string
+-#   __flags_<flag_name>_short: the flag short name
+-#   __flags_<flag_name>_type: the flag type
+-#
+-# Notes:
+-# - lists of strings are space separated, and a null value is the '~' char.
+-
+-# return if FLAGS already loaded
+ [ -n "${FLAGS_VERSION:-}" ] && return 0
+ FLAGS_VERSION='1.0.3'
+ 
+-# return values
+ FLAGS_TRUE=0
+ FLAGS_FALSE=1
+ FLAGS_ERROR=2
+ 
+-# reserved flag names
+ FLAGS_RESERVED='ARGC ARGV ERROR FALSE HELP PARENT RESERVED TRUE VERSION'
+ 
+ _flags_debug() { echo "flags:DEBUG $@" >&2; }
+@@ -93,7 +12,6 @@ _flags_warn() { echo "flags:WARN $@" >&2
+ _flags_error() { echo "flags:ERROR $@" >&2; }
+ _flags_fatal() { echo "flags:FATAL $@" >&2; }
+ 
+-# specific shell checks
+ if [ -n "${ZSH_VERSION:-}" ]; then
+   setopt |grep "^shwordsplit$" >/dev/null
+   if [ $? -ne ${FLAGS_TRUE} ]; then
+@@ -107,20 +25,15 @@ if [ -n "${ZSH_VERSION:-}" ]; then
+   fi
+ fi
+ 
+-#
+-# constants
+-#
+ 
+-# getopt version
+ __FLAGS_GETOPT_VERS_STD=0
+ __FLAGS_GETOPT_VERS_ENH=1
+ __FLAGS_GETOPT_VERS_BSD=2
+ 
+ getopt >/dev/null 2>&1
+ case $? in
+-  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;  # bsd getopt
++  0) __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD} ;;
+   2)
+-    # TODO(kward): look into '-T' option to test the internal getopt() version
+     if [ "`getopt --version`" = '-- ' ]; then
+       __FLAGS_GETOPT_VERS=${__FLAGS_GETOPT_VERS_STD}
+     else
+@@ -133,82 +46,49 @@ case $? in
+     ;;
+ esac
+ 
+-# getopt optstring lengths
+ __FLAGS_OPTSTR_SHORT=0
+ __FLAGS_OPTSTR_LONG=1
+ 
+ __FLAGS_NULL='~'
+ 
+-# flag info strings
+ __FLAGS_INFO_DEFAULT='default'
+ __FLAGS_INFO_HELP='help'
+ __FLAGS_INFO_SHORT='short'
+ __FLAGS_INFO_TYPE='type'
+ 
+-# flag lengths
+ __FLAGS_LEN_SHORT=0
+ __FLAGS_LEN_LONG=1
+ 
+-# flag types
+ __FLAGS_TYPE_NONE=0
+ __FLAGS_TYPE_BOOLEAN=1
+ __FLAGS_TYPE_FLOAT=2
+ __FLAGS_TYPE_INTEGER=3
+ __FLAGS_TYPE_STRING=4
+ 
+-# set the constants readonly
+ __flags_constants=`set |awk -F= '/^FLAGS_/ || /^__FLAGS_/ {print $1}'`
+ for __flags_const in ${__flags_constants}; do
+-  # skip certain flags
+   case ${__flags_const} in
+     FLAGS_HELP) continue ;;
+     FLAGS_PARENT) continue ;;
+   esac
+-  # set flag readonly
+   if [ -z "${ZSH_VERSION:-}" ]; then
+     readonly ${__flags_const}
+-  else  # handle zsh
++  else
+     case ${ZSH_VERSION} in
+       [123].*) readonly ${__flags_const} ;;
+-      *) readonly -g ${__flags_const} ;;  # declare readonly constants globally
++      *) readonly -g ${__flags_const} ;;
+     esac
+   fi
+ done
+ unset __flags_const __flags_constants
+ 
+-#
+-# internal variables
+-#
+-
+-__flags_boolNames=' '  # space separated list of boolean flag names
+-__flags_longNames=' '  # space separated list of long flag names
+-__flags_shortNames=' '  # space separated list of short flag names
+-
+-__flags_columns=''  # screen width in columns
+-__flags_opts=''  # temporary storage for parsed getopt flags
+-
+-#------------------------------------------------------------------------------
+-# private functions
+-#
+-
+-# Define a flag.
+-#
+-# Calling this function will define the following info variables for the
+-# specified flag:
+-#   FLAGS_flagname - the name for this flag (based upon the long flag name)
+-#   __flags_<flag_name>_default - the default value
+-#   __flags_flagname_help - the help string
+-#   __flags_flagname_short - the single letter alias
+-#   __flags_flagname_type - the type of flag (one of __FLAGS_TYPE_*)
+-#
+-# Args:
+-#   _flags__type: integer: internal type of flag (__FLAGS_TYPE_*)
+-#   _flags__name: string: long flag name
+-#   _flags__default: default flag value
+-#   _flags__help: string: help string
+-#   _flags__short: string: (optional) short flag name
+-# Returns:
+-#   integer: success of operation, or error
++
++__flags_boolNames=' '
++__flags_longNames=' '
++__flags_shortNames=' '
++__flags_columns=''
++__flags_opts=''
++
+ _flags_define()
+ {
+   if [ $# -lt 4 ]; then
+@@ -226,16 +106,13 @@ _flags_define()
+ 
+   _flags_return_=${FLAGS_TRUE}
+ 
+-  # TODO(kward): check for validity of the flag name (e.g. dashes)
+ 
+-  # check whether the flag name is reserved
+   echo " ${FLAGS_RESERVED} " |grep " ${_flags_name_} " >/dev/null
+   if [ $? -eq 0 ]; then
+     flags_error="flag name (${_flags_name_}) is reserved"
+     _flags_return_=${FLAGS_ERROR}
+   fi
+ 
+-  # require short option for getopt that don't support long options
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
+       -a ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} \
+       -a "${_flags_short_}" = "${__FLAGS_NULL}" ]
+@@ -244,7 +121,6 @@ _flags_define()
+     _flags_return_=${FLAGS_ERROR}
+   fi
+ 
+-  # check for existing long name definition
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
+     if _flags_itemInList "${_flags_name_}" \
+         ${__flags_longNames} ${__flags_boolNames}
+@@ -255,7 +131,6 @@ _flags_define()
+     fi
+   fi
+ 
+-  # check for existing short name definition
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} \
+       -a "${_flags_short_}" != "${__FLAGS_NULL}" ]
+   then
+@@ -266,9 +141,6 @@ _flags_define()
+     fi
+   fi
+ 
+-  # handle default value. note, on several occasions the 'if' portion of an
+-  # if/then/else contains just a ':' which does nothing. a binary reversal via
+-  # '!' is not done because it does not work on all shells.
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
+     case ${_flags_type_} in
+       ${__FLAGS_TYPE_BOOLEAN})
+@@ -301,7 +173,7 @@ _flags_define()
+         fi
+         ;;
+ 
+-      ${__FLAGS_TYPE_STRING}) ;;  # everything in shell is a valid string
++      ${__FLAGS_TYPE_STRING}) ;;
+ 
+       *)
+         flags_error="unrecognized flag type '${_flags_type_}'"
+@@ -311,7 +183,6 @@ _flags_define()
+   fi
+ 
+   if [ ${_flags_return_} -eq ${FLAGS_TRUE} ]; then
+-    # store flag information
+     eval "FLAGS_${_flags_name_}='${_flags_default_}'"
+     eval "__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}=${_flags_type_}"
+     eval "__flags_${_flags_name_}_${__FLAGS_INFO_DEFAULT}=\
+@@ -319,7 +190,6 @@ _flags_define()
+     eval "__flags_${_flags_name_}_${__FLAGS_INFO_HELP}=\"${_flags_help_}\""
+     eval "__flags_${_flags_name_}_${__FLAGS_INFO_SHORT}='${_flags_short_}'"
+ 
+-    # append flag name(s) to list of names
+     __flags_longNames="${__flags_longNames}${_flags_name_} "
+     __flags_shortNames="${__flags_shortNames}${_flags_short_} "
+     [ ${_flags_type_} -eq ${__FLAGS_TYPE_BOOLEAN} ] && \
+@@ -333,17 +203,6 @@ _flags_define()
+   return ${flags_return}
+ }
+ 
+-# Return valid getopt options using currently defined list of long options.
+-#
+-# This function builds a proper getopt option string for short (and long)
+-# options, using the current list of long options for reference.
+-#
+-# Args:
+-#   _flags_optStr: integer: option string type (__FLAGS_OPTSTR_*)
+-# Output:
+-#   string: generated option string for getopt
+-# Returns:
+-#   boolean: success of operation (always returns True)
+ _flags_genOptStr()
+ {
+   _flags_optStrType_=$1
+@@ -358,7 +217,6 @@ _flags_genOptStr()
+             ${_flags_flag_} ${__FLAGS_INFO_SHORT}`
+         if [ "${_flags_shortName_}" != "${__FLAGS_NULL}" ]; then
+           _flags_opts_="${_flags_opts_}${_flags_shortName_}"
+-          # getopt needs a trailing ':' to indicate a required argument
+           [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
+               _flags_opts_="${_flags_opts_}:"
+         fi
+@@ -366,7 +224,6 @@ _flags_genOptStr()
+ 
+       ${__FLAGS_OPTSTR_LONG})
+         _flags_opts_="${_flags_opts_:+${_flags_opts_},}${_flags_flag_}"
+-        # getopt needs a trailing ':' to indicate a required argument
+         [ ${_flags_type_} -ne ${__FLAGS_TYPE_BOOLEAN} ] && \
+             _flags_opts_="${_flags_opts_}:"
+         ;;
+@@ -379,15 +236,6 @@ _flags_genOptStr()
+   return ${FLAGS_TRUE}
+ }
+ 
+-# Returns flag details based on a flag name and flag info.
+-#
+-# Args:
+-#   string: long flag name
+-#   string: flag info (see the _flags_define function for valid info types)
+-# Output:
+-#   string: value of dereferenced flag variable
+-# Returns:
+-#   integer: one of FLAGS_{TRUE|FALSE|ERROR}
+ _flags_getFlagInfo()
+ {
+   _flags_name_=$1
+@@ -399,13 +247,6 @@ _flags_getFlagInfo()
+   if [ -n "${_flags_value_}" ]; then
+     flags_return=${FLAGS_TRUE}
+   else
+-    # see if the _flags_name_ variable is a string as strings can be empty...
+-    # note: the DRY principle would say to have this function call itself for
+-    # the next three lines, but doing so results in an infinite loop as an
+-    # invalid _flags_name_ will also not have the associated _type variable.
+-    # Because it doesn't (it will evaluate to an empty string) the logic will
+-    # try to find the _type variable of the _type variable, and so on. Not so
+-    # good ;-)
+     _flags_typeVar_="__flags_${_flags_name_}_${__FLAGS_INFO_TYPE}"
+     _flags_strToEval_="_flags_type_=\"\${${_flags_typeVar_}:-}\""
+     eval "${_flags_strToEval_}"
+@@ -424,15 +265,6 @@ _flags_getFlagInfo()
+   return ${flags_return}
+ }
+ 
+-# check for presense of item in a list. passed a string (e.g. 'abc'), this
+-# function will determine if the string is present in the list of strings (e.g.
+-# ' foo bar abc ').
+-#
+-# Args:
+-#   _flags__str: string: string to search for in a list of strings
+-#   unnamed: list: list of strings
+-# Returns:
+-#   boolean: true if item is in the list
+ _flags_itemInList()
+ {
+   _flags_str_=$1
+@@ -449,34 +281,22 @@ _flags_itemInList()
+   return ${flags_return}
+ }
+ 
+-# Returns the width of the current screen.
+-#
+-# Output:
+-#   integer: width in columns of the current screen.
+ _flags_columns()
+ {
+   if [ -z "${__flags_columns}" ]; then
+-    # determine the value and store it
+     if eval stty size >/dev/null 2>&1; then
+-      # stty size worked :-)
+       set -- `stty size`
+       __flags_columns=$2
+     elif eval tput cols >/dev/null 2>&1; then
+       set -- `tput cols`
+       __flags_columns=$1
+     else
+-      __flags_columns=80  # default terminal width
++      __flags_columns=80
+     fi
+   fi
+   echo ${__flags_columns}
+ }
+ 
+-# Validate a boolean.
+-#
+-# Args:
+-#   _flags__bool: boolean: value to validate
+-# Returns:
+-#   bool: true if the value is a valid boolean
+ _flags_validateBoolean()
+ {
+   _flags_bool_=$1
+@@ -492,12 +312,6 @@ _flags_validateBoolean()
+   return ${flags_return}
+ }
+ 
+-# Validate a float.
+-#
+-# Args:
+-#   _flags__float: float: value to validate
+-# Returns:
+-#   bool: true if the value is a valid float
+ _flags_validateFloat()
+ {
+   _flags_float_=$1
+@@ -507,10 +321,10 @@ _flags_validateFloat()
+   else
+     flags_return=${FLAGS_TRUE}
+     case ${_flags_float_} in
+-      -*)  # negative floats
++      -*)
+         _flags_test_=`expr "${_flags_float_}" : '\(-[0-9][0-9]*\.[0-9][0-9]*\)'`
+         ;;
+-      *)  # positive floats
++      *)
+         _flags_test_=`expr "${_flags_float_}" : '\([0-9][0-9]*\.[0-9][0-9]*\)'`
+         ;;
+     esac
+@@ -521,22 +335,16 @@ _flags_validateFloat()
+   return ${flags_return}
+ }
+ 
+-# Validate an integer.
+-#
+-# Args:
+-#   _flags__integer: interger: value to validate
+-# Returns:
+-#   bool: true if the value is a valid integer
+ _flags_validateInteger()
+ {
+   _flags_int_=$1
+ 
+   flags_return=${FLAGS_TRUE}
+   case ${_flags_int_} in
+-    -*)  # negative ints
++    -*)
+       _flags_test_=`expr "${_flags_int_}" : '\(-[0-9][0-9]*\)'`
+       ;;
+-    *)  # positive ints
++    *)
+       _flags_test_=`expr "${_flags_int_}" : '\([0-9][0-9]*\)'`
+       ;;
+   esac
+@@ -546,23 +354,12 @@ _flags_validateInteger()
+   return ${flags_return}
+ }
+ 
+-# Parse command-line options using the standard getopt.
+-#
+-# Note: the flag options are passed around in the global __flags_opts so that
+-# the formatting is not lost due to shell parsing and such.
+-#
+-# Args:
+-#   @: varies: command-line options to parse
+-# Returns:
+-#   integer: a FLAGS success condition
+ _flags_getoptStandard()
+ {
+   flags_return=${FLAGS_TRUE}
+   _flags_shortOpts_=`_flags_genOptStr ${__FLAGS_OPTSTR_SHORT}`
+ 
+-  # check for spaces in passed options
+   for _flags_opt_ in "$@"; do
+-    # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
+     _flags_match_=`echo "x${_flags_opt_}x" |sed 's/ //g'`
+     if [ "${_flags_match_}" != "x${_flags_opt_}x" ]; then
+       flags_error='the available getopt does not support spaces in options'
+@@ -585,15 +382,6 @@ _flags_getoptStandard()
+   return ${flags_return}
+ }
+ 
+-# Parse command-line options using the enhanced getopt.
+-#
+-# Note: the flag options are passed around in the global __flags_opts so that
+-# the formatting is not lost due to shell parsing and such.
+-#
+-# Args:
+-#   @: varies: command-line options to parse
+-# Returns:
+-#   integer: a FLAGS success condition
+ _flags_getoptEnhanced()
+ {
+   flags_return=${FLAGS_TRUE}
+@@ -617,17 +405,6 @@ _flags_getoptEnhanced()
+   return ${flags_return}
+ }
+ 
+-# Dynamically parse a getopt result and set appropriate variables.
+-#
+-# This function does the actual conversion of getopt output and runs it through
+-# the standard case structure for parsing. The case structure is actually quite
+-# dynamic to support any number of flags.
+-#
+-# Args:
+-#   argc: int: original command-line argument count
+-#   @: varies: output from getopt parsing
+-# Returns:
+-#   integer: a FLAGS success condition
+ _flags_parseGetopt()
+ {
+   _flags_argc_=$1
+@@ -638,35 +415,26 @@ _flags_parseGetopt()
+   if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
+     set -- $@
+   else
+-    # note the quotes around the `$@' -- they are essential!
+     eval set -- "$@"
+   fi
+ 
+-  # provide user with number of arguments to shift by later
+-  # NOTE: the FLAGS_ARGC variable is obsolete as of 1.0.3 because it does not
+-  # properly give user access to non-flag arguments mixed in between flag
+-  # arguments. Its usage was replaced by FLAGS_ARGV, and it is being kept only
+-  # for backwards compatibility reasons.
+   FLAGS_ARGC=`expr $# - 1 - ${_flags_argc_}`
+ 
+-  # handle options. note options with values must do an additional shift
+   while true; do
+     _flags_opt_=$1
+     _flags_arg_=${2:-}
+     _flags_type_=${__FLAGS_TYPE_NONE}
+     _flags_name_=''
+ 
+-    # determine long flag name
+     case "${_flags_opt_}" in
+-      --) shift; break ;;  # discontinue option parsing
++      --) shift; break ;;
+ 
+-      --*)  # long option
++      --*)
+         _flags_opt_=`expr "${_flags_opt_}" : '--\(.*\)'`
+         _flags_len_=${__FLAGS_LEN_LONG}
+         if _flags_itemInList "${_flags_opt_}" ${__flags_longNames}; then
+           _flags_name_=${_flags_opt_}
+         else
+-          # check for negated long boolean version
+           if _flags_itemInList "${_flags_opt_}" ${__flags_boolNames}; then
+             _flags_name_=`expr "${_flags_opt_}" : 'no\(.*\)'`
+             _flags_type_=${__FLAGS_TYPE_BOOLEAN}
+@@ -675,12 +443,10 @@ _flags_parseGetopt()
+         fi
+         ;;
+ 
+-      -*)  # short option
++      -*)
+         _flags_opt_=`expr "${_flags_opt_}" : '-\(.*\)'`
+         _flags_len_=${__FLAGS_LEN_SHORT}
+         if _flags_itemInList "${_flags_opt_}" ${__flags_shortNames}; then
+-          # yes. match short name to long name. note purposeful off-by-one
+-          # (too high) with awk calculations.
+           _flags_pos_=`echo "${__flags_shortNames}" \
+               |awk 'BEGIN{RS=" ";rn=0}$0==e{rn=NR}END{print rn}' \
+                   e=${_flags_opt_}`
+@@ -690,14 +456,12 @@ _flags_parseGetopt()
+         ;;
+     esac
+ 
+-    # die if the flag was unrecognized
+     if [ -z "${_flags_name_}" ]; then
+       flags_error="unrecognized option (${_flags_opt_})"
+       flags_return=${FLAGS_ERROR}
+       break
+     fi
+ 
+-    # set new flag value
+     [ ${_flags_type_} -eq ${__FLAGS_TYPE_NONE} ] && \
+         _flags_type_=`_flags_getFlagInfo \
+             "${_flags_name_}" ${__FLAGS_INFO_TYPE}`
+@@ -746,7 +510,6 @@ _flags_parseGetopt()
+         ;;
+     esac
+ 
+-    # handle special case help flag
+     if [ "${_flags_name_}" = 'help' ]; then
+       if [ ${FLAGS_help} -eq ${FLAGS_TRUE} ]; then
+         flags_help
+@@ -756,12 +519,10 @@ _flags_parseGetopt()
+       fi
+     fi
+ 
+-    # shift the option and non-boolean arguements out.
+     shift
+     [ ${_flags_type_} != ${__FLAGS_TYPE_BOOLEAN} ] && shift
+   done
+ 
+-  # give user back non-flag arguments
+   FLAGS_ARGV=''
+   while [ $# -gt 0 ]; do
+     FLAGS_ARGV="${FLAGS_ARGV:+${FLAGS_ARGV} }'$1'"
+@@ -773,43 +534,18 @@ _flags_parseGetopt()
+   return ${flags_return}
+ }
+ 
+-#------------------------------------------------------------------------------
+-# public functions
+-#
+-
+-# A basic boolean flag. Boolean flags do not take any arguments, and their
+-# value is either 1 (false) or 0 (true). For long flags, the false value is
+-# specified on the command line by prepending the word 'no'. With short flags,
+-# the presense of the flag toggles the current value between true and false.
+-# Specifying a short boolean flag twice on the command results in returning the
+-# value back to the default value.
+-#
+-# A default value is required for boolean flags.
+-#
+-# For example, lets say a Boolean flag was created whose long name was 'update'
+-# and whose short name was 'x', and the default value was 'false'. This flag
+-# could be explicitly set to 'true' with '--update' or by '-x', and it could be
+-# explicitly set to 'false' with '--noupdate'.
++
+ DEFINE_boolean() { _flags_define ${__FLAGS_TYPE_BOOLEAN} "$@"; }
+ 
+-# Other basic flags.
+ DEFINE_float()   { _flags_define ${__FLAGS_TYPE_FLOAT} "$@"; }
+ DEFINE_integer() { _flags_define ${__FLAGS_TYPE_INTEGER} "$@"; }
+ DEFINE_string()  { _flags_define ${__FLAGS_TYPE_STRING} "$@"; }
+ 
+-# Parse the flags.
+-#
+-# Args:
+-#   unnamed: list: command-line flags to parse
+-# Returns:
+-#   integer: success of operation, or error
+ FLAGS()
+ {
+-  # define a standard 'help' flag if one isn't already defined
+   [ -z "${__flags_help_type:-}" ] && \
+       DEFINE_boolean 'help' false 'show this help' 'h'
+ 
+-  # parse options
+   if [ $# -gt 0 ]; then
+     if [ ${__FLAGS_GETOPT_VERS} -ne ${__FLAGS_GETOPT_VERS_ENH} ]; then
+       _flags_getoptStandard "$@"
+@@ -818,7 +554,6 @@ FLAGS()
+     fi
+     flags_return=$?
+   else
+-    # nothing passed; won't bother running getopt
+     __flags_opts='--'
+     flags_return=${FLAGS_TRUE}
+   fi
+@@ -832,23 +567,11 @@ FLAGS()
+   return ${flags_return}
+ }
+ 
+-# This is a helper function for determining the `getopt` version for platforms
+-# where the detection isn't working. It simply outputs debug information that
+-# can be included in a bug report.
+-#
+-# Args:
+-#   none
+-# Output:
+-#   debug info that can be included in a bug report
+-# Returns:
+-#   nothing
+ flags_getoptInfo()
+ {
+-  # platform info
+   _flags_debug "uname -a: `uname -a`"
+   _flags_debug "PATH: ${PATH}"
+ 
+-  # shell info
+   if [ -n "${BASH_VERSION:-}" ]; then
+     _flags_debug 'shell: bash'
+     _flags_debug "BASH_VERSION: ${BASH_VERSION}"
+@@ -857,7 +580,6 @@ flags_getoptInfo()
+     _flags_debug "ZSH_VERSION: ${ZSH_VERSION}"
+   fi
+ 
+-  # getopt info
+   getopt >/dev/null
+   _flags_getoptReturn=$?
+   _flags_debug "getopt return: ${_flags_getoptReturn}"
+@@ -866,39 +588,16 @@ flags_getoptInfo()
+   unset _flags_getoptReturn
+ }
+ 
+-# Returns whether the detected getopt version is the enhanced version.
+-#
+-# Args:
+-#   none
+-# Output:
+-#   none
+-# Returns:
+-#   bool: true if getopt is the enhanced version
+ flags_getoptIsEnh()
+ {
+   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_ENH}
+ }
+ 
+-# Returns whether the detected getopt version is the standard version.
+-#
+-# Args:
+-#   none
+-# Returns:
+-#   bool: true if getopt is the standard version
+ flags_getoptIsStd()
+ {
+   test ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD}
+ }
+ 
+-# This is effectively a 'usage()' function. It prints usage information and
+-# exits the program with ${FLAGS_FALSE} if it is ever found in the command line
+-# arguments. Note this function can be overridden so other apps can define
+-# their own --help flag, replacing this one, if they want.
+-#
+-# Args:
+-#   none
+-# Returns:
+-#   integer: success of operation (always returns true)
+ flags_help()
+ {
+   if [ -n "${FLAGS_HELP:-}" ]; then
+@@ -953,19 +652,14 @@ flags_help()
+         echo "${flags_helpStr_}" >&2
+       else
+         echo "  ${flags_flagStr_}  ${flags_help_}" >&2
+-        # note: the silliness with the x's is purely for ksh93 on Ubuntu 6.06
+-        # because it doesn't like empty strings when used in this manner.
+         flags_emptyStr_="`echo \"x${flags_flagStr_}x\" \
+             |awk '{printf "%"length($0)-2"s", ""}'`"
+         flags_helpStr_="  ${flags_emptyStr_}  ${flags_defaultStr_}"
+         flags_helpStrLen_=`expr "${flags_helpStr_}" : '.*'`
+         if [ ${__FLAGS_GETOPT_VERS} -eq ${__FLAGS_GETOPT_VERS_STD} \
+             -o ${flags_helpStrLen_} -lt ${flags_columns_} ]; then
+-          # indented to match help string
+           echo "${flags_helpStr_}" >&2
+         else
+-          # indented four from left to allow for longer defaults as long flag
+-          # names might be used too, making things too long
+           echo "    ${flags_defaultStr_}" >&2
+         fi
+       fi
+@@ -978,12 +672,6 @@ flags_help()
+   return ${FLAGS_TRUE}
+ }
+ 
+-# Reset shflags back to an uninitialized state.
+-#
+-# Args:
+-#   none
+-# Returns:
+-#   nothing
+ flags_reset()
+ {
+   for flags_name_ in ${__flags_longNames}; do
+@@ -1000,7 +688,6 @@ flags_reset()
+     eval ${flags_strToEval_}
+   done
+ 
+-  # reset internal variables
+   __flags_boolNames=' '
+   __flags_longNames=' '
+   __flags_shortNames=' '

stunc/Makefile

@@ -9,13 +9,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.1.12
+PKG_VERSION:=1.1.8
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=5b65364709a921db0956bf74a4f126217cfb1775
+PKG_SOURCE_VERSION:=2628f2c9e0b99064a703a1ad069f0f298bc36076
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -64,16 +64,19 @@ TARGET_CFLAGS += \
 	-Wall -Werror
 
 ifeq ($(BUILD_VARIANT),wolfssl)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
   MAKE_FLAGS += \
 	USE_WOLFSSL="yes"
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/mbedtls
   MAKE_FLAGS += \
 	USE_MBEDTLS="yes"
 endif
 
 ifeq ($(BUILD_VARIANT),openssl)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
   MAKE_FLAGS += \
 	USE_OPENSSL="yes"
 endif

stunc/files/etc/config/stunc

@@ -8,5 +8,5 @@ config stunc 'stunc'
 	option min_keepalive '30'
 	option max_keepalive '3600'
 #	option client_port 7547
-	option log_level '1'
+	option log_level '0'
 

sulu-server/Makefile

@@ -1,59 +0,0 @@
-#
-# Copyright (C) 2021 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sulu-server
-PKG_VERSION:=0.0.1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-server.git
-PKG_SOURCE_VERSION:=a93a29eab7d018ca24cd32fb8b183c5c62c11a78
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-PKG_LICENSE:=PROPRIETARY IOPSYS
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=node-yarn/host
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/sulu-server
-	SECTION:=sulu
-	CATEGORY:=Utilities
-	MENU=1
-	TITLE:=Express based SULU-server
-	DEPENDS:=+nginx +node
-endef
-
-define Package/sulu-server/description
-	Express based web server for SULU.
-endef
-
-define Build/Prepare
-	$(Build/Prepare/Default)
-	echo "PORT=7071" >>$(PKG_BUILD_DIR)/.env
-	echo "JWT_SECRET=d10365eff77ca1aebd6421b3a8c742c7881959283198ddd764c7c685ba6b70124e09633e05e57640c030c192c5bea4293f5f968538d6c636e4e6b0ff0d0e4ecc" >>$(PKG_BUILD_DIR)/.env
-	echo "RESOURCES_PATH=/sulu-server" >>$(PKG_BUILD_DIR)/.env
-endef
-
-define Build/Compile
-	cd $(PKG_BUILD_DIR) && yarn install && yarn build:dev-clean
-endef
-
-define Package/sulu-server/install
-	$(INSTALL_DIR) $(1)/sulu-server
-	$(INSTALL_DIR) $(1)/etc/nginx/conf.d
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DIR) $(1)/sbin/
-	$(INSTALL_DIR) $(1)/sulu-server/secret
-	$(INSTALL_DIR) $(1)/sulu-server/private
-	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu-server/
-	$(CP) $(PKG_BUILD_DIR)/.env $(1)/sulu-server/
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,sulu-server))
-

sulu-server/files/etc/init.d/sulu-server

@@ -1,29 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-USE_PROCD=1
-
-START=99
-STOP=01
-
-log() {
-	echo "${@}"|logger -t sulu-server.init -p debug
-}
-
-start_service() {
-	procd_open_instance sulu-server
-	procd_set_param limits cpu="1"
-	procd_set_param command /sbin/sulu-server
-	procd_set_param stdout 1
-	procd_set_param stderr 1
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "obuspa" "mosquitto"
-}

sulu-server/files/etc/nginx/conf.d/sulu_server.locations

@@ -1,8 +0,0 @@
-location / {
-    proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
-    proxy_set_header Host $host;
-    proxy_pass http://127.0.0.1:7071;
-    proxy_http_version 1.1;
-    proxy_set_header Upgrade $http_upgrade;
-    proxy_set_header Connection "upgrade";
-}

sulu-server/files/etc/uci-defaults/91-sulu-server-nginx-conf

@@ -1,16 +0,0 @@
-mkdir -p /tmp/sulu-server
-
-uci -q get nginx._sulu && exit 0
-
-uci -q set nginx._sulu_server=server
-uci -q add_list nginx._sulu_server.listen='7070 ssl'
-uci -q add_list nginx._sulu_server.listen='[::]:7070 ssl'
-uci -q set nginx._sulu_server.root='/sulu-server'
-uci -q set nginx._sulu_server.server_name='_sulu_server'
-uci -q add_list nginx._sulu_server.include='conf.d/sulu_server.locations'
-uci -q set nginx._sulu_server.uci_manage_ssl='self-signed'
-uci -q set nginx._sulu_server.ssl_certificate='/etc/nginx/conf.d/_lan.crt'
-uci -q set nginx._sulu_server.ssl_certificate_key='/etc/nginx/conf.d/_lan.key'
-uci -q set nginx._sulu_server.ssl_session_cache='shared:SSL:32k'
-uci -q set nginx._sulu_server.ssl_session_timeout='64m'
-

sulu-server/files/sbin/sulu-server

@@ -1,3 +0,0 @@
-#!/bin/sh
-
-cd /sulu-server/ && node /sulu-server/index.js

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.0.12
+PKG_VERSION:=1.0.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=fc82a32ab3cdcb18dc3aa7b907c62d8bed29b4ff
+PKG_SOURCE_VERSION:=222030dd934438c2340ce751b23840fa4e4848b3
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

swmodd/Makefile

@@ -1,16 +1,17 @@
 #
-# Copyright (C) 2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 IOPSYS
 #
+# 
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.5
+PKG_VERSION:=2.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2f953ea76b5779a73a540777dfb450982802e4f8
+PKG_SOURCE_VERSION:=e484557ea7ede6d8ff439081deebd763d4952851
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -19,9 +20,6 @@ endif
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=bbf
 
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
 include $(INCLUDE_DIR)/package.mk
 
 define Package/swmodd

swmodd/files/etc/init.d/swmodd

@@ -1,7 +1,7 @@
 #!/bin/sh /etc/rc.common
 
-START=99
-STOP=01
+START=94
+STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/swmodd

twamp/Makefile

@@ -1,22 +1,26 @@
 #
-# Copyright (C) 2020-2022 iopsys Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
 #
-
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.2.0
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp-light.git
-PKG_SOURCE_VERSION:=4dfc8609fb0cefaaf9e86b559b1e10488117cf07
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp.git
+PKG_SOURCE_VERSION:=c9b6b0fe35e137e967ccef63a9e1253155a59078
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 PKG_BUILD_DEPENDS:=bbf
@@ -27,12 +31,12 @@ define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=TWAMP Light Client(TR-390)
+  TITLE:=BBF TWAMP/TWAMP Light feature
   DEPENDS:=+libuci +ubox +libubus
 endef
 
 define Package/$(PKG_NAME)/description
-	TWAMP Client for Performance Measurement from IP Edge to Customer Equipment using TWAMP Light Protocol
+	BBF TWAMP/TWAMP Light feature
 endef
 
 TARGET_CFLAGS += \

twamp/files/etc/config/twamp

@@ -1,11 +1,13 @@
 
 config twamp 'twamp'
-	option enable '0'
-	#Log levels: Critical=0, Error=1, Warning=2, Notice=3, Info=4, Debug=5
-	option log_level '4'
+	option enable '1'
+	option twamp_light '1'
+	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
+	option log_level '3'
 
 config twamp_reflector 'reflector_1'
 	option enable '0'
 	option interface 'wan'
 	option port '862'
 	option max_ttl '1'
+

twamp/files/etc/firewall.twamp

@@ -14,7 +14,7 @@ function configure_firewall()
 {
 	local enable port interface
 
-	config_get enable ${1} enable "1"
+	config_get enable ${1} enable "0"
 	config_get port ${1} port
 	config_get interface ${1} interface
 	if [ "$enable" -eq 0 -o -z "${port}" -o -z "${interface}" ]; then
@@ -27,21 +27,5 @@ function configure_firewall()
 	fi
 }
 
-function delete_rule()
-{
-        while iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" > /dev/null; do
-		iptables -w 1 -D zone_${1}_input $(iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" | head -1|awk '{print $1}');
-	done
-}
-
-# Loop through all interfaces and delete the twamp reflector rule from interface's input chain
-config_load network
-config_foreach delete_rule interface
-
 config_load twamp
-config_get twamp_enable twamp enable "0"
-if [ "${twamp_enable}" -eq "0" ]; then
-	exit 0;
-fi
-
 config_foreach configure_firewall twamp_reflector

twamp/files/etc/init.d/twampd

@@ -22,9 +22,6 @@ start_service() {
 reload_service() {
         stop
         start
-        [ -f /etc/firewall.twamp ] && {
-                sh /etc/firewall.twamp
-        }
 }
 
 service_triggers() {

udpecho/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpecho
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.0.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpecho.git
-PKG_SOURCE_VERSION:=19a555c2d460db6bdfcfa53742011fbb6a4ca6af
+PKG_SOURCE_VERSION:=aeaf8f5862fff7133e6299ac30ab02c8fbb1ff61
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

urlfilter/Makefile

@@ -6,17 +6,18 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
 PKG_SOURCE_VERSION:=5a64642ac33e629151788b3ff1de920776bcd2ed
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
@@ -34,6 +35,7 @@ define Package/urlfilter/description
 endef
 
 TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
         -D_GNU_SOURCE
 
 ifeq ($(LOCAL_DEV),1)

urlfilter/files/etc/bbfdm/json/urlfilter.json

@@ -1,419 +0,0 @@
-{
-	"json_plugin_version": 1,
-	"Device.{BBF_VENDOR_PREFIX}URLFilter.": {
-		"type": "object",
-		"version": "2.14",
-		"protocols": [
-			"cwmp",
-			"usp"
-		],
-		"access": false,
-		"array": false,
-		"Enable": {
-			"type": "boolean",
-			"version": "2.14",
-			"read": true,
-			"write": true,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "urlfilter",
-						"section": {
-							"name": "globals"
-						},
-						"option": {
-							"name": "enable"
-						}
-					}
-				}
-			]
-		},
-		"GlobalBlacklist": {
-			"type": "boolean",
-			"version": "2.14",
-			"read": true,
-			"write": true,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "urlfilter",
-						"section": {
-							"name": "globals"
-						},
-						"option": {
-							"name": "global_blacklist"
-						}
-					}
-				}
-			]
-		},
-		"BlacklistURL": {
-			"type": "string",
-			"version": "2.14",
-			"read": true,
-			"write": true,
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"list": {
-				"datatype": "string"
-			},
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "urlfilter",
-						"section": {
-							"name": "globals"
-						},
-						"list": {
-							"name": "blacklist_url"
-						}
-					}
-				}
-			]
-		},
-		"ProfileNumberOfEntries": {
-			"type": "unsignedInt",
-			"read": true,
-			"write": false,
-			"version": "2.14",
-			"protocols": [
-				"cwmp",
-				"usp"
-			],			
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "urlfilter",
-						"section": {
-							"type": "profile"
-						},
-						"option": {
-							"name": "@Count"
-						}
-					}
-				}
-			]	
-		},
-		"Device.{BBF_VENDOR_PREFIX}URLFilter.Profile.{i}.": {
-			"type": "object",
-			"version": "2.14",
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"uniqueKeys": [
-				"Name"
-			],
-			"access": true,
-			"array": true,
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "urlfilter",
-						"section": {
-							"type": "profile"
-						},
-						"dmmapfile": "dmmap_urlfilter"
-					}
-				}
-			],
-			"Name": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"version": "2.14",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"datatype": "string",
-				"range": [
-					{
-						"max": 64
-					}
-				],
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "profile"
-							},
-							"option": {
-								"name": "@Name"
-							}
-						}
-					}
-				]
-			},
-			"WhitelistURL": {
-				"type": "string",
-				"version": "2.14",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"list": {
-					"datatype": "string"
-				},
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "profile"
-							},
-							"list": {
-								"name": "whitelist_url"
-							}
-						}
-					}
-				]
-			},
-			"BlacklistURL": {
-				"type": "string",
-				"version": "2.14",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"list": {
-					"datatype": "string"
-				},
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "profile"
-							},
-							"list": {
-								"name": "blacklist_url"
-							}
-						}
-					}
-				]
-			}
-		},
-		"FilterNumberOfEntries": {
-			"type": "unsignedInt",
-			"read": true,
-			"write": false,
-			"version": "2.14",
-			"protocols": [
-				"cwmp",
-				"usp"
-			],			
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "urlfilter",
-						"section": {
-							"type": "filter"
-						},
-						"option": {
-							"name": "@Count"
-						}
-					}
-				}
-			]
-		},
-		"Device.{BBF_VENDOR_PREFIX}URLFilter.Filter.{i}.": {
-			"type": "object",
-			"version": "2.14",
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"access": true,
-			"array": true,
-			"mapping": [
-				{
-					"type": "uci",
-					"uci": {
-						"file": "urlfilter",
-						"section": {
-							"type": "filter"
-						},
-						"dmmapfile": "dmmap_urlfilter"
-					}
-				}
-			],
-			"Enable": {
-				"type": "boolean",
-				"version": "2.14",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "filter"
-							},
-							"option": {
-								"name": "enable"
-							}
-						}
-					}
-				]
-			},
-			"Profile": {
-				"type": "string",
-				"version": "2.14",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "filter"
-							},
-							"option": {
-								"name": "profile"
-							}
-						},
-						"linker_obj": "Device.{BBF_VENDOR_PREFIX}URLFilter.Profile."
-					}
-				]
-			},
-			"MACAddress": {
-				"type": "string",
-				"version": "2.14",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"list": {
-					"datatype": "string"
-				},
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "filter"
-							},
-							"list": {
-								"name": "macaddr"
-							}
-						}
-					}
-				]
-			},
-			"Day": {
-				"type": "string",
-				"version": "2.14",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"list": {
-					"datatype": "string"
-				},
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "filter"
-							},
-							"list": {
-								"name": "day"
-							}
-						}
-					}
-				]
-			},
-			"StartTime": {
-				"type": "string",
-				"version": "2.14",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "filter"
-							},
-							"option": {
-								"name": "start_time"
-							}
-						}
-					}
-				]
-			},
-			"Duration": {
-				"type": "string",
-				"version": "2.14",
-				"read": true,
-				"write": true,
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci",
-						"uci": {
-							"file": "urlfilter",
-							"section": {
-								"type": "filter"
-							},
-							"option": {
-								"name": "duration"
-							}
-						}
-					}
-				]
-			}
-		}
-	}
-}
-

usp-js/Makefile

@@ -1,12 +1,7 @@
-#
-# Copyright (C) 2022 IOPSYS
-#
-#
-
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usp-js
-PKG_VERSION:=1.0.1
+PKG_VERSION:=0.0.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/usp-js.git
@@ -14,58 +9,26 @@ PKG_SOURCE_VERSION:=7e285eb006414f230a3c17acf1b6f4c31c987447
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
-PKG_LICENSE:=BSD-3-Clause
-PKG_LICENSE_FILES:=LICENSE
-
-PKG_BUILD_DEPENDS:=node-yarn/host
 include $(INCLUDE_DIR)/package.mk
 
-define Package/usp-js/default
+define Package/usp-js
   SECTION:=libs
   CATEGORY:=Libraries
   TITLE:=A JS library for USP(TR369) protocol
+  DEPENDS:=+quickjs +quickjs-websocket
 endef
 
 define Package/usp-js/description
   A JS library to provide USP(TR369) protocol functionality for an usp controller.
 endef
 
-define Package/usp-js-quickjs
-  $(Package/usp-js/default)
-  TITLE += (QuickJS)
-  DEPENDS:=+quickjs +quickjs-websocket
-  VARIANT:=quickjs
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/usp-js-nodejs
-  $(Package/usp-js/default)
-  TITLE += (NodeJS)
-  DEPENDS:=+node
-  VARIANT:=nodejs
-endef
-
-ifeq ($(BUILD_VARIANT),nodejs)
 define Build/Compile
-	cd $(PKG_BUILD_DIR) && yarn install && yarn build
+	cd $(PKG_BUILD_DIR) && npm install @types/node --save-dev && yarn qjs
 endef
-else
-define Build/Compile
-	cd $(PKG_BUILD_DIR) && yarn install && yarn qjs
-endef
-endif
 
-define Package/usp-js-quickjs/install
+define Package/usp-js/install
 	$(INSTALL_DIR) $(1)/usr/lib/usp-js
 	$(CP) $(PKG_BUILD_DIR)/qjs/* $(1)/usr/lib/usp-js/
 endef
 
-define Package/usp-js-nodejs/install
-	$(INSTALL_DIR) $(1)/usr/lib/node_modules/usp-js
-	$(INSTALL_DIR) $(1)/usr/lib/node_modules/usp-js/node_modules
-	$(CP) $(PKG_BUILD_DIR)/node/* $(1)/usr/lib/node_modules/usp-js/
-	$(CP) $(PKG_BUILD_DIR)/node_modules/* $(1)/usr/lib/node_modules/usp-js/node_modules/
-endef
-
-$(eval $(call BuildPackage,usp-js-nodejs))
-$(eval $(call BuildPackage,usp-js-quickjs))
+$(eval $(call BuildPackage,usp-js))

uspd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.12
+PKG_VERSION:=2.2.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE_VERSION:=b18e7cbad2c295a1dcea64fca42439f0c9cd73a2
+PKG_SOURCE_VERSION:=ff39170a3e0595a67763a61ac81b2f99b5bf11d7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -26,14 +26,14 @@ define Package/uspd/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Datamodel ubus backend
-  DEPENDS:=+USE_GLIBC:librt +libubox +ubus +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
+  DEPENDS:=+libubox +ubus +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
            +@BBF_TR181 +@BBF_TR104 +@BBF_TR143
 endef
 
 define Package/uspd-mbedtls
   $(Package/uspd/default)
   TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_uspd-mbedtls:libbbfdm-mbedtls
+  DEPENDS += +libbbfdm-mbedtls
   VARIANT:=mbedtls
   DEFAULT_VARIANT:=1
 endef
@@ -41,7 +41,7 @@ endef
 define Package/uspd-openssl
   $(Package/uspd/default)
   TITLE += (openssl)
-  DEPENDS += +PACKAGE_uspd-openssl:libbbfdm-openssl
+  DEPENDS += +libbbfdm-openssl
   CONFLICTS := uspd-mbedtls
   VARIANT:=openssl
 endef
@@ -49,29 +49,17 @@ endef
 define Package/uspd-wolfssl
   $(Package/uspd/default)
   TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_uspd-wolfssl:libbbfdm-wolfssl
+  DEPENDS += +libbbfdm-wolfssl
   CONFLICTS := uspd-mbedtls uspd-openssl
   VARIANT:=wolfssl
 endef
 
 TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
 	-Wall -Werror \
 	-DUSPD_MAX_MSG_LEN="10485760"
 
-TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
-ifeq ($(BUILD_VARIANT),openssl)
-  MAKE_FLAGS += USE_OPENSSL="yes"
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
-  MAKE_FLAGS += USE_WOLFSSL="yes"
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-  MAKE_FLAGS += USE_MBEDTLS="yes"
-endif
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/uspd/* $(PKG_BUILD_DIR)/
@@ -81,8 +69,10 @@ endif
 define Package/uspd/default/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
 	$(INSTALL_BIN) ./files/etc/init.d/uspd $(1)/etc/init.d/uspd
 	$(INSTALL_CONF) ./files/etc/config/uspd $(1)/etc/config/uspd
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/transferComplete.json $(1)/etc/bbfdm/json/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uspd $(1)/usr/sbin/
 endef

wfadatad/Makefile

@@ -1,23 +1,23 @@
 #
-# Copyright (C) 2021-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2021 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=2.8.0.1
+PKG_VERSION:=7.0.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=01fd303670eef525e35c5337c4cf15418588273f
+PKG_SOURCE_VERSION:=5132917381acd81f3b043ee041beaa8630e2bd12
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_LICENSE:=BSD-3-Clause
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
@@ -60,7 +60,6 @@ MAKE_FLAGS += DEBUG=1
 endif
 
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE

wfadatad/files/decollector.init

@@ -7,7 +7,7 @@ USE_PROCD=1
 PROG=/usr/sbin/decollector
 
 service_running() {
-	ubus -t 2 wait_for ieee1905 ieee1905.map topology
+	ubus -t 2 wait_for ieee1905 ieee1905.map
 }
 
 start_service() {

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=14.0.9
+PKG_VERSION:=14.0.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=beeffd6651723c049ea32af74d927a9baa6ee2c5
+PKG_SOURCE_VERSION:=981ce51b2f135926d6e9135772dcd43d73c39b64
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz