Use older version of stunc

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.33
+PKG_VERSION:=6.8.4
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=9bdcb1ac188c44fc2274bf01dd9dce46f572b967
+PKG_SOURCE_VERSION:=ebe5137382756175f796082b80a977e099573d47
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

bulkdata/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.5
+PKG_VERSION:=2.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=33a6648de9ee0af33c44518656b56b0a30b6c1ab
+PKG_SOURCE_VERSION:=85d7486a21a9eb0e0f345b587b3ac506edcb72fe
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -34,7 +34,7 @@ define Package/$(PKG_NAME)
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json +zlib
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json
 endef
 
 TARGET_CFLAGS += \

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.5
+PKG_VERSION:=3.5.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c5695bc92f7f22089c9a85d3e1f4dac7c12ca900
+PKG_SOURCE_VERSION:=ffda80f40b5703f07570a2892522d5dded84b63a
 PKG_MIRROR_HASH:=skip
 endif
 

easy-qos/Makefile

@@ -19,7 +19,7 @@ define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
+  DEPENDS:=@TARGET_iopsys_brcm63xx_arm
 endef
 
 define Package/easy-qos/description

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.6.0
+PKG_VERSION:=6.4.45
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c8c406568822b170e373a54fbf32323e960259ff
+PKG_SOURCE_VERSION:=b6baf5a2c1213230651912bd9141f1cee02e500a
 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
@@ -55,10 +55,6 @@ 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

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:=0901382048bb7ce01fc1767fef75e54692f56743
+PKG_SOURCE_VERSION:=7d43e471f0ffc4a54eb2ac35eced4b72fca4dafb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

evoice/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=evoice
-PKG_VERSION:=0.2.29
+PKG_VERSION:=0.2.5
 
 LOCAL_DEV=0
 LOCAL_DEV_EVOICE_DIR=~/voip/evoice
@@ -13,7 +13,7 @@ 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:=ee4e9e00ec1c54b41e15a3de38f6a733634622dd
+PKG_SOURCE_VERSION:=9a2f547c7c3c8d67928c1ed7fbca538e59088c2a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,7 +21,7 @@ endif
 PKG_LICENSE:=PROPRIETARY IOPSYS
 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.
 #PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
@@ -33,7 +33,7 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c\
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl\
 		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
 		+TARGET_iopsys_econet:kmod-voip_driver\
 		+TARGET_iopsys_econet:voip_app
@@ -64,12 +64,10 @@ ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
 		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
 	TRG=SVrgBcmFxs
-	JSONFILE=codecs_brcm.json
 else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
 	TARGET_PLATFORM=ECONET
 	TONES_INI_REQUIRED=y
 	TRG=SVrgMtekOwrt
-	JSONFILE=codecs_airoha.json
 endif
 
 # disable temporarily some not important warnings, force PIC
@@ -96,9 +94,6 @@ define Package/evoice/install
 	$(CP) ./files/* $(1)/
 	$(if $(TONES_INI_REQUIRED),,$(RM) $(1)/etc/evoice/tones.ini)
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(1)/lib/voice/$(JSONFILE) $(1)/lib/voice/codecs_evoice.json
-	$(RM) $(1)/lib/voice/codecs_brcm.json
-	$(RM) $(1)/lib/voice/codecs_airoha.json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/

evoice/files/etc/config/voice

@@ -39,33 +39,66 @@ config SIPNetwork 'Network1'
 	list CodecList '1CodecProfile5'
 	list CodecList '1CodecProfile4'
 
+config Capabilities 'Capabilities'
+	option FacilityActions 'CW_ACTIVE,CFU_ACTIVE'
+
+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'
+
 config CodecProfile '1CodecProfile1'
 	option Enable '1'
-	option Codec 'G.711ALaw'
+	option Codec 'Codec1'
 	option PacketizationPeriod '20'
 	option SilenceSupression '1'
 
 config CodecProfile '1CodecProfile2'
 	option Enable '1'
-	option Codec 'G.711MuLaw'
+	option Codec 'Codec2'
 	option PacketizationPeriod '20'
 	option SilenceSupression '1'
 
 config CodecProfile '1CodecProfile3'
 	option Enable '1'
-	option Codec 'G.726'
+	option Codec 'Codec3'
 	option PacketizationPeriod '20'
 	option SilenceSupression '0'
 
 config CodecProfile '1CodecProfile4'
 	option Enable '1'
-	option Codec 'G.722'
+	option Codec 'Codec4'
 	option PacketizationPeriod '20'
 	option SilenceSupression '0'
 
 config CodecProfile '1CodecProfile5'
 	option Enable '1'
-	option Codec 'G.729'
+	option Codec 'Codec5'
 	option PacketizationPeriod '20'
 	option SilenceSupression '0'
 
@@ -131,7 +164,7 @@ config IncomingMap 'IncomingMap2'
 	option Line 'Line2'
 
 config IncomingMap 'IncomingMap3'
-	option Enable '0'
+	option Enable '1'
 	option Extension 'Extension2'
 	option Line 'Line1'
 
@@ -204,15 +237,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'
@@ -220,9 +253,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'
@@ -232,7 +265,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'
@@ -242,7 +275,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'
@@ -252,7 +285,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'
@@ -262,7 +295,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'
@@ -272,7 +305,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'
@@ -282,7 +315,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'
@@ -292,7 +325,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'
@@ -302,7 +335,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'
@@ -312,7 +345,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/voicedm

@@ -74,13 +74,6 @@ config codecs 'map_codec'
    option ptime 'voice.CodecProfile@.PacketizationPeriod'
    option dtx 'voice.CodecProfile@.SilenceSupression'
 
-config fxsinfo 'map_fxs'
-   option Enable 'voice.FXS@.Enable'
-   option DialType 'voice.FXS@.DialType'
-   option TransmitGain 'voice.FXS@.TransmitGain'
-   option ReceiveGain  'voice.FXS@.ReceiveGain'
-   option EchoCancellationEnable 'voice.FXS@.EchoCancellationEnable'
-
 config extensioninfo 'map_ext'
    option Enable 'voice.Extension@.Enable'
    option Internal_Number_Phone 'voice.Extension@.ExtensionNumber'

evoice/files/etc/init.d/evoice

@@ -10,12 +10,6 @@ VOICE_UCI_CONFIG=voice
 start_service() {
 	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
 
-
-	which endptmngr >/dev/null 2>&1 && {
-		echo "evoice can't be started since endptmngr is installed. Please remove endptmngr and retry"
-		return
-	}
-
 	procd_open_instance
 	procd_set_param command $NAME
 	procd_set_param respawn "5" "0" "3"

evoice/files/lib/voice/codecs_airoha.json

@@ -1,28 +0,0 @@
-{
-        "G.711ALaw": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        },
-        "G.711MuLaw": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        },
-        "G.726": {
-                "BitRate": 32000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        },
-        "G.729": {
-                "BitRate": 8000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        },
-        "G.722": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "20",
-                "SilenceSuppression": 0
-        }
-}
-

evoice/files/lib/voice/codecs_brcm.json

@@ -1,28 +0,0 @@
-{
-        "G.711ALaw": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        },
-        "G.711MuLaw": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        },
-        "G.726": {
-                "BitRate": 32000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        },
-        "G.729": {
-                "BitRate": 8000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        },
-        "G.722": {
-                "BitRate": 64000,
-                "PacketizationPeriod": "30",
-                "SilenceSuppression": 1
-        }
-}
-

fdtextract/Makefile

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

gryphon-led-module/Makefile

@@ -44,15 +44,7 @@ MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
-	# This assumes that the MODULES_SUBDIR set by OpenWrt is of the form
-	# lib/modules/4.19.235-abcdef where 4.19.235 is the version of our fake bcmlinux kernel
-	# and abcdef the git-commit.
-	# The kernel compiled by the Broadcom SDK has a uname -r of 4.19.235, i.e. without the git-commit.
-	# The assignment below removes the part after the - which puts modules in the right directory as
-	# long as the bcmlinux version matches the kernel version in the BCM SDK.
-	# So, this will only stop working in the time window where the BCM SDK has been updated
-	# but bcmlinux has not yet been updated.
-	MODULES_SUBDIR:=$(firstword $(subst -, ,$(MODULES_SUBDIR)))
+	MODULES_SUBDIR:=lib/modules/4.19.225
 	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"))

icwmp/Config_cwmp.in

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

icwmp/Makefile

@@ -1,28 +1,34 @@
 #
 # Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
-# This is free software, licensed under the BSD-3-Clause
+# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.0.3
+PKG_VERSION:=8.4.21
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=304db5eb064d89cf4e4df0bb81fa22b88933d602
+PKG_SOURCE_VERSION:=62a5eab3a495b07a4f714d608e7428354cdaad36
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
-PKG_LICENSE:=BSD-3-Clause
+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,25 @@ define Package/icwmp-mbedtls
 endef
 
 ifeq ($(BUILD_VARIANT),openssl)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+CONFIGURE_ARGS += --enable-libopenssl
 endif
 
 ifeq ($(BUILD_VARIANT),wolfssl)
-CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+CONFIGURE_ARGS += --enable-libwolfssl
 endif
 
 ifeq ($(BUILD_VARIANT),mbedtls)
-CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+CONFIGURE_ARGS += --enable-libmbedtls
+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
 
 USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
@@ -98,6 +128,7 @@ 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/config/cwmp

@@ -17,7 +17,6 @@ config acs 'acs'
 config cpe 'cpe'
 	option enable '1'
 	option default_wan_interface 'wan'
-	option default_lan_interface 'lan'
 	option log_to_console 'disable'
 	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
@@ -32,7 +31,7 @@ config cpe 'cpe'
 	option amd_version '5'
 	# compression possible configs: InstanceNumber, InstanceAlias
 	option instance_mode 'InstanceNumber'
-	option session_timeout '300'
+	option session_timeout '60'
 	option notification '1'
 	option exec_download '0'
 	option periodic_notify_enable '1'

icwmp/files/etc/icwmpd/update.sh

@@ -1,27 +1,104 @@
 #!/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 bootup_start
 
-	config_get_bool cwmp_enable cpe enable 1
-	if [ "$cwmp_enable" = "0" ]; then
+	bootup_start="${1:-0}"
+	update="0"
+	defwan="$(uci -q get cwmp.cpe.default_wan_interface)"
+	vendorspecinf="$(ifstatus "${defwan}" | jsonfilter -e "@.data.vendorspecinf")"
+
+	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
+	}
+
+	if [ "${bootup_start}" -eq "1" ]; then
+		# if called at boot up then no need to reload the service, since it will start after
+		uci commit cwmp
 		return 0
 	fi
 
-	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
+	# 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" ] || [ "$status" = "" ]; 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
+			fi
 		fi
 	fi
 }

icwmp/files/etc/init.d/icwmpd

@@ -71,206 +71,6 @@ enable_dhcp_option43() {
 	fi
 }
 
-convert_to_hex() {
-	local val=""
-	local optval="${1}"
-	OPTIND=1
-	while getopts ":" opt "-$optval"
-	do
-		temp=$(printf "%X" "'${OPTARG:-:}")
-		val="${val}:${temp}"
-	done
-
-	echo "${val}"
-}
-
-configure_send_op125() {
-	local sendopt="${1}"
-	local intf="${2}"
-	local uci="${3}"
-	local hex_oui=""
-	local hex_serial=""
-	local hex_class=""
-	local oui_len=0
-	local serial_len=0
-	local class_len=0
-
-	if [ "${uci}" = "network" ]; then
-		local opt125="125:00:00:0D:E9"
-	else
-		local opt125="125,00:00:0D:E9"
-	fi
-
-	config_get oui cpe manufacturer_oui ""
-	if [ -z "${oui}" ]; then
-		oui=$(db -q get device.deviceinfo.ManufacturerOUI)
-	fi
-
-	oui=$(echo "${oui}" | tr 'a-f' 'A-F')
-
-	config_get serial cpe serial_number ""
-	if [ -z "${serial}" ]; then
-		serial=$(db -q get device.deviceinfo.SerialNumber)
-	fi
-
-	config_get class cpe product_class ""
-	if [ -z "${class}" ]; then
-		class=$(db -q get device.deviceinfo.ProductClass)
-	fi
-
-	oui_len=$(echo -n "${oui}" | wc -m)
-	serial_len=$(echo -n "${serial}" | wc -m)
-	class_len=$(echo -n "${class}" | wc -m)
-
-	if [ ${oui_len} -eq 0 ] || [ ${serial_len} -eq 0 ]; then
-		return 0
-	fi
-
-	opt125_len=$((oui_len + serial_len + class_len))
-	if [ ${class_len} -gt 0 ]; then
-		opt125_len=$((opt125_len + 6))
-	else
-		opt125_len=$((opt125_len + 4))
-	fi
-
-	hex_opt125_len=$(printf "%X" "${opt125_len}")
-	opt125="${opt125}:${hex_opt125_len}"
-	hex_oui=$(convert_to_hex "${oui}")
-	if [ -z "${hex_oui}" ]; then
-		return 0
-	fi
-
-	hex_oui_len=$(printf "%X" "${oui_len}")
-	if [ "${uci}" = "network" ]; then
-		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
-	else
-		opt125="${opt125}:04:${hex_oui_len}${hex_oui}"
-	fi
-
-	hex_serial=$(convert_to_hex "${serial}")
-	if [ -z "${hex_serial}" ]; then
-		return 0
-	fi
-
-	hex_serial_len=$(printf "%X" "${serial_len}")
-	if [ "${uci}" = "network" ]; then
-		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
-	else
-		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
-	fi
-
-	if [ ${class_len} -gt 0 ]; then
-		hex_class=$(convert_to_hex "${class}")
-		if [ -z "${hex_class}" ]; then
-			return 0
-		fi
-
-		hex_class_len=$(printf "%X" "${class_len}")
-		if [ "${uci}" = "network" ]; then
-			opt125="${opt125}:03:${hex_class_len}${hex_class}"
-		else
-			opt125="${opt125}:06:${hex_class_len}${hex_class}"
-		fi
-	fi
-
-
-	if [ "${uci}" = "network" ]; then
-		new_send_opt="$sendopt $opt125"
-		uci -q set network.$intf.sendopts="$new_send_opt"
-	else
-		uci -q add_list dhcp.$intf.dhcp_option="$opt125"
-	fi
-}
-
-enable_dnsmasq_option125() {
-	local lan="${1}"
-	local send125_present=0
-	local opt125="125,"
-
-	local proto="$(uci -q get dhcp.$lan.dhcpv4)"
-	if [ "${proto}" = "server" ]; then
-		opt_list="$(uci -q get dhcp.$lan.dhcp_option)"
-
-		for sopt in $opt_list; do
-			if [[ "$sopt" == "$opt125"* ]]; then
-				send125_present=1
-				break
-			fi
-		done
-
-		if [ ${send125_present} -eq 0 ]; then
-			configure_send_op125 "" "${lan}" "dhcp"
-			ubus call uci commit '{"config":"dhcp"}'
-		fi
-	fi
-}
-
-enable_disable_dhcp_option125() {
-	local wan="${1}"
-	local action="${2}"
-
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local sendopts="$(uci -q get network.$wan.sendopts)"
-	local proto="$(uci -q get network.$wan.proto)"
-	local newreqopts=""
-	local newsendopts=""
-	local req125_present=0
-	local send125_present=0
-	local network_uci_update=0
-	local opt125="125:"
-
-	for ropt in $reqopts; do
-		case $ropt in
-			125) req125_present=1 ;;
-			*) ;;
-		esac
-	done
-
-	for sopt in $sendopts; do
-		if [[ "$sopt" == "$opt125"* ]]; then
-			send125_present=1
-			break
-		fi
-	done
-
-	if [ "${proto}" == "dhcp" ]; then
-		if [ "${action}" == "enable" ]; then
-			if [ ${req125_present} -eq 0 ]; then
-				newreqopts="$reqopts 125"
-				uci -q set network.$wan.reqopts="$newreqopts"
-				network_uci_update=1
-			fi
-
-			if [ ${send125_present} -eq 0 ]; then
-				configure_send_op125 "${sendopts}" "${wan}" "network"
-				network_uci_update=1
-			fi
-		else
-			if [ ${req125_present} -eq 1 ]; then
-				newreqopts=$(echo ${reqopts/125/})
-				uci -q set network.$wan.reqopts="$newreqopts"
-				network_uci_update=1
-			fi
-
-			if [ ${send125_present} -eq 1 ]; then
-				for sopt in $sendopts; do
-					if [[ "$sopt" == "$opt125"* ]]; then
-						newsendopts=$(echo ${sendopts/"${sopt}"/})
-						uci -q set network.$wan.sendopts="$newreqopts"
-						network_uci_update=1
-						break
-					fi
-				done
-			fi
-		fi
-	fi
-
-	if [ ${network_uci_update} -eq 1 ]; then
-		uci commit network
-		ubus call network reload
-	fi
-}
-
 wait_for_resolvfile() {
 	local time=$1
 	local tm=1
@@ -373,13 +173,10 @@ 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
 
@@ -397,20 +194,11 @@ boot() {
 	config_load cwmp
 	config_get dhcp_discovery acs dhcp_discovery "0"
 
-	config_get wan_interface cpe default_wan_interface "wan"
 	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 lan_interface cpe default_lan_interface ""
-	if [ -n "${lan_interface}" ]; then
-		# Set dhcp_option 125 if not already configured
-		enable_disable_dhcp_option125 "${wan_interface}" "enable"
-		enable_dnsmasq_option125 "${lan_interface}"
-	else
-		# Remove dhcp option 125 if exists
-		enable_disable_dhcp_option125 "${wan_interface}" "disable"
+		/etc/icwmpd/update.sh 1
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -424,11 +212,14 @@ boot() {
 
 start_service() {
 	local enable_cwmp
+	local wan_interface
 
 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
+	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
 
@@ -461,26 +252,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
-		start
-		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

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/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.7
+PKG_VERSION:=4.9.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b50f79061a95840d89a6129aa0a95aff82b5a1b7
+PKG_SOURCE_VERSION:=a8f98ec5532310eb4e0313bb9037b5cd292d34a4
 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/config/ieee1905

@@ -2,7 +2,7 @@ config ieee1905 'ieee1905'
 	option enabled '1'
 	option extension '1'
 	list extmodule 'map'
-	option registrar '2 5 6'
+	option registrar '2 5'
 #	option macaddress '0a:1b:2c:3d:4e:50'
 
 config al-iface
@@ -24,9 +24,3 @@ config ap
 	option encryption 'sae-mixed'
 	option key '1234567890'
 
-config ap
-	option band '6'
-	option ssid 'IOWRT-6GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
-

ieee1905/files/etc/init.d/ieee1905

@@ -42,7 +42,7 @@ validate_ap_section() {
 	local section="$1"
 
 	uci_validate_section ieee1905 $section "${1}" \
-			'band:or("2", "5", "60", "6")' \
+			'band:or("2", "5", "60")' \
 			'ssid:string' \
 			'encryption:or("psk2", "sae-mixed", "sae", string)' \
 			'key:string' \

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
-

iop/config

@@ -50,8 +50,6 @@ CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
-CONFIG_PACKAGE_map-agent=m
-CONFIG_PACKAGE_map-controller=m
 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

@@ -36,17 +36,6 @@ function feeds_update {
 		./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
 

iop/scripts/genconfig.sh

@@ -13,12 +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"
-	mediatek="target/linux/feeds/iopsys-mediatek"
+	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
@@ -84,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
 
@@ -118,11 +117,9 @@ function genconfig {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -170,14 +167,6 @@ function genconfig {
 		    return
 		fi
 	    done
-
-	    for p in $iopsys_mediatek; do
-		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
-		    return
-		fi
-	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -330,25 +319,20 @@ function genconfig {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES 
-		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
-			if [ -z "$mk_file" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			local subtarget="$(basename "${mk_file%.mk}")"
+		if [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			;;
-		*)
+		elif [ "$target" = "iopsys_econet" ]; then
+			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
-			;;
-		esac
+		fi
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

iop/scripts/genconfig_min.sh

@@ -12,12 +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"
-	mediatek="target/linux/feeds/iopsys-mediatek"
+	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 +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
 
@@ -117,11 +116,9 @@ function genconfig_min {
 			iopsys_x86=$(cd $x86; ./genconfig)
 		[ -e $armvirt/genconfig ] &&
 			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
+			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -169,14 +166,6 @@ function genconfig_min {
 		    return
 		fi
 	    done
-
-	    for p in $iopsys_mediatek; do
-		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
-		    return
-		fi
-	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -321,25 +310,20 @@ function genconfig_min {
 		fi
 
 		# Special handling for targets which use TARGET_DEVICES
-		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
-			# This assumes the device name to be unique within one target,
-			# which is a fair assumption to make.
-			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
-			if [ -z "$mk_file" ]; then
-				echo "Error determining subtarget for $target / ${BOARDTYPE}"
-				return 1
-			fi
-			local subtarget="$(basename "${mk_file%.mk}")"
+		if [ "$target" = "iopsys_ramips" ]; then
+			subtarget="mt7621"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
-			;;
-		*)
+		elif [ "$target" = "iopsys_econet" ]; then
+			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
-			;;
-		esac
+		fi
 
 		echo "$CUSTOMERS $BOARDTYPE" > $CURRENT_CONFIG_FILE
 

iop/scripts/iopupgrade.sh

@@ -1,282 +1,344 @@
 # this is a developer helper script to install firmware on a remote host with SSH
 
 function upd_usage {
-	echo "usage: $0 ssh_upgrade [-t <host>] [-f <file>] [opts] "
-	echo ""
-	echo "   Default host is 192.168.1.1"
-	echo "   Default firmware file is the latest one (last.{itb,pkgtb})"
-	echo "   Default is to not keep configuration"
-	echo "opts:"
-	echo ""
-	echo "	-i	Interactive use, allows to select firmware file"
-	echo "	-n	Do not do the final reboot of the target board"
-	echo "	-c	Keep configuration"
-	echo "	-x	Force install even if firmware is not for this board"
-	echo "	-b	Force install of bootloader regardless of version installed"
+    echo "usage: $0 iopupgrade -t <host> -f <file> [opts] "
+    echo ""
+    echo "   Default host is 192.168.1.1"
+    echo "   Default firmware file is the newest one found"
+    echo "   Default is to not keep configuration"
+    echo "opts:"
+    echo ""
+    echo "	-i	Interactive use, Allows to select firmware file"
+    echo "	-n	Do not do the final reboot of the target board"
+    echo "	-c	Keep configuration"
+    echo "	-x	Force install even if firmware is not for this board"
+    echo "	-b	Force install of bootloader regardless of version installed"
+    echo "	-s	Use sysupgade. old upgrade method, needed for old releases that do not have iopu"
 }
 
 function set_config_string {
-	eval $(grep $1 .config)
+    eval `grep $1 .config`
 }
 
 function upd_ask_ok {
-	echo "Will continue with the following settings:"
-	echo "-----------------------------------------"
-	printf "%20s: %s\n" "Firmware file" "$upd_fw_base"
-	printf "%20s: %s\n" "Host IP" "$upd_host"
-	printf "%20s: " "Reboot"
-	if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Keep config"
-	if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force bootloader"
-	if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	printf "%20s: " "Force image upgrade"
-	if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi
-	echo "-----------------------------------------"
+    echo "Will Continue with the following settings"
+    echo "-----------------------------------------"
+    printf "%20s: %s\n"  "Firmare file" "$upd_fw_base"
+    printf "%20s: %s\n"  "Host ip" "$upd_host"
+    printf "%20s: " "Reboot";               if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Keep config";          if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Force bootloader";     if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Force image upgrade";  if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    printf "%20s: " "Use sysupgrade";       if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi
+    echo "-----------------------------------------"
 
-	echo -n "Continue? [Y/n/q]:"
-	read answer
+    if [ "$upd_sysupgrade" == "0" ]
+       then
+	   if [ "$upd_keepconf"   == "1" ] ;then echo "keeping config is just a fantasy it's not yet implemented, try sysupgrade";fi
+    fi
 
-	case $answer in
-	n | N)
-		return 1
-		;;
-	q | Q)
-		exit 1
-		;;
-	y | Y | *)
-		return 0
-		;;
-	esac
+    echo -n "Continue? [Y/n/q]:"
+    read answer
+
+    case $answer in
+	n|N)
+	    return 1;;
+	q|Q)
+	    exit 1;;
+	y|Y|*)
+	    return 0;;
+    esac
 }
 
 function upd_select_file {
-	dialog --keep-tite --title "To select a file, use TAB/ARROW to highlight then press SPACEBAR -> RETURN" \
-		--fselect "${upd_fw:-bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/}" \
-		$((lines - 10)) $((cols - 5)) \
-		2>$tempfile
 
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_fw="$new_file"
-		upd_fw_base=$(basename $upd_fw)
-	fi
+    dialog --keep-tite --title "To select file use TAB/ARROW to hilight then press SPACEBAR -> RETURN" \
+	   --fselect "bin/targets/$CONFIG_TARGET_BOARD/generic/" \
+	   $((lines -10)) $((cols -5)) \
+	   2> $tempfile
+
+    new_file=$(cat $tempfile)
+    if [ -n "$new_file" ]
+    then
+	upd_fw="$new_file"
+	upd_fw_base=$(basename $upd_fw);
+    fi
 }
 
 function upd_select_target {
-	dialog --keep-tite --title "Input the hostname/IP of the target board" \
-		--inputbox "Name/IP" \
-		$((lines - 10)) $((cols - 5)) \
-		"$upd_host" \
-		2>$tempfile
 
-	new_file=$(cat $tempfile)
-	if [ -n "$new_file" ]; then
-		upd_host="$new_file"
-	fi
+    dialog --keep-tite --title "Input the name/ip number of target board" \
+	   --inputbox "Name/IP" \
+	   $((lines -10)) $((cols -5)) \
+	   "$upd_host" \
+	   2> $tempfile
+
+    new_file=$(cat $tempfile)
+    if [ -n "$new_file" ]
+    then
+	upd_host="$new_file"
+    fi
 }
 
-function upd_select_reboot {
-	dialog --keep-tite --radiolist "Should the board reboot after download finished" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Reboot" "Restart board after done" $(if [ "$upd_noreboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		"No reboot" "Continue running old system" $(if [ "$upd_noreboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
 
-	res=$(cat $tempfile)
-	case $res in
+function upd_select_reboot {
+    dialog --keep-tite --radiolist "Should the board reboot after download finished" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Reboot" "Restart board after done"       `if [ "$upd_noreboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "No reboot" "Continue running old system" `if [ "$upd_noreboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
+
+    res=$(cat $tempfile)
+    case $res in
 	"No reboot")
-		upd_noreboot=1
-		;;
+	    upd_noreboot=1
+	;;
 	"Reboot")
-		upd_noreboot=0
-		;;
-	esac
+	    upd_noreboot=0
+	    ;;
+    esac
 }
 
 function upd_select_config {
-	dialog --keep-tite --radiolist "Should the configuration be kept" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Keep" "Keep the config from old system" $(if [ "$upd_keepconf" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Default" "Use default config for new system" $(if [ "$upd_keepconf" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
+    dialog --keep-tite --radiolist "Should the configuration be keept" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Keep" "Keep the config from old system"      `if [ "$upd_keepconf" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "Default" "Use default config for new system" `if [ "$upd_keepconf" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
 
-	res=$(cat $tempfile)
-	case $res in
+    res=$(cat $tempfile)
+    case $res in
 	"Keep")
-		upd_keepconf=1
-		;;
+	    upd_keepconf=1
+	    ;;
 	"Default")
-		upd_keepconf=0
-		;;
-	esac
+	    upd_keepconf=0
+	    ;;
+    esac
 }
 
 function upd_select_forceboot {
-	dialog --keep-tite --radiolist "Should the boot loader be updated regardless of the version installed" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Always update boot loader" $(if [ "$upd_forceboot" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Version check" "Only upgrade if version is newer" $(if [ "$upd_forceboot" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
+    dialog --keep-tite --radiolist "Should the boot loader be updated reagardless of version installed" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Force" "Alwasy update boot loader"                `if [ "$upd_forceboot" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "Version check" "Only upgrade if version is newer" `if [ "$upd_forceboot" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
 
-	res=$(cat $tempfile)
-	case $res in
+    res=$(cat $tempfile)
+    case $res in
 	"Force")
-		upd_forceboot=1
-		;;
+	    upd_forceboot=1
+	    ;;
 	"Version check")
-		upd_forceboot=0
-		;;
-	esac
+	    upd_forceboot=0
+	    ;;
+    esac
 }
 
 function upd_select_forceimage {
-	dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Force" "Disable sanity check and force use of image (dangerous)" $(if [ "$upd_forceimage" == "1" ]; then echo "ON"; else echo "OFF"; fi) \
-		"Only compatible" "Normal checks apply" $(if [ "$upd_forceimage" == "0" ]; then echo "ON"; else echo "OFF"; fi) \
-		2>$tempfile
+    dialog --keep-tite --radiolist "Should the image be stored in flash even if sanity checks would reject it" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Force" "Dissable sanity check and force use of image (dangerous)" `if [ "$upd_forceimage" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "Only compatible" "Normal checks apply"                            `if [ "$upd_forceimage" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
 
-	res=$(cat $tempfile)
-	case $res in
+    res=$(cat $tempfile)
+    case $res in
 	"Force")
-		upd_forceimage=1
-		;;
+	    upd_forceimage=1
+	    ;;
 	"Only compatible")
-		upd_forceimage=0
-		;;
-	esac
+	    upd_forceimage=0
+	    ;;
+    esac
+}
+
+function upd_select_sysupgrade {
+    dialog --keep-tite --radiolist "Use the old way to upgrade a board" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "iopu" "Use the iop upgrade methode"          `if [ "$upd_sysupgrade" == "0" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   "sysupgrade" "Use the old sysupgrade methode" `if [ "$upd_sysupgrade" == "1" ] ;then echo "ON" ;else echo "OFF";fi` \
+	   2> $tempfile
+
+    res=$(cat $tempfile)
+    case $res in
+	"iopu")
+	    upd_sysupgrade=0
+	    ;;
+	"sysupgrade")
+	    upd_sysupgrade=1
+	    ;;
+    esac
 }
 
 function upd_select {
-	dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select item to change" \
-		$((lines - 5)) $((cols - 5)) $((lines - 5 - 5)) \
-		"Firmware file" "$upd_fw_base" \
-		"Host IP" "$upd_host" \
-		"Reboot" $(if [ "$upd_noreboot" == "0" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Keep config" $(if [ "$upd_keepconf" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force bootloader" $(if [ "$upd_forceboot" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		"Force image upgrade" $(if [ "$upd_forceimage" == "1" ]; then printf "Yes\n"; else printf "No\n"; fi) \
-		2>$tempfile
 
-	case $(cat $tempfile) in
-	"Firmware file")
-		upd_select_file
-		;;
-	"Host IP")
-		upd_select_target
-		;;
+    dialog --keep-tite --ok-label "Select" --cancel-label "Done" --menu "Select Item to change" \
+	   $((lines -5)) $((cols -5)) $((lines -5 -5)) \
+	   "Firmare file" "$upd_fw_base"\
+	   "Host ip" "$upd_host" \
+	   "Reboot"               `if [ "$upd_noreboot"   == "0" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "Keep config"          `if [ "$upd_keepconf"   == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "Force bootloader"     `if [ "$upd_forceboot"  == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "Force image upgrade"  `if [ "$upd_forceimage" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   "sysupgrade"           `if [ "$upd_sysupgrade" == "1" ] ;then printf "Yes\n" ;else printf "No\n";fi` \
+	   2> $tempfile
+
+
+    case $(cat $tempfile) in
+	"Firmare file")
+	    upd_select_file
+	    ;;
+	"Host ip")
+	    upd_select_target
+	    ;;
 	"Reboot")
-		upd_select_reboot
-		;;
+	    upd_select_reboot
+	    ;;
 	"Keep config")
-		upd_select_config
-		;;
+	    upd_select_config
+	    ;;
 	"Force bootloader")
-		upd_select_forceboot
-		;;
+	    upd_select_forceboot
+	    ;;
 	"Force image upgrade")
-		upd_select_forceimage
-		;;
+	    upd_select_forceimage
+	    ;;
+	"sysupgrade")
+	    upd_select_sysupgrade
+	    ;;
 	*)
-		return
-		;;
-	esac
-	upd_select
+	    return
+	;;
+    esac
+    upd_select
 }
 function upd_select_start {
-	lines=$(tput lines)
-	cols=$(tput cols)
-	tempfile="$(mktemp)"
-	trap "rm -f $tempfile" 0 1 2 5 15
-	upd_select
+    lines=$(tput lines)
+    cols=$(tput cols)
+    tempfile=`tempfile 2>/dev/null` || tempfile=/tmp/test$$
+    trap "rm -f $tempfile" 0 1 2 5 15
+    upd_select
 
 }
 
 function ssh_upgrade {
-	upd_noreboot=0
-	upd_forceboot=0
-	upd_keepconf=0
-	upd_forceimage=0
-	upd_fw_base=""
-	upd_fw=""
-	upd_host="192.168.1.1"
-	do_dialog=0
+    upd_noreboot=0
+    upd_forceboot=0
+    upd_keepconf=0
+    upd_forceimage=0
+    upd_fw_base=""
+    upd_fw=""
+    upd_host="192.168.1.1"
+    upd_sysupgrade=1
+    do_dialog=0
 
-	while getopts "f:hnxt:icb" opt; do
-		case $opt in
-		n)
-			upd_noreboot=1
-			;;
-		x)
-			upd_forceimage=1
-			;;
-		b)
-			upd_forceboot=1
-			;;
-		c)
-			upd_keepconf=1
-			;;
-		v)
-			verbose=$OPTARG
-			;;
-		f)
-			upd_fw=$OPTARG
-			;;
-		t)
-			upd_host=$OPTARG
-			;;
-		i)
-			do_dialog=1
-			;;
-		h)
-			upd_usage
-			exit 1
-			;;
-		\?)
-			echo "Invalid option: -$OPTARG" >&2
-			exit 1
-			;;
-		esac
-	done
-
-	if [ -z "$upd_fw" ]; then
-		set_config_string CONFIG_TARGET_BOARD
-		set_config_string CONFIG_TARGET_SUBTARGET
-		upd_fw="$(realpath -q --canonicalize-existing --relative-to=. "bin/targets/$CONFIG_TARGET_BOARD/$CONFIG_TARGET_SUBTARGET/"last.{pkgtb,itb})"
-		if [ -z "$upd_fw" ] && [ $do_dialog -eq 0 ]; then
-			echo "Could not find image. Check that last.{itb,pkgtb} exists or specify an image using -f <image> or -i (interactive)." >&2
-			return 1
-		fi
-	fi
-	upd_fw_base="$(basename "$upd_fw")"
-
-	[ $do_dialog -eq 1 ] && upd_select_start
-
-	if ! upd_ask_ok; then
-		upd_select_start
-		if ! upd_ask_ok; then
-			exit 1
-		fi
-	fi
-
-	if [ ! -f $upd_fw ]; then
-		echo "Firmware file $firmware does not exist."
+    while getopts "f:hnxt:iscb" opt; do
+	case $opt in
+	    n)
+		upd_noreboot=1
+		;;
+	    x)
+		upd_forceimage=1
+		;;
+	    b)
+		upd_forceboot=1
+		;;
+	    c)
+		upd_keepconf=1
+		;;
+	    v)
+		verbose=$OPTARG
+		;;
+	    f)
+		upd_fw=$OPTARG
+		;;
+	    t)
+		upd_host=$OPTARG
+		;;
+	    i)
+		do_dialog=1
+		;;
+	    s)
+		upd_sysupgrade=1
+		;;
+	    h)
+		upd_usage
 		exit 1
+		;;
+	    \?)
+		echo "Invalid option: -$OPTARG" >&2
+		exit 1
+		;;
+	esac
+    done
+
+    if [ -n "$upd_fw" ]
+    then
+	upd_fw_base=$(basename $upd_fw);
+    else
+	set_config_string CONFIG_TARGET_BOARD
+	firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t *[0-9].y[3])
+
+	# if target uses pkgtb
+	if [ -z "$firmwares"]
+	then
+	    # pkgtb files can not be streamed so copy over the file witch scp
+	    use_scp=1
+	    firmwares=$(cd bin/targets/$CONFIG_TARGET_BOARD/generic/; ls -t last.pkgtb)
 	fi
 
-	extra_args=""
-	[ $upd_noreboot -eq 1 ] && extra_args="$extra_args --no-reboot"
-	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args --force"
-	[ $upd_keepconf -eq 0 ] && extra_args="$extra_args -n"
-	[ $upd_forceboot -eq 1 ] && extra_args="$extra_args --force-loader-upgrade"
+	for upd_fw_base in $firmwares
+	do
+	    #echo "firmware $upd_fw"
+	    break
+	done
+	upd_fw="bin/targets/$CONFIG_TARGET_BOARD/generic/$upd_fw_base"
+    fi
 
-	pv "$upd_fw" |
-		ssh \
-			-o ConnectTimeout=60 \
-			root@"$upd_host" \
-			sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" ||
-		echo "Sysupgrade failed" >&2 && return 1
+    [ $do_dialog -eq 1 ] && upd_select_start
+
+    if ! upd_ask_ok
+    then
+	upd_select_start
+	if ! upd_ask_ok
+	then
+	    exit 1
+	fi
+    fi
+
+    if [ ! -f $upd_fw ]
+    then
+	echo "firmware file $firmware do not exist"
+	exit 1
+    fi
+
+    if [ $upd_sysupgrade -eq 0 ]
+    then
+	extra_args=""
+	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -n"
+	[ $upd_forceimage -eq 1 ] && extra_args="$extra_args -x"
+	[ $upd_forceboot  -eq 1 ] && extra_args="$extra_args -b"
+
+	file_size_kb=`du -k "$upd_fw" | cut -f1`
+	if [ "$use_scp" == "1" ]
+	then
+	    scp $upd_fw root@$upd_host:/tmp/ &&
+		ssh -o ConnectTimeout=60 root@$upd_host "iopu $extra_arg -f /tmp/$upd_fw_base"
+	else
+	    cat $upd_fw | pv -s ${file_size_kb}k | ssh root@$upd_host "iopu $extra_args"
+	fi
+    else
+	extra_args=""
+	[ $upd_noreboot   -eq 1 ] && extra_args="$extra_args -d"
+	[ $upd_keepconf   -eq 0 ] && extra_args="$extra_args -n"
+
+	scp $upd_fw root@$upd_host:/tmp/ &&
+	    ssh -o ConnectTimeout=60 root@$upd_host "sysupgrade -v $extra_args /tmp/$upd_fw_base" &&
+	    echo "sysupgrade done!"
+    fi
 }
 
 register_command "ssh_upgrade" "-h <host> -f <file> [opts]  Install firmware on remote host with SSH"
+
+

map-agent/Config.in

@@ -13,22 +13,5 @@ config AGENT_ISLAND_PREVENTION
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
-
-config AGENT_EASYMESH_VENDOR_EXT
-	bool "Enable extra features through Easymesh vendor extension"
-	default y
-
-config AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	string
-	default "\\\\x11\\\\x22\\\\x33"
-
-config AGENT_EASYMESH_VENDOR_EXT_OUI
-	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
-	default AGENT_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	help
-	Extra features not covered by the base Easymesh specification can be
-	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
-	through which such features would be exposed.
-
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.3.14
+PKG_VERSION:=2.9.0.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=449eb907b121b7224cbfedcf51246e438f2b30d6
+PKG_SOURCE_VERSION:=c3887ca931d4e7fb6f773b4d71b4e6164f9f0372
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -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)
@@ -71,11 +70,6 @@ ifeq ($(CONFIG_AGENT_EASYMESH_R2_CERT),y)
 TARGET_CFLAGS += -DEASYMESH_R2_CERT
 endif
 
-ifeq ($(CONFIG_AGENT_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_AGENT_EASYMESH_VENDOR_EXT_OUI)\\\"
-endif
-
-
 MAKE_PATH:=src
 
 define Package/map-agent/install
@@ -83,8 +77,6 @@ define Package/map-agent/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/lib/wifi
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/script/* $(1)/lib/wifi/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mapagent $(1)/usr/sbin/
 endef
 

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

@@ -215,10 +215,6 @@ validate_agent_config() {
 	return 0
 }
 
-create_dir() {
-        mkdir -p /var/run/multiap
-}
-
 start_service() {
 	[ -f /usr/sbin/dynbhd ] && start_dynbhd_service
 
@@ -238,7 +234,6 @@ start_service() {
 	[ "$ts" -eq 1 ] && create_map #|| remove_map
 
 	procd_open_instance
-	create_dir
 	procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
 #	procd_set_param stdout 1

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

@@ -0,0 +1,920 @@
+#!/bin/sh
+
+# functions
+# wireless_teardown - tear down ifaces based on mapagent config
+# setup_network     - prepare /etc/config/network if necessary
+# setup_wireless    - prepare /etc/config/wireless based on mapagent config
+# write_credentials - write bBSS credentials to fBSS
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+. /lib/wifi/traffic_separation
+
+MAPFILE="/tmp/multiap.backhaul"
+
+diff=0
+onbrd_bssid=0
+onbrd_band=0
+
+usage() {
+	cat <<EOF
+Usage: $0 [wireless_teardown|setup_network|setup_wireless|write_credentials]
+Platform specific Multi-AP script to prepare network and wifi subsystem based on
+mapagent configuration.
+wireless_teardown - tear down ifaces in /etc/config/wireless
+setup_network     - prepare /etc/config/network
+setup_wireless    - prepare /etc/config/wireless
+write_credentials - write bBSS credentials to fBSS
+EOF
+	exit 1
+}
+
+
+type_to_multi_ap () {
+	type="$1"
+
+	if [ "$type" = "backhaul" ]; then
+		echo "1"
+		return
+	elif [ "$type" = "fronthaul" ]; then
+		echo "2"
+		return
+	elif [ "$type" = "combined" ]; then
+		echo "3"
+		return
+	fi
+
+	echo "0"
+}
+
+get_type_by_section() {
+	section="$1"
+
+	config_get type $section type "0"
+
+	echo "$(type_to_multi_ap $type)"
+}
+
+sync_credentials() {
+	bands=""
+	json_init
+	mapagent_process_fh() {
+		local section=$1
+		local dev=$2
+
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
+		config_get device $section device
+
+		[ "$dev" != "$device" ] && return
+
+		config_get band $section band
+		config_get ssid $section ssid
+		config_get encryption $section encryption
+		config_get key $section key
+
+		section=$(uci add ieee1905 ap)
+		[ "$section" == "" ] && return
+
+		uci -q set ieee1905.${section}.band=$band
+		uci -q set ieee1905.${section}.ssid="$ssid"
+		uci -q set ieee1905.${section}.encryption=$encryption
+		uci -q set ieee1905.${section}.key="$key"
+		json_select "$band" > /dev/null
+		if [ "$?" = "0" ]; then
+			json_get_keys keys
+
+			for key in ${keys};
+			do
+				json_get_var val "$key"
+				uci -q set ieee1905.${section}.$key="$val"
+			done
+			json_select ..
+		fi
+	}
+
+	mapagent_process_radio() {
+		local section=$1
+
+		config_get device $section device
+		config_get band $section band
+		config_get dedicated_backhaul $section dedicated_backhaul 0
+
+		[ "$dedicated_backhaul" != "0" ] && return
+
+		for b in $bands; do
+			if [ "$b" == "$band" ]; then
+				return
+			fi
+		done
+
+		config_foreach mapagent_process_fh ap $device
+		bands="$bands $band"
+	}
+
+	ieee1905_del_ap() {
+		append_value() {
+			local section=$1
+			local key=$2
+			shift
+			shift
+
+			while [ "$key" != "" ]; do
+				val=$(uci -q get ieee1905.$section.$key)
+				[ "$val" = "" ] && {
+					key=$1
+					shift
+					continue
+				}
+				json_add_string "$key" ${val}
+				key=$1
+				shift
+			done
+		}
+
+		local section=$1
+		local band
+
+		config_get band $section band
+		json_select "$band" > /dev/null
+		rc=$?
+		[ "$rc" != "0" ] && json_add_object "$band"
+		append_value $section "manufacturer" "model_name" "device_name" "model_number" "serial_number" "device_type" "os_version"
+		if [ "$rc" != "0" ]; then
+			json_close_object
+		else
+			json_select ..
+		fi
+
+		uci -q delete ieee1905.${section}
+	}
+
+	config_load ieee1905
+	config_foreach ieee1905_del_ap ap
+
+	config_load mapagent
+	config_foreach mapagent_process_radio radio
+
+	uci commit ieee1905
+	json_cleanup
+}
+
+write_credentials() {
+	config_load mapagent
+
+	mapagent_apply_wireless() {
+		write_wireless() {
+			local section=$1
+			local map_ifname=$2
+			local bk_ssid="$3"
+			local bk_key="$4"
+
+			config_get ifname $section ifname
+
+			#echo found device=$device map=$multi_ap ifname=$ifname mapifname=$map_ifname
+
+			[ "$ifname" != "$map_ifname" ] && return
+
+			#echo applying bk_ssid = "$bk_ssid" bk_key = "$bk_key"
+
+			uci -q set wireless.${section}.multi_ap_backhaul_ssid="$bk_ssid"
+			uci -q set wireless.${section}.multi_ap_backhaul_key="$bk_key"
+		}
+		config_load wireless
+
+		config_foreach write_wireless wifi-iface "$1" "$2" "$3"
+	}
+
+	mapagent_find_fbss() {
+		local section=$1
+		local dev=$2
+		local bk_ssid="$3"
+		local bk_key="$4"
+
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
+		config_get device $section device
+
+		#echo found dev=$dev device=$device map=$multi_ap
+
+		[ "$device" != "$dev" ] && return
+		[ "$multi_ap" != "2" ] && return
+
+		config_get ifname $section ifname
+
+		#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")
+	}
+
+	mapagent_find_bbss() {
+		local section=$1
+		local dev=$2
+
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
+		config_get device $section device
+		config_get enabled $section enabled "1"
+
+		#echo found dev=$dev device=$device map=$multi_ap
+
+		[ "$enabled" == "0" ] && return
+		[ "$device" != "$dev" ] && return
+		[ "$multi_ap" != "1" ] && return
+
+		config_get ssid $1 ssid
+		config_get key $1 key
+
+		#echo found ssid="$ssid" key="$key"
+
+		config_foreach mapagent_find_fbss ap $dev "$ssid" "$key"
+	}
+
+	mapagent_process_radio() {
+		local section=$1
+
+		config_get device $section device
+
+		#echo found dev=$dev
+
+		config_foreach mapagent_find_bbss ap $device
+	}
+
+
+	config_foreach mapagent_process_radio radio
+
+	uci commit wireless
+}
+
+set_network() {
+	local ifname=$1
+	local num=$2
+	local bssid=$3
+
+	wpa_cli -i $ifname set_n $num bssid $bssid
+}
+
+bsta_steer() {
+	local ifname=$1
+	local bssid=$2
+
+	rc=$(wpa_cli -i $ifname set_n 0 bssid $bssid)
+	[ "$rc" == "FAIL" ] && {
+		echo "1"
+		return;
+	}
+
+	rc=$(wpa_cli -i $ifname roam $bssid)
+	[ "$rc" == "FAIL" ] && {
+		echo "1"
+		return;
+	}
+}
+
+write_bsta_config() {
+	local ifname=$1
+
+	#echo diff = $diff > /dev/console
+
+
+	config_load mapagent
+
+	mapagent_apply_wl_bsta() {
+		apply_config() {
+			local section=$1
+			local bsta=$2
+			local bssid=$3
+
+			config_get ifname $section ifname
+
+			[ "$bsta" == "$ifname" ] || return
+			#echo setting diff = $diff > /dev/console
+			old_bssid="$(uci -q get wireless.${section}.bssid)"
+
+			[ "$old_bssid" == "$bssid" ] && break
+
+			uci -q set wireless.${section}.bssid=$bssid
+			wpa_cli -i "$bsta" set_n 0 bssid $bssid
+			wpa_cli -i "$bsta" save_config
+			echo 1
+		}
+		config_load wireless
+
+		config_foreach apply_config wifi-iface $1 $2
+		uci commit wireless
+	}
+
+	mapagent_process_bk() {
+		local section=$1
+		local bsta=$2
+
+
+		config_get ifname $section ifname
+		#echo bsta = $bsta > /dev/console
+
+		[ "$bsta" == "$ifname" ] || return
+		#echo found ifname=$ifname > /dev/console
+
+		config_get bssid $section bssid
+		config_get band $section band
+		ret=$(mapagent_apply_wl_bsta $ifname $bssid)
+		[ "$ret" == "1" ] && {
+			diff=1
+			onbrd_bssid=$bssid
+			onbrd_band=$band
+		}
+	}
+
+	mapagent_apply_bssid_same_band() {
+		apply_config() {
+			local section=$1
+			local bsta=$2
+
+			config_get ifname $section ifname
+
+			[ "$bsta" == "$ifname" ] || return
+			uci -q set wireless.${section}.bssid=$bssid
+		}
+
+		config_get band $1 band
+		config_get onboarded $1 onboarded "0"
+
+		[ "$onbrd_band" != "$band" -o "$onboarded" = "1" ] && return
+
+		config_get ifname $1 ifname
+
+		config_load wireless
+		config_foreach apply_config wifi-iface $ifname $onbrd_bssid
+		uci commit wireless
+	}
+
+	config_foreach mapagent_process_bk bsta $ifname
+
+	#echo result diff = $diff > /dev/console
+	[ "$diff" == "1" ] && {
+		(config_foreach mapagent_apply_bssid_same_band bsta)
+		#ubus call uci commit '{"config":"wireless"}'
+		#echo reloading wireless > /dev/console
+	}
+
+}
+
+teardown_iface() {
+	config_load mapagent
+
+	local iface=$1
+
+	mapagent_teardown_wireless() {
+		write_wireless() {
+			local section=$1
+			local map_ifname=$2
+
+			config_get ifname $section ifname
+
+			[ "$ifname" != "$map_ifname" ] && return
+
+			uci -q set wireless.${section}.disabled="1"
+			uci -q set wireless.${section}.ssid="DISABLED-SSID"
+			uci -q set wireless.${section}.key="DISABLED-KEY"
+			uci -q delete wireless.${section}.multi_ap_backhaul_ssid
+			uci -q delete wireless.${section}.multi_ap_backhaul_key
+		}
+
+		config_load wireless
+
+		config_foreach write_wireless wifi-iface $1
+	}
+
+	mapagent_teardown_bss() {
+		local section=$1
+		local iface=$2
+
+		multi_ap=$(get_type_by_section $section)
+		[ "$multi_ap" == "0" ] && return
+
+		config_get ifname $section ifname
+
+		[ "$iface" != "$ifname" ] && return
+
+		config_get ifname $section ifname
+		uci -q set mapagent.${section}.enabled="0"
+		uci -q set mapagent.${section}.ssid="DISABLED-SSID"
+		uci -q set mapagent.${section}.key="DISABLED-KEY"
+
+		# subshell in hopes to maintain mapagent config loaded
+		(mapagent_teardown_wireless $ifname)
+	}
+
+
+	config_foreach mapagent_teardown_bss ap $iface
+
+	uci commit wireless
+	uci commit mapagent
+}
+
+bsta_to_wireless() {
+	config_load mapagent
+
+	mapagent_find_lowest_prio_onboarded() {
+		mapagent_process_bk() {
+			config_get priority $1 priority "2"
+			config_get onboarded $1 onboarded "0"
+
+			[ "$onboarded" = "0" ] && return
+
+			if [ -z "$sec" -o "$prio" = "-1" -o "$priority" -lt "$prio" ]; then
+				sec=$1
+				prio=$priority
+			fi
+		}
+
+		local sec=""
+		local prio="-1"
+
+		config_foreach mapagent_process_bk bsta
+		echo $sec
+	}
+
+	mapagent_enable_best() {
+		#echo 1=$1 best=$best > /dev/console
+		if [ "$1" = "$best" ]; then
+			uci -q set mapagent.$1.enabled='1'
+		else
+			uci -q set mapagent.$1.enabled='0'
+		fi
+	}
+
+	mapagent_bsta_to_wireless() {
+		mapagent_apply_wl_bsta() {
+			apply_config() {
+				local section=$1
+				local bsta=$2
+				local ssid="$3"
+				local key="$4"
+				local encryption=$5
+				local enabled=$6
+				local bssid=$7
+				local disabled="0"
+
+				config_get ifname $section ifname
+
+				[ -z "$enabled" -o "$enabled" = "0" ] && disabled="1"
+
+				[ "$bsta" == "$ifname" ] || return
+
+				uci -q set wireless.${section}.ssid="$ssid"
+				uci -q set wireless.${section}.key="$key"
+				uci -q set wireless.${section}.encryption=$encryption
+				uci -q set wireless.${section}.bssid="$bssid"
+				uci -q set wireless.${section}.default_disabled='0'
+
+				[ "$disabled" != "1" ] && return
+				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
+				wpa_cli -i "$bsta" disable_network 0 > /dev/null 2>&1
+				wpa_cli -i "$bsta" save_config > /dev/null 2>&1
+
+				echo 1
+			}
+
+			config_load wireless
+
+			config_foreach apply_config wifi-iface $@
+			uci commit wireless
+		}
+
+		mapagent_find_other_creds() {
+			#echo "trying to find other creds for $2" > /dev/console
+			local other_section="$2"
+
+			config_get band $1 band
+			config_get onboarded $1 onboarded "0"
+
+			[ "$4" != "$band" -o "$onboarded" = "0" ] && return
+
+			config_get ssid $1 ssid
+			config_get key $1 key
+			config_get encryption $1 encryption
+			config_get enabled $1 enabled "0"
+			config_get bssid $1 bssid
+
+			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")
+		}
+
+		config_get band $1 band
+		config_get ifname $1 ifname
+		config_get onboarded $1 onboarded "0"
+		config_get enabled $1 enabled "0"
+
+		if [ "$onboarded" = "0" ]; then
+			config_foreach mapagent_find_other_creds bsta $1 $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")
+		fi
+	}
+
+#	best=$(mapagent_find_lowest_prio_onboarded)
+#
+#	[ -z "$best" ] && return
+#
+#	band=$1
+#	sec=""
+#	prio=""
+#
+#	config_foreach mapagent_enable_best bsta $best
+#	uci commit mapagent
+	config_load mapagent
+
+	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
+
+#	[ "$diff" != "" ] && {
+
+		ubus call uci commit '{"config":"wireless"}'
+#	}
+}
+
+
+sync_mapcontroller_from_wireless() {
+	ubus -t 5 wait_for wifi
+	[ "$?" != "0" ] && return
+
+	[ ! -f "/etc/config/wireless" ] && return
+
+	status=$(ubus -S call wifi status)
+
+	device_to_band() {
+		local ifname=$1
+		json_load "$status"
+		json_select "radios"
+		json_get_keys keys
+
+		for key in $keys; do
+			json_select $key
+			json_get_var name name
+
+			if [ "$name" != "$ifname" ]; then
+				json_select ..
+				continue
+			fi
+
+			json_get_var band band
+
+			if [ "$band" == "5GHz" ]; then
+				echo "5"
+			elif [ "$band" == "2.4GHz" ]; then
+				echo "2"
+			fi
+
+			break
+		done
+
+		json_cleanup
+	}
+
+	wireless_process_iface() {
+		local section=$1
+		local type="ap"
+		local enabled="1"
+
+		config_get multi_ap $section multi_ap 0
+		[ "$multi_ap" != "1" ] && [ "$multi_ap" != "2" ] && return
+
+		config_get mode $section mode "ap"
+		[ "$mode" != "ap" ] && return
+
+		config_get device $section device
+		band=$(device_to_band $device)
+		[ "$band" == "" ] && return
+
+		config_get ssid $section ssid
+		config_get key $section key
+		config_get encryption $section encryption
+		config_get start_disabled $section start_disabled "0"
+		config_get network $section network
+
+
+		cntlr_section=$(uci add mapcontroller ${type})
+		uci -q set mapcontroller.${cntlr_section}.ssid="$ssid"
+		uci -q set mapcontroller.${cntlr_section}.key="$key"
+		uci -q set mapcontroller.${cntlr_section}.encryption="$encryption"
+		uci -q set mapcontroller.${cntlr_section}.band="$band"
+		uci -q set mapcontroller.${cntlr_section}.vid="1"
+		uci -q set mapcontroller.${cntlr_section}.network="$network"
+
+		[ "$multi_ap" == "1" ] && map_type="backhaul" || map_type="fronthaul"
+		uci -q set mapcontroller.${cntlr_section}.type="$map_type"
+
+		[ "$start_disabled" == "1" ] && enabled="0"
+		uci -q set mapcontroller.${cntlr_section}.enabled="$enabled"
+	}
+
+	mapcontroller_teardown() {
+		local section=$1
+
+		uci delete mapcontroller.$1
+	}
+
+	config_load mapcontroller
+	config_foreach mapcontroller_teardown ap
+
+	config_load wireless
+	config_foreach wireless_process_iface wifi-iface
+	uci commit mapcontroller
+}
+
+bsta_scan_on_enabled() {
+	local onboarded_bands=""
+
+	mapagent_onboarded_bands() {
+		config_get band $1 band
+		config_get onboarded $1 onboarded "0"
+
+		[ "$onboarded" = "0" ] && return
+
+		onboarded_bands="$onboarded_bands $band"
+	}
+
+	mapagent_enable_bk() {
+		config_get ifname $1 ifname
+		config_get band $1 band
+		config_get enabled $1 enabled
+
+		[ "$enabled" = "0" ] && return
+
+		for onboarded_band in $onboarded_bands
+		do
+			[ "$onboarded_band" != "$band" ] && continue
+
+			logger -t multiap "bsta_scan_on_enabled $ifname $band"
+			wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
+			wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
+			wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+		done
+	}
+
+	config_load mapagent
+	config_foreach mapagent_onboarded_bands bsta
+	config_foreach mapagent_enable_bk bsta
+}
+
+bsta_enable_all() {
+	mapagent_enable_bk() {
+		config_get ifname $1 ifname
+		uci -q set mapagent.$1.enabled="1"
+	}
+
+	config_load mapagent
+
+	config_foreach mapagent_enable_bk bsta
+	uci commit mapagent
+	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="$@"
+
+	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
+	}
+
+	config_load mapagent
+	config_foreach mapagent_blacklist_by_band bsta
+}
+
+bsta_disable_lower_priority() {
+	config_load mapagent
+
+	mapagent_get_priority() {
+		config_get ifname $1 ifname
+
+		[ "$ifname" != "$2" ] && return
+
+		config_get priority $1 priority "2"
+
+		echo "$priority"
+	}
+
+	mapagent_disable_lower_bk() {
+		mapagent_apply_wl_bsta() {
+			apply_config() {
+				local section="$1"
+				local bsta="$2"
+				local enabled="$3"
+
+				config_get ifname $section ifname
+
+				[ "$bsta" == "$ifname" ] || return
+
+				[ "$enabled" != "0" ] && return
+
+				wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
+				wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
+				wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+			}
+			local ifname="$1"
+			local enabled="$2"
+
+			[ "$enabled" != "0" ] && return
+
+			config_load wireless
+
+			config_foreach apply_config wifi-iface $ifname $enabled
+		}
+
+		local enabled="1"
+
+		config_get ifname $1 ifname
+		config_get priority $1 priority
+
+		[ "$ifname" != "$2" -a "$priority" -gt "$3" ] && enabled="0"
+
+		uci -q set mapagent.$1.enabled="$enabled"
+
+		(mapagent_apply_wl_bsta $ifname $enabled) > /dev/null
+	}
+
+	local bsta=$1
+
+	prio=$(config_foreach mapagent_get_priority bsta $bsta)
+	#echo bsta $bsta has prio $prio > /dev/console
+
+	config_foreach mapagent_disable_lower_bk bsta $bsta $prio
+	uci commit mapagent
+
+#	ubus call uci commit '{"config":"wireless"}'
+}
+
+
+bsta_use_link() {
+	config_load mapagent
+
+	mapagent_disable_bk() {
+		local bsta="$2"
+
+		config_get ifname $1 ifname
+		config_get enabled $1 enabled
+
+		[ "$bsta" = "$ifname" ] && return
+
+		wpa_cli -i "$ifname" disconnect > /dev/null 2>&1
+		wpa_cli -i "$ifname" disable_network 0 > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+	}
+
+	local bsta=$1
+
+	config_foreach mapagent_disable_bk bsta $bsta
+}
+
+bsta_swap_to_link() {
+	bsta_disable_lower_priority $1
+	bsta_use_link $1
+
+	wpa_cli -i "$1" enable_network 0 > /dev/null
+	wpa_cli -i "$1" reconnect > /dev/null
+	wpa_cli -i "$1" save_config > /dev/null
+}
+
+set_uplink_backhaul_info() {
+	local ul_1905id=$1
+	local ul_mac=$2
+
+	(
+		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
+}
+
+set_uplink() {
+	local type=$1
+	local ifname=$2
+	local hwaddr
+
+	hwaddr="$(ifconfig $ifname | grep -i hwaddr | awk '{print $5}' | awk '{print tolower($0)}')"
+
+	json_init
+	json_add_string "type" "$type"
+	json_add_string "ifname" "$ifname"
+	json_add_string "macaddr" "$hwaddr"
+	(
+		flock -x 200
+		json_dump > "$MAPFILE"
+	) 200>/var/lock/map.backhaul.lock
+	json_cleanup
+
+	config_load mapagent
+
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
+
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		ubus call map.agent toggle_fh '{"enable":true, "prevent_island":true, "ifname":"all"}'
+	fi
+
+}
+
+unset_uplink() {
+	local type=${1:-wifi}
+
+	config_load mapagent
+
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
+
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		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
+}
+
+func=$1
+shift
+
+case "$func" in
+	wireless_teardown) wireless_teardown;;
+	setup_network) setup_network;;
+	setup_wireless) setup_wireless;;
+	write_credentials) write_credentials;;
+	sync_credentials) sync_credentials;;
+	bsta_steer) bsta_steer $@;;
+	set_network) set_network $@;;
+	write_bsta_config) write_bsta_config $@;;
+	teardown_iface) teardown_iface $@;;
+	bsta_to_wireless) bsta_to_wireless $@;;
+	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 $@;;
+	bsta_swap_to_link) bsta_swap_to_link $@;;
+	set_uplink) set_uplink $@;;
+	set_uplink_backhaul_info) set_uplink_backhaul_info $@;;
+	unset_uplink) unset_uplink $@;;
+	--help|help) usage;;
+	*) usage; exit 1;;
+esac
+

map-agent/files/lib/wifi/traffic_separation

@@ -0,0 +1,210 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+AL_BRIDGE=${AL_BRIDGE-"br-lan"}
+PRIMARY_VID=${PRIMARY_VID-1}
+
+### Traffic Separation ###
+
+dbg() {
+	logger -t traffic_separation $@
+}
+
+ts_sub() {
+	ts_usage() {
+		cat <<EOF
+Usage: $0 [create|reload]
+Traffic Separation related functions.
+create vid - create vlan configuration with vlan_id
+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
+
+			[ -z "$(uci -q get network.${name})" ] || return
+
+			local ip_addr="192.168.${vid}.1"
+			local br_dev="${AL_BRIDGE/-/_}"
+			local tag=":t"
+
+			[ "${vid}" = "${PRIMARY_VID}" ] && {
+				tag=""
+
+				# Global options
+				[ -z "$(uci -q get network.${br_dev}.vlan_filtering)" ] && {
+					uci -q set network.${br_dev}.vlan_filtering=1;
+				}
+
+				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"
+			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"
+
+			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}"
+			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
+		}
+
+		_dhcp_setup() {
+			local name=$1
+
+			[ -n "$(uci -q get dhcp.${name})" ] && return
+
+			uci -q set dhcp.${name}=dhcp
+			uci -q set dhcp.${name}.interface="${name}"
+			uci -q set dhcp.${name}.start="100"
+			uci -q set dhcp.${name}.limit="150"
+			uci -q set dhcp.${name}.leasetime="1h"
+			uci -q set dhcp.${name}.dhcpv4="server"
+			uci -q set dhcp.${name}.dhcpv6="server"
+			uci -q set dhcp.${name}.ra="server"
+			uci -q set dhcp.${name}.ra_slaac="1"
+			uci -q add_list dhcp.${name}.ra_flags="managed-config"
+			uci -q add_list dhcp.${name}.ra_flags="other-config"
+
+			uci -q commit dhcp
+		}
+
+		_firewall_setup() {
+			local name=$1
+			local network=$1
+			local vid=$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
+
+			[ "${vid}" = "${PRIMARY_VID}" ] && {
+				uci -q delete firewall.lan
+			}
+
+			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"
+
+			uci -q commit firewall
+		}
+
+		vid=$1
+
+		[ -n "$vid" ] || {
+			cat <<EOF
+VID required to configure.
+EOF
+			exit 1
+		}
+
+		ip link show sink${vid} 2> /dev/null || {
+			ip link add sink${vid} type veth peer name sink_peer${vid}
+		}
+
+		ip link set sink${vid} up
+		ip link set sink_peer${vid} up
+
+		proto="dhcp"
+		[ -x "/usr/sbin/mapcontroller" ] && proto="static" ;
+		_net_setup "vlan${vid}" ${vid} ${proto} "sink${vid}" "sink_peer${vid}"
+
+		[ -x "/usr/sbin/mapcontroller" ] && {
+			_dhcp_setup vlan${vid}
+			_firewall_setup vlan${vid} ${vid}
+		}
+	}
+
+	ts_reload() {
+		local dhcp_reload=$1
+
+		# workaround for missing backhaul wifi.ap.* ubus obj's:
+		# iterate in config and setup bh
+#		config_load wireless
+
+# _setup_bh_iface() {
+#			local sec=$1
+#			local iface=$2
+#			local bridge=$3
+
+#			config_get ifname $sec ifname
+
+#			config_get mode $sec mode
+#			config_get multi_ap $sec multi_ap "0"
+#			[ "$mode" = "ap" -a "$multi_ap" = "1" ] && {
+#				ts_create bh $ifname 1 2 br-map
+#			}
+		#}
+
+#		config_foreach _setup_bh_iface wifi-iface
+
+		[ -n "dhcp_reload" ] && /etc/init.d/dnsmasq reload
+		ubus call uci commit '{"config":"network"}'
+		/etc/init.d/firewall reload
+
+
+		#for sink in $(ubus list network.interface.sink*) ; do
+		#	local sink_vlan=${sink/network.interface./}_vlan
+		#done
+	}
+
+	local func=$1
+	shift
+
+	case "$func" in
+		create) dbg "create $@"; ts_create $@;;
+		reload) dbg "reload $@"; ts_reload $@;;
+		--help|help) ts_usage;;
+		*) ts_usage; exit 1;;
+	esac
+}

map-controller/Config.in

@@ -6,21 +6,5 @@ config CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 	bool "Support Dynamic Controller configuration sync"
 	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 
-config CONTROLLER_EASYMESH_VENDOR_EXT
-	bool "Enable extra features through Easymesh vendor extension"
-	default y
-
-config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	string
-	default "\\\\x11\\\\x22\\\\x33"
-
-config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
-	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
-	default CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	help
-	Extra features not covered by the base Easymesh specification can be
-	enabled through CONTROLLER_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
-	through which such features would be exposed.
-
 endmenu
 endif

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.4
+PKG_VERSION:=2.10.0.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=a4a626539ede73c1c4eb1ad768331524a8ee9ce8
+PKG_SOURCE_VERSION:=4cac1a57ede76550273ebd02aa13a1992d3645ab
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -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
@@ -49,10 +48,6 @@ ifeq ($(CONFIG_CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
 
-ifeq ($(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_CONTROLLER_EASYMESH_VENDOR_EXT_OUI)\\\"
-endif
-
 define Package/map-controller/install
 	$(INSTALL_DIR) $(1)/etc
 	$(CP) ./files/* $(1)/

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

@@ -25,8 +25,7 @@ validate_controller_section() {
 		'use_bcn_metrics:bool:false' \
 		'use_usta_metrics:bool:false' \
 		'allow_bgdfs:range(0,2629744)' \
-		'channel_plan:range(0,2629744)' \
-		'enable_ts:bool:false'
+		'channel_plan:range(0,2629744)'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapcontroller" "Validation of controller section failed"

map-topology/Config.in

@@ -1,22 +0,0 @@
-if (PACKAGE_map-topology)
-
-menu "Configurations"
-
-config TOPOLOGYD_EASYMESH_VENDOR_EXT
-	bool "Enable extra features through Easymesh vendor extension"
-	default y
-
-config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	string
-	default "\\\\x11\\\\x22\\\\x33"
-
-config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI
-	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
-	default TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI_DEFAULT
-	help
-	Extra features not covered by the base Easymesh specification can be
-	enabled through TOPOLOGYD_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
-	through which such features would be exposed.
-
-endmenu
-endif

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.4
+PKG_VERSION:=2.5.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=488ce1ce576b57c9b3c4d7c034969bf65e66216f
+PKG_SOURCE_VERSION:=8ddd80413d6ffd174cd1b4a6859e2a306af0d409
 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
@@ -31,12 +31,7 @@ define Package/map-topology
 	TITLE:=Utility to build topology of a multi-AP network
 endef
 
-define Package/map-topology/config
-	source "$(SOURCE)/Config.in"
-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 \
@@ -48,11 +43,6 @@ endef
 
 MAKE_PATH:=src
 
-ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
-TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)\\\"
-endif
-
-
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
         $(CP) -rf ~/git/map-topology/* $(PKG_BUILD_DIR)/

map-topology/files/etc/config/hosts

@@ -2,4 +2,3 @@
 config global 'global'
 	option ageing_timer '1440'
 	option reboot_persistent '0'
-	list ifname 'br-lan'

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/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.21
+PKG_VERSION:=5.0.0.16
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=cd47bcaf1cc82dfd5c10ea76491fd0dae4436cc6
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
-PKG_SOURCE_VERSION:=c71da7f9b66f4d7fd240e6eb7078044c6b43b72b
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -100,7 +100,6 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
@@ -108,7 +107,6 @@ define Package/obuspa/install
 	$(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
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,17 +1,30 @@
 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 'agent_mtp'
+config mtp
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
 	option mqtt 'localmqtt'
@@ -22,30 +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 'sub_event'
-#    option ID 'uci-sub-events'
-#    option NotifType 'Event'
-#    list ReferenceList 'Device.Boot!'
-#    list ReferenceList 'Device.LocalAgent.TransferComplete!'
-#    option Persistent 'true'
-#    option controller 'localcontroller'
-
-#config subscription 'sub_op_comp'
-#   option ID 'uci-sub-op_complete'
-#   option NotifType 'OperationComplete'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Download()'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Activate()'
-#   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'

obuspa/files/etc/uci-defaults/01-fix-upgrade-uci

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-fix_stomp_section() {
-	local encryption
-
-	config_get_bool encryption $1 encryption ""
-	if [ -n "${encryption}" ]; then
-		uci_set obuspa $1 encryption ""
-		uci_set obuspa $1 EnableEncryption "$encryption"
-	fi
-}
-
-# fix the stomp encryption parameter
-config_load obuspa
-config_foreach fix_stomp_section stomp
-uci_commit

ponmngr/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=ponmngr
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -17,12 +17,11 @@ include $(INCLUDE_DIR)/package.mk
 
 define Package/ponmngr
 	CATEGORY:=Utilities
-	TITLE:=PON Manager
-	DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
+	TITLE:=ponmngr packets manager daemon
 endef
 
 define Package/ponmngr/description
-	Configures PON
+	Configures pon
 endef
 
 #define Build/Prepare
@@ -33,12 +32,7 @@ define Build/Compile
 endef
 
 define Package/ponmngr/install
-	$(CP) ./files/common/* $(1)/
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
-	$(CP) ./files/broadcom/* $(1)/
-else ifneq ($(CONFIG_TARGET_iopsys_econet),)
-	$(CP) ./files/airoha/* $(1)/
-endif
+	$(CP) ./files/* $(1)/
 endef
 
 $(eval $(call BuildPackage,ponmngr))

ponmngr/files/airoha/lib/xpon/airoha.sh

@@ -1,25 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_serial_number() {
-	vendor_id=$1
-	vssn=$2
-
-	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
-}
-
-init_xpon() {
-	procd_open_instance ponmgr_cfg
-	procd_set_param command /userfs/bin/ponmgr_cfg
-	procd_close_instance
-	procd_open_instance omci
-	procd_set_param command /userfs/bin/omci
-	procd_close_instance
-}
-
-deinit_xpon() {
-	killall -9 omci 2>/dev/null
-	killall -9 ponmgr_cfg 2>/dev/null
-}
-

ponmngr/files/broadcom/lib/xpon/broadcom.sh

@@ -1,30 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-set_serial_number() {
-	vendor_id=$1
-	vssn=$2
-
-	vendor_id="$(echo $vendor_id | hexdump -e '4/1 "%02X" "\n"')"
-	vendor_id=${vendor_id:0:8}
-
-	bs /b/c gpon onu_sn={vendor_id=$vendor_id,vendor_specific=$vssn}
-}
-
-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_set_param respawn
-	procd_close_instance
-}
-
-deinit_xpon() {
-	# stopping omcid does not bring down the pon link, which should happen
-	# if ANI is disabled or stopped (go to O1)
-	gponctl stop
-}

ponmngr/files/common/etc/init.d/xpon

@@ -1,38 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=19
-STOP=91
-
-USE_PROCD=1
-
-. /lib/functions.sh
-include /lib/xpon
-
-configure_serial_number() {
-	serial_number="$(uci -q get xpon.ani.serial_number)"
-	if [ ${#serial_number} -eq 12 ]; then
-		vendor_id="${serial_number:0:4}"
-		vssn="${serial_number:4:8}"
-	else
-		macaddr="$(fw_printenv -n ethaddr | tr -d ':' | tr 'a-z' 'A-Z')"
-		vendor_id="IOPS"
-		vssn="${macaddr:4:8}"
-	fi
-
-	set_serial_number $vendor_id $vssn
-}
-
-start_service() {
-	if [ "$(uci -q get xpon.ani.enable)" == "1" ]; then
-		configure_serial_number
-		init_xpon
-	fi
-}
-
-stop_service() {
-	deinit_xpon
-}
-
-service_triggers() {
-	procd_add_reload_trigger "xpon"
-}

ponmngr/files/etc/init.d/xpon

@@ -0,0 +1,25 @@
+#!/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/lib/xpon/broadcom.sh

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

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

@@ -30,25 +30,17 @@ populate_config_from_db() {
 }
 
 populate_config_from_device_tree() {
-	for path in $(find /proc/device-tree/ -name "port@*"); do
-		port="$(cat $path/label)"
+	for port in $(find /proc/device-tree/ -name "port@*"); do
+		port="$(cat $port/label)"
 		[ -n "$port" ] || continue
 		[ "$port" = "cpu" ] && continue
-		speed=1000
-		if [ -e "$path/phy-mode" ]; then
-			phymode="$(cat $path/phy-mode)"
-			case "$phymode" in
-				10000*) speed=10000 ;;
-				2500*) speed=2500 ;;
-			esac
-		fi
 		PORT="$(echo $port | tr '[a-z]' '[A-Z]')"
 		uci add ports ethport
 		uci rename ports.@ethport[-1]="$PORT"
 		uci set ports.@ethport[-1].enabled=1
 		uci set ports.@ethport[-1].name="$PORT"
 		uci set ports.@ethport[-1].ifname="$port"
-		uci set ports.@ethport[-1].speed="$speed"
+		uci set ports.@ethport[-1].speed=1000
 		uci set ports.@ethport[-1].duplex="full"
 		uci set ports.@ethport[-1].autoneg=1
 		uci set ports.@ethport[-1].eee=0
@@ -73,7 +65,7 @@ fi
 
 touch /etc/config/ports
 
-if [ -f /sbin/db -a -n "$(db get hw.board.ethernetPortOrder 2>/dev/null)" ]; then
+if [ -f /sbin/db ] && [ -f /etc/board-db/config/hw ]; then
 	populate_config_from_db
 elif [ -d /proc/device-tree/ ]; then
 	populate_config_from_device_tree

qosmngr/Makefile

@@ -27,7 +27,7 @@ define Package/qosmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=QoS Manager
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
+  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
 endef
 
 define Package/qosmngr/description

qosmngr/files/lib/qos/broadcom.sh

@@ -7,15 +7,20 @@ BR_RULE=""
 BR6_RULE=""
 
 POLICER_COUNT=0
+INTF_NAME=""
 Q_COUNT=0
-SP_Q_PRIO=7
+ITER=0
+PREV_ORDER=""
+CURR_ORDER=""
+MAX_ORDER=""
+
 
 # Function to handle a queue order and
 # update total number of queues
 handle_q_order() {
-	local qid="$1" #queue section ID
+	qid="$1" #queue section ID
 
-	config_get is_enable "$qid" "enable" 1
+	config_get is_enable "$qid" "enable"
 
 	# No need to configure disabled queues
 	if [ $is_enable == '0' ]; then
@@ -31,7 +36,7 @@ handle_q_order() {
 	# Create precedence file containing queue order per
 	# interface.
 	local precedence_file="/tmp/qos/$ifname/q_order"
-	local q_no=$(cat /tmp/qos/$ifname/q_idx)
+	local q_no=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
 
 	config_get precedence "$qid" "precedence"
 	value=${precedence}_q${q_no}
@@ -39,32 +44,71 @@ handle_q_order() {
 
 	# Update the number of queues per interface.
 	q_no=$((q_no + 1))
-	echo $q_no > /tmp/qos/$ifname/q_idx
+	echo $q_no > /tmp/qos/queue_stats/$ifname/q_idx
 }
 
-# Sort queue, lower value in uci means higher precedence, so this
-# function sorts the precedence in decending order
-sort_q_by_precedence() {
+# Function to check if values are greater than (total number
+# of queue -1) and map them to corresponding value.
+configure_precedence_to_file() {
+	order="$1"
+	line="$2"
+	order_file="$3"
+
+	if [ $order == "$PREV_ORDER" ]; then
+		queue_id=${line#*_}
+		val=${CURR_ORDER}_${queue_id}
+		echo $val >> $order_file
+	else
+		PREV_ORDER=$order
+		queue_id=${line#*_}
+		val=${MAX_ORDER}_${queue_id}
+		echo $val >> $order_file
+		CURR_ORDER=$MAX_ORDER
+		MAX_ORDER=$((MAX_ORDER - 1))
+	fi
+}
+
+# Fucntion to map queue precedence per interface
+# ranging from 1-X to 0-(no of queues -1)
+map_queue_precedence() {
 	ifname="$1"
+	total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
+	q_no=`expr $total_q - 1`
 
+	MAX_ORDER=$q_no
+
+	local precedence_file="/tmp/qos/$ifname/q_precedence"
 	local order_file="/tmp/qos/$ifname/q_order"
-	local tmp_order_file="/tmp/qos/$ifname/q_order.tmp"
 
-	sort -n -k1 $order_file > $tmp_order_file
-	cp $tmp_order_file $order_file
-	rm -f $tmp_order_file
+	sort -n -r -k1 $order_file >> $precedence_file
+	rm $order_file
+
+	while read line
+	do
+		order=${line%_*}
+		if [ $order  -gt $q_no ]; then
+			ITER=$((ITER + 1))
+			configure_precedence_to_file $order $line $order_file
+		else
+			if [ $ITER == '0' ]; then
+				echo $line >> $order_file
+			else
+				configure_precedence_to_file $order $line $order_file
+			fi
+		fi
+
+	done < $precedence_file
 }
 
-sort_by_precedence() {
+map_precedence() {
 	for interf in $(db -q get hw.board.ethernetPortOrder); do
-		sort_q_by_precedence $interf
+		map_queue_precedence $interf
 	done
 }
 
 # function to handle a queue section
 handle_queue() {
-	local qid="$1" #queue section ID
-	local intf_name="$2"
+	qid="$1" #queue section ID
 
 	config_get is_enable "$qid" "enable"
 
@@ -80,35 +124,33 @@ handle_queue() {
 	fi
 
 	# This is to get the qid per interface.
-	if [ "$intf_name" != "$ifname" ]; then
-		return
+	if [ "$INTF_NAME" == $ifname ]; then
+		Q_COUNT=$((Q_COUNT + 1))
+	else
+		Q_COUNT='0'
 	fi
 
-	local precedence_file="/tmp/qos/$ifname/q_order"
+	INTF_NAME=$ifname
 
-	local temp_order=0
-	while read -r line; do
-		line_qid=${line: -1}
-		if [ "$line_qid" == "$Q_COUNT" ]; then
-			break
-		fi
-		temp_order=$((temp_order + 1))
-	done < "$precedence_file"
+	local total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
+	q_no=`expr $total_q - 1` local
+	precedence_file="/tmp/qos/$ifname/q_order"
 
-	# for sp queue, no matter what the precedence value is configured in the uci file
-	# broadcom recommends that the highest precedence queue should have priority value
-	#7, the next priority q 6 and so on.
-	# Here, we have the index of the queue when sorted by precedence value in the file
-	# precedence_file so the order is calculated accordingly.
-	local order=`expr $SP_Q_PRIO - $temp_order`
+	# TR181 suggests lower the precedence value higher the priority
+	# but in the chip its the opposite ie lower the value, lower
+	# the priority of queue on this chip. So we need to reverse the
+	# precedence value.
+	precedence="$(grep -i q${Q_COUNT} $precedence_file)"
+	precedence=${precedence%_*}
+	order=`expr $q_no - $precedence`
 
 	config_get sc_alg "$qid" "scheduling"
-	config_get wgt "$qid" "weight" 1
+	config_get wgt "$qid" "weight"
 	config_get rate "$qid" "rate"
 	config_get bs "$qid" "burst_size"
 	config_get qsize "$qid" "queue_size" 1024
 
-	local salg=1
+	salg=1
 
 	case "$sc_alg" in
 		"SP") salg=1
@@ -121,15 +163,31 @@ handle_queue() {
 		;;
 	esac
 
-	# ignore precedence value in case of WRR, broadcom recommends that WRR queue should
-	# always have precedence value set to 0
+	# ignore precedence value in case of WRR
 	if [ $salg -eq 2 ]; then
 	       order=0
 	fi
 
 	# Call tmctl which is a broadcomm command to configure queues on a port.
 	tmctl setqcfg --devtype 0 --if $ifname --qid $Q_COUNT --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
-	Q_COUNT=$((Q_COUNT + 1))
+
+	# In BCM968 chips, the counters for queues are read, on other model, its read and reset. So, to maintain counter
+	# value and uniform behaviour, we are storing counter value for each queue in files
+	local d_name="/tmp/qos/queue_stats/${ifname}/q_${Q_COUNT}"
+	mkdir $d_name
+	local f_name="$d_name/txPackets"
+	touch $f_name
+	echo 0 > $f_name
+	f_name="$d_name/txBytes"
+	touch $f_name
+	echo 0 > $f_name
+	f_name="$d_name/droppedPackets"
+	touch $f_name
+	echo 0 > $f_name
+	f_name="$d_name/droppedBytes"
+	touch $f_name
+	echo 0 > $f_name
+
 }
 
 #function to handle a policer section
@@ -1034,20 +1092,28 @@ configure_classify() {
 
 pre_configure_queue() {
 	# Delete queues
+	rm -rf /tmp/qos/queue_stats
+
 	for intf in $(db get hw.board.ethernetPortOrder); do
 		rm -rf /tmp/qos/$intf
 
-		mkdir -p /tmp/qos/$intf
-		touch /tmp/qos/$intf/q_order
-		touch /tmp/qos/$intf/q_idx
-		echo 0 > /tmp/qos/$intf/q_idx
+		mkdir -p /tmp/qos/queue_stats/$intf
+		touch /tmp/qos/queue_stats/$intf/q_idx
+		echo 0 > /tmp/qos/queue_stats/$intf/q_idx
 
-		tmctl porttminit --devtype 0 --if $intf --numqueues 8
+#		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
+
+		mkdir -p /tmp/qos/$intf
+		touch /tmp/qos/$intf/q_order
+		touch /tmp/qos/$intf/q_precedence
 	done
 }
 
@@ -1055,15 +1121,8 @@ configure_queue() {
 	# Load UCI file
 	config_load qos
 	config_foreach handle_q_order queue
-	sort_by_precedence
-	for interf in $(db -q get hw.board.ethernetPortOrder); do
-		Q_COUNT=0
-		# sp queue have max priority value = no. of queue configured on the port
-		# hence read and update SP_Q_PRIO here
-		local q_no=$(cat /tmp/qos/$interf/q_idx)
-		SP_Q_PRIO=`expr $q_no - 1`
-		config_foreach handle_queue queue $interf
-	done
+	map_precedence
+	config_foreach handle_queue queue
 }
 
 configure_policer() {

skopeo/Makefile

@@ -1,80 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=skopeo
-PKG_VERSION:=1.9.2
-PKG_RELEASE:=1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_NAME:=skopeo
-PKG_SOURCE_URL:=https://github.com/containers/skopeo.git
-PKG_SOURCE_VERSION:=v$(PKG_VERSION)
-PKG_SOURCE:=$(PKG_NAME)-v$(PKG_VERSION)-$(PKG_RELEASE).tar.gz
-PKG_MIRROR_HASH:=skip
-
-PKG_LICENSE:=Apache-2.0
-PKG_LICENSE_FILES:=LICENSE
-
-HOST_BUILD_DEPENDS:=golang/host
-HOST_BUILD_PARALLEL:=1
-
-PKG_BUILD_DEPENDS:=golang/host
-PKG_BUILD_PARALLEL:=1
-PKG_USE_MIPS16:=0
-
-GO_PKG:=github.com/containers/skopeo
-GO_PKG_BUILD_PKG:=github.com/containers/skopeo/cmd/skopeo
-
-include $(INCLUDE_DIR)/host-build.mk
-include $(INCLUDE_DIR)/package.mk
-
-GOLANG_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-package.mk)
-GOLANG_HOST_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-host-build.mk)
-
-# verify that there is only one single file returned
-ifneq (1,$(words $(GOLANG_PACKAGE_MK)))
-ifeq (0,$(words $(GOLANG_PACKAGE_MK)))
-$(error did not find golang-package.mk in any feed)
-else
-$(error found multiple golang-package.mk files in the feeds)
-endif
-else
-$(info found golang-package.mk at $(GOLANG_PACKAGE_MK))
-endif
-
-include $(GOLANG_PACKAGE_MK)
-include $(GOLANG_HOST_PACKAGE_MK)
-
-define Package/skopeo
-  SECTION:=utils
-  CATEGORY:=Utilities
-  TITLE:=Command line utility for container image management
-  URL:=https://github.com/containers/skopeo
-  DEPENDS:=$(GO_ARCH_DEPENDS)
-endef
-
-define Package/skopeo/description
-  skopeo is a command line utility that performs various operations on container images and image repositories.
-endef
-
-define Package/skopeo/conffiles
-/etc/containers/policy.json
-endef
-
-GO_PKG_TAGS=exclude_graphdriver_devicemapper,exclude_graphdriver_btrfs,containers_image_openpgp
-GO_PKG_BUILD_VARS += GO111MODULE=auto
-
-define Build/Compile
-	$(call GoPackage/Build/Compile)
-	$(call GoPackage/Package/Install/Bin,$(PKG_INSTALL_DIR))
-endef
-
-define Package/skopeo/install
-	$(call GoPackage/Package/Install/Bin,$(1))
-	$(INSTALL_DIR) $(1)/etc/containers
-	$(INSTALL_DATA) ./files/etc/containers/policy.json $(1)/etc/containers/policy.json
-endef
-
-$(eval $(call GoBinHostBuild))
-$(eval $(call HostBuild))
-$(eval $(call GoBinPackage,skopeo))
-$(eval $(call BuildPackage,skopeo))

skopeo/files/etc/containers/policy.json

@@ -1,15 +0,0 @@
-{
-    "default": [
-        {
-            "type": "insecureAcceptAnything"
-        }
-    ],
-    "transports":
-        {
-            "docker-daemon":
-                {
-                    "": [{"type":"insecureAcceptAnything"}]
-                }
-        }
-}
-

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.11
 
 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:=ed0a4d88f4c42ab452eb8a84705598a297261f49
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

sulu-builder/Config.in

@@ -1,126 +0,0 @@
-menu "Configuration"
-	depends on PACKAGE_sulu-builder
-
-menu "SULU_CORE"
-	depends on PACKAGE_sulu-builder
-	config SULU_CORE_ENABLE
-	bool "Enable this plugin"
-	default y
-
-	config SULU_CORE_URL
-		string "SULU url"
-		default "https://dev.iopsys.eu/websdk/sulu.git"
-
-	config SULU_CORE_VERSION
-		string "SULU repo version"
-		default "944f4e2217e478c04f1ef56ae67c66d82ece7994"
-endmenu
-
-menu "SULU_PLUGIN_LCM"
-	depends on PACKAGE_sulu-builder
-	config SULU_PLUGIN_LCM_ENABLE
-	bool "Enable this plugin"
-	default y
-
-	config SULU_PLUGIN_LCM_NAME
-		depends on SULU_PLUGIN_LCM_ENABLE
-		string "Plugin_name"
-		default "sulu-lcm"
-
-	config SULU_PLUGIN_LCM_URL
-		depends on SULU_PLUGIN_LCM_ENABLE
-		string "URL"
-		default "https://dev.iopsys.eu/websdk/sulu-lcm.git"
-
-	config SULU_PLUGIN_LCM_VERSION
-		depends on SULU_PLUGIN_LCM_ENABLE
-		string "Version"
-		default "f8a96f1c55904082c0658ee63aebe1e67a097f42"
-endmenu
-
-menu "SULU_PLUGIN_MULTIAP"
-	depends on PACKAGE_sulu-builder
-	config SULU_PLUGIN_MULTIAP_ENABLE
-	bool "Enable this plugin"
-	default y
-
-	config SULU_PLUGIN_MULTIAP_NAME
-		depends on SULU_PLUGIN_MULTIAP_ENABLE
-		string "Plugin_name"
-		default "sulu-multi-ap"
-
-	config SULU_PLUGIN_MULTIAP_URL
-		depends on SULU_PLUGIN_MULTIAP_ENABLE
-		string "URL"
-		default "https://dev.iopsys.eu/websdk/sulu-multi-ap.git"
-
-	config SULU_PLUGIN_MULTIAP_VERSION
-		depends on SULU_PLUGIN_MULTIAP_ENABLE
-		string "Version"
-		default "89b4e4b95d3a94b88782f5cdc9d1eafd5728a1f7"
-endmenu
-
-menu "SULU_THEME_IOPSYS"
-	depends on PACKAGE_sulu-builder
-	config SULU_THEME_IOPSYS_ENABLE
-	bool "Enable this plugin"
-	default y
-
-	config SULU_THEME_IOPSYS_NAME
-		depends on SULU_THEME_IOPSYS_ENABLE
-		string "Plugin_name"
-		default "sulu-theme-iopsys"
-
-	config SULU_THEME_IOPSYS_URL
-		depends on SULU_THEME_IOPSYS_ENABLE
-		string "URL"
-		default "https://dev.iopsys.eu/websdk/sulu-theme-iopsys.git"
-
-	config SULU_THEME_IOPSYS_VERSION
-		depends on SULU_THEME_IOPSYS_ENABLE
-		string "Version"
-		default "e80fea80cdf8d49db0ae70b5c26a5dab49b8a20d"
-endmenu
-
-menu "SULU_PLUGIN_CUSTOM"
-	depends on PACKAGE_sulu-builder
-	config SULU_PLUGIN_CUSTOM_ENABLE
-	bool "Enable this plugin"
-	default n
-
-	config SULU_PLUGIN_CUSTOM_NAME
-		depends on SULU_PLUGIN_CUSTOM_ENABLE
-		string "Plugin_name"
-		default "custom_app"
-
-	config SULU_PLUGIN_CUSTOM_URL
-		depends on SULU_PLUGIN_CUSTOM_ENABLE
-		string "URL"
-		default ""
-
-	config SULU_PLUGIN_CUSTOM_VERSION
-		depends on SULU_PLUGIN_CUSTOM_ENABLE
-		string "Version"
-endmenu
-
-menu "SULU_THEME_CUSTOM"
-	depends on PACKAGE_sulu-builder
-	config SULU_THEME_CUSTOM_ENABLE
-	bool "Enable this plugin"
-	default n
-
-	config SULU_THEME_CUSTOM_NAME
-		depends on SULU_THEME_CUSTOM_ENABLE
-		string "Plugin_name"
-		default "plugin_theme_custom"
-
-	config SULU_THEME_CUSTOM_URL
-		depends on SULU_THEME_CUSTOM_ENABLE
-		string "URL"
-		default ""
-
-	config SULU_THEME_CUSTOM_VERSION
-		depends on SULU_THEME_CUSTOM_ENABLE
-		string "Version"
-endmenu
-endmenu

sulu-builder/Makefile

@@ -1,155 +0,0 @@
-#
-# Copyright (C) 2021-2022 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=sulu-builder
-PKG_VERSION:=1.1.4
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=ca38b2086cee7ba83b41eec56539e9432271a349
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(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/${PKG_NAME}
-	SECTION:=utils
-	CATEGORY:=Utilities
-	TITLE:=Build sulu from source
-	DEPENDS:=+nginx +mosquitto-auth-shadow
-	MENU:=1
-endef
-
-define Package/${PKG_NAME}/description
-	SULU-CE ReactJS based Web UI builder.
-endef
-
-define Package/${PKG_NAME}/config
-	source "$(SOURCE)/Config.in"
-endef
-
-# Sulu core and other dependent needs to be updated in Config.in
-SULU_DL_FILE:=sulu-${PKG_VERSION}-${CONFIG_SULU_CORE_VERSION}.tar.gz
-define Download/sulu_core
-  FILE:=$(SULU_DL_FILE)
-  URL:=$(CONFIG_SULU_CORE_URL)
-  PROTO:=git
-  SUBDIR:=core
-  VERSION:=${CONFIG_SULU_CORE_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_CORE_ENABLE),y)
-$(eval $(call Download,sulu_core))
-endif
-
-SULU_PLUGIN_LCM_DL:=${CONFIG_SULU_PLUGIN_LCM_NAME}_plugin-${CONFIG_SULU_PLUGIN_LCM_VERSION}.tar.gz
-define Download/sulu_plugin_lcm
-  FILE:=${SULU_PLUGIN_LCM_DL}
-  URL:=${CONFIG_SULU_PLUGIN_LCM_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_LCM_NAME}
-  VERSION:=${CONFIG_SULU_PLUGIN_LCM_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_PLUGIN_LCM_ENABLE),y)
-$(eval $(call Download,sulu_plugin_lcm))
-endif
-
-SULU_PLUGIN_MULTIAP_DL:=${CONFIG_SULU_PLUGIN_MULTIAP_NAME}_plugin-${CONFIG_SULU_PLUGIN_MULTIAP_VERSION}.tar.gz
-define Download/sulu_plugin_multiap
-  FILE:=${SULU_PLUGIN_MULTIAP_DL}
-  URL:=${CONFIG_SULU_PLUGIN_MULTIAP_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_MULTIAP_NAME}
-  VERSION:=${CONFIG_SULU_PLUGIN_MULTIAP_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_PLUGIN_MULTIAP_ENABLE),y)
-$(eval $(call Download,sulu_plugin_multiap))
-endif
-
-SULU_THEME_IOPSYS_DL:=${CONFIG_SULU_THEME_IOPSYS_NAME}_plugin-${CONFIG_SULU_THEME_IOPSYS_VERSION}.tar.gz
-define Download/sulu_theme_iopsys
-  FILE:=${SULU_THEME_IOPSYS_DL}
-  URL:=${CONFIG_SULU_THEME_IOPSYS_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_THEME_IOPSYS_NAME}
-  VERSION:=${CONFIG_SULU_THEME_IOPSYS_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_THEME_IOPSYS_ENABLE),y)
-$(eval $(call Download,sulu_theme_iopsys))
-endif
-
-SULU_PLUGIN_CUSTOM_DL:=${CONFIG_SULU_PLUGIN_CUSTOM_NAME}_plugin-${CONFIG_SULU_PLUGIN_CUSTOM_VERSION}.tar.gz
-define Download/sulu_plugin_custom
-  FILE:=${SULU_PLUGIN_CUSTOM_DL}
-  URL:=${CONFIG_SULU_PLUGIN_CUSTOM_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_PLUGIN_CUSTOM_NAME}
-  VERSION:=${CONFIG_SULU_PLUGIN_CUSTOM_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_PLUGIN_CUSTOM_ENABLE),y)
-$(eval $(call Download,sulu_plugin_custom))
-endif
-
-SULU_THEME_CUSTOM_DL:=${CONFIG_SULU_THEME_CUSTOM_NAME}_plugin-${CONFIG_SULU_THEME_CUSTOM_VERSION}.tar.gz
-define Download/sulu_theme_custom
-  FILE:=${SULU_THEME_CUSTOM_DL}
-  URL:=${CONFIG_SULU_THEME_CUSTOM_URL}
-  PROTO:=git
-  SUBDIR:=plugins/${CONFIG_SULU_THEME_CUSTOM_NAME}
-  VERSION:=${CONFIG_SULU_THEME_CUSTOM_VERSION}
-  HASH:=skip
-endef
-
-ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y)
-$(eval $(call Download,sulu_theme_custom))
-endif
-
-define Build/Prepare
-	$(Build/Prepare/Default)
-	tar xzf $(DL_DIR)/${SULU_DL_FILE} -C $(PKG_BUILD_DIR)
-ifeq ($(CONFIG_SULU_PLUGIN_LCM_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_PLUGIN_LCM_DL} -C $(PKG_BUILD_DIR)
-endif
-ifeq ($(CONFIG_SULU_PLUGIN_MULTIAP_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_PLUGIN_MULTIAP_DL} -C $(PKG_BUILD_DIR)
-endif
-ifeq ($(CONFIG_SULU_THEME_IOPSYS_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_THEME_IOPSYS_DL} -C $(PKG_BUILD_DIR)
-endif
-ifeq ($(CONFIG_SULU_PLUGIN_CUSTOM_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_PLUGIN_CUSTOM_DL} -C $(PKG_BUILD_DIR)
-endif
-ifeq ($(CONFIG_SULU_THEME_CUSTOM_ENABLE),y)
-	tar xzf $(DL_DIR)/${SULU_THEME_CUSTOM_DL} -C $(PKG_BUILD_DIR)
-endif
-endef
-
-define Package/${PKG_NAME}/install
-	$(INSTALL_DIR) $(1)/sulu
-	$(INSTALL_DIR) $(1)/sulu/config
-	$(INSTALL_DIR) $(1)/etc/nginx/
-	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
-	$(CP) $(PKG_BUILD_DIR)/build/dist/* $(1)/sulu
-	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/*.json $(1)/sulu/config/
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,${PKG_NAME}))
-

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

@@ -1,27 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=10
-
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t sulu.init -p debug
-}
-
-start_service() {
-	procd_open_instance sulu
-	# append sulu connection injection
-	procd_close_instance
-
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers()
-{
-	procd_add_config_trigger "config.change" "obuspa" /etc/init.d/sulu reload
-}

sulu-builder/files/etc/mosquitto/conf.d/obuspa.conf

@@ -1,3 +0,0 @@
-listener 1883 127.0.0.1
-allow_anonymous true
-

sulu-builder/files/etc/mosquitto/conf.d/sulu.conf

@@ -1,5 +0,0 @@
-listener 9001
-protocol websockets
-plugin /usr/lib/mosquitto_auth_shadow.so
-require_certificate false
-allow_anonymous false

sulu-builder/files/etc/nginx/conf.d/sulu.locations

@@ -1,18 +0,0 @@
-location /config/ {
-	autoindex on;
-	if ($request_method = 'OPTIONS') {
-		add_header 'Access-Control-Allow-Origin' '*';
-		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS';
-		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range';
-		add_header 'Access-Control-Max-Age' 1728000;
-		add_header 'Content-Type' 'text/plain; charset=utf-8';
-		add_header 'Content-Length' 0;
-		return 204;
-	}
-	if ($request_method = 'GET') {
-		add_header 'Access-Control-Allow-Origin' '*' always;
-		add_header 'Access-Control-Allow-Methods' 'GET, POST, OPTIONS' always;
-		add_header 'Access-Control-Allow-Headers' 'DNT,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type,Range' always;
-		add_header 'Access-Control-Expose-Headers' 'Content-Length,Content-Range' always;
-	}
-}

sulu-builder/files/etc/uci-defaults/90-sulu-set-nginx-conf

@@ -1,10 +0,0 @@
-mkdir -p /tmp/sulu
-
-uci -q get nginx._sulu && exit 0
-
-uci -q set nginx._sulu=server
-uci -q add_list nginx._sulu.listen='8080'
-uci -q add_list nginx._sulu.listen='[::]:8080'
-uci -q set nginx._sulu.root='/sulu'
-uci -q set nginx._sulu.server_name='_sulu'
-uci -q add_list nginx._sulu.include='conf.d/sulu.locations'

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.0.10
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=ca38b2086cee7ba83b41eec56539e9432271a349
+PKG_SOURCE_VERSION:=13d88f2ad9193951ff711b89500f57c48fdc9635
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -28,7 +28,7 @@ define Package/sulu
 	CATEGORY:=Utilities
 	MENU=1
 	TITLE:=SULU-CE ReactJS based Web UI Package
-	DEPENDS:=+nginx +mosquitto-auth-shadow
+	DEPENDS:=+nginx
 endef
 
 define Package/sulu/description
@@ -39,7 +39,6 @@ define Package/sulu/install
 	$(INSTALL_DIR) $(1)/sulu
 	$(INSTALL_DIR) $(1)/sulu/config
 	$(INSTALL_DIR) $(1)/etc/nginx/
-	$(INSTALL_DIR) $(1)/etc/mosquitto/conf.d/
 	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
 	$(CP) $(PKG_BUILD_DIR)/config/* $(1)/sulu/config
 	$(CP) ./files/* $(1)/

sulu/files/etc/mosquitto/conf.d/obuspa.conf

@@ -1,3 +0,0 @@
-listener 1883 127.0.0.1
-allow_anonymous true
-

sulu/files/etc/mosquitto/conf.d/sulu.conf

@@ -1,5 +0,0 @@
-listener 9001
-protocol websockets
-plugin /usr/lib/mosquitto_auth_shadow.so
-require_certificate false
-allow_anonymous false

swmodd/Config.in

@@ -1,22 +1,9 @@
+if PACKAGE_swmodd
+
 menu "Configuration"
-	depends on PACKAGE_swmodd
 
-	config SWMODD_LXC_SUPPORT
-		bool "Handles LXC based containers"
-		default n
-		depends on PACKAGE_swmodd
-		select PACKAGE_liblxc
-
-	config SWMODD_OCI_SUPPORT
-		bool "Handles OCI containers"
-		default y
-		depends on PACKAGE_swmodd
-		select PACKAGE_crun
-
-	config SWMODD_REGISTRY_PULL_SUPPORT
-		bool "Add support to pull images from container image registries (i.e: docker.io, quay.io)"
-		default n
-		depends on PACKAGE_swmodd
-		select PACKAGE_skopeo
-		select PACKAGE_umoci
+config SWMOD_HOST_IS_EXECENV
+	bool "Enable host system as execution environment"
+	default n
 endmenu
+endif

swmodd/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.16
+PKG_VERSION:=2.1.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5124ea8051c06e8c3563b384660b08db199c93eb
+PKG_SOURCE_VERSION:=2f953ea76b5779a73a540777dfb450982802e4f8
 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
@@ -30,9 +30,8 @@ define Package/swmodd
   SUBMENU:=TRx69
   TITLE:= Software Modules Daemon
   DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
-	    +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
-	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
-	    +swmodd-cgroup +jq
+	    +PACKAGE_liblxc:liblxc +PACKAGE_liblxc:cgroupfs-mount \
+	    +@BUSYBOX_CONFIG_BUSYBOX +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT
 endef
 
 define Package/swmodd/description
@@ -43,28 +42,21 @@ define Package/swmodd/config
 	source "$(SOURCE)/Config.in"
 endef
 
-define Package/swmodd-cgroup
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:= Cgroup mount handler for Software modules daemon
-  DEPENDS:=+@CONFIG_KERNEL_CGROUPS
-endef
-
 TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
-ifeq ($(CONFIG_PACKAGE_crun),y)
-MAKE_FLAGS += \
-	SWMOD_CRUN="yes"
-endif
-
 ifeq ($(CONFIG_PACKAGE_liblxc),y)
 MAKE_FLAGS += \
 	SWMOD_LXC="yes"
 endif
 
+ifeq ($(CONFIG_SWMOD_HOST_IS_EXECENV),y)
+MAKE_FLAGS += \
+	SWMOD_HOST_IS_EXECENV="yes"
+endif
+
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
 	$(CP) -rf ~/git/swmodd/* $(PKG_BUILD_DIR)/
@@ -75,6 +67,7 @@ define Package/swmodd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_DIR) $(1)/etc/swmod
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/etc/init.d/swmodd $(1)/etc/init.d/swmodd
 	$(INSTALL_BIN) ./files/etc/config/swmodd $(1)/etc/config/swmodd
@@ -86,21 +79,6 @@ ifeq ($(CONFIG_PACKAGE_liblxc),y)
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/templates/lxc-iopsys $(1)/usr/share/lxc/templates/lxc-iopsys
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/opkg_offline.sh $(1)/usr/share/swmodd/opkg_offline
 endif
-ifeq ($(CONFIG_PACKAGE_crun),y)
-	$(INSTALL_DIR) $(1)/etc/swmodd
-	$(INSTALL_DIR) $(1)/etc/uci-defaults
-	$(INSTALL_BIN) ./files/etc/swmodd/run.sh $(1)/etc/swmodd/run.sh
-	$(INSTALL_BIN) ./files/etc/init.d/crun $(1)/etc/init.d/crun
-	$(INSTALL_BIN) ./files/etc/config/crun $(1)/etc/config/crun
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/crun_create $(1)/usr/sbin/crun_create
-	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-bundle-path $(1)/etc/uci-defaults/01-fix-bundle-path
-endif
 endef
 
-define Package/swmodd-cgroup/install
-	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_BIN) ./files/etc/init.d/swmodd_cgroup $(1)/etc/init.d/swmodd_cgroup
-endef
-
-$(eval $(call BuildPackage,swmodd-cgroup))
 $(eval $(call BuildPackage,swmodd))

swmodd/files/etc/config/crun

@@ -1,2 +0,0 @@
-config global global
-	option enable '1'

swmodd/files/etc/config/swmodd

@@ -1,5 +1,4 @@
 config globals 'globals'
-        option enabled '1'
-        option debug '1'
-        option log_level '3'
-        option lan_bridge 'br-lan'
+	option enabled '1'
+	option debug '1'
+	option log_level '3'

swmodd/files/etc/init.d/crun

@@ -1,190 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-
-USE_PROCD=1
-
-log() {
-	echo "${@}"|logger -t crun.init -p info
-}
-
-is_container_running() {
-	crun list |tail -n +2|grep -wq "^${1}"
-	return $?
-}
-
-configure_crun_container() {
-	local name type autostart du_status requested_state url username password
-	local BRIDGE BUNDLE
-	local RUNNER="/etc/swmodd/run.sh"
-
-	BUNDLE="${2}"
-	BRIDGE="${3}"
-
-	config_get name ${1} name ""
-	config_get type ${1} type ""
-	config_get_bool autostart ${1} autostart 1
-	config_get du_status ${1} du_status ""
-	config_get requested_state ${1} requested_state ""
-	config_get url ${1} url ""
-	config_get username ${1} username ""
-	config_get password ${1} password ""
-
-	if [ -z "${name}" ] || [ -z "${type}" ] || [ -z "${du_status}" ]; then
-		return 0;
-	fi
-
-	if [ "${type}" != "crun" ]; then
-		return 0;
-	fi
-
-	if [ "${du_status}" == "Installing" ]; then
-		local result
-		log "Pull image from registry"
-		uci_set ocicontainer ${1} du_status Installing_start
-		uci_set ocicontainer ${1} username ""
-		uci_set ocicontainer ${1} password ""
-		result=$(${RUNNER} -b "${BUNDLE}" -n "${name}" -r "${url}" -l "${username}:${password}")
-		if [ "$?" -eq 0 ]; then
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_description")
-			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} description "${result}"
-			fi
-
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_vendor")
-			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} vendor "${result}"
-			fi
-
-			result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_version")
-			if [ "${result}" != "null" ]; then
-				uci_set ocicontainer ${1} version "${result}"
-			fi
-
-			uci_set ocicontainer ${1} du_status Installing_success
-			du_status="Installed"
-		else
-			uci_set ocicontainer ${1} du_status Installing_failed
-			uci_set ocicontainer ${1} fault_string "${result}"
-			return 0;
-		fi
-	fi
-
-	if [ "${du_status}" == "Uninstalling" ]; then
-		ubus call service delete "{\"name\":\"crun\",\"instance\":\"${name}\"}"
-		if is_container_running "${name}"; then
-			crun kill --all "${name}" 9
-		fi
-		${RUNNER} -c -n "${name}"
-		if [ -d "${BUNDLE:?}/${name:?}" ]; then
-			rm -rf "${BUNDLE:?}/${name:?}"
-		fi
-
-		# If directory still exists then uninstall failed
-		if [ -d "${BUNDLE}/${name}" ]; then
-			uci_set ocicontainer ${1} du_status Uninstalling_failed
-			uci_set ocicontainer ${1} fault_string "Failed to remove ${BUNDLE}/${name}"
-		else
-			uci_set ocicontainer ${1} du_status Uninstalling_success
-		fi
-		# Delete the uci config section after uninstall
-		log "CRUN container ${name} removed"
-		return 0;
-	fi
-
-	if [ ! -d "${BUNDLE:?}/${name:?}" ]; then
-		log "Crun container {${BUNDLE:?}/${name:?}} not available"
-		return 0;
-	fi
-
-	if [ "${du_status}" != "Installed" ]; then
-		return 0;
-	fi
-
-	if [ "${autostart}" -eq 0 ]; then
-		ubus call service delete "{\"name\":\"crun\",\"instance\":\"${name}\"}"
-		# stop the container if not enabled
-		crun kill --all "${name}" 9
-		return 0;
-	fi
-
-	if is_container_running "${name}"; then
-		log "Container [$name] req_status [${requested_state}]"
-		if [ "${requested_state}" == "Idle" ]; then
-			crun pause "${name}"
-		elif [ "${requested_state}" == "Active" ]; then
-			${RUNNER} -u -n "${name}" -i "${BRIDGE}"
-			crun resume "${name}"
-		fi
-	else
-		${RUNNER} -U -b "${BUNDLE}" -n "${name}"
-		result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_description")
-		if [ "${result}" != "null" ]; then
-			uci_set ocicontainer ${1} description "${result}"
-		fi
-
-		result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_vendor")
-		if [ "${result}" != "null" ]; then
-			uci_set ocicontainer ${1} vendor "${result}"
-		fi
-
-		result=$(cat ${BUNDLE}/${name}/config.json |jq ".annotations.org_opencontainers_image_version")
-		if [ "${result}" != "null" ]; then
-			uci_set ocicontainer ${1} version "${result}"
-		fi
-	fi
-
-        procd_open_instance "${name}"
-        procd_set_param stdout 1
-        procd_set_param stderr 1
-        procd_set_param command "${RUNNER}"
-        procd_append_param command -b "${BUNDLE}" -n "${name}" -i "${BRIDGE}"
-        procd_set_param respawn
-        procd_close_instance "${name}"
-}
-
-start_service() {
-	local bundle bridge
-
-	# Check if crun present
-	if ! command -v crun >/dev/null 2>&1; then
-		log "CRUN binary not found"
-		return 0;
-	fi
-
-	config_load swmodd
-	config_get bundle globals oci_bundle_root ""
-	config_get bridge globals lan_bridge "br-lan"
-
-	if [ -z "${bundle}" ] || [ -z "${bridge}" ]; then
-		log "Empty bundle path or bridge"
-		return 0;
-	fi
-
-	if [ -f "${bundle}/ocicontainer" ]; then
-		UCI_CONFIG_DIR="${bundle}"
-		config_load ocicontainer
-		config_foreach configure_crun_container du_eu_assoc "${bundle}" "${bridge}"
-		uci_commit
-		# Add a timer for DuStateChange!
-		(sleep 5 && ubus -t 5 call swmodules reload) &
-	fi
-}
-
-stop_service() {
-	local cid
-
-	cid="$(crun list|tail -n +2 |awk '{printf $1 " "}')"
-	for f in $cid; do
-		crun kill --all "${f}" 9
-	done
-}
-
-reload_service() {
-        start
-}
-
-service_triggers() {
-	procd_add_reload_trigger "crun" "network"
-}

swmodd/files/etc/init.d/swmodd

@@ -12,97 +12,46 @@ validate_globals_section()
 		'enabled:bool:1' \
 		'debug:bool:false' \
 		'log_level:uinteger:1' \
-		'lxc_bundle_root:string' \
-		'oci_bundle_root:string' \
 		'sock:string'
 }
 
-start_lxc_container() {
-	config_get name "${1}" name ""
-	config_get type "${1}" type ""
-	config_get autostart "${1}" autostart "0"
-	config_get timeout "${1}" timeout "300"
-
-	if [ -z "${name}" ] || [ -z "${type}" ]; then
-		return 0;
-	fi
-
-	if [ "${type}" != "lxc" ]; then
-		return 0;
-	fi
-
-	state=$(lxc-ls -f | tail -n +2 | grep -w "${name}" | cut -d " " -f 2)
-	if [ -z "${state}" ]; then
-		return 0;
-	fi
-
-	if [ "${autostart}" == "0" ]; then
-		if [ "${state}" == "RUNNING" ]; then
-			# stop the container if running
-			lxc-stop -n "${name}" -t "${timeout}" &
-			return 0;
-		elif [ "${state}" == "FROZEN" ]; then
-			# first unfreeze then stop
-			lxc-unfreeze -n "${name}"
-			lxc-stop -n "${name}" -t "${timeout}" &
-			return 0;
-		fi
-	else
-		if [ "${state}" == "FROZEN" ]; then
-			# unfreeze the container
-			lxc-unfreeze -n "${name}"
-		elif [ "${state}" == "STOPPED" ]; then
-			# start the container
-			lxc-start -n "${name}"
-			return 0;
-		fi
-	fi
-}
-
 start_service() {
-	local enabled debug log_level sock lxc_bundle_root oci_bundle_root
+	local enabled debug log_level sock
+
+	# creating fallback shared mount-point
+	mkdir -p /tmp/swmodd_dw
 
 	config_load swmodd
 
 	validate_globals_section || {
+		log "Validation of uci globals failed"
 		return 1;
 	}
 
 	[ "${enabled}" -eq 0 ] && return 0
 
-	# Create the bundle paths if not present
-	[ -n "${lxc_bundle_root}" ] && mkdir -p "${lxc_bundle_root}"
-	[ -n "${oci_bundle_root}" ] && mkdir -p "${oci_bundle_root}"
-
 	procd_open_instance swmodd
 	procd_set_param command ${PROG}
 
 	if [ "${debug}" -eq 1 ]; then
 		procd_set_param stdout 1
 		procd_set_param stderr 1
-		procd_append_param command -l "${log_level}"
+		procd_append_param command -l ${log_level}
 	fi
 
 	if [ -f "${sock}" ]; then
-		procd_append_param command -s "${sock}"
+		procd_append_param command -s ${sock}
 	fi
 
 	procd_set_param respawn
 	procd_close_instance
+}
 
-	# Auto-start the lxc containers
-	if [ -f "${lxc_bundle_root}/lxccontainer" ]; then
-		UCI_CONFIG_DIR="${lxc_bundle_root}"
-		config_load lxccontainer
-		config_foreach start_lxc_container container
-	fi
+stop_service() {
+	service_stop ${PROG}
 }
 
 reload_service() {
 	stop
 	start
 }
-
-service_triggers() {
-       procd_add_reload_trigger "swmodd"
-}

swmodd/files/etc/init.d/swmodd_cgroup

@@ -1,56 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=01
-
-log() {
-	echo "swmodd_cgroup: ${@}" >/dev/console
-}
-
-cgroup_remounting_required()
-{
-	if ! mount |grep -q '/sys/fs/cgroup '; then
-		return 1;
-	fi
-
-	if grep -v '^#' /etc/fstab | grep -q cgroup; then
-		log "fstab mounted system, remounting of cgroup not required"
-		return 1
-	fi
-
-	if [ ! -d /sys/fs/cgroup ] && [ ! -e /proc/cgroups ]; then
-		log "cgroup fs not found"
-		return 1
-	fi
-
-	umount /sys/fs/cgroup
-	return 0;
-}
-
-mount_cgroup()
-{
-
-	if ! cgroup_remounting_required; then
-		log "cgroup remounting not required"
-		return 1
-	fi
-
-	mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-	cd /sys/fs/cgroup
-	for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-		mkdir -p $sys
-		if ! mountpoint -q $sys; then
-			if ! mount -n -t cgroup -o $sys cgroup $sys; then
-				rm -f $sys || true
-			fi
-		fi
-	done
-
-	if [ -e /sys/fs/cgroup/memory/memory.use_hierarchy ]; then
-		echo 1 > /sys/fs/cgroup/memory/memory.use_hierarchy
-	fi
-}
-
-boot()
-{
-	mount_cgroup
-}

swmodd/files/etc/swmodd/run.sh

@@ -1,262 +0,0 @@
-#!/bin/sh
-
-VETHNAME=""
-
-log() {
-	echo "${@}"|logger -t crun.runner -p info
-	echo "${@}"
-}
-
-check_binary() {
-	if [ -z "${1}" ]; then
-		return 0;
-	fi
-
-	if ! command -v "${1}" >/dev/null 2>&1;then
-		log "${1} not present in system"
-		exit 1
-	fi
-	return 0;
-}
-
-check_binary crun
-check_binary script
-
-get_veth_name() {
-	local name
-
-	name="cr$1"
-	VETHNAME="${name:0:15}"
-}
-
-clean_container_network() {
-	local name
-
-	name="${1}"
-	# clean up
-	if ip netns list|grep -qw "${name}"; then
-		get_veth_name "${name}"
-		ip netns del "${name}"
-		ip link delete "${VETHNAME}" type veth peer name eth0
-	fi
-}
-
-setup_container_network() {
-	local name bridge_name
-
-	if [ "$#" -lt 2 ]; then
-		return 0
-	fi
-
-	name="${1}"
-	bridge_name="${2}"
-
-	clean_container_network "${name}"
-	get_veth_name "${name}"
-	# Add a namespace
-	ip netns add "${name}"
-	# Add a veth pair
-	ip link add "${VETHNAME}" type veth peer name eth0 netns "$name"
-	# Make veth on network side up
-	ip netns exec "$name" ip link set dev eth0 up
-	# Create loopback interface
-	ip netns exec "$name" ip link set lo up
-	# Make veth on host side up
-	ip link set dev "${VETHNAME}" up
-	# Link with host bridge
-	brctl addif "${bridge_name}" "${VETHNAME}"
-	# Get Ip from bridge and make the link ready
-	ip netns exec "$name" udhcpc -i eth0 -x hostname:"CRUN-${name}"
-	if [ "${du_status}" != "Installed" ]; then
-		return 0;
-	fi
-
-}
-
-run_container() {
-	local bundle name bridge
-
-	bundle="${1}"
-	name="${2}"
-	bridge="${3}"
-
-	if [ ! -d "${bundle:?}/${name:?}" ]; then
-		log "Bundle does not exists"
-		return 1
-	fi
-
-	setup_container_network "${name}" "${bridge}"
-	
-        script -q -c "crun run -b ${bundle}/${name} ${name}" /dev/null
-}
-
-update_network_ns() {
-    local type
-    json_select $2
-    json_get_var type type
-    if [ "${type}" == "network" ]; then
-        json_add_string path "/var/run/netns/${NAME}"
-	break;
-    fi
-    json_select ..
-}
-
-nginx_hack() {
-	# replace nginx user to root user
-	if [ -f "${BUNDLE:?}/${NAME:?}/rootfs/etc/nginx/nginx.conf" ]; then
-		sed -i 's/^user .*;$/user root;/' "${BUNDLE}/${NAME}/rootfs/etc/nginx/nginx.conf"
-	fi
-}
-
-update_config_json() {
-
-	if [ ! -f "${BUNDLE:?}/${NAME:?}/config.json" ]; then
-		log "config.json not found or bundle missing"
-		exit 0;
-	fi
-
-	if [ -f "/usr/share/libubox/jshn.sh" ]; then
-		. /usr/share/libubox/jshn.sh
-	else
-		log "jshn.sh missing in the system"
-		exit 1;
-	fi
-	cd "${BUNDLE}/${NAME}"
-	if cat config.json |jq '.linux.namespaces[] |select (.type == "network") |.path' |grep -q ${NAME}; then
-		exit 0;
-	fi
-
-	mv config.json config_orig.json
-	json_init
-	json_load_file "config_orig.json"
-	json_select linux
-	json_for_each_item update_network_ns namespaces
-	json_dump >config.json
-
-	nginx_hack
-}
-
-pull_image_from_registry() {
-	local temp disksize exsize
-
-	if [ -z "${BUNDLE}" -o -z "${NAME}" -o -z "${REGURL}" ]; then
-		log "Information missing for installation"
-		exit 1
-	fi
-
-	if [ -d "${BUNDLE}/${NAME}" ]; then
-		log "Container with same name already present"
-		exit 1
-	fi
-
-	check_binary skopeo
-	check_binary umoci
-	temp="$(mktemp -d)"
-	if [ ! -d "${temp}" ]; then
-		log "Failed to create temp directory"
-		exit 1
-	fi
-
-	cd "${temp}"
-	OPTS=""
-	INSPECT_OPT=""
-	if [ "${#LOGIN}" -gt 3 ]; then
-		OPTS="--src-creds ${LOGIN}"
-		INSPECT_OPT="--creds ${LOGIN}"
-	fi
-	if ! skopeo --command-timeout 4m copy ${OPTS} ${REGURL} oci:${NAME}_tmp:latest >/dev/null 2>&1; then
-		log "Failed to download image"
-		cd -
-		rm -rf "${temp}"
-		exit 1
-	fi
-	if ! umoci unpack --image ${NAME}_tmp:latest ${NAME} >/dev/null 2>&1; then
-		log "Failed to unpack image"
-		cd -
-		rm -rf "${temp}"
-		exit 1
-	fi
-	rm -rf "${NAME}_tmp"
-	if [ ! -f "${NAME}/config.json" ]; then
-		log "Failed to pull the image config missing"
-		cd -
-		rm -rf "${temp}"
-		exit 1
-	fi
-
-	# Check disk available space before copy
-	disksize=$(df -P -k ${BUNDLE} |tail -n +2 |awk '{print $4}')
-	exsize=$(du -s ${temp} |awk '{print $1}')
-	if [ "${disksize}" -lt "${exsize}" ]; then
-		log "Disk space ${disksize} less that required ${exists}"
-		cd -
-		rm -rf "${temp}"
-		exit 1
-	fi
-
-	mv ${NAME} ${BUNDLE}/
-	if [ "$?" -ne 0 ]; then
-		log "Failed ${name} move in ${BUNDLE}"
-		cd -
-		rm -rf "${temp}"
-		rm -rf ${BUNDLE}/${NAME}
-		exit 1
-	fi
-
-	cd -
-	rm -rf "${temp}"
-	update_config_json
-}
-
-clean=0
-net_update=0
-update_json=0
-while getopts b:n:i:r:l:cuU options
-do
-	case "${options}" in
-		b) BUNDLE=${OPTARG};;
-		n) NAME=${OPTARG};;
-		i) BRIDGE=${OPTARG};;
-		r) REGURL=${OPTARG};;
-		l) LOGIN=${OPTARG};;
-		c) clean=1;;
-		u) net_update=1;;
-		U) update_json=1;;
-		*) log "Invalid options";;
-	esac
-done
-
-if [ -z "${NAME}" ]; then
-	log "Emtpy container name"
-	return 0;
-fi
-
-if [ "${update_json}" -eq 1 ]; then
-	update_config_json
-	return 0;
-fi
-
-if [ -n "${REGURL}" ]; then
-	pull_image_from_registry
-	return 0;
-fi
-
-if [ "$clean" -eq 1 ]; then
-	clean_container_network "${NAME}"
-	return 0;
-fi
-
-if [ -z "${BRIDGE}" ]; then
-	log "Empty bridge name"
-	return 0;
-fi
-
-if [ "${net_update}" -eq 1 ]; then
-	get_veth_name "${NAME}"
-	brctl addif "${BRIDGE}" "${VETHNAME}"
-	return 0;
-fi
-
-if [ -n "${BUNDLE}" ] ; then
-	run_container "${BUNDLE}" "${NAME}" "${BRIDGE}"
-fi

swmodd/files/etc/uci-defaults/01-fix-bundle-path

@@ -1,43 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-lxc=""
-lxc_bundle=""
-oci_bundle=""
-
-if [ -f "/etc/lxc/lxc.conf" ]; then
-	lxc=$(cat /etc/lxc/lxc.conf |grep "lxc.lxcpath"| cut -d "=" -f 2)
-fi
-
-config_load swmodd
-config_get lxc_bundle globals lxc_bundle_root ""
-config_get oci_bundle globals oci_bundle_root ""
-
-if [ -n "${lxc_bundle}" ]; then
-	# if lxc_bundle_root define in swmodd, update it in lxc path
-	mkdir -p /etc/lxc
-	echo "lxc.lxcpath = ${lxc_bundle}" > /etc/lxc/lxc.conf
-elif [ -n "${lxc}" ]; then
-	# if lxc_bundle_root not define in swmodd, update it with lxc path
-	uci_set swmodd globals lxc_bundle_root ${lxc}
-	uci_commit
-else
-	mkdir -p /etc/lxc
-	echo "lxc.lxcpath = /srv/" > /etc/lxc/lxc.conf
-	uci_set swmodd globals lxc_bundle_root "/srv/"
-	uci_commit
-fi
-
-if [ -z "${oci_bundle}" ] && [ -n "${lxc_bundle}" ]; then
-	# if oci_bundle_root not defined in swmodd, update it with lxc_bundle_root if defined
-	uci_set swmodd globals oci_bundle_root ${lxc_bundle}
-	uci_commit
-elif [ -z "${oci_bundle}" ] && [ -n "${lxc}" ]; then
-	# if oci_bundle_root not defined in swmodd, update it with lxc path
-	uci_set swmodd globals oci_bundle_root ${lxc}
-	uci_commit
-elif [ -z "${oci_bundle}" ]; then
-	uci_set swmodd globals oci_bundle_root "/srv/"
-	uci_commit
-fi

twamp/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.0
 
 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:=b0111c35ff4908edd82c5d5f4a3c0d6809605b94
+PKG_SOURCE_VERSION:=4dfc8609fb0cefaaf9e86b559b1e10488117cf07
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -41,7 +41,7 @@ TARGET_CFLAGS += \
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	$(CP) -rf ~/git/twamp-light/* $(PKG_BUILD_DIR)/
+	$(CP) -rf ~/git/twamp/* $(PKG_BUILD_DIR)/
 endef
 endif
 
@@ -58,7 +58,6 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) ./files/etc/init.d/twampd $(1)/etc/init.d/twampd
 	$(INSTALL_BIN) ./files/etc/firewall.twamp $(1)/etc/firewall.twamp
 	$(INSTALL_BIN) ./files/etc/uci-defaults/92-twampfirewall $(1)/etc/uci-defaults/92-twampfirewall
-	$(INSTALL_BIN) ./files/etc/uci-defaults/93-twamp_fix_reflector $(1)/etc/uci-defaults/93-twamp_fix_reflector
 endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))

twamp/files/etc/config/twamp

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

twamp/files/etc/firewall.twamp

@@ -29,7 +29,7 @@ function configure_firewall()
 
 function delete_rule()
 {
-        while iptables -w 1 -L zone_${1}_input --line-numbers | grep "TWAMP reflector port" > /dev/null 2>&1; do
+        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
 }

twamp/files/etc/uci-defaults/93-twamp_fix_reflector

@@ -1,22 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-function rename_section()
-{
-	local enable inst
-
-	config_get interface ${1} interface ""
-	if [ -z "${interface}" ]; then
-		return 0
-	fi
-
-	inst="$(echo ${1}|cut -d '_' -f 2)"
-	uci_rename twamp ${1} "${interface}_${inst}"
-}
-
-config_load twamp
-config_foreach rename_section twamp_reflector
-
-exit 0
-

umoci/Makefile

@@ -1,8 +1,8 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=umoci
-PKG_VERSION:=0.4.7
-PKG_RELEASE:=$(AUTORELEASE)
+PKG_VERSION:=0.0.1
+PKG_RELEASE:=1
 PKG_LICENSE:=Apache-2.0
 PKG_LICENSE_FILES:=LICENSE
 
@@ -10,7 +10,7 @@ PKG_SOURCE_PROTO:=git
 PKG_SOURCE_NAME:=umoci
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/opencontainers/umoci.git
-PKG_SOURCE_VERSION:=17f38511d61846e2fb8ec01a1532f3ef5525e71d
+PKG_SOURCE_VERSION:=2cec49f54b72684ef170f11c708c56140f298bf7
 PKG_MIRROR_HASH:=skip
 
 PKG_BUILD_DEPENDS:=golang/host
@@ -18,12 +18,11 @@ PKG_BUILD_PARALLEL:=1
 PKG_USE_MIPS16:=0
 
 GO_PKG:=github.com/opencontainers/umoci/
+GO_PKG_LDFLAGS_X:=main.gitCommit=$(PKG_SOURCE_VERSION) main.version=$(PKG_SOURCE_VERSION)
 
-include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 
 GOLANG_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-package.mk)
-GOLANG_HOST_PACKAGE_MK:=$(wildcard $(TOPDIR)/feeds/*/lang/golang/golang-host-build.mk)
 
 # verify that there is only one single file returned
 ifneq (1,$(words $(GOLANG_PACKAGE_MK)))
@@ -37,7 +36,6 @@ $(info found golang-package.mk at $(GOLANG_PACKAGE_MK))
 endif
 
 include $(GOLANG_PACKAGE_MK)
-include $(GOLANG_HOST_PACKAGE_MK)
 
 define Package/umoci
   SECTION:=utils
@@ -63,7 +61,5 @@ define Package/umoci/install
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/umoci $(1)/usr/bin
 endef
 
-$(eval $(call GoBinHostBuild))
-$(eval $(call HostBuild))
 $(eval $(call GoBinPackage,umoci))
 $(eval $(call BuildPackage,umoci))

urlfilter/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
-PKG_SOURCE_VERSION:=e55a2c2c7c992eb5071e82734bdc8850b71b02e0
+PKG_SOURCE_VERSION:=5a64642ac33e629151788b3ff1de920776bcd2ed
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

uspd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.14
+PKG_VERSION:=2.2.11
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE_VERSION:=1c3b886bb5e654049ae81cda726dffae950369c7
+PKG_SOURCE_VERSION:=1bfd9937ae31c6878aff77fca25f9265d822b57d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wfa-capi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfa-capi
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.2
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=64d9101c8e4930cbd3fe6ce471fb4cfd2b9b80dc
+PKG_SOURCE_VERSION:=ce29c2d69d0ca96b61f2de5d1ba107c8d31cb5ef
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfa-capi.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=2.10.0.0
+PKG_VERSION:=2.8.0.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b75a1271c718e4fb2a45b5ac4fe73d192c864713
+PKG_SOURCE_VERSION:=01fd303670eef525e35c5337c4cf15418588273f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -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

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=14.2.3
+PKG_VERSION:=14.0.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f57015819a20d8d172899b1831fa29a9578011e8
+PKG_SOURCE_VERSION:=af1c9ae51544532bc535814de63f9a55d2388792
 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