map-agent: make EASYMESH_R2_CERT compile flag selectable

libvoiceservice updating

bbf/Config_bbfdm.in

@@ -1,7 +1,3 @@
-if PACKAGE_libbbfdm
-
-menu "Configuration"
-
 config BBF_VENDOR_EXTENSION
 	bool "Enable Vendor Extension"
 	default y
@@ -14,10 +10,6 @@ config BBF_VENDOR_PREFIX
 	string "Vendor Prefix"
 	default "X_IOPSYS_EU_"
 
-config BBF_TR181
-	bool "Enable TR-181 Data Model Support"
-	default y
-
 config BBF_TR104
 	bool "Enable TR-104 Data Model Support"
 	default y
@@ -28,10 +20,8 @@ config BBF_TR143
 
 config BBFDM_ENABLE_JSON_PLUGIN
 	bool "Enable json plugin to extend datamodel"
-	default n
+	default y
 
 config BBFDM_ENABLE_DOTSO_PLUGIN
 	bool "Enable shared library plugin to extend datamodel"
-	default n
-endmenu
-endif
+	default y

bbf/Makefile

@@ -5,21 +5,20 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.6.2
-PKG_FIXUP:=autoreconf
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_VERSION:=6.6.24
+
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=be6a8fc69fc257f6e3bbd8864b7b1d25b8e77190
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
+PKG_SOURCE_VERSION:=daa67e6bad5526c5904715214ac553366255765c
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
 
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_RELEASE=$(PKG_SOURCE_VERSION)
 
 PKG_LICENSE:=LGPL-2.1
 PKG_LICENSE_FILES:=LICENSE
 
+PKG_FIXUP:=autoreconf
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libbbf_api
@@ -30,12 +29,42 @@ define Package/libbbf_api
   DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
 endef
 
-define Package/libbbfdm
+define Package/libbbfdm/default
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  TITLE:=Library for broadband-forum data model
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libbbf_api +libopenssl +libcurl
+  TITLE:=Library for broadband forum data model support
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl
+endef
+
+define Package/libbbfdm
+  $(Package/libbbfdm/default)
+  TITLE += (internal)
+  VARIANT:=internal
+endef
+
+define Package/libbbfdm-mbedtls
+  $(Package/libbbfdm/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
+  VARIANT:=mbedtls
+  DEFAULT_VARIANT:=1
+endef
+
+define Package/libbbfdm-openssl
+  $(Package/libbbfdm/default)
+  TITLE += (openssl)
+  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  CONFLICTS := libbbfdm-mbedtls
+  VARIANT:=openssl
+endef
+
+define Package/libbbfdm-wolfssl
+  $(Package/libbbfdm/default)
+  TITLE += (wolfssl)
+  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
+  CONFLICTS := libbbfdm-mbedtls libbbfdm-openssl
+  VARIANT:=wolfssl
 endef
 
 define Package/libbbfdm/config
@@ -61,10 +90,8 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror \
 
-ifeq ($(CONFIG_BBF_TR181),y)
 CONFIGURE_ARGS += \
 	--enable-tr181
-endif
 
 ifeq ($(CONFIG_BBF_TR104),y)
 CONFIGURE_ARGS += \
@@ -76,11 +103,6 @@ CONFIGURE_ARGS += \
 	--enable-tr143
 endif
 
-ifeq ($(CONFIG_PACKAGE_libopenssl),y)
-CONFIGURE_ARGS += \
-	--enable-libopenssl
-endif
-
 ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
 CONFIGURE_ARGS += \
 	--enable-vendor-extension
@@ -101,12 +123,27 @@ 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)
+CONFIGURE_ARGS += --enable-libwolfssl
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/wolfssl
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+CONFIGURE_ARGS += --enable-libmbedtls
+TARGET_CFLAGS += -I$(STAGING_DIR)/usr/include/
+endif
+
 define Package/libbbf_api/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/.libs/libbbf_api.so* $(1)/lib/
 endef
 
-define Package/libbbfdm/install
+define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/lib
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/etc/bbfdm
@@ -117,12 +154,20 @@ define Package/libbbfdm/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 endef
 
-define Package/libbbfdm/prerm
+define Package/libbbfdm/default/prerm
 	#!/bin/sh
 	rm -rf /etc/bbfdm/dmmap/*
 	exit 0
 endef
 
+Package/libbbfdm-openssl/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-wolfssl/prerm = $(Package/libbbfdm/default/prerm)
+Package/libbbfdm-mbedtls/prerm = $(Package/libbbfdm/default/prerm)
+
+Package/libbbfdm-openssl/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-wolfssl/install = $(Package/libbbfdm/default/install)
+Package/libbbfdm-mbedtls/install = $(Package/libbbfdm/default/install)
+
 define Build/InstallDev
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -137,3 +182,6 @@ endef
 
 $(eval $(call BuildPackage,libbbf_api))
 $(eval $(call BuildPackage,libbbfdm))
+$(eval $(call BuildPackage,libbbfdm-openssl))
+$(eval $(call BuildPackage,libbbfdm-wolfssl))
+$(eval $(call BuildPackage,libbbfdm-mbedtls))

bulkdata/Makefile

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

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:=ef9d4c6124d0ca66f048f3d678d9a25f13aa4207
+PKG_SOURCE_VERSION:=96011a9ac7f8b714846ac0ba629528a078de8d9a
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2
+	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c
 endef
 
 define Package/$(PKG_NAME)/description

dectmngr/files/etc/config/dect

@@ -1,2 +1,3 @@
 config dect 'global'
-	option log_dect_cmbs 'syslog'
+ 	option log_dect_cmbs 'syslog'
+        option log_level 'realtime,warning,error'

dslmngr/Makefile

@@ -28,12 +28,6 @@ include $(INCLUDE_DIR)/package.mk
 
 ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
   TARGET_PLATFORM=BROADCOM
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-else ifeq ($(CONFIG_TARGET_iopsys_linksys),y)
-  TARGET_PLATFORM=MARVELL
-else ifeq ($(CONFIG_TARGET_intel_mips),y)
-  TARGET_PLATFORM=INTEL
 else
   $(info Unexpected CONFIG_TARGET)
 endif

easy-qos/Makefile

@@ -19,7 +19,7 @@ define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_intel_mips||TARGET_iopsys_brcm63xx_arm)
+  DEPENDS:=@TARGET_iopsys_brcm63xx_arm
 endef
 
 define Package/easy-qos/description
@@ -39,11 +39,7 @@ define Package/easy-qos/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(CP) ./files/etc/config/easy_qos $(1)/etc/config/
-ifeq ($(CONFIG_TARGET_intel_mips),y)
-	$(CP) ./files/etc/init.d/easy_qos.classcfg $(1)/etc/init.d/easy_qos
-else
 	$(CP) ./files/etc/init.d/easy_qos.iptables $(1)/etc/init.d/easy_qos
-endif
 	$(CP) ./files/etc/uci-defaults/* $(1)/etc/uci-defaults/
 	$(CP) ./files/etc/firewall.easyqos $(1)/etc/firewall.easyqos
 endef

easy-qos/files/etc/init.d/easy_qos.classcfg

@@ -1,301 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-USE_PROCD=1
-
-RULE_LIST="/tmp/easy_qos_rule.list"
-CLIENT_LIST="/tmp/easy_qos_class_client.list"
-BRIDGE_INTF=""
-
-[ -f /etc/profile.d/intel.sh ] && {
-	. /etc/profile.d/intel.sh
-	sh /etc/profile.d/intel.sh
-}
-
-log() {
-	echo "${@}"|logger -t easy_qos_class -p debug
-}
-
-exec_log() {
-	${@}
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-	fi
-}
-
-exec_class_log() {
-	${@} |grep -i successful
-	if [ "${?}" -ne 0 ]; then
-		log "Failed to create ${@}";
-		return 1
-	fi
-	return 0
-}
-
-get_priority() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
-	case "${prio}" in
-		"lowest")
-			echo 8;;
-		"low")
-			echo 7;;
-		"besteffort")
-			echo 6;;
-		"normal")
-			echo 5;;
-		"video")
-			echo 4;;
-		"medium")
-			echo 3;;
-		"high")
-			echo 2;;
-		"highest")
-			echo 1;;
-	esac
-}
-
-get_mark() {
-	local prio=$(echo $1|tr 'A-Z' 'a-z');
-	case "${prio}" in
-		"lowest")
-			echo "0x41/0x3df";;
-		"low")
-			echo "0x82/0x3df";;
-		"besteffort")
-			echo "0xc3/0x3df";;
-		"normal")
-			echo "0x104/0x3df";;
-		"video")
-			echo "0x145/0x3df";;
-		"medium")
-			echo "0x186/0x3df";;
-		"high")
-			echo "0x1c7/0x3df";;
-		"highest")
-			echo "0x208/0x3df";;
-	esac
-}
-
-clean_client_entries() {
-	[ -f ${CLIENT_LIST} ] && rm ${CLIENT_LIST}
-}
-
-map_client_entries() {
-	local clients ip mac host
-
-	json_load "$(ubus call router.network 'clients')"
-	json_get_keys keys
-
-	for key in ${keys};
-	do
-		json_select ${key}
-		json_get_vars ipaddr macaddr hostname
-		clients="${macaddr} ${ipaddr} ${hostname};${clients}"
-		json_select ..
-	done
-
-	json_init
-
-	IFS=";"
-	for client in ${clients};
-	do
-		macaddr=$(echo ${client} | cut -d" " -f1)
-		json_add_object "${macaddr//:/_}"
-		json_add_string "ip" "$(echo ${client} | cut -d" " -f2)"
-		json_add_string "macaddr" "$(echo ${client} | cut -d" " -f1)"
-		json_add_string "host" "$(echo ${client} | cut -d" " -f3)"
-		json_close_object
-	done
-
-	IFS=' '
-	echo `json_dump` > ${CLIENT_LIST}
-	json_cleanup
-}
-
-# Find the IP of a corresponding mac from arp table
-get_ipaddress() {
-	local clients ip mac host
-
-	json_load "$(cat ${CLIENT_LIST})"
-	json_get_keys keys
-
-	# jshn seems a bit iffy on having : in key, replace by _
-	json_select "${1//:/_}" 2 > /dev/null
-	json_get_var ip ip
-
-	echo "$ip"
-}
-
-check_and_create() {
-	iptables -t mangle -C PREROUTING ${@} 2>/dev/null
-	# Create rule if not exists
-	if [ ${?} -ne 0 ]; then
-		exec_log iptables -t mangle -A PREROUTING ${@}
-	else
-		log "Rule exists for ${@}"
-	fi
-}
-
-create_ip_rule() {
-	local proto=$1; shift
-	local src_ip=$1; shift
-	local mark=$1; shift
-	local ports=$1;
-	local cmd="";
-
-	cmd="-j EXTMARK --set-mark ${mark}";
-	if [ "${proto}" != "icmp" ]; then
-		if [ -n "${ports}" ]; then
-			cmd="--match multiport --dports ${ports} ${cmd}";
-		fi
-	fi
-
-	if [ "${proto}" == "icmp" ]; then
-		cmd="-p icmp -m icmp --icmp-type 8 $cmd"
-	elif [ "${proto}" == "all" ]; then
-		cmd="-p all $cmd"
-	else
-		cmd="-p ${proto} -m ${proto} $cmd"
-	fi
-	cmd="-s ${src_ip} $cmd"
-
-	check_and_create ${cmd}
-}
-
-is_lan_bridge() {
-	local _section=$1
-	local _type
-	local _is_lan
-
-	config_get _type "$section" "type"
-	config_get _is_lan "$section" "is_lan"
-
-	if [ "${_type}" == "bridge" -a "${_is_lan}" == "1" ]; then
-		BRIDGE_INTF="br-${_section}"
-	fi
-}
-
-get_bridge_interface() {
-	config_load network
-	config_foreach is_lan_bridge interface
-}
-
-validate_rule_section()
-{
-	uci_validate_section easy_qos rule "${1}" \
-		'priority:string' \
-		'macaddr:string' \
-		'proto:string:none' \
-		'port:list(uinteger)' \
-		'comment:string:none'
-}
-
-# Clear existing rules before applying new rules
-clear_existing_rules() {
-	# execute the delete rules written onto a file then delete the file
-	[ -f ${RULE_LIST} ] || return 0
-
-	while read line
-	do
-		log "Deleting old classification rules"
-		exec_class_log classcfg -D ${line} -i ${BRIDGE_INTF}
-	done <${RULE_LIST}
-
-	local rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
-	while [ -n "${rule}" ]; do
-		exec_log iptables -t mangle ${rule}
-		rule=$(iptables -t mangle -S PREROUTING|grep -m 1 EXTMARK |sed 's/-A/-D/1')
-	done
-	sync
-
-	[ -f ${RULE_LIST} ] && rm ${RULE_LIST}
-}
-
-# classcfg -M local_dhcp -i lo -p udp --dport 67:67 --dport 68:68 -j mark --mark 1
-create_rule() {
-	local proto=$1; shift
-	local mac_addr=$1; shift
-	local mark=$1; shift
-	local ports=$1;
-	local cmd="";
-	# Rule name is uniqe, so we take hash of all the input as rule_name
-	local rule_name="$(echo ${mac_addr}${proto}${mark}${ports} |md5sum |head -c 30)"
-
-	cmd="-j mark --mark ${mark}";
-
-	if [ "${mac_addr}" != "none" ]; then
-		cmd="--smac ${mac_addr} ${cmd}";
-	fi
-
-	if [ "${proto}" != "icmp" ]; then
-		if [ "${ports}" != "none" ]; then
-			IFS=","
-			for port in ${ports};
-			do
-				cmd="--dport ${port}:${port} ${cmd}";
-			done
-			IFS=' '
-		fi
-	fi
-	if [ "${proto}" != "none" ]; then
-		cmd="-p ${proto} $cmd"
-	fi
-	cmd="-i ${BRIDGE_INTF} $cmd"
-	cmd="-A ${rule_name} $cmd"
-
-	# Store the rule_names for cleanup on reload
-	exec_class_log classcfg ${cmd}
-	[ $? -eq 0 ] && \
-		echo ${rule_name}  >> ${RULE_LIST}
-}
-
-manage_rule() {
-	local cfg="$1"
-	local priority macaddr proto port comment prio_num port_list ip ipmark
-
-	validate_rule_section "${1}" || {
-		log "Validation of section failed"
-		return 1;
-	}
-
-	prio_num=$(get_priority ${priority})
-	port_list=$(echo ${port}|sed 's/ /,/g')
-	ipmark=$(get_mark ${priority})
-	ip=$(get_ipaddress ${macaddr})
-
-	if [ -n "${prio_num}" ]; then
-		if [ "${proto}" == "none" -o "${proto}" == "tcpudp" ]; then
-			create_rule tcp ${macaddr} ${prio_num} ${port_list}
-			create_rule udp ${macaddr} ${prio_num} ${port_list}
-			if [ -n "${ip}" ]; then
-				create_ip_rule tcp ${ip} ${ipmark} ${port_list}
-				create_ip_rule udp ${ip} ${ipmark} ${port_list}
-			fi
-		else
-			create_rule ${proto} ${macaddr} ${prio_num} ${port_list}
-			if [ -n "${ip}" ]; then
-				create_ip_rule ${proto} ${ip} ${ipmark} ${port_list}
-			fi
-		fi
-	fi
-}
-
-reload_service() {
-	get_bridge_interface
-	map_client_entries
-	clear_existing_rules
-	config_load easy_qos
-	config_foreach manage_rule rule
-	clean_client_entries
-}
-
-start_service() {
-	[ -x /opt/intel/usr/sbin/classcfg ] || exit 0
-	reload_service
-	log "Easy QoS class installed"
-}
-
-service_triggers() {
-	procd_add_reload_trigger "easy_qos" "network"
-}
-

easy-soc-libs/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.4.35
+PKG_VERSION:=6.4.44
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=699744d5ae9e043715c260f9b58bbc18747895f9
+PKG_SOURCE_VERSION:=e4f811b7cd2836cdcce5ea0f97f515a317da5bc3
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/easy-soc-libs.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

endptmngr/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=94df920d39e8589c7ac7f5523bf372d48ef24c5e
+PKG_SOURCE_VERSION:=2390a3503990e04e33e8e448ad9dccc00f206908
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

evoice/Makefile

@@ -0,0 +1,65 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=evoice
+PKG_VERSION:=0.1
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
+PKG_SOURCE_VERSION:=c8d7ddd92be4ee5edb243112c590036ccc02f410
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_LICENSE:=MIT
+PKG_LICENSE_FILES:=LICENSE
+
+
+# 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
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Network
+	SUBMENU:=Telephony
+	TITLE:=Ensemble Voice
+	URL:=
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp
+endef
+
+define Package/$(PKG_NAME)/description
+	Ensemble Voice. A stand alone SIP VoIP application. 
+endef
+
+ifeq ($(LOCAL_DEV),1)
+# If you want to build the code from your own local repositiory enable
+# LOCAL_DEV and change the path below to your own git repository.
+define Build/Prepare
+	rsync -av /swdev/bide/evoice_clean/* $(PKG_BUILD_DIR)/
+endef
+endif
+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
+	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=SVrgBcmFxs LIF=cerder DBG=dbg
+	+$(MAKE) -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix TRG=libvoiceservice LIF=cerder DBG=dbg
+endef
+
+define Package/evoice/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/
+endef
+
+$(eval $(call BuildPackage,evoice))

evoice/files/etc/config/voice

@@ -0,0 +1,345 @@
+
+config SIPClient 'Client1'
+	option Enable '1'
+	option RegisterMode 'RFC3261'
+	option AuthUserName '51234'
+	option AuthPassword '51234'
+	option Network 'Network1'
+	option MaxSessions '5'
+	option RegisiterURI '51234@sip-proxy.iopsys.eu'
+	option E164Format '1'
+
+config SIPClient 'Client2'
+	option Enable '1'
+	option RegisterMode 'RFC3261'
+	option AuthUserName '51235'
+	option AuthPassword '51235'
+	option Network 'Network1'
+	option MaxSessions '5'
+	option RegisiterURI '51235@sip-proxy.iopsys.eu'
+	option E164Format '1'
+
+config SIPNetwork 'Network1'
+	option Enable '1'
+	option ProxyServer 'sip-proxy.iopsys.eu'
+	option ProxyServerPort '5060'
+	option ProxyServerTransport 'UDP'
+	option RegistrarServer 'sip-proxy.iopsys.eu'
+	option RegistrarServerPort '5060'
+	option RegistrarServerTransport 'UDP'
+	option RegistrationPeriod '3240'
+	option RegisterExpires '3600'
+	option UserAgentDomain ' '
+	option TimerRegistrationFailed '120'
+	option TimerT1 '500'
+	option VoIPProfile 'VoIPProfile1'
+	list CodecList '1CodecProfile1'
+	list CodecList '1CodecProfile2'
+	list CodecList '1CodecProfile3'
+	list CodecList '1CodecProfile5'
+	list CodecList '1CodecProfile4'
+
+config Capabilities 'Capabilities'
+	option FacilityActions 'CW_ACTIVE,CFU_ACTIVE'
+
+config CapabilitiesCodec 'Codec1'
+	option Codec 'G.711ALaw'
+
+config CapabilitiesCodec 'Codec2'
+	option Codec 'G.711MuLaw'
+
+config CapabilitiesCodec 'Codec3'
+	option Codec 'G.726'
+
+config CapabilitiesCodec 'Codec4'
+	option Codec 'G.722'
+
+config CapabilitiesCodec 'Codec5'
+	option Codec 'G.729'
+
+config CodecProfile '1CodecProfile1'
+	option Enable '1'
+	option Codec 'Codec1'
+	option PacketizationPeriod '20'
+	option SilenceSupression '1'
+
+config CodecProfile '1CodecProfile2'
+	option Enable '1'
+	option Codec 'Codec2'
+	option PacketizationPeriod '20'
+	option SilenceSupression '1'
+
+config CodecProfile '1CodecProfile3'
+	option Enable '1'
+	option Codec 'Codec3'
+	option PacketizationPeriod '20'
+	option SilenceSupression '0'
+
+config CodecProfile '1CodecProfile4'
+	option Enable '1'
+	option Codec 'Codec4'
+	option PacketizationPeriod '20'
+	option SilenceSupression '0'
+
+config CodecProfile '1CodecProfile5'
+	option Enable '1'
+	option Codec 'Codec5'
+	option PacketizationPeriod '20'
+	option SilenceSupression '0'
+
+config VoIPProfile 'VoIPProfile1'
+	option Enable '1'
+	option DTMFMethod 'RFC4733'
+	option RTP '1RTP'
+
+config RTP '1RTP'
+	option LocalPortMin '10020'
+	option LocalPortMax '10039'
+	option JitterBufferType 'Static'
+
+config FXXPorts 'POTS'
+	option Region 'SE'
+
+config FXSPorts 'FXS1'
+	option Enable '1'
+	option DialType 'Tone'
+	option TransmitGain '4'
+	option ReceiveGain '4'
+	option EchoCancellationEnable '1'
+
+config FXSPorts 'FXS2'
+	option Enable '1'
+	option DialType 'Tone'
+	option TransmitGain '4'
+	option ReceiveGain '4'
+	option EchoCancellationEnable '1'
+
+config Extension 'Extension1'
+	option Enable '1'
+	option ExtensionNumber '10#'
+	option Provider 'FXS1'
+	option CallingFeatures 'Set1'
+	option Name 'Phone 1'
+
+config Extension 'Extension2'
+	option Enable '1'
+	option ExtensionNumber '11#'
+	option Provider 'FXS2'
+	option CallingFeatures 'Set1'
+	option Name 'Phone 2'
+
+config Line 'Line1'
+	option Enable '1'
+	option Provider 'Client1'
+	option CallingFeatures 'Set1'
+
+config Line 'Line2'
+	option Enable '1'
+	option Provider 'Client2'
+	option CallingFeatures 'Set2'
+
+config IncomingMap 'IncomingMap1'
+	option Enable '1'
+	option Extension 'Extension1'
+	option Line 'Line1'
+
+config IncomingMap 'IncomingMap2'
+	option Enable '1'
+	option Extension 'Extension2'
+	option Line 'Line2'
+
+config IncomingMap 'IncomingMap3'
+	option Enable '1'
+	option Extension 'Extension2'
+	option Line 'Line1'
+
+config OutgoingMap 'OutgoingMap1'
+	option Enable '1'
+	option Extension 'Extension1'
+	option Line 'Line1'
+
+config OutgoingMap 'OutgoingMap2'
+	option Enable '1'
+	option Extension 'Extension2'
+	option Line 'Line2'
+
+config CallingFeatures 'Set1'
+	option CallerIDEnable '1'
+	option CallerIDNameEnable '1'
+	option CallForwardUnconditionalEnable '0'
+	option CallForwardUnconditionalNumber ' '
+	option CallForwardOnBusyEnable '0'
+	option CallForwardOnBusyNumber ' '
+	option CallForwardOnNoAnswerEnable '0'
+	option CallForwardOnNoAnswerRingTimeout '24'
+	option CallForwardOnNoAnswerNumber ' '
+	option CallTransferEnable '1'
+	option MWIEnable '1'
+	option VMWIEnable '1'
+	option LineMessagesWaiting '0'
+	option AnonymousCallRejectionEnable '0'
+	option AnonymousCallEnable '1'
+	option DoNotDisturbEnable '1'
+	option RepeatDialEnable '1'
+	option VoiceMailEnable '1'
+	option CallPickUpEnable '1'
+	option CCBSEnable '1'
+	option CallWaitingEnable '0'
+
+config CallingFeatures 'Set2'
+	option CallerIDEnable '1'
+	option CallerIDNameEnable '1'
+	option CallForwardUnconditionalEnable '0'
+	option CallForwardUnconditionalNumber ' '
+	option CallForwardOnBusyEnable '0'
+	option CallForwardOnBusyNumber ' '
+	option CallForwardOnNoAnswerEnable '0'
+	option CallForwardOnNoAnswerRingTimeout '24'
+	option CallForwardOnNoAnswerNumber ' '
+	option CallTransferEnable '1'
+	option MWIEnable '1'
+	option VMWIEnable '1'
+	option LineMessagesWaiting '0'
+	option AnonymousCallRejectionEnable '0'
+	option AnonymousCallEnable '1'
+	option DoNotDisturbEnable '1'
+	option RepeatDialEnable '1'
+	option VoiceMailEnable '1'
+	option CallPickUpEnable '1'
+	option CCBSEnable '1'
+	option CallWaitingEnable '1'
+
+config NumberingPlan 'NumberingPlan1'
+	option MinimumNumberOfDigits '1'
+	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 ' '
+	list PrefixList '3PrefixInfo1'
+	list PrefixList '3PrefixInfo2'
+	list PrefixList '3PrefixInfo3'
+	list PrefixList '3PrefixInfo4'
+	list PrefixList '3PrefixInfo5'
+	list PrefixList '3PrefixInfo6'
+	list PrefixList '3PrefixInfo7'
+	list PrefixList '3PrefixInfo8'
+	list PrefixList '3PrefixInfo9'
+
+config NumberingPlan 'NumberingPlan3'
+	option MinimumNumberOfDigits '5'
+	option MaximumNumberOfDigits '15'
+	option InterDigitTimerStd '2000'
+	option InterDigitTimerOpen '2000'
+	option TerminationDigit '#'
+	list PrefixList '4PrefixInfo1'
+
+config PrefixInfo '3PrefixInfo1'
+	option Enable '1'
+	option PrefixRange '*43#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CW_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo2'
+	option Enable '1'
+	option PrefixRange '#43#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CW_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo3'
+	option Enable '1'
+	option PrefixRange '*21*(X+)#'
+	option PrefixMinNumberOfDigits '9'
+	option PrefixMaxNumberOfDigits '9'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFU_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo4'
+	option Enable '1'
+	option PrefixRange '#21#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFU_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo5'
+	option Enable '1'
+	option PrefixRange '*67*(X+)#'
+	option PrefixMinNumberOfDigits '9'
+	option PrefixMaxNumberOfDigits '9'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFB_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo6'
+	option Enable '1'
+	option PrefixRange '#67#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFB_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo7'
+	option Enable '1'
+	option PrefixRange '*61*(X+(*X+)?)#'
+	option PrefixMinNumberOfDigits '15'
+	option PrefixMaxNumberOfDigits '15'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFNR_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo8'
+	option Enable '1'
+	option PrefixRange '#61#'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CFNR_DEACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '3PrefixInfo9'
+	option Enable '1'
+	option PrefixRange '*31*'
+	option PrefixMinNumberOfDigits '4'
+	option PrefixMaxNumberOfDigits '4'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'CA_ACTIVATE'
+	option FacilityActionArgument ' '
+
+config PrefixInfo '4PrefixInfo1'
+	option Enable '1'
+	option PrefixRange '110|112'
+	option PrefixMinNumberOfDigits '7'
+	option PrefixMaxNumberOfDigits '7'
+	option NumberOfDigitsToRemove '0'
+	option PosOfDigitsToRemove '0'
+	option FacilityAction 'X_IOPSYS_EU_EMERGENCY'
+	option FacilityActionArgument ' '
+
+config DialPlan 'X_IOPSYS_EU_InternalNumber1'
+	option RegExp '1X#'
+

evoice/files/etc/evoice/voicedm

@@ -0,0 +1,165 @@
+# RO (Main)
+config account 'map_board'
+   option HW_Has_Voice 'hw.board.hasVoice'
+   option HW_Has_DECT 'hw.board.hasDect'
+   option HW_Nr_Of_POTS_Ports 'hw.board.VoicePorts'
+   option ProductID 'device.deviceinfo.ModelName'
+   option I3_VERSION 'device.deviceinfo.SoftwareVersion'
+   option SerialNumber 'device.deviceinfo.SerialNumber'
+   
+config account 'map_pots'
+   option Country 'voice.POTS.Region'
+
+# Voice Service navigation paths
+# Not used to initialize internal configuration
+config navigation 'map_vs'
+   option Account 'voice.Client@.'
+   option Network 'voice.Client@.Network'
+   option VoIPProfile 'voice.Network@.VoIPProfile'
+   option CfAccount 'voice.Line@.CallingFeatures'
+   option CfPhone 'voice.Extension@.CallingFeatures'
+   option CodecList 'voice.Network@.CodecList'
+   option Codec 'voice.Codec@.Codec'
+   option OutgoingMapEnabled 'voice.OutgoingMap@.Enable'
+   option From_Phone 'voice.OutgoingMap@.Extension'
+   option Extension 'voice.Extension@.Provider'
+   option To_Account 'voice.OutgoingMap@.Line'
+   option Line 'voice.Line@.Provider'
+   option LineEnable 'voice.Line@.Enable'
+   option LineProvider 'voice.Line@.Provider'
+   option IncomingMapEnabled 'voice.IncomingMap@.Enable'
+   option From_Account 'voice.IncomingMap@.Line'
+   option To_Phone 'voice.IncomingMap@.Extension'
+   option ExtensionEnable 'voice.Extension@.Enable'
+   option ExtensionProvider 'voice.Extension@.Provider'
+
+# Registration for account A-Z is associate with SIP.Clienti.Enable    
+# All parameters in this table are written to internal configuration
+config account 'map_account'
+   option Registration 'voice.Client@.Enable'
+   option Display_Name ''
+   option PhoneNumber 'voice.Client@.RegisiterURI'
+   option Username 'voice.Client@.AuthUserName'
+   option Password 'voice.Client@.AuthPassword'
+   option SIP_Telephone_Syntax 'voice.Client@.E164Format'
+   option Device_Description 'voice.Client@.UserAgent'
+
+# Network stuff associated with an account.
+# All parameters in this table are written to internal configuration
+config network 'map_net'
+   option Enable 'voice.Network@.Enable'
+   option Registration_Server 'voice.Network@.RegistrarServer'
+   option Outbound_Proxy 'voice.Network@.ProxyServer'
+   option SIP_Port 'voice.Network@.RegistrarServerPort'
+   option SIP_Transport 'voice.Network@.RegistrarServerTransport'
+   option RegistrationPeriod 'voice.Network@.RegistrationPeriod'
+   option Registration_Interval 'voice.Network@.RegisterExpires'
+   option Reg_Failure_Interval 'voice.Network@.TimerRegistrationFailed'
+   option T1 'voice.Network@.TimerT1'
+   option UserAgentDomain 'voice.Network@.UserAgentDomain'
+
+config VoIPProfile 'map_voip'
+   option Enable 'voice.VoIPProfile@.Enable'
+   option DTMF_Method 'voice.VoIPProfile@.DTMFMethod'
+   option RTP 'voice.VoIPProfile@.RTP'
+
+config RTP 'map_rtp'
+   option RTP_Port_Base 'voice.@RTP@.LocalPortMin'
+   option RTP_Port_End 'voice.@RTP@.LocalPortMax'
+
+config codecs 'map_codec'
+   option Codec 'voice.CodecProfile@.Codec'
+   option enable 'voice.CodecProfile@.Enable'
+   option ptime 'voice.CodecProfile@.PacketizationPeriod'
+   option dtx 'voice.CodecProfile@.SilenceSupression'
+
+config extensioninfo 'map_ext'
+   option Enable 'voice.Extension@.Enable'
+   option Internal_Number_Phone 'voice.Extension@.ExtensionNumber'
+   option Display_Name_Phone 'voice.Extension@.Name'
+
+config capabilities 'map_capa'
+   option Call_Waiting_Enable 'voice.Capabilities@FacilityActions'
+   option Enable_Call_Diversion 'voice.Capabilities@FacilityActions'
+
+config cs_account 'map_set'
+   option BusyCallWait 'voice.Set@.CallWaitingEnable'
+   option AlwaysDivert 'voice.Set@.CallForwardUnconditionalEnable'
+   option CFU_Number 'voice.Set@.CallForwardUnconditionalNumber'
+   option BusyDivert 'voice.Set@.CallForwardOnBusyEnable'
+   option CFB_Number 'voice.Set@.CallForwardOnBusyNumber'
+   option NoAnswDivert 'voice.Set@.CallForwardOnNoAnswerEnable'
+   option CFNR_Number 'voice.Set@.CallForwardOnNoAnswerNumber'
+   option CFNR_Timeout 'voice.Set@.CallForwardOnNoAnswerRingTimeout'
+   option Enable_Call_Transfer 'voice.Set@.CallTransferEnable'
+   option AnonymousReject 'voice.Set@.AnonymousCallRejectionEnable'
+   option AllowAnonymousConf 'voice.Set@.AnonymousCallEnable'
+
+config cs_xvendor 'map_np_cs'
+   option np_sc_actCW 'voice.X_IOPSYS_EU_NpSc@.CW_ACT'
+   option np_sc_actCW_output 'voice.X_IOPSYS_EU_NpSc@.CW_OUT'
+   option np_sc_deactCW 'voice.X_IOPSYS_EU_NpSc@.CW_DEACT'
+   option np_sc_isactCW 'voice.X_IOPSYS_EU_NpSc@.CW_ISACT'
+   option np_sc_actCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_ACT'
+   option np_sc_actCFU_output 'voice.X_IOPSYS_EU_NpSc@.CFU_OUT'
+   option np_sc_deactCFU 'voice.X_IOPSYS_EU_NpSc@.CFU_DEACT'
+   option np_sc_actCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_ACT'
+   option np_sc_actCFB_output 'voice.X_IOPSYS_EU_NpSc@.CFB_OUT'
+   option np_sc_deactCFB 'voice.X_IOPSYS_EU_NpSc@.CFB_DEACT'
+   option np_sc_actCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_ACT'
+   option np_sc_actCFNR_output 'voice.X_IOPSYS_EU_NpSc@.CFNR_OUT'
+   option np_sc_deactCFNR 'voice.X_IOPSYS_EU_NpSc@.CFNR_DEACT'
+   option np_sc_actRA 'voice.X_IOPSYS_EU_NpSc@.RA_ACT'
+   option np_sc_deactRA 'voice.X_IOPSYS_EU_NpSc@.RA_DEACT'
+   option np_sc_actAC 'voice.X_IOPSYS_EU_NpSc@.AC_ACT'
+   option np_sc_deactAC 'voice.X_IOPSYS_EU_NpSc@.AC_DEACT'
+   option np_sc_actAA 'voice.X_IOPSYS_EU_NpSc@.AA_ACT'
+   option np_sc_deactAA 'voice.X_IOPSYS_EU_NpSc@.AA_DEACT'
+   option np_sc_actAD 'voice.X_IOPSYS_EU_NpSc@.AD_ACT'
+   option np_sc_actAD_output 'voice.X_IOPSYS_EU_NpSc@.AD_OUT'
+   option np_sc_deactAD 'voice.X_IOPSYS_EU_NpSc@.AD_DEACT'
+   option np_sc_actMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_ACT'
+   option np_sc_deactMWSplash 'voice.X_IOPSYS_EU_NpSc@.MWI_SPLASH_DEACT'
+   option np_sc_actMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_ACT'
+   option np_sc_deactMWTone 'voice.X_IOPSYS_EU_NpSc@.MWI_TONE_DEACT'
+   option np_sc_redial 'voice.X_IOPSYS_EU_NpSc@.REDIAL'
+   option np_sc_setMiscConf 'voice.X_IOPSYS_EU_NpSc@.SET_MISC'
+
+config cc_xvendor 'map_np_in'
+   option np_in_limitExp 'voice.X_IOPSYS_EU_InternalNumber@.RegExp'
+
+config cc_xvendor 'map_np_sh'
+   option sh_no_str 'voice.X_IOPSYS_EU_ShortNumber@.RegExp'
+
+config cc_xvendor 'map_np_eme'
+   option np_eme 'voice.X_IOPSYS_EU_EmergencyNumber@.RegExp'
+   option np_eme_out 'voice.X_IOPSYS_EU_EmergencyNumber@.OutStr'
+
+config cc_xvendor 'map_np_rn'
+   option np_rn 'voice.X_IOPSYS_EU_RegularNumber@.RegExp'
+   option np_rn_out 'voice.X_IOPSYS_EU_RegularNumber@.OutStr'
+   option np_rn_account 'voice.X_IOPSYS_EU_RegularNumber@.AccStr'
+
+config cc_xvendor 'map_np_bn'
+   option np_bn 'voice.X_IOPSYS_EU_BarredNumber@.RegExp'
+   option np_bn_out 'voice.X_IOPSYS_EU_BarredNumber@.OutStr'
+
+config TR104NumberingPlan 'map_np_tr'
+   option min_digits 'voice.NumberingPlan@.MinimumNumberOfDigits'
+   option max_digits 'voice.NumberingPlan@.MaximumNumberOfDigits'
+   option tmo_std 'voice.NumberingPlan@.InterDigitTimerStd'
+   option tmo_open 'voice.NumberingPlan@.InterDigitTimerOpen'
+   option term_digit 'voice.NumberingPlan@.TerminationDigit'
+   option prefix_list 'voice.NumberingPlan@.PrefixList'
+
+config TR104NumberingPlanPrefix 'map_np_pf'
+   option enable 'voice.@PrefixInfo@.Enable'
+   option range 'voice.@PrefixInfo@.PrefixRange'
+   option prefix_min_digits 'voice.@PrefixInfo@.PrefixMinNumberOfDigits'
+   option prefix_max_digits 'voice.@PrefixInfo@.PrefixMaxNumberOfDigits'
+   option remove_digits 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
+   option remove_pos 'voice.@PrefixInfo@.NumberOfDigitsToRemove'
+   option facility_act 'voice.@PrefixInfo@.FacilityAction'
+   option facility_arg 'voice.@PrefixInfo@.FacilityActionArgument'
+
+

evoice/files/etc/evoice/voicero

@@ -0,0 +1,56 @@
+config static_prm 'defaults'
+   option Print_Control '4'
+   option Print_UDP_Addr '192.168.1.3'
+   option Print_UDP_Port '60000'
+   option Verbosity 'Off'
+   option Failure_Log 'On'
+   option Message_Log 'Off'
+   option Method_Trace 'Off'
+   option Dial_Cache_Size '0'
+   option Reverse_Fax_Detection '0'
+   option DSP_24 '0'
+   option DSP_36 '0'
+   option DSP_43 '0'
+   option Swap_Name_Nr_CID '0'
+   option R_Button_Lower_Lim '100'
+   option R_Button_Upper_Lim '800'
+   option HookOn_Delay '0'
+   option SupportLDD '0'
+   option LDD_Min_Break_Time '41'
+   option LDD_Max_Break_Time '94'
+   option LDD_Percent_Break '55'
+   option Tone_On_Hangup '1'
+   option BusyTone_On_Hangup '1'
+   option Enable_Analouge_Conf '0'
+   option SIP_SessTmrEnable '0'
+   option PrackUsage '1'
+   option SIP_SupportedPath '0'
+   option IMS_Access_Network_Info ' '
+   option SIP_Reason_Protocol '0'
+   option SIP_Body_QOST '0'
+   option SIP_HistoryInfo '0'
+   option Customer_Spec2 '1'
+   option UTF8_Enable '0'
+   option RFC3325 '0'
+   option Accept_From_Registered '0'
+   option Polarity_Reversal '0'
+   option Closed_Dial_Plan '0'
+   option Netw_Dial '0'
+   option No_Answer_Tmo '180'
+   option UPnP_Enabled '0'
+   option NAT_Address ' '
+   option NAT_Address_From_SIP '0'
+   option HookOn_Transfer '0'
+   option Enable_Call_Transfer '1'
+   option Multiparty_Transp '0'
+   option Presence_Indication '0'
+   option Login_Note ' '
+   option Login_Description ' '
+   option Logout_Note ' '
+   option Logout_Description ' '
+   option Resolve_Every_Transaction '2'
+   option Translate_Plus '1'
+   option Mid_Call_Services '0'
+   option Account_Restriction '0'
+   option Answering_Machine_Enable '0'
+

evoice/files/etc/init.d/evoice

@@ -0,0 +1,22 @@
+#!/bin/sh /etc/rc.common
+
+START=68
+STOP=12
+
+USE_PROCD=1
+NAME=evoice
+
+start_service() {
+	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
+
+	procd_open_instance
+	procd_set_param command $NAME
+	procd_set_param respawn "5" "0" "3"
+	procd_close_instance
+}
+
+reload_service() {
+	stop
+	start
+}
+

fdtextract/Makefile

@@ -12,7 +12,7 @@ PKG_VERSION:=1.0
 
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/fdtextract.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7e013f0afa68378d38a6bdc9b0c5a342bd3dd0a5
+PKG_SOURCE_VERSION:=0ebaf1e7d1f09318ae75d0f475a25280742b790e
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=GPLv2
@@ -38,9 +38,6 @@ define Package/$(PKG_NAME)/description
 	Command to extract sub images from FIT images.
 endef
 
-MAKE_FLAGS += \
-	CFLAGS+="-Wall"
-
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 

icwmp/Config_cwmp.in

@@ -1,24 +1,30 @@
-if PACKAGE_icwmp
-
-menu "Configuration"
 choice
-	prompt "Select ACS sever"
-	default CWMP_ACS_MULTI
+       prompt "Select ACS sever"
+       default CWMP_ACS_MULTI
+       depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
 
 config CWMP_ACS_MULTI
 	bool "No specific ACS, follow standard"
 
 config CWMP_ACS_HDM
-	bool "HDM"
+	bool "Select HDM as ACS server"
 endchoice
 
 config CWMP_DEBUG
 	bool "Compile with debug options"
+	depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
 	default y
 
 config CWMP_DEVEL_DEBUG
-	bool "Compile with development debug options"
+	bool "Compile with development debug options (deprecated)"
+	depends on PACKAGE_icwmp || \
+		   PACKAGE_icwmp-openssl || \
+		   PACKAGE_icwmp-wolfssl || \
+		   PACKAGE_icwmp-mbedtls
 	default n
-endmenu
-endif
-

icwmp/Makefile

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

icwmp/files/etc/config/cwmp

@@ -16,10 +16,9 @@ config acs 'acs'
 	option ip_version '4'
 
 config cpe 'cpe'
-	option interface 'eth0.1'
 	option default_wan_interface 'wan'
 	option log_to_console 'disable'
-	option log_to_file 'enable'
+	option log_to_file 'disable'
 	# log_severity: INFO (Default)	
 	# log_severity possible configs: EMERG, ALERT, CRITIC ,ERROR, WARNING, NOTICE, INFO, DEBUG
 	option log_severity 'INFO'

icwmp/files/etc/firewall.cwmp

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

icwmp/files/etc/icwmpd/update.sh

@@ -1,17 +1,27 @@
 #!/bin/sh
 
 log() {
-	echo $@ |logger -t cwmp.update -p info
+	echo "$@" |logger -t cwmp.update -p info
 }
 
 handle_icwmp_update() {
-	local defwan=$(uci -q get cwmp.cpe.default_wan_interface)
-	local vendorspecinf=`ifstatus ${defwan} | jsonfilter -e "@.data.vendorspecinf"`
+	local defwan vendorspecinf update
 
-	log "Handling dhcp option value ${vendorspecinf}"
+	update="0"
+	defwan="$(uci -q get cwmp.cpe.default_wan_interface)"
+	vendorspecinf="$(ifstatus "${defwan}" | jsonfilter -e "@.data.vendorspecinf")"
+
+	log "Handling dhcp option value [${vendorspecinf}]"
 	[ -n "$vendorspecinf" ] && {
-		local url=""
-		local old_url="$(uci -q get cwmp.acs.dhcp_url)"
+		local url old_url
+		local prov_code old_prov_code
+		local min_wait_interval old_min_wait_interval
+		local retry_interval_multiplier old_retry_interval_multiplier
+
+		old_url="$(uci -q get cwmp.acs.dhcp_url)"
+		old_prov_code="$(uci -q get cwmp.cpe.dhcp_provisioning_code)"
+		old_min_wait_interval="$(uci -q get cwmp.acs.dhcp_retry_min_wait_interval)"
+		old_retry_interval_multiplier="$(uci -q get cwmp.acs.dhcp_retry_interval_multiplier)"
 
 		case $vendorspecinf in
 			http://*|https://*)
@@ -21,7 +31,16 @@ handle_icwmp_update() {
 				for optval in $vendorspecinf; do
 				        case $optval in
 				                1=*)
-				                        url="$(echo $optval | cut -d"=" -f2-)"
+				                        url="$(echo "$optval" | cut -d"=" -f2-)"
+				                ;;
+				                2=*)
+				                        prov_code="$(echo "$optval" | cut -d"=" -f2-)"
+				                ;;
+				                3=*)
+				                        min_wait_interval="$(echo "$optval" | cut -d"=" -f2-)"
+				                ;;
+				                4=*)
+				                        retry_interval_multiplier="$(echo "$optval" | cut -d"=" -f2-)"
 				                ;;
 				        esac
 				done
@@ -29,15 +48,46 @@ handle_icwmp_update() {
 		esac
 
 		if [ -n "$url" ]; then
-			log "## icwmp url[${old_url}] changed to [${url}]"
 			if [ "${url}" != "${old_url}" ]; then
-				log "Restarting icwmp url[${old_url}] changed to [${url}]"
+				log "## icwmp url[${old_url}] changed to [${url}]"
 				uci -q set cwmp.acs.dhcp_url="$url"
-				uci commit cwmp
-				ubus call uci commit '{"config":"cwmp"}'
+				update=1
+			fi
+		fi
+		if [ -n "$prov_code" ]; then
+			if [ "${prov_code}" != "${old_prov_code}" ]; then
+				log "## icwmp prov_code[${old_prov_code}] changed to [${prov_code}]"
+				uci -q set cwmp.cpe.dhcp_provisioning_code="$prov_code"
+				update=1
+			fi
+		fi
+		if [ -n "$min_wait_interval" ]; then
+			if [ "${min_wait_interval}" != "${old_min_wait_interval}" ]; then
+				log "## icwmp min_wait_interval[${old_min_wait_interval}] changed to [${min_wait_interval}]"
+				uci -q set cwmp.acs.dhcp_retry_min_wait_interval="$min_wait_interval"
+				update=1
+			fi
+		fi
+		if [ -n "$retry_interval_multiplier" ]; then
+			if [ "${retry_interval_multiplier}" != "${old_retry_interval_multiplier}" ]; then
+				log "## icwmp retry_interval_multiplier[${old_retry_interval_multiplier}] changed to [${retry_interval_multiplier}]"
+				uci -q set cwmp.acs.dhcp_retry_interval_multiplier="$retry_interval_multiplier"
+				update=1
 			fi
 		fi
 	}
+	if [ "${update}" -eq "1" ]; then
+		log "CWMP uci changes, reload cwmp with uci commit"
+		ubus call uci commit '{"config":"cwmp"}'
+	else
+		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

icwmp/files/etc/init.d/icwmpd

@@ -1,16 +1,16 @@
 #!/bin/sh /etc/rc.common
 # Copyright (C) 2015-2019 iopsys Software Solutions AB
 
-. /lib/functions.sh
-include /lib/network
-. /usr/share/libubox/jshn.sh
-
 START=99
-STOP=2
+STOP=00
 
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
 
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+include /lib/network
+
 log() {
 	echo "${@}"|logger -t cwmp.init -p info
 }
@@ -36,7 +36,7 @@ enable_dhcp_option43() {
 	fi
 
 	newreqopts="$reqopts 43"
-	if [ $proto == "dhcp" ]; then
+	if [ "${proto}" == "dhcp" ]; then
 		uci -q set network.$wan.reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
@@ -50,65 +50,47 @@ wait_for_resolvfile() {
 	local resolvfile="$(uci -q get dhcp.@dnsmasq[0].resolvfile)"
 	[ -n "$resolvfile" ] || return
 
-	while [ ! -f $resolvfile ]; do
+	while [ ! -f "$resolvfile" ]; do
 		sleep 1
-		[ $tm -ge $time ] && break
+		[ "$tm" -ge "$time" ] && break
 		tm=$((tm+1))
 	done
 }
 
-set_wan_interface() {
-	local wan_interface="${1}"
-	local l3_device=""
-
-	if [ -z "${wan_interface}" ]; then
-		return 0;
-	fi
-
-	json_load "$(ifstatus ${wan_interface})"
-	json_get_var l3_device l3_device
-	if [ -n "$l3_device" ]; then
-		uci -q set cwmp.cpe.interface="${l3_device}"
-		uci -q commit cwmp
-	fi
-}
-
 copy_cwmp_etc_files_to_varstate() {
-	if [ ! -f /var/state/cwmp ]
-	then
-		if [ -f /etc/icwmpd/cwmp ]
-		then
-			uci -q -c /etc/icwmpd delete cwmp.acs
-			uci -q -c /etc/icwmpd commit cwmp
-			cp /etc/icwmpd/cwmp /var/state/cwmp
-		else
-			touch /var/state/cwmp
-		fi
+	mkdir -p /var/run/icwmpd
+
+	if [ -f /etc/icwmpd/cwmp ]; then
+		uci -q -c /etc/icwmpd delete cwmp.acs
+		uci -q -c /etc/icwmpd commit cwmp
+		cp -f /etc/icwmpd/cwmp /var/state/cwmp
 	fi
 
-	mkdir -p /var/run/icwmpd
-	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]
-	then
-		mv /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd 2>/dev/null
+	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
+		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]
-	then
-		mv /etc/icwmpd/dm_enabled_notify /var/run/icwmpd 2>/dev/null
+
+	if [ -f /etc/icwmpd/dm_enabled_notify.xml ]; then
+		cp -f /etc/icwmpd/dm_enabled_notify /var/run/icwmpd/ 2>/dev/null
 	fi
 }
 
 copy_cwmp_varstate_files_to_etc() {
-	if [ -f /var/state/cwmp ]
-	then
-		cp /var/state/cwmp /etc/icwmpd 2>/dev/null
+	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]; then
+		cp -f /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /var/run/icwmpd/icwmpd_backup_session.xml ]
-	then
-		cp /var/run/icwmpd/icwmpd_backup_session.xml /etc/icwmpd 2>/dev/null
+
+	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]; then
+		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
 	fi
-	if [ -f /var/run/icwmpd/dm_enabled_notify.xml ]
-	then
-		cp /var/run/icwmpd/dm_enabled_notify /etc/icwmpd 2>/dev/null
+
+	if [ -f /var/state/cwmp ]; then
+		cp -f /var/state/cwmp /etc/icwmpd/
+	fi
+
+	# move the successful custom notify import marker to persistent storage
+	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
+		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
 	fi
 }
 
@@ -161,7 +143,7 @@ validate_defaults() {
 		return 1;
 	}
 
-	[ -z "${url}" -a -z "${dhcp_url}" ] && {
+	[ -z "${url}" ] && [ -z "${dhcp_url}" ] && {
 		log "ACS url is empty can't start"
 		return 1;
 	}
@@ -171,31 +153,9 @@ validate_defaults() {
 		return 1;
 	}
 
-	[ -z "${default_wan_interface}" ] && {
-		log "Wan interface is empty"
-		return 1;
-	}
-
 	return 0;
 }
 
-boot() {
-	local dhcp_url=""
-	local discovery="1"
-
-	config_load cwmp
-	config_get_bool dhcp_discovery acs dhcp_discovery 1
-	config_get dhcp_url acs dhcp_url ""
-
-	if [ "${dhcp_discovery}" == "enable" -o "${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
@@ -206,16 +166,13 @@ start_service() {
 	config_get dhcp_discovery acs dhcp_discovery
 	config_get wan_interface cpe default_wan_interface "wan"
 
-	if [ "$enable_cwmp" = "0" -o "$enable_cwmp" = "false" ]; then
+	if [ "$enable_cwmp" = "0" ] || [ "$enable_cwmp" = "false" ]; then
 		log "CWMP is not enabled"
 		return 0
 	fi
 
-	# Set wan interface if not configured
-	set_wan_interface "${wan_interface}"
-
 	# Set dhcp option 43 if dhcp discovery enabled
-	if [ "${dhcp_discovery}" == "enable" -o "${dhcp_discovery}" == "1" ]; then
+	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
 		enable_dhcp_option43 "${wan_interface}"
 	fi
 
@@ -223,34 +180,38 @@ 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
 
-	# Copy backup data so that if it restart latter on it gets the info
-	copy_cwmp_etc_files_to_varstate
-
 	validate_defaults || {
 		log "Validation of defaults failed"
 		return 1;
 	}
 
+	# Copy backup data so that if it restart latter on it gets the info
+	copy_cwmp_etc_files_to_varstate
+
 	procd_open_instance icwmp
 	procd_set_param command "$PROG"
 	procd_append_param command -b
 	procd_set_param respawn \
-		${respawn_threshold:-5} \
-		${respawn_timeout:-10} ${respawn_retry:-3}
+		"${respawn_threshold:-5}" \
+		"${respawn_timeout:-10}" "${respawn_retry:-3}"
 
 	procd_set_param watch network.interface
 	procd_close_instance
 }
 
-stop_service()
+service_stopped()
 {
 	copy_cwmp_varstate_files_to_etc
 }
 
 reload_service() {
-	log "Restarting CWMP client"
-	stop
-	start
+	log "Reloading CWMP client"
+	ubus -t 1 call tr069 command '{"command":"reload"}'
+	if [ "$?" -ne "0" ]; then
+		log "Restarting CWMP client"
+		stop
+		start
+	fi
 }
 
 service_triggers() {

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.6.16
+PKG_VERSION:=4.7.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=be0d54ed751ef697e0cd5cf1393dc6932672d8ef
+PKG_SOURCE_VERSION:=8de4d6cab56f2107e89728187e8e72f95f0e2afa
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iop/Config.in

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

iop/Makefile

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

iop/config

@@ -51,7 +51,7 @@ CONFIG_PACKAGE_wifimngr=y
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
 CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_wfadatad=y
+# CONFIG_PACKAGE_wfadatad is not set
 CONFIG_PACKAGE_wfadatad-collector=y
 
 # Network #
@@ -65,12 +65,12 @@ CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
 
 # TR-x69 #
-CONFIG_PACKAGE_uspd=y
-CONFIG_PACKAGE_icwmp=y
+CONFIG_PACKAGE_uspd-mbedtls=y
+CONFIG_PACKAGE_icwmp-mbedtls=y
 CONFIG_PACKAGE_obuspa=y
-CONFIG_PACKAGE_bulkdata=y
+CONFIG_PACKAGE_bulkdata-mbedtls=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc=m
+CONFIG_PACKAGE_stunc-mbedtls=m
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_twamp=m
 CONFIG_PACKAGE_udpechoserver=m
@@ -118,7 +118,6 @@ CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_miniupnpd=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
-CONFIG_PACKAGE_mwan3=y
 CONFIG_PACKAGE_nginx=y
 CONFIG_PACKAGE_openvpn-easy-rsa=y
 CONFIG_PACKAGE_openvpn-openssl=y

iop/scripts/feeds_update.sh

@@ -32,8 +32,7 @@ function feeds_update {
     fi
 
     # targets need to be installed explicitly
-    targets="iopsys-brcm63xx-arm iopsys-ramips intel_mips iopsys-x86 iopsys-armvirt iopsys-bcm27xx iopsys-mediatek iopsys-econet"
-    for target in $targets
+    for target in $(ls ./feeds/targets)
     do
 	rm -f target/linux/$target
 	./scripts/feeds install -p targets $target

map-agent/Config.in

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

map-agent/Makefile

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

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

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

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

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

map-agent/files/lib/wifi/multiap

@@ -55,7 +55,7 @@ get_type_by_section() {
 	echo "$(type_to_multi_ap $type)"
 }
 
-brcm_sync_credentials() {
+sync_credentials() {
 	bands=""
 	json_init
 	mapagent_process_fh() {
@@ -160,7 +160,7 @@ brcm_sync_credentials() {
 	json_cleanup
 }
 
-brcm_write_credentials() {
+write_credentials() {
 	config_load mapagent
 
 	mapagent_apply_wireless() {
@@ -250,7 +250,7 @@ brcm_write_credentials() {
 	uci commit wireless
 }
 
-brcm_set_network() {
+set_network() {
 	local ifname=$1
 	local num=$2
 	local bssid=$3
@@ -293,7 +293,13 @@ write_bsta_config() {
 
 			[ "$bsta" == "$ifname" ] || return
 			#echo setting diff = $diff > /dev/console
+			old_bssid="$(uci -q get wireless.${section}.bssid)"
+
+			[ "$old_bssid" == "$bssid" ] && break
+
 			uci -q set wireless.${section}.bssid=$bssid
+			wpa_cli -i "$bsta" set_n 0 bssid $bssid
+			wpa_cli -i "$bsta" save_config
 			echo 1
 		}
 		config_load wireless
@@ -351,13 +357,13 @@ write_bsta_config() {
 	#echo result diff = $diff > /dev/console
 	[ "$diff" == "1" ] && {
 		config_foreach mapagent_apply_bssid_same_band bsta
-		ubus call uci commit '{"config":"wireless"}'
+		#ubus call uci commit '{"config":"wireless"}'
 		#echo reloading wireless > /dev/console
 	}
 
 }
 
-brcm_teardown_iface() {
+teardown_iface() {
 	config_load mapagent
 
 	local iface=$1
@@ -410,7 +416,7 @@ brcm_teardown_iface() {
 	uci commit mapagent
 }
 
-brcm_bsta_to_wireless() {
+bsta_to_wireless() {
 	config_load mapagent
 
 	mapagent_find_lowest_prio_onboarded() {
@@ -464,7 +470,7 @@ brcm_bsta_to_wireless() {
 				uci -q set wireless.${section}.key="$key"
 				uci -q set wireless.${section}.encryption=$encryption
 				uci -q set wireless.${section}.bssid="$bssid"
-				#uci -q set wireless.${section}.disabled=$disabled
+				uci -q set wireless.${section}.default_disabled='0'
 
 				[ "$disabled" != "1" ] && return
 				wpa_cli -i "$bsta" disconnect > /dev/null 2>&1
@@ -528,6 +534,7 @@ brcm_bsta_to_wireless() {
 	diff=$(config_foreach mapagent_bsta_to_wireless bsta)
 
 #	[ "$diff" != "" ] && {
+
 		ubus call uci commit '{"config":"wireless"}'
 #	}
 }
@@ -622,21 +629,37 @@ sync_mapcontroller_from_wireless() {
 }
 
 bsta_scan_on_enabled() {
-	config_load mapagent
+	local onboarded_bands=""
+
+	mapagent_onboarded_bands() {
+		config_get band $1 band
+		config_get onboarded $1 onboarded "0"
+
+		[ "$onboarded" = "0" ] && return
+
+		onboarded_bands="$onboarded_bands $band"
+	}
 
 	mapagent_enable_bk() {
 		config_get ifname $1 ifname
+		config_get band $1 band
 		config_get enabled $1 enabled
 
-		echo ifname $ifname enabled $enabled
-
 		[ "$enabled" = "0" ] && return
 
-		wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
-		wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
-		wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+		for onboarded_band in $onboarded_bands
+		do
+			[ "$onboarded_band" != "$band" ] && continue
+
+			logger -t multiap "bsta_scan_on_enabled $ifname $band"
+			wpa_cli -i "$ifname" enable_network 0 > /dev/null 2>&1
+			wpa_cli -i "$ifname" reconnect > /dev/null 2>&1
+			wpa_cli -i "$ifname" save_config > /dev/null 2>&1
+		done
 	}
 
+	config_load mapagent
+	config_foreach mapagent_onboarded_bands bsta
 	config_foreach mapagent_enable_bk bsta
 }
 
@@ -771,26 +794,45 @@ set_uplink() {
 	json_add_string "macaddr" "$hwaddr"
 	json_dump > "$MAPFILE"
 	json_cleanup
+
+	config_load mapagent
+
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
+
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		ubus call map.agent toggle_fh '{"enable":true, "prevent_island":true, "ifname":"all"}'
+	fi
+
 }
 
 unset_uplink() {
-	rm "$MAPFILE" > /dev/null 2>&1
+	local type=${1:-wifi}
+
+	config_load mapagent
+
+	island_prevention="$(uci -q get mapagent.agent.island_prevention)"
+
+	if [ "$island_prevention" = "1" -a "$type" = "eth" ]; then
+		ubus call map.agent toggle_fh '{"enable":false, "prevent_island":true, "ifname":"all"}'
+	fi
+
+	rm -f "$MAPFILE" > /dev/null 2>&1
 }
 
 func=$1
 shift
 
 case "$func" in
-	wireless_teardown) brcm_wireless_teardown;;
-	setup_network) brcm_setup_network;;
-	setup_wireless) brcm_setup_wireless;;
-	write_credentials) brcm_write_credentials;;
-	sync_credentials) brcm_sync_credentials;;
+	wireless_teardown) wireless_teardown;;
+	setup_network) setup_network;;
+	setup_wireless) setup_wireless;;
+	write_credentials) write_credentials;;
+	sync_credentials) sync_credentials;;
 	bsta_steer) bsta_steer $@;;
-	set_network) brcm_set_network $@;;
+	set_network) set_network $@;;
 	write_bsta_config) write_bsta_config $@;;
-	teardown_iface) brcm_teardown_iface $@;;
-	bsta_to_wireless) brcm_bsta_to_wireless $@;;
+	teardown_iface) teardown_iface $@;;
+	bsta_to_wireless) bsta_to_wireless $@;;
 	sync_mapcontroller_from_wireless) sync_mapcontroller_from_wireless $@;;
 	ts) ts_sub $@;;
 	bsta_enable_all) bsta_enable_all $@;;

map-controller/Makefile

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

map-controller/files/etc/init.d/mapcontroller

@@ -39,8 +39,8 @@ validate_ap_section() {
 	uci_validate_section mapcontroller $section "${1}" \
 			'band:or("2", "5")' \
 			'ssid:string' \
-			'encryption:or("sae-mixed", "sae", "psk-mixed", "psk2", "psk",
-						   "wpa-mixed", "wpa2", "wpa", "none", "open")' \
+			'encryption:or("sae", "sae+aes", "psk2",
+				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
 			'key:string' \
 			'vid:range(1,65535):1' \
 			'type:or("backhaul", "fronthaul", "combined")' \

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=3.2.4
+PKG_VERSION:=3.2.12
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=55b4bae9338ffa19255756c20626228ca4f30ee2
+PKG_SOURCE_VERSION:=dc59897b52ed1406175cd9314759c00aa12ed0a4
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

netmode/files/etc/init.d/netmode

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

obuspa/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=5.0.0.3
+PKG_VERSION:=5.0.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=9d957848b9ac1d381149ce43b59775c21b1e24e0
+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 +libcurl +libsqlite3 +libubox +libubus +uspd +libmosquitto-ssl +libwebsockets-openssl
+  DEPENDS:=+libopenssl +libuci +libblobmsg-json +libcurl +libsqlite3 +libubox +libubus +libmosquitto-ssl +libwebsockets-openssl
 endef
 
 define Package/obuspa/description
@@ -96,11 +96,13 @@ define Package/obuspa/install
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/obuspa
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/obuspa $(1)/usr/sbin/
 	$(INSTALL_BIN) ./files/etc/init.d/obuspa $(1)/etc/init.d/
 	$(INSTALL_DATA) ./files/etc/config/obuspa $(1)/etc/config/
 	$(INSTALL_DATA) ./files/etc/obuspa/roles.json $(1)/etc/obuspa/roles.json
 	$(INSTALL_DATA) ./files/etc/obuspa/dmcaching_exclude.json $(1)/etc/obuspa/dmcaching_exclude.json
+	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/init.d/obuspa

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

peripheral_manager/Makefile

@@ -12,7 +12,7 @@ PKG_NAME:=peripheral_manager
 PKG_VERSION:=1.0.6
 PKG_RELEASE:=1
 
-PKG_SOURCE_VERSION:=15ba90f01914113e7c5e8f8a6df6279c882e8265
+PKG_SOURCE_VERSION:=21522c2003b8c61904acc61ff97e54fc9b0c3c92
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/peripheral-manager
 

peripheral_manager/files/etc/init.d/ledmngr

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

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

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

qosmngr/files/etc/init.d/qos

@@ -28,11 +28,6 @@ boot() {
 	start
 }
 
-service_running() {
-	setup_qos
-	start
-}
-
 service_triggers() {
 	procd_add_reload_trigger qos
 }

qosmngr/files/lib/qos/broadcom.sh

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

stunc/Makefile

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

stunc/files/etc/init.d/stunc

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

sulu/Makefile

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

swmodd/Makefile

@@ -6,12 +6,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.1.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=f169ab825295e1e0bb414c7bbc921fab2ef9ccfa
+PKG_SOURCE_VERSION:=e484557ea7ede6d8ff439081deebd763d4952851
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/swmodd.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -41,7 +41,8 @@ endef
 
 TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include \
-	-D_GNU_SOURCE
+	-D_GNU_SOURCE \
+	-Wall -Werror
 
 ifeq ($(CONFIG_PACKAGE_liblxc),y)
 MAKE_FLAGS += \

twamp/Makefile

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

uboot/Makefile

@@ -4,9 +4,6 @@
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# intel_mips branch:
-# iopsys 4.x: iop_grx-ugw-8.1.1-ga
-# iopsys 5.x: iop_grx-ugw-8.4.1.30 
 
 include $(TOPDIR)/rules.mk
 
@@ -15,15 +12,12 @@ PKG_VERSION:=2016.08
 
 PKG_SOURCE_PROTO:=git
 
-ifdef CONFIG_TARGET_intel_mips
-PKG_SOURCE_URL:=https://dev.iopsys.eu/intel/uboot.git
-PKG_SOURCE_VERSION:=feed838bd1bfeeb57a9afb93b4d704971f423d92
-else ifdef CONFIG_TARGET_iopsys_econet
+ifdef CONFIG_TARGET_iopsys_econet
 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:=826af23a7723ee05dc9bc023d12a83f44aa649f4
+PKG_SOURCE_VERSION:=4cd73fe5db0ebfc1242ca9c85c14d7f0718eaf73
 endif
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
@@ -65,41 +59,9 @@ define uboot/en7562
   UBOOT_IMG:=u-boot-nand.bin
 endef
 
-define uboot/sdx810_ap
-  TITLE:=U-Boot for the sdx810_ap
-  DEPENDS:=@TARGET_iopsys_ramips
-  PKG_RELEASE:=6
-endef
-
-define uboot/grx500
-  TITLE:=U-Boot for the grx
-  UBOOT_IMG:=u-boot-nand.bin
-  DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=12
-endef
-
-# obsolete: no longer supported
-define uboot/grx500_speedport_smart3
-  TITLE:=U-Boot for the Speedport Smart3
-  UBOOT_IMG:=u-boot-nand.bin
-  DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=7
-endef
-
-define uboot/grx500_norrland
-  TITLE:=U-Boot for Norrland Board
-  UBOOT_IMG:=u-boot-nand.bin
-  DEPENDS:=@TARGET_intel_mips
-  PKG_RELEASE:=17
-endef
-
 UBOOTS := \
 	ex400 \
-	en7562 \
-	sdx810_ap \
-	grx500 \
-	grx500_speedport_smart3 \
-	grx500_norrland
+	en7562
 
 define Package/uboot/template
 define Package/uboot-$(1)
@@ -145,8 +107,6 @@ endef
 define Package/uboot/install/default
 	$(INSTALL_DIR) $$(1)/lib/upgrade
 	$(CP) ./files/uboot-upgrade $$(1)/lib/upgrade/
-	$(if $(CONFIG_TARGET_intel_mips), ,$(INSTALL_DIR) $$(1)/etc/init.d)
-	$(if $(CONFIG_TARGET_intel_mips), ,$(CP) ./files/uboot $$(1)/etc/init.d/)
 
 	$(INSTALL_DIR) $(BIN_DIR)/$(TARGET)
 	$(CP) \

udpechoserver/Makefile

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

uspd/Config.in

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

uspd/Makefile

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

wfadatad/Config.in

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

wfadatad/Makefile

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

wifimngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=14.0.6
+PKG_VERSION:=14.0.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a248c1508bab5f30297d5b9c12719a90a86d81aa
+PKG_SOURCE_VERSION:=981ce51b2f135926d6e9135772dcd43d73c39b64
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz

xmppc/Makefile

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