map-agent: make EASYMESH_R2_CERT compile flag selectable

config: deselect wfadatad package
Update package evoice
2025-12-27 12:33:49 +08:00 · 2022-04-20 13:20:13 +02:00 · 2022-04-20 10:53:52 +02:00 · 2022-04-20 10:50:25 +02:00 · 2022-04-20 10:39:38 +02:00 · 2022-04-20 09:11:40 +02:00
31 changed files with 410 additions and 357 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.16
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_VERSION:=6.6.24
+
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b7dc6ec4cf5f1aac429be8b1e5ffe2a723bcd8ba
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_SOURCE_VERSION:=daa67e6bad5526c5904715214ac553366255765c
 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:=2869a8709bfd1f7a332c79311c5e3d714b318076
+PKG_SOURCE_VERSION:=96011a9ac7f8b714846ac0ba629528a078de8d9a
 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
+	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c
 endef

 define Package/$(PKG_NAME)/description
--- a/easy-soc-libs/Makefile
+++ b/easy-soc-libs/Makefile
@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.40
+PKG_VERSION:=6.4.44
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=42e2d433aa81c9914d2893aa69cc434fb93f9b96
+PKG_SOURCE_VERSION:=e4f811b7cd2836cdcce5ea0f97f515a317da5bc3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
--- a/evoice/Makefile
+++ b/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/ensemble/evoice.git
-PKG_SOURCE_VERSION:=1f790ba0cbc1b62c4bff9fd09a20cb0c299422da
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
+PKG_SOURCE_VERSION:=c8d7ddd92be4ee5edb243112c590036ccc02f410
 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/evoice/files/etc/config/voice
+++ b/evoice/files/etc/config/voice
@@ -6,7 +6,7 @@ config SIPClient 'Client1'
 	option AuthPassword '51234'
 	option Network 'Network1'
 	option MaxSessions '5'
-	option RegisiterURI '51234@192.164.4.210'
+	option RegisiterURI '51234@sip-proxy.iopsys.eu'
 	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@192.164.4.210'
+	option RegisiterURI '51235@sip-proxy.iopsys.eu'
 	option E164Format '1'

 config SIPNetwork 'Network1'
 	option Enable '1'
-	option ProxyServer '192.168.4.210'
+	option ProxyServer 'sip-proxy.iopsys.eu'
 	option ProxyServerPort '5060'
 	option ProxyServerTransport 'UDP'
-	option RegistrarServer '192.168.4.210'
+	option RegistrarServer 'sip-proxy.iopsys.eu'
 	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,20 +210,13 @@ config CallingFeatures 'Set2'
 	option CallWaitingEnable '1'

 config NumberingPlan 'NumberingPlan1'
-	option MinimumNumberOfDigits '5'
-	option MaximumNumberOfDigits '15'
-	option InterDigitTimerStd '2000'
-	option InterDigitTimerOpen '2000'
-	option TerminationDigit ' '
-
-config NumberingPlan 'NumberingPlan2'
-	option MinimumNumberOfDigits '5'
+	option MinimumNumberOfDigits '1'
 	option MaximumNumberOfDigits '15'
 	option InterDigitTimerStd '2000'
 	option InterDigitTimerOpen '2000'
 	option TerminationDigit '#'

-config NumberingPlan 'NumberingPlan3'
+config NumberingPlan 'NumberingPlan2'
 	option MinimumNumberOfDigits '5'
 	option MaximumNumberOfDigits '15'
 	option InterDigitTimerStd '2000'
@@ -239,7 +232,7 @@ config NumberingPlan 'NumberingPlan3'
 	list PrefixList '3PrefixInfo8'
 	list PrefixList '3PrefixInfo9'

-config NumberingPlan 'NumberingPlan4'
+config NumberingPlan 'NumberingPlan3'
 	option MinimumNumberOfDigits '5'
 	option MaximumNumberOfDigits '15'
 	option InterDigitTimerStd '2000'
@@ -255,7 +248,7 @@ config PrefixInfo '3PrefixInfo1'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CW_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '

 config PrefixInfo '3PrefixInfo2'
 	option Enable '1'
@@ -265,7 +258,7 @@ config PrefixInfo '3PrefixInfo2'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CW_DEACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '

 config PrefixInfo '3PrefixInfo3'
 	option Enable '1'
@@ -275,7 +268,7 @@ config PrefixInfo '3PrefixInfo3'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFU_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '

 config PrefixInfo '3PrefixInfo4'
 	option Enable '1'
@@ -285,7 +278,7 @@ config PrefixInfo '3PrefixInfo4'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFU_DEACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '

 config PrefixInfo '3PrefixInfo5'
 	option Enable '1'
@@ -295,7 +288,7 @@ config PrefixInfo '3PrefixInfo5'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFB_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '

 config PrefixInfo '3PrefixInfo6'
 	option Enable '1'
@@ -305,7 +298,7 @@ config PrefixInfo '3PrefixInfo6'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFB_DEACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '

 config PrefixInfo '3PrefixInfo7'
 	option Enable '1'
@@ -315,7 +308,7 @@ config PrefixInfo '3PrefixInfo7'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFNR_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '

 config PrefixInfo '3PrefixInfo8'
 	option Enable '1'
@@ -325,7 +318,7 @@ config PrefixInfo '3PrefixInfo8'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CFNR_DEACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '

 config PrefixInfo '3PrefixInfo9'
 	option Enable '1'
@@ -335,7 +328,7 @@ config PrefixInfo '3PrefixInfo9'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'CA_ACTIVATE'
-    option FacilityActionArgument ' '
+	option FacilityActionArgument ' '

 config PrefixInfo '4PrefixInfo1'
 	option Enable '1'
@@ -345,7 +338,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#'
--- 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.3.6
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_VERSION:=8.4.0
+
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=adc551c7685668bfb0cf1296db8905ec88ff4e03
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
+PKG_SOURCE_VERSION:=a8463946f3df9227685947a6b5a7ffde17b10a44
 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 +libmicroxml +libubox +jshn +libubus +libblobmsg-json +libpthread +ubusd +shflags +getopt +zlib +libjson-c +libwolfssl +curl +libcurl +libopenssl
-  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/firewall.cwmp
+++ b/icwmp/files/etc/firewall.cwmp
@@ -6,7 +6,6 @@ log() {
 }

 if [ ! -f "/var/state/cwmp" ]; then
-	touch "/var/state/cwmp"
 	exit 0;
 fi

--- a/icwmp/files/etc/init.d/icwmpd
+++ b/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=2
+STOP=00

 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,41 +58,39 @@ 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
+	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
 	fi

-	mkdir -p /var/run/icwmpd
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
-	then
-		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
+	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
-		mv /etc/icwmpd/dm_enabled_notify /var/run/icwmpd 2>/dev/null
+
+	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]; then
+		cp -f /etc/icwmpd/dm_enabled_notify /var/run/icwmpd/ 2>/dev/null
 	fi
 }

 copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/state/cwmp ]
-	then
-		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
+	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]; then
+		cp -f /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]
-	then
-		cp /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
+
+	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]; then
+		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]
-	then
-		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
+
+	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/
 	fi
 }

@@ -158,22 +156,6 @@ 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
@@ -217,15 +199,19 @@ start_service() {
 	procd_close_instance
 }

-stop_service()
+service_stopped()
 {
 	copy_cwmp_varstate_files_to_etc
 }

 reload_service() {
-	log "Restarting CWMP client"
-	stop
-	start
+	log "Reloading CWMP client"
+	ubus -t 1 call tr069 command '{"command":"reload"}'
+	if [ "$?" -ne "0" ]; then
+		log "Restarting CWMP client"
+		stop
+		start
+	fi
 }

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

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

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=079e0698ed2de45c9c38ff72c0415c99f5d35d2d
+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.26
+PKG_VERSION:=7.1.34
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d6ff42ed06e3e56dae337d9ffad054a9197feeaa
+PKG_SOURCE_VERSION:=b94b561bc74ec7682cebcc3b4c9cb1bfc08b4c41
 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-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
+++ b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
@@ -97,7 +97,9 @@ if [ "$LINK" = "up" ]; then

 	/lib/wifi/multiap set_uplink "eth" "$PORT"
 else
-	rm -f "$map_bh_file"
+	/lib/wifi/multiap unset_uplink "eth"
+	#rm -f "$map_bh_file"
 	config_load "mapagent"
 	config_foreach update_bstas bsta up
+
 fi
--- a/map-agent/files/lib/wifi/multiap
+++ b/map-agent/files/lib/wifi/multiap
@@ -797,21 +797,26 @@ set_uplink() {

 	config_load mapagent

-	mapagent_process_agent() {
-		local section=$1
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"

-		config_get island_prevention $section island_prevention
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		ubus call map.agent toggle_fh '{"enable":true, "prevent_island":true, "ifname":"all"}'
+	fi

-		if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
-			ubus call map.agent toggle_fh '{"ifname":"all", "enable":true}'
-		fi
-	}
-
-	config_foreach mapagent_process_agent agent
 }

 unset_uplink() {
-	rm "$MAPFILE" > /dev/null 2>&1
+	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
 }

 func=$1
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=6.0.14
+PKG_VERSION:=6.0.19
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=de6cf72670f0d912200cb4f0476bc5fb2a90bb67
+PKG_SOURCE_VERSION:=b0e445b1a9ee962c1d151526eeb39d657f6f855c

 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
--- a/map-topology/Makefile
+++ b/map-topology/Makefile
@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk

 PKG_NAME:=map-topology
-PKG_VERSION:=3.2.9
+PKG_VERSION:=3.2.12

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=5d9b0bc94f8d01ecc7a2026ca1d6faf19ca0ede2
+PKG_SOURCE_VERSION:=dc59897b52ed1406175cd9314759c00aa12ed0a4
 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
--- 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.2
-
+PKG_RELEASE:=1
+PKG_VERSION:=1.1.5

 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/$(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/stunc/files/etc/init.d/stunc
+++ b/stunc/files/etc/init.d/stunc
@@ -17,6 +17,7 @@ validate_stun_section()
 		'enabled:bool' \
 		'Username:string' \
 		'Password:string' \
+		'server_address:host' \
 		'server_port:port' \
 		'client_port:port' \
 		'log_level:uinteger:0'
--- a/sulu/Makefile
+++ b/sulu/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

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

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

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
--- a/uboot/Makefile
+++ b/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:=cc5b0b236c4536ad4b694407f8ea258c61aaa76c
+PKG_SOURCE_VERSION:=4cd73fe5db0ebfc1242ca9c85c14d7f0718eaf73
 endif

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
--- 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.3
+PKG_VERSION:=2.2.7

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a472ef1ef9d9f1f7a9dc356a91b15e295e417d54
 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.11.3
+PKG_VERSION:=7.0.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ee894ec87ba3f97bfcab9bf2629c85ae69f2329d
+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
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
Jakob Olsson	db91f3809a	wfadatad: 6.12.2	2022-04-12 10:36:27 +02:00
Jakob Olsson	55ba075a82	ieee1905: 4.7.4	2022-04-12 09:34:29 +02:00
Jakob Olsson	98403702fe	ieee1905: 4.7.3	2022-04-11 15:28:41 +02:00
Jakob Olsson	f50af42366	map-controller: 6.0.18	2022-04-11 15:27:57 +02:00
vdutta	9ea69b1c07	bbf: 6.6.20	2022-04-11 15:32:04 +05:30
Jakob Olsson	338856f15d	map-topology: 3.2.12	2022-04-08 17:04:21 +02:00
vdutta	a5459d4ee6	uspd: 2.2.6	2022-04-08 18:24:37 +05:30
Jakob Olsson	d143e9af96	map-controller: 6.0.17	2022-04-08 14:28:31 +02:00
Anjan Chanda	bf7e5fca47	wfadatad: 6.12.1	2022-04-08 12:32:41 +02:00
Anjan Chanda	eb1224022e	ieee1905: 4.7.2	2022-04-08 12:24:11 +02:00
Anjan Chanda	55835b3af0	easy-soc-libs: 6.4.44	2022-04-08 12:23:33 +02:00
vdutta	e0eec6c755	uspd: 2.2.5	2022-04-08 15:36:46 +05:30
Anjan Chanda	c8e1e6538a	ieee1905: 4.7.1	2022-04-08 12:04:20 +02:00
Sukru Senli	3e60ebb118	sulu: v1.0.0	2022-04-08 10:29:17 +02:00
Jakob Olsson	42bd799915	map-controller: 6.0.16	2022-04-07 18:05:43 +02:00
Yalu Zhang	64369a08f4	evoice: update /etc/config/voice to support variable length of called numbers The previous config only allows the fixed number of digits as a called number. With MinimumNumberOfDigits as 5, MaximumNumberOfDigits as 15 and TerminationDigit as ' ', users can only dial 5 digits as a called number. That is wrong. After this change, the number of digits for a called number is in the range between MinimumNumberOfDigits (1) and MaximumNumberOfDigits (15). But the number must terminate with '#' which is not a part of called number and will be strapped off. TODO: support variable length of called numbers without termination digit.	2022-04-07 16:39:54 +02:00
Jakob Olsson	3dd570990e	map-topology: 3.2.11	2022-04-07 15:50:19 +02:00
vdutta	7e8f51d15b	uspd: 2.2.4	2022-04-07 17:17:18 +05:30
vdutta	2faada9f0b	icwmp: 8.3.10	2022-04-07 17:13:07 +05:30
Jakob Olsson	1d88107cc6	map-topology: 3.2.10	2022-04-07 11:12:00 +02:00
Anjan Chanda	65ecbbde31	ieee1905: 4.7.0	2022-04-07 10:56:10 +02:00
vdutta	0c8b29d7d5	icwmp: Fix race condition in config backup	2022-04-07 11:16:20 +05:30
Jakob Olsson	45f0f50740	map-agent: 7.1.33	2022-04-06 17:15:13 +02:00
Jakob Olsson	6ecc48540f	map-agent: 7.1.32	2022-04-06 16:11:35 +02:00
Janusz Dziedzic	a027edeca2	easy-soc-libs: 6.4.43 Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>	2022-04-06 12:22:16 +00:00
Anjan Chanda	dd25486412	ieee1905: 4.6.27	2022-04-06 10:23:30 +02:00
Yalu Zhang	d345eefd86	evoice: update /etc/config/voice for easy testing Domain name "sip-proxy.iopsys.eu" is used for URI and proxy instead of IP address. In order to make it work, the proxy server's configuration needs to be updated for accepting sip-proxy.iopsys.eu as domain instead of IP address by default for kamailio example. $ diff /etc/kamailio/kamailio.cfg.orig /etc/kamailio/kamailio.cfg 176c176 < # alias="sip.mydomain.com" --- > alias="sip-proxy.iopsys.eu" On the DUT, run the following to add a domain name entry in dnsmasq for sip-proxy.iopsys.eu. uci add dhcp domain uci set dhcp.@domain[-1].name='sip-proxy.iopsys.eu' uci set dhcp.@domain[-1].ip="10.100.1.254" # Replace 10.100.1.254 with the actual IP in your environment uci commit dhcp /etc/init.d/dnsmasq restart Then restart evoice at the last step.	2022-04-05 16:52:51 +02:00
Jakob Olsson	4b272be181	map-agent: 7.1.31	2022-04-05 15:21:50 +02:00
Jakob Olsson	09d49cb77d	ieee1905: 4.6.26	2022-04-05 15:09:49 +02:00
vdutta	0e8b8eb69d	cwmp: Fix upload	2022-04-05 17:39:42 +05:30
Jakob Olsson	a2610d371d	map-agent: 7.1.30	2022-04-05 11:32:17 +02:00
vdutta	e1886e61bc	bbf: 6.6.19	2022-04-05 08:52:33 +05:30
Grzegorz Sluja	c1f4056723	dectmngr: Play DialTone on handset based on SIP registration status	2022-04-04 16:01:04 +02:00
Anjan Chanda	1a404e9be5	ieee1905: 4.6.25	2022-04-04 14:14:59 +02:00
Anjan Chanda	6899e35524	easy-soc-libs: 6.4.42	2022-04-04 14:14:15 +02:00
Jakob Olsson	17c9858783	map-agent: 7.1.29	2022-04-04 11:44:22 +02:00
Anjan Chanda	eb4e698b90	wfadatad: 6.12.0	2022-04-01 18:07:24 +02:00
Sukru Senli	c30b8937a0	sulu: adapt to URL change	2022-04-01 17:34:22 +02:00
Jakob Olsson	491098c51f	map-agent: 7.1.28	2022-04-01 17:22:49 +02:00
Sukru Senli	f190fd9085	evoice: adapt to URL change	2022-04-01 17:21:07 +02:00
Filip Matusiak	96b7aad9f2	map-agent: handle link loss of eth when active bh	2022-04-01 15:20:26 +00:00
Jakob Olsson	0166ee6540	map-controller: 6.0.15	2022-04-01 14:09:52 +02:00
vdutta	bcd9d70c52	bbf: 6.6.18	2022-04-01 16:32:07 +05:30
Sukru Senli	6ce86e0a68	sulu: 0.2.37	2022-04-01 10:36:52 +02:00
Janusz Dziedzic	b206df8ad9	easy-soc-libs: 6.4.41 Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>	2022-04-01 07:49:17 +00:00
vdutta	4a09f80d40	bbf: 6.6.17	2022-03-31 22:06:19 +05:30
Andreas Gnau	32fbe3288f	Update feed [ iopsys ] package [ u-boot-ex400 ] ------------------------------------------------------------------------------- * 4cd73fe5db ex400: Update bootloader version to new IOWRT 6 format * b22609213e Revert "ex400: enable network by default" ------------------------------------------------------------------------------- commit 4cd73fe5db0ebfc1242ca9c85c14d7f0718eaf73 Author: Jani Juvan <jani.juvan@iopsys.eu> Date: 2021-12-08 17:27:59 +0100 ex400: Update bootloader version to new IOWRT 6 format Base directory -> / board/inteno/common/board.c \| 4 ++-- board/inteno/ex400/board.c \| 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 3 deletions(-) ------------------------------------------------------------------------------- commit b22609213e92496f6cc44028f9b9930becb8a999 Author: Andreas Gnau <andreas.gnau@iopsys.eu> Date: 2022-03-31 13:35:09 +0200 Revert "ex400: enable network by default" This reverts commit 0cd508d8dd077d62baa59a0d74e2e5f24cff8926. It turns out that not starting network by default had a reason. See fccb9d5ee7 (Prevent ethernet to start up by default., 2017-05-11). Quoting the commit message: > This is needed as the setup has all port in the same switch > so WAN is connected to LAN and dhcp on clients on LAN is getting > out to the ISP and stealing ip numbers. We do not want to have networking by default with a static IP on the WAN-port. In addition, test-scripts would need adaptation if the networking is not to started by default, which is not worth it for an old platform like this. Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu> Base directory -> / board/inteno/common/board.c \| 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -------------------------------------------------------------------------------	2022-03-31 18:35:32 +02:00
vdutta	9d099ff1ce	icwmp: 8.3.7	2022-03-31 20:09:35 +05:30
Jakob Olsson	c03c76c74f	map-agent: 7.1.27	2022-03-31 15:12:43 +02:00
vdutta	000da5e808	stunc: Datamodel improvements	2022-03-31 16:13:35 +05:30
Alf Håkansson	2343ace07c	evoice: RTCP statistics and TR104 CallLog added. Tested on E600,SH3 and CRM based boards	2022-03-30 17:46:00 +02:00