icwmp: HEARTBEAT event

map-agent: 7.1.35
udpechoserver: 1.0.4
2025-12-26 03:53:58 +08:00 · 2022-04-28 14:36:12 +01:00 · 2022-04-22 15:31:07 +02:00 · 2022-04-21 17:36:42 +05:30 · 2022-04-21 12:07:13 +02:00 · 2022-04-21 10:01:21 +01:00
26 changed files with 374 additions and 278 deletions
--- a/bbf/Config_bbfdm.in
+++ b/bbf/Config_bbfdm.in
@@ -1,5 +1,3 @@
-if PACKAGE_libbbfdm
-
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -12,10 +10,6 @@ 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
@@ -26,24 +20,8 @@ config BBF_TR143

 config BBFDM_ENABLE_JSON_PLUGIN
 	bool "Enable json plugin to extend datamodel"
-	default n
+	default y

 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
-	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
+	default y
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -5,21 +5,20 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.20
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_VERSION:=6.6.25
+
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=491a8b0c00680ba110fb42d17a51627365b1baed
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_SOURCE_VERSION:=e1d796c4fca5f4962fefdc5602b6daa922d40f08
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_RELEASE=$(PKG_SOURCE_VERSION)

 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE

+PKG_FIXUP:=autoreconf
 include $(INCLUDE_DIR)/package.mk

 define Package/libbbf_api
@@ -27,16 +26,45 @@ define Package/libbbf_api
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=Library for libbbfdm API
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libopenssl +libwolfssl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef

-define Package/libbbfdm
+define Package/libbbfdm/default
  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
+  TITLE:=Library for broadband forum data model support
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
+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
 endef

 define Package/libbbfdm/config
@@ -62,10 +90,8 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror \

-ifeq ($(CONFIG_BBF_TR181),y)
 CONFIGURE_ARGS += \
 	--enable-tr181
-endif

 ifeq ($(CONFIG_BBF_TR104),y)
 CONFIGURE_ARGS += \
@@ -97,16 +123,19 @@ CONFIGURE_ARGS += \
 	--enable-shared-library
 endif

-ifeq ($(CONFIG_BBF_USE_WOLFSSL), y)
-CONFIGURE_ARGS += --enable-libwolfssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += "-lwolfssl"
-endif
-
-ifeq ($(CONFIG_BBF_USE_OPENSSL), y)
+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
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+CONFIGURE_ARGS += --enable-libmbedtls
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
 endif

 define Package/libbbf_api/install
@@ -114,7 +143,7 @@ define Package/libbbf_api/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
 endef

-define Package/libbbfdm/install
+define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
@@ -125,12 +154,20 @@ define Package/libbbfdm/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef

-define Package/libbbfdm/prerm
+define Package/libbbfdm/default/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
@@ -145,3 +182,6 @@ 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))
--- a/bulkdata/Makefile
+++ b/bulkdata/Makefile
@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bulkdata
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -19,23 +19,41 @@ 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/$(PKG_NAME)
+define Package/bulkdata/default
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm +libbbf_api
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbf_api
 endef

-define Package/$(PKG_NAME)/description
-	BBF BulkData Collection
+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
 endef

 TARGET_CFLAGS += \
@@ -48,7 +66,7 @@ define Build/Prepare
 endef
 endif

-define Package/$(PKG_NAME)/install
+define Package/bulkdata/default/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
@@ -56,4 +74,10 @@ define Package/$(PKG_NAME)/install
 	$(CP) ./files/* $(1)/
 endef

-$(eval $(call BuildPackage,$(PKG_NAME)))
+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))
--- a/dectmngr/Makefile
+++ b/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:=cc475d5bfe663b73f4ae28d74c9035e210a8ad24
+PKG_SOURCE_VERSION:=96011a9ac7f8b714846ac0ba629528a078de8d9a
 PKG_MIRROR_HASH:=skip
 endif

--- a/evoice/Makefile
+++ b/evoice/Makefile
@@ -11,7 +11,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=56a568164e84c8e2d7f2c7f06d26265e837b11ef
+PKG_SOURCE_VERSION:=391b822c7e7127c85245934139ac6344715fac9f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -51,12 +51,15 @@ 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))
--- a/icwmp/Config_cwmp.in
+++ b/icwmp/Config_cwmp.in
@@ -1,36 +1,30 @@
-if PACKAGE_icwmp
-
 choice
-	prompt "Select ACS sever"
-	default CWMP_ACS_MULTI
+       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 "HDM"
+	bool "Select HDM as ACS server"
 endchoice

 config CWMP_DEBUG
 	bool "Compile with debug options"
+	depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
 	default y

 config CWMP_DEVEL_DEBUG
-	bool "Compile with development debug options"
+	bool "Compile with development debug options (deprecated)"
+	depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
 	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
-
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
+# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,57 +8,92 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.0
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_VERSION:=8.4.2
+
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=473e8f449032cb195ae4aff2595e5c2efe623335
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_SOURCE_VERSION:=c7e55ed9070dd822452f132cc7112294d305a233
 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_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=COPYING
+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

-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 include $(INCLUDE_DIR)/package.mk

-define Package/$(PKG_NAME)
+define Package/icwmp/default
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
-  TITLE:=CWMP client
-  DEPENDS:=+libuci +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libwolfssl +curl +libcurl +libopenssl +mxml
-  MENU := 1
+  TITLE:=TR069 CWMP client
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
 endef

-define Package/$(PKG_NAME)/description
- A free client implementation of CWMP (TR-069) protocol
-endef
-
-define Package/$(PKG_NAME)/config
+define Package/icwmp/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
@@ -79,19 +114,14 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif

-ifeq ($(CONFIG_CWMP_USE_WOLFSSL), y)
-CONFIGURE_ARGS += --enable-libwolfssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += "-lwolfssl"
+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

-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
+define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
@@ -109,4 +139,11 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
 endef

-$(eval $(call BuildPackage,$(PKG_NAME)))
+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))
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -11,7 +11,6 @@ config acs 'acs'
 	option retry_min_wait_interval '5'
 	# possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
-	option https_ssl_capath ''
 	option ipv6_enable '0'
 	option ip_version '4'

--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -106,7 +106,6 @@ validate_acs_section()
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
 		'retry_interval_multiplier:range(1000, 65535)' \
-		'https_ssl_capath:file' \
 		'ipv6_enable:bool'

 }
--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ieee1905
-PKG_VERSION:=4.7.4
+PKG_VERSION:=4.7.7

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=efe39a957f8512243e6ee6044e91d8f5a97c318e
+PKG_SOURCE_VERSION:=8de4d6cab56f2107e89728187e8e72f95f0e2afa
 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
--- a/iop/config
+++ b/iop/config
@@ -51,7 +51,7 @@ CONFIG_PACKAGE_wifimngr=y
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
 CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_wfadatad=y
+# CONFIG_PACKAGE_wfadatad is not set
 CONFIG_PACKAGE_wfadatad-collector=y

 # Network #
@@ -65,12 +65,12 @@ CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y

 # TR-x69 #
-CONFIG_PACKAGE_uspd=y
-CONFIG_PACKAGE_icwmp=y
+CONFIG_PACKAGE_uspd-mbedtls=y
+CONFIG_PACKAGE_icwmp-mbedtls=y
 CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_bulkdata=y
+CONFIG_PACKAGE_bulkdata-mbedtls=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=m
+CONFIG_PACKAGE_stunc-mbedtls=m
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_twamp=m
 CONFIG_PACKAGE_udpechoserver=m
--- a/map-agent/Config.in
+++ b/map-agent/Config.in
@@ -10,5 +10,8 @@ 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
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=7.1.33
+PKG_VERSION:=7.1.35
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=9d37e0b65571a6e5b9ad05bd79f49dc04d9a1dbb
+PKG_SOURCE_VERSION:=cd0f2a4ecb3ee3a3bdbff6d18bb51e23ae673847
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -66,6 +66,10 @@ 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
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=6.0.18
+PKG_VERSION:=6.0.19
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=4029fa48a18e3a6c8af3a2478558e74184fd1786
+PKG_SOURCE_VERSION:=b0e445b1a9ee962c1d151526eeb39d657f6f855c

 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.7
+PKG_VERSION:=5.0.0.9

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -31,7 +31,7 @@ define Package/obuspa
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=USP agent
-  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto-ssl +libwebsockets-openssl
+  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
 endef

 define Package/obuspa/description
--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -699,20 +699,16 @@ configure_obuspa() {

 	if [ -n "${ifname}" ]; then
 		procd_set_param env USP_BOARD_IFNAME="${ifname}"
-		# Set this variable for root user and obuspa -c tool
+	fi
+
+	if [ -z "${ifname}" ] || ! grep -F -q "export USP_BOARD_IFNAME=${ifname}" "${PROFILE}"; then
 		if [ -f "${PROFILE}" ]; then
-			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
+			sed -i "/export USP_BOARD_IFNAME/d" "${PROFILE}"
 		fi
-		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
+
+		if [ -n "${ifname}" ]; then
+			# Set this variable for root user and obuspa -c tool
+			echo "export USP_BOARD_IFNAME=${ifname}" >> "${PROFILE}"
 		fi
 	fi

--- a/qosmngr/files/lib/qos/broadcom.sh
+++ b/qosmngr/files/lib/qos/broadcom.sh
@@ -5,7 +5,6 @@
 IP_RULE=""
 BR_RULE=""

-POLICER_SKIP=0
 POLICER_COUNT=0
 INTF_NAME=""
 Q_COUNT=0
@@ -757,12 +756,7 @@ handle_policer_rules() {
 		return
 	fi

-	# 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
+	config_ingress_rate_limit $ifname $ingress_rate $in_burst_size

 }

@@ -880,17 +874,15 @@ configure_queue() {
 configure_policer() {
 	# The policer object is not available on non BCM968* chips, just clean up
 	# the old config if any and return
-	if [ $POLICER_SKIP -eq 0 ]; then
-		for intf in $(db get hw.board.ethernetPortOrder); do
-			local unitport="$(get_port_number $intf)"
-			local unit=$(echo $unitport | cut -d ' ' -f 1)
-			local port=$(echo $unitport | cut -d ' ' -f 2)
-			# setting rate and burst size to 0 disables rate limiting
-			if [ $port != "" -a $unit != "" ]; then
-				ethswctl -c rxratectrl -n $unit -p $port -x 0 -y 0
-			fi
-		done
-	fi
+	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

 	# Delete policer
 	local i=0
@@ -931,10 +923,6 @@ 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
--- a/stunc/Config.in
+++ b/stunc/Config.in
@@ -1,16 +0,0 @@
-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
--- a/stunc/Makefile
+++ b/stunc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020 iopsys Software Solutions AB
+# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,49 +8,75 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=stunc
-PKG_VERSION:=1.1.3
-
+PKG_RELEASE:=1
+PKG_VERSION:=1.1.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c5de804fb976d17fd9a7ed7967d760d0c7e4c224
 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/$(PKG_NAME)
+define Package/stunc/default
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libwolfssl +libblobmsg-json +libbbf_api +libopenssl
-  MENU := 1
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json +libbbf_api
 endef

-define Package/$(PKG_NAME)/description
-	BBF STUN Client
+define Package/stunc-mbedtls
+  $(Package/stunc/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_stunc-mbedtls:libmbedtls
+  VARIANT:=mbedtls
+  DEFAULT_VARIANT:=1
 endef

-define Package/$(PKG_NAME)/config
-	source "$(SOURCE)/Config.in"
+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
 endef

 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror

-ifeq ($(CONFIG_STUNC_USE_WOLFSSL), y)
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += -lwolfssl
+ifeq ($(BUILD_VARIANT),wolfssl)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+  MAKE_FLAGS += \
+	USE_WOLFSSL="yes"
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/mbedtls
+  MAKE_FLAGS += \
+	USE_MBEDTLS="yes"
+endif
+
+ifeq ($(BUILD_VARIANT),openssl)
+  TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+  MAKE_FLAGS += \
+	USE_OPENSSL="yes"
 endif

 ifeq ($(LOCAL_DEV),1)
@@ -59,7 +85,7 @@ define Build/Prepare
 endef
 endif

-define Package/$(PKG_NAME)/install
+define Package/stunc/default/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/init.d
@@ -70,4 +96,10 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DATA) ./files/etc/config/stunc $(1)/etc/config/stunc
 endef

-$(eval $(call BuildPackage,$(PKG_NAME)))
+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))
--- a/sulu/Makefile
+++ b/sulu/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.2

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=ab01473ad17974714f7cc91fcb345746fb7ddd6d
+PKG_SOURCE_VERSION:=bbb96509dfb6f64e653421d3c37228a800548261

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
--- a/udpechoserver/Makefile
+++ b/udpechoserver/Makefile
@@ -8,14 +8,17 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=udpechoserver
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4

-PKG_SOURCE_VERSION:=4e80bbec15b284080798b5ffbe8655febaa239aa
+LOCAL_DEV:=0
+ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpechoserver.git
-
+PKG_SOURCE_VERSION:=bb89f350f8b5b2c554b4f484c87e99400d41d4a2
 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)

@@ -42,6 +45,12 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror

+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	$(CP) -rf ~/git/udpechoserver/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
--- a/udpechoserver/files/etc/init.d/udpechoserverd
+++ b/udpechoserver/files/etc/init.d/udpechoserverd
@@ -4,29 +4,51 @@
 #Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>

 START=99
-STOP=10
+STOP=02

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

 start_service() {
-	local enable_udpechoserver=`uci -q get udpechoserver.udpechoserver.enable`
-	local port_udpechoserver=`uci -q get udpechoserver.udpechoserver.server_port`
-	if [ "$port_udpechoserver" != "0" ]; then
-		if [ "$enable_udpechoserver" = "1" ]; then
+	local enable_udpechoserver port_udpechoserver address_udpechoserver
+
+	enable_udpechoserver="$(uci -q get udpechoserver.udpechoserver.enable)"
+	port_udpechoserver="$(uci -q get udpechoserver.udpechoserver.server_port)"
+	address_udpechoserver="$(uci -q get udpechoserver.udpechoserver.address)"
+
+
+	if [ "${enable_udpechoserver}" -eq "1" ] && [ "$port_udpechoserver" -ne "0" ]; then
+		if [ -z "$address_udpechoserver" ]; then
 			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
-			procd_open_instance
-			procd_set_param command "$PROG"
-			procd_set_param respawn "3" "7" "0"
-			procd_close_instance
+			ip6tables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
+		elif [[ "$address_udpechoserver" =~ .*:.* ]]; then
+			ip6tables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
 		else
-			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j REJECT -m comment --comment "Close UDPechoserver port"
+			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j ACCEPT -m comment --comment "Open UDPechoserver port"
 		fi
+
+		procd_open_instance
+		procd_set_param command "$PROG"
+		procd_set_param respawn "3" "7" "0"
+		procd_close_instance
 	fi
 }

-boot() {
-	start
+stop_service() {
+	# Remove the USPechoserver ports created earlier
+	while iptables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
+		iptables -D zone_wan_input $(iptables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
+	done
+
+	while ip6tables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" > /dev/null; do
+		ip6tables -D zone_wan_input $(ip6tables -L zone_wan_input --line-numbers | grep "Open UDPechoserver port" | head -1|awk '{print $1}');
+	done
+
+	plus_enable="$(uci -q -c /var/state get udpechoserver.udpechoserver.plus)"
+	if [ -n "${plus_enable}" ]; then
+		uci -q set udpechoserver.udpechoserver.plus="${plus_enable}"
+		uci commit udpechoserver
+	fi
 }

 reload_service() {
@@ -36,4 +58,4 @@ reload_service() {

 service_triggers() {
 	procd_add_reload_trigger udpechoserver
-}
+}
--- a/uspd/Config.in
+++ b/uspd/Config.in
@@ -1,14 +0,0 @@
-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
--- a/uspd/Makefile
+++ b/uspd/Makefile
@@ -5,46 +5,60 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=uspd
-PKG_VERSION:=2.2.6
+PKG_VERSION:=2.2.7

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ff39170a3e0595a67763a61ac81b2f99b5bf11d7
 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
+define Package/uspd/default
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
-  TITLE:=USP ubus backend
-  DEPENDS:=+libubox +ubus +libbbfdm +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
+  TITLE:=Datamodel ubus backend
+  DEPENDS:=+libubox +ubus +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
           +@BBF_TR181 +@BBF_TR104 +@BBF_TR143
 endef

-define Package/uspd/description
- Ubus based backend for TR-369/USP which can be used by other USP agents
- running on top of it.
+define Package/uspd-mbedtls
+  $(Package/uspd/default)
+  TITLE += (mbedtls)
+  DEPENDS += +libbbfdm-mbedtls
+  VARIANT:=mbedtls
+  DEFAULT_VARIANT:=1
 endef

-define Package/uspd/config
-	source "$(SOURCE)/Config.in"
+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
 endef

 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
 	-D_GNU_SOURCE \
 	-Wall -Werror \
-	-DUSPD_MAX_MSG_LEN=$(CONFIG_USPD_MAX_MSG_LEN)
+	-DUSPD_MAX_MSG_LEN="10485760"

 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
@@ -52,7 +66,7 @@ define Build/Prepare
 endef
 endif

-define Package/uspd/install
+define Package/uspd/default/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
@@ -63,4 +77,10 @@ define Package/uspd/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/uspd $(1)/usr/sbin/
 endef

-$(eval $(call BuildPackage,uspd))
+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))
--- a/wfadatad/Config.in
+++ b/wfadatad/Config.in
@@ -1,9 +1,4 @@
-if PACKAGE_wfadatad || PACKAGE_wfadatad-collector
-menu "configurations"
-
-config WFA_DELM_STANDALONE
-	bool "Build as standalone daemon instead of a plugin"
-	default y
+menu "Configuration"

 config WFA_DELM_MULTIAP_MODE
 	bool "Enable Multi-AP mode"
@@ -13,4 +8,3 @@ config WIFI_DELM_DEBUG
 	bool "Enable debug logs"
 	default n
 endmenu
-endif
--- a/wfadatad/Makefile
+++ b/wfadatad/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wfadatad
-PKG_VERSION:=6.12.2
+PKG_VERSION:=7.0.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=090f5e7c3a379cc46b3473d997a7aaee6b255000
+PKG_SOURCE_VERSION:=6e4055202952311774680793a1b46224e44c997f
 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
+  TITLE:=WiFi DataElements Agent (standalone) daemon
  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl \
-	  +!WFA_DELM_STANDALONE:map-agent +libieee1905 +map-plugin
+	   @(!PACKAGE_map-agent) +libieee1905 +map-plugin
 endef

 define Package/wfadatad/description
@@ -37,24 +37,20 @@ endef
 define Package/wfadatad-collector
  SECTION:=utils
  CATEGORY:=Utilities
-  TITLE:=WiFi DataElements Collector
+  TITLE:=WiFi DataElements Collector Proxy
  DEPENDS:=+libuci +libubox +ubus +libpthread +libnl-genl \
 	   +libieee1905 +map-plugin
 endef

 define Package/wfadatad-collector/description
- It implements WiFi DataElement Collector.
+ It implements the WiFi DataElements Collector Proxy component.
 endef


-define Package/wfadatad/config
+define Package/wfadatad-collector/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
@@ -85,29 +81,17 @@ 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))
Author	SHA1	Message	Date
Omar Kallel	b63285e7a8	icwmp: HEARTBEAT event	2022-04-28 14:36:12 +01:00
Jakob Olsson	d4a9cde562	map-agent: 7.1.35	2022-04-22 15:31:07 +02:00
vdutta	1824013aeb	udpechoserver: 1.0.4	2022-04-21 17:36:42 +05:30
Yalu Zhang	13c858421c	Update package evoice Enable the development log messages and fix compilation errors	2022-04-21 12:07:13 +02:00
Omar Kallel	a917d47854	icwmp: 8.4.1	2022-04-21 10:01:21 +01:00
Jakob Olsson	4c11a12d11	map-agent: make EASYMESH_R2_CERT compile flag selectable	2022-04-20 13:20:13 +02:00
Anjan Chanda	73a7d9cc42	config: deselect wfadatad package	2022-04-20 10:53:52 +02:00
Yalu Zhang	68a51047e9	Update package evoice libvoiceservice updating	2022-04-20 10:50:25 +02:00
Anjan Chanda	42db3eaf5d	wfadatad: 7.0.1	2022-04-20 10:39:38 +02:00
Roman Azarenko	8c867fc829	obuspa: init: fix manipulating USP_BOARD_IFNAME env var in .profile This addresses two problems: 1. `sed 'g/export USP_BOARD_NAME/d'` would erase all the lines in the affected file, regardless of whether there was a match or not. Replace this with `sed '/foo/d'`, which correctly deletes just the affected lines. 2. Changing an `interface`/`ifname` in UCI configuration would end up appending to /root/.profile due to how the control flow was written.	2022-04-20 09:11:40 +02:00
Omar Kallel	c9bc7a3dea	icwmp: 8.4.0	2022-04-19 15:28:14 +01:00
Yalu Zhang	7c05f41418	eVoice: Update Makefile to build libvoiceservice.so by default	2022-04-19 11:51:13 +02:00
Anjan Chanda	47fe3342d3	ieee1905: 4.7.7	2022-04-14 16:32:15 +02:00
Sukru Senli	135b15c101	sulu: 1.0.2	2022-04-14 13:40:50 +02:00
Jakob Olsson	26a75d11f0	map-controller: 6.0.19	2022-04-14 12:37:19 +02:00
vdutta	85a20c9485	bbf: 6.6.24	2022-04-14 14:01:48 +05:30
Amin Ben Ramdhane	e239e77fdd	bbf: 6.6.23	2022-04-13 15:16:11 +01:00
vdutta	4824b441b6	stunc: Fix compilation issue for wolfssl variant	2022-04-13 13:23:06 +00:00
vdutta	3bb9298485	iop: Select mbedtls variants for TRx69 packages	2022-04-13 13:23:06 +00:00
vdutta	557ed06daa	bulkdata: Added ssl variants to align with bbf variants	2022-04-13 13:23:06 +00:00
vdutta	1f0e4a191c	uspd: Added ssl variants	2022-04-13 13:23:06 +00:00
vdutta	03e29020e2	bbf: Added ssl variants for libbbfdm	2022-04-13 13:23:06 +00:00
vdutta	f314c20b8a	obuspa: Removed build dependency from uspd	2022-04-13 13:23:06 +00:00
vdutta	5f2e737e7c	icwmp: Added ssl variants	2022-04-13 13:23:06 +00:00
vdutta	0e32d885b0	stunc: Added ssl variants	2022-04-13 13:23:06 +00:00
Wenpeng Song	363ae3044e	dectmngr: provide UBUS API test	2022-04-13 13:02:23 +00:00
Jakob Olsson	2f5d167976	map-agent: 7.1.34	2022-04-13 14:22:13 +02:00
Sukru Senli	558936d23d	sulu: 1.0.1	2022-04-13 12:58:10 +02:00
Anjan Chanda	b946784deb	ieee1905: 4.7.6	2022-04-12 20:19:16 +02:00
Amin Ben Ramdhane	7adf27bcaf	bbf: 6.6.21	2022-04-12 17:12:19 +01:00
Amit KUmar	85d804d575	qosmngr: uniform code handling for qos policer removed POLICER_SKIP check from broadcom.sh to make policer configuration code uniform for all devices.	2022-04-12 13:02:11 +00:00
Jakob Olsson	4a756c84c7	ieee1905: 4.7.5	2022-04-12 12:47:17 +02:00