icwmp: parsing of DHCP option 125

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

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.7
+PKG_VERSION:=6.8.9
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=90ac63e15ac446b387d25eb0469645bbac8c8bf7
+PKG_SOURCE_VERSION:=4ad900a9bb6b4a0dd38edc1d14e1b6cbfeaa8e9b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

easy-soc-libs/Makefile

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

icwmp/Makefile

@@ -83,6 +83,7 @@ define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
+	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
@@ -92,6 +93,7 @@ define Package/icwmp/default/install
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
+	$(INSTALL_BIN) ./files/etc/udhcpc.user.d/udhcpc_icwmp.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp.user
 endef
 
 Package/icwmp-openssl/install = $(Package/icwmp/default/install)

icwmp/files/etc/udhcpc.user.d/udhcpc_icwmp.user

@@ -0,0 +1,122 @@
+#!/bin/sh
+
+CLASS=""
+OUI=""
+SERIAL=""
+
+get_vivsoi() {
+	# opt125 environment variable has data in below format
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |	 enterprise-number1	  |
+	# |				  |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
+	# |   data-len1   |		  |
+	# +-+-+-+-+-+-+-+-+ option-data1  |
+	# /				  /
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+	# |	 enterprise-number2	  |   ^
+	# |				  |   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# |   data-len2   |		  | optional
+	# +-+-+-+-+-+-+-+-+ option-data2  |   |
+	# /				  /   |
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+   |
+	# ~	       ...		  ~   V
+	# +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ -----
+
+	#  Enterprise Id  Len  Sub Op  SLen  Data Sub Op  SLen Data	  Sub Op  SLen Data
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+	# |	id    |  n  |	1  |  n1  | D1 |   2  |  n2 | D2 | ... |   6  |  n6 | D6 |
+	# +-------------+-----+------+------+----+------+-----+----+-----+------+-----+----+
+
+	local opt125="$1"
+	local len="$2"
+	local ent_id
+
+	#hex-string 2 character=1 Byte
+	# length in hex string will be twice of actual Byte length
+	[ "$len" -gt "8" ] || return
+
+	data="${opt125}"
+	rem_len="${len}"
+	while [ $rem_len -gt 0 ]; do
+		ent_id=${data:0:8}
+		ent_id=$(printf "%d\n" "0x$ent_id")
+
+		if [ $ent_id -ne  3561 ]; then
+			len_val=${data:8:2}
+			data_len=$(printf "%d\n" "0x$len_val")
+			# add 4 byte for ent_id and 1 byte for len
+			data_len=$(( data_len * 2 + 10 ))
+			# move ahead data to next enterprise id
+			data=${data:"${data_len}":"${rem_len}"}
+			rem_len=$(( rem_len - $data_len ))
+			continue
+		fi
+
+		# read the length of enterprise data
+		len_val=${data:8:2}
+		opt_len=$(printf "%d\n" "0x$len_val")
+		[ $opt_len -eq 0 ] && return
+
+		# populate the option data of enterprise id
+		sub_data_len=$(( opt_len * 2))
+		# starting 10 means ahead of length field
+		sub_data=${data:10:"${sub_data_len}"}
+
+		# parsing of suboption of option 125
+		while [ $sub_data_len -gt 0 ]; do
+			# get the suboption id
+			sub_opt_id=${sub_data:0:2}
+			sub_opt_id=$(printf "%d\n" "0x$sub_opt_id")
+
+			# get the length of suboption
+			sub_opt_len=${sub_data:2:2}
+			sub_opt_len=$(printf "%d\n" "0x$sub_opt_len")
+			sub_opt_len=$(( sub_opt_len * 2 ))
+
+			# get the value of sub option starting 4 means starting after length
+			sub_opt_val=${sub_data:4:${sub_opt_len}}
+
+			# assign the value found in sub option
+			case "${sub_opt_id}" in
+				"4") OUI=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"5") SERIAL=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+				"6") CLASS=$(echo -n $sub_opt_val | sed 's/\([0-9A-F]\{2\}\)/\\\\\\x\1/gI' | xargs printf && echo '')
+				;;
+			esac
+
+			# add 2 bytes for sub_opt id and sub_opt len field
+			sub_opt_end=$(( sub_opt_len + 4 ))
+
+			# fetch next sub option hex string
+			sub_data=${sub_data:${sub_opt_end}:${sub_data_len}}
+
+			# update the remaining sub option hex string length
+			sub_data_len=$((sub_data_len - sub_opt_end))
+		done
+
+		break
+	done
+}
+
+wan_intf=$(uci -q get cwmp.cpe.default_wan_interface)
+if [ -n "${wan_intf}" ] && [ "${wan_intf}" == "${INTERFACE}" ]; then
+	if [ -n "$opt125" ]; then
+		len=$(printf "$opt125"|wc -c)
+		get_vivsoi "$opt125" "$len"
+	fi
+
+	sec=$(uci -q -c /var/state get cwmp.gatewayinfo)
+	if [ -z "${sec}" ]; then
+		sec=$(uci -q -c /var/state add cwmp gatewayinfo)
+		uci -q -c /var/state rename cwmp."${sec}"="gatewayinfo"
+	fi
+
+	uci -q -c /var/state set cwmp.gatewayinfo.class="$CLASS"
+	uci -q -c /var/state set cwmp.gatewayinfo.oui="$OUI"
+	uci -q -c /var/state set cwmp.gatewayinfo.serial="$SERIAL"
+	uci -q -c /var/state commit cwmp
+fi

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=6.0.2
+PKG_VERSION:=6.0.16
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=30068401b9591a286b8b76da47730142de342545
+PKG_SOURCE_VERSION:=3b12bdd1b0e75f4e5b744e18f00ab5ac703382e6
 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

ieee1905/files/etc/init.d/ieee1905

@@ -82,8 +82,10 @@ start_service() {
 	validate_ieee1905_config || return 1;
 
 	procd_open_instance
-        procd_set_param command "/usr/sbin/ieee1905d"
+        procd_set_param command "/usr/sbin/ieee1905d" "-o"  "/tmp/ieee1905.log" "-f"
 	procd_set_param respawn
+	procd_set_param limits core="unlimited"
+#	procd_set_param env IEEE1905_LOG_CMDU=1
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1
 	procd_close_instance

iop/config

@@ -76,6 +76,7 @@ CONFIG_PACKAGE_urlfilter=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
+CONFIG_PACKAGE_usermngr=y
 
 # TR-x69 #
 CONFIG_PACKAGE_uspd-mbedtls=y

iop/scripts/genconfig.sh

@@ -393,10 +393,10 @@ function genconfig {
 			echo "ERROR: Failed getting version via git describe, exiting." >&2
 			return 1
 		fi
-		local customers_lower="${CUSTOMERS,,}"
-		local version="${git_version}${customers_lower:+-${customers_lower// /}}"
-		echo "CONFIG_TARGET_VERSION=\"${version}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version}\"" >> .config
+		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
+		local version_lower="${version,,}"
+		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Package source tree override if selected

iop/scripts/genconfig_min.sh

@@ -384,10 +384,10 @@ function genconfig_min {
 			echo "ERROR: Failed getting version via git describe, exiting." >&2
 			return 1
 		fi
-		local customers_lower="${CUSTOMERS,,}"
-		local version="${git_version}${customers_lower:+-${customers_lower// /}}"
-		echo "CONFIG_TARGET_VERSION=\"${version}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${version}\"" >> .config
+		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
+		local version_lower="${version,,}"
+		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Package source tree override if selected

libvoice-broadcom/Makefile

@@ -16,7 +16,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=2d3f39d517e89df0f3e80f85b7efedd3efc6705c
+PKG_SOURCE_VERSION:=b53e93ca1a2fdda56ca9caffb6020e158e684f3d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -47,7 +47,6 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	@echo "Building from the local source. TARGET_PLATFORM=$(TARGET_PLATFORM)"
 	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
 endef
 endif

libvoice-d2/Makefile

@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvoice-d2
+PKG_VERSION:=0.1
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
+PKG_SOURCE_VERSION:=45e7d35f97f258f5e13c3afa0542db724bf59828
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += -Wall -Werror
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Utilities
+	TITLE:=IOPSYS libvoice for D2 which is software DSP
+	URL:=
+	DEPENDS:=
+endef
+
+define Package/$(PKG_NAME)/description
+	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/$(PKG_NAME)/install
+	# Although there is nothing needs to be installed, but the install section must NOT be empty. Otherwise the package will be skipped as below.
+	# WARNING: skipping libvoice-d2 -- package has no install section
+	$(INSTALL_DIR) $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
+

map-agent/Config.in

@@ -13,6 +13,9 @@ config AGENT_ISLAND_PREVENTION
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
+config AGENT_EASYMESH_VERSION
+	int "Support Easymesh version"
+	default 2
 
 config AGENT_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.4.1
+PKG_VERSION:=2.10.4.11
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=29aabbeb0d96c76fa1a7ea2faffc2bd001efa800
+PKG_SOURCE_VERSION:=0852c7803475f7fb919f680d02437ba9672c42fc
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -59,6 +59,8 @@ TARGET_CFLAGS += \
 	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_AGENT_EASYMESH_VERSION)
+
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 endif

map-agent/files/etc/config/mapagent

@@ -7,6 +7,7 @@ config agent 'agent'
 	option island_prevention '0'
 	option eth_onboards_wifi_bhs '0'
 #	option controller_macaddr '0a:1b:2c:3d:4e:50'
+	option scan_on_boot_only '0'
 
 config dynamic_backhaul
 	option missing_bh_timer '60'

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

@@ -34,7 +34,8 @@ validate_agent_section() {
 		'resend_num:uinteger:0' \
 		'dyn_cntlr_sync:bool:true' \
 		'island_prevention:bool:false' \
-		'eth_onboards_wifi_bhs:bool:false'
+		'eth_onboards_wifi_bhs:bool:false' \
+		'scan_on_boot_only:bool:false'
 
 
 	[ "$?" -ne 0 ] && {

map-controller/Config.in

@@ -14,6 +14,10 @@ config CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT
 	string
 	default "\\\\x11\\\\x22\\\\x33"
 
+config CONTROLLER_EASYMESH_VERSION
+	int "Support Easymesh version"
+	default 2
+
 config CONTROLLER_EASYMESH_VENDOR_EXT_OUI
 	string "Vendor OUI in '\\\\xAB\\\\xCD\\\\xEF' format"
 	default CONTROLLER_EASYMESH_VENDOR_EXT_OUI_DEFAULT

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.14
+PKG_VERSION:=2.11.0.20
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8a71dffdd66b2dcacf67353efcb09cb9127c1ea9
+PKG_SOURCE_VERSION:=5ff7f037c040d337982a1e3a51693fb8e0682046
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -45,6 +45,8 @@ TARGET_CFLAGS += \
 
 MAKE_PATH:=src
 
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_CONTROLLER_EASYMESH_VERSION)
+
 ifeq ($(CONFIG_CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 endif

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.10
+PKG_VERSION:=2.5.1.13
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=ef732a9b7dcb4e03490a1fba8f89c5a6f8b9797f
+PKG_SOURCE_VERSION:=aaa55a72e719184af32d57a9b40bec1c440774a9
 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

sulu-builder/Config.in

@@ -13,7 +13,7 @@ menu "SULU_CORE"
 
 	config SULU_CORE_VERSION
 		string "SULU repo version"
-		default "59426b891fd66711b99a5b941cd40c87f0da1744"
+		default "c7e62f7f7cda1961012e8149d220ac1eb26d362f"
 endmenu
 
 menu "SULU_PLUGIN_LCM"
@@ -35,7 +35,7 @@ menu "SULU_PLUGIN_LCM"
 	config SULU_PLUGIN_LCM_VERSION
 		depends on SULU_PLUGIN_LCM_ENABLE
 		string "Version"
-		default "aae9064570e42cbb5f667fad824a992c812dd984"
+		default "ccd70b399b31530dc1af6a871eee94fbb179d794"
 endmenu
 
 menu "SULU_PLUGIN_MULTIAP"
@@ -57,7 +57,7 @@ menu "SULU_PLUGIN_MULTIAP"
 	config SULU_PLUGIN_MULTIAP_VERSION
 		depends on SULU_PLUGIN_MULTIAP_ENABLE
 		string "Version"
-		default "53eef156a02b9e93bd566997b5ff6f47fba29e46"
+		default "3c79d57bee453e7b62c7b7626e33bf273212bbc9"
 endmenu
 
 menu "SULU_THEME_IOPSYS"

sulu-builder/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=1.3.12
+PKG_VERSION:=1.3.16
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=f48e4fc60f8b3a34fceaa25aadd1c9f6941a16f5
+PKG_SOURCE_VERSION:=81d4bb268914dc3822293e93519ae6adbd6ddbea
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -22,7 +22,7 @@ define Package/${PKG_NAME}
 	SECTION:=utils
 	CATEGORY:=Utilities
 	TITLE:=Build sulu from source
-	DEPENDS:=+nginx +mosquitto-auth-shadow +usermngr
+	DEPENDS:=+nginx +mosquitto-auth-shadow +usermngr +jq
 	CONFLICTS:=sulu
 endef
 

sulu-builder/files/etc/config/sulu

@@ -1,4 +1,7 @@
 config global 'global'
+	option root '/sulu'
+	option port '8080'
+	option ws_port '9001'
 	option enabled '1'
 	option enable_system_credentials '1'
 	option role_based_access '1'

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

@@ -34,7 +34,8 @@ start_service() {
 	fi
 
 	configure_sulu "${enable_system_credentials}" "${role_based_access}" 1
-	update_nginx_config "${enabled}"
+	update_nginx_config "${enabled}" 1
+	update_sulu_connection_port
 	procd_close_instance
 }
 

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

@@ -3,7 +3,7 @@ server {
         listen [::]:8080;
         server_name _sulu;
         root /sulu;
-        location /config/ {
+        location / {
                 autoindex on;
                 expires -1;
 

sulu-builder/files/etc/sulu/sulu.sh

@@ -2,9 +2,7 @@
 
 . /lib/functions.sh
 
-SULU_CONFIG="/sulu/config/connectionConfig.json"
 ACL_FILE="/tmp/sulu/mqtt.acl"
-MB_SULU_CONF="/etc/mosquitto/conf.d/sulu.conf"
 _RESTART_SERVICES="0"
 
 mkdir -p /tmp/sulu/
@@ -47,12 +45,37 @@ function _get_sulu_users()
 	echo "$(uci -q get sulu.global.user)"
 }
 
+function _get_sulu_root()
+{
+	local root
+
+	root="$(uci -q get sulu.global.root)"
+	echo "${root:-/sulu}"
+}
+
+function _get_sulu_port()
+{
+	local port
+
+	port="$(uci -q get sulu.global.port)"
+	echo "${port:-8080}"
+}
+
+function _get_sulu_ws_port()
+{
+	local port
+
+	port="$(uci -q get sulu.global.ws_port)"
+	echo "${port:-9001}"
+}
+
 function generate_sulu_conn_config()
 {
-	local rbac users
+	local rbac users SCONFIG
 
 	rbac="${1}"
 	users="$(_get_sulu_users)"
+	SCONFIG="$(_get_sulu_root)/config/connectionConfig.json"
 
 	json_init;
 	if [ "${rbac}" -eq "1" ]; then
@@ -63,7 +86,7 @@ function generate_sulu_conn_config()
 	json_add_object 'connections';
 		json_add_object 'rbac';
 		json_add_string 'toId' "$(_get_endpoint_id)";
-		json_add_int 'port' 9001;
+		json_add_int 'port' "$(_get_sulu_ws_port)";
 		json_add_string 'protocol' 'ws';
 			json_add_array 'auth';
 			json_close_array;
@@ -83,7 +106,7 @@ function generate_sulu_conn_config()
 		json_add_object 'main';
 		json_add_string 'fromId' 'proto::interop-usp-controller';
 		json_add_string 'toId' "$(_get_endpoint_id)";
-		json_add_int 'port' 9001;
+		json_add_int 'port' "$(_get_sulu_ws_port)";
 		json_add_string 'protocol' 'ws';
 		json_add_string 'publishEndpoint' "/usp/endpoint";
 		json_add_string 'subscribeEndpoint' "/usp/controller";
@@ -92,24 +115,40 @@ function generate_sulu_conn_config()
 		json_close_object;
 	json_close_object;
 
-	json_dump > ${SULU_CONFIG}
+	json_dump > ${SCONFIG}
 }
 
 function set_sulu_connection_mode()
 {
-	local rbac profile config
+	local rbac profile config SCONFIG
 
+	SCONFIG="$(_get_sulu_root)/config/connectionConfig.json"
 	rbac="${1}"
 
-	profile="$(jq '.currentConnection' ${SULU_CONFIG})"
+	profile="$(jq '.currentConnection' ${SCONFIG})"
 	if [ "$rbac" -eq "1" -a "${profile}" == "\"main\"" ]; then
-		config="$(jq '.currentConnection = "rbac"' ${SULU_CONFIG})"
-		echo "${config}" > ${SULU_CONFIG}
+		config="$(jq '.currentConnection = "rbac"' ${SCONFIG})"
+		echo "${config}" > ${SCONFIG}
 	elif [ "$rbac" -eq "0" -a "${profile}" == "\"rbac\"" ]; then
-		config="$(jq '.currentConnection = "main"' ${SULU_CONFIG})"
-		echo "${config}" > ${SULU_CONFIG}
+		config="$(jq '.currentConnection = "main"' ${SCONFIG})"
+		echo "${config}" > ${SCONFIG}
 	fi
 }
+
+function update_sulu_connection_port()
+{
+	local port ws_port SCONF
+
+	SCONF="$(_get_sulu_root)/config/connectionConfig.json"
+	ws_port="$(_get_sulu_ws_port)"
+
+	port="$(jq '.connections.rbac.port' ${SCONF})"
+	if [ "${port}" -ne "${ws_port}" ]; then
+		jq ".connections.main.port = ${ws_port} | .connections.rbac.port = ${ws_port}" ${SCONF} > /tmp/sulu/ss_port.json
+		mv /tmp/sulu/ss_port.json ${SCONF}
+	fi
+}
+
 function _update_obuspa_config()
 {
 	local restart
@@ -175,7 +214,7 @@ function _update_obuspa_config_rbac() {
 
 		# Add mqtt
 		sec="mqtt_sulu_${f}"
-		if ! uci_get obuspa mqtt ${sec} >/dev/null 2>&1; then
+		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
 			uci_add obuspa mqtt ${sec}
 			uci_set obuspa ${sec} BrokerAddress "127.0.0.1"
 			uci_set obuspa ${sec} BrokerPort "1883"
@@ -185,7 +224,7 @@ function _update_obuspa_config_rbac() {
 
 		# Add mtp
 		sec="mtp_sulu_${f}"
-		if ! uci_get obuspa mtp ${sec} >/dev/null 2>&1; then
+		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
 			uci_add obuspa mtp ${sec}
 			uci_set obuspa ${sec} Protocol "MQTT"
 			uci_set obuspa ${sec} ResponseTopicConfigured "/usp/${agent}/${f}/endpoint"
@@ -195,7 +234,7 @@ function _update_obuspa_config_rbac() {
 
 		# Add controller
 		sec="controller_sulu_${f}"
-		if ! uci_get obuspa controller ${sec} >/dev/null 2>&1; then
+		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
 			uci_add obuspa controller ${sec}
 			uci_set obuspa ${sec} EndpointID "self::sulu-${f}"
 			uci_set obuspa ${sec} Protocol "MQTT"
@@ -262,11 +301,13 @@ function _create_acl() {
 
 function update_mosquitto_broker_config()
 {
-	local system_cred rbac restart
+	local system_cred rbac restart ws_port
 
+	MB_SULU_CONF="/etc/mosquitto/conf.d/sulu.conf"
 	system_cred="${1}"
 	rbac="${2}"
 	restart=0
+	ws_port="$(_get_sulu_ws_port)"
 
 	if [ "${system_cred}" -eq "1" ]; then
 		if grep -q "password_file " ${MB_SULU_CONF}; then
@@ -301,6 +342,11 @@ function update_mosquitto_broker_config()
 		fi
 	fi
 
+	if ! grep -q "listener ${ws_port}" ${MB_SULU_CONF}; then
+		sed -i "s/listener [0-9]\+/listener ${ws_port}/" ${MB_SULU_CONF}
+		restart=1
+	fi
+
 	if [ "${_RESTART_SERVICES}" -eq "1" -a "${restart}" -eq "1" ]; then
 		slog "Restarting mqtt broker..."
 		/etc/init.d/mosquitto restart &
@@ -336,21 +382,36 @@ function update_obuspa_config()
 
 function update_nginx_config()
 {
-	local enabled restart
+	local enabled restart port
 
+	NCONF="/etc/nginx/conf.d/sulu.conf"
 	restart=0
 	enabled="${1:-0}"
+	_RESTART_SERVICES="${2:-0}"
+	port="$(_get_sulu_port)"
+	root="$(_get_sulu_root)"
+
 	if [ "${enabled}" -eq "1" ]; then
-		if [ ! -f "/etc/nginx/conf.d/sulu.conf" ]; then
-			cp  /etc/sulu/nginx.conf /etc/nginx/conf.d/sulu.conf
+		if [ ! -f "${NCONF}" ]; then
+			cp  /etc/sulu/nginx.conf ${NCONF}
+			restart=1
+		fi
+		if ! grep -q "listen ${port}" ${NCONF}; then
+			sed -i "s/listen [0-9]\+/listen ${port}/" ${NCONF}
+			sed -i "s/listen \[::\]:[0-9]\+/listen [::]:${port}/" ${NCONF}
+			restart=1
+		fi
+		if ! grep -q "root ${root}" ${NCONF}; then
+			sed -i "s/root .*;/root ${root//\//\\/};/" ${NCONF}
 			restart=1
 		fi
 	else
-		if [ -f "/etc/nginx/conf.d/sulu.conf" ]; then
-			rm -f /etc/nginx/conf.d/sulu.conf
+		if [ -f "${NCONF}" ]; then
+			rm -f ${NCONF}
 			restart=1
 		fi
 	fi
+
 	if [  "${_RESTART_SERVICES}" -eq "1" -a "${restart}" -eq "1" ]; then
 		slog "Restarting nginx..."
 		ubus call uci commit '{"config":"nginx"}'

sulu-builder/files/etc/uci-defaults/99-fix-sulu-config

@@ -8,5 +8,4 @@ config_get role_based_access global role_based_access 0
 config_get enabled global enabled 0
 
 configure_sulu "${enable_system_credentials}" "${role_based_access}" 0
-update_nginx_config "${enabled}"
 generate_sulu_conn_config "${role_based_access}"

sulu/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu
-PKG_VERSION:=1.3.12
+PKG_VERSION:=1.3.16
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=f48e4fc60f8b3a34fceaa25aadd1c9f6941a16f5
+PKG_SOURCE_VERSION:=81d4bb268914dc3822293e93519ae6adbd6ddbea
 
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
@@ -27,7 +27,7 @@ define Package/sulu
 	SECTION:=sulu
 	CATEGORY:=Utilities
 	TITLE:=SULU-CE ReactJS based Web UI Package
-	DEPENDS:=+nginx +mosquitto-auth-shadow +usermngr
+	DEPENDS:=+nginx +mosquitto-auth-shadow +usermngr +jq
 endef
 
 define Package/sulu/description

sulu/files/etc/config/sulu

@@ -1,4 +1,7 @@
 config global 'global'
+	option root '/sulu'
+	option port '8080'
+	option ws_port '9001'
 	option enabled '1'
 	option enable_system_credentials '1'
 	option role_based_access '1'

sulu/files/etc/init.d/sulu

@@ -34,7 +34,8 @@ start_service() {
 	fi
 
 	configure_sulu "${enable_system_credentials}" "${role_based_access}" 1
-	update_nginx_config "${enabled}"
+	update_nginx_config "${enabled}" 1
+	update_sulu_connection_port
 	procd_close_instance
 }
 

sulu/files/etc/nginx/conf.d/sulu.conf

@@ -3,7 +3,7 @@ server {
         listen [::]:8080;
         server_name _sulu;
         root /sulu;
-        location /config/ {
+        location / {
                 autoindex on;
                 expires -1;
 

sulu/files/etc/sulu/sulu.sh

@@ -2,9 +2,7 @@
 
 . /lib/functions.sh
 
-SULU_CONFIG="/sulu/config/connectionConfig.json"
 ACL_FILE="/tmp/sulu/mqtt.acl"
-MB_SULU_CONF="/etc/mosquitto/conf.d/sulu.conf"
 _RESTART_SERVICES="0"
 
 mkdir -p /tmp/sulu/
@@ -47,12 +45,37 @@ function _get_sulu_users()
 	echo "$(uci -q get sulu.global.user)"
 }
 
+function _get_sulu_root()
+{
+	local root
+
+	root="$(uci -q get sulu.global.root)"
+	echo "${root:-/sulu}"
+}
+
+function _get_sulu_port()
+{
+	local port
+
+	port="$(uci -q get sulu.global.port)"
+	echo "${port:-8080}"
+}
+
+function _get_sulu_ws_port()
+{
+	local port
+
+	port="$(uci -q get sulu.global.ws_port)"
+	echo "${port:-9001}"
+}
+
 function generate_sulu_conn_config()
 {
-	local rbac users
+	local rbac users SCONFIG
 
 	rbac="${1}"
 	users="$(_get_sulu_users)"
+	SCONFIG="$(_get_sulu_root)/config/connectionConfig.json"
 
 	json_init;
 	if [ "${rbac}" -eq "1" ]; then
@@ -63,7 +86,7 @@ function generate_sulu_conn_config()
 	json_add_object 'connections';
 		json_add_object 'rbac';
 		json_add_string 'toId' "$(_get_endpoint_id)";
-		json_add_int 'port' 9001;
+		json_add_int 'port' "$(_get_sulu_ws_port)";
 		json_add_string 'protocol' 'ws';
 			json_add_array 'auth';
 			json_close_array;
@@ -83,7 +106,7 @@ function generate_sulu_conn_config()
 		json_add_object 'main';
 		json_add_string 'fromId' 'proto::interop-usp-controller';
 		json_add_string 'toId' "$(_get_endpoint_id)";
-		json_add_int 'port' 9001;
+		json_add_int 'port' "$(_get_sulu_ws_port)";
 		json_add_string 'protocol' 'ws';
 		json_add_string 'publishEndpoint' "/usp/endpoint";
 		json_add_string 'subscribeEndpoint' "/usp/controller";
@@ -92,24 +115,40 @@ function generate_sulu_conn_config()
 		json_close_object;
 	json_close_object;
 
-	json_dump > ${SULU_CONFIG}
+	json_dump > ${SCONFIG}
 }
 
 function set_sulu_connection_mode()
 {
-	local rbac profile config
+	local rbac profile config SCONFIG
 
+	SCONFIG="$(_get_sulu_root)/config/connectionConfig.json"
 	rbac="${1}"
 
-	profile="$(jq '.currentConnection' ${SULU_CONFIG})"
+	profile="$(jq '.currentConnection' ${SCONFIG})"
 	if [ "$rbac" -eq "1" -a "${profile}" == "\"main\"" ]; then
-		config="$(jq '.currentConnection = "rbac"' ${SULU_CONFIG})"
-		echo "${config}" > ${SULU_CONFIG}
+		config="$(jq '.currentConnection = "rbac"' ${SCONFIG})"
+		echo "${config}" > ${SCONFIG}
 	elif [ "$rbac" -eq "0" -a "${profile}" == "\"rbac\"" ]; then
-		config="$(jq '.currentConnection = "main"' ${SULU_CONFIG})"
-		echo "${config}" > ${SULU_CONFIG}
+		config="$(jq '.currentConnection = "main"' ${SCONFIG})"
+		echo "${config}" > ${SCONFIG}
 	fi
 }
+
+function update_sulu_connection_port()
+{
+	local port ws_port SCONF
+
+	SCONF="$(_get_sulu_root)/config/connectionConfig.json"
+	ws_port="$(_get_sulu_ws_port)"
+
+	port="$(jq '.connections.rbac.port' ${SCONF})"
+	if [ "${port}" -ne "${ws_port}" ]; then
+		jq ".connections.main.port = ${ws_port} | .connections.rbac.port = ${ws_port}" ${SCONF} > /tmp/sulu/ss_port.json
+		mv /tmp/sulu/ss_port.json ${SCONF}
+	fi
+}
+
 function _update_obuspa_config()
 {
 	local restart
@@ -175,7 +214,7 @@ function _update_obuspa_config_rbac() {
 
 		# Add mqtt
 		sec="mqtt_sulu_${f}"
-		if ! uci_get obuspa mqtt ${sec} >/dev/null 2>&1; then
+		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
 			uci_add obuspa mqtt ${sec}
 			uci_set obuspa ${sec} BrokerAddress "127.0.0.1"
 			uci_set obuspa ${sec} BrokerPort "1883"
@@ -185,7 +224,7 @@ function _update_obuspa_config_rbac() {
 
 		# Add mtp
 		sec="mtp_sulu_${f}"
-		if ! uci_get obuspa mtp ${sec} >/dev/null 2>&1; then
+		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
 			uci_add obuspa mtp ${sec}
 			uci_set obuspa ${sec} Protocol "MQTT"
 			uci_set obuspa ${sec} ResponseTopicConfigured "/usp/${agent}/${f}/endpoint"
@@ -195,7 +234,7 @@ function _update_obuspa_config_rbac() {
 
 		# Add controller
 		sec="controller_sulu_${f}"
-		if ! uci_get obuspa controller ${sec} >/dev/null 2>&1; then
+		if ! uci_get obuspa ${sec} >/dev/null 2>&1; then
 			uci_add obuspa controller ${sec}
 			uci_set obuspa ${sec} EndpointID "self::sulu-${f}"
 			uci_set obuspa ${sec} Protocol "MQTT"
@@ -262,11 +301,13 @@ function _create_acl() {
 
 function update_mosquitto_broker_config()
 {
-	local system_cred rbac restart
+	local system_cred rbac restart ws_port
 
+	MB_SULU_CONF="/etc/mosquitto/conf.d/sulu.conf"
 	system_cred="${1}"
 	rbac="${2}"
 	restart=0
+	ws_port="$(_get_sulu_ws_port)"
 
 	if [ "${system_cred}" -eq "1" ]; then
 		if grep -q "password_file " ${MB_SULU_CONF}; then
@@ -301,6 +342,11 @@ function update_mosquitto_broker_config()
 		fi
 	fi
 
+	if ! grep -q "listener ${ws_port}" ${MB_SULU_CONF}; then
+		sed -i "s/listener [0-9]\+/listener ${ws_port}/" ${MB_SULU_CONF}
+		restart=1
+	fi
+
 	if [ "${_RESTART_SERVICES}" -eq "1" -a "${restart}" -eq "1" ]; then
 		slog "Restarting mqtt broker..."
 		/etc/init.d/mosquitto restart &
@@ -336,21 +382,36 @@ function update_obuspa_config()
 
 function update_nginx_config()
 {
-	local enabled restart
+	local enabled restart port
 
+	NCONF="/etc/nginx/conf.d/sulu.conf"
 	restart=0
 	enabled="${1:-0}"
+	_RESTART_SERVICES="${2:-0}"
+	port="$(_get_sulu_port)"
+	root="$(_get_sulu_root)"
+
 	if [ "${enabled}" -eq "1" ]; then
-		if [ ! -f "/etc/nginx/conf.d/sulu.conf" ]; then
-			cp  /etc/sulu/nginx.conf /etc/nginx/conf.d/sulu.conf
+		if [ ! -f "${NCONF}" ]; then
+			cp  /etc/sulu/nginx.conf ${NCONF}
+			restart=1
+		fi
+		if ! grep -q "listen ${port}" ${NCONF}; then
+			sed -i "s/listen [0-9]\+/listen ${port}/" ${NCONF}
+			sed -i "s/listen \[::\]:[0-9]\+/listen [::]:${port}/" ${NCONF}
+			restart=1
+		fi
+		if ! grep -q "root ${root}" ${NCONF}; then
+			sed -i "s/root .*;/root ${root//\//\\/};/" ${NCONF}
 			restart=1
 		fi
 	else
-		if [ -f "/etc/nginx/conf.d/sulu.conf" ]; then
-			rm -f /etc/nginx/conf.d/sulu.conf
+		if [ -f "${NCONF}" ]; then
+			rm -f ${NCONF}
 			restart=1
 		fi
 	fi
+
 	if [  "${_RESTART_SERVICES}" -eq "1" -a "${restart}" -eq "1" ]; then
 		slog "Restarting nginx..."
 		ubus call uci commit '{"config":"nginx"}'

sulu/files/etc/uci-defaults/99-fix-sulu-config

@@ -8,5 +8,4 @@ config_get role_based_access global role_based_access 0
 config_get enabled global enabled 0
 
 configure_sulu "${enable_system_credentials}" "${role_based_access}" 0
-update_nginx_config "${enabled}"
 generate_sulu_conn_config "${role_based_access}"

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/usermngr.git
-PKG_SOURCE_VERSION:=c8afaf3a275d6a3480992a3769382135ca3252d7
+PKG_SOURCE_VERSION:=a1c6ed3add2edb59f0b71bffa9b8aaa8b8240a61
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,7 +27,7 @@ define Package/usermngr
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  DEPENDS:= +shadow-utils
+  DEPENDS:= +shadow-utils +libbbf_api
   TITLE:=Package to add Device.Users. datamodel support
 endef
 
@@ -48,6 +48,7 @@ define Package/usermngr/install
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/init.d/users $(1)/etc/init.d/users
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/uci-defaults/90-indicate-bootstrap $(1)/etc/uci-defaults/90-indicate-bootstrap
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/uci-defaults/91-sync-shells $(1)/etc/uci-defaults/91-sync-shells
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/libusermngr.so $(1)/usr/lib/bbfdm/libusermngr.so
 	$(INSTALL_BIN) ./files/etc/config/users $(1)/etc/config/users
 endef

uspd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=uspd
-PKG_VERSION:=2.2.21
+PKG_VERSION:=2.2.22
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/uspd.git
-PKG_SOURCE_VERSION:=8c4ab6aa9d05181c4ef2a288853764dca9625c4e
+PKG_SOURCE_VERSION:=828abe8f0234eb7cd36115bb2e4a5b4113c0510f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

uspd/files/etc/config/uspd

@@ -3,3 +3,4 @@ config uspd 'usp'
 	option debug '0'
 	option loglevel  '1'
 	option refresh_time '5'
+	option transaction_timeout '10'

voicemngr/Makefile

@@ -18,7 +18,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=be0efc70203d0f8b83269711388c7990d53db851
+PKG_SOURCE_VERSION:=8cdd77393ac6a631649eac71ff33603bfc2b55b3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -38,7 +38,8 @@ define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
 	TITLE:=IOPSYS Voice Manager
 	URL:=
-	DEPENDS:= +libubox +ubus +libpicoevent +uci +TARGET_brcmbca:bcmkernel +TARGET_brcmbca:libvoice-broadcom +TARGET_iopsys_qualcomm:vtsp
+	DEPENDS:= +libubox +ubus +libpicoevent +uci +TARGET_brcmbca:bcmkernel +TARGET_brcmbca:libvoice-broadcom \
+		+TARGET_ipq95xx:libvoice-d2
 endef
 
 define Package/$(PKG_NAME)/description

wfadatad/Config.in

@@ -1,10 +1,7 @@
 menu "Configuration"
 
-config WFA_DELM_MULTIAP_MODE
-	bool "Enable Multi-AP mode"
-	default y
+config DECOLLECTOR_EASYMESH_VERSION
+	int "Support Easymesh version"
+	default 2
 
-config WIFI_DELM_DEBUG
-	bool "Enable debug logs"
-	default n
 endmenu

wfadatad/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=2.10.0.4
+PKG_VERSION:=2.11.0.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b5b6e881b110d86c6ea725c30c1be4de77e9ecfb
+PKG_SOURCE_VERSION:=24dcb18f3e60082c70ab17b0707073fd2981f0a9
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -73,6 +73,7 @@ endif
 
 MAKE_PATH:=src
 
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION)
 
 EXECS := \
 	$(if $(CONFIG_PACKAGE_wfadatad),agent/deagent) \