stunc: remove dependency on server address

2025-12-24 11:05:02 +08:00 · 2022-03-30 12:55:17 +05:30
60 changed files with 629 additions and 1076 deletions
--- a/bbf/Config_bbfdm.in
+++ b/bbf/Config_bbfdm.in
@@ -1,3 +1,5 @@
+if PACKAGE_libbbfdm
+
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -10,6 +12,10 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"

+config BBF_TR181
+	bool "Enable TR-181 Data Model Support"
+	default y
+
 config BBF_TR104
 	bool "Enable TR-104 Data Model Support"
 	default y
@@ -20,8 +26,24 @@ config BBF_TR143

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

 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
-	default y
+	default n
+
+choice
+	prompt "Select SSL utility"
+	default BBF_USE_WOLFSSL
+
+config BBF_USE_WOLFSSL
+	bool "Use WolfSSL for ssl utilities"
+	select CONFIG_PACKAGE_libwolfssl
+
+config BBF_USE_OPENSSL
+	bool "Use OpenSSL for ssl utilities"
+	select CONFIG_PACKAGE_libopenssl
+
+endchoice
+
+endif
--- a/bbf/Makefile
+++ b/bbf/Makefile
@@ -1,24 +1,25 @@
 #
-# Copyright (C) 2022 IOPSYS
+# Copyright (C) 2021 IOPSYS
 #

 include $(TOPDIR)/rules.mk

 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.35
-
-PKG_SOURCE_PROTO:=git
+PKG_VERSION:=6.6.16
+PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=0159ecf5d84805d76dff8cb80831334e200989c7
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=b7dc6ec4cf5f1aac429be8b1e5ffe2a723bcd8ba
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

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

 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE

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

 define Package/libbbf_api
@@ -26,44 +27,16 @@ define Package/libbbf_api
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=Library for libbbfdm API
-endef
-
-define Package/libbbfdm/default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libopenssl +libwolfssl
 endef

 define Package/libbbfdm
-  $(Package/libbbfdm/default)
-  TITLE += (internal)
-  VARIANT:=internal
-endef
-
-define Package/libbbfdm-mbedtls
-  $(Package/libbbfdm/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-define Package/libbbfdm-openssl
-  $(Package/libbbfdm/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
-  CONFLICTS := libbbfdm-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/libbbfdm-wolfssl
-  $(Package/libbbfdm/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
-  CONFLICTS := libbbfdm-mbedtls libbbfdm-openssl
-  VARIANT:=wolfssl
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Library for broadband-forum data model
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libcurl +libopenssl +libwolfssl
+  MENU:=1
 endef

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

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

 ifeq ($(CONFIG_BBF_TR104),y)
 CONFIGURE_ARGS += \
@@ -122,50 +97,40 @@ CONFIGURE_ARGS += \
 	--enable-shared-library
 endif

-ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
+ifeq ($(CONFIG_BBF_USE_WOLFSSL), y)
 CONFIGURE_ARGS += --enable-libwolfssl
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += "-lwolfssl"
 endif

-ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIGURE_ARGS += --enable-libmbedtls
+ifeq ($(CONFIG_BBF_USE_OPENSSL), y)
+CONFIGURE_ARGS += --enable-libopenssl
 TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+TARGET_LDFLAGS += "-lssl"
 endif

 define Package/libbbf_api/install
 	$(INSTALL_DIR) $(1)/lib
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
 endef

-define Package/libbbfdm/default/install
+define Package/libbbfdm/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.so* $(1)/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef

-define Package/libbbfdm/default/prerm
+define Package/libbbfdm/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
 endef

-Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
-Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
-
-Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
-Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
-
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -174,12 +139,9 @@ define Build/InstallDev
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(CP) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
-	touch $(1)/usr/lib/libbbf_api.so
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbfdm.{a,so*} $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.{a,so*} $(1)/usr/lib/
 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
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2022 iopsys Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,25 +8,22 @@
 include $(TOPDIR)/rules.mk

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

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=85d7486a21a9eb0e0f345b587b3ac506edcb72fe
+PKG_SOURCE_VERSION:=b35e7862bc17fc11dc1f757c7b93900995a28633
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
@@ -34,7 +31,11 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF BulkData Collection
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +libblobmsg-json
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libcurl +curl +libblobmsg-json +libbbfdm +libbbf_api
+endef
+
+define Package/$(PKG_NAME)/description
+	BBF BulkData Collection
 endef

 TARGET_CFLAGS += \
@@ -51,7 +52,7 @@ define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.so $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/*.so $(1)/usr/lib/bbfdm
 	$(CP) ./files/* $(1)/
 endef

--- a/bulkdata/files/etc/config/bulkdata
+++ b/bulkdata/files/etc/config/bulkdata
@@ -1,6 +1,43 @@

 config bulkdata 'bulkdata'
 	option enable '0'
-	#Log levels: Error=1, Warning=2, Info=3, Debug=4
+	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
 	option log_level '3'

+config profile
+	option profile_id '1'
+	option enable '0'
+	option name ''
+	option nbre_of_retained_failed_reports '0'
+	option protocol 'http'
+	option encoding_type ''
+	option reporting_interval '86400'
+	option time_reference '0'
+	option csv_encoding_field_separator ','
+	option csv_encoding_row_separator '&#10;'
+	option csv_encoding_escape_character '&quot;'
+	option csv_encoding_report_format 'column'
+	option csv_encoding_row_time_stamp 'unix'
+	option json_encoding_report_format 'objecthierarchy'
+	option json_encoding_report_time_stamp 'unix'
+	option http_url ''
+	option http_username ''
+	option http_password ''
+	option http_compression 'none'
+	option http_method 'post'
+	option http_use_date_header '1'
+	option http_retry_enable '0'
+	option http_retry_minimum_wait_interval '5'
+	option http_retry_interval_multiplier '2000'
+	option http_persist_across_reboot '0'
+
+config profile_parameter
+	option profile_id '1'
+	option name ''
+	option reference ''
+
+config profile_http_request_uri_parameter
+	option profile_id '1'
+	option name ''
+	option reference ''
+
--- a/bulkdata/files/etc/init.d/bulkdatad
+++ b/bulkdata/files/etc/init.d/bulkdatad
@@ -1,4 +1,7 @@
 #!/bin/sh /etc/rc.common
+# Bulkdata Software
+# Copyright (C) 2020 iopsys Software Solutions AB
+# Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>

 START=99
 STOP=10
@@ -7,16 +10,13 @@ USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"

 start_service() {
-	local enable=$(uci -q get bulkdata.bulkdata.enable)
-
-	[ "$enable" != "1" ] && {
-		return 0
-	}
-
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_set_param respawn "3" "7" "0"
-	procd_close_instance
+	local bulkdata_enable=`uci -q get bulkdata.bulkdata.enable`
+	if [ "$bulkdata_enable" = "1" ]; then
+		procd_open_instance
+		procd_set_param command "$PROG"
+		procd_set_param respawn "3" "7" "0"
+		procd_close_instance
+	fi
 }

 boot() {
--- a/bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options
+++ b/bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options
@@ -1,75 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-PROFILE_COUNT=1
-
-get_next_count()
-{
-	local config="$1"
-	local default_name="${2}"
-	local count=${3}
-	local found=0
-
-	if [ -z "$count" ]; then
-		count=1
-	fi
-
-	while [ "${found}" -ne 1 ]; do
-		uci -q get ${config}.${default_name}_${count} >/dev/null
-		if [ $? -eq 0 ]; then
-			count=$((count + 1))
-		else
-			found=1;
-		fi
-	done
-
-	echo "${default_name}_${count}"
-}
-
-translate_profile_id_to_profile_name() {
-	local section="${1}"
-	local profile_id="${2}"
-	local profile_name="${3}"
-	local curr_profile_id
-
-	config_get curr_profile_id "${section}" profile_id
-
-	[ -n "${curr_profile_id}" ] || return
-	
-	[ "${curr_profile_id}" != "${profile_id}" ] && return
-
-	uci -q set bulkdata.${section}.profile_name="${profile_name}"
-	uci -q set bulkdata.${section}.profile_id=""	
-}
-
-update_profile_sections() {
-	local section="${1}"
-	local default="${2}"
-	local profile_name
-
-	config_get profile_id "${section}" profile_id
-
-	[ -n "${profile_id}" ] || return
-
-	case "${section}" in
-		"cfg"*)
-			profile_name="$(get_next_count bulkdata ${default} ${PROFILE_COUNT})"
-			uci_rename bulkdata "${section}" "${profile_name}"
-		;;
-	esac
-	PROFILE_COUNT=$((PROFILE_COUNT + 1))
-
-	[ -n "$profile_name" ] && section="${profile_name}"
-
-	uci -q set bulkdata.${section}.profile_id=""
-
-	config_foreach translate_profile_id_to_profile_name profile_parameter "${profile_id}" "${profile_name}"
-	config_foreach translate_profile_id_to_profile_name profile_http_request_uri_parameter "${profile_id}" "${profile_name}"
-}
-
-config_load bulkdata
-config_foreach update_profile_sections profile profile
-uci commit bulkdata
-
-exit 0
--- 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:=8c94908eb230dc453dd2f5575be6c06b086b2e7d
+PKG_SOURCE_VERSION:=2869a8709bfd1f7a332c79311c5e3d714b318076
 PKG_MIRROR_HASH:=skip
 endif

@@ -34,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
 	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c
+	DEPENDS:= +libubox +ubus +uci +libxml2
 endef

 define Package/$(PKG_NAME)/description
--- 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.44
+PKG_VERSION:=6.4.40
 PKG_RELEASE:=1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e4f811b7cd2836cdcce5ea0f97f515a317da5bc3
+PKG_SOURCE_VERSION:=42e2d433aa81c9914d2893aa69cc434fb93f9b96
 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/endptmngr/Makefile
+++ b/endptmngr/Makefile
@@ -18,7 +18,7 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

-PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE

 export BUILD_DIR
--- a/evoice/Makefile
+++ b/evoice/Makefile
@@ -5,18 +5,18 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=evoice
-PKG_VERSION:=0.2.1
+PKG_VERSION:=0.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=f2477946f9e142d01820b38e32ce98a781e0310e
+PKG_SOURCE_URL:=https://dev.iopsys.eu/ensemble/evoice.git
+PKG_SOURCE_VERSION:=1f790ba0cbc1b62c4bff9fd09a20cb0c299422da
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

-PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE


@@ -31,7 +31,7 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +TARGET_iopsys_brcm63xx_arm:bcmkernel +TARGET_iopsys_econet:kmod-voip_driver
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp
 endef

 define Package/$(PKG_NAME)/description
@@ -45,31 +45,18 @@ define Build/Prepare
 	rsync -av /swdev/bide/evoice_clean/* $(PKG_BUILD_DIR)/
 endef
 endif
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-	TARGET_PLATFORM=BROADCOM
-	export IDIR = $(STAGING_DIR)/usr/include
-	export BDIR = bcm963xx/userspace/private/apps/voice
-	export _XFLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc -I$(IDIR)/bcm963xx/xchg/bos/publicInc -I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
-else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
-	TARGET_PLATFORM=ECONET
-endif
-
-export TARGET_PLATFORM
-
+export IDIR = $(STAGING_DIR)/usr/include
+export BDIR = bcm963xx/userspace/private/apps/voice
+export _XFLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc -I$(IDIR)/bcm963xx/xchg/bos/publicInc -I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx

 define Build/Compile
-	@echo "TARGET_PLATFORM=${TARGET_PLATFORM}"
 	+$(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@sip-proxy.iopsys.eu'
+	option RegisiterURI '51234@192.164.4.210'
 	option E164Format '1'

 config SIPClient 'Client2'
@@ -16,22 +16,22 @@ config SIPClient 'Client2'
 	option AuthPassword '51235'
 	option Network 'Network1'
 	option MaxSessions '5'
-	option RegisiterURI '51235@sip-proxy.iopsys.eu'
+	option RegisiterURI '51235@192.164.4.210'
 	option E164Format '1'

 config SIPNetwork 'Network1'
 	option Enable '1'
-	option ProxyServer 'sip-proxy.iopsys.eu'
+	option ProxyServer '192.168.4.210'
 	option ProxyServerPort '5060'
 	option ProxyServerTransport 'UDP'
-	option RegistrarServer 'sip-proxy.iopsys.eu'
+	option RegistrarServer '192.168.4.210'
 	option RegistrarServerPort '5060'
 	option RegistrarServerTransport 'UDP'
 	option RegistrationPeriod '3240'
 	option RegisterExpires '3600'
-	option UserAgentDomain ' '
+    option UserAgentDomain ' '
 	option TimerRegistrationFailed '120'
-	option TimerT1 '500'
+    option TimerT1 '500'
 	option VoIPProfile 'VoIPProfile1'
 	list CodecList '1CodecProfile1'
 	list CodecList '1CodecProfile2'
@@ -98,20 +98,20 @@ config RTP '1RTP'
 	option JitterBufferType 'Static'

 config FXXPorts 'POTS'
-	option Region 'US'
+	option Region 'SE'

 config FXSPorts 'FXS1'
 	option Enable '1'
 	option DialType 'Tone'
-	option TransmitGain '0'
-	option ReceiveGain '0'
+	option TransmitGain '4'
+	option ReceiveGain '4'
 	option EchoCancellationEnable '1'

 config FXSPorts 'FXS2'
 	option Enable '1'
 	option DialType 'Tone'
-	option TransmitGain '0'
-	option ReceiveGain '0'
+	option TransmitGain '4'
+	option ReceiveGain '4'
 	option EchoCancellationEnable '1'

 config Extension 'Extension1'
@@ -210,13 +210,20 @@ config CallingFeatures 'Set2'
 	option CallWaitingEnable '1'

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

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

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

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

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

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

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

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

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

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

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

 config PrefixInfo '4PrefixInfo1'
 	option Enable '1'
@@ -338,7 +345,7 @@ config PrefixInfo '4PrefixInfo1'
 	option NumberOfDigitsToRemove '0'
 	option PosOfDigitsToRemove '0'
 	option FacilityAction 'X_IOPSYS_EU_EMERGENCY'
-	option FacilityActionArgument ' '
+    option FacilityActionArgument ' '

 config DialPlan 'X_IOPSYS_EU_InternalNumber1'
 	option RegExp '1X#'
--- a/evoice/files/etc/evoice/voicecap
+++ b/evoice/files/etc/evoice/voicecap
@@ -1,38 +0,0 @@
-# Capabilties are platform dependent. Keep these separated from customer configuration
- 
-config capabilities_prm 'limits'
-	option MaxCallLogCount '100'
-
-config capabilities_prm 'features'
-	option QIModelsSupported 'G.107'
-
-config CapabilitiesCodec 'Codec1'
-	option Codec 'G.711ALaw'
-	option BitRate '64000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '1'
-
-config CapabilitiesCodec 'Codec2'
-	option Codec 'G.711MuLaw'
-	option BitRate '64000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '1'
-
-config CapabilitiesCodec 'Codec3'
-	option Codec 'G.726'
-	option BitRate '32000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '0'
-	
-config CapabilitiesCodec 'Codec4'
-	option Codec 'G.722'
-	option BitRate '64000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '0'
-	
-config CapabilitiesCodec 'Codec4'
-	option Codec 'G.729'
-	option BitRate '8000'
-	option PacketizationPeriod '20,30'
-	option SilenceSupression '0'
-	
--- a/evoice/files/etc/evoice/voicedm
+++ b/evoice/files/etc/evoice/voicedm
@@ -94,7 +94,6 @@ config cs_account 'map_set'
   option Enable_Call_Transfer 'voice.Set@.CallTransferEnable'
   option AnonymousReject 'voice.Set@.AnonymousCallRejectionEnable'
   option AllowAnonymousConf 'voice.Set@.AnonymousCallEnable'
-   option CallerIDEnable 'voice.Set@.CallerIDEnable'

 config cs_xvendor 'map_np_cs'
   option np_sc_actCW 'voice.X_IOPSYS_EU_NpSc@.CW_ACT'
--- a/evoice/files/etc/evoice/voicero
+++ b/evoice/files/etc/evoice/voicero
@@ -2,9 +2,9 @@ config static_prm 'defaults'
   option Print_Control '4'
   option Print_UDP_Addr '192.168.1.3'
   option Print_UDP_Port '60000'
-   option Verbosity 'On'
+   option Verbosity 'Off'
   option Failure_Log 'On'
-   option Message_Log 'On'
+   option Message_Log 'Off'
   option Method_Trace 'Off'
   option Dial_Cache_Size '0'
   option Reverse_Fax_Detection '0'
@@ -42,7 +42,6 @@ config static_prm 'defaults'
   option NAT_Address_From_SIP '0'
   option HookOn_Transfer '0'
   option Enable_Call_Transfer '1'
-   option CallerIDEnable '1'
   option Multiparty_Transp '0'
   option Presence_Indication '0'
   option Login_Note ' '
--- a/icwmp/Config_cwmp.in
+++ b/icwmp/Config_cwmp.in
@@ -1,30 +1,36 @@
+if PACKAGE_icwmp
+
 choice
-       prompt "Select ACS sever"
-       default CWMP_ACS_MULTI
-       depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
+	prompt "Select ACS sever"
+	default CWMP_ACS_MULTI

 config CWMP_ACS_MULTI
 	bool "No specific ACS, follow standard"

 config CWMP_ACS_HDM
-	bool "Select HDM as ACS server"
+	bool "HDM"
 endchoice

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

 config CWMP_DEVEL_DEBUG
-	bool "Compile with development debug options (deprecated)"
-	depends on PACKAGE_icwmp || \
-		   PACKAGE_icwmp-openssl || \
-		   PACKAGE_icwmp-wolfssl || \
-		   PACKAGE_icwmp-mbedtls
+	bool "Compile with development debug options"
 	default n
+
+choice
+	prompt "Select SSL utility"
+	default CWMP_USE_WOLFSSL
+
+config CWMP_USE_WOLFSSL
+	bool "Use WolfSSL for ssl utilities"
+	select CONFIG_PACKAGE_libwolfssl
+
+config CWMP_USE_OPENSSL
+	bool "Use OpenSSL for ssl utilities"
+	select CONFIG_PACKAGE_libopenssl
+
+endchoice
+endif
+
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,92 +8,57 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=8.4.8
-
-PKG_SOURCE_PROTO:=git
+PKG_VERSION:=8.3.6
+PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=00d037ce851495aca6365f2189849c6030f305df
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=adc551c7685668bfb0cf1296db8905ec88ff4e03
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

 PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
+PKG_LICENSE_FILES:=COPYING

-PKG_FIXUP:=autoreconf
 PKG_CONFIG_DEPENDS:= \
 	CONFIG_CWMP_ACS_MULTI \
 	CONFIG_CWMP_ACS_HDM \
 	CONFIG_CWMP_DEBUG \
 	CONFIG_CWMP_DEVEL_DEBUG

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

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

-define Package/icwmp/config
+define Package/$(PKG_NAME)/description
+ A free client implementation of CWMP (TR-069) protocol
+endef
+
+define Package/$(PKG_NAME)/config
 	source "$(SOURCE)/Config_cwmp.in"
 endef

+USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
+ifneq ($(USE_LOCAL),)
+define Build/Prepare
+	$(CP) ./src/* $(PKG_BUILD_DIR)/
+endef
+endif
+
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	"-DCWMP_REVISION=\\\"$(PKG_SOURCE_VERSION)\\\""

-define Package/icwmp
-  $(Package/icwmp/default)
-  TITLE += (internal)
-  VARIANT:=internal
-endef
-
-define Package/icwmp-openssl
-  $(Package/icwmp/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
-  VARIANT:=openssl
-endef
-
-define Package/icwmp-wolfssl
-  $(Package/icwmp/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
-  CONFLICTS := icwmp-openssl
-  VARIANT:=wolfssl
-endef
-
-define Package/icwmp-mbedtls
-  $(Package/icwmp/default)
-  TITLE += (mbedtls)
-  DEPENDS += +PACKAGE_icwmp-mbedtls:libmbedtls
-  CONFLICTS := icwmp-openssl icwmp-wolfssl
-  VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
-endef
-
-ifeq ($(BUILD_VARIANT),openssl)
-CONFIGURE_ARGS += --enable-libopenssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lssl"
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
-CONFIGURE_ARGS += --enable-libwolfssl
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
-TARGET_LDFLAGS += "-lwolfssl"
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-CONFIGURE_ARGS += --enable-libmbedtls
-TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
-TARGET_LDFLAGS += "-lmbedtls"
-endif
-
 ifeq ($(CONFIG_CWMP_ACS_MULTI),y)
 CONFIGURE_ARGS += \
 	--enable-acs=multi
@@ -114,14 +79,19 @@ CONFIGURE_ARGS += \
 	--enable-devel
 endif

-USE_LOCAL=$(shell ls ./src/ 2>/dev/null >/dev/null && echo 1)
-ifneq ($(USE_LOCAL),)
-define Build/Prepare
-	$(CP) ./src/* $(PKG_BUILD_DIR)/
-endef
+ifeq ($(CONFIG_CWMP_USE_WOLFSSL), y)
+CONFIGURE_ARGS += --enable-libwolfssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+TARGET_LDFLAGS += "-lwolfssl"
 endif

-define Package/icwmp/default/install
+ifeq ($(CONFIG_CWMP_USE_OPENSSL), y)
+CONFIGURE_ARGS += --enable-libopenssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+TARGET_LDFLAGS += "-lssl"
+endif
+
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/icwmpd
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/config
@@ -139,11 +109,4 @@ define Package/icwmp/default/install
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
 endef

-Package/icwmp-openssl/install = $(Package/icwmp/default/install)
-Package/icwmp-wolfssl/install = $(Package/icwmp/default/install)
-Package/icwmp-mbedtls/install = $(Package/icwmp/default/install)
-
-$(eval $(call BuildPackage,icwmp))
-$(eval $(call BuildPackage,icwmp-openssl))
-$(eval $(call BuildPackage,icwmp-wolfssl))
-$(eval $(call BuildPackage,icwmp-mbedtls))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/icwmp/files/etc/config/cwmp
+++ b/icwmp/files/etc/config/cwmp
@@ -11,6 +11,7 @@ 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/firewall.cwmp
+++ b/icwmp/files/etc/firewall.cwmp
@@ -6,6 +6,7 @@ log() {
 }

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

--- a/icwmp/files/etc/icwmpd/update.sh
+++ b/icwmp/files/etc/icwmpd/update.sh
@@ -6,9 +6,7 @@ log() {

 handle_icwmp_update() {
 	local defwan vendorspecinf update
-	local fallback_restart

-	fallback_restart="${1:-0}"
 	update="0"
 	defwan="$(uci -q get cwmp.cpe.default_wan_interface)"
 	vendorspecinf="$(ifstatus "${defwan}" | jsonfilter -e "@.data.vendorspecinf")"
@@ -78,23 +76,18 @@ handle_icwmp_update() {
 			fi
 		fi
 	}
-
-	# In case of update restart icwmp
 	if [ "${update}" -eq "1" ]; then
 		log "CWMP uci changes, reload cwmp with uci commit"
 		ubus call uci commit '{"config":"cwmp"}'
 	else
-		status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
-		if [ "$status" = "failure" ]; then
-			log "Trigger out of bound inform, since last inform status was failure"
-			ubus -t 10 call tr069 inform >/dev/null 2>&1
-			# Handle timeout
-			if [ "$?" -eq 7 ]; then
-				log "Restarting icwmp tr069 object"
-				/etc/init.d/icwmpd restart
-			fi
+		if ubus list tr069 >/dev/null 2>&1 ; then
+			log "Trigger out of bound inform"
+			ubus call tr069 inform
+		else
+			log "Restarting icwmp tr069 object not found"
+			/etc/init.d/icwmpd restart
 		fi
 	fi
 }

-handle_icwmp_update $@
+handle_icwmp_update
--- 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=00
+STOP=2

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

-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-include /lib/network
-
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
@@ -58,39 +58,41 @@ wait_for_resolvfile() {
 }

 copy_cwmp_etc_files_to_varstate() {
+	if [ ! -f /var/state/cwmp ]
+	then
+		if [ -f /etc/icwmpd/cwmp ]
+		then
+			uci -q -c /etc/icwmpd delete cwmp.acs
+			uci -q -c /etc/icwmpd commit cwmp
+			cp /etc/icwmpd/cwmp /var/state/cwmp
+		else
+			touch /var/state/cwmp
+		fi
+	fi
+
 	mkdir -p /var/run/icwmpd
-
-	if [ -f /etc/icwmpd/cwmp ]; then
-		uci -q -c /etc/icwmpd delete cwmp.acs
-		uci -q -c /etc/icwmpd commit cwmp
-		cp -f /etc/icwmpd/cwmp /var/state/cwmp
+	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
+	then
+		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
 	fi
-
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
-		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
-	fi
-
-	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]; then
-		cp -f /etc/icwmpd/dm_enabled_notify /var/run/icwmpd/ 2>/dev/null
+	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]
+	then
+		mv /etc/icwmpd/dm_enabled_notify /var/run/icwmpd 2>/dev/null
 	fi
 }

 copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]; then
-		cp -f /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd/ 2>/dev/null
+	if [ -f /var/state/cwmp ]
+	then
+		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
 	fi
-
-	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]; then
-		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
+	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]
+	then
+		cp /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
 	fi
-
-	if [ -f /var/state/cwmp ]; then
-		cp -f /var/state/cwmp /etc/icwmpd/
-	fi
-
-	# move the successful custom notify import marker to persistent storage
-	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
-		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
+	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]
+	then
+		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
 	fi
 }

@@ -102,13 +104,12 @@ validate_acs_section()
 		'periodic_inform_interval:uinteger' \
 		'periodic_inform_time:string' \
 		'url:string' \
-		'dhcp_discovery:string' \
 		'dhcp_url:string' \
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
 		'retry_interval_multiplier:range(1000, 65535)' \
-		'ipv6_enable:bool' \
-		'ssl_capath:string'
+		'https_ssl_capath:file' \
+		'ipv6_enable:bool'

 }

@@ -137,7 +138,6 @@ validate_cpe_section()
 }

 validate_defaults() {
-	local ssl_capath
 	config_load cwmp

 	validate_acs_section || {
@@ -145,13 +145,6 @@ validate_defaults() {
 		return 1;
 	}

-	# Put the cert pem file in keep list
-	if [ -d "${ssl_capath}" ]; then
-		if ! grep "${ssl_capath}" /lib/upgrade/keep.d/icwmp; then
-			echo "${ssl_capath}"'/*.pem' >> /lib/upgrade/keep.d/icwmp
-		fi
-	fi
-
 	[ -z "${url}" ] && [ -z "${dhcp_url}" ] && {
 		log "ACS url is empty can't start"
 		return 1;
@@ -165,16 +158,30 @@ 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
 	local dhcp_discovery
-	local dhcp_url

 	config_load cwmp
 	config_get_bool enable_cwmp cpe enable 1
-	config_get dhcp_discovery acs dhcp_discovery "0"
-	config_get dhcp_url acs dhcp_url ''
+	config_get dhcp_discovery acs dhcp_discovery
 	config_get wan_interface cpe default_wan_interface "wan"

 	if [ "$enable_cwmp" = "0" ] || [ "$enable_cwmp" = "false" ]; then
@@ -191,13 +198,6 @@ start_service() {
 	[ -f /usr/sbin/dnsmasq ] && log "Waiting for DNS Proxy to be started ..." && ubus -t 5 wait_for dnsmasq
 	[ -f /etc/config/dhcp ] && log "Waiting for DNS Server(s) ..." && wait_for_resolvfile 20

-	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
-		if [ -z "${dhcp_url}" ]; then
-			log "Empty dhcp url, running update script"
-			/etc/icwmpd/update.sh
-		fi
-	fi
-
 	validate_defaults || {
 		log "Validation of defaults failed"
 		return 1;
@@ -217,19 +217,15 @@ start_service() {
 	procd_close_instance
 }

-service_stopped()
+stop_service()
 {
 	copy_cwmp_varstate_files_to_etc
 }

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

 service_triggers() {
@@ -242,7 +238,6 @@ service_triggers() {
                               json_add_array
                                       json_add_string "" "run_script"
                                       json_add_string "" "/etc/icwmpd/update.sh"
-                                       json_add_string "" "1"
                               json_close_array
                       json_close_array
                       json_add_int "" "2000"
--- a/icwmp/files/etc/uci-defaults/95-icwmp-generate-ssl
+++ b/icwmp/files/etc/uci-defaults/95-icwmp-generate-ssl
@@ -2,37 +2,17 @@

 . /lib/functions.sh

-regenerate_ssl_link_path()
-{
-        local cert_dir all_file rehash
+regenerate_ssl_link(){
+	[ ! -d "/etc/ssl/certs" ] && return 0;
+	[ ! -f "/etc/ssl/certs/*.pem" ] && return 0;

-        cert_dir="${1}"
+	local cert_dir="/etc/ssl/certs"
+	local all_file=$(ls $cert_dir/*.pem)

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

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

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

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=69b27e3e1509b9192c529fbba6a329cc0532cfbb
+PKG_SOURCE_VERSION:=079e0698ed2de45c9c38ff72c0415c99f5d35d2d
 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/ieee1905/files/etc/config/ieee1905
+++ b/ieee1905/files/etc/config/ieee1905
@@ -3,24 +3,20 @@ config ieee1905 'ieee1905'
 	option extension '1'
 	list extmodule 'map'
 	option registrar '2 5'
-#	option macaddress '0a:1b:2c:3d:4e:50'

-config al-iface
-	option enabled '1'
-	option ifname 'br-lan'
-	option type 'bridge'
-
-# ap sections are auto-generated/overwritten during onboarding
-#
 config ap
 	option band '2'
-	option ssid 'IOWRT-2.4GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
+	option ssid 'TestSSID.2'
+	option encryption 'psk2'
+	option key '5555500000'

 config ap
 	option band '5'
-	option ssid 'IOWRT-5GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
+	option ssid 'TestSSID.5'
+	option encryption 'psk2'
+	option key '2222200000'

+config al-iface
+	option enabled 1
+	option ifname 'br-lan'
+	option type 'bridge'
--- a/iop/config
+++ b/iop/config
@@ -51,6 +51,7 @@ CONFIG_PACKAGE_wifimngr=y
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
 CONFIG_PACKAGE_map-topology=y
+CONFIG_PACKAGE_wfadatad=y
 CONFIG_PACKAGE_wfadatad-collector=y

 # Network #
@@ -64,16 +65,15 @@ CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y

 # TR-x69 #
-CONFIG_PACKAGE_uspd-mbedtls=y
-CONFIG_PACKAGE_icwmp-mbedtls=y
+CONFIG_PACKAGE_uspd=y
+CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc-mbedtls=m
+CONFIG_PACKAGE_stunc=m
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_twamp=m
-CONFIG_PACKAGE_udpecho-client=m
-CONFIG_PACKAGE_udpecho-server=m
+CONFIG_PACKAGE_udpechoserver=m
 CONFIG_PACKAGE_xmppc=m

 # WebGUI #
--- a/libtrace/Makefile
+++ b/libtrace/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libtrace
-PKG_VERSION:=3.0.23
+PKG_VERSION:=3.0.22
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
@@ -72,11 +72,11 @@ endef

 define Package/libtrace/install    
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libtrace.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libwandio.so.* $(1)/usr/lib/
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump.so.* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libtrace.so.* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libwandio.so.* $(1)/usr/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump.so.* $(1)/usr/lib/
 	$(INSTALL_DIR) $(1)/usr/lib/libpacketdump
-	$(CP) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump/*.so* $(1)/usr/lib/libpacketdump/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/lib/libpacketdump/*.so* $(1)/usr/lib/libpacketdump/
 endef

 define Package/libtrace-tools/install    
--- a/map-agent/Config.in
+++ b/map-agent/Config.in
@@ -10,8 +10,5 @@ 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.2.1
+PKG_VERSION:=7.1.26
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=b3e3a21c9a938ce719a0ea609c965852586d6778
+PKG_SOURCE_VERSION:=d6ff42ed06e3e56dae337d9ffad054a9197feeaa
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>

 PKG_LICENSE:=PROPRIETARY IOPSYS
@@ -66,10 +66,6 @@ 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/config/mapagent
+++ b/map-agent/files/etc/config/mapagent
@@ -1,131 +1,34 @@
 config agent 'agent'
 	option enabled '1'
-	option debug '0'
+	option debug '6'
 	option profile '2'
 	option al_bridge 'br-lan'
-	option netdev 'wlan'
-	option island_prevention '0'
-	option eth_onboards_wifi_bhs '0'
-#	option controller_macaddr '0a:1b:2c:3d:4e:50'

-config dynamic_backhaul
-	option missing_bh_timer '60'
-
-config controller_select
-	option id 'auto'
-	option probe_int '20'
-	option retry_int '9'
-	option autostart '1'
-	option local '0'
-
-config radio
-	option device 'phy0'
-	option band '2'
-# options below are auto-generated during onboarding
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '70'
-#	option report_rcpi_threshold '80'
-#	option rcpi_hysteresis_margin '0'
-#	option report_util_threshold '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-config radio
-	option device 'phy1'
-	option band '5'
-# options below are auto-generated during onboarding
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '86'
-#	option report_rcpi_threshold '96'
-#	option rcpi_hysteresis_margin '0'
-#	option report_util_threshold '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-config bsta
-	option enabled '1'
-	option ifname 'wlan0'
-	option band '2'
-	option device 'phy0'
-	option priority '2'
-# options below are auto-generated during onboarding
-#	option ssid 'MAP-BH-2.4GHz'
-#	option encryption 'sae-mixed'
-#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
-#	option onboarded '1'
-#	option bssid '0a:1b:2c:3d:4e:53'
-#	option vid '1'
-
-config bsta
-	option enabled '1'
-	option ifname 'wlan1'
-	option band '5'
-	option device 'phy1'
-	option priority '0'
-# options below are auto-generated during onboarding
-#	option ssid 'MAP-BH-5GHz'
-#	option encryption 'sae-mixed'
-#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
-#	option onboarded '1'
-#	option bssid '0a:1b:2c:3d:4e:54'
-#	option vid '1'
-
-# ap sections and policy section are
-# auto-generated during onboarding
-#
 #config ap
-#	option enabled '1'
-#	option ifname 'wlan0-1'
+#	option ifname 'wl0'
+#	option steer 'rssi bssload'
+#	list exclude '00:11:22:33:44:55'
+#	list exclude_btm '00:aa:bb:cc:dd:ee'
+#	list assoc_ctrl '00:10:20:30:40:50'
+#	option btm_retry '3'
+#	option btm_retry_secs '180'
+#	option fallback_legacy '1'
+#	option steer_legacy_reassoc_secs '30'
+#	option steer_legacy_retry_secs '3600'
+#	option assoc_ctrl_secs '30'
 #	option band '2'
-#	option device 'phy0'
 #	option type 'fronthaul'
-#	option ssid 'IOWRT-2.4GHz'
-#	option encryption 'sae-mixed+aes'
-#	option key '1234567890'
-#	option vid '1'

 #config ap
-#	option enabled '1'
-#	option ifname 'wlan0-2'
-#	option band '2'
-#	option device 'phy0'
-#	option type 'backhaul'
-#	option ssid 'MAP-BH-2.4GHz'
-#	option encryption 'sae+aes'
-#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
-#	option disallow_bsta '0'
-#	option vid '1'
-
-#config ap
-#	option enabled '1'
-#	option ifname 'wlan1-1'
+#	option ifname 'wl1'
+#	option steer 'rssi bssload'
+#	list exclude '00:11:22:33:44:55'
+#	list exclude_btm '00:aa:bb:cc:dd:ee'
 #	option band '5'
-#	option device 'phy1'
 #	option type 'fronthaul'
-#	option ssid 'IOWRT-5GHz'
-#	option encryption 'sae-mixed+aes'
-#	option key '1234567890'
-#	option vid '1'

-#config ap
+#config bsta
+#	option ifname 'apclii0'
 #	option enabled '1'
-#	option ifname 'wlan1-2'
-#	option band '5'
-#	option device 'phy1'
-#	option type 'backhaul'
-#	option ssid 'MAP-BH-5GHz'
-#	option encryption 'sae+aes'
-#	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
-#	option disallow_bsta '0'
-#	option vid '1'
-
-#config policy
-#	option report_interval '0'
-#	option pvid '1'
-#	option pcp_default '0'
-#	option report_scan '0'
-#	option report_sta_assocfails '0'
-#	option report_sta_assocfails_rate '0'
-
+#	option onboarded '0'
+#	option disallow_bsta '1		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
--- a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
+++ b/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
@@ -97,9 +97,7 @@ if [ "$LINK" = "up" ]; then

 	/lib/wifi/multiap set_uplink "eth" "$PORT"
 else
-	/lib/wifi/multiap unset_uplink "eth"
-	#rm -f "$map_bh_file"
+	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
@@ -377,7 +377,7 @@ teardown_iface() {

 			[ "$ifname" != "$map_ifname" ] && return

-			uci -q set wireless.${section}.disabled="1"
+			uci -q set wireless.${section}.start_disabled="1"
 			uci -q set wireless.${section}.ssid="DISABLED-SSID"
 			uci -q set wireless.${section}.key="DISABLED-KEY"
 			uci -q delete wireless.${section}.multi_ap_backhaul_ssid
@@ -797,26 +797,21 @@ set_uplink() {

 	config_load mapagent

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

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

+		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() {
-	local type=${1:-wifi}
-
-	config_load mapagent
-
-	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
-
-	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
-		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
-	fi
-
-	rm -f "$MAPFILE" > /dev/null 2>&1
+	rm "$MAPFILE" > /dev/null 2>&1
 }

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

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

 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
--- a/map-controller/files/etc/config/mapcontroller
+++ b/map-controller/files/etc/config/mapcontroller
@@ -1,143 +1,67 @@
 config controller 'controller'
 	option enabled '1'
-	option registrar '2 5'
-	option debug '0'
+	option registrar '5 2'	    #bands on which wps registrar supported
+	option debug '6'
 	option enable_sta_steer '0'
 	option enable_bsta_steer '0'
-	option use_bcn_metrics '0'
-	option use_usta_metrics '0'
 	option primary_vid '1'
 	option primary_pcp '0'
-	option allow_bgdfs '0'
-	option channel_plan '0'

-config ap
-	option band '2'
-	option encryption 'sae-mixed'
-	option vid '1'
-	option ssid 'IOWRT-2.4GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
+config interface 'lan'
+	option 'dhcp'

 config ap
 	option band '5'
+	option encryption 'sae-mixed'
+	option key '1234567890'
+	option ssid 'map-net5'
+	option vid '1'
 	option type 'fronthaul'
-	option vid '1'
-	option ssid 'IOWRT-5GHz'
-	option encryption 'sae-mixed'
-	option key '1234567890'
+	option network 'lan'

 config ap
 	option band '2'
-	option type 'backhaul'
+	option encryption 'sae-mixed'
+	option key '1234567890'
+	option ssid 'map-net2'
 	option vid '1'
-	list disallow_bsta '0'
-	option ssid 'MAP-BH-2.4GHz'
-	option encryption 'sae'
-	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
+	option type 'fronthaul'
+	option network 'lan'

 config ap
 	option band '5'
-	option type 'backhaul'
-	option vid '1'
-	list disallow_bsta '0'
-	option ssid 'MAP-BH-5GHz'
 	option encryption 'sae'
-	option key '0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWZYZ0'
+	option key '5555555555'
+	option ssid 'map-bkhaul-5'
+	option type 'backhaul'
+	option disallow_bsta '1'		# bitmap, 1 for disallow p1, 2 to disallow p2, 3 to disallow both (probably never applicable)
+	option vid '1'
+	option network 'lan'

-# node and radio sections (per node) are auto
-# generated per Multi-AP Agent in the network
-#
-#config node 'node_0a1b2c3d4e50'
-#	option agent_id '0a:1b:2c:3d:4e:50'
-# following values use default values after onboarding if not explicitly set
-#	option backhaul_ul_macaddr '00:00:00:00:00:00'
-#	option backhaul_dl_macaddr '00:00:00:00:00:00'
-#	option backhaul_type 'none'
-#	option primary_vid '1'
-#	option primary_pcp '0'
-#	option report_sta_assocfails '0'
-#	option report_sta_assocfails_rate '0'
-#	option report_metric_periodic '0'
-#	option report_scan '0'
-#	option steer_exclude '0'
-#	option steer_exclude_btm '0'
-#	option steer_disallow '0'
-#	option coordinated_cac '0'
-#	option traffic_separation '0'
-#	option sta_steer '0'
+config ap
+	option band '2'
+	option encryption 'sae'
+	option key '2222222222'
+	option ssid 'map-bkhaul-2'
+	list disallow_bsta '0'                # 0 or 1 profile-1 bSTA
+	option vid '1'
+	option type 'backhaul'
+	option network 'lan'

-#config radio 'radio_0a1b2c3d4e53'
-#	option agent_id '0a:1b:2c:3d:4e:50'
-#	option macaddr '0a:1b:2c:3d:4e:53'
-#	option band '2'
-# following values use default values after onboarding if not explicitly set
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '70'
-#	option report_rcpi_threshold '80'
-#	option report_util_threshold '0'
-#	option report_rcpi_hysteresis_margin '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-#config radio 'radio_0a1b2c3d4e54'
-#	option agent_id '0a:1b:2c:3d:4e:50'
-#	option macaddr '0a:1b:2c:3d:4e:54'
-#	option band '5'
-# following values use default values after onboarding if not explicitly set
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '86'
-#	option report_rcpi_threshold '96'
-#	option report_util_threshold '0'
-#	option report_rcpi_hysteresis_margin '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-#config node 'node_3fb1c2d3e460'
-#	option agent_id '3f:b1:c2:d3:e4:60'
-# following values use default values after onboarding if not explicitly set
-#	option backhaul_ul_macaddr '00:00:00:00:00:00'
-#	option backhaul_dl_macaddr '00:00:00:00:00:00'
-#	option backhaul_type 'none'
-#	option primary_vid '1'
-#	option primary_pcp '0'
-#	option report_sta_assocfails '0'
-#	option report_sta_assocfails_rate '0'
-#	option report_metric_periodic '0'
-#	option report_scan '0'
-#	option steer_exclude '0'
-#	option steer_exclude_btm '0'
-#	option steer_disallow '0'
-#	option coordinated_cac '0'
-#	option traffic_separation '0'
-#	option sta_steer '0'
-
-#config radio 'radio_3fb1c2d3e463'
-#	option agent_id '3f:b1:c2:d3:e4:60'
-#	option macaddr '3f:b1:c2:d3:e4:63'
-#	option band '2'
-# following values use default values after onboarding if not explicitly set
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '70'
-#	option report_rcpi_threshold '80'
-#	option report_util_threshold '0'
-#	option report_rcpi_hysteresis_margin '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
-
-#config radio 'radio_3fb1c2d3e464'
-#	option agent_id '3f:b1:c2:d3:e4:60'
-#	option macaddr '3f:b1:c2:d3:e4:64'
-#	option band '5'
-# following values use default values after onboarding if not explicitly set
-#	option steer_policy '0'
-#	option util_threshold '0'
-#	option rcpi_threshold '86'
-#	option report_rcpi_threshold '96'
-#	option report_util_threshold '0'
-#	option report_rcpi_hysteresis_margin '0'
-#	option include_sta_stats '1'
-#	option include_sta_metric '1'
+config policy 'policy'
+	list steer_exclude '00:11:22:33:44:55'
+	list steer_exclude_btm '00:aa:bb:cc:dd:ee'
+	option steer_policy '2'                    # 0, 1, 2 - see MultiAP spec
+	option util_threshold '200'                # channel-util as in BSS load
+	option rcpi_threshold '30'                 # 0 - 220 valid range
+	option report_scan '0'                     # 0 or 1 for independent scans
+	option report_sta_assocfails '1'           # 0 or 1 - stas assoc failure
+	option report_sta_assocfails_rate '2'      # reporting rate for STA assoc fails (attempts per minute)
+	option report_metric_periodic '0'          # 0, or 1 - 255 in secs
+	option report_rcpi_threshold '0'           # 0, or 1 - 220
+	option report_util_threshold '0'           # 0, or  channel-util value
+	option rcpi_hysteresis_margin '0'          # 0, or > 0 - hysteresis margin
+	option include_sta_stats '0'               # sta stats in AP metric resp
+	option include_sta_metric '0'              # sta metric in AP metric resp
+	option disallow_bsta_p1 '0'                # 0 or 1 profile-1 bSTA
+	option disallow_bsta_p2 '0'                # 0 or 1 profile-2 bSTA
--- 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:=4.0.1
+PKG_VERSION:=3.2.9

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=f0c36d13b19c100639a8f657a6a027bbfd74b802
+PKG_SOURCE_VERSION:=5d9b0bc94f8d01ecc7a2026ca1d6faf19ca0ede2
 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
@@ -18,7 +18,6 @@ PKG_MIRROR_HASH:=skip
 endif

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=ieee1905
 PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
@@ -26,7 +25,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/map-topology
 	CATEGORY:=Utilities
 	DEPENDS:=+libubox +ubus +libpthread +libuci +libeasy \
-		 +libavahi-nodbus-support +ieee1905
+		+libieee1905 +map-plugin +libavahi-nodbus-support
 	TITLE:=Utility to build topology of a multi-AP network
 endef

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

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

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b8bc6a70f07b40c8512e8894461602f47981df97
+PKG_SOURCE_VERSION:=79958289d3b5c3ffd3bd0af62e493e1bac757e77
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
@@ -31,7 +31,7 @@ define Package/obuspa
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=USP agent
-  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
+  DEPENDS:=+libopenssl +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto-ssl +libwebsockets-openssl
 endef

 define Package/obuspa/description
--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -16,6 +16,7 @@ mqtt_num=0
 subs_num=0
 challenge_num=0
 index=0
+role_def_file=""
 PROFILE="/root/.profile"

 . /lib/functions/network.sh
@@ -61,15 +62,13 @@ get_index() {
 }

 get_role_index_from_json() {
-	local role="$1"
-	local role_def_file="$2"
+	local role="$*"
 	local num=0
 	local roles_obj

 	# In case of role is empty or file not present
 	if [ -z "${role}" ] || [ ! -f "${role_def_file}" ]; then
-		echo "${num}"
-		return ${num}
+		return 0
 	fi

 	json_init
@@ -89,12 +88,11 @@ get_role_index_from_json() {
 		fi

 		if [ "${role}" = "${rname}" ]; then
-			echo "${num}"
 			return ${num}
 		fi
 	done

-	return ${num}
+	return 0
 }

 get_uci_ref_index() {
@@ -468,9 +466,7 @@ configure_subscription(){

 check_json_load()
 {
-	local ret
-
-	ret=0
+	local ret=0
 	if [ -f "${role_def_file}" ]; then
 		json_init
 		if json_load_file "${role_def_file}" 2>&1 |grep -q Failed; then
@@ -485,10 +481,8 @@ check_json_load()
 get_role_index() {
 	local role="Device.LocalAgent.ControllerTrust.Role"
 	local idx=0
-	local role_name="$1"
-	local role_def_file
+	local role_name="$*"

-	role_def_file=$(uci -q get obuspa.global.role_file 2>/dev/null)
 	case "${role_name}" in
 	'full_access')
 		idx=1;
@@ -499,9 +493,9 @@ get_role_index() {
 	 *)
 		local ji=0

-		check_json_load
-		if [ "$?" -eq "0" ]; then
-			ji=$(get_role_index_from_json "${role_name}" "${role_def_file}")
+		ji=$(check_json_load)
+		if [ "${ji}" -eq 0 ]; then
+			get_role_index_from_json "${role_name}"
 		fi
 		idx=$(( ji + 2 )) # Add predefined roles
 	 esac
@@ -678,6 +672,8 @@ configure_obuspa() {

 	validate_obuspa_section "global"

+	role_def_file="${role_file}"
+
 	if [ "${debug}" -eq 1 ]; then
 		# Forward stdout of the command to logd
 		procd_set_param stdout 1
@@ -703,16 +699,20 @@ configure_obuspa() {

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

--- a/obuspa/files/etc/obuspa/dmcaching_exclude.json
+++ b/obuspa/files/etc/obuspa/dmcaching_exclude.json
@@ -1,7 +1,6 @@
 {
  "dmcaching_exclude": [
    "Device.DeviceInfo.ProcessStatus.Process.",
-    "Device.Hosts.Host.",
-    "Device.WiFi.DataElements."
+    "Device.Hosts.Host."
  ]
 }
--- a/periodicstats/Makefile
+++ b/periodicstats/Makefile
@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=periodicstats
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.0

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2779815d2b87e5966e27cfafe88070d0a8970a25
+PKG_SOURCE_VERSION:=7426c7458f792cc66920c206d62869c5620f1400
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/periodicstats.git
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

@@ -20,15 +20,13 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk

 define Package/periodicstats
  SECTION:=utils
  CATEGORY:=Utilities
  TITLE:=Periodic Statistics Daemon
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libbbf_api
 endef

 define Package/periodicstats/description
@@ -37,7 +35,7 @@ endef

 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-        $(CP) -rf ~/git/periodicstats/* $(PKG_BUILD_DIR)/
+        $(CP) -rf ./periodicstats/* $(PKG_BUILD_DIR)/
 endef
 endif

--- a/periodicstats/files/etc/init.d/periodicstats
+++ b/periodicstats/files/etc/init.d/periodicstats
@@ -11,12 +11,9 @@ service_running() {
 }

 start_service() {
-	local enable
+	enable=$(uci -q get periodicstats.globals.enable)

-	config_load periodicstats
-	config_get_bool enable globals enable 1
-
-	if [ "${enable}" -ne "1" ]; then
+	if [ "$(enable)" != "1" ]; then
 		return 0;
 	fi

@@ -27,7 +24,7 @@ start_service() {
 }

 service_triggers() {
-	procd_add_reload_trigger periodicstats
+	procd_add_reload_trigger periodicstats uspd
 }

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

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

-	config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
+	# The policer object is not available on non BCM968* chips
+	if [ $POLICER_SKIP -eq 1 ]; then
+		assign_policer_to_port $ifname $pindex
+	else
+		config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
+	fi

 }

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

 	# Delete policer
 	local i=0
@@ -923,6 +931,10 @@ reload_qos() {
 	local service_name="$1"
 	local cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"

+	case $cpu_model in
+		BCM68*|BCM6755) POLICER_SKIP=1 ;;
+	esac
+
 	if [ -z "$service_name" ]; then
 		configure_qos
 	elif [ "$service_name" == "shaper" ]; then
--- a/stunc/Config.in
+++ b/stunc/Config.in
@@ -0,0 +1,16 @@
+if PACKAGE_stunc
+
+choice
+	prompt "Select SSL utility"
+	default STUNC_USE_WOLFSSL
+
+config STUNC_USE_WOLFSSL
+	bool "Use WolfSSL for ssl utilities"
+	select CONFIG_PACKAGE_libwolfssl
+
+config STUNC_USE_OPENSSL
+	bool "Use OpenSSL for ssl utilities"
+	select CONFIG_PACKAGE_libopenssl
+
+endchoice
+endif
--- a/stunc/Makefile
+++ b/stunc/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020 iopsys Software Solutions AB
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,77 +8,49 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=stunc
-PKG_RELEASE:=1
-PKG_VERSION:=1.1.8
+PKG_VERSION:=1.1.2
+

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=fbd3cb0f101d115744ecf927516c2268c10cf3a0
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/stunc.git
-PKG_SOURCE_VERSION:=2628f2c9e0b99064a703a1ad069f0f298bc36076
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk

-define Package/stunc/default
+define Package/$(PKG_NAME)
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF STUN Client
-  DEPENDS:=+libubus +libuci +libubox +libjson-c +libblobmsg-json
+  DEPENDS:=+libubus +libuci +libubox +libjson-c +libwolfssl +libblobmsg-json +libbbf_api +libopenssl
+  MENU := 1
 endef

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

-define Package/stunc-openssl
-  $(Package/stunc/default)
-  TITLE += (openssl)
-  DEPENDS += +PACKAGE_stunc-openssl:libopenssl
-  CONFLICTS := stunc-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/stunc-wolfssl
-  $(Package/stunc/default)
-  TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_stunc-wolfssl:libwolfssl
-  CONFLICTS := stunc-mbedtls stunc-openssl
-  VARIANT:=wolfssl
+define Package/$(PKG_NAME)/config
+	source "$(SOURCE)/Config.in"
 endef

 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror

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

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

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

-Package/stunc-openssl/install = $(Package/stunc/default/install)
-Package/stunc-wolfssl/install = $(Package/stunc/default/install)
-Package/stunc-mbedtls/install = $(Package/stunc/default/install)
-
-$(eval $(call BuildPackage,stunc-openssl))
-$(eval $(call BuildPackage,stunc-wolfssl))
-$(eval $(call BuildPackage,stunc-mbedtls))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/stunc/files/etc/init.d/stunc
+++ b/stunc/files/etc/init.d/stunc
@@ -17,7 +17,6 @@ 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:=1.0.4
+PKG_VERSION:=0.2.36

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

 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
--- a/swmodd/Makefile
+++ b/swmodd/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.3
+PKG_VERSION:=2.1.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -18,7 +18,6 @@ PKG_MIRROR_HASH:=skip
 endif

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DEPENDS:=bbf

 include $(INCLUDE_DIR)/package.mk

@@ -27,7 +26,7 @@ define Package/swmodd
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:= Software Modules Daemon
-  DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
+  DEPENDS:=+libuci +libubox +ubus +libuuid +libbbf_api +opkg +libcurl \
 	    +PACKAGE_liblxc:liblxc +PACKAGE_liblxc:cgroupfs-mount \
 	    +@BUSYBOX_CONFIG_BUSYBOX +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT
 endef
--- a/twamp/Makefile
+++ b/twamp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=twamp
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.1

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/twamp.git
-PKG_SOURCE_VERSION:=c9b6b0fe35e137e967ccef63a9e1253155a59078
+PKG_SOURCE_VERSION:=a0f7355afea41dbafd443d119cb394e038e70dc6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -23,7 +23,6 @@ PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_DEPENDS:=bbf

 include $(INCLUDE_DIR)/package.mk

@@ -32,7 +31,7 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF TWAMP/TWAMP Light feature
-  DEPENDS:=+libuci +ubox +libubus
+  DEPENDS:=+libuci +libbbf_api +ubox +libubus
 endef

 define Package/$(PKG_NAME)/description
--- 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:=4cd73fe5db0ebfc1242ca9c85c14d7f0718eaf73
+PKG_SOURCE_VERSION:=cc5b0b236c4536ad4b694407f8ea258c61aaa76c
 endif

 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
--- a/udpecho/files/etc/init.d/udpechoserverd
+++ b/udpecho/files/etc/init.d/udpechoserverd
@@ -1,61 +0,0 @@
-#!/bin/sh /etc/rc.common
-#UDP Echo Server software
-# Copyright (C) 2020 iopsys Software Solutions AB
-#Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
-
-START=99
-STOP=02
-
-USE_PROCD=1
-PROG="/usr/sbin/udpechoserverd"
-
-start_service() {
-	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"
-			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 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
-}
-
-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() {
-	stop
-	start 
-}
-
-service_triggers() {
-	procd_add_reload_trigger udpechoserver
-}
--- a/udpechoserver/Makefile
+++ b/udpechoserver/Makefile
@@ -7,63 +7,42 @@

 include $(TOPDIR)/rules.mk

-PKG_NAME:=udpecho
-PKG_VERSION:=2.0.0
+PKG_NAME:=udpechoserver
+PKG_VERSION:=1.0.3

-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=4e80bbec15b284080798b5ffbe8655febaa239aa
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpecho.git
-PKG_SOURCE_VERSION:=aeaf8f5862fff7133e6299ac30ab02c8fbb1ff61
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/udpechoserver.git
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
-
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE
-PKG_BUILD_DEPENDS:=bbf

 include $(INCLUDE_DIR)/package.mk

 MAKE_PATH:=src

-define Package/$(PKG_NAME)-server
+define Package/$(PKG_NAME)
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF UDP Echo Server
-  DEPENDS:=+libuci
+  DEPENDS:=+libuci +libbbf_api
 endef

-define Package/$(PKG_NAME)-client
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=BBF UDP Echo Client
-endef
-
-define Package/$(PKG_NAME)-server/description
+define Package/$(PKG_NAME)/description
 	BBF UDP Echo Server
 endef

-define Package/$(PKG_NAME)-client/description
-	BBF UDP Echo Client
-endef
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror

-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/udpecho/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-define Package/$(PKG_NAME)-server/install
+define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_DIR) $(1)/etc/config
@@ -74,10 +53,4 @@ define Package/$(PKG_NAME)-server/install
 	$(INSTALL_BIN) ./files/etc/init.d/udpechoserverd $(1)/etc/init.d/udpechoserverd
 endef

-define Package/$(PKG_NAME)-client/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/udpechoclientd $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,$(PKG_NAME)-server))
-$(eval $(call BuildPackage,$(PKG_NAME)-client))
+$(eval $(call BuildPackage,$(PKG_NAME)))
--- a/udpechoserver/files/etc/config/udpechoserver
+++ b/udpechoserver/files/etc/config/udpechoserver
--- a/udpechoserver/files/etc/init.d/udpechoserverd
+++ b/udpechoserver/files/etc/init.d/udpechoserverd
@@ -0,0 +1,39 @@
+#!/bin/sh /etc/rc.common
+#UDP Echo Server software
+# Copyright (C) 2020 iopsys Software Solutions AB
+#Author: Amin Ben Ramdhane <amin.benramdhane@pivasoftware.com>
+
+START=99
+STOP=10
+
+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
+			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
+		else
+			iptables -I zone_wan_input -p udp --dport "$port_udpechoserver" -j REJECT -m comment --comment "Close UDPechoserver port"
+		fi
+	fi
+}
+
+boot() {
+	start
+}
+
+reload_service() {
+	stop
+	start 
+}
+
+service_triggers() {
+	procd_add_reload_trigger udpechoserver
+}
--- a/urlfilter/Makefile
+++ b/urlfilter/Makefile
@@ -11,7 +11,7 @@ PKG_VERSION:=1.1.1
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5a64642ac33e629151788b3ff1de920776bcd2ed
+PKG_SOURCE_VERSION:=a2fca29140673d058eb0bfb2b3b3c9e61d7f301f
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
--- a/usp-js/Makefile
+++ b/usp-js/Makefile
@@ -1,34 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=usp-js
-PKG_VERSION:=0.0.1
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/usp-js.git
-PKG_SOURCE_VERSION:=7e285eb006414f230a3c17acf1b6f4c31c987447
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/usp-js
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=A JS library for USP(TR369) protocol
-  DEPENDS:=+quickjs +quickjs-websocket
-endef
-
-define Package/usp-js/description
-  A JS library to provide USP(TR369) protocol functionality for an usp controller.
-endef
-
-define Build/Compile
-	cd $(PKG_BUILD_DIR) && npm install @types/node --save-dev && yarn qjs
-endef
-
-define Package/usp-js/install
-	$(INSTALL_DIR) $(1)/usr/lib/usp-js
-	$(CP) $(PKG_BUILD_DIR)/qjs/* $(1)/usr/lib/usp-js/
-endef
-
-$(eval $(call BuildPackage,usp-js))
--- a/uspd/Config.in
+++ b/uspd/Config.in
@@ -0,0 +1,14 @@
+if PACKAGE_uspd
+
+menu "Configuration"
+config USPD_MAX_MSG_LEN
+    int "Maximum message length"
+    default 10485760
+    help
+        Set the maximum data length allowed over ubus in Bytes.
+
+	This value should not be larger than UBUS_MAX_MSGLEN from ubusd.
+	The maximum blob message length allowed is:
+	(configured value - 128) bytes
+endmenu
+endif
--- a/uspd/Makefile
+++ b/uspd/Makefile
@@ -5,60 +5,46 @@
 include $(TOPDIR)/rules.mk

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

 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/default
+define Package/uspd
  SECTION:=utils
  CATEGORY:=Utilities
  SUBMENU:=TRx69
-  TITLE:=Datamodel ubus backend
-  DEPENDS:=+libubox +ubus +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
+  TITLE:=USP ubus backend
+  DEPENDS:=+libubox +ubus +libbbfdm +@BBFDM_ENABLE_JSON_PLUGIN +@BBFDM_ENABLE_DOTSO_PLUGIN \
           +@BBF_TR181 +@BBF_TR104 +@BBF_TR143
 endef

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

-define Package/uspd-openssl
-  $(Package/uspd/default)
-  TITLE += (openssl)
-  DEPENDS += +libbbfdm-openssl
-  CONFLICTS := uspd-mbedtls
-  VARIANT:=openssl
-endef
-
-define Package/uspd-wolfssl
-  $(Package/uspd/default)
-  TITLE += (wolfssl)
-  DEPENDS += +libbbfdm-wolfssl
-  CONFLICTS := uspd-mbedtls uspd-openssl
-  VARIANT:=wolfssl
+define Package/uspd/config
+	source "$(SOURCE)/Config.in"
 endef

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

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

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

-Package/uspd-openssl/install = $(Package/uspd/default/install)
-Package/uspd-wolfssl/install = $(Package/uspd/default/install)
-Package/uspd-mbedtls/install = $(Package/uspd/default/install)
-
-$(eval $(call BuildPackage,uspd-openssl))
-$(eval $(call BuildPackage,uspd-wolfssl))
-$(eval $(call BuildPackage,uspd-mbedtls))
+$(eval $(call BuildPackage,uspd))
--- a/wfa-capi/Makefile
+++ b/wfa-capi/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wfa-capi
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.0

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ce29c2d69d0ca96b61f2de5d1ba107c8d31cb5ef
+PKG_SOURCE_VERSION:=189c59448ff33fd713a6a218206b18f0c613793a
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfa-capi.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
--- a/wfadatad/Config.in
+++ b/wfadatad/Config.in
@@ -1,4 +1,9 @@
-menu "Configuration"
+if PACKAGE_wfadatad || PACKAGE_wfadatad-collector
+menu "configurations"
+
+config WFA_DELM_STANDALONE
+	bool "Build as standalone daemon instead of a plugin"
+	default y

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

 PKG_NAME:=wfadatad
-PKG_VERSION:=7.0.3
+PKG_VERSION:=6.11.3

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5132917381acd81f3b043ee041beaa8630e2bd12
+PKG_SOURCE_VERSION:=ee894ec87ba3f97bfcab9bf2629c85ae69f2329d
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -25,9 +25,9 @@ include $(INCLUDE_DIR)/package.mk
 define Package/wfadatad
  SECTION:=utils
  CATEGORY:=Utilities
-  TITLE:=WiFi DataElements Agent (standalone) daemon
+  TITLE:=WiFi DataElements Agent
  DEPENDS:=+libwifi +libuci +libubox +ubus +libpthread +libnl-genl \
-	   @(!PACKAGE_map-agent) +libieee1905 +map-plugin
+	  +!WFA_DELM_STANDALONE:map-agent +libieee1905 +map-plugin
 endef

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

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


-define Package/wfadatad-collector/config
+define Package/wfadatad/config
 	source "$(SOURCE)/Config.in"
 endef

+ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
+MAKE_FLAGS += CONFIG_WFA_DELM_STANDALONE=y
+endif
+
 ifneq (,$(findstring ALPHA,$(CONFIG_VERSION_CODE)))
 MAKE_FLAGS += DEBUG=1
 endif
@@ -81,17 +85,29 @@ MAKE_FLAGS += EXECS="$(EXECS)"


 define Package/wfadatad/install
+
+ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/deagent.init $(1)/etc/init.d/deagent
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/agent/deagent $(1)/usr/sbin/
+else
+	$(INSTALL_DIR) $(1)/usr/lib/map-plugins
+	$(CP) $(PKG_BUILD_DIR)/src/agent/deagent.so $(1)/usr/lib/map-plugins
+endif
 endef

 define Package/wfadatad-collector/install
+
+ifeq ($(CONFIG_WFA_DELM_STANDALONE),y)
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/decollector.init $(1)/etc/init.d/decollector
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/collector/decollector $(1)/usr/sbin/
+else
+	$(INSTALL_DIR) $(1)/usr/lib/map-plugins
+	$(CP) $(PKG_BUILD_DIR)/src/collector/decollector.so $(1)/usr/lib/map-plugins
+endif
 endef

 $(eval $(call BuildPackage,wfadatad))
--- a/xmppc/Makefile
+++ b/xmppc/Makefile
@@ -8,25 +8,20 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=xmppc
-PKG_VERSION:=2.0.2
+PKG_VERSION:=1.0.3

-LOCAL_DEV:=0
-ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_VERSION:=4a09b8689d67dcbf3fd1b7e80e53816b7cd12614
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/xmppc.git
-PKG_SOURCE_VERSION:=63ba23c1dc5de3d136a3c1568ae9de08762fd0d0
+
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-endif
-
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)

 PKG_LICENSE:=GPL-2.0-only
 PKG_LICENSE_FILES:=LICENSE

-PKG_BUILD_DEPENDS:=bbf
-
 include $(INCLUDE_DIR)/package.mk

 define Package/$(PKG_NAME)
@@ -34,19 +29,13 @@ define Package/$(PKG_NAME)
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:=BBF xmpp Client
-  DEPENDS:=+libuci +libubox +libstrophe +libubus
+  DEPENDS:=+libuci +libubox +libstrophe +libbbf_api +libubus
 endef

 define Package/$(PKG_NAME)/description
 	BBF XMPP Client
 endef

-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	$(CP) -rf ~/git/xmppc/* $(PKG_BUILD_DIR)/
-endef
-endif
-
 TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror
--- a/xmppc/files/etc/config/xmpp
+++ b/xmppc/files/etc/config/xmpp
@@ -1,11 +1,13 @@

 config xmpp 'xmpp'
-	option conn_req_connection 'connection_1'
+	option enable '0'
+	option id '0'
 	option allowed_jid ''
 	#Log levels: Critical=0, Warning=1, Notice=2, Info=3, Debug=4
 	option loglevel '3'

-config connection 'connection_1'
+config connection
+	option xmpp_id '1'
 	option enable '0'
 	option username ''
 	option password ''
@@ -19,19 +21,9 @@ config connection 'connection_1'
 	option retry_max_interval '1'
 	option serveralgorithm 'DNS-SRV'
 	
-config connection_server 'connection_1_srv_1'
-	option con_name 'connection_1'
+config connection_server
+	option con_id '1'
 	option enable '0'
-	option priority '0'
-	option weight '-1'
-	option port '5222'
-	option server_address ''
-
-config connection_server 'connection_1_srv_2'
-	option con_name 'connection_1'
-	option enable '0'
-	option priority '0'
-	option weight '-1'
 	option port '5222'
 	option server_address ''

--- a/xmppc/files/etc/init.d/xmppc
+++ b/xmppc/files/etc/init.d/xmppc
@@ -7,13 +7,20 @@ USE_PROCD=1
 PROG="/usr/sbin/xmppc"

 start_service() {
-	local con_name=$(uci -q get xmpp.xmpp.conn_req_connection)
-	local con_enable=$(uci -q get xmpp.$con_name.enable)
-	if [ "$con_enable" == "1" ]; then
-		procd_open_instance
-		procd_set_param command "$PROG"
-		procd_set_param respawn "3" "7" "0"
-		procd_close_instance
+	local xmpp_enable=`uci -q get xmpp.xmpp.enable`
+	local xmpp_id=`uci -q get xmpp.xmpp.id`
+	if ([ "$xmpp_enable" = "1" ] && [ "$xmpp_id" != "0" ]); then
+		local con=`uci show xmpp | grep "xmpp.@connection.*xmpp_id=\'$xmpp_id\'" | cut -d "." -f 2`
+		local con_srv=`uci show xmpp | grep "xmpp.@connection.*con_id=\'$xmpp_id\'" | cut -d "." -f 2`
+		local serveralgorithm=`uci get xmpp.$con.serveralgorithm`
+		local con_enable=`uci -q get xmpp.$con.enable`
+		local srv_enable=`uci -q get xmpp.$con_srv.enable`
+		if ([ "$serveralgorithm" = "DNS-SRV" ] && [ "$con_enable" = "1" ]) || ([ "$serveralgorithm" = "ServerTable" ] && [ "$con_enable" = "1" ] && [ "$srv_enable" = "1" ]); then
+			procd_open_instance xmppc
+			procd_set_param command "$PROG"
+			procd_set_param respawn "3" "7" "0"
+			procd_close_instance
+		fi
 	fi
 }

@@ -22,7 +29,6 @@ boot() {
 }

 reload_service() {
-	logger -p crit -t "xmppc" "reloading service()"
 	stop
 	start 
 }