hostmngr: handled host access control timing

Update documentation after phonebook modifications

bbf/Makefile

@@ -1,179 +0,0 @@
-#
-# Copyright (C) 2022 IOPSYS
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=libbbfdm
-PKG_VERSION:=6.9.3
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=afec1eba79cbe70192a066f4ac007d3a071a14c9
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-PKG_RELEASE=$(PKG_SOURCE_VERSION)
-
-PKG_LICENSE:=LGPL-2.1
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/cmake.mk
-
-define Package/libbbf_api
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
-  ABI_VERSION:=1.0
-endef
-
-define Package/libbbfdm/default
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libtrace +libcurl +libbbf_api
-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
-	source "$(SOURCE)/Config_bbfdm.in"
-endef
-
-define Package/libbbf_api/description
- Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
-endef
-
-define Package/libbbfdm/description
- Library contains the data model tree. It includes TR181, TR104 and TR143 data models
-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
-
-CMAKE_OPTIONS += \
-	-DBBF_TR181=ON
-
-ifeq ($(CONFIG_BBF_TR104),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR104=ON
-endif
-
-ifeq ($(CONFIG_BBF_TR143),y)
-CMAKE_OPTIONS += \
-	-DBBF_TR143=ON
-endif
-
-ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
-CMAKE_OPTIONS += \
-	-DBBF_VENDOR_EXTENSION=ON
-
-CMAKE_OPTIONS += \
-	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
-	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
-	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
-
-endif ##CONFIG_BBF_VENDOR_EXTENSION
-
-ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
-CMAKE_OPTIONS += \
-	-DBBF_JSON_PLUGIN=ON
-endif
-
-ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
-CMAKE_OPTIONS += \
-	-DBBF_DOTSO_PLUGIN=ON
-endif
-
-ifeq ($(BUILD_VARIANT),openssl)
-CMAKE_OPTIONS += -DWITH_OPENSSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),wolfssl)
-CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
-endif
-
-ifeq ($(BUILD_VARIANT),mbedtls)
-CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
-endif
-
-define Package/libbbf_api/install
-	$(INSTALL_DIR) $(1)/lib
-endef
-
-define Package/libbbfdm/default/install
-	$(INSTALL_DIR) $(1)/lib
-	$(INSTALL_DIR) $(1)/usr/share/bbfdm
-	$(INSTALL_DIR) $(1)/etc/bbfdm
-	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
-endef
-
-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
-	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
-	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/include/*.h $(1)/usr/include/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/*.h $(1)/usr/include/libbbfdm/
-	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbf_api/*.h $(1)/usr/include/libbbf_api/
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/usr/lib/
-endef
-
-$(eval $(call BuildPackage,libbbf_api))
-$(eval $(call BuildPackage,libbbfdm))
-$(eval $(call BuildPackage,libbbfdm-openssl))
-$(eval $(call BuildPackage,libbbfdm-wolfssl))
-$(eval $(call BuildPackage,libbbfdm-mbedtls))

bbfdm/Config_bbfdm.in

@@ -18,6 +18,10 @@ config BBF_TR143
 	bool "Enable TR-143 Data Model Support"
 	default y
 
+config BBF_TR471
+	bool "Enable TR-471 Data Model Support"
+	default y
+
 config BBFDM_ENABLE_JSON_PLUGIN
 	bool "Enable json plugin to extend datamodel"
 	default y

bbfdm/Makefile

@@ -0,0 +1,265 @@
+#
+# Copyright (C) 2023 IOPSYS
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=bbfdm
+PKG_VERSION:=1.1.11
+
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
+PKG_SOURCE_VERSION:=16a8466c8d133e02b2bc322318cda2d51d670125
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/cmake.mk
+
+define Package/libbbfdm-api
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=BBF datamodel library, provides API to extend datamodel using DotSO plugins
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c
+  ABI_VERSION:=1.0
+endef
+
+define Package/libbbfdm/default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Library for broadband forum data model support
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
+	    +BBF_TR471:obudpst
+endef
+
+define Package/libbbfdm
+  $(Package/libbbfdm/default)
+  TITLE += (default)
+  VARIANT:=default
+  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  DEFAULT_VARIANT:=1
+endef
+
+define Package/libbbfdm-mbedtls
+  $(Package/libbbfdm/default)
+  TITLE += (mbedtls)
+  DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
+  VARIANT:=mbedtls
+  CONFLICTS := libbbfdm libbbfdm-openssl libbbfdm-wolfssl
+endef
+
+define Package/libbbfdm-openssl
+  $(Package/libbbfdm/default)
+  TITLE += (openssl)
+  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  VARIANT:=openssl
+  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-wolfssl
+endef
+
+define Package/libbbfdm-wolfssl
+  $(Package/libbbfdm/default)
+  TITLE += (wolfssl)
+  DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
+  VARIANT:=wolfssl
+  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-openssl
+endef
+
+define Package/bbfdmd
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Datamodel ubus backend
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libbbfdm-api +PACKAGE_libbbfdm-mbedtls:libbbfdm-mbedtls \
+		   +PACKAGE_libbbfdm-openssl:libbbfdm-openssl +PACKAGE_libbbfdm-wolfssl:libbbfdm-wolfssl \
+		   +PACKAGE_libbbfdm:libbbfdm
+endef
+
+define Package/userinterface
+  SECTION:=utils
+  CATEGORY:=Utilities
+  SUBMENU:=TRx69
+  TITLE:=Package to add Device.UserInterface. datamodel support
+endef
+
+define Package/userinterface/description
+  Package to add Device.UserInterface. datamodel support
+endef
+
+define Package/libbbfdm/config
+	source "$(SOURCE)/Config_bbfdm.in"
+endef
+
+define Package/libbbfdm-api/description
+ Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
+endef
+
+define Package/libbbfdm/description
+ Library contains the data model tree. It includes TR181, TR104 and TR143 data models
+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
+
+CMAKE_OPTIONS += \
+	-DBBF_TR181=ON
+	-DBBF_WIFI_DATAELEMENTS=ON
+
+ifeq ($(CONFIG_BBF_TR104),y)
+CMAKE_OPTIONS += \
+	-DBBF_TR104=ON
+endif
+
+ifeq ($(CONFIG_BBF_TR143),y)
+CMAKE_OPTIONS += \
+	-DBBF_TR143=ON
+endif
+
+ifeq ($(CONFIG_BBF_TR471),y)
+CMAKE_OPTIONS += \
+	-DBBF_TR471=ON
+endif
+
+ifeq ($(CONFIG_BBF_VENDOR_EXTENSION),y)
+CMAKE_OPTIONS += \
+	-DBBF_VENDOR_EXTENSION=ON
+
+CMAKE_OPTIONS += \
+	-DBBF_VENDOR_LIST:String="$(CONFIG_BBF_VENDOR_LIST)" \
+	-DBBF_VENDOR_PREFIX:String="$(CONFIG_BBF_VENDOR_PREFIX)" \
+	-DBBF_MAX_OBJECT_INSTANCES:Integer=$(CONFIG_BBF_MAX_OBJECT_INSTANCES)
+
+endif ##CONFIG_BBF_VENDOR_EXTENSION
+
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+CMAKE_OPTIONS += \
+	-DBBF_JSON_PLUGIN=ON
+endif
+
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+CMAKE_OPTIONS += \
+	-DBBF_DOTSO_PLUGIN=ON
+endif
+
+ifeq ($(BUILD_VARIANT),default)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),openssl)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),wolfssl)
+CMAKE_OPTIONS += -DWITH_WOLFSSL=ON
+endif
+
+ifeq ($(BUILD_VARIANT),mbedtls)
+CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
+endif
+
+ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
+CMAKE_OPTIONS += \
+	-DBBFDMD_MAX_MSG_LEN:Integer=10485760
+endif
+
+define Package/libbbfdm-api/install
+	$(INSTALL_DIR) $(1)/lib
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm-api/libbbfdm-api.so $(1)/lib/
+endef
+
+define Package/libbbfdm/default/install
+	$(INSTALL_DIR) $(1)/lib
+	$(INSTALL_DIR) $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/dmmap
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(CP) $(PKG_BUILD_DIR)/libbbfdm/libbbfdm.so $(1)/lib/
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
+ifeq ($(CONFIG_BBF_TR143),y)
+	$(INSTALL_DIR) $(1)/usr/share/bbfdm
+	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libbbfdm/scripts/* $(1)/usr/share/bbfdm
+	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+endif
+ifeq ($(CONFIG_BBFDM_ENABLE_JSON_PLUGIN),y)
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+endif
+ifeq ($(CONFIG_BBFDM_ENABLE_DOTSO_PLUGIN),y)
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+endif
+endef
+
+define Package/libbbfdm/default/prerm
+	#!/bin/sh
+	rm -rf /etc/bbfdm/dmmap/*
+	exit 0
+endef
+
+define Package/bbfdmd/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/bbfdm
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
+	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/src/bbfdmd $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/json/input.json $(1)/etc/bbfdm/
+endef
+
+define Package/userinterface/install
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/etc/uci-defaults
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
+	$(INSTALL_DATA) ./files/etc/config/userinterface $(1)/etc/config/userinterface
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/userinterface $(1)/lib/upgrade/keep.d/userinterface
+	$(INSTALL_BIN) ./files/etc/init.d/userinterface $(1)/etc/init.d/userinterface
+	$(INSTALL_BIN) ./files/etc/uci-defaults/93-userinterface-firewall $(1)/etc/uci-defaults/93-userinterface-firewall
+	$(INSTALL_BIN) ./files/etc/uci-defaults/94-userinterface-json $(1)/etc/uci-defaults/94-userinterface-json
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
+	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
+	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
+endef
+
+Package/libbbfdm/prerm = $(Package/libbbfdm/default/prerm)
+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/install = $(Package/libbbfdm/default/install)
+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
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm
+	$(INSTALL_DIR) $(1)/usr/include/libbbfdm-api
+	$(INSTALL_DIR) $(1)/usr/include/libbbf_api
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/*.h $(1)/usr/include/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/tr181/device.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm/dmtree/vendor/vendor.h $(1)/usr/include/libbbfdm/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbfdm-api/
+	# Work around for backward compatibility
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/*.h $(1)/usr/include/libbbf_api/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libbbfdm-api/include/libbbfdm_api.h $(1)/usr/include/libbbf_api.h
+endef
+
+$(eval $(call BuildPackage,libbbfdm-api))
+$(eval $(call BuildPackage,libbbfdm))
+$(eval $(call BuildPackage,libbbfdm-openssl))
+$(eval $(call BuildPackage,libbbfdm-wolfssl))
+$(eval $(call BuildPackage,libbbfdm-mbedtls))
+$(eval $(call BuildPackage,bbfdmd))
+
+$(eval $(call BuildPackage,userinterface))

bbfdm/files/etc/config/bbfdm

@@ -0,0 +1,7 @@
+
+config bbfdmd 'bbfdmd'
+	option enabled '1'
+	option loglevel '1'
+	option refresh_time '0'
+	option transaction_timeout '30'
+

bbfdm/files/etc/config/userinterface

@@ -0,0 +1,3 @@
+config userinterface 'global'
+	option enable '1'
+

bbfdm/files/etc/firewall.portmap

@@ -0,0 +1,74 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+log() {
+	echo "${@}"|logger -t firewall.dnat -p info
+}
+
+exec_cmd() {
+	if ! eval "$*"; then
+		log "Failed to run [$*]"
+	fi
+}
+
+reorder_dnat_rules() {
+	nat_chains=$(iptables -t nat -S | grep -E "^-N zone[a-zA-Z0-9_]+prerouting$" | cut -d' ' -f 2)
+
+	for chain in ${nat_chains}; do
+		# Collect empty remote host & empty dport rules
+		EMPTY_HOST_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep -v "\-s ")
+		if [ -n "${EMPTY_HOST_PORT}" ]; then
+			echo "${EMPTY_HOST_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
+
+		# Collect empty remote host but non empty dport rules
+		EMPTY_HOST=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep "\-\-dport" | grep -v "\-s ")
+		if [ -n "${EMPTY_HOST}" ]; then
+			echo "${EMPTY_HOST}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
+
+		# Collect non empty remote host but empty dport rules
+		EMPTY_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep "\-s ")
+		if [ -n "${EMPTY_PORT}" ]; then
+			echo "${EMPTY_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
+
+		# Now add rules as per datamodel precedence shown below
+		## Non empty remote host, empty dport
+		## empty remote host, non empty dport
+		## empty remote host, empty dport
+		if [ -n "${EMPTY_PORT}" ]; then
+			echo "${EMPTY_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
+
+		if [ -n "${EMPTY_HOST}" ]; then
+			echo "${EMPTY_HOST}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
+
+		if [ -n "${EMPTY_HOST_PORT}" ]; then
+			echo "${EMPTY_HOST_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
+	done
+}
+
+# Re-order portmapping rules according to precedence hierarchy
+reorder_dnat_rules

bbfdm/files/etc/firewall.userinterface

@@ -0,0 +1,125 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+IDENTIFIER="UI-REMOTE-ACCESS-WAN"
+
+log() {
+	echo "${@}"|logger -t firewall.userinterface -p info
+}
+
+if [ ! -f "/etc/config/userinterface" ] || [ ! -f "/etc/config/nginx" ]; then
+	exit 0;
+fi
+
+exec_cmd() {
+	if ! "$@"; then
+		log "Failed to run [$*]"
+	fi
+}
+
+delete_ui_firewall_rules() {
+	input_chains=$(iptables -S | grep -E "^-N zone[a-zA-Z0-9_]+input$" | cut -d' ' -f 2)
+	output_chains=$(iptables -S | grep -E "^-N zone[a-zA-Z0-9_]+output$" | cut -d' ' -f 2)
+
+	for chain in ${input_chains}; do
+		CMD="iptables -w 1 -t filter -nL ${chain} --line-numbers"
+		while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
+			rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
+			if [ -n "${rule_num}" ]; then
+				exec_cmd iptables -w 1 -t filter -D "${chain}" "${rule_num}";
+			fi
+		done
+	done
+
+	for chain in ${output_chains}; do
+		CMD="iptables -w 1 -t filter -nL ${chain} --line-numbers"
+		while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
+			rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
+			if [ -n "${rule_num}" ]; then
+				exec_cmd iptables -w 1 -t filter -D "${chain}" "${rule_num}";
+			fi
+		done
+	done
+
+	input6_chains=$(ip6tables -S | grep -E "^-N zone[a-zA-Z0-9_]+input$" | cut -d' ' -f 2)
+	output6_chains=$(ip6tables -S | grep -E "^-N zone[a-zA-Z0-9_]+output$" | cut -d' ' -f 2)
+
+	for chain in ${input6_chains}; do
+		CMD="ip6tables -w 1 -t filter -nL ${chain} --line-numbers"
+		while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
+			rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
+			if [ -n "${rule_num}" ]; then
+				exec_cmd ip6tables -w 1 -t filter -D "${chain}" "${rule_num}";
+			fi
+		done
+	done
+
+	for chain in ${output6_chains}; do
+		CMD="ip6tables -w 1 -t filter -nL ${chain} --line-numbers"
+		while ${CMD} 2>/dev/null | grep "${IDENTIFIER}"; do
+			rule_num="$(${CMD} | grep "${IDENTIFIER}" | head -1|awk '{print $1}')"
+			if [ -n "${rule_num}" ]; then
+				exec_cmd ip6tables -w 1 -t filter -D "${chain}" "${rule_num}";
+			fi
+		done
+	done
+}
+
+configure_ui_firewall_rule() {
+	local sec="${1}"
+	local enabled access interface
+	local port=""
+
+	config_get_bool enabled "${sec}" uci_enable '1'
+	config_get access "${sec}" uci_access ""
+	config_get interface "${sec}" uci_interface ""
+
+	if [ "${enabled}" -eq "1" ] && [ "${access}" == "remote" ] && [ -n "${interface}" ]; then
+		port_list=$(uci -q show nginx."${1}".listen|cut -d'=' -f 2|sed "s/'/ /g"|sed "s/\[\:\:\]\://g")
+		for item in ${port_list}; do
+			if [ -z "${item##[0-9]*}" ]; then
+				port="${item}"
+				break
+			fi
+		done
+
+		if [ -z "${port}" ]; then
+			return 0
+		fi
+
+		zone="zone_${interface}_input"
+		iptables -w 1 -t filter -nL ${zone} 2>/dev/null 1>&2
+		if [ "$?" -eq 0 ]; then
+			iptables -w 1 -I "${zone}" -p tcp -m multiport --dports "${port}" -m conntrack --ctstate NEW,ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
+		fi
+
+		ip6tables -w 1 -t filter -nL ${zone} 2>/dev/null 1>&2
+		if [ "$?" -eq 0 ]; then
+			ip6tables -w 1 -I "${zone}" -p tcp -m multiport --dports "${port}" -m conntrack --ctstate NEW,ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
+		fi
+
+		zone="zone_${interface}_output"
+		iptables -w 1 -t filter -nL "${zone}" 2>/dev/null 1>&2
+		if [ "$?" -eq 0 ]; then
+			iptables -w 1 -I "${zone}" -p tcp -m multiport --dports "${port}" -m conntrack --ctstate ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
+		fi
+
+		ip6tables -w 1 -t filter -nL "${zone}" 2>/dev/null 1>&2
+		if [ "$?" -eq 0 ]; then
+			ip6tables -w 1 -I "${zone}" -p tcp -m multiport --dports "${port}" -m conntrack --ctstate ESTABLISHED -m comment --comment "${IDENTIFIER}" -j ACCEPT
+		fi
+	fi
+}
+
+# Delete existing remote access rules
+delete_ui_firewall_rules
+
+config_load userinterface
+config_get_bool serv_enable global enable 1
+
+if [ "${serv_enable}" -eq "1" ]; then
+	config_load nginx
+	# Configure the User Interface rule
+	config_foreach configure_ui_firewall_rule server
+fi

bbfdm/files/etc/hotplug.d/iface/85-bbfdm-sysctl

@@ -0,0 +1,17 @@
+#!/bin/sh
+
+[ "$ACTION" = "ifup" ] || exit 0
+
+apply_sysctl_configuration() {
+        local sysctl_conf
+
+        sysctl_conf="/etc/bbfdm/sysctl.conf"
+
+        [ -f "${sysctl_conf}" ] || touch "${sysctl_conf}"
+
+        sysctl -e -p "${sysctl_conf}" >&-
+}
+
+
+ubus -t 10 wait_for network.device
+apply_sysctl_configuration

bbfdm/files/etc/init.d/bbfdmd

@@ -0,0 +1,80 @@
+#!/bin/sh /etc/rc.common
+
+START=96
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/bbfdmd
+
+BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
+
+log() {
+	echo "${@}"|logger -t bbfdmd.init -p info
+}
+
+validate_bbfdm_bbfdmd_section()
+{
+	uci_validate_section bbfdm bbfdmd "bbfdmd" \
+		'enabled:bool:true' \
+		'debug:bool:false' \
+		'loglevel:uinteger' \
+		'sock:string' \
+		'refresh_time:uinteger' \
+		'transaction_timeout:uinteger' \
+		'subprocess_level:uinteger'
+}
+
+configure_bbfdmd()
+{
+	local enabled debug sock
+
+	config_load bbfdm
+
+	validate_bbfdm_bbfdmd_section || {
+		log "Validation of bbfdmd section failed"
+		return 1;
+	}
+
+	[ "${enabled}" -eq 0 ] && return 0
+
+	[ ! -f "${BBFDM_JSON_INPUT}" ] && return 0
+
+	if [ -n "${loglevel}" ]; then
+		echo "$(jq --arg res ${loglevel} '.daemon.config += {"loglevel": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${refresh_time}" ]; then
+		echo "$(jq --arg res ${refresh_time} '.daemon.config += {"refresh_time": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${transaction_timeout}" ]; then
+		echo "$(jq --arg res ${transaction_timeout} '.daemon.config += {"transaction_timeout": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	if [ -n "${subprocess_level}" ]; then
+		echo "$(jq --arg res ${subprocess_level} '.daemon.config += {"subprocess_level": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	fi
+
+	procd_set_param command ${PROG}
+	if [ "${debug}" -eq 1 ]; then
+		procd_set_param stdout 1
+		procd_set_param stderr 1
+	fi
+
+	if [ -f "${sock}" ]; then
+		procd_append_param command -s "${sock}"
+	fi
+}
+
+start_service()
+{
+	procd_open_instance "bbfdm"
+	configure_bbfdmd
+	procd_set_param respawn
+	procd_close_instance "bbfdm"
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "bbfdm"
+}

bbfdm/files/etc/init.d/userinterface

@@ -0,0 +1,33 @@
+#!/bin/sh /etc/rc.common
+
+START=99
+STOP=01
+
+USE_PROCD=1
+
+start_service() {
+	local enable
+
+	config_load userinterface
+	config_get_bool enable global enable 1
+
+	if [ ! -f "/etc/config/nginx" ]; then
+		return 0
+	fi
+
+	if [ "${enable}" -eq "1" ]; then
+		ubus call service state '{"name":"nginx", "spawn":true}'
+	else
+		ubus call service state '{"name":"nginx", "spawn":false}'
+	fi
+
+	# Inject firewall rules
+	procd_open_instance userinterface
+	/etc/firewall.userinterface
+	procd_close_instance
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "userinterface" "nginx"
+}

bbfdm/files/etc/uci-defaults/93-userinterface-firewall

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+uci -q batch <<-EOT
+        delete firewall.userinterface
+        set firewall.userinterface=include
+        set firewall.userinterface.path=/etc/firewall.userinterface
+        set firewall.userinterface.reload=1
+        commit firewall
+EOT
+
+exit 0
+

bbfdm/files/etc/uci-defaults/94-userinterface-json

@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# This deletes the userinterface json plugin if exists in case of upgrade
+if [ -f "/etc/bbfdm/json/UserInterface.json" ]; then
+	rm /etc/bbfdm/json/UserInterface.json
+fi
+
+exit 0
+

bbfdm/files/etc/uci-defaults/95-portmap-firewall

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+uci -q batch <<-EOT
+        delete firewall.port_hook
+        set firewall.port_hook=include
+        set firewall.port_hook.path=/etc/firewall.portmap
+        set firewall.port_hook.reload=1
+        commit firewall
+EOT
+
+exit 0
+

bbfdm/files/lib/upgrade/keep.d/bbf

@@ -0,0 +1 @@
+/etc/bbfdm/sysctl.conf

bbfdm/files/lib/upgrade/keep.d/userinterface

@@ -0,0 +1 @@
+/etc/nginx/allow_host_*

bulkdata/Makefile

@@ -1,28 +1,24 @@
 #
 # Copyright (C) 2022 iopsys Software Solutions AB
 #
-# This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.6
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bulkdata.git
-PKG_SOURCE_VERSION:=b6e731bcaa7b3b41d5565c4d9c54d3ef9e315084
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
+PKG_SOURCE_VERSION:=2dd55d9c9eb01ed1b11e16bad9e2c3e8badfffeb
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
 
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPL-2.0-only
+PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk

bulkdata/files/etc/init.d/bulkdatad

@@ -12,13 +12,11 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
-	[ "$enable" -ne "1" ] && {
-		return 0
+	procd_open_instance bulkdata
+	[ "$enable" -eq "1" ] && {
+		procd_set_param command "$PROG"
+		procd_set_param respawn "3" "7" "0"
 	}
-
-	procd_open_instance
-	procd_set_param command "$PROG"
-	procd_set_param respawn "3" "7" "0"
 	procd_close_instance
 }
 

bulkdata/files/etc/uci-defaults/95-bulkdata-translation-options

@@ -16,8 +16,8 @@ get_next_count()
 	fi
 
 	while [ "${found}" -ne 1 ]; do
-		uci -q get ${config}.${default_name}_${count} >/dev/null
-		if [ $? -eq 0 ]; then
+		uci -q get "${config}"."${default_name}"_${count} >/dev/null
+		if [ "$?" -eq 0 ]; then
 			count=$((count + 1))
 		else
 			found=1;
@@ -39,8 +39,8 @@ translate_profile_id_to_profile_name() {
 	
 	[ "${curr_profile_id}" != "${profile_id}" ] && return
 
-	uci -q set bulkdata.${section}.profile_name="${profile_name}"
-	uci -q set bulkdata.${section}.profile_id=""	
+	uci -q set bulkdata."${section}".profile_name="${profile_name}"
+	uci -q set bulkdata."${section}".profile_id=""
 }
 
 update_profile_sections() {
@@ -54,7 +54,7 @@ update_profile_sections() {
 
 	case "${section}" in
 		"cfg"*)
-			profile_name="$(get_next_count bulkdata ${default} ${PROFILE_COUNT})"
+			profile_name="$(get_next_count bulkdata "${default}" ${PROFILE_COUNT})"
 			uci_rename bulkdata "${section}" "${profile_name}"
 		;;
 	esac
@@ -62,7 +62,7 @@ update_profile_sections() {
 
 	[ -n "$profile_name" ] && section="${profile_name}"
 
-	uci -q set bulkdata.${section}.profile_id=""
+	uci -q set bulkdata."${section}".profile_id=""
 
 	config_foreach translate_profile_id_to_profile_name profile_parameter "${profile_id}" "${profile_name}"
 	config_foreach translate_profile_id_to_profile_name profile_http_request_uri_parameter "${profile_id}" "${profile_name}"

capiagent/Makefile

@@ -1,17 +1,17 @@
 #
-# Copyright (C) 2021 IOPSYS
+# Copyright (C) 2021-2023 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=wfa-capi
-PKG_VERSION:=1.1.3
+PKG_NAME:=capiagent
+PKG_VERSION:=2.1.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=64d9101c8e4930cbd3fe6ce471fb4cfd2b9b80dc
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfa-capi.git
+PKG_SOURCE_VERSION:=3e671db8f567b19c109fc13b25bc571c4c73a962
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/capiagent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -24,18 +24,18 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 
 
-#define Package/wfa-capi/config
+#define Package/capiagent/config
 #  source "$(SOURCE)/Config.in"
 #endef
 
-define Package/wfa-capi
-  TITLE+= wfa-capi (agent daemon for Wi-Fi Alliance's CAPI commands)
+define Package/capiagent
+  TITLE+= capiagent (daemon implementing Wi-Fi Alliance's CAPI commands)
   DEPENDS= +libubox +libuci +libubus +libnl-genl +libeasy +libwifi \
 	   +libjson-c +libblobmsg-json +ubus +libieee1905
 endef
 
-define Package/wfa-capi/description
- This package provides agent for WiFi Alliance's CAPI specification.
+define Package/capiagent/description
+ This package provides agent for the WiFi Alliance's CAPI specification.
 endef
 
 TARGET_CFLAGS += \
@@ -46,7 +46,7 @@ TARGET_CFLAGS += \
 MAKE_PATH:=src
 
 
-define Package/wfa-capi/install
+define Package/capiagent/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/lib/wifi/capi
@@ -54,4 +54,4 @@ define Package/wfa-capi/install
 	$(CP) $(PKG_BUILD_DIR)/src/scripts/* $(1)/lib/wifi/capi
 endef
 
-$(eval $(call BuildPackage,wfa-capi))
+$(eval $(call BuildPackage,capiagent))

decollector/Config.in

@@ -0,0 +1,7 @@
+menu "Configuration"
+
+config DECOLLECTOR_EASYMESH_VERSION
+	int "Support Easymesh version"
+	default 2
+
+endmenu

decollector/Makefile

@@ -0,0 +1,80 @@
+#
+# Copyright (C) 2021-2023 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=decollector
+PKG_VERSION:=4.0.2.8
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=147d5d63cd4eec40bbfe25cf8af201df620b5a23
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+
+
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/decollector
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=WiFi DataElements Collector Proxy
+  DEPENDS:=+libuci +libubox +ubus +libpthread +libnl-genl \
+	   +libeasy +libwifiutils +libieee1905 +map-plugin
+endef
+
+define Package/decollector/description
+ It implements the WiFi DataElements Agent as defined in the Wi-Fi Alliance's
+ DataElements specification.
+endef
+
+
+define Package/decollector/config
+	source "$(SOURCE)/Config.in"
+endef
+
+ifneq (,$(findstring ALPHA,$(CONFIG_VERSION_CODE)))
+MAKE_FLAGS += DEBUG=1
+endif
+
+ifneq (,$(findstring BETA,$(CONFIG_VERSION_CODE)))
+MAKE_FLAGS += DEBUG=1
+endif
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-D_GNU_SOURCE
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+  rsync -r --exclude=.* ~/git/decollector/ $(PKG_BUILD_DIR)/
+endef
+endif
+
+MAKE_PATH:=src
+
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_DECOLLECTOR_EASYMESH_VERSION)
+
+EXECS := \
+	$(if $(CONFIG_PACKAGE_decollector),decollector)
+
+MAKE_FLAGS += EXECS="$(EXECS)"
+
+define Package/decollector/install
+	$(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/decollector $(1)/usr/sbin/
+endef
+
+$(eval $(call BuildPackage,decollector))

decollector/files/decollector.init

@@ -17,10 +17,11 @@ start_service() {
 
 		config_load mapcontroller
 		config_get en controller enabled "0"
+		config_get collect_int controller de_collect_interval
 
 		[ $en -gt 0 ] && {
 			procd_open_instance
-			procd_set_param command "$PROG" "-d"
+			procd_set_param command "$PROG" "-d" "${collect_int:+-t $collect_int}"
 			#procd_set_param stdout 1
 			#procd_set_param stderr 1
 			procd_set_param respawn

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.5
+PKG_VERSION:=3.5.17
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=c5695bc92f7f22089c9a85d3e1f4dac7c12ca900
+PKG_SOURCE_VERSION:=3e2eeaf2e5ed25d2ec31ee3878e9fe58eeaf4f78
 PKG_MIRROR_HASH:=skip
 endif
 
@@ -34,7 +34,7 @@ include $(INCLUDE_DIR)/package.mk
 define Package/$(PKG_NAME)
 	CATEGORY:=Utilities
  	TITLE:=DECT Manager
-	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c
+	DEPENDS:= +libubox +ubus +uci +libxml2 +libjson-c +gpiod-tools
 endef
 
 define Package/$(PKG_NAME)/description

dectmngr/files/etc/init.d/dectmngr

@@ -6,31 +6,63 @@ START=70
 STOP=12
 
 USE_PROCD=1
-NAME=dectmngr
 PROG=/usr/sbin/dectmngr
 LOG_PATH=/var/log/dectmngr
 DB_PATH=/etc/dect
+DCX81_UART_DT_ALIAS=/proc/device-tree/aliases/dcx81-uart
 
-DECT_GPIO=$(db -q get hw.board.dect_gpio)
+DECT_GPIO="$(gpiofind DCX81_RSTN | cut -d ' ' -f 2 2>/dev/null)"
 
 # Ask dectmngr to exit nicely and wait for it to clean up, which is a slow process.
 stop_and_wait_dectmngr() {
-	pidof $NAME && killall -q $NAME
+	dect_pid=$(pidof $PROG)
+	[ -n "$dect_pid" ] && kill $dect_pid
 
-	pidof $NAME && sleep 2 # wait for the process to stop gracefully
-	while pidof $NAME; do
-		killall -q -9 $NAME 
+	pidof $PROG > /dev/null 2>&1 && sleep 2 # wait for the process to stop gracefully
+	while pidof $PROG > /dev/null 2>&1; do
+		dect_pid=$(pidof $PROG)
+		[ -n "$dect_pid" ] && kill -9 $dect_pid
 		sleep 1
 	done
 }
 
+has_dect() {
+	[ -f "$DCX81_UART_DT_ALIAS" ]
+}
+
+get_dcx81_device() {
+	readonly dcx81_uart_dt_node="/proc/device-tree/$(cat "$DCX81_UART_DT_ALIAS" 2>/dev/null)"
+	[ -e "$dcx81_uart_dt_node" ] || return 1
+	for tty_dt_node in /sys/class/tty/*/device/of_node; do
+		if [ "$tty_dt_node" -ef "$dcx81_uart_dt_node" ]; then
+			readonly uevent_file="${tty_dt_node%%/device/of_node}/uevent"
+			local device_name_line
+			device_name_line="$(grep '^DEVNAME=' "$uevent_file")" || return 1
+			readonly device="/dev/${device_name_line##DEVNAME=}"
+			[ -c "$device" ] || return 1
+			printf "%s" "$device"
+			return 0
+		fi
+	done
+	return 1
+}
+
 start_service() {
 	local opt_ext=
 	local rfpi=
 	local model_id=
 	local rxtun=
 
-	test $(db get hw.board.hasDect) = "0" && return
+	if ! has_dect; then
+		logger -t "$PROG" "Not starting because no DECT hardware is available."
+		return 0
+	fi
+
+	local dcx81_uart_device
+	if ! dcx81_uart_device="$(get_dcx81_device)"; then
+		logger -t "$PROG" -p daemon.warning "Could not determine DCX81 UART device. Falling back to default ttyH0."
+		dcx81_uart_device=/dev/ttyH0
+	fi
 
 	[ -n "$DECT_GPIO" ] && echo 1 > /sys/class/gpio/gpio${DECT_GPIO}/value
 
@@ -51,18 +83,25 @@ start_service() {
 	config_get log_dect_cmbs global log_dect_cmbs syslog
 
 	procd_open_instance
-	if [ "$log_dect_cmbs" = "none" ]; then
+
+	# dectmngr takes expects device without /dev
+	readonly dcx81_uart_device_wo_dev="${dcx81_uart_device##/dev/}"
+	case "$log_dect_cmbs" in
+	none)
 		echo "Starting dectmngr with cmbs logging disabled"
-		procd_set_param command $PROG -comname ttyH0 $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" $opt_ext
 		rm -f $LOG_PATH/*
-	elif [ "$log_dect_cmbs" = "file" ]; then
+		;;
+	file)
 		echo "Starting dectmngr with cmbs logging enabled to file"
-		procd_set_param command $PROG -comname ttyH0 -log $LOG_PATH/dect-cmbs.log $opt_ext
-	else
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -log $LOG_PATH/dect-cmbs.log $opt_ext
+		;;
+	*)
 		echo "Starting dectmngr with cmbs logging enabled to syslog"
-		procd_set_param command $PROG -comname ttyH0 -syslog $opt_ext
+		procd_set_param command "$PROG" -comname "$dcx81_uart_device_wo_dev" -syslog $opt_ext
 		rm -f $LOG_PATH/*
-	fi
+		;;
+	esac
 
 	procd_set_param respawn 6 2 3
 	procd_set_param term_timeout 20
@@ -71,7 +110,7 @@ start_service() {
 }
 
 stop_service() {
-	test $(db get hw.board.hasDect) = "0" && return
+	has_dect || return 0
 
 	[ -n "$DECT_GPIO" ] && echo 0 > /sys/class/gpio/gpio${DECT_GPIO}/value
 	stop_and_wait_dectmngr
@@ -81,8 +120,7 @@ reload_service() {
 	ubus call dect reload
 }
 
-service_triggers()
-{
+service_triggers() {
 	procd_add_config_trigger "config.change" "asterisk" /etc/init.d/dectmngr restart
 	procd_add_config_trigger "config.change" "dect" /etc/init.d/dectmngr reload
 }
@@ -97,4 +135,3 @@ boot() {
 	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH
 	start
 }
-

dslmngr/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.2.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bb754ae620a9fc66fd6fc0745f0fead0708c7a17
+PKG_SOURCE_VERSION:=43dec92b1c86be7859521da337e7bd1168848b26
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -26,7 +26,7 @@ PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
+ifeq ($(CONFIG_TARGET_brcmbca),y)
   TARGET_PLATFORM=BROADCOM
 else
   $(info Unexpected CONFIG_TARGET)
@@ -68,6 +68,10 @@ define Build/Compile
 endef
 
 define Package/dslmngr/install
+	$(CP) ./files/common/* $(1)/
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+	$(CP) ./files/broadcom/* $(1)/
+endif
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/dslmngr $(1)/sbin/
 endef

dslmngr/files/broadcom/lib/dsl/broadcom.sh

@@ -0,0 +1,311 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+# ATM #
+check_pvc() {
+	local vpi=$1
+	local vci=$2
+	local ret
+
+	ret=$(xtmctl operate conn --show | awk -v test="$vpi/$vci" '{if ($3==test ) print $5 }')
+
+	case $ret in
+		''|*[!0-9]*) return 0 ;;
+		*) return $ret ;;
+	esac
+}
+
+check_xtm_list() {
+	local qclass=$1
+	local pcr scr mbs
+	local ret
+
+	case $# in
+		1)
+			pcr=0
+			scr=0
+			mbs=0
+		;;
+		2)
+			pcr=$2
+			scr=0
+			mbs=0
+		;;
+		4)
+			pcr=$2
+			scr=$3
+			mbs=$4
+		;;
+	esac
+
+	ret=$(xtmctl operate tdte --show | awk -v test="$qclass" -v pcr="$pcr" -v scr="$scr" -v mbs="$mbs" '{if ($2==test && $3==pcr && $4==scr && $5==mbs ) print $1 }')
+
+	case $ret in
+		''|*[!0-9]*) return 0 ;;
+		*) return $ret ;;
+	esac
+}
+
+configure_atm_device() {
+	local name vpi vci device link_type encapsulation qos_class pcr mbs scr i
+
+	config_get name $1 name "ATM"
+	config_get vpi $1 vpi "8"
+	config_get vci $1 vci "35"
+	config_get device $1 device "atm0"
+	config_get link_type $1 link_type "eoa"
+	config_get encapsulation $1 encapsulation "llc"
+	config_get qos_class $1 qos_class "ubr"
+	config_get pcr $1 pcr
+	config_get mbs $1 mbs
+	config_get scr $1 scr
+
+	check_pvc $vpi $vci
+	ret=$?
+
+	if [ "$ret" -eq 0 ]; then
+		check_xtm_list $qos_class $pcr $scr $mbs
+		ret=$?
+
+		if [ "$ret" -eq 0 ]; then
+			case $qos_class in # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
+				ubr)
+					xtmctl operate tdte --add "$qos_class"
+				;;
+				ubr_pcr|ubr+)
+					xtmctl operate tdte --add "$qos_class" $pcr
+				;;
+				cbr)
+					xtmctl operate tdte --add "$qos_class" $pcr
+				;;
+				nrtvbr|vbr-nrt)
+					xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
+				;;
+				rtvbr|vbr-rt)
+					xtmctl operate tdte --add "$qos_class" $pcr $scr $mbs
+				;;
+				gfr)
+				;;
+				abr)
+				;;
+			esac
+		fi
+
+		case $link_type in # EoA, IPoA, PPPoA, CIP
+			EoA|eoa)
+				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_eth" || encapsulation="llcsnap_eth"
+			;;
+			PPPoA|pppoa)
+				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_pppoa" || encapsulation="llcencaps_ppp"
+			;;
+			IPoA|ipoa)
+				[ $encapsulation == "vcmux" ] && encapsulation="vcmux_ipoa" || encapsulation="llcsnap_rtip"
+			;;
+			CIP|cip)
+			;;
+		esac
+
+		check_xtm_list $qos_class $pcr $scr $mbs
+		ret="$?"
+
+		xtmctl operate conn --add 1.$vpi.$vci aal5 $encapsulation 0 1 $ret
+		for i in `seq 0 7`; do
+			xtmctl operate conn --addq 1.$vpi.$vci $i wrr 1 dt # queue priority 0-7
+		done
+		xtmctl operate conn --createnetdev 1.$vpi.$vci $device
+		xtmctl operate intf --state 1 enable
+	fi
+}
+
+remove_atm_devices() {
+	local vpi vci rest
+	local vpivci=`xtmctl operate conn --show | grep "ATM\|mode" | awk '{if (NR!=1 && $1!="PTM") {print $3}}'`
+
+	for i in $vpivci
+	do
+		rest=${i#\/}
+		vpi=${rest%%\/*}
+		vci=${rest#*\/}
+		echo "xtmctl operate conn --delete 1.$vpi.$vci"
+		xtmctl operate conn --delete 1.$vpi.$vci
+		echo "xtmctl operate conn --deletenetdev 1.$vpi.$vci"
+		xtmctl operate conn --deletenetdev 1.$vpi.$vci
+	done
+}
+
+create_atm_devices() {
+	echo "Creating ATM Device(s)"
+	config_load dsl
+	config_foreach configure_atm_device atm-device
+}
+# ATM END #
+
+# PTM #
+check_ptm() {
+	local ret
+	local ptmprio=$1
+	local dslat=$2
+
+	if [ "$ptmprio" -eq 2 ]; then
+		ptmprio="high"
+	else
+		ptmprio="low"
+	fi
+
+	ret=$(xtmctl operate conn --show | awk -v dslat="$dslat" -v ptmprio="$ptmprio" '{if ($2 == dslat && $3 == ptmprio ) print $2 }')
+
+	case $ret in
+		''|*[!0-9]*) return 0 ;;
+		*) return $ret ;;
+	esac
+}
+
+configure_ptm_device() {
+	local name device priority portid i
+
+	config_get name $1 name "PTM"
+	config_get device $1 device "ptm0"
+	config_get priority $1 priority 1
+	config_get portid $1 portid 1
+
+	check_ptm $priority $portid
+	ret=$?
+
+	if [ "$ret" -eq 0 ]; then
+		xtmctl operate conn --add $portid.$priority
+
+		for i in `seq 0 7`; do
+			xtmctl operate conn --addq $portid.$priority $i wrr 1 dt -1 -1 3000 # queue priority 0-7
+		done
+		echo "xtmctl operate conn --createnetdev $portid.$priority $device"
+		xtmctl operate conn --createnetdev $portid.$priority $device
+		xtmctl operate intf --state 1 enable
+	fi
+}
+
+remove_ptm_devices() {
+	local delptm
+	local x=0
+
+	IFS=$'\n'
+	for i in `xtmctl operate conn --show | grep "PTM\|mode"`
+	do
+		if [ $x -eq 1 ]; then
+			delptm=$(echo $i | awk '{if ($1!="ATM") print $2"."$11}')
+			echo "xtmctl operate conn --delete $delptm"
+			xtmctl operate conn --delete $delptm
+			xtmctl operate conn --deletenetdev $delptm
+		fi
+		x=1
+	done
+	unset IFS
+}
+
+create_ptm_devices() {
+	echo "Creating PTM Device(s)"
+	config_load dsl
+	config_foreach configure_ptm_device ptm-device
+}
+# PTM END #
+
+prioritize_arp()
+{
+      ebtables -t nat -D POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
+      ebtables -t nat -A POSTROUTING -j mark --mark-or 0x7 -p ARP >/dev/null
+}
+
+xtm_remove_devices() {
+	remove_atm_devices
+	remove_ptm_devices
+}
+
+xtm_create_devices() {
+	local tpstc="$(xdslctl info --show | grep TPS-TC)"
+	if echo "$tpstc" | grep -q "ATM Mode"; then
+		create_atm_devices
+	elif echo "$tpstc" | grep -q "PTM Mode"; then
+		create_ptm_devices
+	fi
+}
+
+xdsl_configure() {
+	local VDSL=0
+	local GFAST=0
+	local mod=""
+	local modes=""
+	local profile=""
+
+	config_load dsl
+
+	# Modes
+	config_get mode line mode
+	for mod in $mode; do
+		[ $mod == "gdmt" ] && modes="${modes}d"
+		[ $mod == "glite" ] && modes="${modes}l"
+		[ $mod == "t1413" ] && modes="${modes}t"
+		[ $mod == "adsl2" ] && modes="${modes}2"
+		[ $mod == "adsl2p" ] && modes="${modes}p"
+		[ $mod == "annexl" ] && modes="${modes}e"
+		[ $mod == "annexm" ] && modes="${modes}m"
+		[ $mod == "vdsl2" ] && modes="${modes}v" && VDSL=1
+		[ $mod == "gfast" ] && modes="${modes}f" && GFAST=1
+	done
+
+	# VDSL Profiles
+	config_get profile line profile
+	# Capabilities
+	config_get_bool bitswap line bitswap 1
+	[ $bitswap -eq 1 ] && bitswap="on" || bitswap="off"
+	config_get_bool sra line sra 1
+	[ $sra -eq 1 ] && sra="on" || sra="off"
+#	config_get_bool trellis line trellis 1
+	config_get_bool sesdrop line sesdrop 0
+	[ $sesdrop -eq 1 ] && sesdrop="on" || sesdrop="off"
+	# VDSL2 only
+	config_get_bool us0 line us0 1
+	[ $us0 -eq 1 ] && us0="on" || us0="off"
+#	config_get_bool dynamicd line dynamicd 1
+#	config_get_bool dynamicf line dynamicf 1
+	config_get_bool sos line sos 0
+	[ $sos -eq 1 ] && sos="on" || sos="off"
+
+	config_get_bool phyReXmtUs line phyReXmtUs 0
+	config_get_bool phyReXmtDs line phyReXmtDs 1
+	phyReXmt=$(( $((phyReXmtUs<<1)) + phyReXmtDs))
+
+	if [ $VDSL -eq 1 -o $GFAST -eq 1 ]; then
+		echo "xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0 --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt"
+		xdslctl start --up --mod $modes --profile "$profile" --sra $sra --bitswap $bitswap --us0 $us0 --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt
+		# G.Fast hardware to VDSL hardware, to set the driver bit kPhyCfg2EnableGfastVdslMMTimeOut0.
+		# Enable V43 tone for GFAST.
+		echo "xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400"
+		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400
+	else
+		echo "xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt"
+		xdslctl start --up --mod $modes --sra $sra --bitswap $bitswap --sesdrop $sesdrop --SOS $sos --phyReXmt $phyReXmt
+	fi
+
+	if [ $GFAST -eq 1 ]; then
+		# G.Fast hardware to VDSL hardware, to set the driver bit kPhyCfg2EnableGfastVdslMMTimeOut0.
+		# Enable V43 tone for GFAST.
+		echo "xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400"
+		xdslctl configure1 --phycfg 0 0 0 0 0 0 0 0 0 0 0 0x1400400 0x1400400
+	fi
+}
+
+xdsl_stop() {
+	# echo "Stopping DSL"
+	# stop causes IRQ issues
+	# xdslctl stop
+	return 0
+}
+
+xdsl_init() {
+	prioritize_arp
+
+	echo "Starting DSL"
+
+	xtmctl start
+	xtmctl operate intf --state 1 enable
+}

dslmngr/files/common/etc/config/dsl

@@ -0,0 +1,53 @@
+# OEM specific parameters
+config oem-parameters 'oem'
+#	option country_code "0000"   # 2 bytes hex
+#	option vendor_id "IO"        # 4 bytes string
+#	option vendor_suffix "0000"  # 2 bytes hex
+#	option sw_version "iopsys"   # 16 bytes string
+#	option serial_nr "00000000"  # 32 bytes string
+
+# DSL Modes
+config dsl-line line
+	list mode gdmt
+	list mode glite
+	list mode t1413
+	list mode adsl2
+	list mode adsl2p
+	list mode annexl
+	list mode annexm
+	list mode vdsl2
+	# VDSL2 profiles
+	list profile 8a
+	list profile 8b
+	list profile 8c
+	list profile 8d
+	list profile 12a
+	list profile 12b
+	list profile 17a
+	list profile 30a
+	option bitswap 1
+	option sra 1
+	option us0 1 # VDSL2 only
+	option sesdrop 0
+	option sos 0
+	option phyReXmtUs 0
+	option phyReXmtDs 1
+
+config atm-device atm0
+	option name 'ATM'
+	option vpi '8'
+	option vci '35'
+	option device atm0
+	option link_type 'eoa' # EoA, IPoA, PPPoA, CIP
+	option encapsulation 'llc' # llc, vcmux
+	option qos_class 'ubr' # ubr, cbr, gfr, vbr-nrt, vbr-rt, ubr+, abr
+#	option pcr '512'
+#	option scr '256'
+#	option mbs '1024'
+
+config ptm-device ptm0
+	option name 'PTM'
+	option device 'ptm0'
+	option priority '1'
+	option portid '1'
+

dslmngr/files/common/etc/hotplug.d/dsl/10-devices

@@ -0,0 +1,7 @@
+[ "$STATUS" == "up" -o "$STATUS" == "down" ] || exit 0
+
+. /lib/functions.sh
+include /lib/dsl
+
+xtm_remove_devices
+xtm_create_devices

dslmngr/files/common/etc/hotplug.d/dsl/20-leds

@@ -0,0 +1,7 @@
+if [ "$STATUS" == "up" ]; then
+	ubus call led.dsl set '{"state":"ok"}'
+elif [ "$STATUS" == "down" ]; then
+	ubus call led.dsl set '{"state":"off"}'
+elif [ "$STATUS" == "training" ]; then
+	ubus call led.dsl set '{"state":"alert"}'
+fi

dslmngr/files/common/etc/init.d/dsl

@@ -0,0 +1,45 @@
+#!/bin/sh /etc/rc.common
+
+. /lib/functions.sh
+include /lib/dsl
+
+START=20
+USE_PROCD=1
+
+DSLMNGR=$(which dslmngr)
+
+start_service() {
+	[ -n "$DSLMNGR" ] && {
+		procd_open_instance
+		procd_set_param command "$DSLMNGR"
+		procd_set_param respawn
+		procd_close_instance
+	}
+
+	xdsl_configure
+	xtm_create_devices
+}
+
+stop_service() {
+	xtm_remove_devices
+	xdsl_stop
+}
+
+boot() {
+	local HASADSL="$(db -q get hw.board.hasAdsl)"
+	local HASVDSL="$(db -q get hw.board.hasVdsl)"
+	[ "$HASADSL" == "1" -o "$HASVDSL" == "1" ] || return
+
+	xdsl_init
+
+	start
+}
+
+reload_service() {
+	stop
+	start
+}
+
+service_triggers() {
+        procd_add_reload_trigger dsl
+}

easy-qos/Makefile

@@ -19,7 +19,7 @@ define Package/easy-qos
   SECTION:=net
   CATEGORY:=Network
   TITLE:=Easy QoS
-  DEPENDS:=@(TARGET_iopsys_brcm63xx_arm||TARGET_iopsys_econet)
+  DEPENDS:=@(TARGET_brcmbca||TARGET_airoha)
 endef
 
 define Package/easy-qos/description

easy-soc-events/Makefile

@@ -19,7 +19,7 @@ include $(INCLUDE_DIR)/package.mk
 
 -include $(TOPDIR)/.config
 
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
+ifneq ($(CONFIG_TARGET_brcmbca),)
   LINUX_DIR=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.1
   LINUX_VERSION := 4.1.52
   LINUXINCLUDE=-Iarch/$(LINUX_KARCH)/mach-bcm963xx/include
@@ -85,7 +85,7 @@ define Build/Compile
 endef
 
 
-ifneq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),)
+ifneq ($(CONFIG_TARGET_brcmbca),)
 define KernelPackage/easy-soc-events/install-extra
 	cp $(PKG_BUILD_DIR)/easyevent.ko $(FS_DIR)/lib/modules/$(LINUX_VERSION)/extra
 endef

easy-soc-libs/Config.in

@@ -1,5 +0,0 @@
-# libeasy configuration
-
-config LIBWIFI_USE_CTRL_IFACE
-	bool "Use UNIX sockets"
-	default n

easy-soc-libs/Makefile

@@ -1,141 +0,0 @@
-#
-# Copyright (C) 2020 iopsys Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.7.3
-PKG_RELEASE:=1
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4dff7b6b9f742e52ee9e4034f8da74162a02c823
-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
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-
-PKG_LICENSE:=GPLv2
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/easy-soc-libs
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=IOPSYS Easy SoC libraries
-  SUBMENU:=IOPSYS Easy SoC libraries
-  DEPENDS:=+libopenssl
-  MENU:=1
-endef
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-  TARGET_PLATFORM=BROADCOM
-  TARGET_WIFI_TYPE=BROADCOM
-  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
-  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
-	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
-else ifeq ($(CONFIG_TARGET_iopsys_ramips),y)
-  TARGET_PLATFORM=MEDIATEK
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_MAC80211
-else ifeq ($(CONFIG_TARGET_iopsys_x86),y)
-  TARGET_PLATFORM=TEST
-  TARGET_WIFI_TYPE=TEST
-  TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
-  TARGET_PLATFORM=TEST
-  TARGET_WIFI_TYPE=TEST
-  TARGET_CFLAGS +=-DIOPSYS_TEST
-else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
-  TARGET_PLATFORM=ECONET
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_ECONET
-else
-  $(info Unexpected CONFIG_TARGET, use default MAC80211)
-  TARGET_PLATFORM=MAC80211
-  TARGET_WIFI_TYPE=MAC80211
-  TARGET_CFLAGS +=-DIOPSYS_MAC80211
-endif
-
-export TARGET_PLATFORM
-export TARGET_WIFI_TYPE
-
-subdirs := \
-	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
-	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
-	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
-	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
-	$(if $(CONFIG_PACKAGE_libqos),libqos)
-
-EASY_SOC_LIBS := \
-	libeasy \
-	libwifi \
-	libdsl \
-	libethernet \
-	libqos
-
-ifeq ($(CONFIG_LIBWIFI_USE_CTRL_IFACE),y)
-  TARGET_CFLAGS +=-DLIBWIFI_USE_CTRL_IFACE
-endif
-
-TARGET_CFLAGS += \
-	-I$(STAGING_DIR)/usr/include \
-	-I$(STAGING_DIR)/usr/include/openssl \
-	-I$(STAGING_DIR)/usr/include/libnl3
-
-MAKE_FLAGS += \
-	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
-	LDFLAGS="$(TARGET_LDFLAGS)" \
-	FPIC="$(FPIC)" \
-	PLATFORM="$(TARGET_PLATFORM)" \
-	WIFI_TYPE="$(TARGET_WIFI_TYPE)" \
-	subdirs="$(subdirs)"
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-	rsync -r --exclude=.* ~/git/easy-soc-libs/ $(PKG_BUILD_DIR)/
-endef
-endif
-
-include easy.mk
-include wifi.mk
-include dsl.mk
-include ethernet.mk
-include qos.mk
-
-ifneq ($(wildcard $(PKG_BUILD_DIR)/.config_*),\
-	$(PKG_BUILD_DIR)/.config_$(patsubst "%",%,$(CONFIG_TARGET_PROFILE)))
-define Build/Compile/rebuild
-	$(FIND) $(PKG_BUILD_DIR) -name \*.o -or -name \*.so\* | $(XARGS) rm -f;
-	$(if $(wildcard $(PKG_BUILD_DIR)/config_*), \
-		rm -f $(PKG_BUILD_DIR)/.config_*)
-endef
-endif
-
-STAMP_CONFIGURED:=$(strip $(STAMP_CONFIGURED))_$(shell echo $(TARGET_CFLAGS) | mkhash md5)
-
-define Build/Compile
-	$(Build/Compile/rebuild)
-	touch $(PKG_BUILD_DIR)/.config_$(CONFIG_TARGET_PROFILE)
-	$(call Build/Compile/Default)
-	$(foreach dir,$(subdirs),$(call Build/Compile/$(dir)))
-endef
-
-define Build/InstallDev
-	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
-endef
-
-define Package/easy-soc-libs/install
-	:
-endef
-
-$(eval $(foreach e,$(EASY_SOC_LIBS),$(call BuildPackage,$(e))))

easy-soc-libs/dsl.mk

@@ -1,44 +0,0 @@
-
-define Package/libdsl
-  $(call Package/easy-soc-libs)
-  TITLE:= xDSL library (libdsl)
-endef
-
-define Package/libdsl/config
-  if PACKAGE_libdsl
-	  config LIBDSL_DEBUG
-		depends on PACKAGE_libdsl
-		bool "Enable dsl debugging"
-		default n
-
-	  config LIBDSL_TEST
-		depends on PACKAGE_libdsl
-		bool "Enable dsl test program"
-		default n
-
-  endif
-endef
-
-define Build/InstallDev/libdsl
-	$(INSTALL_DIR) $(1)/usr/include/xdsl
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xdsl.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/xtm.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/common.h $(1)/usr/include/xdsl
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-endef
-
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-define Build/Compile/libdsl
-	$(MAKE) -C "$(PKG_BUILD_DIR)/libdsl/test" $(MAKE_FLAGS)
-endef
-endif
-
-define Package/libdsl/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/bin
-	$(CP) $(PKG_BUILD_DIR)/libdsl/libdsl.so* $(1)/usr/lib/
-ifeq ($(CONFIG_LIBDSL_TEST),y)
-	$(CP) $(PKG_BUILD_DIR)/libdsl/test/libdsl_test $(1)/usr/bin/
-endif
-endef

easy-soc-libs/easy.mk

@@ -1,29 +0,0 @@
-
-
-define Package/libeasy
-  $(call Package/easy-soc-libs)
-  TITLE:= Common helper functions library (libeasy)
-  DEPENDS+=+libnl +libnl-route
-endef
-
-define Package/libeasy/config
-    source "$(SOURCE)/Config.in"
-endef
-
-define Build/InstallDev/libeasy
-	$(INSTALL_DIR) $(1)/usr/include/easy
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/easy.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/event.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/if_utils.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/debug.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/hlist.h $(1)/usr/include/easy/
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-
-define Package/libeasy/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libeasy/libeasy*.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/ethernet.mk

@@ -1,27 +0,0 @@
-
-define Package/libethernet
-  $(call Package/easy-soc-libs)
-  TITLE:= Ethernet library (libethernet)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_ramips:swconfig +TARGET_iopsys_econet:ecnt_api
-endef
-
-define Package/libethernet/config
-  config LIBETHERNET_DEBUG
-	depends on PACKAGE_libethernet
-	bool "Enable ethernet debugging"
-	default n
-
-endef
-
-define Build/InstallDev/libethernet
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/ethernet.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so $(1)/usr/lib/
-endef
-
-define Package/libethernet/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libethernet/libethernet.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/qos.mk

@@ -1,27 +0,0 @@
-
-define Package/libqos
-  $(call Package/easy-soc-libs)
-  TITLE:= QoS library (libqos)
-  DEPENDS+=+libnl +libnl-route +libeasy
-endef
-
-define Package/libqos/config
-  config LIBQOS_DEBUG
-	depends on PACKAGE_libqos
-	bool "Enable qos debugging"
-	default n
-
-endef
-
-define Build/InstallDev/libqos
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/include/qos.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libqos/libqos.so $(1)/usr/lib/
-endef
-
-define Package/libqos/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libqos/libqos*.so* $(1)/usr/lib/
-endef
-

easy-soc-libs/wifi.mk

@@ -1,29 +0,0 @@
-
-define Package/libwifi
-  $(call Package/easy-soc-libs)
-  TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_iopsys_brcm63xx_arm:bcmkernel
-endef
-
-define Package/libwifi/config
-  if PACKAGE_libdsl
-	  config LIBWIFI_DEBUG
-		depends on PACKAGE_libwifi
-		bool "Enable wifi debugging"
-		default n
-
-  endif
-endef
-
-define Build/InstallDev/libwifi
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
-endef
-
-define Package/libwifi/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
-endef
-

endptmngr/Config.in

@@ -1,4 +0,0 @@
-
-config ENDPT_OPEN
-       bool "Use pre-compiled version for Open SDK"
-       default n

endptmngr/Makefile

@@ -1,69 +0,0 @@
-#
-# Copyright (C) 2018 IOPSYS Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=endptmngr
-PKG_VERSION:=0.6
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=0901382048bb7ce01fc1767fef75e54692f56743
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=PROPRIETARY
-PKG_LICENSE_FILES:=LICENSE
-
-export BUILD_DIR
-
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_BUILD_PARALLEL:=1
-
-# 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
-
-export CONFIG_BRCM_SDK_VER_504040
-export CONFIG_BCM_CHIP_ID
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/endptmngr/config
-	source "$(SOURCE)/Config.in"
-endef
-
-define Package/endptmngr
-  CATEGORY:=Utilities
-  TITLE:=Broadcom Voice Endpoint Manager
-  URL:=
-  DEPENDS:= +libubox +ubus +libpicoevent +uci +bcmkernel @TARGET_HAS_VOICE @BCM_VOICE
-endef
-
-define Package/endptmngr/description
-	endptmngr
-endef
-
-ifeq ($(LOCAL_DEV),1)
-define Build/Prepare
-        rsync -av --exclude=.* ~/git/endptmngr/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-TARGET_CFLAGS += \
-        -Wall \
-        -Werror
-
-define Package/endptmngr/install
-	$(CP) ./files/* $(1)/
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/endptmngr $(1)/usr/sbin/
-endef
-
-$(eval $(call BuildPackage,endptmngr))

ethmngr/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ethmngr
-PKG_VERSION:=2.0.1
+PKG_VERSION:=2.1.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_VERSION:=5a0ff3bc7c49dcb05129f423ef8e0c4929f6aa03
@@ -23,7 +23,7 @@ define Package/ethmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=Ethernet status and configration utility
-  DEPENDS:=+libethernet +libuci +libubox +ubus +libpthread +libnl-genl
+  DEPENDS:=+(TARGET_brcmbca||TARGET_airoha||TARGET_ipq95xx||TARGET_mediatek):libethernet +libuci +libubox +ubus +libpthread +libnl-genl
 endef
 
 define Package/ethmngr/description
@@ -37,10 +37,22 @@ TARGET_CFLAGS += \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
 
+ifeq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_mediatek),)
+define Build/Compile
+endef
+endif
+
 define Package/ethmngr/install
-	$(INSTALL_DIR) $(1)/etc/init.d $(1)/usr/sbin
-	$(INSTALL_BIN) ./files/ethmngr.init $(1)/etc/init.d/ethmngr
+	$(CP) ./files/common/* $(1)/
+ifneq ($(CONFIG_TARGET_brcmbca),)
+	$(CP) ./files/broadcom/* $(1)/
+else
+	$(CP) ./files/linux/* $(1)/
+endif
+ifneq ($(CONFIG_TARGET_brcmbca)$(CONFIG_TARGET_airoha)$(CONFIG_TARGET_ipq95xx)$(CONFIG_TARGET_mediatek),)
+	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/ethmngr $(1)/usr/sbin/
+endif
 endef
 
 $(eval $(call BuildPackage,ethmngr))

ethmngr/files/broadcom/lib/ethernet/broadcom.sh

@@ -0,0 +1,144 @@
+# arg1: port ifname, ex: eth0
+get_max_port_speed() {
+	if [ -z "$1" ]; then
+		echo 0
+		return
+	fi
+
+	local ifname="$1"
+	local phycap="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Speed Capabilities' | awk '{print$NF}')"
+	local speed=1000
+
+	case "$phycap" in
+		10GFD*) speed=10000 ;;
+		5GFD*) speed=5000 ;;
+		2.5GFD*) speed=2500 ;;
+		1GFD*) speed=1000 ;;
+		100MFD*|100MHD*) speed=100 ;;
+		10MFD*|10MHD*) speed=10 ;;
+	esac
+
+	echo $speed
+}
+
+# arg1: port name, ex: eth0
+get_port_number() {
+	[ -z "$1" ] && return
+	local ports="0 1 2 3 4 5 6 7 8"
+	local units="0 1"
+	local port="$1"
+	local ifname
+
+	for unit in $units; do
+		for prt in $ports; do
+			ifname="$(ethswctl getifname $unit $prt 2>/dev/null | awk '{print$NF}')"
+			if [ "$ifname" == "$port" ]; then
+				echo "$unit $prt"
+				return
+			fi
+		done
+	done
+}
+
+# arg1: port ifname, ex: eth0
+reset_port() {
+        local ifname="$1"
+        ethctl $ifname phy-reset >/dev/null
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+power_updown() {
+	local ifname="$1"
+	local enabled=$2
+
+	local updown="up"
+	[ $enabled -eq 0 ] && updown="down"
+	ethctl $ifname phy-power $updown >/dev/null
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+# arg3: port speed, ex: 1000
+# arg4: port duplex, ex: full
+# arg5: port autoneg, ex: on
+# arg6: port eee, ex: 0
+# arg7: port pause, ex: 0
+set_port_settings() {
+	local ifname="$1"
+	local enabled=$2
+	local speed="$3"
+	local duplex=$4
+	local autoneg=$5
+	local eee=$6
+	local pause=$7
+
+	[ -d /sys/class/net/$ifname ] || return
+
+	local unitport="$(get_port_number $ifname)"
+	local unit=$(echo $unitport | cut -d ' ' -f 1)
+	local port=$(echo $unitport | cut -d ' ' -f 2)
+
+	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
+	[ "$duplex" == "half" ] && duplex=0 || duplex=1
+	[ "$duplex" == 0 ] && dplx="HD" || dplx="FD"
+	[ "$autoneg" == "on" ] && media_type="auto" || media_type="$speed$dplx"
+
+	phycaps="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Speed Capabilities' | awk '{print$NF}')"
+	numofcaps="$(echo $phycaps | tr ':' ' ' | wc -w)"
+
+        # Reset the port before setting new params
+        reset_port $ifname
+
+	if [ "$numofcaps" == "1" ]; then
+		logger -t "ethmngr" "$ifname is capable of $phycaps only; not setting speed/duplex"
+	else
+		logger -t "ethmngr" "$ifname is capable of $phycaps; setting speed/duplex to $media_type"
+		ethctl $ifname media-type $media_type ${pyhendpoint:+ port $pyhendpoint} &>/dev/null
+	fi
+
+	[ $eee -eq 1 ] && eee="on" || eee="off"
+	ethtool --set-eee $ifname eee $eee 2>/dev/null
+
+	case $pause in
+		off|0)
+			pause=0x0
+			auto=off
+			rx=off
+			tx=off
+		;;
+		on|1)
+			pause=0x2
+			auto=off
+			rx=on
+			tx=on
+		;;
+		auto)
+			pause=0x1
+			auto=on
+			rx=on
+			tx=on
+		;;
+		tx)
+			pause=0x3
+			auto=off
+			rx=off
+			tx=on
+		;;
+		rx)
+			pause=0x4
+			auto=off
+			rx=on
+			tx=off
+		;;
+	esac
+	if [ "$auto" == "on" ]; then
+		# Use ethswctl utility to set pause autoneg
+		# as ethtool is not setting it properly
+		ethswctl -c pause -n $unit -p $port -v $pause 2>&1 >/dev/null
+	else
+		ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
+	fi
+
+	power_updown $ifname $enabled
+}

ethmngr/files/common/etc/init.d/ethmngr

@@ -1,12 +1,15 @@
 #!/bin/sh /etc/rc.common
 
 START=15
+STOP=90
+
 USE_PROCD=1
+PROG=/usr/sbin/ethmngr
 
 . /lib/functions.sh
-include /lib/network
+include /lib/ethernet
 
-configure_ports(){
+configure_ethernet_port(){
 	local cfg=$1
 	local ifname enabled speed duplex autoneg eee pause
 
@@ -24,11 +27,22 @@ configure_ports(){
 }
 
 start_service() {
-	[ -f /lib/network/port.sh ] || return
+	if [ -s /etc/config/ports ]; then
+		config_load ports
+		config_foreach configure_ethernet_port ethport
+	fi
 
-	config_load ports
-	config_foreach configure_ports ethport
-	config_foreach configure_ports sfpport
+	if [ -f $PROG ]; then
+		procd_open_instance
+		procd_set_param command ${PROG}
+		procd_set_param respawn
+		procd_close_instance
+	fi
+}
+
+reload_service() {
+        stop
+        start
 }
 
 service_triggers() {

ethmngr/files/common/etc/uci-defaults/15-ports-config-generate

@@ -2,7 +2,8 @@
 
 populate_config_from_db() {
 	. /lib/functions.sh
-	include /lib/network
+	. /lib/network/utils.sh
+	include /lib/ethernet
 
 	portorder="$(db -q get hw.board.ethernetPortOrder)"
 	for port in $portorder; do

ethmngr/files/ethmngr.init

@@ -1,19 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=95
-STOP=10
-
-USE_PROCD=1
-PROG=/usr/sbin/ethmngr
-
-start_service() {
-	procd_open_instance
-	procd_set_param command ${PROG}
-	procd_set_param respawn
-	procd_close_instance
-}
-
-reload_service() {
-        stop
-        start
-}

ethmngr/files/linux/lib/ethernet/linux.sh

@@ -0,0 +1,95 @@
+# arg1: port ifname, ex: eth0
+get_max_port_speed() {
+	if [ -z "$1" ]; then
+		echo 0
+		return
+	fi
+
+	local ifname="$1"
+	local phycap="$(ethtool $ifname | grep -A 10 "Supported link modes" | grep 00 | tail -n 1 | awk '{print$NF}')"
+	local speed=1000
+
+	case "$phycap" in
+		10000*) speed=10000 ;;
+		5000*) speed=5000 ;;
+		2500*) speed=2500 ;;
+		1000*) speed=1000 ;;
+		100*) speed=100 ;;
+		10*) speed=10 ;;
+	esac
+
+	echo $speed
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+power_updown() {
+	local ifname="$1"
+	local enabled=$2
+
+	local updown="up"
+	[ $enabled -eq 0 ] && updown="down"
+	ip link set dev $ifname $updown
+}
+
+# arg1: port ifname, ex: eth0
+# arg2: port enabled, ex: 1
+# arg3: port speed, ex: 1000
+# arg4: port duplex, ex: full
+# arg5: port autoneg, ex: on
+# arg6: port eee, ex: 0
+# arg7: port pause, ex: 0
+set_port_settings() {
+	local ifname="$1"
+	local enabled=$2
+	local speed="$3"
+	local duplex=$4
+	local autoneg=$5
+	local eee=$6
+	local pause=$7
+
+	[ -d /sys/class/net/$ifname ] || return
+
+	[ $autoneg -eq 1 ] && autoneg="on" || autoneg="off"
+	ethtool --change $ifname speed $speed duplex $duplex autoneg $autoneg
+
+	[ $eee -eq 1 ] && eee="on" || eee="off"
+	ethtool --set-eee $ifname eee $eee 2>/dev/null
+
+	case $pause in
+		off|0)
+			pause=0x0
+			auto=off
+			rx=off
+			tx=off
+		;;
+		on|1)
+			pause=0x2
+			auto=off
+			rx=on
+			tx=on
+		;;
+		auto)
+			pause=0x1
+			auto=on
+			rx=on
+			tx=on
+		;;
+		tx)
+			pause=0x3
+			auto=off
+			rx=off
+			tx=on
+		;;
+		rx)
+			pause=0x4
+			auto=off
+			rx=on
+			tx=off
+		;;
+	esac
+
+	ethtool --pause $ifname autoneg $auto rx $rx tx $tx 2>/dev/null
+
+	power_updown $ifname $enabled
+}

evoice/Makefile

@@ -1,106 +0,0 @@
-#
-# Copyright (C) 2022 IOPSYS Software Solutions AB
-#
-
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=evoice
-PKG_VERSION:=0.2.30
-
-LOCAL_DEV=0
-LOCAL_DEV_EVOICE_DIR=~/voip/evoice
-
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=ee4e9e00ec1c54b41e15a3de38f6a733634622dd
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-endif
-
-PKG_LICENSE:=PROPRIETARY IOPSYS
-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 +libopenssl +libjson-c +libblobmsg-json\
-		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
-		+TARGET_iopsys_econet:kmod-voip_driver\
-		+TARGET_iopsys_econet:voip_app +libbbf_api
-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 set LOCAL_DEV_EVOICE_DIR to your own git repository.
-define Build/Prepare
-	@echo "======================================================="
-	@echo "DEVELOPMENT BUILD! rsync $(LOCAL_DEV_EVOICE_DIR) to $(PKG_BUILD_DIR)"
-	@echo "======================================================="
-	rsync -a $(LOCAL_DEV_EVOICE_DIR)/* $(PKG_BUILD_DIR)/
-endef
-endif
-
-IDIR = $(STAGING_DIR)/usr/include
-TONES_INI_REQUIRED=
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-	TARGET_PLATFORM=BROADCOM
-	BDIR = bcm963xx/userspace/private/apps/voice
-	CC_FLAGS = -I$(IDIR) -I$(IDIR)/$(BDIR)/inc\
-		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
-		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
-	TRG=SVrgBcmFxs
-	JSONFILE=codecs_brcm.json
-else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
-	TARGET_PLATFORM=ECONET
-	TONES_INI_REQUIRED=y
-	TRG=SVrgMtekOwrt
-	JSONFILE=codecs_airoha.json
-endif
-
-# disable temporarily some not important warnings, force PIC
-CC_FLAGS_VS=$(CC_FLAGS) -Wno-unused-parameter -Wno-unused-function -fPIC
-
-export TARGET_PLATFORM
-
-#used and altered by BIDE makefiles
-export _XFLAGS
-
-BIDE_MAKE_OPTS = -r -R -C $(PKG_BUILD_DIR) -f _bld/src/cdabs.mk\
-	SWB=b_gxxqca6 HWA=a_openwrt HWC=c_hosted OSP=p_posix LIF=cerder DBG=dbg
-
-define Build/Compile
-	@echo "TARGET_PLATFORM=${TARGET_PLATFORM}"
-	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS)" TRG=$(TRG)
-
-	@echo "clean libvoiceservice before building shared lib!"
-	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice cleanall
-	+$(MAKE) $(BIDE_MAKE_OPTS) CC_FLAGS="$(CC_FLAGS_VS)" TRG=libvoiceservice
-endef
-
-define Package/evoice/install
-	$(CP) ./files/* $(1)/
-	$(if $(TONES_INI_REQUIRED),,$(RM) $(1)/etc/evoice/tones.ini)
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(CP) $(1)/lib/voice/$(JSONFILE) $(1)/lib/voice/codecs_evoice.json
-	$(RM) $(1)/lib/voice/codecs_brcm.json
-	$(RM) $(1)/lib/voice/codecs_airoha.json
-	$(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

@@ -1,327 +0,0 @@
-
-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 CodecProfile '1CodecProfile1'
-	option Enable '1'
-	option Codec 'G.711ALaw'
-	option PacketizationPeriod '20'
-	option SilenceSupression '1'
-
-config CodecProfile '1CodecProfile2'
-	option Enable '1'
-	option Codec 'G.711MuLaw'
-	option PacketizationPeriod '20'
-	option SilenceSupression '1'
-
-config CodecProfile '1CodecProfile3'
-	option Enable '1'
-	option Codec 'G.726'
-	option PacketizationPeriod '20'
-	option SilenceSupression '0'
-
-config CodecProfile '1CodecProfile4'
-	option Enable '1'
-	option Codec 'G.722'
-	option PacketizationPeriod '20'
-	option SilenceSupression '0'
-
-config CodecProfile '1CodecProfile5'
-	option Enable '1'
-	option Codec 'G.729'
-	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 'US'
-
-config FXSPorts 'FXS1'
-	option Enable '1'
-	option DialType 'Tone'
-	option TransmitGain '0'
-	option ReceiveGain '0'
-	option EchoCancellationEnable '1'
-
-config FXSPorts 'FXS2'
-	option Enable '1'
-	option DialType 'Tone'
-	option TransmitGain '0'
-	option ReceiveGain '0'
-	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 '0'
-	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 '2PrefixInfo1'
-	list PrefixList '2PrefixInfo2'
-	list PrefixList '2PrefixInfo3'
-	list PrefixList '2PrefixInfo4'
-	list PrefixList '2PrefixInfo5'
-	list PrefixList '2PrefixInfo6'
-	list PrefixList '2PrefixInfo7'
-	list PrefixList '2PrefixInfo8'
-	list PrefixList '2PrefixInfo9'
-
-config NumberingPlan 'NumberingPlan3'
-	option MinimumNumberOfDigits '5'
-	option MaximumNumberOfDigits '15'
-	option InterDigitTimerStd '2000'
-	option InterDigitTimerOpen '2000'
-	option TerminationDigit '#'
-	list PrefixList '3PrefixInfo1'
-
-config PrefixInfo '2PrefixInfo1'
-	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 '2PrefixInfo2'
-	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 '2PrefixInfo3'
-	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 '2PrefixInfo4'
-	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 '2PrefixInfo5'
-	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 '2PrefixInfo6'
-	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 '2PrefixInfo7'
-	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 '2PrefixInfo8'
-	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 '2PrefixInfo9'
-	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 '3PrefixInfo1'
-	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

@@ -1,174 +0,0 @@
-# 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 HW_VoiceDSP 'hw.board.VoiceDSP'
-   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 fxsinfo 'map_fxs'
-   option Enable 'voice.FXS@.Enable'
-   option DialType 'voice.FXS@.DialType'
-   option TransmitGain 'voice.FXS@.TransmitGain'
-   option ReceiveGain  'voice.FXS@.ReceiveGain'
-   option EchoCancellationEnable 'voice.FXS@.EchoCancellationEnable'
-
-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'
-   option CallerIDEnable 'voice.Set@.CallerIDEnable'
-
-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

@@ -1,57 +0,0 @@
-config static_prm 'defaults'
-   option Print_Control '4'
-   option Print_UDP_Addr '192.168.1.3'
-   option Print_UDP_Port '60000'
-   option Verbosity 'On'
-   option Failure_Log 'On'
-   option Message_Log 'On'
-   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 CallerIDEnable '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

@@ -1,32 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=68
-STOP=12
-
-USE_PROCD=1
-NAME=evoice
-VOICE_UCI_CONFIG=voice
-
-start_service() {
-	[ "$(db -q get hw.board.hasVoice)" = "1" ] || return
-
-
-	which endptmngr >/dev/null 2>&1 && {
-		echo "evoice can't be started since endptmngr is installed. Please remove endptmngr and retry"
-		return
-	}
-
-	procd_open_instance
-	procd_set_param command $NAME
-	procd_set_param respawn "5" "0" "3"
-	procd_close_instance
-}
-
-reload_service() {
-	stop
-	start
-}
-
-service_triggers() {
-	procd_add_reload_trigger $VOICE_UCI_CONFIG
-}

evoice/files/lib/voice/codecs_airoha.json

@@ -1,50 +0,0 @@
-{
-	"G.711ALaw": [
-		{
-			"BitRate": 64000,
-			"PacketizationPeriod": "20",
-			"SilenceSuppression": false
-		}
-	],
-	"G.711MuLaw": [
-		{
-			"BitRate": 64000,
-			"PacketizationPeriod": "20",
-			"SilenceSuppression": false
-		}
-	],
-	"G.722": [
-		{
-			"BitRate": 64000,
-			"PacketizationPeriod": "20",
-			"SilenceSuppression": false
-		}
-	],
-	"G.726": [
-		{
-			"BitRate": 32000,
-			"PacketizationPeriod": "20",
-			"SilenceSuppression": false
-		},
-		{
-			"BitRate": 24000,
-			"PacketizationPeriod": "20",
-			"SilenceSuppression": false
-		}
-	],
-	"G.729": [
-		{
-			"BitRate": 8000,
-			"PacketizationPeriod": "20",
-			"SilenceSuppression": false
-		}
-	],
-	"AMR": [
-		{
-			"BitRate": 7400,
-			"PacketizationPeriod": "20",
-			"SilenceSuppression": false
-		}
-	]
-}
-

evoice/files/lib/voice/codecs_brcm.json

@@ -1,140 +0,0 @@
-{
-	"G.711Mulaw": [
-		{
-			"BitRate": 64000,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"G.711alaw": [
-		{
-			"BitRate": 64000,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"G.726": [
-		{
-			"BitRate": 16000,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 24000,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 32000,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 40000,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"G.723.1": [
-		{
-			"BitRate": 5300,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 6300,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"G.729": [
-		{
-			"BitRate": 8000,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"iLBC": [
-		{
-			"BitRate": 15200,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 13300,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"G.722": [
-		{
-			"BitRate": 64000,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"AMR": [
-		{
-			"BitRate": 12200,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 10200,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 7950,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 7400,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 6700,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 5900,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 5150,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		},
-		{
-			"BitRate": 4750,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"GSM-EFR": [
-		{
-			"BitRate": 12200,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"GSM-FR": [
-		{
-			"BitRate": 13200,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	],
-	"GSM-HR": [
-		{
-			"BitRate": 5600,
-			"PacketizationPeriod": "10-30",
-			"SilenceSuppression": true
-		}
-	]
-}
-

gryphon-led-module/Makefile

@@ -28,7 +28,7 @@ define KernelPackage/$(PKG_NAME)
   FILES:=$(PKG_BUILD_DIR)/$(PKG_NAME).$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_PACKAGE_kmod-gryphon-led-kernel-module=y
   AUTOLOAD:=$(call AutoLoad,60,$(PKG_NAME))
-  DEPENDS:= +(TARGET_iopsys_brcm63xx_arm):bcmkernel
+  DEPENDS:= +(TARGET_brcmbca):bcmkernel
   PKG_LICENSE:=GPLv2
   PKG_LICENSE_URL:=
 endef
@@ -41,32 +41,8 @@ EXTRA_KCONFIG:= CONFIG_RGB_LED=m
 
 MODULE_INCLUDE=-I$(PKG_BUILD_DIR)
 
-
-ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
-	LINUX_DIR:=$(BUILD_DIR)/bcmkernel/bcm963xx/kernel/linux-4.19
-	# This assumes that the MODULES_SUBDIR set by OpenWrt is of the form
-	# lib/modules/4.19.235-abcdef where 4.19.235 is the version of our fake bcmlinux kernel
-	# and abcdef the git-commit.
-	# The kernel compiled by the Broadcom SDK has a uname -r of 4.19.235, i.e. without the git-commit.
-	# The assignment below removes the part after the - which puts modules in the right directory as
-	# long as the bcmlinux version matches the kernel version in the BCM SDK.
-	# So, this will only stop working in the time window where the BCM SDK has been updated
-	# but bcmlinux has not yet been updated.
-	MODULES_SUBDIR:=$(firstword $(subst -, ,$(MODULES_SUBDIR)))
-	TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARM_TOOLCHAIN_PREFIX)-
-
-	ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"63158" "6856" "6858"))
-		# These targets use a 64-bit kernel
-		LINUX_KARCH:=arm64
-		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_AARCH64_TOOLCHAIN_PREFIX)-
-	else ifeq ($(CONFIG_BCM_CHIP_ID),$(filter $(CONFIG_BCM_CHIP_ID),"6855" "6756" "47622" "63148" "63178"))
-		# These targets use a 32-bit arm-sfp kernel
-		LINUX_KARCH:=arm
-		TARGET_CROSS:=$(CONFIG_BRCM_ALT_TOOLCHAIN_BASE)/$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_TOPDIR)/bin/$(CONFIG_BRCM_ALT_ARMSFP_TOOLCHAIN_PREFIX)-
-	endif
-	# For some reason, Broadcom's kernel does not set the include paths correctly when compiling out-of-tree modules
-	EXTRA_KCPPFLAGS:="-I $(LINUX_DIR)/../bcmkernel/include -I $(LINUX_DIR)/arch/arm/mach-bcm963xx/include"
-endif
+# support compilation against BCM SDK kernel
+include ../../broadcom/bcmkernel/bcm-kernel-toolchain.mk
 
 define Build/Prepare
 	mkdir -p $(PKG_BUILD_DIR)/kdevlinks/

gryphon-led-module/src/main.c

@@ -220,7 +220,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->clock_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
 				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
 		return PTR_ERR(leds->clock_gpio);
 	}
 
@@ -228,7 +227,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->clock_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire clock GPIO %ld\n",
 				PTR_ERR(leds->clock_gpio));
-		leds->clock_gpio = NULL;
 		return PTR_ERR(leds->clock_gpio);
 	} else {
 		printk(KERN_INFO "Got clock gpio\n");
@@ -246,7 +244,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->data_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
 				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
 		return PTR_ERR(leds->data_gpio);
 	}
 
@@ -254,7 +251,6 @@ static int canyon_led_probe(struct platform_device *pdev)
 	if (IS_ERR(leds->data_gpio)) {
 		dev_err(&pdev->dev, "Failed to acquire data GPIO %ld\n",
 				PTR_ERR(leds->data_gpio));
-		leds->data_gpio = NULL;
 		return PTR_ERR(leds->data_gpio);
 	} else {
 		printk(KERN_INFO "Got data gpio\n");

hostmngr/Makefile

@@ -0,0 +1,75 @@
+#
+# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=hostmngr
+PKG_VERSION:=1.0.5
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=fcfcbc54e2f7a7bec9c599181f2d2c735eb41dda
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
+endif
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_LICENSE:=BSD-3-Clause
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+
+define Package/hostmngr
+  SECTION:=utils
+  CATEGORY:=Utilities
+  TITLE:=Show and manage hosts in the network
+  DEPENDS= +libubox +libuci +libubus +ubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +libnfnetlink +libmnl \
+	   +libnetfilter-conntrack \
+	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api
+
+endef
+
+define Package/hostmngr/config
+  source "$(SOURCE)/Config.in"
+endef
+
+define Package/hostmngr/description
+ This package provides hostmngr that can detect and show host devices
+ present in the network.
+endef
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/libnl3 \
+	-I$(STAGING_DIR)/usr/include/libnetfilter_conntrack \
+	-D_GNU_SOURCE
+
+ifeq ($(CONFIG_HOSTMNGR_PLATFORM_HAS_WIFI),y)
+TARGET_CFLAGS += -DHAS_WIFI
+endif
+
+MAKE_PATH:=src
+
+define Package/hostmngr/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/hostmngr/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1)/etc/hostmngr/
+	$(INSTALL_DATA) ./files/etc/hostmngr/input.json $(1)/etc/hostmngr/	
+	$(INSTALL_DATA) ./files/lib/hosts/hosts_acl.sh $(1)/lib/hosts/
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        rsync -r --exclude=.* ~/git/hostmngr/ $(PKG_BUILD_DIR)/
+endef
+endif
+
+$(eval $(call BuildPackage,hostmngr))

hostmngr/files/etc/init.d/hostmngr

@@ -0,0 +1,34 @@
+#!/bin/sh /etc/rc.common
+
+START=97
+STOP=20
+
+. /etc/bbfdm/bbfdm_services.sh
+. /lib/hosts/hosts_acl.sh
+
+USE_PROCD=1
+
+HOSTS_JSON_INPUT="/etc/hostmngr/input.json"
+
+start_service() {
+	procd_open_instance
+	procd_set_param command "/usr/sbin/hostmngr" "--config hosts" "-o"  "/tmp/hostmngr.log" "-f"
+#	procd_set_param respawn
+	procd_set_param limits core="unlimited"
+#	procd_set_param stdout 1
+#	procd_set_param stderr 1
+	procd_close_instance
+	
+	bbfdm_add_service "bbfdm.hosts" "${HOSTS_JSON_INPUT}"
+	hosts_acl
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "hosts"
+}
+
+reload_service() {
+	stop
+	start
+}

icwmp/Makefile

@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2020-2022 IOPSYS Software Solutions AB
+# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
 #
 # This is free software, licensed under the BSD-3-Clause
 # See /LICENSE for more information.
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.0.5
+PKG_VERSION:=9.3.8.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=f590a3f64d9c0b80c3a41336e6fabbbff48868e5
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
+PKG_SOURCE_VERSION:=4f4a43b31d5ff18ee5814acc21683dc30eaa6b33
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -29,33 +29,44 @@ define Package/icwmp/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=TR069 CWMP client
-  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml
+  DEPENDS:=+libuci +libubox +libblobmsg-json +libubus +libjson-c +libcurl +mxml +libuuid +libbbfdm-api
+endef
+
+define Package/icwmp
+  $(Package/icwmp/default)
+  VARIANT:=default
+  DEFAULT_VARIANT:=1
+  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
 endef
 
 define Package/icwmp-openssl
   $(Package/icwmp/default)
   TITLE += (openssl)
-  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
   VARIANT:=openssl
+  DEPENDS += +PACKAGE_icwmp-openssl:libopenssl
+  CONFLICTS := icwmp icwmp-mbedtls icwmp-wolfssl
 endef
 
 define Package/icwmp-wolfssl
   $(Package/icwmp/default)
   TITLE += (wolfssl)
-  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
-  CONFLICTS := icwmp-openssl
   VARIANT:=wolfssl
+  DEPENDS += +PACKAGE_icwmp-wolfssl:libwolfssl
+  CONFLICTS := icwmp icwmp-mbedtls icwmp-openssl
 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
+  CONFLICTS := icwmp icwmp-wolfssl icwmp-openssl
 endef
 
+ifeq ($(BUILD_VARIANT),default)
+CMAKE_OPTIONS += -DWITH_OPENSSL=ON
+endif
+
 ifeq ($(BUILD_VARIANT),openssl)
 CMAKE_OPTIONS += -DWITH_OPENSSL=ON
 endif
@@ -83,6 +94,9 @@ define Package/icwmp/default/install
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(INSTALL_DIR) $(1)/etc/bbfdm/json/
+	$(INSTALL_DIR) $(1)/etc/udhcpc.user.d
+	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/libcwmpdm.so $(1)/usr/lib/bbfdm/libcwmpdm.so
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/icwmpd $(1)/usr/sbin/icwmpd
 	$(INSTALL_DATA) ./files/etc/config/cwmp $(1)/etc/config/cwmp
 	$(INSTALL_BIN) ./files/etc/firewall.cwmp $(1)/etc/firewall.cwmp
@@ -92,12 +106,16 @@ define Package/icwmp/default/install
 	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/icwmp $(1)/lib/upgrade/keep.d/icwmp
 	$(INSTALL_BIN) ./files/etc/icwmpd/update.sh $(1)/etc/icwmpd/update.sh
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/CWMPManagementServer.json $(1)/etc/bbfdm/json/
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt125.user
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/files/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user $(1)/etc/udhcpc.user.d/udhcpc_icwmp_opt43.user
 endef
 
+Package/icwmp/install = $(Package/icwmp/default/install)
 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

@@ -11,8 +11,6 @@ config acs 'acs'
 	option retry_min_wait_interval '5'
 	#­ possible configs interval :[1000:65535]
 	option retry_interval_multiplier '2000'
-	option ipv6_enable '0'
-	option ip_version '4'
 
 config cpe 'cpe'
 	option enable '1'
@@ -38,6 +36,7 @@ config cpe 'cpe'
 	option periodic_notify_enable '1'
 	option periodic_notify_interval '10'
 	option incoming_rule 'Port_Only'
+	option active_notif_throttle '0'
 	
 config lwn 'lwn'
 	option enable '1'

icwmp/files/etc/firewall.cwmp

@@ -5,14 +5,14 @@ log() {
 	echo "${@}"|logger -t firewall.cwmp -p info
 }
 
-if [ ! -f "/var/state/cwmp" ]; then
+if [ ! -f "/var/state/icwmp" ]; then
 	exit 0;
 fi
 
-zone_name=$(uci -c /var/state -q get cwmp.acs.zonename)
+zone_name=$(uci -c /var/state -q get icwmp.acs.zonename)
 port=$(uci -q get cwmp.cpe.port)
-ipaddr=$(uci -c /var/state -q get cwmp.acs.ip)
-ip6addr=$(uci -c /var/state -q get cwmp.acs.ip6)
+ipaddr=$(uci -c /var/state -q get icwmp.acs.ip)
+ip6addr=$(uci -c /var/state -q get icwmp.acs.ip6)
 incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
 
 if [ -z "${zone_name}" ]; then
@@ -20,13 +20,13 @@ if [ -z "${zone_name}" ]; then
 	exit 0
 elif [ "$zone_name" = "icwmp" ]; then
 	iptables -nL zone_icwmp_input 2> /dev/null
-	if [ $? != 0 ]; then
+	if [ "$?" != 0 ]; then
 		iptables -w 1 -N zone_icwmp_input
 		iptables -w 1 -t filter -A INPUT -j zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -w 1 -I zone_icwmp_input -p tcp --dport "${port}" -j REJECT
 	else			
 		iptables -w 1 -F zone_icwmp_input
-		iptables -w 1 -I zone_icwmp_input -p tcp --dport $port -j REJECT
+		iptables -w 1 -I zone_icwmp_input -p tcp --dport "${port}" -j REJECT
 	fi			
 else
 	iptables -w 1 -F zone_icwmp_input 2> /dev/null
@@ -64,17 +64,17 @@ else
 	fi
 fi
 
-echo ${cmd}|grep -q "\-\-dport \|\-s "
+echo "${cmd}"|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd}
 fi
 
-echo ${cmd6}|grep -q "\-\-dport \|\-s "
+echo "${cmd6}"|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd6}
 fi
 
-uci -c /var/state -q set cwmp.cpe.firewall_restart="init"
-uci -c /var/state -q commit cwmp
+uci -c /var/state -q set icwmp.cpe.firewall_restart="init"
+uci -c /var/state -q commit icwmp

icwmp/files/etc/icwmpd/update.sh

@@ -14,16 +14,21 @@ handle_icwmp_update() {
 		return 0
 	fi
 
-	status="$(ubus call tr069 status |jsonfilter -qe '@.last_session.status')"
-	if [ "$status" != "running" ]; then
-		log "Trigger out of bound inform, since last inform status was failure"
-		ubus -t 10 call tr069 inform >/dev/null 2>&1
-		# Handle timeout or tr069 object not found
-		if [ "$?" -eq 7 ] || [ "$?" -eq 4 ]; then
-			log "Restarting icwmp tr069 object"
-			/etc/init.d/icwmpd restart
+	# wait for some time to avoid interface fluctuation
+	sleep 10
+	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
+
+	if [ "$ret" = "true" ]; then
+		# read status from var/state/icwmp
+		status=$(uci -q -c /var/state get icwmp.sess_status.current_status)
+		if [ "$status" != "running" ]; then
+			log "Trigger out of bound inform, since last inform status was failure"
+			ubus -t 10 call tr069 inform >/dev/null 2>&1
 		fi
+	else
+		log "Restarting icwmp tr069 object"
+		/etc/init.d/icwmpd restart
 	fi
 }
 
-handle_icwmp_update $@
+handle_icwmp_update "$@"

icwmp/files/etc/init.d/icwmpd

@@ -23,22 +23,22 @@ regenerate_ssl_link()
 	[ ! -d "${cert_dir}" ] && return 0;
 
 	### Generate all ssl link for pem certicates ###
-	all_file=$(ls $cert_dir/*.pem 2>/dev/null)
+	all_file=$(ls "${cert_dir}"/*.pem 2>/dev/null)
 	if [ -n "${all_file}" ]; then
 		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in $cfile)"
-			[ -f ${cert_dir}/${rehash}.0 ] || \
-				ln -s $cfile $cert_dir/${rehash}.0
+			rehash="$(openssl x509 -hash -noout -in "${cfile}")"
+			[ -f "${cert_dir}"/"${rehash}".0 ] || \
+				ln -s "${cfile}" "${cert_dir}"/"${rehash}".0
 		done
 	fi
 
 	### Generate all ssl link for crt certicates ###
-	all_file=$(ls $cert_dir/*.crt 2>/dev/null)
+	all_file=$(ls "${cert_dir}"/*.crt 2>/dev/null)
 	if [ -n "${all_file}" ]; then
 		for cfile in $all_file; do
-			rehash="$(openssl x509 -hash -noout -in $cfile)"
-			[ -f ${cert_dir}/${rehash}.0 ] || \
-				ln -s $cfile $cert_dir/${rehash}.0
+			rehash="$(openssl x509 -hash -noout -in "${cfile}")"
+			[ -f "${cert_dir}"/"${rehash}".0 ] || \
+				ln -s "${cfile}" "${cert_dir}"/"${rehash}".0
 		done
 	fi
 }
@@ -47,8 +47,8 @@ enable_dhcp_option43() {
 	local wan="${1}"
 
 	### Ask for DHCP Option 43 only if CWMP is enabled ###
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local proto="$(uci -q get network.$wan.proto)"
+	local reqopts="$(uci -q get network."${wan}".reqopts)"
+	local proto="$(uci -q get network."${wan}".proto)"
 	local newreqopts=""
 	local option43_present=0
 
@@ -64,8 +64,8 @@ enable_dhcp_option43() {
 	fi
 
 	newreqopts="$reqopts 43"
-	if [ "${proto}" == "dhcp" ]; then
-		uci -q set network.$wan.reqopts="$newreqopts"
+	if [ "${proto}" = "dhcp" ]; then
+		uci -q set network."${wan}".reqopts="$newreqopts"
 		uci commit network
 		ubus call network reload
 	fi
@@ -77,7 +77,7 @@ convert_to_hex() {
 	OPTIND=1
 	while getopts ":" opt "-$optval"
 	do
-		temp=$(printf "%X" "'${OPTARG:-:}")
+		temp=$(printf "%02X" "'${OPTARG:-:}")
 		val="${val}:${temp}"
 	done
 
@@ -122,25 +122,25 @@ configure_send_op125() {
 	serial_len=$(echo -n "${serial}" | wc -m)
 	class_len=$(echo -n "${class}" | wc -m)
 
-	if [ ${oui_len} -eq 0 ] || [ ${serial_len} -eq 0 ]; then
+	if [ "${oui_len}" -eq 0 ] || [ "${serial_len}" -eq 0 ]; then
 		return 0
 	fi
 
 	opt125_len=$((oui_len + serial_len + class_len))
-	if [ ${class_len} -gt 0 ]; then
+	if [ "${class_len}" -gt 0 ]; then
 		opt125_len=$((opt125_len + 6))
 	else
 		opt125_len=$((opt125_len + 4))
 	fi
 
-	hex_opt125_len=$(printf "%X" "${opt125_len}")
+	hex_opt125_len=$(printf "%02X" "${opt125_len}")
 	opt125="${opt125}:${hex_opt125_len}"
 	hex_oui=$(convert_to_hex "${oui}")
 	if [ -z "${hex_oui}" ]; then
 		return 0
 	fi
 
-	hex_oui_len=$(printf "%X" "${oui_len}")
+	hex_oui_len=$(printf "%02X" "${oui_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:01:${hex_oui_len}${hex_oui}"
 	else
@@ -152,20 +152,20 @@ configure_send_op125() {
 		return 0
 	fi
 
-	hex_serial_len=$(printf "%X" "${serial_len}")
+	hex_serial_len=$(printf "%02X" "${serial_len}")
 	if [ "${uci}" = "network" ]; then
 		opt125="${opt125}:02:${hex_serial_len}${hex_serial}"
 	else
 		opt125="${opt125}:05:${hex_serial_len}${hex_serial}"
 	fi
 
-	if [ ${class_len} -gt 0 ]; then
+	if [ "${class_len}" -gt 0 ]; then
 		hex_class=$(convert_to_hex "${class}")
 		if [ -z "${hex_class}" ]; then
 			return 0
 		fi
 
-		hex_class_len=$(printf "%X" "${class_len}")
+		hex_class_len=$(printf "%02X" "${class_len}")
 		if [ "${uci}" = "network" ]; then
 			opt125="${opt125}:03:${hex_class_len}${hex_class}"
 		else
@@ -176,9 +176,9 @@ configure_send_op125() {
 
 	if [ "${uci}" = "network" ]; then
 		new_send_opt="$sendopt $opt125"
-		uci -q set network.$intf.sendopts="$new_send_opt"
+		uci -q set network."${intf}".sendopts="$new_send_opt"
 	else
-		uci -q add_list dhcp.$intf.dhcp_option="$opt125"
+		uci -q add_list dhcp."${intf}".dhcp_option="$opt125"
 	fi
 }
 
@@ -187,9 +187,9 @@ enable_dnsmasq_option125() {
 	local send125_present=0
 	local opt125="125,"
 
-	local proto="$(uci -q get dhcp.$lan.dhcpv4)"
+	local proto="$(uci -q get dhcp."${lan}".dhcpv4)"
 	if [ "${proto}" = "server" ]; then
-		opt_list="$(uci -q get dhcp.$lan.dhcp_option)"
+		opt_list="$(uci -q get dhcp."${lan}".dhcp_option)"
 
 		for sopt in $opt_list; do
 			if [[ "$sopt" == "$opt125"* ]]; then
@@ -205,13 +205,27 @@ enable_dnsmasq_option125() {
 	fi
 }
 
-enable_disable_dhcp_option125() {
+set_vendor_id() {
 	local wan="${1}"
-	local action="${2}"
+	local proto="$(uci -q get network."${wan}".proto)"
 
-	local reqopts="$(uci -q get network.$wan.reqopts)"
-	local sendopts="$(uci -q get network.$wan.sendopts)"
-	local proto="$(uci -q get network.$wan.proto)"
+	if [ "${proto}" = "dhcp" ]; then
+		vendorid="$(uci -q get network."${wan}".vendorid)"
+		if [ -z "${vendorid}" ]; then
+			uci -q set network."${wan}".vendorid="dslforum.org"
+			ubus call uci commit '{"config":"network"}'
+		elif [[ $vendorid != *"dslforum.org"* ]]; then
+			uci -q set network."${wan}".vendorid="${vendorid},dslforum.org"
+			ubus call uci commit '{"config":"network"}'
+		fi
+	fi
+}
+
+enable_dhcp_option125() {
+	local wan="${1}"
+	local reqopts="$(uci -q get network."${wan}".reqopts)"
+	local sendopts="$(uci -q get network."${wan}".sendopts)"
+	local proto="$(uci -q get network."${wan}".proto)"
 	local newreqopts=""
 	local newsendopts=""
 	local req125_present=0
@@ -233,35 +247,16 @@ enable_disable_dhcp_option125() {
 		fi
 	done
 
-	if [ "${proto}" == "dhcp" ]; then
-		if [ "${action}" == "enable" ]; then
-			if [ ${req125_present} -eq 0 ]; then
-				newreqopts="$reqopts 125"
-				uci -q set network.$wan.reqopts="$newreqopts"
-				network_uci_update=1
-			fi
+	if [ "${proto}" = "dhcp" ]; then
+		if [ ${req125_present} -eq 0 ]; then
+			newreqopts="$reqopts 125"
+			uci -q set network."${wan}".reqopts="$newreqopts"
+			network_uci_update=1
+		fi
 
-			if [ ${send125_present} -eq 0 ]; then
-				configure_send_op125 "${sendopts}" "${wan}" "network"
-				network_uci_update=1
-			fi
-		else
-			if [ ${req125_present} -eq 1 ]; then
-				newreqopts=$(echo ${reqopts/125/})
-				uci -q set network.$wan.reqopts="$newreqopts"
-				network_uci_update=1
-			fi
-
-			if [ ${send125_present} -eq 1 ]; then
-				for sopt in $sendopts; do
-					if [[ "$sopt" == "$opt125"* ]]; then
-						newsendopts=$(echo ${sendopts/"${sopt}"/})
-						uci -q set network.$wan.sendopts="$newreqopts"
-						network_uci_update=1
-						break
-					fi
-				done
-			fi
+		if [ ${send125_present} -eq 0 ]; then
+			configure_send_op125 "${sendopts}" "${wan}" "network"
+			network_uci_update=1
 		fi
 	fi
 
@@ -288,12 +283,6 @@ wait_for_resolvfile() {
 copy_cwmp_etc_files_to_varstate() {
 	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
-
 	if [ -f /etc/icwmpd/icwmpd_backup_session.xml ]; then
 		cp -f /etc/icwmpd/icwmpd_backup_session.xml /var/run/icwmpd/ 2>/dev/null
 	fi
@@ -312,10 +301,6 @@ copy_cwmp_varstate_files_to_etc() {
 		cp -f /var/run/icwmpd/dm_enabled_notify /etc/icwmpd/ 2>/dev/null
 	fi
 
-	if [ -f /var/state/cwmp ]; then
-		cp -f /var/state/cwmp /etc/icwmpd/
-	fi
-
 	# move the successful custom notify import marker to persistent storage
 	if [ -f /var/run/icwmpd/icwmpd_notify_import_marker ]; then
 		cp -f /var/run/icwmpd/icwmpd_notify_import_marker /etc/icwmpd/
@@ -335,7 +320,6 @@ validate_acs_section()
 		'compression:or("GZIP","Deflate","Disabled")' \
 		'retry_min_wait_interval:range(1, 65535)' \
 		'retry_interval_multiplier:range(1000, 65535)' \
-		'ipv6_enable:bool' \
 		'ssl_capath:string'
 
 }
@@ -392,25 +376,33 @@ validate_defaults() {
 }
 
 boot() {
+	local enable_cwmp="0"
 	local dhcp_discovery="0"
 
 	config_load cwmp
+	config_get_bool enable_cwmp cpe enable 1
+	local wan_interface=""
+	
+	config_get wan_interface cpe default_wan_interface "wan"
+	
+	if [ "$enable_cwmp" = "0" ]; then
+		return 0
+	fi
+
 	config_get dhcp_discovery acs dhcp_discovery "0"
 
-	config_get wan_interface cpe default_wan_interface "wan"
-	if [ "${dhcp_discovery}" == "enable" ] || [ "${dhcp_discovery}" == "1" ]; then
+	if [ "${dhcp_discovery}" = "enable" ] || [ "${dhcp_discovery}" = "1" ]; then
 		# Set dhcp option 43 if not already configured
 		enable_dhcp_option43 "${wan_interface}"
+		# Set dhcp option 60
+		set_vendor_id "${wan_interface}"
 	fi
 
 	config_get lan_interface cpe default_lan_interface ""
 	if [ -n "${lan_interface}" ]; then
 		# Set dhcp_option 125 if not already configured
-		enable_disable_dhcp_option125 "${wan_interface}" "enable"
+		enable_dhcp_option125 "${wan_interface}"
 		enable_dnsmasq_option125 "${lan_interface}"
-	else
-		# Remove dhcp option 125 if exists
-		enable_disable_dhcp_option125 "${wan_interface}" "disable"
 	fi
 	
 	config_get ssl_capath acs ssl_capath
@@ -419,6 +411,11 @@ boot() {
 		regenerate_ssl_link "${ssl_capath}"
 	fi
 
+	# Copy backup data so that if it restart latter on, it gets the info
+	copy_cwmp_etc_files_to_varstate
+	mkdir -p /var/run/icwmpd/
+	touch /var/run/icwmpd/cwmp
+
 	start
 }
 
@@ -441,9 +438,6 @@ start_service() {
 		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
@@ -455,7 +449,7 @@ start_service() {
 	procd_close_instance
 }
 
-service_stopped()
+stop_service()
 {
 	copy_cwmp_varstate_files_to_etc
 }
@@ -473,7 +467,14 @@ reload_service() {
 		return 0
 	fi
 
-	status="$(ubus -t 1 call tr069 status |jsonfilter -qe '@.cwmp.status')"
+	tr069_status="$(ubus -t 1 call tr069 status)"
+	ret="$?"
+	if [ "$ret" = "7" ]; then
+		# ubus timed out may be due to uloop is busy in some task so returning
+		return 0
+	fi
+
+	status="$(echo "${tr069_status}" | jsonfilter -qe '@.cwmp.status')"
 	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'
@@ -487,20 +488,17 @@ reload_service() {
 	fi
 }
 
-service_triggers() {
-       procd_add_reload_trigger "cwmp"
-
-       procd_open_trigger
-               json_add_array
-                       json_add_string "" "interface.update"
-                       json_add_array
-                               json_add_array
-                                       json_add_string "" "run_script"
-                                       json_add_string "" "/etc/icwmpd/update.sh"
-                               json_close_array
-                       json_close_array
-                       json_add_int "" "2000"
-               json_close_array
-       procd_close_trigger
+add_interface_trigger() {
+        procd_add_interface_trigger "interface.update" "$1" /etc/icwmpd/update.sh
+}
+
+service_triggers() {
+       local wan_interface
+
+       config_load cwmp
+       config_get wan_interface cpe default_wan_interface "wan"
+
+       procd_add_reload_trigger "cwmp"
+       add_interface_trigger ${default_wan_interface}
 }
 

ieee1905/Config.in

@@ -1,6 +1,6 @@
 if (PACKAGE_ieee1905)
 
-menu "Configurations"
+menu "Configuration"
 
 config IEEE1905_EXTENSION_ALLOWED
 	bool "Allow plugins to extend 1905 CMDUs and/or TLVs"
@@ -10,5 +10,18 @@ config IEEE1905_PLATFORM_HAS_WIFI
 	bool "Platform has WiFi"
 	default y if PACKAGE_libwifi
 
+config IEEE1905_CMDU_SA_IS_ALMAC
+	bool "Send CMDUs with SA set to 1905 AL-macaddress instead of interface macaddress"
+	default n
+
+config IEEE1905_WIFI_EASYMESH
+	bool "Include WiFi-Alliance's Easymesh updates"
+	default y
+
+config IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
+	bool "Fragment large CMDU frame at TLV boundary instead of octet boundary"
+	default y
+
 endmenu
+
 endif

ieee1905/Config.map-plugin.in

@@ -1,14 +0,0 @@
-if (PACKAGE_map-plugin)
-
-menu "Configurations"
-
-config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
-	bool "Sync configuration between dynamic controllers in the network"
-	default n
-
-config MULTIAP_FUZZ_1905_CMDUS
-	bool "Include support to fuzz 1905 CMDUs for testing purpose"
-	default n
-
-endmenu
-endif

ieee1905/Makefile

@@ -1,17 +1,17 @@
 #
-# Copyright (C) 2021 IOPSYS
+# Copyright (C) 2020-2023 IOPSYS Software Solutions AB
 #
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=4.10.7
+PKG_VERSION:=8.1.18.1
 
-LOCAL_DEV=0
+LOCAL_DEV=1
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b50f79061a95840d89a6129aa0a95aff82b5a1b7
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
+PKG_SOURCE_VERSION:=eecbdf46c506e640d8fa66ddb211f88f1de098f8
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -35,31 +35,21 @@ define Package/ieee1905/config
 endef
 
 define Package/libieee1905
-$(call Package/ieee1905/Default,$(1))
-  TITLE+= (library for CMDU and TLV handling)
+  $(call Package/ieee1905/Default)
+  TITLE:=libieee1905.so (library for CMDU and TLV handling)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json
 endef
 
 define Package/ieee1905
-$(call Package/ieee1905/Default,$(1))
-  TITLE+= ieee1905d (daemon implementing 1905.1 and provides cli)
+  $(call Package/ieee1905/Default)
+  TITLE:=ieee1905d (daemon implementing 1905.1 and provides cli)
   DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +ubus +libpthread \
 	   +libieee1905 +IEEE1905_PLATFORM_HAS_WIFI:libwifi
 endef
 
-
-define Package/map-plugin
-$(call Package/ieee1905/Default,$(1))
-  TITLE:=Multi-AP (Easymesh) plugin
-  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
-	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
-endef
-
-define Package/map-plugin/config
-  source "$(SOURCE)/Config.map-plugin.in"
-endef
+include $(wildcard plugins/*.mk)
 
 define Package/ieee1905/description
  This package provides IEEE Std 1905.1 stack.
@@ -69,8 +59,16 @@ define Package/libieee1905/description
  This package provides library functions for IEEE Std 1905.1 stack.
 endef
 
+plugins := \
+	$(if $(CONFIG_PACKAGE_map-plugin),map) \
+	$(if $(CONFIG_PACKAGE_snoop-plugin),snoop) \
+	$(if $(CONFIG_PACKAGE_topology-plugin),topology)
+
+
+ppkg:=$(patsubst plugins/%.mk,%-plugin,$(wildcard plugins/*.mk))
+
+
 TARGET_CFLAGS += \
-	-Wno-error=deprecated-declarations \
 	-I$(STAGING_DIR)/usr/include \
 	-I$(STAGING_DIR)/usr/include/libnl3 \
 	-D_GNU_SOURCE
@@ -79,10 +77,20 @@ ifeq ($(CONFIG_IEEE1905_PLATFORM_HAS_WIFI),y)
 TARGET_CFLAGS += -DHAS_WIFI
 endif
 
-ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
-TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
+ifeq ($(CONFIG_IEEE1905_CMDU_SA_IS_ALMAC),y)
+TARGET_CFLAGS += -DCMDU_SA_IS_ALMAC
 endif
 
+ifeq ($(CONFIG_IEEE1905_WIFI_EASYMESH),y)
+TARGET_CFLAGS += -DWIFI_EASYMESH
+endif
+
+ifeq ($(CONFIG_IEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY),y)
+TARGET_CFLAGS += -DIEEE1905_CMDU_FRAGMENT_TLV_BOUNDARY
+endif
+
+MAKE_FLAGS += \
+	extmod_subdirs="$(patsubst %,extensions/%,$(plugins))"
 
 MAKE_PATH:=src
 
@@ -101,25 +109,6 @@ define Package/libieee1905/install
 	$(CP) $(PKG_BUILD_DIR)/src/libmidgen.so $(1)/usr/lib/
 endef
 
-define Package/map-plugin/install
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
-endef
-
-define Build/InstallDev/map-plugin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/include
-	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map2.h $(1)/usr/include/map2.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
-	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
-endef
-
-
 define Build/InstallDev/libieee1905
 	$(INSTALL_DIR) $(1)/usr/lib
 	$(INSTALL_DIR) $(1)/usr/include
@@ -137,7 +126,7 @@ endef
 
 define Build/InstallDev
 	$(call Build/InstallDev/libieee1905,$(1),$(2))
-	$(call Build/InstallDev/map-plugin,$(1),$(2))
+	$(foreach p,$(ppkg),$(call Build/InstallDev/$(p),$(1),$(2)))
 endef
 
 ifeq ($(LOCAL_DEV),1)
@@ -148,4 +137,4 @@ endif
 
 $(eval $(call BuildPackage,ieee1905))
 $(eval $(call BuildPackage,libieee1905))
-$(eval $(call BuildPackage,map-plugin))
+$(eval $(foreach p,$(ppkg),$(call BuildPackage,$(p))))

ieee1905/files/etc/init.d/ieee1905

@@ -44,7 +44,8 @@ validate_ap_section() {
 	uci_validate_section ieee1905 $section "${1}" \
 			'band:or("2", "5", "60", "6")' \
 			'ssid:string' \
-			'encryption:or("psk2", "sae-mixed", "sae", string)' \
+			'encryption:or("psk2", "sae-mixed", "sae",
+				"psk", "psk-mixed", "none", string)' \
 			'key:string' \
 			'uuid:string' \
 			'manufacturer:string' \
@@ -82,8 +83,10 @@ start_service() {
 	validate_ieee1905_config || return 1;
 
 	procd_open_instance
-        procd_set_param command "/usr/sbin/ieee1905d"
+        procd_set_param command "/usr/sbin/ieee1905d" "-o"  "/tmp/ieee1905.log" "-f"
 	procd_set_param respawn
+	procd_set_param limits core="unlimited"
+#	procd_set_param env IEEE1905_LOG_CMDU=1
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1
 	procd_close_instance

ieee1905/files/etc/uci-defaults/31-ifname-option-to-list

@@ -0,0 +1,18 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+config_load ieee1905
+
+ifname_to_list() {
+	local section=$1
+
+	config_get ifname $section ifname	# get list or option as space separated values
+	ifname=${ifname//,/\ }			# convert csv with space separation
+	uci del ieee1905.${section}.ifname	# delete entry
+	for i in ${ifname}; do
+		uci add_list ieee1905.${section}.ifname="$i"	# writeback entry as list
+	done
+}
+
+config_foreach ifname_to_list al-iface

ieee1905/plugins/map.mk

@@ -0,0 +1,51 @@
+define Package/map-plugin
+  $(call Package/ieee1905/Default)
+  TITLE:=Multi-AP plugin supporting WiFi-Alliance Easymesh standard
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+endef
+
+define Package/map-plugin/config
+	if (PACKAGE_map-plugin)
+
+		menu "Configuration"
+
+		config MULTIAP_EASYMESH_VERSION
+		int "Easymesh version"
+		default 2
+
+		config MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG
+		bool "Sync configuration between dynamic controllers in the network"
+		default n
+
+		config MULTIAP_FUZZ_1905_CMDUS
+		bool "Include support to fuzz 1905 CMDUs for testing purpose"
+		default n
+
+		endmenu
+	endif
+endef
+
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_MULTIAP_EASYMESH_VERSION)
+
+ifeq ($(CONFIG_MULTIAP_DYNAMIC_CNTLR_SYNC_CONFIG),y)
+TARGET_CFLAGS += -DDYNAMIC_CNTLR_SYNC_CONFIG
+endif
+
+define Build/InstallDev/map-plugin
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/easymesh.h $(1)/usr/include/easymesh.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map_module.h $(1)/usr/include/map_module.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/cntlrsync.h $(1)/usr/include/cntlrsync.h
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
+endef
+
+define Package/map-plugin/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/libmaputil.so $(1)/usr/lib/libmaputil.so
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/map/map.so $(1)/usr/lib/ieee1905/map.so
+endef

ieee1905/plugins/snoop.mk

@@ -0,0 +1,12 @@
+define Package/snoop-plugin
+  $(call Package/ieee1905/Default)
+  TITLE:=Show all received 1905 CMDUs over UBUS
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+endef
+
+define Package/snoop-plugin/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/snoop/snoop.so $(1)/usr/lib/ieee1905/snoop.so
+endef

ieee1905/plugins/topology.mk

@@ -0,0 +1,12 @@
+define Package/topology-plugin
+  $(call Package/ieee1905/Default)
+  TITLE:=Build full network topology of the 1905 nodes only
+  DEPENDS= +libubox +libuci +libubus +libeasy +libnl-genl \
+	   +libjson-c +libblobmsg-json +ieee1905 +libieee1905
+endef
+
+define Package/topology-plugin/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/lib/ieee1905
+	$(CP) $(PKG_BUILD_DIR)/src/extensions/topology/topology.so $(1)/usr/lib/ieee1905/topology.so
+endef

imonitor/files/etc/init.d/imonitor

@@ -18,12 +18,7 @@ start_service() {
 	procd_close_instance
 }
 
-stop() {
-	service_stop imonitor
-}
-
 reload_service() {
 	stop
 	start
 }
-

iop/config

@@ -18,8 +18,21 @@ CONFIG_TARGET_ROOTFS_TARGZ=y
 # /etc/banner and /etc/device_info #
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="iopsysWrt"
+CONFIG_VERSION_MANUFACTURER="IOPSYS"
 CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
+CONFIG_VERSION_DIST="IOWRT"
+
+# OpenWrt is given by CONFIG_VERSION_NUMBER which we do not want to override.
+# disabling CONFIG_VERSION_FILENAMES will hide the OpenWrt version from the image filename
+# CONFIG_VERSION_FILENAMES is not set
+
+# CONFIG_VERSION_CODE is set to the IOWRT version instead by the genconfig-script and
+# CONFIG_VERSION_CODE_FILENAMES will put it into the image filename.
+CONFIG_VERSION_CODE_FILENAMES=y
+
+CONFIG_VERSION_HOME_URL="https://iopsys.eu"
+CONFIG_VERSION_BUG_URL="https://iopsys.eu"
+CONFIG_VERSION_SUPPORT_URL="https://iopsys.eu"
 
 # /lib/preinit #
 CONFIG_PREINITOPT=y
@@ -43,9 +56,8 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 
 # EasySoC HAL #
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_peripheral_manager=y
-CONFIG_PACKAGE_port-management=y
+CONFIG_PACKAGE_qosmngr=y
+CONFIG_PACKAGE_libwifiutils=y
 CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
@@ -53,25 +65,28 @@ CONFIG_PACKAGE_ieee1905=y
 CONFIG_PACKAGE_map-agent=m
 CONFIG_PACKAGE_map-controller=m
 CONFIG_PACKAGE_map-topology=y
-CONFIG_PACKAGE_wfadatad-collector=y
+CONFIG_PACKAGE_decollector=y
+
+CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
 
 # Network #
 CONFIG_PACKAGE_netmode=y
-CONFIG_PACKAGE_owsd=m
 CONFIG_PACKAGE_urlfilter=y
 
 # System #
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
+CONFIG_PACKAGE_usermngr=y
 
 # TR-x69 #
-CONFIG_PACKAGE_uspd-mbedtls=y
-CONFIG_PACKAGE_icwmp-mbedtls=y
+CONFIG_PACKAGE_libbbfdm=y
+CONFIG_PACKAGE_bbfdmd=y
+CONFIG_PACKAGE_icwmp=y
 CONFIG_PACKAGE_obuspa=y
 CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_periodicstats=y
-CONFIG_PACKAGE_stunc-mbedtls=m
+CONFIG_PACKAGE_stunc=m
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_twamp=m
 CONFIG_PACKAGE_udpecho-client=m
@@ -95,6 +110,8 @@ CONFIG_PACKAGE_comgt=y
 CONFIG_PACKAGE_comgt-directip=y
 CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_ds-lite=y
+CONFIG_PACKAGE_firewall=y
+# CONFIG_PACKAGE_firewall4 is not set
 CONFIG_PACKAGE_gre=y
 CONFIG_PACKAGE_map=y
 CONFIG_PACKAGE_ntfs-3g=y
@@ -118,7 +135,7 @@ CONFIG_PACKAGE_atftp=m
 CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_dnsmasq=y
-CONFIG_PACKAGE_miniupnpd-iptables=y
+CONFIG_PACKAGE_ssdpd=y
 CONFIG_PACKAGE_mosquitto-client-ssl=y
 CONFIG_PACKAGE_mosquitto-ssl=y
 CONFIG_PACKAGE_nginx=y
@@ -140,7 +157,8 @@ CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=y
-CONFIG_PACKAGE_iptables-legacy=y
+CONFIG_PACKAGE_ip6tables-zz-legacy=y
+CONFIG_PACKAGE_iptables-zz-legacy=y
 CONFIG_PACKAGE_iptables-mod-conntrack-extra=y
 CONFIG_PACKAGE_iptables-mod-filter=y
 CONFIG_PACKAGE_iptables-mod-ipopt=y
@@ -289,10 +307,3 @@ CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_SQUASHFS=y
 CONFIG_BUSYBOX_CONFIG_FEATURE_VOLUMEID_UBIFS=y
 CONFIG_BUSYBOX_CONFIG_TIMEOUT=y
 CONFIG_BUSYBOX_CONFIG_NOHUP=y
-
-# Use fw3 iptables-based instead of newer nftables-based fw4
-# TODO: for now we cannot build an image with fw3 and luci-app-firewall (i.e. fw3)
-# Enabling luci-app-firewall enables fw4
-# CONFIG_PACKAGE_luci-app-firewall is not set
-CONFIG_PACKAGE_firewall=y
-# CONFIG_PACKAGE_firewall4 is not set

iop/scripts/feeds_update.sh

@@ -1,15 +1,26 @@
-#! /bin/bash
+#!/bin/bash
 
 function feeds_update {
-
+	heads=1
 	developer=0
 	override=1
-	start=$(date -u +'%s')
-	while getopts "n" opt; do
+	while getopts "inh" opt; do
 		case $opt in
+		i)
+			heads=0
+			;;
 		n)
 			override=0
 			;;
+		h|\?)
+			echo "Usage: ./iop feeds_update [-i] [-n] [-h]"
+			echo
+			echo "OPTIONS:"
+			echo "  -i - Only update index. Do not change HEAD in feeds."
+			echo "  -n - Do not replace core packages with iopsys versions."
+			echo "  -h - Display this help message and exit."
+			exit 1
+			;;
 		esac
 	done
 
@@ -17,47 +28,42 @@ function feeds_update {
 
 	cp .config .genconfig_config_bak
 
-	#if -d argument is passed, clone feeds with ssh instead of http
-	if [ $developer == 1 ]; then
-		./scripts/feeds update -g
-	else
-		./scripts/feeds update
+	if [ $heads == 1 ]; then
+		if [ $developer == 1 ]; then
+			./scripts/feeds update -g
+		else
+			./scripts/feeds update
+		fi
 	fi
-	./scripts/feeds update -ai
+	./scripts/feeds update -ai || exit 1
 
 	# replace core packages with iopsys versions
 	if [ $override == 1 ]; then
-		./scripts/feeds install -f -p openwrt_core -a
+		./scripts/feeds install -f -p openwrt_core -a || exit 1
 	fi
 
+	(
+		echo '# DO NOT EDIT. Autogenerated file by ./iop feeds_update'
+		echo 'FEED_DEVICES_DIRS:='
+		find feeds -type f -name .is-feed-devices-dir -printf 'FEED_DEVICES_DIRS+=$(TOPDIR)/%h'
+	) > target/linux/feed-devices/feed-devices-list.mk || exit 1
+
 	# targets need to be installed explicitly
 	for target in $(ls ./feeds/targets); do
-		rm -f target/linux/$target
-		./scripts/feeds install -p targets $target
-	done
-
-	# Workaround for bug in 22.03.0-rc4 where installed target path has been
-	# moved to target/linux/feeds but Config.in and Makefile from installed
-	# targets are not properly included from the new location.
-	# This hack is to be removed once the issues are fixed.
-	# Note that the above block of code might no longer necessary because
-	# targets no longer need to be installed explicitly.
-	echo "Working around installed-target-bug"
-	for f in target/linux/feeds/*; do
-		ln -vsf "feeds/$(basename "$f")" "target/linux/$(basename "$f")"
+		./scripts/feeds install -f -p targets $target || exit 1
 	done
 
 	# install all packages
-	./scripts/feeds install -a
+	./scripts/feeds install -a || exit 1
 
 	# remove broken symlinks ( for packages that are no longer in the feed )
-	find -L package/feeds -maxdepth 2 -type l -delete
+	find -L package/feeds -maxdepth 2 -type l -delete || exit 1
 
 	cp .genconfig_config_bak .config
-	make defconfig
+	make defconfig || exit 1
 
 	# record when we last run this script
-	touch tmp/.iop_bootstrap
+	touch tmp/.iop_bootstrap || exit 1
 
 	# always return true
 	exit 0

iop/scripts/genconfig.sh

@@ -13,12 +13,13 @@ function genconfig {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
-	mediatek="target/linux/feeds/iopsys-mediatek"
+	brcmbca_feed="target/linux/feeds/brcmbca"
+	airoha_feed="target/linux/feeds/airoha"
+	x86_feed="target/linux/feeds/x86"
+	armvirt_feed="target/linux/feeds/armvirt"
+	mediatek_feed="target/linux/feeds/mediatek"
+	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
+	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -41,19 +42,13 @@ function genconfig {
 	}
 
 	function verify_config {
-	    IFS=$'\n'
-	    org=$(<.genconfig.config)
-	    unset IFS
-	    local num
 	    local conf_opt
 	    local conf_org
 	    local conf_new
 
-	    #echo "lines to check $tot_lines"
-	    num=0
-	    for line in $org
+	    while read -r line
 	    do
-		conf_opt=$(echo $line | grep CONFIG_ | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
+		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
 		if [ -n "${conf_opt}" ]
 		then
 		    conf_org=$(find_last ${conf_opt} .genconfig.config)
@@ -74,8 +69,7 @@ function genconfig {
 			#echo -e "wanted [$conf_org] got [$conf_new]"
 		    fi
 		fi
-		num=$((num+1))
-	    done
+	    done < .genconfig.config
 	}
 
 	# Takes a board name and returns the target name in global var $target
@@ -108,73 +102,84 @@ function genconfig {
 			return
 		fi
 
-		[ -e $brcm63xx_arm/genconfig ] &&
-			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
-		[ -e $ramips/genconfig ] &&
-			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $econet/genconfig ] &&
-			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $x86/genconfig ] &&
-			iopsys_x86=$(cd $x86; ./genconfig)
-		[ -e $armvirt/genconfig ] &&
-			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
+		[ -e $brcmbca_feed/genconfig ] &&
+			brcmbca=$(cd $brcmbca_feed; ./genconfig)
+		[ -e $airoha_feed/genconfig ] &&
+			airoha=$(cd $airoha_feed; ./genconfig)
+		[ -e $x86_feed/genconfig ] &&
+			x86=$(cd $x86_feed; ./genconfig)
+		[ -e $armvirt_feed/genconfig ] &&
+			armvirt=$(cd $armvirt_feed; ./genconfig)
+		[ -e $mediatek_feed/genconfig ] &&
+			mediatek=$(cd $mediatek_feed; ./genconfig)
+		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
+			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
+		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
+			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
+			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
-				for b in ${!list}; do
+				a=$(echo "${!list}" | sort)
+				for b in $a; do
 					echo -e "\t$b"
 				done
 			done
 			return
 	    fi
 
-	    for p in $iopsys_brcm63xx_arm; do
+	    for p in $airoha; do
 		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_arm"
-			target_config_path="$brcm63xx_arm/config"
+		    target="airoha"
+			target_config_path="$airoha_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_ramips; do
+	    for p in $x86; do
 		if [ $p == $profile ]; then
-		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
+		    target="x86"
+			target_config_path="$x86_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_econet; do
+	    for p in $armvirt; do
 		if [ $p == $profile ]; then
-		    target="iopsys_econet"
-			target_config_path="$econet/config"
+		    target="armvirt"
+			target_config_path="$armvirt_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_x86; do
+	    for p in $mediatek; do
 		if [ $p == $profile ]; then
-		    target="iopsys_x86"
-			target_config_path="$x86/config"
+		    target="mediatek"
+			target_config_path="$mediatek_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_armvirt; do
+	    for p in $ipq95xx; do
 		if [ $p == $profile ]; then
-		    target="iopsys_armvirt"
-			target_config_path="$armvirt/config"
+		    target="ipq95xx"
+			target_config_path="$qualcomm_ipq95xx_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_mediatek; do
+	    for p in $ipq53xx; do
 		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
+		    target="ipq53xx"
+			target_config_path="$qualcomm_ipq53xx_feed/config"
+		    return
+		fi
+	    done
+
+	    for p in $brcmbca; do
+		if [ $p == $profile ]; then
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
 		    return
 		fi
 	    done
@@ -265,11 +270,22 @@ function genconfig {
 	setup_dirs()
 	{
 		git remote -v | grep -q http || {
+			CUSTBRANCH="$(git rev-parse --abbrev-ref HEAD)"
 			if git ls-remote $CUSTREPO -q 2>/dev/null; then
 				if [ ! -d "$CUSTPATH" ]; then
-					git clone "$CUSTREPO" "$CUSTPATH"
+					echo "Cloning $CUSTBRANCH branch of $CUSTREPO"
+					git clone -b "$CUSTBRANCH" "$CUSTREPO" "$CUSTPATH" 2>/dev/null || {
+						DEFBRANCH="$(git remote show $CUSTREPO | grep 'HEAD branch' | cut -d' ' -f5)"
+						echo "$CUSTBRANCH branch is not found, cloning $DEFBRANCH branch of $CUSTREPO"
+						git clone "$CUSTREPO" "$CUSTPATH"
+					}
 				elif [ $IMPORT -eq 1 ]; then
 					cd $CUSTPATH
+					echo "Checking out $CUSTBRANCH branch in $CUSTPATH"
+					git checkout "$CUSTBRANCH" 2>/dev/null || {
+						DEFBRANCH="$(git symbolic-ref refs/remotes/origin/HEAD | cut -d '/' -f4)"
+						echo "Checking out $CUSTBRANCH branch has failed, using $DEFBRANCH branch in $CUSTPATH"
+					}
 					v "git pull"
 					git pull
 					cd - >/dev/null #go back
@@ -287,6 +303,24 @@ function genconfig {
 		fi
 	}
 
+	get_subtarget_for_device() {
+		readonly target="$1"
+		readonly device="$2"
+		readonly targetinfo_file="tmp/info/.targetinfo-feeds_$target"
+		readonly target_profile_line="Target-Profile: DEVICE_$device"
+		# We want to know after which Target: $target/$subtarget line
+		# our $target_profile_line appears
+		# This is a crude way to "parse" the file using shell 🤯
+		# 1. grep for both lines with line number output
+		# 2. grep again to determine the device profile line that we looked for
+		#    but output one context line before as well to determine corresponding subtarget line
+		# 4. Use head and sed to extract the subtarget
+		grep "^Target: $target/\|^$target_profile_line" "$targetinfo_file" \
+			| grep -E -B1 "^$target_profile_line" \
+			| head -n1 \
+			| sed -E "s|^Target: $target/||"
+	}
+
 	create_and_copy_files()
 	{
 		local BOARDTYPE=$1
@@ -328,18 +362,22 @@ function genconfig {
 		    cat $target_config_path/$BOARDTYPE/config >> .config
 		    echo "" >> .config
 		fi
-
-		# Special handling for targets which use TARGET_DEVICES 
+		# hack to support custom-devices until we have deprecated this genconfig-script...
+		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
+			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
+			echo "" >> .config
+		fi
+		
+		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
+		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
-			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
-			if [ -z "$mk_file" ]; then
+			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
+			if [ -z "$subtarget" ]; then
 				echo "Error determining subtarget for $target / ${BOARDTYPE}"
 				return 1
 			fi
-			local subtarget="$(basename "${mk_file%.mk}")"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
@@ -377,12 +415,15 @@ function genconfig {
 		fi
 
 		# Set target version
-		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		local GIT_REV=$(git rev-parse --short HEAD)
-		local GIT_VER="$GIT_TAG"
-		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
-		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
+		local git_version
+		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+			echo "ERROR: Failed getting version via git describe, exiting." >&2
+			return 1
+		fi
+		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
+		local version_lower="${version,,}"
+		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Package source tree override if selected
@@ -429,7 +470,7 @@ function genconfig {
 	if [ ! -e tmp/.iop_bootstrap ]; then
 		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
 		echo "Run: iop feeds_update"
-		exit 0
+		exit 1
 	fi
 
 	if [ $# -eq 0 ]; then
@@ -466,7 +507,7 @@ function genconfig {
 		CUSTREPO="${CUSTREPO:-git@dev.iopsys.eu:consumer/iopsys.git}"
 
 		setup_dirs
-		create_and_copy_files "$@"
+		create_and_copy_files "$@" || exit 1
 	fi
 }
 

iop/scripts/genconfig_min.sh

@@ -12,12 +12,13 @@ function genconfig_min {
 	export DEVELOPER=0
 	target="bogus"
 	target_config_path=""
-	brcm63xx_arm="target/linux/feeds/iopsys-brcm63xx-arm"
-	ramips="target/linux/feeds/iopsys-ramips"
-	econet="target/linux/feeds/iopsys-econet"
-	x86="target/linux/feeds/iopsys-x86"
-	armvirt="target/linux/feeds/iopsys-armvirt"
-	mediatek="target/linux/feeds/iopsys-mediatek"
+	brcmbca_feed="target/linux/feeds/brcmbca"
+	airoha_feed="target/linux/feeds/airoha"
+	x86_feed="target/linux/feeds/x86"
+	armvirt_feed="target/linux/feeds/armvirt"
+	mediatek_feed="target/linux/feeds/mediatek"
+	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
+	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -40,19 +41,13 @@ function genconfig_min {
 	}
 
 	function verify_config {
-	    IFS=$'\n'
-	    org=$(<.genconfig.config)
-	    unset IFS
-	    local num
 	    local conf_opt
 	    local conf_org
 	    local conf_new
 
-	    #echo "lines to check $tot_lines"
-	    num=0
-	    for line in $org
+	    while read -r line
 	    do
-		conf_opt=$(echo $line | grep CONFIG_ | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
+		conf_opt=$(echo $line | grep "^[ #]*CONFIG_" | sed 's|.*\(CONFIG_[^ =]*\)[ =].*|\1|')
 		if [ -n "${conf_opt}" ]
 		then
 		    conf_org=$(find_last ${conf_opt} .genconfig.config)
@@ -73,8 +68,7 @@ function genconfig_min {
 			#echo -e "wanted [$conf_org] got [$conf_new]"
 		    fi
 		fi
-		num=$((num+1))
-	    done
+	    done < .genconfig.config
 	}
 
 	# Takes a board name and returns the target name in global var $target
@@ -107,73 +101,84 @@ function genconfig_min {
 			return
 		fi
 
-		[ -e $brcm63xx_arm/genconfig ] &&
-			iopsys_brcm63xx_arm=$(cd $brcm63xx_arm; ./genconfig)
-		[ -e $ramips/genconfig ] &&
-			iopsys_ramips=$(cd $ramips; ./genconfig)
-		[ -e $econet/genconfig ] &&
-			iopsys_econet=$(cd $econet; ./genconfig)
-		[ -e $x86/genconfig ] &&
-			iopsys_x86=$(cd $x86; ./genconfig)
-		[ -e $armvirt/genconfig ] &&
-			iopsys_armvirt=$(cd $armvirt; ./genconfig)
-		[ -e $mediatek/genconfig ] &&
-			iopsys_mediatek=$(cd $mediatek; ./genconfig)
+		[ -e $brcmbca_feed/genconfig ] &&
+			brcmbca=$(cd $brcmbca_feed; ./genconfig)
+		[ -e $airoha_feed/genconfig ] &&
+			airoha=$(cd $airoha_feed; ./genconfig)
+		[ -e $x86_feed/genconfig ] &&
+			x86=$(cd $x86_feed; ./genconfig)
+		[ -e $armvirt_feed/genconfig ] &&
+			armvirt=$(cd $armvirt_feed; ./genconfig)
+		[ -e $mediatek_feed/genconfig ] &&
+			mediatek=$(cd $mediatek_feed; ./genconfig)
+		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
+			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
+		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
+			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in iopsys_brcm63xx_arm iopsys_ramips iopsys_econet iopsys_x86 iopsys_armvirt iopsys_mediatek; do
+			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
-				for b in ${!list}; do
+				a=$(echo "${!list}" | sort)
+				for b in $a; do
 					echo -e "\t$b"
 				done
 			done
 			return
 	    fi
 
-	    for p in $iopsys_brcm63xx_arm; do
+	    for p in $airoha; do
 		if [ $p == $profile ]; then
-		    target="iopsys_brcm63xx_arm"
-			target_config_path="$brcm63xx_arm/config"
+		    target="airoha"
+			target_config_path="$airoha_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_ramips; do
+	    for p in $x86; do
 		if [ $p == $profile ]; then
-		    target="iopsys_ramips"
-			target_config_path="$ramips/config"
+		    target="x86"
+			target_config_path="$x86_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_econet; do
+	    for p in $armvirt; do
 		if [ $p == $profile ]; then
-		    target="iopsys_econet"
-			target_config_path="$econet/config"
+		    target="armvirt"
+			target_config_path="$armvirt_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_x86; do
+	    for p in $mediatek; do
 		if [ $p == $profile ]; then
-		    target="iopsys_x86"
-			target_config_path="$x86/config"
+		    target="mediatek"
+			target_config_path="$mediatek_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_armvirt; do
+	    for p in $ipq95xx; do
 		if [ $p == $profile ]; then
-		    target="iopsys_armvirt"
-			target_config_path="$armvirt/config"
+		    target="ipq95xx"
+			target_config_path="$qualcomm_ipq95xx_feed/config"
 		    return
 		fi
 	    done
 
-	    for p in $iopsys_mediatek; do
+	    for p in $ipq53xx; do
 		if [ $p == $profile ]; then
-		    target="iopsys_mediatek"
-			target_config_path="$mediatek/config"
+		    target="ipq53xx"
+			target_config_path="$qualcomm_ipq53xx_feed/config"
+		    return
+		fi
+	    done
+
+	    for p in $brcmbca; do
+		if [ $p == $profile ]; then
+		    target="brcmbca"
+			target_config_path="$brcmbca_feed/config"
 		    return
 		fi
 	    done
@@ -181,12 +186,6 @@ function genconfig_min {
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
 		DEVELOPER=1
-
-		bcmAllowed=0
-		endptAllowed=0
-
-		git ls-remote git@dev.iopsys.eu:broadcom/bcmcreator.git -q 2>/dev/null && bcmAllowed=1
-		git ls-remote git@dev.iopsys.eu:iopsys/endptmngr.git -q 2>/dev/null && endptAllowed=1
 	}
 
 	v() {
@@ -278,6 +277,24 @@ function genconfig_min {
 		fi
 	}
 
+	get_subtarget_for_device() {
+		readonly target="$1"
+		readonly device="$2"
+		readonly targetinfo_file="tmp/info/.targetinfo-feeds_$target"
+		readonly target_profile_line="Target-Profile: DEVICE_$device"
+		# We want to know after which Target: $target/$subtarget line
+		# our $target_profile_line appears
+		# This is a crude way to "parse" the file using shell 🤯
+		# 1. grep for both lines with line number output
+		# 2. grep again to determine the device profile line that we looked for
+		#    but output one context line before as well to determine corresponding subtarget line
+		# 4. Use head and sed to extract the subtarget
+		grep "^Target: $target/\|^$target_profile_line" "$targetinfo_file" \
+			| grep -E -B1 "^$target_profile_line" \
+			| head -n1 \
+			| sed -E "s|^Target: $target/||"
+	}
+
 	create_and_copy_files()
 	{
 		local BOARDTYPE=$1
@@ -319,18 +336,22 @@ function genconfig_min {
 		    cat $target_config_path/$BOARDTYPE/config >> .config
 		    echo "" >> .config
 		fi
+		# hack to support custom-devices until we have deprecated this genconfig-script...
+		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
+			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
+			echo "" >> .config
+		fi
 
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		iopsys_ramips | iopsys_econet | iopsys_mediatek | iopsys_brcm63xx_arm)
+		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
-			local mk_file="$(grep -Fx --files-with-matches "define Device/${BOARDTYPE}" "$target_config_path/../image/"*.mk)"
-			if [ -z "$mk_file" ]; then
+			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"
+			if [ -z "$subtarget" ]; then
 				echo "Error determining subtarget for $target / ${BOARDTYPE}"
 				return 1
 			fi
-			local subtarget="$(basename "${mk_file%.mk}")"
 			echo "CONFIG_TARGET_${target}=y" >> .config
 			echo "CONFIG_TARGET_${target}_${subtarget}=y" >> .config
 			echo "CONFIG_TARGET_DEVICE_${target}_${subtarget}_DEVICE_${BOARDTYPE}=y" >> .config
@@ -368,12 +389,15 @@ function genconfig_min {
 		fi
 
 		# Set target version
-		local GIT_TAG=$(git describe --abbrev=0 --tags)
-		local GIT_REV=$(git rev-parse --short HEAD)
-		local GIT_VER="$GIT_TAG"
-		git describe --contains $GIT_REV >/dev/null 2>&1 || GIT_VER="${GIT_TAG}_${GIT_REV}"
-		echo "CONFIG_TARGET_VERSION=\"${GIT_VER}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_VER}\"" >> .config
+		local git_version
+		if ! git_version="$(git describe --always --dirty --tags --match '[0-9].*.*' --match '[0-9][0-9].*.*')"; then
+			echo "ERROR: Failed getting version via git describe, exiting." >&2
+			return 1
+		fi
+		local version="${git_version,,}${CUSTOMERS:+-${CUSTOMERS// /}}"
+		local version_lower="${version,,}"
+		echo "CONFIG_TARGET_VERSION=\"${version_lower}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${version_lower}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Package source tree override if selected
@@ -414,7 +438,7 @@ function genconfig_min {
 	if [ ! -e tmp/.iop_bootstrap ]; then
 		echo "You have not installed feeds. Running genconfig in this state would create a non functional configuration."
 		echo "Run: iop feeds_update"
-		exit 0
+		exit 1
 	fi
 
 	if [ $# -eq 0 ]; then

iop/scripts/install_key.sh

@@ -48,7 +48,10 @@ function ssh_install_key {
     local keys="$(get_ssh_public_keys)"
     echo "Adding the following keys to $DROPBEAR_AUTHORIZED_KEYS_FILE on $host:"
     echo "$keys"
-    ssh root@$host "echo '$keys' >> '$DROPBEAR_AUTHORIZED_KEYS_FILE'" && echo ok
+    ssh \
+        -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
+        root@$host \
+        "echo '$keys' >> '$DROPBEAR_AUTHORIZED_KEYS_FILE'" && echo ok
 }
 
 register_command "ssh_install_key" "Install the users public ssh key on host running dropbear"

iop/scripts/iopupgrade.sh

@@ -274,9 +274,10 @@ function ssh_upgrade {
 	pv "$upd_fw" |
 		ssh \
 			-o ConnectTimeout=60 \
+			-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
 			root@"$upd_host" \
 			sh -c "cat > '/tmp/$upd_fw_base' && (set -x && sysupgrade -v $extra_args /tmp/$upd_fw_base)" ||
 		echo "Sysupgrade failed" >&2 && return 1
 }
 
-register_command "ssh_upgrade" "-h <host> -f <file> [opts]  Install firmware on remote host with SSH"
+register_command "ssh_upgrade" "-t <host> -f <file> [opts]  Install firmware on remote host with SSH"

iop/scripts/update_package.sh

@@ -449,7 +449,7 @@ insert_feed_hash_in_feeds_config()
     local feed=$1
     local TO=$(cd feeds/${feed}; git rev-parse HEAD)
 
-    sed -i feeds.conf -e "/ ${feed}/ s/\(.*\)[;^].*/\1^${TO}/"
+    sed -i feeds.conf -e "/ ${feed} / s/\(.*\)[;^].*/\1^${TO}/"
     git add feeds.conf
 }
 

iwatchdog/files/etc/init.d/iwatchdog

@@ -32,8 +32,3 @@ start_service() {
     procd_set_param respawn
     procd_close_instance
 }
-
-#stop() {
-#	service_stop /sbin/iwatchdog
-#}
-

libdsl/Makefile

@@ -0,0 +1,106 @@
+#
+# Copyright (C) 2020-2023 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libdsl
+PKG_VERSION:=7.2.99
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=f9f3fcd0f4140540db5bd41059bcca7ded083024
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libdsl.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=LGPL-2.1-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+  TARGET_PLATFORM=BROADCOM
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
+else ifeq ($(CONFIG_TARGET_x86),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_armvirt),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+endif
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	subdirs="$(subdirs)"
+
+define Package/libdsl
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=IOPSYS HAL libs
+  MENU:=1
+  TITLE:= xDSL library (libdsl)
+endef
+
+define Package/libdsl/description
+  Library provides xDSL/GFAST HAL APIs
+endef
+
+define Package/libdsl/config
+  if PACKAGE_libdsl
+	  config LIBDSL_DEBUG
+		depends on PACKAGE_libdsl
+		bool "Enable dsl debugging"
+		default n
+
+	  config LIBDSL_TEST
+		depends on PACKAGE_libdsl
+		bool "Enable dsl test program"
+		default n
+
+  endif
+endef
+
+define Build/InstallDev/libdsl
+	$(INSTALL_DIR) $(1)/usr/include/xdsl
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/xdsl.h $(1)/usr/include/xdsl
+	$(CP) $(PKG_BUILD_DIR)/xtm.h $(1)/usr/include/xdsl
+	$(CP) $(PKG_BUILD_DIR)/common.h $(1)/usr/include/xdsl
+	$(CP) $(PKG_BUILD_DIR)/libdsl.so* $(1)/usr/lib/
+endef
+
+define Build/InstallDev
+	$(call Build/InstallDev/libdsl,$(1),$(2))
+endef
+
+ifeq ($(CONFIG_LIBDSL_TEST),y)
+define Build/Compile/libdsl
+	$(MAKE) -C "$(PKG_BUILD_DIR)/test" $(MAKE_FLAGS)
+endef
+endif
+
+define Package/libdsl/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(1)/usr/bin
+	$(CP) $(PKG_BUILD_DIR)/libdsl.so* $(1)/usr/lib/
+ifeq ($(CONFIG_LIBDSL_TEST),y)
+	$(CP) $(PKG_BUILD_DIR)/test/libdsl_test $(1)/usr/bin/
+endif
+endef
+
+$(eval $(call BuildPackage,libdsl))

libeasy/Makefile

@@ -0,0 +1,68 @@
+#
+# Copyright (C) 2020-2023 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libeasy
+PKG_VERSION:=7.2.100
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=32db1b79bd88eba85a3e7518dbbbd1e29f4b06d9
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libeasy.git
+PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=LGPL-2.1-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall"
+
+define Package/libeasy
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=IOPSYS HAL libs
+  MENU:=1
+  TITLE:= Common helper library (libeasy)
+  DEPENDS+=+libnl +libnl-route +libopenssl
+endef
+
+define Package/libeasy/description
+  Library provides common utility functions
+endef
+
+define Build/InstallDev/libeasy
+	$(INSTALL_DIR) $(1)/usr/include/easy
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/easy.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/event.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/utils.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/if_utils.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/debug.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/hlist.h $(1)/usr/include/easy/
+	$(CP) $(PKG_BUILD_DIR)/libeasy*.so* $(1)/usr/lib/
+endef
+
+define Build/InstallDev
+	$(call Build/InstallDev/libeasy,$(1),$(2))
+endef
+
+define Package/libeasy/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libeasy*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libeasy))

libethernet/Makefile

@@ -0,0 +1,105 @@
+#
+# Copyright (C) 2020-2023 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libethernet
+PKG_VERSION:=7.2.104
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=d777636ca43302a95e571ab030ec44ef50905570
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=LGPL-2.1-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+  TARGET_PLATFORM=BROADCOM
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/shared/opensource/include/bcm963xx \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
+else ifeq ($(CONFIG_TARGET_x86),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_armvirt),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_airoha),y)
+  TARGET_PLATFORM=ECONET
+  TARGET_CFLAGS +=-DIOPSYS_ECONET
+else ifeq ($(CONFIG_TARGET_mediatek),y)
+  TARGET_PLATFORM=MEDIATEK
+  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
+else
+  $(info Unexpected CONFIG_TARGET, use default LINUX)
+  TARGET_PLATFORM=LINUX
+  TARGET_CFLAGS +=-DIOPSYS_LINUX
+endif
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	subdirs="$(subdirs)"
+
+define Package/libethernet
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=IOPSYS HAL libs
+  MENU:=1
+  TITLE:= Ethernet library (libethernet)
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_airoha:ecnt_api +TARGET_brcmbca:bcmkernel
+endef
+
+define Package/libethernet/description
+  Library provides ethernet HAL APIs
+endef
+
+define Package/libethernet/config
+  config LIBETHERNET_DEBUG
+	depends on PACKAGE_libethernet
+	bool "Enable ethernet debugging"
+	default n
+
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./libethernet/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Build/InstallDev/libethernet
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/ethernet.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libethernet.so $(1)/usr/lib/
+endef
+
+define Build/InstallDev
+	$(call Build/InstallDev/libethernet,$(1),$(2))
+endef
+
+define Package/libethernet/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libethernet.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libethernet))

libpicoevent-bcm/Makefile

@@ -0,0 +1,52 @@
+#
+# Copyright (C) 2006-2010 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_RELEASE:=1
+PKG_VERSION:=0.3
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libpicoevent.git
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=f446f186102539cceedaa15a95a33547ac3c1fd7
+PKG_NAME:=libpicoevent-bcm
+
+PKG_LICENSE:=LGPL-2.1-only
+PKG_LICENSE_FILES:=LICENSE
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/libpicoevent-bcm
+  CATEGORY:=Libraries
+  TITLE:=Libpicoevent-bcm
+  URL:=
+  DEPENDS:= +TARGET_brcmbca:bcmkernel
+  include $(TOPDIR)/feeds/broadcom/bcmkernel/bcm-toolchain.mk
+  TARGET_CFLAGS := -Os -pipe -mfpu=vfpv3-d16 -mfloat-abi=softfp -DCONFIG_TARGET_brcmbca -g3 -fno-caller-saves -fno-plt -Wno-error=unused-but-set-variable -Wno-error=unused-result \
+                   -mfloat-abi=soft -fmacro-prefix-map=$(BUILD_DIR)libpicoevent-bcm-0.3=libpicoevent-bcm-0.3 -Wformat -Werror=format-security -fstack-protector -D_FORTIFY_SOURCE=1 \
+                   -Wl,-z,now -Wl,-z,relro -Wl,--build-i
+endef
+
+define Package/libpicoevent-bcm/description
+	Minimal event library
+endef
+
+define Package/libpicoevent-bcm/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/lib/broadcom
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include/bcm963xx
+	$(CP) $(PKG_BUILD_DIR)/libpicoevent.h $(STAGING_DIR)/usr/include/bcm963xx
+	mkdir -p $(1)/usr/lib/broadcom
+	$(CP) $(PKG_BUILD_DIR)/libpicoevent.so $(STAGING_DIR)/usr/lib/broadcom
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/libpicoevent.so $(1)/usr/lib/broadcom
+endef
+
+$(eval $(call BuildPackage,libpicoevent-bcm))

libqos/Makefile

@@ -0,0 +1,103 @@
+#
+# Copyright (C) 2020-2023 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libqos
+PKG_VERSION:=7.2.101
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=93ca0a66d6f82bca208bbe52b75ed582b20aa094
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
+PKG_MIRROR_HASH:=skip
+endif
+
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_LICENSE:=LGPL-2.1-only
+PKG_LICENSE_FILES:=LICENSE
+
+include $(INCLUDE_DIR)/package.mk
+
+ifeq ($(CONFIG_TARGET_brcmbca),y)
+  TARGET_PLATFORM=BROADCOM
+  CHIP_ID=$(patsubst "%",%,$(CONFIG_BCM_CHIP_ID))
+  TARGET_CFLAGS +=-DIOPSYS_BROADCOM -DCHIP_$(CHIP_ID) -DCONFIG_BCM9$(CHIP_ID) \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/bcmdrivers/opensource/include/bcm963xx \
+	-I$(STAGING_DIR)/usr/include/bcm963xx/userspace/public/include
+else ifeq ($(CONFIG_TARGET_x86),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_armvirt),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_airoha),y)
+  TARGET_PLATFORM=ECONET
+  TARGET_CFLAGS +=-DIOPSYS_ECONET
+else ifeq ($(CONFIG_TARGET_ipq95xx),y)
+  TARGET_PLATFORM=IPQ95XX
+  TARGET_CFLAGS +=-DIPQ95XX
+else ifeq ($(CONFIG_TARGET_mediatek),y)
+  TARGET_PLATFORM=LINUX
+  TARGET_CFLAGS +=-DIOPSYS_LINUX
+else
+  $(info Unexpected CONFIG_TARGET, use default LINUX)
+  TARGET_PLATFORM=LINUX
+  TARGET_CFLAGS +=-DIOPSYS_LINUX
+endif
+
+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	subdirs="$(subdirs)"
+
+define Package/libqos
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=IOPSYS HAL libs
+  MENU:=1
+  TITLE:= QoS library (libqos)
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_brcmbca:bcmkernel
+endef
+
+define Package/libqos/config
+  config LIBQOS_DEBUG
+	depends on PACKAGE_libqos
+	bool "Enable qos debugging"
+	default n
+
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+        $(CP) -rf ./libqos/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Build/InstallDev/libqos
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/include/qos.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libqos.so $(1)/usr/lib/
+endef
+
+define Build/InstallDev
+	$(call Build/InstallDev/libqos,$(1),$(2))
+endef
+
+define Package/libqos/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libqos*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libqos))

libvoice-airoha/Makefile

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvoice-airoha
+PKG_RELEASE:=1
+PKG_VERSION:=1.0.7
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
+PKG_SOURCE_VERSION:=5e1befd02c6734ee8b94b7ef54d6171ba1086042
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += -Wall -Werror
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Utilities
+	TITLE:=IOPSYS libvoice for Airoha platform
+	URL:=
+	DEPENDS:=
+endef
+
+define Package/$(PKG_NAME)/description
+	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/$(PKG_NAME)/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
+

libvoice-airoha/files/lib/voice/codecs.json

@@ -0,0 +1,60 @@
+{
+	"ulaw": {
+		"name": "G.711MuLaw",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 64
+	},
+	"alaw": {
+		"name": "G.711ALaw",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 64
+	},
+	"g726": {
+		"name": "G.726",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 16,
+		"rtp_payload": 80
+	},
+	"g723": {
+		"name": "G.723.1",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 30,
+		"ptime_increment": 30,
+		"bitrate": 5.3
+	},
+	"g729": {
+		"name": "G.729",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 8
+	},
+	"ilbc": {
+		"name": "iLBC",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 30,
+		"bitrate": 15.2
+	},
+	"gsm": {
+		"name": "AMR",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 20,
+		"bitrate": 12.2
+	}
+}
+

libvoice-broadcom/Makefile

@@ -0,0 +1,59 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvoice-broadcom
+PKG_RELEASE:=1
+PKG_VERSION:=1.0.5
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
+PKG_SOURCE_VERSION:=8c8fa2b70e2bd570deb291478b31fa81a4ab3c1a
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
+
+export CONFIG_BCM_CHIP_ID
+
+include $(INCLUDE_DIR)/package.mk
+
+TARGET_CFLAGS += -Wall -Werror
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Utilities
+	TITLE:=IOPSYS libvoice for Broadcom
+	URL:=
+	DEPENDS:=
+endef
+
+define Package/$(PKG_NAME)/description
+	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/$(PKG_NAME)/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
+

libvoice-broadcom/files/lib/voice/codecs.json

@@ -0,0 +1,59 @@
+{
+	"ulaw": {
+		"name": "G.711MuLaw",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 64
+	},
+	"alaw": {
+		"name": "G.711ALaw",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 64
+	},
+	"g726": {
+		"name": "G.726",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 16
+	},
+	"g723": {
+		"name": "G.723.1",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 30,
+		"ptime_increment": 30,
+		"bitrate": 5.3
+	},
+	"g729": {
+		"name": "G.729",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 8
+	},
+	"ilbc": {
+		"name": "iLBC",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 30,
+		"bitrate": 15.2
+	},
+	"gsm": {
+		"name": "AMR",
+		"ptime_min": 10,
+		"ptime_max": 30,
+		"ptime_default": 20,
+		"ptime_increment": 20,
+		"bitrate": 12.2
+	}
+}
+

libvoice-d2/Makefile

@@ -0,0 +1,57 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvoice-d2
+PKG_RELEASE:=1
+PKG_VERSION:=1.0.11
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
+PKG_SOURCE_VERSION:=a30a6fa713f23ac46b99842e9bf099a6c2559b94
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_MIRROR_HASH:=skip
+endif
+
+# All config variable that are passed to the make invocation, directly or
+# indirectly. This ensures that the package is rebuilt on config-changes.
+PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
+
+include $(INCLUDE_DIR)/package.mk
+
+export D2_VTSP_PLATFORM := $(shell echo $(CONFIG_D2_VTSP_PLATFORM))
+
+TARGET_CFLAGS += -Wall -Werror
+
+define Package/$(PKG_NAME)
+	CATEGORY:=Utilities
+	TITLE:=IOPSYS libvoice for D2 which is software DSP
+	URL:=
+	DEPENDS:=+d2-voice
+endef
+
+define Package/$(PKG_NAME)/description
+	Libvoice is a library that provides a uniform set of APIs and data types with hardware abstract layer for DSP/SLIC from different vendors
+endef
+
+ifeq ($(LOCAL_DEV),1)
+define Build/Prepare
+	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/$(PKG_NAME)/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
+

libvoice-d2/files/lib/voice/codecs.json

@@ -0,0 +1,34 @@
+{
+	"ulaw": {
+		"name": "G.711MuLaw",
+		"ptime_min": 10,
+		"ptime_max": 40,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 64
+	},
+	"alaw": {
+		"name": "G.711ALaw",
+		"ptime_min": 10,
+		"ptime_max": 40,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 64
+	},
+	"g729": {
+		"name": "G.729",
+		"ptime_min": 10,
+		"ptime_max": 40,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 8
+	},
+	"g722": {
+		"name": "G.722",
+		"ptime_min": 10,
+		"ptime_max": 40,
+		"ptime_default": 20,
+		"ptime_increment": 10,
+		"bitrate": 56
+	}
+}