map-agent: bsta clean default_disabled

When we know credentials clean default_disabled.

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

bbf/Config_bbfdm.in

@@ -1,3 +1,5 @@
+if PACKAGE_libbbfdm
+
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -10,6 +12,10 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
+config BBF_TR181
+	bool "Enable TR-181 Data Model Support"
+	default y
+
 config BBF_TR104
 	bool "Enable TR-104 Data Model Support"
 	default y
@@ -20,8 +26,24 @@ config BBF_TR143
 
 config BBFDM_ENABLE_JSON_PLUGIN
 	bool "Enable json plugin to extend datamodel"
-	default y
+	default n
 
 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
-	default y
+	default n
+
+choice
+	prompt "Select SSL utility"
+	default BBF_USE_WOLFSSL
+
+config BBF_USE_WOLFSSL
+	bool "Use WolfSSL for ssl utilities"
+	select CONFIG_PACKAGE_libwolfssl
+
+config BBF_USE_OPENSSL
+	bool "Use OpenSSL for ssl utilities"
+	select CONFIG_PACKAGE_libopenssl
+
+endchoice
+
+endif

bbf/Makefile

@@ -5,20 +5,21 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.24
-
-PKG_SOURCE_PROTO:=git
+PKG_VERSION:=6.6.7
+PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=daa67e6bad5526c5904715214ac553366255765c
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=68b452d8030dbb8451d8dc19892c17880b234c45
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE
 
-PKG_FIXUP:=autoreconf
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libbbf_api
@@ -26,45 +27,16 @@ define Package/libbbf_api
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for libbbfdm API
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
-endef
-
-define Package/libbbfdm/default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libopenssl +libwolfssl
 endef
 
 define Package/libbbfdm
-  $(Package/libbbfdm/default)
-  TITLE += (internal)
-  VARIANT:=internal
-endef
-
-define Package/libbbfdm-mbedtls
-  $(Package/libbbfdm/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/libbbfdm-openssl
-  $(Package/libbbfdm/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
-  CONFLICTS := libbbfdm-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/libbbfdm-wolfssl
-  $(Package/libbbfdm/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
-  CONFLICTS := libbbfdm-mbedtls libbbfdm-openssl
-  VARIANT:=wolfssl
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libcurl +libopenssl +libwolfssl
+  MENU:=1
 endef
 
 define Package/libbbfdm/config
@@ -90,8 +62,10 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror \
 
+ifeq ($(CONFIG_BBF_TR181),y)
 CONFIGURE_ARGS += \
 	--enable-tr181
+endif
 
 ifeq ($(CONFIG_BBF_TR104),y)
 CONFIGURE_ARGS += \
@@ -123,19 +97,16 @@ CONFIGURE_ARGS += \
 	--enable-shared-library
 endif
 
-ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
+ifeq ($(CONFIG_BBF_USE_WOLFSSL), y)
 CONFIGURE_ARGS += --enable-libwolfssl
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += "-lwolfssl"
 endif
 
-ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIGURE_ARGS += --enable-libmbedtls
+ifeq ($(CONFIG_BBF_USE_OPENSSL), y)
+CONFIGURE_ARGS += --enable-libopenssl
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+TARGET_LDFLAGS += "-lssl"
 endif
 
 define Package/libbbf_api/install
@@ -143,7 +114,7 @@ define Package/libbbf_api/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
 endef
 
-define Package/libbbfdm/default/install
+define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
@@ -154,20 +125,12 @@ define Package/libbbfdm/default/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef
 
-define Package/libbbfdm/default/prerm
+define Package/libbbfdm/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
 endef
 
-Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
-
-Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -182,6 +145,3 @@ endef
 
 $(eval $(call BuildPackage,libbbf_api))
 $(eval $(call BuildPackage,libbbfdm))
-$(eval $(call BuildPackage,libbbfdm-openssl))
-$(eval $(call BuildPackage,libbbfdm-wolfssl))
-$(eval $(call BuildPackage,libbbfdm-mbedtls))

bulkdata/Makefile

@@ -8,65 +8,38 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.3
 
-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=b35e7862bc17fc11dc1f757c7b93900995a28633
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=b35e7862bc17fc11dc1f757c7b93900995a28633
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/bulkdata/default
+define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbf_api
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm +libbbf_api
 endef
 
-define Package/bulkdata-mbedtls
-  $(Package/bulkdata/default)
-  TITLE += (mbedtls)
-  DEPENDS += +libbbfdm-mbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/bulkdata-openssl
-  $(Package/bulkdata/default)
-  TITLE += (openssl)
-  DEPENDS += +libbbfdm-openssl
-  CONFLICTS := bulkdata-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/bulkdata-wolfssl
-  $(Package/bulkdata/default)
-  TITLE += (wolfssl)
-  DEPENDS += +libbbfdm-wolfssl
-  CONFLICTS := bulkdata-mbedtls bulkdata-openssl
-  VARIANT:=wolfssl
+define Package/$(PKG_NAME)/description
+	BBF BulkData Collection
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror
+	-D_GNU_SOURCE
 
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/bulkdata/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/bulkdata/default/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
@@ -74,10 +47,4 @@ define Package/bulkdata/default/install
 	$(CP) ./files/* $(1)/
 endef
 
-Package/bulkdata-openssl/install = $(Package/bulkdata/default/install)
-Package/bulkdata-wolfssl/install = $(Package/bulkdata/default/install)
-Package/bulkdata-mbedtls/install = $(Package/bulkdata/default/install)
-
-$(eval $(call BuildPackage,bulkdata-openssl))
-$(eval $(call BuildPackage,bulkdata-wolfssl))
-$(eval $(call BuildPackage,bulkdata-mbedtls))
+$(eval $(call BuildPackage,$(PKG_NAME)))

dectmngr/Makefile

@@ -14,7 +14,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=96011a9ac7f8b714846ac0ba629528a078de8d9a
+PKG_SOURCE_VERSION:=d46c60babb1212ff296ae0842e456f5685291d13
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c
+	DEPENDS:= +libubox +ubus +uci +libxml2
 endef
 
 define Package/$(PKG_NAME)/description

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.44
+PKG_VERSION:=6.4.37
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e4f811b7cd2836cdcce5ea0f97f515a317da5bc3
+PKG_SOURCE_VERSION:=f3b8deb144236abe2e839cf441fc51611bfd31ec
 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

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:=2390a3503990e04e33e8e448ad9dccc00f206908
+PKG_SOURCE_VERSION:=3a71d4124061287783e0d4c763b1b20e925d2133
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

evoice/Makefile

@@ -10,8 +10,8 @@ PKG_VERSION:=0.1
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=c8d7ddd92be4ee5edb243112c590036ccc02f410
+PKG_SOURCE_URL:=https://dev.iopsys.eu/ensemble/evoice.git
+PKG_SOURCE_VERSION:=1f790ba0cbc1b62c4bff9fd09a20cb0c299422da
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -51,15 +51,12 @@ export _XFLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc -I$(IDIR)/bcm963xx/xchg/bos/pub
 
 define Build/Compile
 	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=SVrgBcmFxs LIF=cerder DBG=dbg
-	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=libvoiceservice LIF=cerder DBG=dbg
 endef
 
 define Package/evoice/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(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/
 endef
 
 $(eval $(call BuildPackage,evoice))

evoice/files/etc/config/voice

@@ -6,7 +6,7 @@ config SIPClient 'Client1'
 	option AuthPassword '51234'
 	option Network 'Network1'
 	option MaxSessions '5'
-	option RegisiterURI '51234@sip-proxy.iopsys.eu'
+	option RegisiterURI '51234@192.164.4.210'
 	option E164Format '1'
 
 config SIPClient 'Client2'
@@ -16,22 +16,22 @@ config SIPClient 'Client2'
 	option AuthPassword '51235'
 	option Network 'Network1'
 	option MaxSessions '5'
-	option RegisiterURI '51235@sip-proxy.iopsys.eu'
+	option RegisiterURI '51235@192.164.4.210'
 	option E164Format '1'
 
 config SIPNetwork 'Network1'
 	option Enable '1'
-	option ProxyServer 'sip-proxy.iopsys.eu'
+	option ProxyServer '192.168.4.210'
 	option ProxyServerPort '5060'
 	option ProxyServerTransport 'UDP'
-	option RegistrarServer 'sip-proxy.iopsys.eu'
+	option RegistrarServer '192.168.4.210'
 	option RegistrarServerPort '5060'
 	option RegistrarServerTransport 'UDP'
 	option RegistrationPeriod '3240'
 	option RegisterExpires '3600'
-	option UserAgentDomain ' '
+    option UserAgentDomain ' '
 	option TimerRegistrationFailed '120'
-	option TimerT1 '500'
+    option TimerT1 '500'
 	option VoIPProfile 'VoIPProfile1'
 	list CodecList '1CodecProfile1'
 	list CodecList '1CodecProfile2'
@@ -210,13 +210,20 @@ config CallingFeatures 'Set2'
 	option CallWaitingEnable '1'
 
 config NumberingPlan 'NumberingPlan1'
-	option MinimumNumberOfDigits '1'
+	option MinimumNumberOfDigits '5'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit ' '
+
+config NumberingPlan 'NumberingPlan2'
+	option MinimumNumberOfDigits '5'
 	option MaximumNumberOfDigits '15'
 	option InterDigitTimerStd '2000'
 	option InterDigitTimerOpen '2000'
 	option TerminationDigit '#'
 
-config NumberingPlan 'NumberingPlan2'
+config NumberingPlan 'NumberingPlan3'
 	option MinimumNumberOfDigits '5'
 	option MaximumNumberOfDigits '15'
 	option InterDigitTimerStd '2000'
@@ -232,7 +239,7 @@ config NumberingPlan 'NumberingPlan2'
 	list PrefixList '3PrefixInfo8'
 	list PrefixList '3PrefixInfo9'
 
-config NumberingPlan 'NumberingPlan3'
+config NumberingPlan 'NumberingPlan4'
 	option MinimumNumberOfDigits '5'
 	option MaximumNumberOfDigits '15'
 	option InterDigitTimerStd '2000'
@@ -248,7 +255,7 @@ config PrefixInfo '3PrefixInfo1'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CW_ACTIVATE'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo2'
 	option Enable '1'
@@ -258,7 +265,7 @@ config PrefixInfo '3PrefixInfo2'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CW_DEACTIVATE'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo3'
 	option Enable '1'
@@ -268,7 +275,7 @@ config PrefixInfo '3PrefixInfo3'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFU_ACTIVATE'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo4'
 	option Enable '1'
@@ -278,7 +285,7 @@ config PrefixInfo '3PrefixInfo4'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFU_DEACTIVATE'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo5'
 	option Enable '1'
@@ -288,7 +295,7 @@ config PrefixInfo '3PrefixInfo5'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFB_ACTIVATE'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo6'
 	option Enable '1'
@@ -298,7 +305,7 @@ config PrefixInfo '3PrefixInfo6'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFB_DEACTIVATE'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo7'
 	option Enable '1'
@@ -308,7 +315,7 @@ config PrefixInfo '3PrefixInfo7'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFNR_ACTIVATE'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo8'
 	option Enable '1'
@@ -318,7 +325,7 @@ config PrefixInfo '3PrefixInfo8'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFNR_DEACTIVATE'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config PrefixInfo '3PrefixInfo9'
 	option Enable '1'
@@ -328,7 +335,7 @@ config PrefixInfo '3PrefixInfo9'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CA_ACTIVATE'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config PrefixInfo '4PrefixInfo1'
 	option Enable '1'
@@ -338,7 +345,7 @@ config PrefixInfo '4PrefixInfo1'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'X_IOPSYS_EU_EMERGENCY'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '
 
 config DialPlan 'X_IOPSYS_EU_InternalNumber1'
 	option RegExp '1X#'

icwmp/Config_cwmp.in

@@ -1,30 +1,36 @@
+if PACKAGE_icwmp
+
 choice
-       prompt "Select ACS sever"
-       default CWMP_ACS_MULTI
-       depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
+	prompt "Select ACS sever"
+	default CWMP_ACS_MULTI
 
 config CWMP_ACS_MULTI
 	bool "No specific ACS, follow standard"
 
 config CWMP_ACS_HDM
-	bool "Select HDM as ACS server"
+	bool "HDM"
 endchoice
 
 config CWMP_DEBUG
 	bool "Compile with debug options"
-	depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
 	default y
 
 config CWMP_DEVEL_DEBUG
-	bool "Compile with development debug options (deprecated)"
-	depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
+	bool "Compile with development debug options"
 	default n
+
+choice
+	prompt "Select SSL utility"
+	default CWMP_USE_WOLFSSL
+
+config CWMP_USE_WOLFSSL
+	bool "Use WolfSSL for ssl utilities"
+	select CONFIG_PACKAGE_libwolfssl
+
+config CWMP_USE_OPENSSL
+	bool "Use OpenSSL for ssl utilities"
+	select CONFIG_PACKAGE_libopenssl
+
+endchoice
+endif
+

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,92 +8,57 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.0
-
-PKG_SOURCE_PROTO:=git
+PKG_VERSION:=8.3.2
+PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=a8463946f3df9227685947a6b5a7ffde17b10a44
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=8df8a9a6a079775f79f4461be0c6e06dd7a17211
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
 PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
+PKG_LICENSE_FILES:=COPYING
 
-PKG_FIXUP:=autoreconf
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
 	CONFIG_CWMP_ACS_HDM \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
-define Package/icwmp/default
+define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
+  TITLE:=CWMP client
+  DEPENDS:=+libuci +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libwolfssl +curl +libcurl +libopenssl
+  MENU := 1
 endef
 
-define Package/icwmp/config
+define Package/$(PKG_NAME)/description
+ A free client implementation of CWMP (TR-069) protocol
+endef
+
+define Package/$(PKG_NAME)/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef
 
+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
+define Build/Prepare
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 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)
-  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
-  VARIANT:=openssl
-endef
-
-define Package/icwmp-wolfssl
-  $(Package/icwmp/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
-  CONFLICTS := icwmp-openssl
-  VARIANT:=wolfssl
-endef
-
-define Package/icwmp-mbedtls
-  $(Package/icwmp/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_icwmp-mbedtls:libmbedtls
-  CONFLICTS := icwmp-openssl icwmp-wolfssl
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lssl"
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
-CONFIGURE_ARGS += --enable-libwolfssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += "-lwolfssl"
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIGURE_ARGS += --enable-libmbedtls
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lmbedtls"
-endif
-
 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
 CONFIGURE_ARGS += \
 	--enable-acs=multi
@@ -114,14 +79,19 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif
 
-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
+ifeq ($(CONFIG_CWMP_USE_WOLFSSL), y)
+CONFIGURE_ARGS += --enable-libwolfssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += "-lwolfssl"
 endif
 
-define Package/icwmp/default/install
+ifeq ($(CONFIG_CWMP_USE_OPENSSL), y)
+CONFIGURE_ARGS += --enable-libopenssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+TARGET_LDFLAGS += "-lssl"
+endif
+
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
@@ -139,11 +109,4 @@ define Package/icwmp/default/install
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
 endef
 
-Package/icwmp-openssl/install = $(Package/icwmp/default/install)
-Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
-Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
-
-$(eval $(call BuildPackage,icwmp))
-$(eval $(call BuildPackage,icwmp-openssl))
-$(eval $(call BuildPackage,icwmp-wolfssl))
-$(eval $(call BuildPackage,icwmp-mbedtls))
+$(eval $(call BuildPackage,$(PKG_NAME)))

icwmp/files/etc/firewall.cwmp

@@ -6,6 +6,7 @@ log() {
 }
 
 if [ ! -f "/var/state/cwmp" ]; then
+	touch "/var/state/cwmp"
 	exit 0;
 fi
 

icwmp/files/etc/init.d/icwmpd

@@ -1,16 +1,16 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2015-2019 iopsys Software Solutions AB
 
+. /lib/functions.sh
+include /lib/network
+. /usr/share/libubox/jshn.sh
+
 START=99
-STOP=00
+STOP=2
 
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
 
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-include /lib/network
-
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
@@ -58,39 +58,41 @@ wait_for_resolvfile() {
 }
 
 copy_cwmp_etc_files_to_varstate() {
+	if [ ! -f /var/state/cwmp ]
+	then
+		if [ -f /etc/icwmpd/cwmp ]
+		then
+			uci -q -c /etc/icwmpd delete cwmp.acs
+			uci -q -c /etc/icwmpd commit cwmp
+			cp /etc/icwmpd/cwmp /var/state/cwmp
+		else
+			touch /var/state/cwmp
+		fi
+	fi
+
 	mkdir -p /var/run/icwmpd
-
-	if [ -f /etc/icwmpd/cwmp ]; then
-		uci -q -c /etc/icwmpd delete cwmp.acs
-		uci -q -c /etc/icwmpd commit cwmp
-		cp -f /etc/icwmpd/cwmp /var/state/cwmp
+	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
+	then
+		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
 	fi
-
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
-		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
-	fi
-
-	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]; then
-		cp -f /etc/icwmpd/dm_enabled_notify /var/run/icwmpd/ 2>/dev/null
+	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]
+	then
+		mv /etc/icwmpd/dm_enabled_notify /var/run/icwmpd 2>/dev/null
 	fi
 }
 
 copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]; then
-		cp -f /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd/ 2>/dev/null
+	if [ -f /var/state/cwmp ]
+	then
+		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
 	fi
-
-	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]; then
-		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
+	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]
+	then
+		cp /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
 	fi
-
-	if [ -f /var/state/cwmp ]; then
-		cp -f /var/state/cwmp /etc/icwmpd/
-	fi
-
-	# move the successful custom notify import marker to persistent storage
-	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
-		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
+	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]
+	then
+		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
 	fi
 }
 
@@ -156,6 +158,22 @@ validate_defaults() {
 	return 0;
 }
 
+boot() {
+	local dhcp_url dhcp_discovery
+
+	config_load cwmp
+	config_get_bool dhcp_discovery acs dhcp_discovery 1
+	config_get dhcp_url acs dhcp_url ""
+
+	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
+		if [ -z "${dhcp_url}" ]; then
+			log "dhcp discovery enabled but no dhcp url, trigger update"
+			/etc/icwmpd/update.sh
+		fi
+	fi
+	start
+}
+
 start_service() {
 	local enable_cwmp
 	local wan_interface
@@ -199,19 +217,15 @@ start_service() {
 	procd_close_instance
 }
 
-service_stopped()
+stop_service()
 {
 	copy_cwmp_varstate_files_to_etc
 }
 
 reload_service() {
-	log "Reloading CWMP client"
-	ubus -t 1 call tr069 command '{"command":"reload"}'
-	if [ "$?" -ne "0" ]; then
-		log "Restarting CWMP client"
-		stop
-		start
-	fi
+	log "Restarting CWMP client"
+	stop
+	start
 }
 
 service_triggers() {

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.7.7
+PKG_VERSION:=4.6.20
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=8de4d6cab56f2107e89728187e8e72f95f0e2afa
+PKG_SOURCE_VERSION:=6212d9c40bfcbdc1021eba8b6d5b253d5855e0ad
 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

iop/Config.in

@@ -1,7 +0,0 @@
-config TARGET_VERSION
-	string
-	prompt "Software Version"
-
-config TARGET_CUSTOMER
-	string
-	prompt "Customer ID"

iop/Makefile

@@ -24,10 +24,6 @@ define Package/iop/description
 	This package contains iopsysWrt SDK utilities
 endef
 
-define Package/iop/config
-	source "$(SOURCE)/Config.in"
-endef
-
 define Build/Compile
 	true
 endef

iop/config

@@ -51,7 +51,7 @@ CONFIG_PACKAGE_wifimngr=y
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
 CONFIG_PACKAGE_map-topology=y
-# CONFIG_PACKAGE_wfadatad is not set
+CONFIG_PACKAGE_wfadatad=y
 CONFIG_PACKAGE_wfadatad-collector=y
 
 # Network #
@@ -65,12 +65,12 @@ CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
 
 # TR-x69 #
-CONFIG_PACKAGE_uspd-mbedtls=y
-CONFIG_PACKAGE_icwmp-mbedtls=y
+CONFIG_PACKAGE_uspd=y
+CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_bulkdata-mbedtls=y
+CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc-mbedtls=m
+CONFIG_PACKAGE_stunc=m
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_twamp=m
 CONFIG_PACKAGE_udpechoserver=m

map-agent/Config.in

@@ -6,12 +6,5 @@ config AGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 	bool "Support Dynamic Controller configuration sync"
 	default y if MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
 
-config AGENT_ISLAND_PREVENTION
-	bool "Support Island Prevention"
-	default y if MULTIAP_AGENT_ISLAND_PREVENTION
-
-config AGENT_EASYMESH_R2_CERT
-	bool "Compile for WFA test bed"
-
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=7.1.34
+PKG_VERSION:=7.1.18
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b94b561bc74ec7682cebcc3b4c9cb1bfc08b4c41
+PKG_SOURCE_VERSION:=cbc88b2c935ff216e0452b5f06bfd4d8c82d8715
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -62,14 +62,6 @@ ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
 
-ifeq ($(CONFIG_AGENT_ISLAND_PREVENTION),y)
-TARGET_CFLAGS += -DAGENT_ISLAND_PREVENTION
-endif
-
-ifeq ($(CONFIG_AGENT_EASYMESH_R2_CERT),y)
-TARGET_CFLAGS += -DEASYMESH_R2_CERT
-endif
-
 MAKE_PATH:=src
 
 define Package/map-agent/install

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

@@ -1,78 +1,22 @@
 #!/bin/sh
 
-. /lib/network/utils.sh
+wan=$(db -q get hw.board.ethernetWanPort)
+MAPFILE="/tmp/multiap.backhaul"
 
-conn_ports_file="/tmp/map.connected.ports"
-map_bh_file="/tmp/multiap.backhaul"
-al_bridge="$(uci -q get mapagent.agent.al_bridge)"
-[ "${al_bridge:0:3}" = "br-" ] || exit 0
-al_brnet="${al_bridge:3}"
 
-# Exit if the PORT is not member of the AL Bridge
-[ "$(get_network_of $PORT)" = "$al_brnet" ] || exit 0
-
-############## Dynamic Backhaul Daemon ##############
-if [ -n "$(which dynbhd)" ]; then
-	pidof dynbhd >/dev/null && exit 0 # dynbhd is managing the links
-
-	if [ ! -f $conn_ports_file ]; then
-		touch $conn_ports_file
-		if [ "$LINK" = "up" ]; then
-			touch $conn_ports_file
-			echo "$PORT" > $conn_ports_file
-			brctl delif $al_bridge $PORT
-			#ubus call network.interface.lan remove_device "{\"name\":\"$PORT\"}"
-		fi
-	else
-		if [ "$LINK" = "up" ]; then
-			brctl delif $al_bridge $PORT
-			echo "$PORT" >> $conn_ports_file
-			#ubus call network.interface.lan remove_device "{\"name\":\"$PORT\"}"
-		else
-			sed -i -E "/(^|:)${PORT}(:|$)/d" $conn_ports_file
-			#ubus call network.interface.lan add_device "{\"name\":\"$PORT\"}"
-			brctl addif $al_bridge $PORT
-			[ "$(cat $conn_ports_file | wc -c)" = "0" ] && rm -f $conn_ports_file
-		fi
-	fi
-
-	exit 0
-fi
-########################################################
-
-################ Dedicated ETH WAN Port ################
-wanport="$(db -q get hw.board.ethernetWanPort)"
-if [ -n "$wanport" ]; then
-	[ "$wanport" = "$PORT" ] || exit 0
-########################################################
-else
-#################### DHCP Discovery ####################
-	[ "$(uci -q get network.${al_brnet}.proto)" == "dhcp" ] || exit 0
-
-	if [ "$LINK" = "up" ]; then
-		brctl delif $al_bridge $PORT
-
-		udhcpc -qnRoC -i $PORT >/dev/null 2>&1 && dhcp=1
-
-		brctl addif $al_bridge $PORT
-
-		[ $dhcp -eq 1 ] || exit 0
-	else
-		[ -f $map_bh_file ] || exit 0
-		cur_bh="$(cat $map_bh_file  | jsonfilter -e @.ifname)"
-		[ "$cur_bh" = "$PORT" ] || exit 0
-	fi
-########################################################
-fi
+[ -z "$wan" ] && exit 1 # no configuration
+[ "$PORT" != "$wan" ] && exit 0
 
 remove_from_bridge() {
 	config_get ifname "$section" ifname
-	[ -n "$ifname" ] && ubus call network.interface.${al_brnet} remove_device '{"name":"$ifname"}'
+
+	ubus call network.interface.$bridge remove_device '{"name":"$ifname"}'
 }
 
 update_bstas() {
-	section="$1"
-	action="$2"
+	local section="$1"
+	local action="$2"
+	local ifname onboarded
 
 	config_get ifname "$section" ifname
 	config_get_bool enabled "$section" enabled 0
@@ -90,16 +34,16 @@ update_bstas() {
 }
 
 if [ "$LINK" = "up" ]; then
-	#touch "$map_bh_file"
+	#touch "$MAPFILE"
+
 	config_load "mapagent"
-	config_foreach remove_from_bridge bsta
+	bridge=$(uci get mapagent.agent.al_bridge | cut -d '-' -f2)
+	config_foreach remove_from_bridge bsta $bridge
 	config_foreach update_bstas bsta down
 
 	/lib/wifi/multiap set_uplink "eth" "$PORT"
 else
-	/lib/wifi/multiap unset_uplink "eth"
-	#rm -f "$map_bh_file"
+	rm -f "$MAPFILE"
 	config_load "mapagent"
 	config_foreach update_bstas bsta up
-
 fi

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

@@ -59,7 +59,7 @@ remove_map() {
 }
 
 start_dynbhd_service() {
-	rm -f /tmp/multiap.backhaul
+	rm -f /tmp/map.agent.bsta_global_disable
 	procd_open_instance
 	procd_set_param command "/usr/sbin/dynbhd"
 	procd_set_param respawn
@@ -79,9 +79,7 @@ validate_agent_section() {
 		'netdev:string' \
 		'vlan_segregation:bool:false' \
 		'resend_num:uinteger:0' \
-		'dyn_cntlr_sync:bool:true' \
-		'island_prevention:bool:true'
-
+		'dyn_cntlr_sync:bool:true'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of agent section failed"
@@ -141,7 +139,7 @@ validate_radio_section() {
 			'configured:bool:false' \
 			'onboarded:bool:false' \
 			'dedicated_backhaul:bool:false' \
-			'steer_policy:range(0,255)' \
+            'steer_policy:range(0,255)' \
 			'util_threshold:range(0,255)' \
 			'rcpi_threshold:range(0,255)' \
 			'report_rcpi_threshold:range(0,255)' \
@@ -180,29 +178,14 @@ validate_policy_section() {
 	return 0
 }
 
-validate_dyn_bh_section() {
-	local section="$1"
-
-	uci_validate_section mapagent $section "${1}" \
-			'missing_bh_timer:range(1,255)'
-
-	[ "$?" -ne 0 ] && {
-		logger -s -t "mapagent" "Validation of dynamic backhaul section failed"
-		IS_CFG_VALID=0
-		return 1
-	}
-	return 0
-}
-
 validate_agent_config() {
 	IS_CFG_VALID=1
 
 	validate_agent_section &&
 		config_foreach validate_cs_section controller_select &&
 		config_foreach validate_ap_section ap &&
-		config_foreach validate_radio_section radio &&
-		config_foreach validate_policy_section policy &&
-		config_foreach validate_dyn_bh_section dynamic_backhaul
+        config_foreach validate_radio_section radio &&
+        config_foreach validate_policy_section policy
 
 	[ "$IS_CFG_VALID" -ne 1 ] && {
 		logger -s -t "mapagent" "Validation of mapagent UCI file failed"
@@ -230,7 +213,7 @@ start_service() {
 	[ "$ts" -eq 1 ] && create_map #|| remove_map
 
 	procd_open_instance
-	procd_set_param command "/usr/sbin/mapagent" "-d"
+        procd_set_param command "/usr/sbin/mapagent" "-d"
 	procd_set_param respawn
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1

map-agent/files/lib/wifi/multiap

@@ -55,7 +55,7 @@ get_type_by_section() {
 	echo "$(type_to_multi_ap $type)"
 }
 
-sync_credentials() {
+brcm_sync_credentials() {
 	bands=""
 	json_init
 	mapagent_process_fh() {
@@ -160,7 +160,7 @@ sync_credentials() {
 	json_cleanup
 }
 
-write_credentials() {
+brcm_write_credentials() {
 	config_load mapagent
 
 	mapagent_apply_wireless() {
@@ -250,7 +250,7 @@ write_credentials() {
 	uci commit wireless
 }
 
-set_network() {
+brcm_set_network() {
 	local ifname=$1
 	local num=$2
 	local bssid=$3
@@ -293,13 +293,7 @@ write_bsta_config() {
 
 			[ "$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
@@ -357,13 +351,13 @@ write_bsta_config() {
 	#echo result diff = $diff > /dev/console
 	[ "$diff" == "1" ] && {
 		config_foreach mapagent_apply_bssid_same_band bsta
-		#ubus call uci commit '{"config":"wireless"}'
+		ubus call uci commit '{"config":"wireless"}'
 		#echo reloading wireless > /dev/console
 	}
 
 }
 
-teardown_iface() {
+brcm_teardown_iface() {
 	config_load mapagent
 
 	local iface=$1
@@ -416,7 +410,7 @@ teardown_iface() {
 	uci commit mapagent
 }
 
-bsta_to_wireless() {
+brcm_bsta_to_wireless() {
 	config_load mapagent
 
 	mapagent_find_lowest_prio_onboarded() {
@@ -470,7 +464,8 @@ bsta_to_wireless() {
 				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'
+				#uci -q set wireless.${section}.disabled=$disabled
+				uci -q set wireless.${section}.default_disabled="0"
 
 				[ "$disabled" != "1" ] && return
 				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
@@ -534,7 +529,6 @@ bsta_to_wireless() {
 	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
 
 #	[ "$diff" != "" ] && {
-
 		ubus call uci commit '{"config":"wireless"}'
 #	}
 }
@@ -629,37 +623,21 @@ sync_mapcontroller_from_wireless() {
 }
 
 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"
-	}
+	config_load mapagent
 
 	mapagent_enable_bk() {
 		config_get ifname $1 ifname
-		config_get band $1 band
 		config_get enabled $1 enabled
 
+		echo ifname $ifname enabled $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
+		wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
+		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
+		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
 	}
 
-	config_load mapagent
-	config_foreach mapagent_onboarded_bands bsta
 	config_foreach mapagent_enable_bk bsta
 }
 
@@ -794,45 +772,26 @@ set_uplink() {
 	json_add_string "macaddr" "$hwaddr"
 	json_dump > "$MAPFILE"
 	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
-
-	rm -f "$MAPFILE" > /dev/null 2>&1
+	rm "$MAPFILE" > /dev/null 2>&1
 }
 
 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;;
+	wireless_teardown) brcm_wireless_teardown;;
+	setup_network) brcm_setup_network;;
+	setup_wireless) brcm_setup_wireless;;
+	write_credentials) brcm_write_credentials;;
+	sync_credentials) brcm_sync_credentials;;
 	bsta_steer) bsta_steer $@;;
-	set_network) set_network $@;;
+	set_network) brcm_set_network $@;;
 	write_bsta_config) write_bsta_config $@;;
-	teardown_iface) teardown_iface $@;;
-	bsta_to_wireless) bsta_to_wireless $@;;
+	teardown_iface) brcm_teardown_iface $@;;
+	bsta_to_wireless) brcm_bsta_to_wireless $@;;
 	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
 	ts) ts_sub $@;;
 	bsta_enable_all) bsta_enable_all $@;;

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=6.0.19
+PKG_VERSION:=6.0.9
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b0e445b1a9ee962c1d151526eeb39d657f6f855c
+PKG_SOURCE_VERSION:=5adc5d12e6caf4f234a970d2a4f2586aee1dc1f7
 
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=3.2.12
+PKG_VERSION:=3.2.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=dc59897b52ed1406175cd9314759c00aa12ed0a4
+PKG_SOURCE_VERSION:=3e515b41e6027a1537ebb5e7d56fe2b596512c41
 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

netmode/files/etc/init.d/netmode

@@ -34,13 +34,12 @@ start_service() {
 	[ -n "$mode" ] || return
 
 	# Get the last saved mode
-	lastmode="$(cat $MODEDIR/.last_mode 2>/dev/null)"
+	lastmode="$(cat /etc/netmodes/.last_mode 2>/dev/null)"
 	# Return if desired mode is same as last saved mode
 	[ "$mode" == "$lastmode" ] && return
 
 	# Save mode as last mode
-	[ -d $MODEDIR ] || mkdir -p $MODEDIR
-	echo "$mode" > $MODEDIR/.last_mode
+	echo "$mode" > /etc/netmodes/.last_mode
 
 	logger -s -p user.info -t "netmode" "Switching to $mode Mode" >/dev/console
 

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.9
+PKG_VERSION:=5.0.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=79958289d3b5c3ffd3bd0af62e493e1bac757e77
+PKG_SOURCE_VERSION:=9d957848b9ac1d381149ce43b59775c21b1e24e0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -31,7 +31,7 @@ define Package/obuspa
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=USP agent
-  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
+  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto-ssl +libwebsockets-openssl
 endef
 
 define Package/obuspa/description
@@ -96,13 +96,11 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
-	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/init.d/obuspa

@@ -35,7 +35,7 @@ log() {
 }
 
 db_set() {
-	if [ -n "${1}" ] && [ -n "${2}" ]; then
+	if [ -n "${1}" ]; then
 		echo "${1} \"${2}\"">>${PARAM_FILE}
 	else
 		echo >>${PARAM_FILE}
@@ -149,7 +149,7 @@ validate_controller_section()
 		'USPNotifRetryMinimumWaitInterval:uinteger:5' \
 		'USPNotifRetryIntervalMultiplier:uinteger:2000' \
 		'ControllerCode:string' \
-		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
+		'Protocol:or("STOMP","CoAP","MQTT")' \
 		'Reference:string' \
 		'Destination:string:controller-notify-dest' \
 		'Topic:string' \
@@ -158,14 +158,7 @@ validate_controller_section()
 		'coap_path:string' \
 		'coap_port:port' \
 		'mqtt:string' \
-		'stomp:string' \
-		'Host:host' \
-		'Port:port' \
-		'Path:string' \
-		'EnableEncryption:bool' \
-		'KeepAliveInterval:uinteger' \
-		'SessionRetryIntervalMultiplier:uinteger' \
-		'SessionRetryMinimumWaitInterval:uinteger'
+		'stomp:string'
 }
 
 validate_subscription_section()
@@ -184,7 +177,7 @@ validate_mtp_section()
 {
 	uci_validate_section ${CONFIGURATION} mtp "${1}" \
 		'Enable:bool:true' \
-		'Protocol:or("STOMP","CoAP","MQTT", "WebSocket")' \
+		'Protocol:or("STOMP","CoAP","MQTT")' \
 		'Reference:string' \
 		'ResponseTopicConfigured:string' \
 		'PublishQoS:uinteger' \
@@ -192,12 +185,7 @@ validate_mtp_section()
 		'coap_path:string' \
 		'coap_port:port' \
 		'mqtt:string' \
-		'stomp:string' \
-		'Path:string' \
-		'Port:port' \
-		'EnableEncryption:bool' \
-		'KeepAliveInterval:uinteger'
-
+		'stomp:string'
 }
 
 validate_stomp_connection_section()
@@ -315,8 +303,6 @@ configure_controller() {
 	local EndpointID Enable AssignedRole PeriodicNotifInterval PeriodicNotifTime USPNotifRetryMinimumWaitInterval
 	local USPNotifRetryIntervalMultiplier ControllerCode Protocol Destination coap_host coap_path coap_port
 	local Reference Topic mqtt stomp assigned_role_name ParameterName
-	local Host Port Path EnableEncryption KeepAliveInterval
-	local SessionRetryIntervalMultiplier SessionRetryMinimumWaitInterval
 
 	validate_controller_section "${1}" || {
 		log "Validation of controller section failed"
@@ -328,20 +314,7 @@ configure_controller() {
 		return 1;
 	fi
 
-	# Support for backward compatibility for coap uci parameters
-	if [ -n "${coap_host}" ] && [ -z "${Host}" ]; then
-		Host="${coap_host}"
-	fi
-
-	if [ -n "${coap_path}" ] && [ -z "${Path}" ]; then
-		Path="${coap_path}"
-	fi
-
-	if [ -n "${coap_port}" ] && [ -z "${Port}" ]; then
-		Port="${coap_port}"
-	fi
-
-	if [ -z "${stomp}" ] && [ -z "${Reference}" ] && [ -z "${mqtt}" ] && [ -z "${Host}" ]; then
+	if [ -z "${stomp}" ] && [ -z "${Reference}" ] && [ -z "${mqtt}" ] && [ -z "${coap_path}" ]; then
 		log "controller:: Invalid configuration"
 		return 1;
 	fi
@@ -399,18 +372,9 @@ configure_controller() {
 		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Reference "${Reference}"
 		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.STOMP.Destination "${Destination}"
 	elif [ "${Protocol}" = "CoAP" ]; then
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Host "${Host}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Path "${Path}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Port "${Port}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.EnableEncryption "${EnableEncryption}"
-	elif [ "${Protocol}" = "WebSocket" ]; then
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Host "${Host}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Port "${Port}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.Path "${Path}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.EnableEncryption "${EnableEncryption}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.KeepAliveInterval "${KeepAliveInterval}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.SessionRetryIntervalMultiplier "${SessionRetryIntervalMultiplier}"
-		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.WebSocket.SessionRetryMinimumWaitInterval "${SessionRetryMinimumWaitInterval}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Host "${coap_host}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Path "${coap_path}"
+		db_set Device.LocalAgent.Controller.${controller_num}.MTP.1.CoAP.Port "${coap_port}"
 	else
 		log "Unsupported Protocol ${Protocol}"
 	fi
@@ -461,7 +425,6 @@ configure_subscription(){
 	db_set Device.LocalAgent.Subscription.${subs_num}.ReferenceList "${ReferenceList}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.Persistent "${Persistent}"
 	db_set Device.LocalAgent.Subscription.${subs_num}.Recipient "${Recipient}"
-	db_set Device.LocalAgent.Subscription.${subs_num}.CreationDate "$(date -I'seconds')"
 }
 
 check_json_load()
@@ -541,21 +504,12 @@ configure_challenges() {
 configure_mtp() {
 	local Enable Protocol Reference ResponseTopicConfigured PublishQoS
 	local stomp mqtt
-	local Path Port EnableEncryption KeepAliveInterval
 
 	validate_mtp_section "${1}" || {
 		log "Validation of mtp section failed"
 		return 1;
 	}
 
-	if [ -n "${coap_path}" ] && [ -z "${Path}" ]; then
-		Path="${coap_path}"
-	fi
-
-	if [ -n "${coap_port}" ] && [ -z "${Port}" ]; then
-		Port="${coap_port}"
-	fi
-
 	if [ -z "${Reference}" ]; then
 		if [ "${Protocol}" = "STOMP" ]; then
 			val=$(get_uci_ref_index stomp "${stomp}")
@@ -588,13 +542,8 @@ configure_mtp() {
 		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Reference "${Reference}"
 		db_set Device.LocalAgent.MTP.${mtp_num}.STOMP.Destination "${Destination}"
 	elif [ "${Protocol}" = "CoAP" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${Path}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${Port}"
-	elif [ "${Protocol}" = "WebSocket" ]; then
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.Path "${Path}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.Port "${Port}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.EnableEncryption "${EnableEncryption}"
-		db_set Device.LocalAgent.MTP.${mtp_num}.WebSocket.KeepAliveInterval "${KeepAliveInterval}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Path "${coap_path}"
+		db_set Device.LocalAgent.MTP.${mtp_num}.CoAP.Port "${coap_port}"
 	else
 		log "Unsupported Protocol ${Protocol} in mtp"
 	fi
@@ -699,16 +648,20 @@ configure_obuspa() {
 
 	if [ -n "${ifname}" ]; then
 		procd_set_param env USP_BOARD_IFNAME="${ifname}"
-	fi
-
-	if [ -z "${ifname}" ] || ! grep -F -q "export USP_BOARD_IFNAME=${ifname}" "${PROFILE}"; then
+		# Set this variable for root user and obuspa -c tool
 		if [ -f "${PROFILE}" ]; then
-			sed -i "/export USP_BOARD_IFNAME/d" "${PROFILE}"
+			if grep -q "export USP_BOARD_IFNAME=${ifname}" ${PROFILE}; then
+				if grep -q "export USP_BOARD_IFNAME" ${PROFILE}; then
+					sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
+				fi
+			fi
 		fi
-
-		if [ -n "${ifname}" ]; then
-			# Set this variable for root user and obuspa -c tool
-			echo "export USP_BOARD_IFNAME=${ifname}" >> "${PROFILE}"
+		echo "export USP_BOARD_IFNAME=${ifname}" >> ${PROFILE}
+	else
+		if [ -f "$PROFILE" ]; then
+			if grep -q "export USP_BOARD_IFNAME" ${PROFILE}; then
+				sed -i "g/export USP_BOARD_IFNAME/d" ${PROFILE}
+			fi
 		fi
 	fi
 

peripheral_manager/files/etc/init.d/ledmngr

@@ -1,62 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=20
-USE_PROCD=1
-
-setled() {
-	local enable
-	local brightness
-
-	config_get_bool enable $1 enable 1
-	config_get brightness $1 brightness 100
-	ubus call led.$1 set "{\"enable\":$enable,\"brightness\":$brightness}"
-}
-
-start_service() {
-	local enable
-
-	config_load leds
-	config_foreach setled led
-	config_get_bool enable leds enable 1
-
-	if [ "$enable" == "0" ]; then
-		ubus call leds set  '{"state" : "alloff"}'
-	else
-		ubus call leds set  '{"state" : "normal"}'
-	fi
-}
-
-boot() {
-	local led ledname
-
-	ubus list led* >/dev/null || sleep 1
-	ubus list led* >/dev/null || sleep 1
-
-	[ -f /etc/config/leds ] || touch /etc/config/leds
-
-	if ! uci -q get leds.leds >/dev/null; then
-		uci set leds.leds=leds
-		uci set leds.leds.enable=1
-	fi
-
-	for led in $(ubus list led.*); do
-		ledname=${led:4}
-		case $ledname in
-			*phy*) continue ;;
-		esac
-		if ! uci -q  get leds.$ledname >/dev/null; then
-			uci set leds.$ledname=led
-			uci set leds.$ledname.enable=1
-		fi
-	done
-
-	uci commit leds
-
-	start
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "leds"
-}
-

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

@@ -1,20 +1,16 @@
 #!/bin/sh
 
 populate_config_from_db() {
-	. /lib/functions.sh
-	include /lib/network
+	. /lib/network/utils.sh
 
 	portorder="$(db -q get hw.board.ethernetPortOrder)"
 	for port in $portorder; do
-		speed="$(get_max_port_speed $port 2>/dev/null)"
-		speed="${speed:-1000}"
-
 		uci add ports ethport
 		uci rename ports.@ethport[-1]="$(get_port_name $port)"
 		uci set ports.@ethport[-1].enabled=1
 		uci set ports.@ethport[-1].name="$(get_port_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

qosmngr/files/lib/qos/broadcom.sh

@@ -5,6 +5,7 @@
 IP_RULE=""
 BR_RULE=""
 
+POLICER_SKIP=0
 POLICER_COUNT=0
 INTF_NAME=""
 Q_COUNT=0
@@ -336,11 +337,6 @@ broute_filter_on_dscp() {
 }
 
 broute_filter_on_vid() {
-
-	if [ $1 -lt 0 ]; then
-		return
-	fi
-
 	case "$BR_RULE" in
 	*proto*)
 		BR_RULE="$BR_RULE --vlan-id $1"
@@ -756,7 +752,12 @@ handle_policer_rules() {
 		return
 	fi
 
-	config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
+	# The policer object is not available on non BCM968* chips
+	if [ $POLICER_SKIP -eq 1 ]; then
+		assign_policer_to_port $ifname $pindex
+	else
+		config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
+	fi
 
 }
 
@@ -874,15 +875,17 @@ configure_queue() {
 configure_policer() {
 	# The policer object is not available on non BCM968* chips, just clean up
 	# the old config if any and return
-	for intf in $(db get hw.board.ethernetPortOrder); do
-		local unitport="$(get_port_number $intf)"
-		local unit=$(echo $unitport | cut -d ' ' -f 1)
-		local port=$(echo $unitport | cut -d ' ' -f 2)
-		# setting rate and burst size to 0 disables rate limiting
-		if [ $port != "" -a $unit != "" ]; then
-			ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
-		fi
-	done
+	if [ $POLICER_SKIP -eq 0 ]; then
+		for intf in $(db get hw.board.ethernetPortOrder); do
+			local unitport="$(get_port_number $intf)"
+			local unit=$(echo $unitport | cut -d ' ' -f 1)
+			local port=$(echo $unitport | cut -d ' ' -f 2)
+			# setting rate and burst size to 0 disables rate limiting
+			if [ $port != "" -a $unit != "" ]; then
+				ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
+			fi
+		done
+	fi
 
 	# Delete policer
 	local i=0
@@ -923,6 +926,10 @@ reload_qos() {
 	local service_name="$1"
 	local cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"
 
+	case $cpu_model in
+		BCM68*|BCM6755) POLICER_SKIP=1 ;;
+	esac
+
 	if [ -z "$service_name" ]; then
 		configure_qos
 	elif [ "$service_name" == "shaper" ]; then

stunc/Config.in

@@ -0,0 +1,16 @@
+if PACKAGE_stunc
+
+choice
+	prompt "Select SSL utility"
+	default STUNC_USE_WOLFSSL
+
+config STUNC_USE_WOLFSSL
+	bool "Use WolfSSL for ssl utilities"
+	select CONFIG_PACKAGE_libwolfssl
+
+config STUNC_USE_OPENSSL
+	bool "Use OpenSSL for ssl utilities"
+	select CONFIG_PACKAGE_libopenssl
+
+endchoice
+endif

stunc/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,75 +8,49 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
-PKG_RELEASE:=1
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.2
+
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=fbd3cb0f101d115744ecf927516c2268c10cf3a0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=fd87f85f3e73b7de4a35c977c8d7ff6338749f08
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/stunc/default
+define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libwolfssl +libblobmsg-json +libbbf_api +libopenssl
+  MENU := 1
 endef
 
-define Package/stunc-mbedtls
-  $(Package/stunc/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_stunc-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
+define Package/$(PKG_NAME)/description
+	BBF STUN Client
 endef
 
-define Package/stunc-openssl
-  $(Package/stunc/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_stunc-openssl:libopenssl
-  CONFLICTS := stunc-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/stunc-wolfssl
-  $(Package/stunc/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_stunc-wolfssl:libwolfssl
-  CONFLICTS := stunc-mbedtls stunc-openssl
-  VARIANT:=wolfssl
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
 
-ifeq ($(BUILD_VARIANT),wolfssl)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-  MAKE_FLAGS += \
-	USE_WOLFSSL="yes"
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/mbedtls
-  MAKE_FLAGS += \
-	USE_MBEDTLS="yes"
-endif
-
-ifeq ($(BUILD_VARIANT),openssl)
-  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-  MAKE_FLAGS += \
-	USE_OPENSSL="yes"
+ifeq ($(CONFIG_STUNC_USE_WOLFSSL), y)
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += -lwolfssl
 endif
 
 ifeq ($(LOCAL_DEV),1)
@@ -85,7 +59,7 @@ define Build/Prepare
 endef
 endif
 
-define Package/stunc/default/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -96,10 +70,4 @@ define Package/stunc/default/install
 	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
 endef
 
-Package/stunc-openssl/install = $(Package/stunc/default/install)
-Package/stunc-wolfssl/install = $(Package/stunc/default/install)
-Package/stunc-mbedtls/install = $(Package/stunc/default/install)
-
-$(eval $(call BuildPackage,stunc-openssl))
-$(eval $(call BuildPackage,stunc-wolfssl))
-$(eval $(call BuildPackage,stunc-mbedtls))
+$(eval $(call BuildPackage,$(PKG_NAME)))

stunc/files/etc/init.d/stunc

@@ -36,6 +36,11 @@ start_service() {
 		return 0;
 	fi
 
+	if [ -z "${server_address}" ]; then
+		log "Stun server address not defined or invalid"
+		return 0;
+	fi
+
 	procd_open_instance stunc
 	procd_set_param command ${PROG}
 	procd_set_param respawn "3" "7" "0"

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.0.2
+PKG_VERSION:=0.2.29
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=bbb96509dfb6f64e653421d3c37228a800548261
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/sulu.git
+PKG_SOURCE_VERSION:=5c722ca387ffdd28ac2a2e01f27dba12015fc2e7
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz

swmodd/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.2
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e484557ea7ede6d8ff439081deebd763d4952851
+PKG_SOURCE_VERSION:=f169ab825295e1e0bb414c7bbc921fab2ef9ccfa
 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
@@ -41,8 +41,7 @@ endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE \
-	-Wall -Werror
+	-D_GNU_SOURCE
 
 ifeq ($(CONFIG_PACKAGE_liblxc),y)
 MAKE_FLAGS += \

twamp/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.1.1
+PKG_VERSION:=1.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -39,8 +39,7 @@ define Package/$(PKG_NAME)/description
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror
+	-D_GNU_SOURCE
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare

uboot/Makefile

@@ -17,7 +17,7 @@ PKG_SOURCE_URL:=https://dev.iopsys.eu/ensemble/u-boot.git
 PKG_SOURCE_VERSION:=1b320f0656bfc8504fa4f771dd77d8e403ed00e0
 else
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/uboot.git
-PKG_SOURCE_VERSION:=4cd73fe5db0ebfc1242ca9c85c14d7f0718eaf73
+PKG_SOURCE_VERSION:=826af23a7723ee05dc9bc023d12a83f44aa649f4
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)

udpechoserver/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=udpechoserver
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.2
 
 PKG_SOURCE_VERSION:=4e80bbec15b284080798b5ffbe8655febaa239aa
 PKG_SOURCE_PROTO:=git
@@ -39,8 +39,7 @@ define Package/$(PKG_NAME)/description
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror
+	-D_GNU_SOURCE
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin

uspd/Config.in

@@ -0,0 +1,14 @@
+if PACKAGE_uspd
+
+menu "Configuration"
+config USPD_MAX_MSG_LEN
+    int "Maximum message length"
+    default 10485760
+    help
+        Set the maximum data length allowed over ubus in Bytes.
+
+	This value should not be larger than UBUS_MAX_MSGLEN from ubusd.
+	The maximum blob message length allowed is:
+	(configured value - 128) bytes
+endmenu
+endif

uspd/Makefile

@@ -5,60 +5,45 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.7
+PKG_VERSION:=2.2.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=a0c6b7e1b09987289e06da36124296ec9e792f77
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE_VERSION:=ff39170a3e0595a67763a61ac81b2f99b5bf11d7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/uspd/default
+define Package/uspd
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Datamodel ubus backend
-  DEPENDS:=+libubox +ubus +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
+  TITLE:=USP ubus backend
+  DEPENDS:=+libubox +ubus +libbbfdm +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
            +@BBF_TR181 +@BBF_TR104 +@BBF_TR143
 endef
 
-define Package/uspd-mbedtls
-  $(Package/uspd/default)
-  TITLE += (mbedtls)
-  DEPENDS += +libbbfdm-mbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
+define Package/uspd/description
+ Ubus based backend for TR-369/USP which can be used by other USP agents
+ running on top of it.
 endef
 
-define Package/uspd-openssl
-  $(Package/uspd/default)
-  TITLE += (openssl)
-  DEPENDS += +libbbfdm-openssl
-  CONFLICTS := uspd-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/uspd-wolfssl
-  $(Package/uspd/default)
-  TITLE += (wolfssl)
-  DEPENDS += +libbbfdm-wolfssl
-  CONFLICTS := uspd-mbedtls uspd-openssl
-  VARIANT:=wolfssl
+define Package/uspd/config
+	source "$(SOURCE)/Config.in"
 endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
-	-Wall -Werror \
-	-DUSPD_MAX_MSG_LEN="10485760"
+	-DUSPD_MAX_MSG_LEN=$(CONFIG_USPD_MAX_MSG_LEN)
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -66,7 +51,7 @@ define Build/Prepare
 endef
 endif
 
-define Package/uspd/default/install
+define Package/uspd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
@@ -77,10 +62,4 @@ define Package/uspd/default/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uspd $(1)/usr/sbin/
 endef
 
-Package/uspd-openssl/install = $(Package/uspd/default/install)
-Package/uspd-wolfssl/install = $(Package/uspd/default/install)
-Package/uspd-mbedtls/install = $(Package/uspd/default/install)
-
-$(eval $(call BuildPackage,uspd-openssl))
-$(eval $(call BuildPackage,uspd-wolfssl))
-$(eval $(call BuildPackage,uspd-mbedtls))
+$(eval $(call BuildPackage,uspd))

wfadatad/Config.in

@@ -1,4 +1,9 @@
-menu "Configuration"
+if PACKAGE_wfadatad || PACKAGE_wfadatad-collector
+menu "configurations"
+
+config WFA_DELM_STANDALONE
+	bool "Build as standalone daemon instead of a plugin"
+	default y
 
 config WFA_DELM_MULTIAP_MODE
 	bool "Enable Multi-AP mode"
@@ -8,3 +13,4 @@ config WIFI_DELM_DEBUG
 	bool "Enable debug logs"
 	default n
 endmenu
+endif

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=7.0.1
+PKG_VERSION:=6.10.13
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6e4055202952311774680793a1b46224e44c997f
+PKG_SOURCE_VERSION:=1c4ff6177f7eef969293d6847454ffcdc41deaed
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -25,9 +25,9 @@ include $(INCLUDE_DIR)/package.mk
 define Package/wfadatad
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=WiFi DataElements Agent (standalone) daemon
+  TITLE:=WiFi DataElements Agent
   DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl \
-	   @(!PACKAGE_map-agent) +libieee1905 +map-plugin
+	  +!WFA_DELM_STANDALONE:map-agent +libieee1905 +map-plugin
 endef
 
 define Package/wfadatad/description
@@ -37,20 +37,24 @@ endef
 define Package/wfadatad-collector
   SECTION:=utils
   CATEGORY:=Utilities
-  TITLE:=WiFi DataElements Collector Proxy
+  TITLE:=WiFi DataElements Collector
   DEPENDS:=+libuci +libubox +ubus +libpthread +libnl-genl \
 	   +libieee1905 +map-plugin
 endef
 
 define Package/wfadatad-collector/description
- It implements the WiFi DataElements Collector Proxy component.
+ It implements WiFi DataElement Collector.
 endef
 
 
-define Package/wfadatad-collector/config
+define Package/wfadatad/config
 	source "$(SOURCE)/Config.in"
 endef
 
+ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
+MAKE_FLAGS += CONFIG_WFA_DELM_STANDALONE=y
+endif
+
 ifneq (,$(findstring ALPHA,$(CONFIG_VERSION_CODE)))
 MAKE_FLAGS += DEBUG=1
 endif
@@ -81,17 +85,29 @@ MAKE_FLAGS += EXECS="$(EXECS)"
 
 
 define Package/wfadatad/install
+
+ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/deagent.init $(1)/etc/init.d/deagent
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/agent/deagent $(1)/usr/sbin/
+else
+	$(INSTALL_DIR) $(1)/usr/lib/map-plugins
+	$(CP) $(PKG_BUILD_DIR)/src/agent/deagent.so $(1)/usr/lib/map-plugins
+endif
 endef
 
 define Package/wfadatad-collector/install
+
+ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/decollector.init $(1)/etc/init.d/decollector
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/collector/decollector $(1)/usr/sbin/
+else
+	$(INSTALL_DIR) $(1)/usr/lib/map-plugins
+	$(CP) $(PKG_BUILD_DIR)/src/collector/decollector.so $(1)/usr/lib/map-plugins
+endif
 endef
 
 $(eval $(call BuildPackage,wfadatad))

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=14.0.7
+PKG_VERSION:=14.0.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=981ce51b2f135926d6e9135772dcd43d73c39b64
+PKG_SOURCE_VERSION:=a248c1508bab5f30297d5b9c12719a90a86d81aa
 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

xmppc/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.2
 
 PKG_SOURCE_VERSION:=4a09b8689d67dcbf3fd1b7e80e53816b7cd12614
 PKG_SOURCE_PROTO:=git
@@ -37,8 +37,7 @@ define Package/$(PKG_NAME)/description
 endef
 
 TARGET_CFLAGS += \
-	-D_GNU_SOURCE \
-	-Wall -Werror
+	-D_GNU_SOURCE
 
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin