icwmp: optimize dual stack implementation

This reverts commit e26a9affbd. We updated
to v22.03.4, so the workaround causes problems because the actual issue
has been fixed.

airties-edge/Makefile

@@ -1,44 +0,0 @@
-#
-# 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:=airties-edge
-PKG_VERSION:=1.0.0
-
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/3rdparty/airties-edge.git
-PKG_SOURCE_VERSION:=2824fbc580f6cfc39b6a5faa4f0e4d168169ed22
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
-PKG_MIRROR_HASH:=skip
-
-PKG_LICENSE:=PROPRIETARY
-PKG_LICENSE_FILES:=LICENSE
-
-include $(INCLUDE_DIR)/package.mk
-
-define Package/airties-edge
-  SECTION:=libs
-  CATEGORY:=Libraries
-  TITLE:=Airties Edge library
-  DEPENDS:=+libubox +libubus +libblobmsg-json +libjson-c
-endef
-
-TARGET_CFLAGS += -DVENDOR_PREFIX=\\\"$(CONFIG_BBF_VENDOR_PREFIX)\\\"
-#TARGET_CFLAGS += -DLIB_VERSION=\\\"$(PKG_VERSION)\\\"
-
-define Package/airties-edge/install
-	#$(INSTALL_DIR) $(1)/airties-edge
-	#$(INSTALL_DIR) $(1)/airties-edge/lib
-	#$(CP) $(PKG_BUILD_DIR)/lib_airties_edge/libairtiesedge.so $(1)/airties-edge/lib
-	$(INSTALL_DIR) $(1)/usr
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libairtiesedge_dm.so $(1)/usr/lib/bbfdm
-endef
-
-$(eval $(call BuildPackage,airties-edge))

bbf/files/etc/bbfdm/json/UserInterface.json

@@ -1,112 +0,0 @@
-{
-	"Device.UserInterface.": {
-		"type": "object",
-		"version": "2.0",
-		"protocols": [
-			"cwmp",
-			"usp"
-		],
-		"access": false,
-		"array": false,
-		"Device.UserInterface.RemoteAccess.": {
-			"type": "object",
-			"version": "2.0",
-			"protocols": [
-				"cwmp",
-				"usp"
-			],
-			"access": false,
-			"array": false,
-			"Enable": {
-				"type": "boolean",
-				"read": true,
-				"write": true,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci", 
-						"uci": {
-							"file": "userinterface", 
-							"section": {
-								"name": "remote_access"
-							}, 
-							"option": {
-								"name": "enable"
-							}
-						}
-					}
-				]
-			},
-			"Port": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci", 
-						"uci": {
-							"file": "userinterface", 
-							"section": {
-								"name": "remote_access"
-							}, 
-							"option": {
-								"name": "port"
-							}
-						}
-					}
-				]
-			},
-			"SupportedProtocols": {
-				"type": "string",
-				"read": true,
-				"write": false,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"list": {
-					"datatype": "string",
-					"enumerations": [
-						"HTTP",
-						"HTTPS"
-					]
-				},
-				"default": "HTTP"
-			},
-			"Protocol": {
-				"type": "string",
-				"read": true,
-				"write": true,
-				"version": "2.0",
-				"protocols": [
-					"cwmp",
-					"usp"
-				],
-				"mapping": [
-					{
-						"type": "uci", 
-						"uci": {
-							"file": "userinterface", 
-							"section": {
-								"name": "remote_access"
-							}, 
-							"option": {
-								"name": "protocol"
-							}
-						}
-					}
-				]
-			}
-		}
-	}
-}

bbf/files/etc/config/userinterface

@@ -1,6 +0,0 @@
-config userinterface 'remote_access'
-	option enable '0'
-	option interface 'wan'
-	option port '80'
-	option protocol 'HTTP'
-

bbf/files/etc/firewall.userinterface

@@ -1,88 +0,0 @@
-#!/bin/sh
-
-
-#!/bin/sh
-
-. /lib/functions.sh
-
-IDENTIFIER="REMOTE-ACCESS-WAN"
-
-log() {
-	echo "${@}"|logger -t firewall.userinterface -p info
-}
-
-if [ ! -f "/etc/config/userinterface" ]; then
-	exit 0;
-fi
-
-function exec_cmd()
-{
-	if ! $@; then
-		log "Failed to run [$@]"
-	fi
-}
-
-function configure_firewall_rule()
-{
-	local enable port protocol gui_port
-	local zone interface
-
-	config_load userinterface
-	config_get_bool enable remote_access enable 1
-	config_get port remote_access port
-	config_get interface remote_access interface
-
-	if [ "${enable}" -eq "0" -o -z "${port}" -o -z "${interface}" ]; 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
-
-	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
-}
-
-function delete_firewall_rule()
-{
-	local zone interface
-	local CMD
-
-	config_load userinterface
-	config_get interface remote_access interface
-
-	# Clean remote interface rules
-	if [ -z "${interface}" ]; then
-		return 0
-	fi
-
-	zone="zone_${interface}_input"
-	CMD="iptables -w 1 -t filter -L ${zone} --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 ${zone} ${rule_num};
-		fi
-	done
-
-	zone="zone_${interface}_output"
-	CMD="iptables -w 1 -t filter -L ${zone} --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 ${zone} ${rule_num};
-		fi
-	done
-}
-
-# Delete existing remote access rules
-delete_firewall_rule
-
-# Configure the User Interface rule
-configure_firewall_rule

bbf/files/etc/init.d/userinterface

@@ -1,27 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-STOP=01
-
-USE_PROCD=1
-
-start_service() {
-	local enable
-
-	procd_open_instance usp
-
-	config_load userinterface
-	config_get_bool enable global enable 1
-
-	# Inject firewall rules
-	if [ "${enable}" -eq "1" ]; then
-		/etc/firewall.userinterface
-	fi
-
-	procd_close_instance
-}
-
-service_triggers()
-{
-	procd_add_reload_trigger "userinterface"
-}

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

@@ -1,31 +1,30 @@
 #
-# Copyright (C) 2022 IOPSYS
+# Copyright (C) 2023 IOPSYS
 #
 
 include $(TOPDIR)/rules.mk
 
-PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.6
+PKG_NAME:=bbfdm
+PKG_VERSION:=1.0.4
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=1db92e1259673e6bf2a92f905aa1b54674dc12c1
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
+PKG_SOURCE_VERSION:=96b305926f8fa8cafa0638e613879537da9b6086
 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:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
-define Package/libbbf_api
+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
 
@@ -34,13 +33,16 @@ define Package/libbbfdm/default
   CATEGORY:=Utilities
   SUBMENU:=TRx69
   TITLE:=Library for broadband forum data model support
-  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbf_api
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libcurl +libbbfdm-api \
+	    +BBF_TR471:obudpst
 endef
 
 define Package/libbbfdm
   $(Package/libbbfdm/default)
-  TITLE += (internal)
-  VARIANT:=internal
+  TITLE += (default)
+  VARIANT:=default
+  DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
+  DEFAULT_VARIANT:=1
 endef
 
 define Package/libbbfdm-mbedtls
@@ -48,23 +50,33 @@ define Package/libbbfdm-mbedtls
   TITLE += (mbedtls)
   DEPENDS += +PACKAGE_libbbfdm-mbedtls:libmbedtls
   VARIANT:=mbedtls
-  DEFAULT_VARIANT:=1
+  CONFLICTS := libbbfdm libbbfdm-openssl libbbfdm-wolfssl
 endef
 
 define Package/libbbfdm-openssl
   $(Package/libbbfdm/default)
   TITLE += (openssl)
   DEPENDS += +PACKAGE_libbbfdm-openssl:libopenssl
-  CONFLICTS := libbbfdm-mbedtls
   VARIANT:=openssl
+  CONFLICTS := libbbfdm libbbfdm-mbedtls libbbfdm-wolfssl
 endef
 
 define Package/libbbfdm-wolfssl
   $(Package/libbbfdm/default)
   TITLE += (wolfssl)
   DEPENDS += +PACKAGE_libbbfdm-wolfssl:libwolfssl
-  CONFLICTS := libbbfdm-mbedtls libbbfdm-openssl
   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
@@ -75,14 +87,14 @@ define Package/userinterface
 endef
 
 define Package/userinterface/description
-  Package to add Device.UserInterface. datamodel support using libbbf JSON Plugin
+  Package to add Device.UserInterface. datamodel support
 endef
 
 define Package/libbbfdm/config
 	source "$(SOURCE)/Config_bbfdm.in"
 endef
 
-define Package/libbbf_api/description
+define Package/libbbfdm-api/description
  Library contains the API(UCI, UBUS, JSON, CLI and Browse) of libbbfdm
 endef
 
@@ -110,6 +122,11 @@ 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
@@ -131,6 +148,10 @@ 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
@@ -143,21 +164,36 @@ ifeq ($(BUILD_VARIANT),mbedtls)
 CMAKE_OPTIONS += -DWITH_MBEDTLS=ON
 endif
 
-define Package/libbbf_api/install
+ifeq ($(CONFIG_PACKAGE_bbfdmd),y)
+CMAKE_OPTIONS += -DBBFDMD_ENABLED=ON
+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)/etc/bbfdm/json
+	$(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/lib/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
-	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
+	$(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
@@ -166,22 +202,34 @@ define Package/libbbfdm/default/prerm
 	exit 0
 endef
 
+define Package/bbfdmd/install
+	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/config
+	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
+	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/src/bbfdmd $(1)/usr/sbin/
+endef
+
 define Package/userinterface/install
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/etc/init.d
-	$(INSTALL_DATA) ./files/etc/bbfdm/json/UserInterface.json $(1)/etc/bbfdm/json/
+	$(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/firewall.userinterface $(1)/etc/firewall.userinterface
 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)
@@ -190,16 +238,22 @@ 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)/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/
+	$(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,userinterface))
-$(eval $(call BuildPackage,libbbf_api))
+$(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,5 @@
+
+config bbfdmd 'bbfdmd'
+	option loglevel '1'
+	option refresh_time '10'
+	option transaction_timeout '10'

bbfdm/files/etc/config/userinterface

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

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/init.d/bbfdmd

@@ -0,0 +1,83 @@
+#!/bin/sh /etc/rc.common
+
+START=96
+STOP=10
+
+USE_PROCD=1
+PROG=/usr/sbin/bbfdmd
+
+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' \
+		'transaction_timeout:string'
+}
+
+configure_bbfdmd()
+{
+	local enabled debug sock transaction_timeout
+
+	config_load bbfdm
+
+	validate_bbfdm_bbfdmd_section || {
+		log "Validation of bbfdmd section failed"
+		return 1;
+	}
+
+	[ "${enabled}" -eq 0 ] && return 0
+
+	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
+
+	if [ -n "${transaction_timeout}" ]; then
+		procd_append_param command -t "${transaction_timeout}"
+	fi
+}
+
+apply_sysctl_configuration() {
+	local sysctl_conf
+
+	sysctl_conf="/etc/bbfdm/sysctl.conf"
+	
+	[ -f "${sysctl_conf}" ] || touch "${sysctl_conf}"
+
+	sysctl -e -p "${sysctl_conf}" >&-
+}
+
+start_service() {
+	local sysctl_reload
+
+	ubus -t 5 wait_for network.device
+	[ "$?" -eq 0 ] && sysctl_reload=1
+
+	procd_open_instance bbf
+	configure_bbfdmd
+	procd_set_param respawn
+	procd_close_instance
+
+	[ "${sysctl_reload}" -eq 1 ] && apply_sysctl_configuration
+}
+
+reload_service() {
+	ubus -t 5 wait_for network.device
+	apply_sysctl_configuration
+}
+
+service_triggers()
+{
+	procd_add_reload_trigger "bbfdm" "network"
+}

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/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/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.9
+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:=6e85d2032e66df581fae7c72cd83cc89367b8fc8
+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/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,78 @@
+#
+# Copyright (C) 2021-2023 IOPSYS Software Solutions AB
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=decollector
+PKG_VERSION:=4.0.2.0
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=162654487bfbff7d68d0c87ae9498a3def738d84
+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_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))

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.7
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=cf4e91ffe0a1d83140fef5b41d16e581e5341cec
+PKG_SOURCE_VERSION:=83f89a83cf860bbcf2b7f2e030215db315a5bbbf
 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

@@ -10,8 +10,9 @@ 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() {
@@ -19,18 +20,48 @@ stop_and_wait_dectmngr() {
 
 	pidof $NAME && sleep 2 # wait for the process to stop gracefully
 	while pidof $NAME; do
-		killall -q -9 $NAME 
+		killall -q -9 $NAME
 		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 +82,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 +109,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 +119,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 +134,3 @@ boot() {
 	[ ! -d $DB_PATH ] && mkdir -p $DB_PATH
 	start
 }
-

dslmngr/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dslmngr
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.2.0
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -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-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.7
-PKG_RELEASE:=1
-
-LOCAL_DEV=0
-ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=055ffe68d293616f02a430692343b9d051d96f5b
-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_brcmbca),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_airoha),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_airoha: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_brcmbca: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:=dc12712af8c4088f7873502ca845e51c68a1ada9
-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))

endptmngr/files/etc/init.d/endptmngr

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

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_iopsys_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_iopsys_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_iopsys_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,149 @@
+# 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 Capabilities' | awk '{print$NF}' | cut -d'|' -f1)"
+	local speed=1000
+
+	case "$phycap" in
+		10GFD) speed=10000 ;;
+		5GFD) speed=5000 ;;
+		2.5GFD) speed=2500 ;;
+		1GFD|1GHD) 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"
+
+	phycrossbar="$(ethctl $ifname phy-crossbar | head -1)"
+	crossbartype="$(echo $phycrossbar | awk '{print$2$3}')"
+	# Take only the last PHY Endpoint (non-Serdes) into account as Serdes port number precedes
+	[ "$crossbartype" == "oncrossbar" ] && pyhendpoint="$(echo $phycrossbar | awk '{print$NF}')"
+
+	phycaps="$(ethctl $ifname media-type ${pyhendpoint:+ port $pyhendpoint} | awk -F'PHY Capabilities: ' '{print$2}')"
+	numofcaps="$(echo $phycaps | tr '|' ' ' | wc -w)"
+
+        # Reset the port before setting new params
+        reset_port $ifname
+
+	if [ "$numofcaps" == "1" ]; then
+		logger -t "port-management" "$ifname is capable of $phycaps only; not setting speed/duplex"
+	else
+		logger -t "port-management" "$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
+}

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");

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.1.2
+PKG_VERSION:=9.3.2
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=b964edb3570797286584793dbadfbef323cddbeb
+PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
+PKG_SOURCE_VERSION:=a68417ec44251e9f619f2682618b06dae083bd32
 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 +libuuid
+  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

@@ -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,13 +64,13 @@ 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}

icwmp/files/etc/icwmpd/update.sh

@@ -16,7 +16,7 @@ handle_icwmp_update() {
 
 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 
-	if [ "$ret" == "true" ]; then
+	if [ "$ret" = "true" ]; then
 		# read status from var/state/cwmp
 		status=$(uci -q -c /var/state get cwmp.sess_status.current_status)
 		if [ "$status" != "running" ]; then
@@ -29,4 +29,4 @@ handle_icwmp_update() {
 	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
@@ -122,12 +122,12 @@ 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))
@@ -159,7 +159,7 @@ configure_send_op125() {
 		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
@@ -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,12 +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
-		uci -q -c /var/state delete cwmp.sess_status
-		uci -q -c /var/state commit cwmp
-		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/
@@ -337,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'
 
 }
@@ -394,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
@@ -421,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
 }
 
@@ -443,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
@@ -457,11 +449,6 @@ start_service() {
 	procd_close_instance
 }
 
-service_stopped()
-{
-	copy_cwmp_varstate_files_to_etc
-}
-
 stop_service()
 {
 	copy_cwmp_varstate_files_to_etc
@@ -487,7 +474,7 @@ reload_service() {
 		return 0
 	fi
 
-	status="$(echo $tr069_status | jsonfilter -qe '@.cwmp.status')"
+	status="$(echo "${tr069_status}" | jsonfilter -qe '@.cwmp.status')"
 	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'

ieee1905/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=6.0.1
+PKG_VERSION:=8.0.15
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b466c02716acbc55f552e7d35dcfec95bbd7fa78
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
+PKG_SOURCE_VERSION:=1717f97c054c232d393c91fa7e95a571bf893680
+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

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

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

@@ -56,8 +56,8 @@ CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 
 # EasySoC HAL #
 CONFIG_PACKAGE_inbd=y
-CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_port-management=y
+CONFIG_PACKAGE_qosmngr=y
+CONFIG_PACKAGE_libwifiutils=y
 CONFIG_PACKAGE_wifimngr=y
 
 # Multi-AP #
@@ -65,7 +65,7 @@ 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
 
 # Network #
 CONFIG_PACKAGE_netmode=y
@@ -76,14 +76,16 @@ CONFIG_PACKAGE_urlfilter=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
+CONFIG_PACKAGE_usermngr=y
 
 # TR-x69 #
-CONFIG_PACKAGE_uspd-mbedtls=y
-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
@@ -107,6 +109,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
@@ -130,7 +134,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
@@ -152,6 +156,7 @@ CONFIG_PACKAGE_ip-bridge=y
 CONFIG_PACKAGE_ip-full=y
 CONFIG_PACKAGE_iperf3=y
 CONFIG_PACKAGE_ipset=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
@@ -301,10 +306,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

@@ -30,23 +30,18 @@ function feeds_update {
 		./scripts/feeds install -f -p openwrt_core -a
 	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
+
 	# 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")"
-	done
-
 	# install all packages
 	./scripts/feeds install -a
 

iop/scripts/genconfig.sh

@@ -14,7 +14,6 @@ function genconfig {
 	target="bogus"
 	target_config_path=""
 	brcmbca_feed="target/linux/feeds/brcmbca"
-	ramips_feed="target/linux/feeds/iopsys-ramips"
 	airoha_feed="target/linux/feeds/airoha"
 	x86_feed="target/linux/feeds/iopsys-x86"
 	armvirt_feed="target/linux/feeds/iopsys-armvirt"
@@ -111,8 +110,6 @@ function genconfig {
 
 		[ -e $brcmbca_feed/genconfig ] &&
 			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $ramips_feed/genconfig ] &&
-			iopsys_ramips=$(cd $ramips_feed; ./genconfig)
 		[ -e $airoha_feed/genconfig ] &&
 			airoha=$(cd $airoha_feed; ./genconfig)
 		[ -e $x86_feed/genconfig ] &&
@@ -125,7 +122,7 @@ function genconfig {
 			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in brcmbca airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -142,14 +139,6 @@ function genconfig {
 		fi
 	    done
 
-	    for p in $iopsys_ramips; do
-		if [ $p == $profile ]; then
-		    target="iopsys_ramips"
-			target_config_path="$ramips_feed/config"
-		    return
-		fi
-	    done
-
 	    for p in $airoha; do
 		if [ $p == $profile ]; then
 		    target="airoha"
@@ -276,11 +265,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
@@ -298,6 +298,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
@@ -340,17 +358,16 @@ function genconfig {
 		    echo "" >> .config
 		fi
 
-		# Special handling for targets which use TARGET_DEVICES 
+		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
+		airoha | iopsys_mediatek | brcmbca | ipq95xx)
 			# 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
@@ -388,12 +405,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

iop/scripts/genconfig_min.sh

@@ -13,7 +13,6 @@ function genconfig_min {
 	target="bogus"
 	target_config_path=""
 	brcmbca_feed="target/linux/feeds/brcmbca"
-	ramips_feed="target/linux/feeds/iopsys-ramips"
 	airoha_feed="target/linux/feeds/airoha"
 	x86_feed="target/linux/feeds/iopsys-x86"
 	armvirt_feed="target/linux/feeds/iopsys-armvirt"
@@ -110,8 +109,6 @@ function genconfig_min {
 
 		[ -e $brcmbca_feed/genconfig ] &&
 			brcmbca=$(cd $brcmbca_feed; ./genconfig)
-		[ -e $ramips_feed/genconfig ] &&
-			iopsys_ramips=$(cd $ramips_feed; ./genconfig)
 		[ -e $airoha_feed/genconfig ] &&
 			airoha=$(cd $airoha_feed; ./genconfig)
 		[ -e $x86_feed/genconfig ] &&
@@ -124,7 +121,7 @@ function genconfig_min {
 			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca iopsys_ramips airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
+			for list in brcmbca airoha iopsys_x86 iopsys_armvirt iopsys_mediatek ipq95xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -141,14 +138,6 @@ function genconfig_min {
 		fi
 	    done
 
-	    for p in $iopsys_ramips; do
-		if [ $p == $profile ]; then
-		    target="iopsys_ramips"
-			target_config_path="$ramips_feed/config"
-		    return
-		fi
-	    done
-
 	    for p in $airoha; do
 		if [ $p == $profile ]; then
 		    target="airoha"
@@ -192,12 +181,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() {
@@ -289,6 +272,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
@@ -333,15 +334,14 @@ function genconfig_min {
 
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		iopsys_ramips | airoha | iopsys_mediatek | brcmbca | ipq95xx)
+		airoha | iopsys_mediatek | brcmbca | ipq95xx)
 			# 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
@@ -379,12 +379,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

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,95 @@
+#
+# 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:=54d53295b5e4ca74884045d0fa6bb0dc279ace3d
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libdsl.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
+
+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_iopsys_x86),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+endif
+
+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.99
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=bca982ba1e3c59fc900d297145b731dd0ad588a0
+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,110 @@
+#
+# Copyright (C) 2020-2023 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libethernet
+PKG_VERSION:=7.2.102
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=30df74671870acef99036217e002d1f4418c8d4f
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.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
+PKG_BUILD_DEPENDS:=+TARGET_brcmbca:bcmkernel
+
+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_iopsys_x86),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_iopsys_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_iopsys_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/libethernet
+  SECTION:=libs
+  CATEGORY:=Libraries
+  SUBMENU:=IOPSYS HAL libs
+  MENU:=1
+  TITLE:= Ethernet library (libethernet)
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_airoha:ecnt_api
+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,105 @@
+#
+# Copyright (C) 2020-2023 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libqos
+PKG_VERSION:=7.2.100
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=3a37af002fee1c0d35da49cefee2d24ee92a5d0a
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.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
+PKG_BUILD_DEPENDS:=+TARGET_brcmbca:bcmkernel
+
+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_iopsys_x86),y)
+  TARGET_PLATFORM=TEST
+  TARGET_CFLAGS +=-DIOPSYS_TEST
+else ifeq ($(CONFIG_TARGET_iopsys_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_iopsys_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
+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.0
+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:=2a6ef141747ad0f7b32a536b5b5bd174834a7af5
+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,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": "GSM-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.0
+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:=401a392a72e2933f527eb92466faaf2907c38730
+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": "GSM-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.2
+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:=7ca102e62fa439a7188f2c5e4c72e3fcfd3fb28a
+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,42 @@
+{
+	"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
+	},
+	"g729a": {
+		"name": "G.729a",
+		"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
+	}
+}

libwifi/Makefile

@@ -0,0 +1,162 @@
+#
+# Copyright (C) 2020-2023 Iopsys
+#
+
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libwifi
+PKG_VERSION:=7.2.100
+
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_VERSION:=d6e14d7a0b747ca09d3f6843cea9ae3584d18dd3
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.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
+
+ifeq ($(CONFIG_TARGET_brcmbca),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_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_airoha),y)
+  TARGET_PLATFORM=ECONET
+  TARGET_WIFI_TYPE=MEDIATEK MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_ECONET
+else ifeq ($(CONFIG_TARGET_ipq95xx),y)
+  TARGET_PLATFORM=IPQ95XX
+  TARGET_WIFI_TYPE=MAC80211
+  TARGET_CFLAGS +=-DIPQ95XX
+else ifeq ($(CONFIG_TARGET_iopsys_mediatek),y)
+  TARGET_PLATFORM=LINUX
+  TARGET_WIFI_TYPE=MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_LINUX
+else
+  $(info Unexpected CONFIG_TARGET, use default MAC80211)
+  TARGET_PLATFORM=MAC80211
+  TARGET_WIFI_TYPE=MAC80211
+  TARGET_CFLAGS +=-DIOPSYS_MAC80211
+endif
+
+ifneq ($(CONFIG_PACKAGE_libwifi),)
+TARGET_CFLAGS +=-DHAS_WIFI
+endif
+
+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/libwifi/ $(PKG_BUILD_DIR)/
+endef
+endif
+
+define Package/libwifi-common
+  SECTION:=libs
+  CATEGORY:=Libraries
+  TITLE:=libwifi
+  SUBMENU:=IOPSYS HAL libs
+  DEPENDS:=+libopenssl
+  MENU:=1
+endef
+
+define Package/libwifi/description
+  Library provides WiFi HAL APIs and WiFi common utility functions
+endef
+
+define Package/libwifiutils
+  $(call Package/libwifi-common)
+  TITLE:= WiFi utility library (libwifiutils.so)
+  DEPENDS+=+libnl +libnl-route +libeasy
+endef
+
+define Build/InstallDev/libwifiutils
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/wifidefs.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/wifiutils.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifiutils*.so* $(1)/usr/lib/
+endef
+
+define Package/libwifiutils/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifiutils*.so* $(1)/usr/lib/
+endef
+
+
+define Package/libwifi
+  $(call Package/libwifi-common)
+  TITLE:= WiFi library (libwifi)
+  DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcmkernel
+endef
+
+define Package/libwifi/config
+  if PACKAGE_libwifi
+	config LIBWIFI_DEBUG
+		depends on PACKAGE_libwifi
+		bool "Enable debugging in libwifi"
+		default n
+
+	config LIBWIFI_USE_CTRL_IFACE
+		bool "Create UNIX sockets to interface with hostapd/wpa_supplicant"
+		default n
+  endif
+endef
+
+
+define Build/InstallDev/libwifi
+	$(INSTALL_DIR) $(1)/usr/include
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/wifiops.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/wifi.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifi-7*.so* $(1)/usr/lib/
+endef
+
+
+define Build/InstallDev
+	$(call Build/InstallDev/libwifiutils,$(1),$(2))
+ifneq ($(CONFIG_PACKAGE_libwifi),)
+	$(call Build/InstallDev/libwifi,$(1),$(2))
+endif
+endef
+
+define Package/libwifi/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi-7*.so* $(1)/usr/lib/
+endef
+
+$(eval $(call BuildPackage,libwifiutils))
+$(eval $(call BuildPackage,libwifi))

loop-detector/files/loop_detection.init

@@ -20,10 +20,6 @@ start_service() {
 	fi
 }
 
-stop() {
-	service_stop /sbin/loop-detector
-}
-
 service_triggers()
 {
 	procd_add_reload_trigger loop_detection
@@ -33,4 +29,3 @@ reload_service() {
 	stop
 	start
 }
-

map-agent/Config.in

@@ -13,6 +13,9 @@ config AGENT_ISLAND_PREVENTION
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
+config AGENT_EASYMESH_VERSION
+	int "Support Easymesh version"
+	default 2
 
 config AGENT_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"
@@ -30,5 +33,17 @@ config AGENT_EASYMESH_VENDOR_EXT_OUI
 	enabled through AGENT_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.
 
+config AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST
+	bool "Create STA entry before authorization is completed"
+
+config AGENT_CHANSWITCH_SKIP_DFS_UNAVAILABLE
+	bool "Skip DFS unavailable channels when channel switch"
+
+config AGENT_LOCAL_ACS_SERVICE
+	bool "Enable loacal ACS daemon usage"
+
+config AGENT_STRICT_OPER_CHANNEL_REPORT
+	bool "Report operation channel strictly, skip some unsolicited reports"
+
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=2.10.3.28
+PKG_VERSION:=4.3.1.1
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5deb9717bdf4832734bc710bf51cf27a69a9d7eb
+PKG_SOURCE_VERSION:=a6c5d7cbbc6363e123cfacc9333e5ae507f6dcd7
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-agent
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-agent
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -59,6 +59,8 @@ TARGET_CFLAGS += \
 	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_AGENT_EASYMESH_VERSION)
+
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
@@ -76,6 +78,21 @@ TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_AGENT_EASYMESH_VENDOR_EX
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT
 endif
 
+ifeq ($(CONFIG_AGENT_UNAUTHORIZED_STA_IN_ASSOCLIST),y)
+TARGET_CFLAGS += -DUNAUTHORIZED_STA_IN_ASSOCLIST
+endif
+
+ifeq ($(CONFIG_AGENT_CHANSWITCH_SKIP_DFS_UNAVAILABLE),y)
+TARGET_CFLAGS += -DCHANSWITCH_SKIP_DFS_UNAVAILABLE
+endif
+
+ifeq ($(CONFIG_AGENT_LOCAL_ACS_SERVICE),y)
+TARGET_CFLAGS += -DLOCAL_ACS_SERVICE
+endif
+
+ifeq ($(CONFIG_AGENT_STRICT_OPER_CHANNEL_REPORT),y)
+TARGET_CFLAGS += -DSTRICT_OPER_CHANNEL_REPORT
+endif
 
 MAKE_PATH:=src
 

map-agent/files/etc/config/mapagent

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

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

@@ -25,7 +25,7 @@ validate_agent_section() {
 	uci_validate_section mapagent agent "agent" \
 		'enabled:bool:true' \
 		'debug:range(0,16)' \
-		'profile:range(1,2):2' \
+		'profile:range(1,4):2' \
 		'brcm_setup:bool:false' \
 		'controller_macaddr:macaddr' \
 		'al_bridge:string' \
@@ -34,7 +34,8 @@ validate_agent_section() {
 		'resend_num:uinteger:0' \
 		'dyn_cntlr_sync:bool:true' \
 		'island_prevention:bool:false' \
-		'eth_onboards_wifi_bhs:bool:false'
+		'eth_onboards_wifi_bhs:bool:false' \
+		'scan_on_boot_only:bool:false'
 
 
 	[ "$?" -ne 0 ] && {
@@ -103,7 +104,11 @@ validate_radio_section() {
 			'include_sta_metric:bool:false' \
 			'rcpi_hysteresis_margin:range(0,255)' \
 			'report_util_threshold:range(0,255)' \
-			'encryption:or("sae", "psk2", "sae-mixed")'
+			'encryption:or("sae", "sae+aes", "psk2",
+				"psk2+aes", "sae-mixed", "sae-mixed+aes",
+				"none", "psk-mixed", "psk-mixed+aes",
+				"wpa", "wpa+aes", "wpa2", "wpa2+aes",
+				"psk", "psk+aes")' \
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapagent" "Validation of radio section failed"

map-controller/Config.in

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

map-controller/Makefile

@@ -5,14 +5,14 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.14
+PKG_VERSION:=4.3.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8a71dffdd66b2dcacf67353efcb09cb9127c1ea9
+PKG_SOURCE_VERSION:=fb600940ac54456bcde650ccee7055f7c9bb785b
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-controller
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-controller
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
@@ -26,7 +26,7 @@ define Package/map-controller
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=WiFi Multi-AP Controller (EasyMesh R2)
-  DEPENDS:=+libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 +map-plugin
+  DEPENDS:=+libuci +libubox +ubus +libeasy +libwifiutils +libieee1905 +ieee1905 +map-plugin
 endef
 
 define Package/map-controller/description
@@ -45,6 +45,8 @@ TARGET_CFLAGS += \
 
 MAKE_PATH:=src
 
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_CONTROLLER_EASYMESH_VERSION)
+
 ifeq ($(CONFIG_CONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DCONTROLLER_SYNC_DYNAMIC_CNTLR_CONFIG
 endif

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

@@ -45,7 +45,13 @@ validate_sta_steering_section() {
 		'use_bcn_metrics:bool:false' \
 		'use_usta_metrics:bool:false' \
 		'bandsteer:bool:false' \
-		'diffsnr:range(0,100)'
+		'diffsnr:range(0,100)' \
+		'rcpi_threshold_2g:range(0,220)' \
+		'rcpi_threshold_5g:range(0,220)' \
+		'rcpi_threshold_6g:range(0,220)' \
+		'report_rcpi_threshold_2g:range(0,220)' \
+		'report_rcpi_threshold_5g:range(0,220)' \
+		'report_rcpi_threshold_6g:range(0,220)'
 
 	[ "$?" -ne 0 ] && {
 		logger -s -t "mapcontroller" "Validation of sta_steering section failed"
@@ -62,7 +68,10 @@ validate_ap_section() {
 			'band:or("2", "5", "6")' \
 			'ssid:string' \
 			'encryption:or("sae", "sae+aes", "psk2",
-				"psk2+aes", "sae-mixed", "sae-mixed+aes")' \
+				"psk2+aes", "sae-mixed", "sae-mixed+aes",
+				"none", "psk-mixed", "psk-mixed+aes",
+				"wpa", "wpa+aes", "wpa2", "wpa2+aes",
+				"psk", "psk+aes")' \
 			'key:string' \
 			'vid:range(1,65535):1' \
 			'type:or("backhaul", "fronthaul", "combined")' \
@@ -190,7 +199,7 @@ reload_service() {
 		return
 	fi
 
-	pidof "mapcontroller" > /dev/null
+	pidof "/usr/sbin/mapcontroller" > /dev/null
 	if [[ $? -ne 0 ]] ; then
 		start
 		return

map-topology/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.8
+PKG_VERSION:=2.5.1.19
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=ee72703a5c89983c881d8faedcdc749b54278790
+PKG_SOURCE_VERSION:=7b2f5dc086207dd74c5c56421dea65b7dabb6944
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif

map-topology/files/etc/config/topology

@@ -4,3 +4,4 @@ config topology 'topology'
 	option depth '8'
 	option interval '60'
 	option maxlog '32'
+	option profile '2'

map-topology/files/etc/firewall.hosts

@@ -0,0 +1,126 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+day=""
+IP_RULE=""
+
+process_ac_schedule() {
+	local acs_id="$1"
+	local is_enabled
+	local access_control
+	local start_time=""
+	local stop_time=""
+	local mac=""
+
+	handle_day_list() {
+		local value=$1
+
+		val=$(echo $value | cut -c 1-3)
+		if [ -z $day ]; then
+			day="$val"
+		else
+			day="$day,$val"
+		fi
+	}
+
+	config_list_foreach "$acs_id" "day" handle_day_list
+	config_get is_enabled "$acs_id" "enable" 1
+	config_get access_control "$acs_id" "dm_parent"
+
+	if [ "$is_enabled" == "0" ] || [ -z "$access_control" ]; then
+		return
+	fi
+
+	IP_RULE=""
+
+	mac=$(uci -q get hosts.$access_control.macaddr)
+	access_policy=$(uci -q get hosts.$access_control.access_policy)
+
+	config_get start_time "$acs_id" "start_time"
+	config_get duration "$acs_id" "duration"
+
+	if [ -z "$mac" ] && [ -z "$start_time" ] && [ -z "$duration" ] && [ -z "$day" ] && [ -z "$access_policy" ]; then
+		return
+	fi
+	if [ -n "$mac" ]; then
+		IP_RULE="$IP_RULE -m mac --mac-source $mac"
+	fi
+
+	# as per iptables manual default starttime is 00:00
+	# default stoptime is 23:59
+	if [ -z "$start_time" ]; then
+		start_time="0:0"
+	fi
+
+        if [ -n "$duration" ]; then
+		hh=$(echo $start_time | awk -F: '{ print $1 }')
+                mm=$(echo $start_time | awk -F: '{ print $2 }')
+                hh_s=`expr $hh \* 3600`
+                mm_s=`expr $mm \* 60`
+                ss=$(( hh_s + mm_s ))
+
+                stop_ss=$(( ss + duration ))
+                hh=$(( stop_ss / 3600 ))
+                if [ $hh -lt 24 ]; then
+                	rem_ss=$(( stop_ss % 3600 ))
+                	mm=$(( rem_ss / 60 ))
+                	ss=$(( rem_ss % 60 ))
+                	stop_time="$hh:$mm:$ss"
+                else
+                	stop_time="23:59"
+                fi
+        else
+        	stop_time="23:59"
+        fi
+
+	# conversion to utc
+	zone=$(date +%z | cut -c 1)
+	utc_h=$(date -u -d @$(date "+%s" -d "$start_time") +%H)
+	local_h=$(echo $start_time | awk -F: '{ print $1 }')
+	if [ "$zone" == "+" ] && [ $utc_h -gt $local_h ]; then
+		start_utc="0:0"
+	else
+		start_utc=$(date -u -d @$(date "+%s" -d "$start_time") +%H:%M)
+	fi
+
+	utc_h=$(date -u -d @$(date "+%s" -d "$stop_time") +%H)
+	local_h=$(echo $stop_time | awk -F: '{ print $1 }')
+	if [ "$zone" == "-" ] && [ $utc_h -lt $local_h ]; then
+		stop_utc="23:59"
+	else
+		stop_utc=$(date -u -d @$(date "+%s" -d "$stop_time") +%H:%M)
+	fi
+
+
+	IP_RULE="$IP_RULE -m time --timestart $start_utc --timestop $stop_utc"
+	if [ -n "$day" ]; then
+		IP_RULE="$IP_RULE --weekdays $day"
+	fi
+
+	if [ "$access_policy" == "Deny" ]; then
+		IP_RULE="$IP_RULE -j DROP"
+	else
+		IP_RULE="$IP_RULE -j ACCEPT"
+	fi
+
+	iptables -w -A hosts_forward ${IP_RULE}
+	ip6tables -w -A hosts_forward ${IP_RULE}
+
+	day=""
+}
+
+iptables -w -F hosts_forward
+ip6tables -w -F hosts_forward
+
+iptables -w -t filter -N hosts_forward
+ret=$?                        
+[ $ret -eq 0 ] && iptables -w -t filter -I FORWARD -j hosts_forward
+ip6tables -w -t filter -N hosts_forward
+ret=$?                        
+[ $ret -eq 0 ] && ip6tables -w -t filter -I FORWARD -j hosts_forward
+
+# Load /etc/config/hosts UCI file
+config_load hosts
+config_foreach process_ac_schedule ac_schedule
+

map-topology/files/etc/init.d/topologyd

@@ -71,6 +71,10 @@ start_service() {
 	config_load "hosts"
 	validate_hosts_config || return 1;
 
+	if [ -f "/proc/sys/net/netfilter/nf_conntrack_timestamp" ]; then
+		echo 1 >/proc/sys/net/netfilter/nf_conntrack_timestamp
+	fi
+
 	procd_open_instance
         procd_set_param command "/usr/sbin/topologyd"
 	procd_set_param respawn

map-topology/files/etc/uci-defaults/992-firewall_host.ucidefaults

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -f /etc/firewall.hosts ]; then
+	uci -q get firewall.hosts || {
+		uci -q set firewall.hosts=include
+		uci -q set firewall.hosts.path="/etc/firewall.hosts"
+		uci -q set firewall.hosts.reload=1
+	}
+fi
+
+
+exit 0

mcastmngr/Makefile

@@ -6,7 +6,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=mcastmngr
-PKG_VERSION:=1.0.2
+PKG_VERSION:=1.1.0
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 
@@ -16,8 +16,9 @@ PKG_LICENSE_FILES:=LICENSE
 include $(INCLUDE_DIR)/package.mk
 
 define Package/mcastmngr
-	CATEGORY:=Utilities
-	TITLE:=multicast packets manager daemon
+ CATEGORY:=Utilities
+ TITLE:=Multicast Proxy/Snooping Manager
+ DEPENDS:=+!TARGET_brcmbca:mcproxy
 endef
 
 define Package/mcastmngr/description
@@ -32,7 +33,12 @@ define Build/Compile
 endef
 
 define Package/mcastmngr/install
-	$(CP) ./files/* $(1)/
+	$(CP) ./files/common/* $(1)/
+ifneq ($(CONFIG_TARGET_brcmbca),)
+	$(CP) ./files/broadcom/* $(1)/
+else
+	$(CP) ./files/linux/* $(1)/
+endif
 endef
 
 $(eval $(call BuildPackage,mcastmngr))

mcastmngr/files/broadcom/lib/mcast/broadcom.sh

@@ -0,0 +1,254 @@
+#!/bin/sh
+
+. /lib/functions.sh
+. /usr/share/libubox/jshn.sh
+. /lib/mcast/common.sh
+
+include /lib/network
+
+
+CONFFILE=/var/mcpd.conf
+PROG_EXE=/usr/sbin/mcpd
+
+proxdevs=""
+ethwan="$(db -q get hw.board.ethernetWanPort)"
+
+
+config_snooping_common_params() {
+	local protocol="$1"
+	echo "${protocol}-default-version $2" >> $CONFFILE
+	echo "${protocol}-robustness-value $3" >> $CONFFILE
+	echo "${protocol}-max-groups $max_groups" >> $CONFFILE
+	echo "${protocol}-max-sources $max_msf" >> $CONFFILE
+	echo "${protocol}-max-members $max_members" >> $CONFFILE
+	echo "${protocol}-snooping-enable $4" >> $CONFFILE
+}
+
+config_mcast_querier_params() {
+	local protocol="$1"
+	local query_interval=$2
+	local q_resp_interval=$3
+	local last_mem_q_int=$4
+
+	echo "${protocol}-query-interval $query_interval" >> $CONFFILE
+	echo "${protocol}-query-response-interval $q_resp_interval" >> $CONFFILE
+	echo "${protocol}-last-member-query-interval $last_mem_q_int" >> $CONFFILE
+}
+
+config_snooping_upstream_interface() {
+	local snooping_upstream_intf=""
+
+	json_load "$(devstatus $1)"
+	logger -t "mcastconf" "$(devstatus $1)"
+	itr=1
+	json_select bridge-members
+
+	# loop over the bridge and find the device on wan port
+	while json_get_var dev $itr; do
+		case "$dev" in
+			*.*)
+				port="$(echo "$dev" | cut -d'.' -f 1)"
+				if [ $port == $ethwan ]; then
+					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
+				fi
+				;;
+		esac
+		itr=$(($itr + 1))
+	done
+	json_select ..
+
+	# if none of the bridge members are on wan port, set the wan port itself
+	if [ -n "$snooping_upstream_intf" ]; then
+		echo "upstream-interface $snooping_upstream_intf" >>$CONFFILE
+	else
+		echo "upstream-interface $ethwan" >>$CONFFILE
+	fi
+}
+
+config_snooping_on_bridge() {
+	local protocol="$1"
+	local bcm_mcast_p=1
+	echo "${protocol}-snooping-interfaces $2" >> $CONFFILE
+
+	[ "$protocol" == "mld" ] && bcm_mcast_p=2
+
+	for snpif in $2; do
+		case "$snpif" in
+			br-*)
+				# set snooping mode on the bridge
+				bcmmcastctl mode -i $snpif -p $bcm_mcast_p -m $3
+			;;
+		esac
+	done
+}
+
+config_mcast_proxy_interface() {
+	local itr
+	local p1="$1"
+	local p_enable
+
+	if [ "$p1" == "igmp" ]; then
+		p_enable=$igmp_p_enable
+	else
+		p_enable=$mld_p_enable
+	fi
+
+	for proxif in $2; do
+		case "$proxif" in
+			br-*)
+				proxdevs="$proxdevs $proxif"
+				echo "upstream-interface $proxif" >>$CONFFILE
+			;;
+			*)
+				ifconfig $proxif | grep RUNNING >/dev/null && proxdevs="$proxdevs $proxif"
+			;;
+		esac
+	done
+
+	if [ $p_enable -eq 1 ]; then
+		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
+	fi
+
+	# if proxdevs is empty set the wan port as mcast-interface
+	if [ -n "$proxdevs" ]; then
+		echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
+	else
+		echo "${p1}-mcast-interfaces $ethwan" >> $CONFFILE
+	fi
+}
+
+configure_mcpd_snooping() {
+	local protocol="$1"
+	local exceptions
+	local filter_ip=""
+	local fast_leave=0
+
+	# Configure snooping related params
+	if [ "$protocol" == "igmp" ]; then
+		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
+		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
+		config_snooping_upstream_interface "$igmp_s_iface"
+		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
+		exceptions=$igmp_s_exceptions
+		fast_leave=$igmp_s_fast_leave
+	elif [ "$protocol" == "mld" ]; then
+		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
+		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
+		config_snooping_upstream_interface "$mld_s_iface"
+		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
+		exceptions=$mld_s_exceptions
+		fast_leave=$mld_s_fast_leave
+	fi
+
+	echo "${protocol}-proxy-enable 0" >> $CONFFILE
+	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
+
+	if [ -n "$exceptions" ]; then
+		IFS=" "
+		for excp in $exceptions; do
+			case $excp in
+			*/*)
+				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
+				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
+				filter_ip="$filter_ip $tmp/$tmp1"
+				;;
+			*)
+				filter_ip="$filter_ip $excp"
+				;;
+			esac
+		done
+		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
+	fi
+}
+
+configure_mcpd_proxy() {
+	local protocol="$1"
+	local fast_leave=0
+	local exceptions=""
+
+	# Configure snooping related params
+	if [ "$protocol" == "igmp" ]; then
+		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_p_mode
+		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
+		config_mcast_proxy_interface $protocol "$igmp_p_up_interfaces"
+		config_snooping_on_bridge $protocol $igmp_p_down_interfaces $igmp_p_mode
+		fast_leave=$igmp_fast_leave
+		exceptions=$igmp_p_exceptions
+	elif [ "$protocol" == "mld" ]; then
+		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_p_mode
+		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
+		config_mcast_proxy_interface $protocol "$mld_p_up_interfaces"
+		config_snooping_on_bridge $protocol $mld_p_down_interfaces $mld_p_mode
+		fast_leave=$mld_fast_leave
+		exceptions=$mld_p_exceptions
+	fi
+
+	# This function will only be hit in case proxy is enabled, so hard coding
+	# proxy enable should not be a problem
+	echo "${protocol}-proxy-enable 1" >> $CONFFILE
+	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
+
+	if [ -n "$exceptions" ]; then
+		IFS=" "
+		for excp in $exceptions; do
+			case $excp in
+			*/*)
+				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
+				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
+				filter_ip="$filter_ip $tmp/$tmp1"
+				;;
+			*)
+				filter_ip="$filter_ip $excp"
+				;;
+			esac
+		done
+		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
+	fi
+}
+
+disable_snooping() {
+	local bcm_mcast_p=$1
+
+	for br in $(brctl show | grep 'br-' | awk '{print$1}' | tr '\n' ' '); do
+		bcmmcastctl mode -i $br -p $bcm_mcast_p -m 0 # disable snooping on all bridges
+	done
+}
+
+configure_mcpd() {
+	disable_snooping 1
+	disable_snooping 2
+
+	# BCM's mcpd does not allow configuration of proxy and L2 snooping simultaneously, hence
+	# here, if proxy is to be configured then the configuration params of snooping are ignored.
+	if [ "$igmp_p_enable" == "1" ]; then
+		configure_mcpd_proxy igmp
+	elif [ "$igmp_s_enable" == "1" ]; then
+		configure_mcpd_snooping igmp
+	fi
+
+	proxdevs=""
+	if [ "$mld_p_enable" == "1" ]; then
+		configure_mcpd_proxy mld
+	elif [ "$mld_s_enable" == "1" ]; then
+		configure_mcpd_snooping mld
+	fi
+}
+
+setup_mcast_mode() {
+	# set the mode at chip to allow both tagged and untagged multicast forwarding
+	bs /b/c iptv lookup_method=group_ip_src_ip
+}
+
+configure_mcast() {
+	rm -f $CONFFILE
+	touch $CONFFILE
+
+	# mcpd internally writes max_groups and max_msf, no need to modify
+	# here directly
+	config_global_params
+
+	read_mcast_snooping_params
+	read_mcast_proxy_params
+
+	configure_mcpd
+}

mcastmngr/files/common/etc/init.d/mcast

@@ -14,15 +14,36 @@ service_triggers() {
 	procd_add_reload_trigger network $NAME
 }
 
+start_mcast_service() {
+	local param=$@
+
+	procd_open_instance
+
+	procd_set_param command "${PROG_EXE}"
+	if [ -n "${param}" ]; then
+		procd_append_param command ${param}
+	fi
+	procd_set_param respawn
+
+	procd_close_instance
+}
+
 start_service() {
 	if [ -f "/etc/config/mcast" ]; then
 		configure_mcast
 	fi
 
-	procd_open_instance
-	procd_set_param command "$PROG_EXE"
-	procd_set_param respawn
-	procd_close_instance
+	if [ -z "${PROG_PARAMS}" ]; then
+		start_mcast_service
+		return
+	fi
+
+	local prev_IFS="${IFS}"
+	IFS=${PROG_PARAMS_SEPARATOR}
+	for param in ${PROG_PARAMS}; do
+		IFS="${prev_IFS}"
+		start_mcast_service ${param}
+	done
 }
 
 boot() {
@@ -30,12 +51,7 @@ boot() {
 	start
 }
 
-stop_service() {
-	service_stop $PROG_EXE
-}
-
 reload_service() {
 	stop
 	start
 }
-

mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate

@@ -0,0 +1,117 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+generate_igmp_global_params(){
+	uci add mcast igmp
+	uci rename mcast.@igmp[-1]="igmp"
+	uci set mcast.@igmp[-1].max_membership="20"
+	uci set mcast.@igmp[-1].max_msf="10"
+	uci set mcast.@igmp[-1].qrv="2"
+	uci set mcast.@igmp[-1].force_version="0"
+
+	uci add mcast mld
+	uci rename mcast.@mld[-1]="mld"
+	uci set mcast.@mld[-1].mldv1_unsolicited_report_interval="10"
+	uci set mcast.@mld[-1].mldv2_unsolicited_report_interval="1"
+	uci set mcast.@mld[-1].qrv="2"
+	uci set mcast.@mld[-1].force_version="0"
+
+	uci commit mcast
+}
+
+generate_mld_proxy_config(){
+	local u_itf="$1"
+
+	uci add mcast proxy
+	uci rename mcast.@proxy[-1]="mc_proxy_MLD"
+	uci set mcast.@proxy[-1].enable="1"
+	uci set mcast.@proxy[-1].proto="mld"
+	uci set mcast.@proxy[-1].version="2"
+	uci set mcast.@proxy[-1].robustness="2"
+	uci set mcast.@proxy[-1].query_interval="125"
+	uci set mcast.@proxy[-1].query_response_interval="100"
+	uci set mcast.@proxy[-1].last_member_query_interval="10"
+	uci set mcast.@proxy[-1].fast_leave="1"
+	uci set mcast.@proxy[-1].snooping_mode="2"
+	uci add_list mcast.@proxy[-1].downstream_interface="br-lan"
+
+	IFS=" "
+	for itf in $u_itf; do
+		uci add_list mcast.@proxy[-1].upstream_interface="$itf"
+	done
+
+}
+
+generate_igmp_proxy_config(){
+	local u_itf="$1"
+
+	uci add mcast proxy
+	uci rename mcast.@proxy[-1]="igmp_proxy_1"
+	uci set mcast.@proxy[-1].enable="1"
+	uci set mcast.@proxy[-1].proto="igmp"
+	uci set mcast.@proxy[-1].version="2"
+	uci set mcast.@proxy[-1].robustness="2"
+	uci set mcast.@proxy[-1].query_interval="125"
+	uci set mcast.@proxy[-1].query_response_interval="100"
+	uci set mcast.@proxy[-1].last_member_query_interval="10"
+	uci set mcast.@proxy[-1].fast_leave="1"
+	uci set mcast.@proxy[-1].snooping_mode="2"
+	uci add_list mcast.@proxy[-1].downstream_interface="br-lan"
+
+	IFS=" "
+	for itf in $u_itf; do
+		uci add_list mcast.@proxy[-1].upstream_interface="$itf"
+	done
+
+	uci add_list mcast.@proxy[-1].filter="239.0.0.0/8"
+}
+
+generate_mcast_config(){
+
+	up_itf="$(uci -q get network.wan.device)"
+
+	generate_igmp_proxy_config "$up_itf"
+	generate_mld_proxy_config "$up_itf"
+
+	uci commit mcast
+}
+
+interfaces_ok(){
+	local section_name=$1
+
+	local up_interf=$(uci -q get ${section_name}.upstream_interface)
+	[ -z "$up_interf" ] && return 1
+
+	local down_interf=$(uci -q get ${section_name}.downstream_interface)
+	[ -z "$down_interf" ] && return 1
+
+	# check if upstream untagged
+	IFS=" "
+	for itf in $up_interf; do
+		# check if there exist a device section for this upstream interface, if yes the
+		# do nothing, if no then split the it at . and use the native interface as
+		# upstream interface
+		dev_section=$(ubus call uci get '{"config":"network", "type":"device", "match":{"name":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[])
+
+		# mcast config is outdated, simply generate as per new logic
+		[ -z "$dev_section" ] && return 1
+	done
+}
+
+
+if [ -s "/etc/config/mcast" ]; then
+	if uci -q get mcast.@proxy[0] >/dev/null; then
+		interfaces_ok "mcast.@proxy[0]" && exit
+	elif uci -q get mcast.@snooping[0] >/dev/null; then
+		# return if there is any valid content
+		exit
+	fi
+fi
+
+rm -f /etc/config/mcast
+touch /etc/config/mcast
+
+generate_igmp_global_params
+
+generate_mcast_config

mcastmngr/files/common/lib/mcast/common.sh

@@ -0,0 +1,182 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+include /lib/network
+
+
+# Parameters available in snooping configuration
+igmp_s_enable=0
+igmp_s_version=2
+igmp_s_query_interval=125
+igmp_s_q_resp_interval=100
+igmp_s_last_mem_q_int=10
+igmp_s_fast_leave=1
+igmp_s_robustness=2
+igmp_s_mode=0
+igmp_s_iface=""
+igmp_s_exceptions=""
+
+mld_s_enable=0
+mld_s_version=2
+mld_s_robustness=2
+mld_s_mode=0
+mld_s_iface=""
+mld_s_exceptions=""
+
+# Global params
+max_groups=25
+max_msf=10
+max_members=25
+mldv1_unsolicited_report_interval=10
+mldv2_unsolicited_report_interval=1
+
+# Parameters available in proxy configuration
+igmp_p_enable=0
+igmp_p_version=2
+igmp_query_interval=125
+igmp_q_resp_interval=100
+igmp_last_mem_q_int=10
+igmp_fast_leave=1
+igmp_p_robustness=2
+igmp_p_mode=0
+igmp_p_up_interfaces=""
+igmp_p_down_interfaces=""
+igmp_p_exceptions=""
+
+mld_p_enable=0
+mld_p_version=1
+mld_query_interval=125
+mld_q_resp_interval=100
+mld_last_mem_q_int=10
+mld_fast_leave=1
+mld_p_robustness=2
+mld_p_mode=0
+mld_p_up_interfaces=""
+mld_p_down_interfaces=""
+mld_p_exceptions=""
+
+read_snooping() {
+	local config="$1"
+	local sec_enable
+	local proto
+
+	config_get sec_enable "$config" enable 0
+	config_get proto "$config" proto
+
+	if [ "$sec_enable" == "0" ]; then
+		return
+	fi
+
+	if [ "$proto" == "igmp" ]; then
+		igmp_s_enable=$sec_enable
+		config_get igmp_s_version "$config" version 2
+		config_get igmp_s_query_interval "$config" query_interval 125
+		config_get igmp_s_q_resp_interval "$config" query_response_interval 100
+		config_get igmp_s_last_mem_q_int "$config" last_member_query_interval 10
+		config_get igmp_s_fast_leave "$config" fast_leave 1
+		config_get igmp_s_robustness "$config" robustness 2
+		config_get igmp_s_mode "$config" snooping_mode 0
+		config_get igmp_s_iface "$config" interface
+		config_get igmp_s_exceptions "$config" filter
+		return
+	fi
+
+	if [ "$proto" == "mld" ]; then
+		mld_s_enable=$sec_enable
+		config_get mld_s_version "$config" version 2
+		config_get mld_s_query_interval "$config" query_interval 125
+		config_get mld_s_q_resp_interval "$config" query_response_interval 100
+		config_get mld_s_last_mem_q_int "$config" last_member_query_interval 10
+		config_get mld_s_fast_leave "$config" fast_leave 1
+		config_get mld_s_robustness "$config" robustness 2
+		config_get mld_s_mode "$config" snooping_mode 0
+		config_get mld_s_iface "$config" interface
+		config_get mld_s_exceptions "$config" filter
+		return
+	fi
+}
+
+read_proxy() {
+	local config="$1"
+	local sec_enable
+	local proto
+
+	config_get sec_enable "$config" enable 0
+	config_get proto "$config" proto
+
+	if [ "$sec_enable" == "0" ]; then
+		return
+	fi
+
+	if [ "$proto" == "igmp" ]; then
+		igmp_p_enable=$sec_enable
+		config_get igmp_p_version "$config" version 2
+		config_get igmp_query_interval "$config" query_interval 125
+		config_get igmp_q_resp_interval "$config" query_response_interval 100
+		config_get igmp_last_mem_q_int "$config" last_member_query_interval 10
+		config_get igmp_fast_leave "$config" fast_leave 1
+		config_get igmp_p_robustness "$config" robustness 2
+		config_get igmp_p_mode "$config" snooping_mode 0
+		config_get igmp_p_up_interfaces "$config" upstream_interface
+		config_get igmp_p_down_interfaces "$config" downstream_interface
+		config_get igmp_p_exceptions "$config" filter
+		return
+	fi
+
+	if [ "$proto" == "mld" ]; then
+		mld_p_enable=$sec_enable
+		config_get mld_p_version "$config" version 2
+		config_get mld_query_interval "$config" query_interval 125
+		config_get mld_q_resp_interval "$config" query_response_interval 100
+		config_get mld_last_mem_q_int "$config" last_member_query_interval 10
+		config_get mld_fast_leave "$config" fast_leave 1
+		config_get mld_p_robustness "$config" robustness 2
+		config_get mld_p_mode "$config" snooping_mode 0
+		config_get mld_p_up_interfaces "$config" upstream_interface
+		config_get mld_p_down_interfaces "$config" downstream_interface
+		config_get mld_p_exceptions "$config" filter
+		return
+	fi
+}
+
+read_mcast_snooping_params() {
+	config_load mcast
+	config_foreach read_snooping snooping
+}
+
+read_mcast_proxy_params() {
+	config_load mcast
+	config_foreach read_proxy proxy
+}
+
+config_global_params() {
+	local igmp_qrv
+	local igmp_force_version
+	local mld_qrv
+	local mld_force_version
+
+	config_load mcast
+	config_get max_msf igmp max_msf 10
+	config_get max_groups igmp max_membership 25
+	config_get igmp_qrv igmp qrv 2
+	config_get igmp_force_version igmp force_version 0
+
+	config_get mld_qrv mld qrv 2
+	config_get mldv1_unsolicited_report_interval mld mldv1_unsolicited_report_interval 10
+	config_get mldv2_unsolicited_report_interval mld mldv2_unsolicited_report_interval 1
+	config_get mld_force_version mld force_version 0
+
+	if [ "$1" == "set_max_groups_and_sources" ]; then
+		echo $max_groups > /proc/sys/net/ipv4/igmp_max_memberships
+		echo $max_msf > /proc/sys/net/ipv4/igmp_max_msf
+		echo $max_msf > /proc/sys/net/ipv6/mld_max_msf
+	fi
+	echo $igmp_qrv > /proc/sys/net/ipv4/igmp_qrv
+	echo $igmp_force_version > /proc/sys/net/ipv4/conf/all/force_igmp_version
+
+	echo $mld_qrv >  /proc/sys/net/ipv6/mld_qrv
+	echo $mld_force_version > /proc/sys/net/ipv6/conf/all/force_mld_version
+	echo $mldv1_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv1_unsolicited_report_interval
+	echo $mldv2_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv2_unsolicited_report_interval
+}

mcastmngr/files/common/usr/libexec/rpcd/mcast

@@ -0,0 +1,142 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+read_mcast_stats() {
+	cat /proc/net/igmp_snooping > /tmp/igmp_stats
+	local mcast_addrs=""
+	local ifaces=""
+
+	while read line; do
+	# reading each line
+		case $line in
+		br-*)
+			found_iface=0
+			snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+			if [ -z "$ifaces" ]; then
+				ifaces="$snoop_iface"
+				continue
+			fi
+
+			IFS=" "
+			for ifx in $ifaces; do
+				if [ $ifx == $snoop_iface ]; then
+					found_iface=1
+					break
+				fi
+			done
+
+			if [ $found_iface -eq 0 ]; then
+				ifaces="$ifaces $snoop_iface"
+				continue
+			fi
+			;;
+		esac
+	done < /tmp/igmp_stats
+
+	while read line; do
+	# reading each line
+		case $line in
+		br-*)
+			found_ip=0
+			grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
+			if [ -z "$mcast_addrs" ]; then
+				mcast_addrs="$grp_ip"
+				continue
+			fi
+
+			IFS=" "
+			for ip_addr in $mcast_addrs; do
+				if [ $ip_addr == $grp_ip ]; then
+					found_ip=1
+					break
+				fi
+			done
+
+			if [ $found_ip -eq 0 ]; then
+				mcast_addrs="$mcast_addrs $grp_ip"
+				continue
+			fi
+			;;
+		esac
+	done < /tmp/igmp_stats
+
+	json_init
+	json_add_array "snooping"
+	json_add_object ""
+	IFS=" "
+	for intf in $ifaces; do
+		while read line; do
+		# reading each line
+			case $line in
+			br-*)
+				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+				if [ "$snoop_iface" != "$intf" ]; then
+					continue
+				fi
+				json_add_string "interface" "$intf"
+				json_add_array "groups"
+				break
+				;;
+			esac
+		done < /tmp/igmp_stats
+		IFS=" "
+		for gip_addr in $mcast_addrs; do
+			grp_obj_added=0
+			while read line; do
+			# reading each line
+				case $line in
+				br-*)
+					snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
+					if [ "$snoop_iface" != "$intf" ]; then
+						continue
+					fi
+					grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
+					if [ "$grp_ip" != "$gip_addr" ]; then
+						continue
+					fi
+					if [ $grp_obj_added -eq 0 ]; then
+						json_add_object ""
+						gip="$(ipcalc.sh $gip_addr | grep IP | awk '{print substr($0,4)}')"
+						json_add_string "groupaddr" "$gip"
+						json_add_array "clients"
+						grp_obj_added=1
+					fi
+
+					json_add_object ""
+					host_ip="$(echo $line | awk -F ' ' '{ print $14 }')"
+					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
+					json_add_string "ipaddr" "$h_ip"
+					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
+					json_add_string "device" "$src_port"
+					timeout="$(echo $line | awk -F ' ' '{ print $15 }')"
+					json_add_int "timeout" "$timeout"
+					json_close_object #close the associated device object
+					;;
+				esac
+			done < /tmp/igmp_stats
+			json_close_array #close the associated devices array
+			json_close_object # close the groups object
+		done # close the loop for group addresses
+		json_close_array #close the groups array
+	done # close the loop for interfaces
+	json_close_object # close the snooping object
+	json_close_array # close the snooping array
+	json_dump
+
+	rm -f /tmp/igmp_stats
+}
+
+case "$1" in
+	list)
+		echo '{ "stats":{} }'
+		;;
+	call)
+		case "$2" in
+			stats)
+				read_mcast_stats
+				;;
+		esac
+		;;
+esac

mcastmngr/files/etc/uci-defaults/61-mcast_config_generate

@@ -1,64 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-
-generate_igmp_global_params(){
-	uci add mcast igmp
-	uci rename mcast.@igmp[-1]="igmp"
-	uci set mcast.@igmp[-1].max_membership="20"
-	uci set mcast.@igmp[-1].max_msf="10"
-	uci set mcast.@igmp[-1].qrv="2"
-	uci set mcast.@igmp[-1].force_version="0"
-
-	uci add mcast mld
-	uci rename mcast.@mld[-1]="mld"
-	uci set mcast.@mld[-1].mldv1_unsolicited_report_interval="10"
-	uci set mcast.@mld[-1].mldv2_unsolicited_report_interval="1"
-	uci set mcast.@mld[-1].qrv="2"
-	uci set mcast.@mld[-1].force_version="0"
-
-	uci commit mcast
-}
-
-generate_mcast_config(){
-
-	up_itf="$(uci -q get network.wan.device)"
-
-	uci add mcast proxy
-	uci rename mcast.@proxy[-1]="igmp_proxy_1"
-	uci set mcast.@proxy[-1].enable="1"
-	uci set mcast.@proxy[-1].proto="igmp"
-	uci set mcast.@proxy[-1].version="2"
-	uci set mcast.@proxy[-1].robustness="2"
-	uci set mcast.@proxy[-1].query_interval="125"
-	uci set mcast.@proxy[-1].query_response_interval="100"
-	uci set mcast.@proxy[-1].last_member_query_interval="10"
-	uci set mcast.@proxy[-1].fast_leave="1"
-	uci set mcast.@proxy[-1].snooping_mode="2"
-	uci add_list mcast.@proxy[-1].downstream_interface="br-lan"
-
-	IFS=" "
-	for itf in $up_itf; do
-		uci add_list mcast.@proxy[-1].upstream_interface="$itf"
-	done
-
-	uci add_list mcast.@proxy[-1].filter="239.0.0.0/8"
-	uci commit mcast
-}
-
-if [ -s "/etc/config/mcast" ]; then
-	if uci -q get mcast.@proxy[0] >/dev/null; then
-		# return if there is any valid content
-		exit
-	elif uci -q get mcast.@snooping[0] >/dev/null; then
-		# return if there is any valid content
-		exit
-	else
-		rm -f /etc/config/mcast
-	fi
-fi
-touch /etc/config/mcast
-
-generate_igmp_global_params
-
-generate_mcast_config

mcastmngr/files/lib/mcast/broadcom.sh

@@ -1,547 +0,0 @@
-#!/bin/sh
-
-. /lib/functions.sh
-. /usr/share/libubox/jshn.sh
-
-include /lib/network
-
-CONFFILE=/var/mcpd.conf
-PROG_EXE=/usr/sbin/mcpd
-
-# Parameters available in snooping configuration
-igmp_s_enable=0
-igmp_s_version=2
-igmp_s_query_interval=125
-igmp_s_q_resp_interval=100
-igmp_s_last_mem_q_int=10
-igmp_s_fast_leave=1
-igmp_s_robustness=2
-igmp_s_mode=0
-igmp_s_iface=""
-igmp_s_exceptions=""
-
-mld_s_enable=0
-mld_s_version=2
-mld_s_robustness=2
-mld_s_mode=0
-mld_s_iface=""
-mld_s_exceptions=""
-
-# Global params
-max_groups=25
-max_msf=10
-max_members=25
-mldv1_unsolicited_report_interval=10
-mldv2_unsolicited_report_interval=1
-
-# Parameters available in proxy configuration
-igmp_p_enable=0
-igmp_p_version=2
-igmp_query_interval=125
-igmp_q_resp_interval=100
-igmp_last_mem_q_int=10
-igmp_fast_leave=1
-igmp_p_robustness=2
-igmp_p_mode=0
-igmp_p_up_interfaces=""
-igmp_p_down_interfaces=""
-igmp_p_exceptions=""
-
-mld_p_enable=0
-mld_p_version=1
-mld_query_interval=125
-mld_q_resp_interval=100
-mld_last_mem_q_int=10
-mld_fast_leave=1
-mld_p_robustness=2
-mld_p_mode=0
-mld_p_up_interfaces=""
-mld_p_down_interfaces=""
-mld_p_exceptions=""
-
-proxdevs=""
-ethwan="$(db -q get hw.board.ethernetWanPort)"
-
-read_snooping() {
-	local config="$1"
-	local sec_enable
-	local proto
-
-	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
-
-	if [ "$sec_enable" == "0" ]; then
-		return
-	fi
-
-	if [ "$proto" == "igmp" ]; then
-		igmp_s_enable=$sec_enable
-		config_get igmp_s_version "$config" version 2
-		config_get igmp_s_query_interval "$config" query_interval 125
-		config_get igmp_s_q_resp_interval "$config" query_response_interval 100
-		config_get igmp_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get igmp_s_fast_leave "$config" fast_leave 1
-		config_get igmp_s_robustness "$config" robustness 2
-		config_get igmp_s_mode "$config" snooping_mode 0
-		config_get igmp_s_iface "$config" interface
-		config_get igmp_s_exceptions "$config" filter
-		return
-	fi
-
-	if [ "$proto" == "mld" ]; then
-		mld_s_enable=$sec_enable
-		config_get mld_s_version "$config" version 2
-		config_get mld_s_query_interval "$config" query_interval 125
-		config_get mld_s_q_resp_interval "$config" query_response_interval 100
-		config_get mld_s_last_mem_q_int "$config" last_member_query_interval 10
-		config_get mld_s_fast_leave "$config" fast_leave 1
-		config_get mld_s_robustness "$config" robustness 2
-		config_get mld_s_mode "$config" snooping_mode 0
-		config_get mld_s_iface "$config" interface
-		config_get mld_s_exceptions "$config" filter
-		return
-	fi
-}
-
-read_proxy() {
-	local config="$1"
-	local sec_enable
-	local proto
-
-	config_get sec_enable "$config" enable 0
-	config_get proto "$config" proto
-
-	if [ "$sec_enable" == "0" ]; then
-		return
-	fi
-
-	if [ "$proto" == "igmp" ]; then
-		igmp_p_enable=$sec_enable
-		config_get igmp_p_version "$config" version 2
-		config_get igmp_query_interval "$config" query_interval 125
-		config_get igmp_q_resp_interval "$config" query_response_interval 100
-		config_get igmp_last_mem_q_int "$config" last_member_query_interval 10
-		config_get igmp_fast_leave "$config" fast_leave 1
-		config_get igmp_p_robustness "$config" robustness 2
-		config_get igmp_p_mode "$config" snooping_mode 0
-		config_get igmp_p_up_interfaces "$config" upstream_interface
-		config_get igmp_p_down_interfaces "$config" downstream_interface
-		config_get igmp_p_exceptions "$config" filter
-		return
-	fi
-
-	if [ "$proto" == "mld" ]; then
-		mld_p_enable=$sec_enable
-		config_get mld_p_version "$config" version 2
-		config_get mld_query_interval "$config" query_interval 125
-		config_get mld_q_resp_interval "$config" query_response_interval 100
-		config_get mld_last_mem_q_int "$config" last_member_query_interval 10
-		config_get mld_fast_leave "$config" fast_leave 1
-		config_get mld_p_robustness "$config" robustness 2
-		config_get mld_p_mode "$config" snooping_mode 0
-		config_get mld_p_up_interfaces "$config" upstream_interface
-		config_get mld_p_down_interfaces "$config" downstream_interface
-		config_get mld_p_exceptions "$config" filter
-		return
-	fi
-}
-
-config_snooping_common_params() {
-	local protocol="$1"
-	echo "${protocol}-default-version $2" >> $CONFFILE
-	echo "${protocol}-robustness-value $3" >> $CONFFILE
-	echo "${protocol}-max-groups $max_groups" >> $CONFFILE 
-	echo "${protocol}-max-sources $max_msf" >> $CONFFILE
-	echo "${protocol}-max-members $max_members" >> $CONFFILE
-	echo "${protocol}-snooping-enable $4" >> $CONFFILE
-}
-
-config_mcast_querier_params() {
-	local protocol="$1"
-	local query_interval=$2
-	local q_resp_interval=$3
-	local last_mem_q_int=$4
-
-	echo "${protocol}-query-interval $query_interval" >> $CONFFILE
-	echo "${protocol}-query-response-interval $q_resp_interval" >> $CONFFILE
-	echo "${protocol}-last-member-query-interval $last_mem_q_int" >> $CONFFILE
-}
-
-config_snooping_upstream_interface() {
-	local snooping_upstream_intf=""
-
-	json_load "$(devstatus $1)"
-	logger -t "mcastconf" "$(devstatus $1)"
-	itr=1
-	json_select bridge-members
-
-	# loop over the bridge and find the device on wan port
-	while json_get_var dev $itr; do
-		case "$dev" in
-			*.*)
-				port="$(echo "$dev" | cut -d'.' -f 1)"
-				if [ $port == $ethwan ]; then
-					ifconfig $dev | grep RUNNING >/dev/null && $snooping_upstream_intf="$dev" && break
-				fi
-				;;
-		esac
-		itr=$(($itr + 1))
-	done
-	json_select ..
-
-	# if none of the bridge members are on wan port, set the wan port itself
-	if [ -n "$snooping_upstream_intf" ]; then
-		echo "upstream-interface $snooping_upstream_intf" >>$CONFFILE
-	else
-		echo "upstream-interface $ethwan" >>$CONFFILE
-	fi
-}
-
-config_snooping_on_bridge() {
-	local protocol="$1"
-	local bcm_mcast_p=1
-	echo "${protocol}-snooping-interfaces $2" >> $CONFFILE
-
-	[ "$protocol" == "mld" ] && bcm_mcast_p=2
-
-	for snpif in $2; do
-		case "$snpif" in
-			br-*)
-				# set snooping mode on the bridge
-				bcmmcastctl mode -i $snpif -p $bcm_mcast_p -m $3
-			;;
-		esac
-	done
-}
-
-config_mcast_proxy_interface() {
-	local itr
-	local p1="$1"
-	local p_enable
-
-	if [ "$p1" == "igmp" ]; then
-		p_enable=$igmp_p_enable
-	else
-		p_enable=$mld_p_enable
-	fi
-
-	for proxif in $2; do
-		case "$proxif" in
-			br-*)
-				proxdevs="$proxdevs $proxif"
-				echo "upstream-interface $proxif" >>$CONFFILE
-			;;
-			*)
-				ifconfig $proxif | grep RUNNING >/dev/null && proxdevs="$proxdevs $proxif"
-			;;
-		esac
-	done
-
-	if [ $p_enable -eq 1 ]; then
-		echo "${p1}-proxy-interfaces $proxdevs" >> $CONFFILE
-	fi
-
-	# if proxdevs is empty set the wan port as mcast-interface
-	if [ -n "$proxdevs" ]; then
-		echo "${p1}-mcast-interfaces $proxdevs" >> $CONFFILE
-	else
-		echo "${p1}-mcast-interfaces $ethwan" >> $CONFFILE
-	fi
-}
-
-configure_mcpd_snooping() {
-	local protocol="$1"
-	local exceptions
-	local filter_ip=""
-	local fast_leave=0
-	
-	# Configure snooping related params
-	if [ "$protocol" == "igmp" ]; then
-		config_snooping_common_params $protocol $igmp_s_version $igmp_s_robustness $igmp_s_mode
-		config_mcast_querier_params $protocol $igmp_s_query_interval $igmp_s_q_resp_interval $igmp_s_last_mem_q_int
-		config_snooping_upstream_interface "$igmp_s_iface"
-		config_snooping_on_bridge $protocol $igmp_s_iface $igmp_s_mode
-		exceptions=$igmp_s_exceptions
-		fast_leave=$igmp_s_fast_leave
-	elif [ "$protocol" == "mld" ]; then
-		config_snooping_common_params $protocol $mld_s_version $mld_s_robustness $mld_s_mode
-		config_mcast_querier_params $protocol $mld_s_query_interval $mld_s_q_resp_interval $mld_s_last_mem_q_int
-		config_snooping_upstream_interface "$mld_s_iface"
-		config_snooping_on_bridge $protocol $mld_s_iface $mld_s_mode
-		exceptions=$mld_s_exceptions
-		fast_leave=$mld_s_fast_leave
-	fi
-
-	echo "${protocol}-proxy-enable 0" >> $CONFFILE
-	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
-
-	if [ -n "$exceptions" ]; then
-		IFS=" "
-		for excp in $exceptions; do
-			case $excp in
-			*/*)
-				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
-				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
-				filter_ip="$filter_ip $tmp/$tmp1"
-				;;
-			*)
-				filter_ip="$filter_ip $excp"
-				;;
-			esac
-		done
-		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
-	fi
-}
-
-configure_mcpd_proxy() {
-	local protocol="$1"
-	local fast_leave=0
-	local exceptions=""
-
-	# Configure snooping related params
-	if [ "$protocol" == "igmp" ]; then
-		config_snooping_common_params $protocol $igmp_p_version $igmp_p_robustness $igmp_p_mode
-		config_mcast_querier_params $protocol $igmp_query_interval $igmp_q_resp_interval $igmp_last_mem_q_int
-		config_mcast_proxy_interface $protocol "$igmp_p_up_interfaces"
-		config_snooping_on_bridge $protocol $igmp_p_down_interfaces $igmp_p_mode
-		fast_leave=$igmp_fast_leave
-		exceptions=$igmp_p_exceptions
-	elif [ "$protocol" == "mld" ]; then
-		config_snooping_common_params $protocol $mld_p_version $mld_p_robustness $mld_p_mode
-		config_mcast_querier_params $protocol $mld_query_interval $mld_q_resp_interval $mld_last_mem_q_int
-		config_mcast_proxy_interface $protocol "$mld_p_up_interfaces"
-		config_snooping_on_bridge $protocol $mld_p_down_interfaces $mld_p_mode
-		fast_leave=$mld_fast_leave
-		exceptions=$mld_p_exceptions
-	fi
-
-	# This function will only be hit in case proxy is enabled, so hard coding
-	# proxy enable should not be a problem
-	echo "${protocol}-proxy-enable 1" >> $CONFFILE
-	echo "${protocol}-fast-leave $fast_leave" >> $CONFFILE
-
-	if [ -n "$exceptions" ]; then
-		IFS=" "
-		for excp in $exceptions; do
-			case $excp in
-			*/*)
-				tmp="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
-				tmp1="$(ipcalc.sh $excp | grep NETMASK | awk '{print substr($0,9)}')"
-				filter_ip="$filter_ip $tmp/$tmp1"
-				;;
-			*)
-				filter_ip="$filter_ip $excp"
-				;;
-			esac
-		done
-		echo "${protocol}-mcast-snoop-exceptions $filter_ip" >> $CONFFILE
-	fi
-}
-
-disable_snooping() {
-	local bcm_mcast_p=$1
-
-	for br in $(brctl show | grep 'br-' | awk '{print$1}' | tr '\n' ' '); do
-		bcmmcastctl mode -i $br -p $bcm_mcast_p -m 0 # disable snooping on all bridges
-	done
-}
-
-configure_mcpd() {
-	disable_snooping 1
-	disable_snooping 2
-
-	# BCM's mcpd does not allow configuration of proxy and L2 snooping simultaneously, hence
-	# here, if proxy is to be configured then the configuration params of snooping are ignored.
-	if [ "$igmp_p_enable" == "1" ]; then
-		configure_mcpd_proxy igmp
-	elif [ "$igmp_s_enable" == "1" ]; then
-		configure_mcpd_snooping igmp
-	fi
-
-	proxdevs=""
-	if [ "$mld_p_enable" == "1" ]; then
-		configure_mcpd_proxy mld
-	elif [ "$mld_s_enable" == "1" ]; then
-		configure_mcpd_snooping mld
-	fi
-}
-
-read_mcast_snooping_params() {
-	config_load mcast
-	config_foreach read_snooping snooping
-}
-
-read_mcast_proxy_params() {
-	config_load mcast
-	config_foreach read_proxy proxy
-}
-
-config_global_params() {
-	local igmp_qrv
-	local igmp_force_version
-	local mld_qrv
-	local mld_force_version
-
-	config_load mcast
-	config_get max_msf igmp max_msf 10
-	config_get max_groups igmp max_membership 25
-	config_get igmp_qrv igmp qrv 2
-	config_get igmp_force_version igmp force_version 0
-
-	config_get mld_qrv mld qrv 2
-	config_get mldv1_unsolicited_report_interval mld mldv1_unsolicited_report_interval 10
-	config_get mldv2_unsolicited_report_interval mld mldv2_unsolicited_report_interval 1
-	config_get mld_force_version mld force_version 0
-
-	# mcpd internally writes max_groups and max_msf, no need to modify
-	# here directly
-	echo $igmp_qrv > /proc/sys/net/ipv4/igmp_qrv
-	echo $igmp_force_version > /proc/sys/net/ipv4/conf/all/force_igmp_version
-
-	echo $mld_qrv >  /proc/sys/net/ipv6/mld_qrv
-	echo $mld_force_version > /proc/sys/net/ipv6/conf/all/force_mld_version
-	echo $mldv1_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv1_unsolicited_report_interval
-	echo $mldv2_unsolicited_report_interval > /proc/sys/net/ipv6/conf/all/mldv2_unsolicited_report_interval
-}
-
-setup_mcast_mode() {
-	# set the mode at chip to allow both tagged and untagged multicast forwarding
-	bs /b/c iptv lookup_method=group_ip_src_ip
-}
-
-configure_mcast() {
-	rm -f $CONFFILE
-	touch $CONFFILE
-
-	config_global_params
-
-	read_mcast_snooping_params
-	read_mcast_proxy_params
-
-	configure_mcpd
-}
-
-read_mcast_stats() {
-	cat /proc/net/igmp_snooping > /tmp/igmp_stats
-	local mcast_addrs=""
-	local ifaces=""
-
-	while read line; do
-	# reading each line
-		case $line in
-		br-*)
-			found_iface=0
-			snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-			if [ -z "$ifaces" ]; then
-				ifaces="$snoop_iface"
-				continue
-			fi
-
-			IFS=" "
-			for ifx in $ifaces; do
-				if [ $ifx == $snoop_iface ]; then
-					found_iface=1
-					break
-				fi
-			done
-
-			if [ $found_iface -eq 0 ]; then
-				ifaces="$ifaces $snoop_iface"
-				continue
-			fi
-			;;
-		esac
-	done < /tmp/igmp_stats
-
-	while read line; do
-	# reading each line
-		case $line in
-		br-*)
-			found_ip=0
-			grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
-			if [ -z "$mcast_addrs" ]; then
-				mcast_addrs="$grp_ip"
-				continue
-			fi
-
-			IFS=" "
-			for ip_addr in $mcast_addrs; do
-				if [ $ip_addr == $grp_ip ]; then
-					found_ip=1
-					break
-				fi
-			done
-
-			if [ $found_ip -eq 0 ]; then
-				mcast_addrs="$mcast_addrs $grp_ip"
-				continue
-			fi
-			;;
-		esac
-	done < /tmp/igmp_stats
-
-	json_init
-	json_add_array "snooping"
-	json_add_object ""
-	IFS=" "
-	for intf in $ifaces; do
-		while read line; do
-		# reading each line
-			case $line in
-			br-*)
-				snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-				if [ "$snoop_iface" != "$intf" ]; then
-					continue
-				fi
-				json_add_string "interface" "$intf"
-				json_add_array "groups"
-				break
-				;;
-			esac
-		done < /tmp/igmp_stats
-		IFS=" "
-		for gip_addr in $mcast_addrs; do
-			grp_obj_added=0
-			while read line; do
-			# reading each line
-				case $line in
-				br-*)
-					snoop_iface="$(echo $line | awk -F ' ' '{ print $1 }')"
-					if [ "$snoop_iface" != "$intf" ]; then
-						continue
-					fi
-					grp_ip="$(echo $line | awk -F ' ' '{ print $10 }')"
-					if [ "$grp_ip" != "$gip_addr" ]; then
-						continue
-					fi
-					if [ $grp_obj_added -eq 0 ]; then
-						json_add_object ""
-						gip="$(ipcalc.sh $gip_addr | grep IP | awk '{print substr($0,4)}')"
-						json_add_string "groupaddr" "$gip"
-						json_add_array "clients"
-						grp_obj_added=1
-					fi
-
-					json_add_object ""
-					host_ip="$(echo $line | awk -F ' ' '{ print $14 }')"
-					h_ip="$(ipcalc.sh $host_ip | grep IP | awk '{print substr($0,4)}')"
-					json_add_string "ipaddr" "$h_ip"
-					src_port="$(echo $line | awk -F ' ' '{ print $2 }')"
-					json_add_string "device" "$src_port"
-					timeout="$(echo $line | awk -F ' ' '{ print $15 }')"
-					json_add_int "timeout" "$timeout"
-					json_close_object #close the associated device object
-					;;
-				esac
-			done < /tmp/igmp_stats
-			json_close_array #close the associated devices array
-			json_close_object # close the groups object
-		done # close the loop for group addresses
-		json_close_array #close the groups array
-	done # close the loop for interfaces
-	json_close_object # close the snooping object
-	json_close_array # close the snooping array
-	json_dump
-
-	rm -f /tmp/igmp_stats
-}

mcastmngr/files/linux/etc/firewall.mcast

@@ -0,0 +1,2 @@
+# Forward multicast packets from wan to lan
+iptables -t filter -A zone_wan_forward -p udp -d 224.0.0.0/240.0.0.0 -m comment --comment "!fw3: Allow-Multicast-UDP" -j zone_lan_dest_ACCEPT

mcastmngr/files/linux/etc/uci-defaults/60-mcast_config_generate

@@ -0,0 +1,12 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+# Add firewall include instance
+uci -q batch <<-EOT
+	delete firewall.mcast
+	set firewall.mcast=include
+	set firewall.mcast.path=/etc/firewall.mcast
+	set firewall.mcast.reload=1
+	commit firewall
+EOT