voicemngr: Add missing libblobmsg-json dependency

401a392 Implement callback for getting platform specific codec capabilities

bbf/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

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=6.8.7
+PKG_VERSION:=6.8.49
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
-PKG_SOURCE_VERSION:=90ac63e15ac446b387d25eb0469645bbac8c8bf7
+PKG_SOURCE_VERSION:=87ae46df8b4e221b8894fd861d2eb785ae1f3bf3
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -34,7 +34,8 @@ 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 +libbbf_api \
+	    +BBF_TR471:obudpst
 endef
 
 define Package/libbbfdm
@@ -110,6 +111,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
@@ -155,9 +161,11 @@ define Package/libbbfdm/default/install
 	$(INSTALL_DIR) $(1)/usr/share/bbfdm
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_DIR) $(1)/usr/libexec/rpcd
+	$(INSTALL_DIR) $(1)/lib/upgrade/keep.d
 	$(CP) $(PKG_BUILD_DIR)/libbbfdm.so $(1)/lib/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/scripts/* $(1)/usr/share/bbfdm
 	$(LN) /usr/share/bbfdm/bbf.diag $(1)/usr/libexec/rpcd/bbf.diag
+	$(INSTALL_DATA) ./files/lib/upgrade/keep.d/bbf $(1)/lib/upgrade/keep.d/bbf
 endef
 
 define Package/libbbfdm/default/prerm

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

@@ -42,7 +42,7 @@
 				]
 			},
 			"Port": {
-				"type": "string",
+				"type": "unsignedInt",
 				"read": true,
 				"write": true,
 				"version": "2.0",
@@ -50,6 +50,11 @@
 					"cwmp",
 					"usp"
 				],
+				"range": [
+					{
+						"max": 65535
+					}
+				],
 				"mapping": [
 					{
 						"type": "uci", 

bbf/files/etc/firewall.userinterface

@@ -15,15 +15,13 @@ if [ ! -f "/etc/config/userinterface" ]; then
 	exit 0;
 fi
 
-function exec_cmd()
-{
-	if ! $@; then
-		log "Failed to run [$@]"
+exec_cmd() {
+	if ! "$@"; then
+		log "Failed to run [$*]"
 	fi
 }
 
-function configure_firewall_rule()
-{
+configure_firewall_rule() {
 	local enable port protocol gui_port
 	local zone interface
 
@@ -32,25 +30,24 @@ function configure_firewall_rule()
 	config_get port remote_access port
 	config_get interface remote_access interface
 
-	if [ "${enable}" -eq "0" -o -z "${port}" -o -z "${interface}" ]; then
+	if [ "${enable}" -eq "0" ] || [ -z "${port}" ] || [ -z "${interface}" ]; then
 		return 0;
 	fi
 
 	zone="zone_${interface}_input"
-	iptables -w 1 -t filter -nL ${zone} 2>/dev/null 1>&2
+	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
+		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
+	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
+		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()
-{
+delete_firewall_rule() {
 	local zone interface
 	local CMD
 
@@ -63,20 +60,20 @@ function delete_firewall_rule()
 	fi
 
 	zone="zone_${interface}_input"
-	CMD="iptables -w 1 -t filter -L ${zone} --line-numbers"
+	CMD="iptables -w 1 -t filter -nL ${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};
+			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"
+	CMD="iptables -w 1 -t filter -nL ${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};
+			exec_cmd iptables -w 1 -t filter -D "${zone}" "${rule_num}";
 		fi
 	done
 }

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

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

bulkdata/Makefile

@@ -8,7 +8,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.0.9
+PKG_VERSION:=2.0.10
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)

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}"

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
 

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,48 @@
+#!/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() {
+	[ -n "$DSLMNGR" ] && service_stop $DSLMNGR
+
+	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

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=easy-soc-libs
-PKG_VERSION:=6.7.8
+PKG_VERSION:=7.2.26
 PKG_RELEASE:=1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bbc8a189dd6855a80279c9f2fdd08bcb139b9dde
+PKG_SOURCE_VERSION:=350793b45873480d8981dac540c4145705a7b7ba
 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
@@ -43,10 +43,6 @@ ifeq ($(CONFIG_TARGET_brcmbca),y)
   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
@@ -57,8 +53,16 @@ else ifeq ($(CONFIG_TARGET_iopsys_armvirt),y)
   TARGET_CFLAGS +=-DIOPSYS_TEST
 else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_PLATFORM=ECONET
-  TARGET_WIFI_TYPE=MAC80211
+  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
@@ -66,18 +70,29 @@ else
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
-export TARGET_PLATFORM
-export TARGET_WIFI_TYPE
-
 subdirs := \
 	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
+	$(if $(CONFIG_PACKAGE_libwifiutils),libwifi) \
 	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
 	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
 	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
 	$(if $(CONFIG_PACKAGE_libqos),libqos)
 
-EASY_SOC_LIBS := \
+ifneq ($(CONFIG_PACKAGE_libwifi),)
+TARGET_CFLAGS +=-DHAS_WIFI
+endif
+
+esl-pkgs := \
+	$(if $(CONFIG_PACKAGE_libeasy),libeasy) \
+	$(if $(CONFIG_PACKAGE_libwifiutils),libwifiutils) \
+	$(if $(CONFIG_PACKAGE_libwifi),libwifi) \
+	$(if $(CONFIG_PACKAGE_libdsl),libdsl) \
+	$(if $(CONFIG_PACKAGE_libethernet),libethernet) \
+	$(if $(CONFIG_PACKAGE_libqos),libqos)
+
+esl-pkgs-all := \
 	libeasy \
+	libwifiutils \
 	libwifi \
 	libdsl \
 	libethernet \
@@ -127,15 +142,15 @@ 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)))
+	$(foreach dir,$(esl-pkgs),$(call Build/Compile/$(dir)))
 endef
 
 define Build/InstallDev
-	$(foreach dir,$(subdirs),$(call Build/InstallDev/$(dir),$(1),$(2));)
+	$(foreach dir,$(esl-pkgs),$(call Build/InstallDev/$(dir),$(1),$(2));)
 endef
 
 define Package/easy-soc-libs/install
 	:
 endef
 
-$(eval $(foreach e,$(EASY_SOC_LIBS),$(call BuildPackage,$(e))))
+$(eval $(foreach e,$(esl-pkgs-all),$(call BuildPackage,$(e))))

easy-soc-libs/easy.mk

@@ -6,10 +6,6 @@ define Package/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

easy-soc-libs/ethernet.mk

@@ -2,7 +2,7 @@
 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
+  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_airoha:ecnt_api
 endef
 
 define Package/libethernet/config

easy-soc-libs/wifi.mk

@@ -1,29 +1,53 @@
 
+define Package/libwifiutils
+  $(call Package/easy-soc-libs)
+  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)/libwifi/wifidefs.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/wifiutils.h $(1)/usr/include/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifiutils*.so* $(1)/usr/lib/
+endef
+
+define Package/libwifiutils/install
+	$(INSTALL_DIR) $(1)/usr/lib
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifiutils*.so* $(1)/usr/lib/
+endef
+
+
 define Package/libwifi
   $(call Package/easy-soc-libs)
   TITLE:= WiFi library (libwifi)
-  DEPENDS+=+libnl +libnl-route +libeasy +TARGET_brcmbca:bcmkernel
+  DEPENDS+=+libnl +libnl-route +libeasy +libwifiutils +TARGET_brcmbca:bcmkernel
 endef
 
 define Package/libwifi/config
-  if PACKAGE_libdsl
-	  config LIBWIFI_DEBUG
+  if PACKAGE_libwifi
+  	config LIBWIFI_DEBUG
 		depends on PACKAGE_libwifi
-		bool "Enable wifi debugging"
+		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)/libwifi/wifiops.h $(1)/usr/include/
 	$(CP) $(PKG_BUILD_DIR)/libwifi/wifi.h $(1)/usr/include/
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/
 endef
 
 define Package/libwifi/install
 	$(INSTALL_DIR) $(1)/usr/lib
-	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi*.so* $(1)/usr/lib/
+	$(CP) $(PKG_BUILD_DIR)/libwifi/libwifi-7*.so* $(1)/usr/lib/
 endef
-

endptmngr/Makefile

@@ -13,7 +13,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/endptmngr.git
-PKG_SOURCE_VERSION:=dc12712af8c4088f7873502ca845e51c68a1ada9
+PKG_SOURCE_VERSION:=fb85081443c19b5062bede49c80b1802c0f05d34
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -30,7 +30,6 @@ PKG_BUILD_PARALLEL:=1
 # 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

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,24 @@ 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 ifneq ($(CONFIG_TARGET_airoha),)
+	$(CP) ./files/airoha/* $(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/airoha/lib/ethernet/airoha.sh

@@ -0,0 +1,208 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+unset -f switchmgr
+# alias for switchmgr
+switchmgr() {
+	"/userfs/bin/switchmgr" "$@"
+}
+
+unset -f tc3162_get_lan_port
+# get lan port port by ifname
+# arg1: port ifname, ex: eth0.1
+tc3162_get_lan_port() {
+	[[ -z "$1" ]] && return 255
+
+	local ifname="$1"
+	local if_idx=255
+
+	# only for tc3162 eth switch ports (eth0.x, 0 < x < 7)
+	case "${ifname}" in
+	eth0.*)
+		;;
+	*)
+		logger -t "port-management" \
+		"unsupported - ${ifname} is not tc3162 switch port"
+		return 255
+		;;
+	esac
+
+	let "if_idx=$(echo "${ifname}" | cut -f2 -d'.')"
+	[[ -z "${if_idx}" ]] && return 255
+	[[ ${if_idx} -lt 1 || ${if_idx} -gt 6 ]] && {
+		logger -t "port-management" \
+		"incorrect tc3162 lan port index ${if_idx} picked from ifname ${ifname}"
+		return 255
+	}
+	let "if_idx=${if_idx}-1"
+	return ${if_idx}
+}
+
+
+unset -f tc3162_get_mapped_port
+# get mapped switch port by ifname
+# arg1: port ifname, ex: eth0.1
+tc3162_get_mapped_port() {
+	[[ -z "$1" ]] && return 255
+
+	local ifname="$1"
+	local if_idx=255
+	local prtmap_procfile="/proc/tc3162/eth_portmap"
+	local lan_prt=255
+	local port=255
+	local prtmap_out_line_num=4
+	local prtmap_out_line=""
+	
+	# check "lan port map" marker in portmap output string
+	prtmap_out_line="$(sed -n "${prtmap_out_line_num}p" ${prtmap_procfile})"
+	[[ ${prtmap_out_line} != "lan_port_map" ]] && return 255
+
+	tc3162_get_lan_port "${ifname}"
+	let "if_idx=$?"
+	[[ -z "${if_idx}" || ${if_idx} -eq 255 ]] && return
+
+	# get lan portmapping string "lan_port mapped_port" for ifname by it's index
+	let "prtmap_out_line_num=${prtmap_out_line_num}+1+${if_idx}"
+	prtmap_out_line="$(sed -n "${prtmap_out_line_num}p" ${prtmap_procfile})"
+
+	# get and check lan port index from lan portmapping string
+	lan_prt=$(echo "${prtmap_out_line}" | cut -f 1 -d' ')
+	[[ -z "${lan_prt}" || "${if_idx}" != "${lan_prt}" ]] && return 255
+
+	# get and check mapped port from lan portmapping string
+	let "port=$(echo "${prtmap_out_line}" | cut -f 2 -d' ')"
+	[[ ${port} -lt 0 || ${port} -gt 255 ]] && return 255
+
+	return ${port}
+}
+
+unset -f get_max_port_speed
+# arg1: port ifname, ex: eth0.1
+get_max_port_speed() {
+	[[ -z "$1" ]] && { echo 0; return; }
+
+	local ifname="$1"
+	local port=255
+	local speed=0
+
+	[[ -d "/sys/class/net/${ifname}" ]] || {
+		logger -t "port-management" "interface ${ifname} is not found"
+		return
+	}
+
+	tc3162_get_lan_port "${ifname}"
+	let "port=$?"
+	[[ -z "${port}" || ${port} -eq 255 ]] && return
+
+	# tc3162 capability for all ports is 1Gbps
+	speed=1000
+
+	echo $speed
+}
+
+unset -f power_updown
+# arg1: port ifname, ex: eth0.1
+# arg2: port enabled, ex: 0/1/off/on/..
+power_updown() {
+	[[ -z "$1" ]] && return
+	[[ -z "$2" ]] && return
+
+	local ifname="$1"
+	local enabled="$2"
+	local port=255
+
+	[[ -d "/sys/class/net/${ifname}" ]] || {
+		logger -t "port-management" "interface ${ifname} is not found"
+		return
+	}
+
+	let "enabled=$(get_bool "${enabled}" "-1")"
+	[[ ${enabled} -eq -1 ]] && return
+
+	tc3162_get_lan_port "${ifname}"
+	let "port=$?"
+	[[ -z "${port}" || ${port} -eq 255 ]] && return
+
+	switchmgr phy admin "${port}" "${enabled}"
+}
+
+unset -f set_port_settings
+# arg1: port ifname, ex: eth0.1
+# arg2: port enabled, ex: 0/1/off/on/..
+# arg3: port speed, ex: 1000
+# arg4: port duplex, ex: full
+# arg5: port autoneg, ex: 0/1/off/on/..
+# arg6: port eee, ex: 0/1/off/on/..
+# arg7: port pause, ex: 0/1/off/on/..
+set_port_settings() {
+	[[ -z "$1" ]] && return
+	[[ -z "$2" ]] && return
+	[[ -z "$3" ]] && return
+	[[ -z "$4" ]] && return
+	[[ -z "$5" ]] && return
+	[[ -z "$6" ]] && return
+	[[ -z "$7" ]] && return
+
+	local ifname="$1"
+	local enabled="$2"
+	local speed="$3"
+	local duplex="$4"
+	local autoneg=$5
+	local eee="$6"
+	local pause="$7"
+	local port=255
+	local speedmode=1
+	local last_speed=0
+
+	[[ -d "/sys/class/net/${ifname}" ]] || {
+		logger -t "port-management" "interface ${ifname} is not found"
+		return
+	}
+	
+	let "enabled=$(get_bool "${enabled}" "-1")"
+	[[ ${enabled} -eq -1 ]] && return
+
+	let "autoneg=$(get_bool "${autoneg}" "-1")"
+	[[ ${autoneg} -eq -1 ]] && return
+
+	let "eee=$(get_bool "${eee}" "-1")"
+	[[ ${eee} -eq -1 ]] && return
+	
+	let "pause=$(get_bool "${pause}" "-1")"
+	[[ ${pause} -eq -1 ]] && return
+	
+	duplex="$(echo "${duplex}" | awk '{print tolower($0)}')"
+	[[ "${duplex}" != "half" && "${duplex}" != "full" ]] && return
+
+	tc3162_get_lan_port "${ifname}"
+	let "port=$?"
+	[[ -z "${port}" || ${port} -eq 255 ]] && return
+	
+	last_speed="$(switchmgr phy maxspeed "${port}" | cut -f2 -d':')"
+	[[ -z "${last_speed}" || "${last_speed}" == "*Down*" ]] \
+		&& last_speed=${speed}
+	
+	switchmgr phy pause "${port}" "${pause}"
+
+	# set speedmode: speed+duplex+autoneg
+# FIXME: switchmgr has no separate setting for 1Gbps speed - use autoneg instead
+	if [[ ${autoneg} -eq 1 || ${speed} -gt 100 ]]; then
+		switchmgr phy speedmode ${port} "1"
+	else
+		[[ ${speed} -gt 10 ]] && let "speedmode=2" || let "speedmode=4"
+		[[ "${duplex}" == "half" ]] && let "speedmode=${speedmode}+1"
+		switchmgr phy speedmode "${port}" "${speedmode}"
+	fi
+	
+# TODO: implement MAC control register manipulations (mapped ports used) for
+	# eee settings change
+	# separate (tx/rx) pause (flow control) settings change
+	# set speed to 1Gbps separately from autoneg mode
+	
+# FIXME: workaround for duplex/pause settings being not applied if speed is unchanged
+	[[ ${last_speed} -eq ${speed} ]] && power_updown "${ifname}" 0
+
+	power_updown "${ifname}" ${enabled}
+
+}

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

@@ -0,0 +1,140 @@
+# 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
+# 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)"
+
+	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 000 | 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

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.1.2
+PKG_VERSION:=9.1.19
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
-PKG_SOURCE_VERSION:=b964edb3570797286584793dbadfbef323cddbeb
+PKG_SOURCE_VERSION:=9d8389cda16f410826920bb27fd8af4d28c79de9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -29,7 +29,7 @@ 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 +libbbf_api
 endef
 
 define Package/icwmp-openssl
@@ -83,6 +83,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,6 +95,8 @@ 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-openssl/install = $(Package/icwmp/default/install)

icwmp/files/etc/config/cwmp

@@ -38,6 +38,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/
@@ -394,25 +377,30 @@ validate_defaults() {
 }
 
 boot() {
+	local enable_cwmp="0"
 	local dhcp_discovery="0"
 
 	config_load cwmp
-	config_get dhcp_discovery acs dhcp_discovery "0"
+	config_get_bool enable_cwmp cpe enable 1
+	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 +409,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 +436,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 +447,6 @@ start_service() {
 	procd_close_instance
 }
 
-service_stopped()
-{
-	copy_cwmp_varstate_files_to_etc
-}
-
 stop_service()
 {
 	copy_cwmp_varstate_files_to_etc
@@ -487,7 +472,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,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=6.0.2
+PKG_VERSION:=8.0.12
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=30068401b9591a286b8b76da47730142de342545
+PKG_SOURCE_VERSION:=b265053762a3d6c901872f29fa3e70b8666daf46
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

ieee1905/files/etc/init.d/ieee1905

@@ -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

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 #
@@ -76,6 +76,7 @@ CONFIG_PACKAGE_urlfilter=y
 CONFIG_PACKAGE_imonitor=m
 CONFIG_PACKAGE_questd=y
 CONFIG_PACKAGE_rulengd=y
+CONFIG_PACKAGE_usermngr=y
 
 # TR-x69 #
 CONFIG_PACKAGE_uspd-mbedtls=y
@@ -130,7 +131,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 +153,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

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

iop/scripts/genconfig_min.sh

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

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

libvoice-airoha/Makefile

@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvoice-airoha
+PKG_VERSION:=0.1
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
+PKG_SOURCE_VERSION:=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
+	# Although there is nothing needs to be installed, but the install section must NOT be empty. Otherwise the package will be skipped as below.
+	# WARNING: skipping libvoice-airoha -- package has no install section
+	$(INSTALL_DIR) $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
+

libvoice-broadcom/Makefile

@@ -16,7 +16,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=2d3f39d517e89df0f3e80f85b7efedd3efc6705c
+PKG_SOURCE_VERSION:=401a392a72e2933f527eb92466faaf2907c38730
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,7 +27,6 @@ PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
 
 LIBVOICE_PKG_BUILD_DIR := $(PKG_BUILD_DIR)
 
-export CONFIG_BRCM_SDK_VER_504040
 export CONFIG_BCM_CHIP_ID
 
 include $(INCLUDE_DIR)/package.mk
@@ -47,7 +46,6 @@ endef
 
 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
-	@echo "Building from the local source. TARGET_PLATFORM=$(TARGET_PLATFORM)"
 	rsync -av --exclude=.* $(LOCAL_SRC_DIR)/* $(PKG_BUILD_DIR)/
 endef
 endif

libvoice-d2/Makefile

@@ -0,0 +1,58 @@
+#
+# Copyright (C) 2022 IOPSYS Software Solutions AB
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=libvoice-d2
+PKG_VERSION:=0.1
+PKG_LICENSE:=PROPRIETARY
+PKG_LICENSE_FILES:=LICENSE
+
+LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
+LOCAL_DEV=0
+ifneq ($(LOCAL_DEV),1)
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
+PKG_SOURCE_VERSION:=8a67b666e57836600457167ccadfba8c46461e5c
+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
+	# Although there is nothing needs to be installed, but the install section must NOT be empty. Otherwise the package will be skipped as below.
+	# WARNING: skipping libvoice-d2 -- package has no install section
+	$(INSTALL_DIR) $(1)/usr/lib
+endef
+
+$(eval $(call BuildPackage,$(PKG_NAME)))
+

map-agent/Config.in

@@ -13,6 +13,9 @@ config AGENT_ISLAND_PREVENTION
 config AGENT_EASYMESH_R2_CERT
 	bool "Compile for WFA test bed"
 
+config AGENT_EASYMESH_VERSION
+	int "Support Easymesh version"
+	default 2
 
 config AGENT_EASYMESH_VENDOR_EXT
 	bool "Enable extra features through Easymesh vendor extension"
@@ -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.4.1
+PKG_VERSION:=4.2.0.7
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=29aabbeb0d96c76fa1a7ea2faffc2bd001efa800
+PKG_SOURCE_VERSION:=142314d9a555ce30399d99ae1a44fbf8be8bb247
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -59,6 +59,8 @@ TARGET_CFLAGS += \
 	-Wno-error=deprecated-declarations \
 	-D_GNU_SOURCE
 
+TARGET_CFLAGS += -DEASYMESH_VERSION=$(CONFIG_AGENT_EASYMESH_VERSION)
+
 ifeq ($(CONFIG_AGENT_SYNC_DYNAMIC_CNTLR_CONFIG),y)
 TARGET_CFLAGS += -DAGENT_SYNC_DYNAMIC_CNTLR_CONFIG
 endif
@@ -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,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=2.11.0.14
+PKG_VERSION:=4.2.0.3
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=8a71dffdd66b2dcacf67353efcb09cb9127c1ea9
+PKG_SOURCE_VERSION:=a88dea065f40c81d3356d850fe447a9deeb972e4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
@@ -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,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=2.5.1.10
+PKG_VERSION:=2.5.1.18
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=ef732a9b7dcb4e03490a1fba8f89c5a6f8b9797f
+PKG_SOURCE_VERSION:=4320fa30e73b916ae6e4ff489294640e61feeb34
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

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() {
@@ -31,11 +52,10 @@ boot() {
 }
 
 stop_service() {
-	service_stop $PROG_EXE
+	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

mcastmngr/files/linux/lib/mcast/linux.sh

@@ -0,0 +1,149 @@
+#!/bin/sh
+
+. /lib/mcast/common.sh
+
+include /lib/network
+
+CONFFILE=
+PROG_EXE=/usr/sbin/mcproxy
+PROG_PARAMS=
+PROG_PARAMS_SEPARATOR=:
+
+setup_mcast_mode() {
+	 unused(){ :;}
+}
+
+config_mcproxy_interfaces() {
+	local upstreams="$1"
+	local downstreams="$2"
+	local exceptions="$3"
+
+	local str_up=""
+	if [ -n "$upstreams" ]; then
+		for upstream in $upstreams; do
+			str_up="$str_up \"$upstream\""
+		done
+	fi
+
+	local str_down=""
+	if [ -n "$downstreams" ]; then
+		for downstream in $downstreams; do
+			str_down="$str_down \"$downstream\""
+		done
+	fi
+
+	if [ ! -z $downstream ]; then
+		echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
+	fi
+
+
+	if [ -z "$exceptions" ] || [ -z "$upstreams" ]; then
+		return
+	fi
+
+	for upstream in $upstreams; do
+		local filter=""
+		for excp in $exceptions; do
+			case $excp in
+			*/*)
+				ip_start="$(ipcalc.sh $excp | grep IP | awk '{print substr($0,4)}')"
+				ip_end="$(ipcalc.sh $excp | grep BROADCAST | awk '{print substr($0,11)}')"
+				filter="$filter ($ip_start - $ip_end | *)"
+				;;
+			*)
+				filter="$filter ($excp | *)"
+				;;
+			esac
+		done
+		echo "pinstance main upstream \"$upstream\" in blacklist table{$filter };" >> $CONFFILE
+		echo "pinstance main upstream \"$upstream\" out blacklist table{$filter };" >> $CONFFILE
+	done
+}
+
+config_mcproxy_instance() {
+	local protocol="$1"
+	local version="$2"
+
+	local robustness=
+	local query_interval=
+	local q_resp_interval=
+	local last_mem_q_int=
+	local fast_leave=0
+	local exceptions=
+	local upstreams=
+	local downstreams=
+
+	CONFFILE=/var/etc/mcproxy_"$protocol".conf
+	rm -f $CONFFILE
+	touch $CONFFILE
+
+	if [ "$protocol" == "igmp" ]; then
+		case "$version" in
+			[1-3])
+				echo -e "protocol IGMPv${version};\n" >> $CONFFILE
+				;;
+			*)
+				echo -e "protocol IGMPv2;\n" >> $CONFFILE
+				;;
+		esac
+
+		robustness=$igmp_p_robustness
+		query_interval=$igmp_query_interval
+		q_resp_interval=$igmp_q_resp_interval
+		last_mem_q_int=$igmp_last_mem_q_int
+		fast_leave=$igmp_fast_leave
+		exceptions=$igmp_p_exceptions
+
+		upstreams=$igmp_p_up_interfaces
+		downstreams=$igmp_p_down_interfaces
+	elif [ "$protocol" == "mld" ]; then
+		case "$version" in
+			[1-2])
+				echo -e "protocol MLDv${version};\n" >> $CONFFILE
+				;;
+			*)
+				echo -e "protocol MLDv2;\n" >> $CONFFILE
+				;;
+		esac
+
+		robustness=$mld_p_robustness
+		query_interval=$mld_query_interval
+		q_resp_interval=$mld_q_resp_interval
+		last_mem_q_int=$mld_last_mem_q_int
+		fast_leave=$mld_fast_leave
+		exceptions=$mld_p_exceptions
+
+		upstreams=$mld_p_up_interfaces
+		downstreams=$mld_p_down_interfaces
+	fi
+
+	[ -n "$robustness" ] && echo -e "rv $robustness;" >> $CONFFILE
+	[ -n "$query_interval" ] && echo -e "qi $query_interval;" >> $CONFFILE
+	[ -n "$q_resp_interval" ] && echo -e "qri $q_resp_interval;" >> $CONFFILE
+	[ -n "$last_mem_q_int" ] && echo -e "lmqi $last_mem_q_int;" >> $CONFFILE
+	[ -n "$fast_leave" ] && echo -e "fastleave $fast_leave;\n" >> $CONFFILE
+
+	[ -n "$upstreams" ] && [ -n "$downstreams" ] &&
+		config_mcproxy_interfaces "$upstreams" "$downstreams" "$exceptions"
+
+	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
+}
+
+config_mcproxy() {
+	if [ "$igmp_p_enable" == "1" ]; then
+		config_mcproxy_instance igmp "$igmp_p_version"
+	fi
+
+	if [ "$mld_p_enable" == "1" ]; then
+		config_mcproxy_instance mld "$mld_p_version"
+	fi
+}
+
+configure_mcast() {
+	config_global_params "set_max_groups_and_sources"
+
+	read_mcast_snooping_params
+	read_mcast_proxy_params
+
+	config_mcproxy
+}

mcastmngr/files/usr/libexec/rpcd/mcast

@@ -1,18 +0,0 @@
-#!/bin/sh
-
-. /usr/share/libubox/jshn.sh
-. /lib/functions.sh
-include /lib/mcast
-
-case "$1" in
-	list)
-		echo '{ "stats":{} }'
-		;;
-	call)
-		case "$2" in
-			stats)
-				read_mcast_stats
-				;;
-		esac
-		;;
-esac

obudpst/Makefile

@@ -6,19 +6,22 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obudpst
-PKG_VERSION:=7.2.1
-PKG_SOURCE_VERSION:=9c448095c9773bd7e5cea143af07817ad9f3c6ba
+PKG_VERSION:=7.5.1
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/BroadbandForum/obudpst.git
+PKG_SOURCE_VERSION:=a8faf1925ea9189467e7f8d3b9d93c67c8b927bd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=LICENSE
 
+include $(INCLUDE_DIR)/host-build.mk
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/cmake.mk
 
+CMAKE_OPTIONS += -DDISABLE_INT_TIMER=ON
+
 define Package/obudpst
 	CATEGORY:=Utilities
 	DEPENDS+=+libopenssl
@@ -39,4 +42,10 @@ define Package/obudpst/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/udpst $(1)/usr/sbin/udpst
 endef
 
+define Host/Install
+	$(INSTALL_DIR) $(STAGING_DIR_HOST)/obudpst
+	$(CP) $(HOST_BUILD_DIR)/udpst $(STAGING_DIR_HOST)/obudpst/
+endef
+
+$(eval $(call HostBuild))
 $(eval $(call BuildPackage,obudpst))

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=6.0.0.11
+PKG_VERSION:=7.0.0.9
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/fork/obuspa.git
-PKG_SOURCE_VERSION:=668748cd4801aa5af12d61d9b0837064b9f933cc
+PKG_SOURCE_VERSION:=0a2a3481dddea672a2b12d1fcaa689d7fa761fe3
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -110,6 +110,7 @@ define Package/obuspa/install
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/USPAgent.json $(1)/etc/bbfdm/json/USPAgent.json
 	$(INSTALL_DATA) ./files/etc/bbfdm/json/TransferComplete.json $(1)/etc/bbfdm/json/TransferComplete.json
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-fix-upgrade-uci $(1)/etc/uci-defaults/
+	$(INSTALL_BIN) ./files/etc/uci-defaults/05-obuspa-mqtt-config $(1)/etc/uci-defaults/
 endef
 
 $(eval $(call BuildPackage,obuspa))

obuspa/files/etc/config/obuspa

@@ -1,6 +1,6 @@
 config obuspa 'global'
 	option enabled '1'
-	option debug '1'
+	option debug '0'
 	option log_level '1'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
@@ -11,54 +11,22 @@ config obuspa 'global'
 	#option log_dest '/var/log/obuspa'
 
 # Adds Device.LocalAgent.MTP.
-config mtp 'agent_mtp'
+config mtp 'test_mtp'
 	option Protocol 'MQTT'
 	option ResponseTopicConfigured '/usp/endpoint'
-	option mqtt 'localmqtt'
+	option mqtt 'testmqtt'
 
 # Adds Device.MQTT.Client.
-config mqtt 'localmqtt'
+config mqtt 'testmqtt'
 	option BrokerAddress '127.0.0.1'
 	option BrokerPort '1883'
 	option TransportProtocol 'TCP/IP'
 
 # Adds Device.LocalAgent.Controller.
-config controller 'localcontroller'
+config controller 'testcontroller'
 	option EndpointID 'proto::interop-usp-controller'
 	option Protocol 'MQTT'
 	option Topic '/usp/controller'
-	option mqtt 'localmqtt'
+	option mqtt 'testmqtt'
 	option assigned_role_name 'full_access'
 
-# Add Device.LocalAgent.Subscription.
-#config subscription 'sub_event'
-#    option ID 'uci-sub-events'
-#    option NotifType 'Event'
-#    list ReferenceList 'Device.Boot!'
-#    list ReferenceList 'Device.LocalAgent.TransferComplete!'
-#    option Persistent 'true'
-#    option controller 'localcontroller'
-
-#config subscription 'sub_op_comp'
-#   option ID 'uci-sub-op_complete'
-#   option NotifType 'OperationComplete'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Download()'
-#   list ReferenceList 'Device.DeviceInfo.FirmwareImage.*.Activate()'
-#   option Persistent 'true'
-#   option controller 'localcontroller'
-
-#config challenge 'admin'
-#	option Description 'Request to get Administrative access'
-#	option role_name 'full_access'
-#	option Enable '1'
-#	option Value 'YWRtaW4='
-#	option Retries 2
-#	option LockoutPeriod 60
-
-#config challenge 'user'
-#	option Description 'Request to get User access'
-#	option role_name 'user'
-#	option Enable '1'
-#	option Value 'dXNlcg=='
-#	option Retries 3
-#	option LockoutPeriod 30

obuspa/files/etc/init.d/obuspa

@@ -314,7 +314,7 @@ publish_endpoint()
 {
 	local AgentEndpointID serial oui user pass
 
-	if ! uci -q get obuspa.localmqtt; then
+	if ! uci -q get obuspa.testmqtt; then
 		return 0;
 	fi
 
@@ -330,11 +330,11 @@ publish_endpoint()
 	if [ -z "${AgentEndpointID}" ]; then
 		serial=$(get_serial_from_db)
 		oui=$(get_oui_from_db)
-		AgentEndpointID="os::${oui}-${serial}"
+		AgentEndpointID="os::${oui}-${serial//+/%2B}"
 	fi
 
-	config_get user localmqtt Username
-	config_get pass localmqtt Password
+	config_get user testmqtt Username
+	config_get pass testmqtt Password
 
 	# publish Agent's EndpointID in mosquito broker for discovery by usp-js
 	# This is a work around till obuspa adds supports for mDNS discovery
@@ -970,7 +970,7 @@ delete_sql_db_entry_with_pattern()
 		return 0;
 	fi
 
-	params="$(grep ${pattern} ${DB_DUMP}|awk '{print $1}')"
+	params="$(grep "${pattern}" ${DB_DUMP}|awk '{print $1}')"
 	for p in ${params}; do
 		db_del_sql "${p}"
 	done
@@ -981,7 +981,7 @@ check_n_delete_db()
 	local sec t r path
 
 	sec="${1}"
-	if uci -q get obuspa.${sec} >/dev/null 2>&1; then
+	if uci -q get obuspa."${sec}" >/dev/null 2>&1; then
 		return 0
 	fi
 
@@ -1032,7 +1032,7 @@ db_init()
 	fi
 
 	# remove entries from db if deleted from uci
-	if [ -f "${DB_DUMP}" ] && [ "${reason}" == "update" ] && [ -f "/tmp/obuspa/obuspa" ]; then
+	if [ -f "${DB_DUMP}" ] && [ "${reason}" = "update" ] && [ -f "/tmp/obuspa/obuspa" ]; then
 		reverse_update_db_with_uci
 	fi
 

obuspa/files/etc/obuspa/dmcaching_exclude.json

@@ -1,6 +1,5 @@
 {
   "dmcaching_exclude": [
-    "Device.InterfaceStack.",
     "Device.Hosts.Host.",
     "Device.IEEE1905.",
     "Device.WiFi.DataElements."

obuspa/files/etc/uci-defaults/01-fix-upgrade-uci

@@ -5,10 +5,10 @@
 fix_stomp_section() {
 	local encryption
 
-	config_get_bool encryption $1 encryption ""
+	config_get_bool encryption "${1}" encryption ""
 	if [ -n "${encryption}" ]; then
-		uci_set obuspa $1 encryption ""
-		uci_set obuspa $1 EnableEncryption "$encryption"
+		uci_set obuspa "${1}" encryption ""
+		uci_set obuspa "${1}" EnableEncryption "$encryption"
 	fi
 }
 

obuspa/files/etc/uci-defaults/05-obuspa-mqtt-config

@@ -0,0 +1,22 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+if [ ! -f "/etc/config/mosquitto" ]; then
+	echo "Local mosquitto broker not available"
+	return 0
+fi
+
+add_obuspa_config()
+{
+	if ! uci_get mosquitto obuspa >/dev/null 2>&1; then
+		uci_add mosquitto listener obuspa
+		uci_set mosquitto obuspa enabled 1
+		uci_set mosquitto obuspa port '1883'
+		uci_set mosquitto obuspa no_remote_access '1'
+		uci_set mosquitto obuspa allow_anonymous '1'
+	fi
+}
+
+uci_load mosquitto
+add_obuspa_config

obuspa/patches/0001-validate-mtp-topic.patch

@@ -1,140 +0,0 @@
-diff --git a/src/core/device.h b/src/core/device.h
-index adf8fa6..072f953 100644
---- a/src/core/device.h
-+++ b/src/core/device.h
-@@ -111,6 +111,7 @@ typedef struct
-     // Following member variables only set if USP message was received over MQTT
-     int mqtt_instance;
-     char *mqtt_topic;           // only set if reply_to was specified in the received MQTT packet
-+    char *mqtt_topic_recv;
- 
- 
-     // Following member variables only set if USP message was received over CoAP
-@@ -252,7 +253,7 @@ void DEVICE_MTP_NotifyMqttConnDeleted(int mqtt_instance);
- int DEVICE_MTP_ValidateMqttReference(dm_req_t *req, char *value);
- void DEVICE_CONTROLLER_SetRolesFromMqtt(int mqtt_instance, ctrust_role_t role);
- char *DEVICE_CONTROLLER_GetControllerTopic(int mqtt_instance);
--
-+int validate_controller_topic_by_endpointid(char *endpointid, mtp_protocol_t proto, char *recv_topic);
- //------------------------------------------------------------------------------
- // Tables used to convert to/from an enumeration to/from a string
- extern const enum_entry_t mtp_protocols[kMtpProtocol_Max];
-diff --git a/src/core/device_controller.c b/src/core/device_controller.c
-index 62c803f..103388d 100755
---- a/src/core/device_controller.c
-+++ b/src/core/device_controller.c
-@@ -239,6 +239,41 @@ int Async_E2ESessionReset(dm_req_t *req, kv_vector_t *input_args, int request);
- extern const enum_entry_t e2e_session_modes[kE2EMode_Max];
- #endif
- 
-+
-+int validate_controller_topic_by_endpointid(char *endpointid, mtp_protocol_t proto, char *recv_topic)
-+{
-+    controller_t *cont = FindEnabledControllerByEndpointId(endpointid);
-+    if (cont == NULL)
-+    {
-+        USP_LOG_Error("not able to find the controller from endpointid [%s]", endpointid);
-+        return USP_ERR_PERMISSION_DENIED;
-+    }
-+#ifdef ENABLE_MQTT
-+    if (proto == kMtpProtocol_MQTT)
-+    {
-+        controller_mtp_t *mtp = FindFirstEnabledMtp(cont, proto);
-+
-+        if (mtp == NULL) {
-+            USP_LOG_Error("Not able to find mtp[%d] for endpointid [%s]", proto, endpointid);
-+            return USP_ERR_REQUEST_DENIED;
-+        }
-+
-+        if (mtp->protocol != proto) {
-+            USP_LOG_Error("No matching mtp[%d] for endpointid [%s]", proto, endpointid);
-+            return USP_ERR_REQUEST_DENIED;
-+        }
-+
-+        char *response_topic = DEVICE_MTP_GetAgentMqttResponseTopic(mtp->mqtt_connection_instance);
-+        if (response_topic && strcmp(response_topic, recv_topic) != 0 ) {
-+            USP_LOG_Error("Controller response topic[%s] and recv topic[%s] mismatch, probably a spoof message", response_topic, recv_topic);
-+            return USP_ERR_PERMISSION_DENIED;
-+        }
-+    }
-+#endif
-+
-+    return USP_ERR_OK;
-+}
-+
- /*********************************************************************//**
- **
- ** DEVICE_CONTROLLER_Init
-diff --git a/src/core/dm_exec.c b/src/core/dm_exec.c
-index c0b95d8..6eb51e2 100755
---- a/src/core/dm_exec.c
-+++ b/src/core/dm_exec.c
-@@ -624,6 +624,7 @@ void DM_EXEC_PostUspRecord(unsigned char *pbuf, int pbuf_len, ctrust_role_t role
-     pur->mtp_reply_to.coap_encryption = mrt->coap_encryption;
-     pur->mtp_reply_to.coap_reset_session_hint = mrt->coap_reset_session_hint;
-     pur->mtp_reply_to.mqtt_topic = USP_STRDUP(mrt->mqtt_topic);
-+    pur->mtp_reply_to.mqtt_topic_recv = USP_STRDUP(mrt->mqtt_topic_recv);
-     pur->mtp_reply_to.mqtt_instance = mrt->mqtt_instance;
-     pur->mtp_reply_to.wsclient_cont_instance = mrt->wsclient_cont_instance;
-     pur->mtp_reply_to.wsclient_mtp_instance = mrt->wsclient_mtp_instance;
-@@ -1144,6 +1145,7 @@ void ProcessMessageQueueSocketActivity(socket_set_t *set)
-             USP_SAFE_FREE(mrt->coap_resource);
-             USP_SAFE_FREE(mrt->mqtt_topic);
-             USP_SAFE_FREE(mrt->cont_endpoint_id);
-+            USP_SAFE_FREE(mrt->mqtt_topic_recv);
-             break;
- 
- #ifndef DISABLE_STOMP
-diff --git a/src/core/mqtt.c b/src/core/mqtt.c
-index 7dba9f4..3ee9c97 100644
---- a/src/core/mqtt.c
-+++ b/src/core/mqtt.c
-@@ -3141,6 +3141,7 @@ void ReceiveMqttMessage(mqtt_client_t *client, const struct mosquitto_message *m
-         mrt.mqtt_topic = response_topic;
-     }
- 
-+    mrt.mqtt_topic_recv = message->topic;
-     // Message may not be valid USP
-     DM_EXEC_PostUspRecord(message->payload, message->payloadlen, client->role, &mrt);
- }
-diff --git a/src/core/msg_handler.c b/src/core/msg_handler.c
-index ce67626..4af9ade 100644
---- a/src/core/msg_handler.c
-+++ b/src/core/msg_handler.c
-@@ -118,7 +118,7 @@ static enum_entry_t mtp_content_types[] = {
- //------------------------------------------------------------------------------
- // Forward declarations. Note these are not static, because we need them in the symbol table for USP_LOG_Callstack() to show them
- int HandleUspMessage(Usp__Msg *usp, char *controller_endpoint, mtp_reply_to_t *mrt);
--int ValidateUspRecord(UspRecord__Record *rec);
-+int ValidateUspRecord(UspRecord__Record *rec, mtp_reply_to_t *mrt);
- char *MtpSendItemToString(mtp_send_item_t *msi);
- void CacheControllerRoleForCurMsg(char *endpoint_id, ctrust_role_t role, mtp_protocol_t protocol);
- int QueueUspNoSessionRecord(usp_send_item_t *usi, char *endpoint_id, char *usp_msg_id, mtp_reply_to_t *mrt, time_t expiry_time);
-@@ -172,7 +172,7 @@ int MSG_HANDLER_HandleBinaryRecord(unsigned char *pbuf, int pbuf_len, ctrust_rol
- #endif
- 
-     // Exit if USP record failed validation
--    err = ValidateUspRecord(rec);
-+    err = ValidateUspRecord(rec, mrt);
-     if (err != USP_ERR_OK)
-     {
-         goto exit;
-@@ -725,7 +725,7 @@ exit:
- ** \return  USP_ERR_OK if record is valid
- **
- **************************************************************************/
--int ValidateUspRecord(UspRecord__Record *rec)
-+int ValidateUspRecord(UspRecord__Record *rec, mtp_reply_to_t *mrt)
- {
-     char *endpoint_id;
- 
-@@ -806,6 +806,9 @@ int ValidateUspRecord(UspRecord__Record *rec)
-         return USP_ERR_REQUEST_DENIED;
-     }
- 
-+#if OBUSPA_CONTROLLER_MTP_VERIFY
-+    return validate_controller_topic_by_endpointid(rec->from_id, mrt->protocol, mrt->mqtt_topic_recv);
-+#endif
-     // If the code gets here, then the USP record passed validation, and the encapsulated USP message may be processed
-     return USP_ERR_OK;
- }

obuspa/patches/0003-set-internal-role-fix.patch

@@ -20,7 +20,7 @@
  void DM_PRIV_RequestInit(dm_req_t *req, dm_node_t *node, char *path, dm_instances_t *inst);
 --- a/src/core/msg_handler.c
 +++ b/src/core/msg_handler.c
-@@ -839,6 +839,20 @@ char *MtpSendItemToString(mtp_send_item_
+@@ -893,6 +893,20 @@ char *MtpSendItemToString(mtp_send_item_
  
  /*********************************************************************//**
  **

obuspa/patches/0004-suppress-notification-logs.patch

@@ -0,0 +1,20 @@
+--- a/src/core/data_model.c
++++ b/src/core/data_model.c
+@@ -1239,7 +1239,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
+     // Exit if instance already exists - nothing to do
+     if (exists)
+     {
+-        USP_ERR_SetMessage("%s: Object (%s) already exists in the data model", __FUNCTION__, path);
++        // USP_ERR_SetMessage("%s: Object (%s) already exists in the data model", __FUNCTION__, path);
+         return USP_ERR_CREATION_FAILURE;
+     }
+ 
+@@ -1324,7 +1324,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
+     // Exit if instance does not exist - nothing to do
+     if (exists == false)
+     {
+-        USP_ERR_SetMessage("%s: Object (%s) does not exist in the data model", __FUNCTION__, path);
++        // USP_ERR_SetMessage("%s: Object (%s) does not exist in the data model", __FUNCTION__, path);
+         return USP_ERR_OBJECT_DOES_NOT_EXIST;
+     }
+ 

obuspa/patches/0005-optimise_ubus_calls_cli.patch

@@ -0,0 +1,22 @@
+diff --git a/src/core/data_model.c b/src/core/data_model.c
+index 2cf4b6c..b92cf59 100644
+--- a/src/core/data_model.c
++++ b/src/core/data_model.c
+@@ -136,6 +136,7 @@ void DumpDataModelNodeMap(void);
+ int GetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *buf, int len, dm_req_t *req);
+ int SetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *value, dm_req_t *req);
+ 
++extern bool is_running_cli_local_command;
+ /*********************************************************************//**
+ **
+ ** DATA_MODEL_Init
+@@ -223,7 +224,9 @@ int DATA_MODEL_Init(void)
+     }
+ 
+     // Set the default values of OUI, Serial Number and (LocalAgent) EndpointID, and cache EndpointID
++    if (is_running_cli_local_command == false) {
+     err = DEVICE_LOCAL_AGENT_SetDefaults();
++    }
+     if (err != USP_ERR_OK)
+     {
+         return err;

obuspa/patches/0006-bdc_json_obj_hierarchy.patch

@@ -0,0 +1,372 @@
+diff --git a/src/core/bdc_exec.c b/src/core/bdc_exec.c
+index 6b5c11d..3670361 100644
+--- a/src/core/bdc_exec.c
++++ b/src/core/bdc_exec.c
+@@ -548,9 +548,14 @@ int StartSendingReport(bdc_connection_t *bc)
+     // Set the list of headers
+     bc->headers = NULL;
+     bc->headers = curl_slist_append(bc->headers, "Content-Type: application/json; charset=UTF-8");
+-    bc->headers = curl_slist_append(bc->headers, "BBF-Report-Format: NameValuePair");
++    if (bc->flags & BDC_FLAG_HEADER_OBJ_HIER)
++        bc->headers = curl_slist_append(bc->headers, "BBF-Report-Format: ObjectHierarchy");
++    else
++        bc->headers = curl_slist_append(bc->headers, "BBF-Report-Format: NameValuePair");
++
+     if (bc->flags & BDC_FLAG_GZIP)
+     {
++        curl_easy_setopt(curl_ctx, CURLOPT_ACCEPT_ENCODING, "gzip");
+         bc->headers = curl_slist_append(bc->headers, "Content-Encoding: gzip");
+     }
+ 
+diff --git a/src/core/bdc_exec.h b/src/core/bdc_exec.h
+index c58c6d5..ff37a2d 100644
+--- a/src/core/bdc_exec.h
++++ b/src/core/bdc_exec.h
+@@ -53,6 +53,6 @@ void BDC_EXEC_ScheduleExit(void);
+ #define BDC_FLAG_PUT            0x00000001  // If set, HTTP PUT should be used instead of HTTP POST when sending the report to the BDC server
+ #define BDC_FLAG_GZIP           0x00000002  // If set, the reports contants are Gzipped
+ #define BDC_FLAG_DATE_HEADER    0x00000004  // If set, the date header should be included in the HTTP post.
+-
++#define BDC_FLAG_HEADER_OBJ_HIER 0x00000008 // If set, report format in header would be ObjectHierarchy otherwise NameValuePair 
+ 
+ #endif
+diff --git a/src/core/device_bulkdata.c b/src/core/device_bulkdata.c
+index 5b1aff2..a7d1b3e 100755
+--- a/src/core/device_bulkdata.c
++++ b/src/core/device_bulkdata.c
+@@ -68,7 +68,8 @@
+ //------------------------------------------------------------------------------
+ // Definitions for formats that we support
+ #define BULKDATA_ENCODING_TYPE "JSON"
+-#define BULKDATA_JSON_REPORT_FORMAT "NameValuePair"
++#define BULKDATA_JSON_REPORT_FORMAT_NAME_VALUE "NameValuePair"
++#define BULKDATA_JSON_REPORT_FORMAT_OBJ_HIER "ObjectHierarchy"
+ 
+ 
+ // Definitions for Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp
+@@ -159,6 +160,7 @@ typedef struct
+     char compression[9];
+     char method[9];
+     bool use_date_header;
++    char report_format[20];
+ } profile_ctrl_params_t;
+ 
+ //------------------------------------------------------------------------------
+@@ -233,7 +235,7 @@ bulkdata_profile_t *bulkdata_find_free_profile(void);
+ bulkdata_profile_t *bulkdata_find_profile(int profile_id);
+ int bulkdata_calc_report_map(bulkdata_profile_t *bp, kv_vector_t *report_map);
+ int bulkdata_reduce_to_alt_name(char *spec, char *path, char *alt_name, char *out_buf, int buf_len);
+-char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp);
++char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp, char *report_format);
+ unsigned char *bulkdata_compress_report(profile_ctrl_params_t *ctrl, char *input_buf, int input_len, int *p_output_len);
+ int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_profile_t *bp, unsigned char *json_report, int report_len);
+ int bulkdata_start_profile(bulkdata_profile_t *bp);
+@@ -307,7 +309,7 @@ int DEVICE_BULKDATA_Init(void)
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Parameter.{i}.Reference", "", Validate_BulkDataReference, NULL, DM_STRING);
+ 
+     // Device.BulkData.Profile.{i}.JSONEncoding
+-    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.JSONEncoding.ReportFormat", BULKDATA_JSON_REPORT_FORMAT, Validate_BulkDataReportFormat, NULL, DM_STRING);
++    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.JSONEncoding.ReportFormat", BULKDATA_JSON_REPORT_FORMAT_NAME_VALUE, Validate_BulkDataReportFormat, NULL, DM_STRING);
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp", BULKDATA_JSON_TIMESTAMP_FORMAT_EPOCH, Validate_BulkDataReportTimestamp, NULL, DM_STRING);
+ 
+     // Device.BulkData.Profile.{i}.HTTP
+@@ -661,9 +663,11 @@ int Validate_BulkDataReference(dm_req_t *req, char *value)
+ int Validate_BulkDataReportFormat(dm_req_t *req, char *value)
+ {
+     // Exit if trying to set a value outside of the range we accept
+-    if (strcmp(value, BULKDATA_JSON_REPORT_FORMAT) != 0)
++    if (strcmp(value, BULKDATA_JSON_REPORT_FORMAT_NAME_VALUE) != 0 &&
++	    strcmp(value, BULKDATA_JSON_REPORT_FORMAT_OBJ_HIER) != 0)
+     {
+-        USP_ERR_SetMessage("%s: Only JSON Report Format supported is '%s'", __FUNCTION__, BULKDATA_JSON_REPORT_FORMAT);
++        USP_ERR_SetMessage("%s: Only JSON Report Format supported are '%s', '%s'", __FUNCTION__,
++			BULKDATA_JSON_REPORT_FORMAT_NAME_VALUE, BULKDATA_JSON_REPORT_FORMAT_OBJ_HIER);
+         return USP_ERR_INVALID_VALUE;
+     }
+ 
+@@ -1974,6 +1978,14 @@ int bulkdata_platform_get_profile_control_params(bulkdata_profile_t *bp, profile
+         return err;
+     }
+ 
++    // Exit if unable to get ReportFormat
++    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportFormat", bp->profile_id);
++    err = DATA_MODEL_GetParameterValue(path, ctrl_params->report_format, sizeof(ctrl_params->report_format), 0);
++    if (err != USP_ERR_OK)
++    {
++        return err;
++    }
++
+     return USP_ERR_OK;
+ }
+ 
+@@ -2249,7 +2261,7 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+     }
+ 
+     // Exit if unable to generate the report
+-    json_report = bulkdata_generate_json_report(bp, ctrl.report_timestamp);
++    json_report = bulkdata_generate_json_report(bp, ctrl.report_timestamp, ctrl.report_format);
+     if (json_report == NULL)
+     {
+         USP_ERR_SetMessage("%s: bulkdata_generate_json_report failed", __FUNCTION__);
+@@ -2299,7 +2311,8 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+     kv_pair_t kv;
+     report_t *cur_report;
+     char *json_report;
+-    char report_timestamp[33];
++    char report_timestamp[33] = {0};
++    char report_format[20] = {0};
+ 
+     // Exit if the MTP has not been connected to successfully after bootup
+     // This is to prevent BDC events being enqueued before the Boot! event is sent (the Boot! event is only sent after successfully connecting to the MTP).
+@@ -2316,6 +2329,14 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+         return;
+     }
+ 
++    // Exit if unable to get ReportFormat
++    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportFormat", bp->profile_id);
++    err = DATA_MODEL_GetParameterValue(path, report_format, sizeof(report_format), 0);
++    if (err != USP_ERR_OK)
++    {
++        return;
++    }
++
+     // When sending via USP events, only one report is ever sent in each USP event
+     // So ensure all retained reports are removed. NOTE: Clearing the reports here is only necessary when switching protocol from HTTP to USP event, and where HTTP had some unsent reports
+     bulkdata_clear_retained_reports(bp);
+@@ -2333,7 +2354,7 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+     bp->num_retained_reports = 1;
+ 
+     // Exit if unable to generate the report
+-    json_report = bulkdata_generate_json_report(bp, report_timestamp);
++    json_report = bulkdata_generate_json_report(bp, report_timestamp, report_format);
+     if (json_report == NULL)
+     {
+         USP_ERR_SetMessage("%s: bulkdata_generate_json_report failed", __FUNCTION__);
+@@ -2545,21 +2566,7 @@ int bulkdata_reduce_to_alt_name(char *spec, char *path, char *alt_name, char *ou
+     return USP_ERR_OK;
+ }
+ 
+-/*********************************************************************//**
+-**
+-**  bulkdata_generate_json_report
+-**
+-**  Generates a JSON name-value pair format report
+-**  NOTE: The report contains all retained failed reports, as well as the current report
+-**  See TR-157 section A.4.2 (end) for an example, and section A.3.5.2 for layout of content containing failed report transmissions
+-**
+-** \param   bp - pointer to bulk data profile containing all reports (current and retained)
+-** \param   report_timestamp - value of Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp
+-**
+-** \return  pointer to NULL terminated dynamically allocated buffer containing the serialized report to send
+-**
+-**************************************************************************/
+-char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp)
++static char *create_json_name_value_pair_report(bulkdata_profile_t *bp, char *report_timestamp)
+ {
+     JsonNode *top;          // top of report
+     JsonNode *array;        // array of reports (retained + current)
+@@ -2574,7 +2581,6 @@ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timesta
+     long long value_as_ll;
+     unsigned long long value_as_ull;
+     bool value_as_bool;
+-    char *result;
+     int i, j;
+     char buf[32];
+     kv_pair_t *kv;
+@@ -2597,7 +2603,7 @@ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timesta
+         }
+         else if (strcmp(report_timestamp, "ISO-8601")==0)
+         {
+-            result = iso8601_from_unix_time(report->collection_time, buf, sizeof(buf));
++            char *result = iso8601_from_unix_time(report->collection_time, buf, sizeof(buf));
+             if (result != NULL)
+             {
+                 json_append_member(element, "CollectionTime", json_mkstring(buf));
+@@ -2656,11 +2662,174 @@ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timesta
+     json_append_member(top, "Report", array);
+ 
+     // Serialize the JSON tree
+-    result = json_stringify(top, " ");
++    char *output = json_stringify(top, " ");
++
++    // Clean up the JSON tree
++    json_delete(top);        // Other JsonNodes which are children of this top level tree will be deleted
++
++    return output;
++}
++
++static char *create_json_obj_hier_report(bulkdata_profile_t *bp, char *report_timestamp)
++{
++    JsonNode *top;          // top of report
++    JsonNode *array;        // array of reports (retained + current)
++    JsonNode *element;      // element of json array, containing an individual report
++    JsonNode *temp;
++    char *param_path;
++    char *param_type_value;
++    char param_type;
++    char *param_value;
++    kv_vector_t *report_map;
++    report_t *report;
++    double value_as_number;
++    long long value_as_ll;
++    unsigned long long value_as_ull;
++    bool value_as_bool;
++    int i, j;
++    char buf[32];
++    kv_pair_t *kv;
++    int err;
++
++    top = json_mkobject();
++    array = json_mkarray();
++
++    // Iterate over all reports adding them to the JSON array
++    for (i=0; i < bp->num_retained_reports; i++)
++    {
++        report = &bp->reports[i];
++        report_map = &report->report_map;
++
++        // Add Collection time to each json report element (only if specified and not 'None')
++        element = json_mkobject();
++        if (strcmp(report_timestamp, "Unix-Epoch")==0)
++        {
++            json_append_member(element, "CollectionTime", json_mknumber(report->collection_time));
++        }
++        else if (strcmp(report_timestamp, "ISO-8601")==0)
++        {
++            char *result = iso8601_from_unix_time(report->collection_time, buf, sizeof(buf));
++            if (result != NULL)
++            {
++                json_append_member(element, "CollectionTime", json_mkstring(buf));
++            }
++        }
++
++        temp = element;
++        // Iterate over each parameter, adding it to the json element. Take account of the parameter's type
++        for (j=0; j < report_map->num_entries; j++)
++        {
++            char buff[2056] = {0};
++            char *pch = NULL, *pchr = NULL, *argv[128] = {0};
++            int n = 0;
++
++            kv = &report_map->vector[j];
++            param_path = kv->key;
++            param_type_value = kv->value;
++            param_type = param_type_value[0];           // First character denotes the type of the parameter
++            param_value = &param_type_value[1];         // Subsequent characters contain the parameter's value
++
++            strncpy(buff, param_path, sizeof(buff));
++            for (pch = strtok_r(buff, ".", &pchr); pch != NULL; pch = strtok_r(NULL, ".", &pchr)) {
++                int idx;
++                JsonNode *obj = element;
++                argv[n] = pch;
++
++                for (idx = 0; idx <= n; idx++) {
++                    if (obj == NULL)
++                        break;
++                    obj = json_find_member(obj, argv[idx]);
++                }
++
++                if (obj)
++                    temp = obj;
++                else {
++                    if (pchr != NULL && *pchr != '\0') {
++                        // It is a DMOBJ
++                        JsonNode *new = json_mkobject();
++                        json_append_member(temp, pch, new);
++                        temp = new;
++                    } else {
++                        // It is a DMPARAM
++                        switch (param_type)
++                        {
++                            case 'S':
++                                json_append_member(temp, pch, json_mkstring(param_value) );
++                                break;
++
++                            case 'U':
++                                value_as_ull = strtoull(param_value, NULL, 10);
++                                json_append_member(temp, pch, json_mkulonglong(value_as_ull) );
++                                break;
++
++                            case 'L':
++                                value_as_ll = strtoll(param_value, NULL, 10);
++                                json_append_member(temp, pch, json_mklonglong(value_as_ll) );
++                                break;
++
++                            case 'N':
++                                value_as_number = atof(param_value);
++                                json_append_member(temp, pch, json_mknumber(value_as_number) );
++                                break;
++
++                            case 'B':
++                                err = TEXT_UTILS_StringToBool(param_value, &value_as_bool);
++                                if (err == USP_ERR_OK)
++                                {
++                                    json_append_member(temp, pch, json_mkbool(value_as_bool) );
++                                }
++                                break;
++
++                            default:
++                                USP_ERR_SetMessage("%s: Invalid JSON parameter type ('%c') in report map for %s", __FUNCTION__, param_type_value[0], param_path);
++                                break;
++                        }
++                    }
++                }
++		n++;
++            }
++        }
++
++        // Add the json element to the json array
++        json_append_element(array, element);
++    }
++
++    // Finally add the array to the report top level
++    json_append_member(top, "Report", array);
++
++    // Serialize the JSON tree
++    char *output = json_stringify(top, " ");
+ 
+     // Clean up the JSON tree
+     json_delete(top);        // Other JsonNodes which are children of this top level tree will be deleted
+ 
++    return output;
++}
++
++/*********************************************************************//**
++**
++**  bulkdata_generate_json_report
++**
++**  Generates a JSON name-value pair or object-hierarchy format report
++**  NOTE: The report contains all retained failed reports, as well as the current report
++**  See TR-157 section A.4.2 (end) for an example, and section A.3.5.2 for layout of content containing failed report transmissions
++**
++** \param   bp - pointer to bulk data profile containing all reports (current and retained)
++** \param   report_timestamp - value of Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp
++**
++** \return  pointer to NULL terminated dynamically allocated buffer containing the serialized report to send
++**
++**************************************************************************/
++char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp, char *report_format)
++{
++    char *result = NULL;
++
++    if (strcmp(report_format, BULKDATA_JSON_REPORT_FORMAT_NAME_VALUE) == 0) {
++	    result = create_json_name_value_pair_report(bp, report_timestamp);
++    } else if (strcmp(report_format, BULKDATA_JSON_REPORT_FORMAT_OBJ_HIER) == 0) {
++	    result = create_json_obj_hier_report(bp, report_timestamp);
++    }
++
+     return result;
+ }
+ 
+@@ -2817,6 +2986,11 @@ int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_
+         flags |= BDC_FLAG_DATE_HEADER;
+     }
+ 
++    if (strcmp(ctrl->report_format, BULKDATA_JSON_REPORT_FORMAT_OBJ_HIER) == 0)
++    {
++        flags |= BDC_FLAG_HEADER_OBJ_HIER;
++    }
++
+     // Exit if failed to post a message to BDC thread
+     // NOTE: Ownership of full_url, query_string, report, username and password passes to BDC_EXEC
+     err = BDC_EXEC_PostReportToSend(bp->profile_id, full_url, query_string, username, password, report, report_len, flags);

obuspa/patches/0007-bdc_csv_format.patch

@@ -0,0 +1,673 @@
+diff --git a/src/core/bdc_exec.c b/src/core/bdc_exec.c
+index 3670361..6a6325d 100644
+--- a/src/core/bdc_exec.c
++++ b/src/core/bdc_exec.c
+@@ -547,11 +547,19 @@ int StartSendingReport(bdc_connection_t *bc)
+ 
+     // Set the list of headers
+     bc->headers = NULL;
+-    bc->headers = curl_slist_append(bc->headers, "Content-Type: application/json; charset=UTF-8");
+-    if (bc->flags & BDC_FLAG_HEADER_OBJ_HIER)
++    if (bc->flags & BDC_FLAG_HEADER_OBJ_HIER) {
++        bc->headers = curl_slist_append(bc->headers, "Content-Type: application/json; charset=UTF-8");
+         bc->headers = curl_slist_append(bc->headers, "BBF-Report-Format: ObjectHierarchy");
+-    else
++    } else if (bc->flags & BDC_FLAG_HEADER_NAME_VAL) {
++        bc->headers = curl_slist_append(bc->headers, "Content-Type: application/json; charset=UTF-8");
+         bc->headers = curl_slist_append(bc->headers, "BBF-Report-Format: NameValuePair");
++    } else if (bc->flags & BDC_FLAG_HEADER_PER_COL) {
++        bc->headers = curl_slist_append(bc->headers, "Content-Type: text/csv; charset=UTF-8");
++        bc->headers = curl_slist_append(bc->headers, "BBF-Report-Format: ParameterPerColumn");
++    } else {
++        bc->headers = curl_slist_append(bc->headers, "Content-Type: text/csv; charset=UTF-8");
++        bc->headers = curl_slist_append(bc->headers, "BBF-Report-Format: ParameterPerRow");
++    }
+ 
+     if (bc->flags & BDC_FLAG_GZIP)
+     {
+diff --git a/src/core/bdc_exec.h b/src/core/bdc_exec.h
+index ff37a2d..ee29c85 100644
+--- a/src/core/bdc_exec.h
++++ b/src/core/bdc_exec.h
+@@ -53,6 +53,9 @@ void BDC_EXEC_ScheduleExit(void);
+ #define BDC_FLAG_PUT            0x00000001  // If set, HTTP PUT should be used instead of HTTP POST when sending the report to the BDC server
+ #define BDC_FLAG_GZIP           0x00000002  // If set, the reports contants are Gzipped
+ #define BDC_FLAG_DATE_HEADER    0x00000004  // If set, the date header should be included in the HTTP post.
+-#define BDC_FLAG_HEADER_OBJ_HIER 0x00000008 // If set, report format in header would be ObjectHierarchy otherwise NameValuePair 
++#define BDC_FLAG_HEADER_OBJ_HIER 0x00000008 // If set, report format in header would be json ObjectHierarchy 
++#define BDC_FLAG_HEADER_NAME_VAL 0x00000010 // If set, report format in header would be json NameValuePair
++#define BDC_FLAG_HEADER_PER_ROW  0x00000020 // If set, report format in header would be csv ParameterPerRow
++#define BDC_FLAG_HEADER_PER_COL  0x00000040 // If set, report format in header would be csv ParameterPerColumn
+ 
+ #endif
+diff --git a/src/core/device_bulkdata.c b/src/core/device_bulkdata.c
+index a7d1b3e..fab9731 100755
+--- a/src/core/device_bulkdata.c
++++ b/src/core/device_bulkdata.c
+@@ -67,9 +67,12 @@
+ 
+ //------------------------------------------------------------------------------
+ // Definitions for formats that we support
+-#define BULKDATA_ENCODING_TYPE "JSON"
++#define BULKDATA_ENCODING_TYPE_JSON "JSON"
++#define BULKDATA_ENCODING_TYPE_CSV "CSV"
+ #define BULKDATA_JSON_REPORT_FORMAT_NAME_VALUE "NameValuePair"
+ #define BULKDATA_JSON_REPORT_FORMAT_OBJ_HIER "ObjectHierarchy"
++#define BULKDATA_CSV_REPORT_FORMAT_PER_COLUMN "ParameterPerColumn"
++#define BULKDATA_CSV_REPORT_FORMAT_PER_ROW "ParameterPerRow"
+ 
+ 
+ // Definitions for Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp
+@@ -153,6 +156,7 @@ static char *profile_push_event_args[] =
+ typedef struct
+ {
+     int num_retained_failed_reports;
++    char encoding_type[10];
+     char report_timestamp[33];
+     char url[1025];
+     char username[257];
+@@ -161,6 +165,11 @@ typedef struct
+     char method[9];
+     bool use_date_header;
+     char report_format[20];
++    char field_separator[10];
++    char row_separator[10];
++    char escape_char[10];
++    char csv_format[20];
++    char row_timestamp[33];
+ } profile_ctrl_params_t;
+ 
+ //------------------------------------------------------------------------------
+@@ -208,6 +217,7 @@ int Validate_BulkDataEncodingType(dm_req_t *req, char *value);
+ int Validate_BulkDataReportingInterval(dm_req_t *req, char *value);
+ int Validate_BulkDataReference(dm_req_t *req, char *value);
+ int Validate_BulkDataReportFormat(dm_req_t *req, char *value);
++int Validate_BulkDataCSVReportFormat(dm_req_t *req, char *value);
+ int Validate_BulkDataReportTimestamp(dm_req_t *req, char *value);
+ int Validate_BulkDataCompression(dm_req_t *req, char *value);
+ int Validate_BulkDataHTTPMethod(dm_req_t *req, char *value);
+@@ -236,6 +246,8 @@ bulkdata_profile_t *bulkdata_find_profile(int profile_id);
+ int bulkdata_calc_report_map(bulkdata_profile_t *bp, kv_vector_t *report_map);
+ int bulkdata_reduce_to_alt_name(char *spec, char *path, char *alt_name, char *out_buf, int buf_len);
+ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timestamp, char *report_format);
++char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator, char *row_separator,
++                                   char *escape_char, char *csv_format, char *row_timestamp);
+ unsigned char *bulkdata_compress_report(profile_ctrl_params_t *ctrl, char *input_buf, int input_len, int *p_output_len);
+ int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_profile_t *bp, unsigned char *json_report, int report_len);
+ int bulkdata_start_profile(bulkdata_profile_t *bp);
+@@ -250,6 +262,7 @@ char *bulkdata_platform_calc_uri_query_string(kv_vector_t *escaped_map);
+ int bulkdata_platform_get_param_refs(int profile_id, param_ref_vector_t *param_refs);
+ void bulkdata_expand_param_ref(param_ref_entry_t *pr, group_get_vector_t *ggv);
+ void bulkdata_append_to_result_map(param_ref_entry_t *pr, group_get_vector_t *ggv, kv_vector_t *report_map);
++void append_string_to_target(char *str, char **output);
+ 
+ /*********************************************************************//**
+ **
+@@ -282,7 +295,7 @@ int DEVICE_BULKDATA_Init(void)
+     err |= USP_REGISTER_VendorParam_ReadOnly("Device.BulkData.Status", Get_BulkDataGlobalStatus, DM_STRING);
+     err |= USP_REGISTER_Param_Constant("Device.BulkData.MinReportingInterval", BULKDATA_MINIMUM_REPORTING_INTERVAL_STR, DM_UINT);
+     err |= USP_REGISTER_Param_SupportedList("Device.BulkData.Protocols", bdc_protocols, NUM_ELEM(bdc_protocols));
+-    err |= USP_REGISTER_Param_Constant("Device.BulkData.EncodingTypes", BULKDATA_ENCODING_TYPE, DM_STRING);
++    err |= USP_REGISTER_Param_Constant("Device.BulkData.EncodingTypes", "CSV,JSON", DM_STRING);
+     err |= USP_REGISTER_Param_Constant("Device.BulkData.ParameterWildCardSupported", "true", DM_BOOL);
+     err |= USP_REGISTER_Param_Constant("Device.BulkData.MaxNumberOfProfiles", BULKDATA_MAX_PROFILES_STR, DM_INT);
+     err |= USP_REGISTER_Param_Constant("Device.BulkData.MaxNumberOfParameterReferences", "-1", DM_INT);
+@@ -297,7 +310,7 @@ int DEVICE_BULKDATA_Init(void)
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Name", "", NULL, NULL, DM_STRING);
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.NumberOfRetainedFailedReports", "0", Validate_NumberOfRetainedFailedReports, NULL, DM_INT);
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.Protocol", BULKDATA_PROTOCOL_HTTP, Validate_BulkDataProtocol, NULL, DM_STRING);
+-    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.EncodingType", BULKDATA_ENCODING_TYPE, Validate_BulkDataEncodingType, NULL, DM_STRING);
++    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.EncodingType", BULKDATA_ENCODING_TYPE_JSON, Validate_BulkDataEncodingType, NULL, DM_STRING);
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.ReportingInterval", "86400", Validate_BulkDataReportingInterval, NotifyChange_BulkDataReportingInterval, DM_UINT);
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.TimeReference", UNKNOWN_TIME_STR, NULL, NotifyChange_BulkDataTimeReference, DM_DATETIME);
+ 
+@@ -312,6 +325,13 @@ int DEVICE_BULKDATA_Init(void)
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.JSONEncoding.ReportFormat", BULKDATA_JSON_REPORT_FORMAT_NAME_VALUE, Validate_BulkDataReportFormat, NULL, DM_STRING);
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp", BULKDATA_JSON_TIMESTAMP_FORMAT_EPOCH, Validate_BulkDataReportTimestamp, NULL, DM_STRING);
+ 
++    // Device.BulkData.Profile.{i}.CSVEncoding
++    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.CSVEncoding.FieldSeparator", ",", NULL, NULL, DM_STRING);
++    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.CSVEncoding.RowSeparator", "
", NULL, NULL, DM_STRING);
++    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.CSVEncoding.EscapeCharacter", """, NULL, NULL, DM_STRING);
++    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.CSVEncoding.ReportFormat", BULKDATA_CSV_REPORT_FORMAT_PER_COLUMN, Validate_BulkDataCSVReportFormat, NULL, DM_STRING);
++    err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.CSVEncoding.RowTimestamp", BULKDATA_JSON_TIMESTAMP_FORMAT_EPOCH, Validate_BulkDataReportTimestamp, NULL, DM_STRING);
++
+     // Device.BulkData.Profile.{i}.HTTP
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.URL", "", NULL, NotifyChange_BulkDataURL, DM_STRING);
+     err |= USP_REGISTER_DBParam_ReadWrite("Device.BulkData.Profile.{i}.HTTP.Username", "", NULL, NULL, DM_STRING);
+@@ -591,9 +611,10 @@ int Validate_BulkDataProtocol(dm_req_t *req, char *value)
+ int Validate_BulkDataEncodingType(dm_req_t *req, char *value)
+ {
+     // Exit if trying to set a value outside of the range we accept
+-    if (strcmp(value, BULKDATA_ENCODING_TYPE) != 0)
++    if (strcmp(value, BULKDATA_ENCODING_TYPE_JSON) != 0 && strcmp(value, BULKDATA_ENCODING_TYPE_CSV) != 0)
+     {
+-        USP_ERR_SetMessage("%s: Only EncodingType supported is '%s'", __FUNCTION__, BULKDATA_ENCODING_TYPE);
++        USP_ERR_SetMessage("%s: Only EncodingType supported are '%s,%s'", __FUNCTION__,
++                           BULKDATA_ENCODING_TYPE_JSON, BULKDATA_ENCODING_TYPE_CSV);
+         return USP_ERR_INVALID_VALUE;
+     }
+ 
+@@ -674,6 +695,32 @@ int Validate_BulkDataReportFormat(dm_req_t *req, char *value)
+     return USP_ERR_OK;
+ }
+ 
++/*********************************************************************//**
++**
++** Validate_BulkDataCSVReportFormat
++**
++** Validates Device.BulkData.Profile.{i}.CSVEncoding.ReportFormat
++**
++** \param   req - pointer to structure identifying the parameter
++** \param   value - value that the controller would like to set the parameter to
++**
++** \return  USP_ERR_OK if successful
++**
++**************************************************************************/
++int Validate_BulkDataCSVReportFormat(dm_req_t *req, char *value)
++{
++    // Exit if trying to set a value outside of the range we accept
++    if (strcmp(value, BULKDATA_CSV_REPORT_FORMAT_PER_COLUMN) != 0 &&
++	    strcmp(value, BULKDATA_CSV_REPORT_FORMAT_PER_ROW) != 0)
++    {
++        USP_ERR_SetMessage("%s: Only JSON Report Format supported are '%s', '%s'", __FUNCTION__,
++			BULKDATA_CSV_REPORT_FORMAT_PER_COLUMN, BULKDATA_CSV_REPORT_FORMAT_PER_ROW);
++        return USP_ERR_INVALID_VALUE;
++    }
++
++    return USP_ERR_OK;
++}
++
+ /*********************************************************************//**
+ **
+ ** Validate_BulkDataReportTimestamp
+@@ -1970,6 +2017,14 @@ int bulkdata_platform_get_profile_control_params(bulkdata_profile_t *bp, profile
+         return err;
+     }
+ 
++    // Exit if unable to get EncodingType
++    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.EncodingType", bp->profile_id);
++    err = DATA_MODEL_GetParameterValue(path, ctrl_params->encoding_type, sizeof(ctrl_params->encoding_type), 0);
++    if (err != USP_ERR_OK)
++    {
++        return err;
++    }
++
+     // Exit if unable to get ReportTimestamp
+     USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportTimestamp", bp->profile_id);
+     err = DATA_MODEL_GetParameterValue(path, ctrl_params->report_timestamp, sizeof(ctrl_params->report_timestamp), 0);
+@@ -1986,6 +2041,46 @@ int bulkdata_platform_get_profile_control_params(bulkdata_profile_t *bp, profile
+         return err;
+     }
+ 
++    // Exit if unable to get FieldSeparator
++    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.FieldSeparator", bp->profile_id);
++    err = DATA_MODEL_GetParameterValue(path, ctrl_params->field_separator, sizeof(ctrl_params->field_separator), 0);
++    if (err != USP_ERR_OK)
++    {
++        return err;
++    }
++
++    // Exit if unable to get RowSeparator
++    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.RowSeparator", bp->profile_id);
++    err = DATA_MODEL_GetParameterValue(path, ctrl_params->row_separator, sizeof(ctrl_params->row_separator), 0);
++    if (err != USP_ERR_OK)
++    {
++        return err;
++    }
++
++    // Exit if unable to get EscapeCharacter
++    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.EscapeCharacter", bp->profile_id);
++    err = DATA_MODEL_GetParameterValue(path, ctrl_params->escape_char, sizeof(ctrl_params->escape_char), 0);
++    if (err != USP_ERR_OK)
++    {
++        return err;
++    }
++
++    // Exit if unable to get ReportFormat
++    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.ReportFormat", bp->profile_id);
++    err = DATA_MODEL_GetParameterValue(path, ctrl_params->csv_format, sizeof(ctrl_params->csv_format), 0);
++    if (err != USP_ERR_OK)
++    {
++        return err;
++    }
++
++    // Exit if unable to get RowTimestamp
++    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.RowTimestamp", bp->profile_id);
++    err = DATA_MODEL_GetParameterValue(path, ctrl_params->row_timestamp, sizeof(ctrl_params->row_timestamp), 0);
++    if (err != USP_ERR_OK)
++    {
++        return err;
++    }
++
+     return USP_ERR_OK;
+ }
+ 
+@@ -2222,7 +2317,7 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+ {
+     int err;
+     report_t *cur_report;
+-    char *json_report;
++    char *report;
+     profile_ctrl_params_t ctrl;
+     unsigned char *compressed_report;
+     int compressed_len;
+@@ -2261,10 +2356,23 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+     }
+ 
+     // Exit if unable to generate the report
+-    json_report = bulkdata_generate_json_report(bp, ctrl.report_timestamp, ctrl.report_format);
+-    if (json_report == NULL)
+-    {
+-        USP_ERR_SetMessage("%s: bulkdata_generate_json_report failed", __FUNCTION__);
++    if (strcmp(ctrl.encoding_type, BULKDATA_ENCODING_TYPE_JSON) == 0) {
++        report = bulkdata_generate_json_report(bp, ctrl.report_timestamp, ctrl.report_format);
++        if (report == NULL)
++        {
++            USP_ERR_SetMessage("%s: bulkdata_generate_json_report failed", __FUNCTION__);
++            return;
++        }
++    } else if (strcmp(ctrl.encoding_type, BULKDATA_ENCODING_TYPE_CSV) == 0) {
++        report = bulkdata_generate_csv_report(bp, ctrl.field_separator, ctrl.row_separator, ctrl.escape_char,
++                                              ctrl.csv_format, ctrl.row_timestamp);
++        if (report == NULL)
++        {
++            USP_ERR_SetMessage("%s: bulkdata_generate_csv_report failed", __FUNCTION__);
++            return;
++        }
++    } else {
++        USP_ERR_SetMessage("%s: bulkdata invalid report encoding type %s", __FUNCTION__, ctrl.encoding_type);
+         return;
+     }
+ 
+@@ -2273,14 +2381,14 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+     USP_LOG_Info("BULK DATA: using compression method=%s", ctrl.compression);
+     if (enable_protocol_trace)
+     {
+-        USP_LOG_String(kLogLevel_Info, kLogType_Protocol, json_report);
++        USP_LOG_String(kLogLevel_Info, kLogType_Protocol, report);
+     }
+ 
+     // Compress the report, if enabled
+-    compressed_report = bulkdata_compress_report(&ctrl, json_report, strlen(json_report), &compressed_len);
+-    if (compressed_report != (unsigned char *)json_report)
++    compressed_report = bulkdata_compress_report(&ctrl, report, strlen(report), &compressed_len);
++    if (compressed_report != (unsigned char *)report)
+     {
+-        free(json_report);
++        free(report);
+     }
+     // NOTE: From this point on, only the compressed_report exists
+ 
+@@ -2310,9 +2418,15 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+     kv_vector_t event_args;
+     kv_pair_t kv;
+     report_t *cur_report;
+-    char *json_report;
++    char *report;
++    char encoding_type[10] = {0};
+     char report_timestamp[33] = {0};
+     char report_format[20] = {0};
++    char field_separator[10];
++    char row_separator[10];
++    char escape_char[10];
++    char csv_format[20];
++    char row_timestamp[33];
+ 
+     // Exit if the MTP has not been connected to successfully after bootup
+     // This is to prevent BDC events being enqueued before the Boot! event is sent (the Boot! event is only sent after successfully connecting to the MTP).
+@@ -2321,20 +2435,62 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+         goto exit;
+     }
+ 
+-    // Exit if unable to get ReportTimestamp
+-    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportTimestamp", bp->profile_id);
+-    err = DATA_MODEL_GetParameterValue(path, report_timestamp, sizeof(report_timestamp), 0);
+-    if (err != USP_ERR_OK)
+-    {
++    // Exit if unable to get EncodingType
++    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.EncodingType", bp->profile_id);
++    err = DATA_MODEL_GetParameterValue(path, encoding_type, sizeof(encoding_type), 0);
++    if (err != USP_ERR_OK) {
+         return;
+     }
+ 
+-    // Exit if unable to get ReportFormat
+-    USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportFormat", bp->profile_id);
+-    err = DATA_MODEL_GetParameterValue(path, report_format, sizeof(report_format), 0);
+-    if (err != USP_ERR_OK)
+-    {
+-        return;
++    if (strcmp(encoding_type, BULKDATA_ENCODING_TYPE_JSON) == 0) {
++        // Exit if unable to get ReportTimestamp
++        USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportTimestamp", bp->profile_id);
++        err = DATA_MODEL_GetParameterValue(path, report_timestamp, sizeof(report_timestamp), 0);
++        if (err != USP_ERR_OK) {
++            return;
++        }
++
++        // Exit if unable to get ReportFormat
++        USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.JSONEncoding.ReportFormat", bp->profile_id);
++        err = DATA_MODEL_GetParameterValue(path, report_format, sizeof(report_format), 0);
++        if (err != USP_ERR_OK) {
++            return;
++        }
++    } else {
++        // Exit if unable to get FieldSeparator
++        USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.FieldSeparator", bp->profile_id);
++        err = DATA_MODEL_GetParameterValue(path, field_separator, sizeof(field_separator), 0);
++        if (err != USP_ERR_OK) {
++            return;
++        }
++
++        // Exit if unable to get RowSeparator
++        USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.RowSeparator", bp->profile_id);
++        err = DATA_MODEL_GetParameterValue(path, row_separator, sizeof(row_separator), 0);
++        if (err != USP_ERR_OK) {
++            return;
++        }
++
++        // Exit if unable to get EscapeCharacter
++        USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.EscapeCharacter", bp->profile_id);
++        err = DATA_MODEL_GetParameterValue(path, escape_char, sizeof(escape_char), 0);
++        if (err != USP_ERR_OK) {
++            return;
++        }
++
++        // Exit if unable to get ReportFormat
++        USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.ReportFormat", bp->profile_id);
++        err = DATA_MODEL_GetParameterValue(path, csv_format, sizeof(csv_format), 0);
++        if (err != USP_ERR_OK) {
++            return;
++        }
++
++        // Exit if unable to get RowTimestamp
++        USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.CSVEncoding.RowTimestamp", bp->profile_id);
++        err = DATA_MODEL_GetParameterValue(path, row_timestamp, sizeof(row_timestamp), 0);
++        if (err != USP_ERR_OK) {
++            return;
++        }
+     }
+ 
+     // When sending via USP events, only one report is ever sent in each USP event
+@@ -2354,10 +2510,16 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+     bp->num_retained_reports = 1;
+ 
+     // Exit if unable to generate the report
+-    json_report = bulkdata_generate_json_report(bp, report_timestamp, report_format);
+-    if (json_report == NULL)
++    if (strcmp(encoding_type, BULKDATA_ENCODING_TYPE_JSON) == 0) {
++        report = bulkdata_generate_json_report(bp, report_timestamp, report_format);
++    } else {
++        report = bulkdata_generate_csv_report(bp, field_separator, row_separator, escape_char,
++                                              csv_format, row_timestamp);
++    }
++
++    if (report == NULL)
+     {
+-        USP_ERR_SetMessage("%s: bulkdata_generate_json_report failed", __FUNCTION__);
++        USP_ERR_SetMessage("%s: bulkdata failed to generate report", __FUNCTION__);
+         return;
+     }
+ 
+@@ -2365,15 +2527,15 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+ 
+     // Construct event_args manually to avoid the overhead of a malloc and copy of the report in KV_VECTOR_Add()
+     kv.key = "Data";
+-    kv.value = json_report;
++    kv.value = report;
+     event_args.vector = &kv;
+     event_args.num_entries = 1;
+ 
+     USP_SNPRINTF(path, sizeof(path), "Device.BulkData.Profile.%d.Push!", bp->profile_id);
+     DEVICE_SUBSCRIPTION_ProcessAllEventCompleteSubscriptions(path, &event_args);
+ 
+-    // Free the report. No need to free the event_args as json_report is the only thing dynamically allocated in it
+-    free(json_report);      // The report is not allocated via USP_MALLOC
++    // Free the report. No need to free the event_args as report is the only thing dynamically allocated in it
++    free(report);      // The report is not allocated via USP_MALLOC
+ 
+     // From the point of view of this code, the report(s) have been successfully sent, so don't retain them
+     // NOTE: Sending of the reports successfully is delegated to the USP notification retry mechanism
+@@ -2833,6 +2995,219 @@ char *bulkdata_generate_json_report(bulkdata_profile_t *bp, char *report_timesta
+     return result;
+ }
+ 
++/*********************************************************************//**
++**
++** append_string_to_target
++**
++** concatenates the src string with target string in newly allocated memory
++** and assign back the new pointer.
++**
++** \param   str - pointer to the src string
++** \param   output - address of the pointer that points to the target string
++**
++** \return  None
++**
++**************************************************************************/
++void append_string_to_target(char *str, char **output)
++{
++    char *tmp = NULL;
++
++    if (str == NULL || strlen(str) == 0)
++        return;
++
++    if (*output == NULL || strlen(*output) == 0) {
++        *output = USP_STRDUP(str);
++        return;
++    } else {
++        tmp = USP_STRDUP(*output);
++        free(*output);
++    }
++
++    assert(tmp != NULL);
++    asprintf(output, "%s%s", tmp, str);
++    free(tmp);
++}
++
++/*********************************************************************//**
++**
++**  bulkdata_generate_csv_report
++**
++**  Generates a CSV ParameterPerRow or ParameterPerColumn format report
++**  NOTE: The report contains all retained failed reports, as well as the current report
++**  See TR-157 section A.4.2 (end) for an example, and section A.3.5.2 for layout of content containing failed report transmissions
++**
++** \param   bp - pointer to bulk data profile containing all reports (current and retained)
++** \param   field_separator - value of Device.Bulkdata.Profile.{i}.CSVEncoding.FieldSeparator
++** \param   row_separator - value of Device.Bulkdata.Profile.{i}.CSVEncoding.RowSeparator
++** \param   escape_char - value of Device.Bulkdata.Profile.{i}.CSVEncoding.EscapeCharacter
++** \param   csv_format - value of Device.BulkData.Profile.{i}.CSVEncoding.ReportFormat
++** \param   row_timestamp - value of Device.Bulkdata.Profile.{i}.CSVEncoding.RowTimestamp
++**
++** \return  pointer to NULL terminated dynamically allocated buffer containing the serialized report to send
++**
++**************************************************************************/
++char *bulkdata_generate_csv_report(bulkdata_profile_t *bp, char *field_separator, char *row_separator,
++                                   char *escape_char, char *csv_format, char *row_timestamp)
++{
++    char *param_path;
++    char *param_type_value;
++    char param_type;
++    char *param_value;
++    kv_vector_t *report_map;
++    report_t *report;
++    int i, j;
++    bool value_as_bool;
++    char buf[32];
++    kv_pair_t *kv;
++    int err;
++    char *output = NULL, *str = NULL, *str1 = NULL, *str2 = NULL, rowseparator = '\0', separator = '\0';
++
++    if (strcmp(row_separator, "
") == 0)
++        rowseparator = '\n';
++    else if (strcmp(row_separator, "
") == 0)
++        rowseparator = '\r';
++
++    if (field_separator)
++        separator = field_separator[0];
++
++    if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
++        if (strcmp(row_timestamp, "None") == 0)
++            asprintf(&str, "ParameterName%cParameterValue%cParameterType%c", separator, separator, rowseparator);
++        else
++            asprintf(&str, "ReportTimestamp%cParameterName%cParameterValue%cParameterType%c", separator, separator, separator, rowseparator);
++
++        assert(str != NULL);
++        append_string_to_target(str, &output);
++        free(str);
++        str = NULL;
++    }
++
++    for (i=0; i < bp->num_retained_reports; i++)
++    {
++        char *timestamp = NULL;
++        report = &bp->reports[i];
++        report_map = &report->report_map;
++
++        // Add Collection time to each csv report element (only if specified and not 'None')
++        if (strcmp(row_timestamp, "Unix-Epoch")==0)
++        {
++            asprintf(&timestamp, "%lld", (long long int)report->collection_time);
++        }
++        else if (strcmp(row_timestamp, "ISO-8601")==0)
++        {
++            char *result = iso8601_from_unix_time(report->collection_time, buf, sizeof(buf));
++            if (result != NULL)
++            {
++                asprintf(&timestamp, "%s", buf);
++            }
++        }
++
++        if (strcasecmp(csv_format, "ParameterPerColumn") == 0 && timestamp) {
++            append_string_to_target("ReportTimestamp", &str1);
++            append_string_to_target(timestamp, &str2);
++        }
++
++        // Iterate over each parameter, adding it to the json element. Take account of the parameter's type
++        for (j=0; j < report_map->num_entries; j++)
++        {
++            kv = &report_map->vector[j];
++            param_path = kv->key;
++            param_type_value = kv->value;
++            param_type = param_type_value[0];           // First character denotes the type of the parameter
++            param_value = &param_type_value[1];         // Subsequent characters contain the parameter's valu
++            char *type = NULL;
++            switch (param_type)
++            {
++                case 'S':
++                    type = "string";
++                    break;
++
++                case 'U':
++                    type = "unsignedInt";
++                    break;
++
++                case 'L':
++                    type = "long";
++                    break;
++
++                case 'N':
++                    type = "decimal";
++                    break;
++
++                case 'B':
++                    err = TEXT_UTILS_StringToBool(param_value, &value_as_bool);
++                    if (err == USP_ERR_OK)
++                    {
++                        type = "boolean";
++                        param_value = value_as_bool ? "True" : "False";
++                    }
++                    break;
++
++                default:
++                    USP_ERR_SetMessage("%s: Invalid JSON parameter type ('%c') in report map for %s", __FUNCTION__, param_type_value[0], param_path);
++                    break;
++            }
++
++            if (type) {
++                if (strcasecmp(csv_format, "ParameterPerRow") == 0) {
++                    if (timestamp == NULL)
++                        asprintf(&str, "%s%c%s%c%s%c", param_path, separator, param_value, separator, type, rowseparator);
++                    else
++                        asprintf(&str, "%s%c%s%c%s%c%s%c", timestamp, separator, param_path, separator, param_value, separator, type, rowseparator);
++
++                    assert(str != NULL);
++                    append_string_to_target(str, &output);
++                    free(str);
++                    str = NULL;
++                } else {
++                    if (str1 == NULL || strlen(str1) == 0)
++                        asprintf(&str, "%s", param_path);
++                    else
++                        asprintf(&str, "%c%s", separator, param_path);
++
++                    assert(str != NULL);
++                    append_string_to_target(str, &str1);
++                    free(str);
++                    str = NULL;
++
++                    if (str2 == NULL || strlen(str2) == 0)
++                        asprintf(&str, "%s", param_value);
++                    else
++                        asprintf(&str, "%c%s", separator, param_value);
++
++                    assert(str != NULL);
++                    append_string_to_target(str, &str2);
++                    free(str);
++                    str = NULL;
++                }
++            }
++        }
++
++        if (timestamp) {
++            free(timestamp);
++            timestamp = NULL;
++        }
++    }
++
++    if (strcasecmp(csv_format, "ParameterPerColumn") == 0) {
++        asprintf(&str, "%c", rowseparator);
++        assert(str != NULL);
++        append_string_to_target(str, &str1);
++        append_string_to_target(str, &str2);
++        append_string_to_target(str1, &output);
++        append_string_to_target(str2, &output);
++    }
++
++    if (str)
++        free(str);
++    if (str1)
++        free(str1);
++    if (str2)
++        free(str2);
++
++    return output;
++}
++
+ /*********************************************************************//**
+ **
+ **  bulkdata_compress_report
+@@ -2986,9 +3361,18 @@ int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_
+         flags |= BDC_FLAG_DATE_HEADER;
+     }
+ 
+-    if (strcmp(ctrl->report_format, BULKDATA_JSON_REPORT_FORMAT_OBJ_HIER) == 0)
+-    {
+-        flags |= BDC_FLAG_HEADER_OBJ_HIER;
++    if (strcmp(ctrl->encoding_type, BULKDATA_ENCODING_TYPE_JSON) == 0) {
++        if (strcmp(ctrl->report_format, BULKDATA_JSON_REPORT_FORMAT_OBJ_HIER) == 0) {
++            flags |= BDC_FLAG_HEADER_OBJ_HIER;
++        } else {
++            flags |= BDC_FLAG_HEADER_NAME_VAL;
++        }
++    } else {
++        if (strcmp(ctrl->csv_format, BULKDATA_CSV_REPORT_FORMAT_PER_COLUMN) == 0) {
++            flags |= BDC_FLAG_HEADER_PER_COL;
++        } else {
++            flags |= BDC_FLAG_HEADER_PER_ROW;
++        }
+     }
+ 
+     // Exit if failed to post a message to BDC thread

ponmngr/Makefile

@@ -39,6 +39,8 @@ ifneq ($(CONFIG_TARGET_brcmbca),)
 else ifneq ($(CONFIG_TARGET_airoha),)
 	$(CP) ./files/airoha/* $(1)/
 endif
+	$(INSTALL_DIR) $(1)/etc/bbfdm/json
+	$(CP) ./files/etc/bbfdm/json/* $(1)/etc/bbfdm/json/
 endef
 
 $(eval $(call BuildPackage,ponmngr))

ponmngr/files/airoha/lib/xpon/airoha.sh

@@ -6,6 +6,8 @@ set_serial_number() {
 	vendor_id=$1
 	vssn=$2
 
+	# Vendor id is not taken from serial automatically, propagate it as well
+	/userfs/bin/omcicfgCmd set vendorId ${vendor_id}
 	/userfs/bin/omcicfgCmd set sn ${vendor_id}${vssn}
 }
 

port-management/Makefile

@@ -1,31 +0,0 @@
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=port-management
-PKG_VERSION:=1.1.0
-PKG_RELEASE:=1
-PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
-PKG_LICENSE:=GPL-2.0-only
-include $(INCLUDE_DIR)/package.mk
-
-define Package/port-management
-  CATEGORY:=Utilities
-  TITLE:=Port management tool
-endef
-
-define Package/port-management/description
-	Port configuration utility
-endef
-
-define Build/Prepare
-	mkdir -p $(PKG_BUILD_DIR)
-	$(CP) ./files/* $(PKG_BUILD_DIR)/
-endef
-
-define Build/Compile
-endef
-
-define Package/port-management/install
-	$(CP) ./files/* $(1)/
-endef
-
-$(eval $(call BuildPackage,port-management))

qosmngr/Makefile

@@ -6,12 +6,12 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=qosmngr
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=e3d608e4bacd367fed99bcdd7f56b3fba7b02891
+PKG_SOURCE_VERSION:=56ebfed11f8f2eb376afda02ebac929c5ad4ee9b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/qosmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
@@ -27,7 +27,7 @@ define Package/qosmngr
   SECTION:=utils
   CATEGORY:=Utilities
   TITLE:=QoS Manager
-  DEPENDS:=@(TARGET_brcmbca||TARGET_airoha) +libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos
+  DEPENDS:=+libuci +libubox +libubus +libblobmsg-json +libjson-c +libqos +!(TARGET_brcmbca||TARGET_airoha):tc-full
 endef
 
 define Package/qosmngr/description
@@ -40,24 +40,17 @@ define Build/Prepare
 endef
 endif
 
-define Package/qosmngr/install/common
+define Package/qosmngr/install
 	$(CP) ./files/common/* $(1)/
-	$(INSTALL_DIR) $(1)/usr
+ifneq ($(CONFIG_TARGET_brcmbca),)
+	$(CP) ./files/broadcom/* $(1)/
+else ifneq ($(CONFIG_TARGET_airoha),)
+	$(CP) ./files/airoha/* $(1)/
+else
+	$(CP) ./files/linux/* $(1)/
+endif
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/qosmngr $(1)/usr/sbin
 endef
 
-ifeq ($(CONFIG_TARGET_brcmbca),y)
-define Package/qosmngr/install
-	$(CP) ./files/broadcom/* $(1)/
-	$(call Package/qosmngr/install/common,$(1))
-endef
-endif
-
-ifeq ($(CONFIG_TARGET_airoha),y)
-define Package/qosmngr/install
-	$(CP) ./files/airoha/* $(1)/
-	$(call Package/qosmngr/install/common,$(1))
-endef
-endif
 $(eval $(call BuildPackage,qosmngr))

qosmngr/files/airoha/etc/uci-defaults/60-qos_config_generate

@@ -4,6 +4,18 @@
 
 ethwan="$(db -q get hw.board.ethernetWanPort)"
 
+populate_no_of_queue(){
+    queue_num=8
+
+    # writing no. of queue per port into file and read on classify generate
+    if [ ! -d "/tmp/qos" ]; then
+	    mkdir -p "/tmp/qos"
+    fi
+    no_queue_file="/tmp/qos/no_queue_per_port"
+    touch "$no_queue_file"
+    echo $queue_num >"$no_queue_file"
+}
+
 generate_queue(){
     section="$1"
 
@@ -14,7 +26,7 @@ generate_queue(){
     fi
 
     # guaranteed number of queues
-    no_of_q="0 1 2 3"
+    no_of_q="0 1 2 3 4 5 6 7"
 
     i=0
     local total_q=$((${no_of_q##* } + 1))
@@ -34,15 +46,19 @@ generate_queue(){
     uci commit qos
 }
 
+populate_no_of_queue
+
 if [ -s "/etc/config/qos" ]; then
     if uci -q get qos.@queue[0] >/dev/null; then
-        # return if there is any valid content
-        exit
+	# return if there is any valid content
+	exit
     else
-        rm -f /etc/config/qos
+	rm -f /etc/config/qos
     fi
 fi
 touch /etc/config/qos
 
+# generate qos queue config
 config_load ports
 config_foreach generate_queue ethport
+

qosmngr/files/airoha/lib/qos/airoha.sh

@@ -27,7 +27,6 @@ hw_intf_init() {
 # Initialize the hardware setup library
 hw_init_all() {
     export TMP_HW_QUEUE_LIST=""
-    export TMP_HW_QUEUE_MASK="0"
     return 0
 }
 
@@ -58,7 +57,10 @@ hw_queue_set() {
     export TMP_HW_QUEUE_${order}_rate="${rate}"
     export TMP_HW_QUEUE_${order}_burstsize="${burstsize}"
     export TMP_HW_QUEUE_LIST="${TMP_HW_QUEUE_LIST} ${order}"
-    export TMP_HW_QUEUE_MASK="$((TMP_HW_QUEUE_MASK | 1 << index))"
+
+    if [ "${rate}" != "" ] && [ $(($rate != 0)) ] ; then
+        errmsg "Per-queue shape rate is not implemented"
+    fi
 
     return 0
 }
@@ -146,8 +148,8 @@ hw_commit_all() {
     local weight_list=""
     local glob_alg=""
     local shape_rate="$TMP_HW_SHAPE_RATE"
-    local queue_mask="$TMP_HW_QUEUE_MASK"
     local q_count="0"
+    local mac_qos_flag=""
 
     # Reorder queues
     for q in ${sorted_list} ; do
@@ -163,28 +165,37 @@ hw_commit_all() {
 
         case "${sc_alg}" in
             WRR)
-                if [ $(($q_count >= 4)) != 0 ] ; then
+                if [ $(($q_count >= 8)) != 0 ] ; then
                     errmsg "Too many queues, next queues will be ignored"
                 else
                     weight_list="$weight_list $wgt"
                 fi
-                q_count=$((q_count + 1))
                 ;;
         esac
+
+        q_count=$((q_count + 1))
     done
 
-    if [ "${glob_alg}" == "WRR" ] ; then
-        while [ $((q_count < 4)) != 0 ] ; do
-            weight_list="$weight_list 1"
-            q_count=$((q_count + 1))
-        done
-    fi
+    case "${glob_alg}" in
+        WRR)
+            mac_qos_flag="8QWRR"
+            while [ $((q_count < 8)) != 0 ] ; do
+                weight_list="$weight_list 1"
+                q_count=$((q_count + 1))
+            done
+            ;;
+        SP)
+            mac_qos_flag="8QPQ"
+            q_count="8"
+            ;;
+    esac
 
     if [ "${glob_alg}" != "" ] ; then
         /userfs/bin/qosrule discpline $(hw_sc_alg2str ${glob_alg}) ${weight_list} \
-                            ${shape_rate:+uplink-bandwidth} $shape_rate \
-                            queuemask $queue_mask
+                            uplink-bandwidth ${shape_rate:-10000000} \
+                            queuemask "$(((1 << q_count) - 1))"
+        echo ${mac_qos_flag} > /proc/qdma_wan/mac_qos_flag
     else
-        /userfs/bin/qosrule discpline off
+        /userfs/bin/qosrule discpline Enable 0
     fi
 }

qosmngr/files/airoha/lib/qos/common/chains.ebtables.sh

@@ -117,9 +117,9 @@ broute_filter_on_vid() {
 }
 
 broute_rule_set_traffic_class() {
-    BR_RULE="$BR_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
+    BR_RULE="$BR_RULE -j mark --mark-or 0x${1}0 --mark-target ACCEPT"
     if [ -n "$BR6_RULE" ]; then
-        BR6_RULE="$BR6_RULE -j mark --mark-or 0x$1 --mark-target ACCEPT"
+        BR6_RULE="$BR6_RULE -j mark --mark-or 0x${1}0 --mark-target ACCEPT"
     fi
 }
 

qosmngr/files/airoha/lib/qos/common/classify.sh

@@ -1,21 +1,66 @@
 #!/bin/sh
 # Common classifier library
 
-# Handle classify section
-handle_classify() {
-    cid="$1" #classify section ID
+#counter variable to assign classify order value if not added in config
+temp_order=1
 
-    config_get is_enable "$cid" "enable"
+# Function to handle a classify order
+handle_classify_order() {
+    local cid="$1" #classify section ID
+
+    config_get is_enable "$cid" "enable" 1
     # no need to configure disabled classify rules
-    if [ -z "$is_enable" ] || [ "$is_enable" == "0" ]; then
+    if [ "$is_enable" == "0" ]; then
         return
     fi
 
-    handle_ebtables_rules "$cid"
-    handle_iptables_rules "$cid"
-    handle_policer_rules "$cid"
+    # Create classify file containing classify order
+    local corder_file="/tmp/qos/classify.order"
+
+    config_get c_order "$cid" "order"
+
+    if [ -z "$c_order" ]; then
+        c_order=$temp_order;
+        temp_order=$((temp_order + 1))
+    fi
+
+    value=${c_order}_${cid}
+    echo $value >> $corder_file
 }
 
+# Sort classify, lower value in uci means higher precedence, so this
+# function sorts the classify order in assending order
+sort_classify_by_order() {
+    local corder_file="/tmp/qos/classify.order"
+    local tmp_corder_file="/tmp/qos/tmp_classify.order"
+
+    sort -n -k1 $corder_file > $tmp_corder_file
+    cp $tmp_corder_file $corder_file
+    rm -f $tmp_corder_file
+}
+
+# Handle classify section
+handle_classify() {
+
+    local corder_file="/tmp/qos/classify.order"
+
+    while read -r line; do
+        line_cid=$(echo $line | cut -d '_' -f 2)
+
+        # add ip rule only for classify rules which has non empty
+        # value forwarding policy option
+        # if forwarding policy option value empty then add iptables/
+        # ip6tables/ebtables/rate_limit rules
+        config_get fwding_policy "$line_cid" "forwarding_policy"
+        if [ -n "$fwding_policy" ]; then
+            handle_ip_rule $line_cid $fwding_policy
+        else
+            handle_ebtables_rules $line_cid
+	    handle_iptables_rules $line_cid
+	    handle_policer_rules $line_cid
+        fi
+    done < "$corder_file"
+}
 
 # Configure classifier based on UCI subtree 'qos.classify'
 configure_classify() {
@@ -24,21 +69,34 @@ configure_classify() {
     rm -f /tmp/qos/classify.ebtables
     rm -f /tmp/qos/classify.iptables
     rm -f /tmp/qos/classify.ip6tables
+    rm -f /tmp/qos/classify.order
+    rm -f /tmp/qos/tmp_classify.order
+    rm -f /tmp/qos/classify.iprule
 
     # Create files that will contain the rules if not present already
     mkdir -p /tmp/qos/
     touch /tmp/qos/classify.iptables
     touch /tmp/qos/classify.ip6tables
     touch /tmp/qos/classify.ebtables
+    touch /tmp/qos/classify.order
+    touch /tmp/qos/tmp_classify.order
+    touch /tmp/qos/classify.iprule
 
     # Add flush chain rules
     flush_chains
 
+    #flush added ip rule
+    flush_ip_rule
+
     # Load UCI file
     config_load qos
-    config_foreach handle_classify classify
+    config_foreach handle_classify_order classify
+    sort_classify_by_order
+    handle_classify
 
     sh /tmp/qos/classify.ebtables
     sh /tmp/qos/classify.iptables
     sh /tmp/qos/classify.ip6tables
-}
+    sh /tmp/qos/classify.iprule
+
+}

qosmngr/files/airoha/lib/qos/common/policer.sh

@@ -80,10 +80,10 @@ handle_policer() {
     local p_sec="$1" # policer section ID
     local dir=1 # default direction, upstream
 
-    config_get is_enable "$p_sec" "enable"
+    config_get is_enable "$p_sec" "enable" 1
 
     # No need to configure disabled policer
-    if [ -z "$is_enable" ] || [ "$is_enable" == "0" ] ; then
+    if [ "$is_enable" == "0" ] ; then
         return
     fi
 

qosmngr/files/airoha/lib/qos/common/queue.sh

@@ -18,10 +18,10 @@ handle_queue() {
     local qid="$1" #queue section ID
     local intf_name="$2"
 
-    config_get is_enable "$qid" "enable"
+    config_get is_enable "$qid" "enable" 1
 
     # no need to configure disabled queues
-    if [ -z "${is_enable}" ] || [ "${is_enable}" == "0" ]; then
+    if [ "${is_enable}" == "0" ]; then
         return
     fi
 

qosmngr/files/airoha/lib/qos/common/shaper.sh

@@ -7,9 +7,9 @@
 handle_shaper() {
     sid="$1" #queue section ID
 
-    config_get is_enable "$sid" "enable"
+    config_get is_enable "$sid" "enable" 1
     # no need to configure disabled queues
-    if [ -z "${is_enable}" ] || [ "${is_enable}" == "0" ] ; then
+    if [ "${is_enable}" == "0" ] ; then
         return
     fi
 

qosmngr/files/airoha/lib/qos/qos.sh

@@ -2,7 +2,7 @@
 # The entrypoint for the QoS setup library
 
 . /lib/functions.sh
-. /lib/network/port.sh
+include /lib/ethernet
 
 . /lib/qos/common/chains.sh
 . /lib/qos/common/chains.ebtables.sh
@@ -12,6 +12,7 @@
 . /lib/qos/common/queue.sh
 . /lib/qos/common/shaper.sh
 . /lib/qos/airoha.sh
+. /lib/qos/ip_rule.sh
 
 configure_qos() {
     # queue configuration is being done after shaper configuration,

qosmngr/files/broadcom/etc/uci-defaults/60-qos_config_generate

@@ -0,0 +1,75 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+ethwan="$(db -q get hw.board.ethernetWanPort)"
+cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"
+
+queue_num=8
+
+populate_no_of_queue(){
+	case $cpu_model in
+		BCM68[3,4,5]*) queue_num=4 ;;
+	esac
+        if grep -qE '[0-9]+ archer$' /proc/devices; then
+                queue_num=4
+        fi
+
+	# writing no. of queue per port into file and read on classify generate
+	if [ ! -d "/tmp/qos" ]; then
+		mkdir -p "/tmp/qos"
+	fi
+	no_queue_file="/tmp/qos/no_queue_per_port"
+	touch "$no_queue_file"
+	echo $queue_num >"$no_queue_file"
+}
+
+generate_queue(){
+	section="$1"
+
+	config_get ifname "$section" "ifname"
+
+	local is_lan=0
+	if [ "$ifname" != "$ethwan" ]; then
+		is_lan=1
+	fi
+
+	local no_of_q="0 1 2 3 4 5 6 7"
+
+	if [ $is_lan -eq 1 ] -a [ $queue_num -eq 4 ]; then
+		no_of_q="0 1 2 3"
+	fi
+
+	i=0
+	local total_q=$((${no_of_q##* } + 1))
+        for i in $no_of_q; do
+		order=$((total_q - i))
+		uci add qos queue
+		uci rename qos.@queue[-1]="q_${i}_${ifname}"
+		uci set qos.@queue[-1].enable="1"
+		uci set qos.@queue[-1].ifname="$ifname"
+		uci set qos.@queue[-1].precedence="$order"
+		uci set qos.@queue[-1].scheduling="SP"
+		uci set qos.@queue[-1].rate="0"
+		uci set qos.@queue[-1].burst_size="0"
+		uci set qos.@queue[-1].weight="1"
+	done
+
+	uci commit qos
+}
+
+populate_no_of_queue
+
+if [ -s "/etc/config/qos" ]; then
+	if uci -q get qos.@queue[0] >/dev/null; then
+		exit
+	else
+		rm -f /etc/config/qos
+	fi
+fi
+touch /etc/config/qos
+
+# generate qos queue config
+config_load ports
+config_foreach generate_queue ethport
+

qosmngr/files/broadcom/lib/qos/qos.sh

@@ -1,6 +1,9 @@
 #!/bin/sh
 . /lib/functions.sh
-. /lib/network/port.sh
+include /lib/ethernet
+
+# include common code
+. /lib/qos/ip_rule.sh
 
 IP_RULE=""
 BR_RULE=""
@@ -809,7 +812,7 @@ handle_iptables_rules() {
 
 	init_iptables_rule
 	config_get proto "$cid" "proto"
-	config_get traffic_class "$sid" "traffic_class"
+	config_get traffic_class "$cid" "traffic_class"
 	config_get dscp_mark "$cid" "dscp_mark"
 	config_get dscp_filter "$cid" "dscp_filter"
 	config_get dest_port "$cid" "dest_port"
@@ -929,21 +932,12 @@ assign_policer_to_port() {
 	local ifname="$1"
 	local pindex="$2"
 	local portorder="$(db -q get hw.board.ethernetPortOrder)"
-	local wanport="$(db -q get hw.board.ethernetWanPort)"
-	local runner_lan_ports="$(bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/examine port | grep ': port/index=lan' | sed -e 's#\.##g' | cut -f2 -d' ' | sort -u | xargs)"
-	local i=1
 
 	for port in $portorder; do
 		if [ "$ifname" == "$port" ]; then
-			if [ "$wanport" == "$port" ]; then
-				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
-			else
-				local lanport="$(echo -n "$runner_lan_ports" | cut -f${i} -d' ')"
-				bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure $lanport ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
-			fi
+			bdmf_shell -c `cat /var/bdmf_sh_id` -cmd /b/configure port/name=$port ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
 			break
 		fi
-		i=$((i+1))
 	done
 }
 
@@ -1060,21 +1054,24 @@ sort_classify_by_order() {
 
 #function to handle a classify section
 handle_classify() {
-	cid="$1" #classify section ID
 
-	config_get is_enable "$cid" "enable"
-	# no need to configure disabled classify rules
-	if [ "$is_enable" == '0' ]; then
-		return
-	fi
 	local corder_file="/tmp/qos/classify.order"
 
 	while read -r line; do
-		line_cid=${line: 2}
+		line_cid=${line#*_}
 
-	        handle_ebtables_rules $line_cid
-	        handle_iptables_rules $line_cid
-	        handle_policer_rules $line_cid
+		# add ip rule only for classify rules which has non empty
+		# value forwarding policy option
+		# if forwarding policy option value empty then add iptables/
+		# ip6tables/ebtables/rate_limit rules
+		config_get fwding_policy "$line_cid" "forwarding_policy"
+		if [ -n "$fwding_policy" ]; then
+			handle_ip_rule $line_cid $fwding_policy
+		else
+			handle_ebtables_rules $line_cid
+			handle_iptables_rules $line_cid
+			handle_policer_rules $line_cid
+		fi
 	done < "$corder_file"
 }
 
@@ -1097,6 +1094,7 @@ configure_classify() {
 	rm -f /tmp/qos/classify.ip6tables
         rm -f /tmp/qos/classify.order
         rm -f /tmp/qos/tmp_classify.order
+	rm -f /tmp/qos/classify.iprule
 
 	#create files that will contain the rules if not present already
 	mkdir -p /tmp/qos/
@@ -1105,19 +1103,25 @@ configure_classify() {
 	touch /tmp/qos/classify.ebtables
         touch /tmp/qos/classify.order
         touch /tmp/qos/tmp_classify.order
+	touch /tmp/qos/classify.iprule
 
 	#add flush chain rules
 	flush_chains
 
+	#flush added ip rule
+	flush_ip_rule
+
 	# Load UCI file
 	config_load qos
 	config_foreach handle_classify_order classify
 	sort_classify_by_order
-	handle_classify classify
+	handle_classify
 
 	sh /tmp/qos/classify.ebtables
 	sh /tmp/qos/classify.iptables
 	sh /tmp/qos/classify.ip6tables
+	sh /tmp/qos/classify.iprule
+
 	# broadcom recommends that each time traffic class is set,
 	# the flows should be flushed for the new mapping to take
 	# effect, it then makes sense to make it a part of the
@@ -1218,7 +1222,6 @@ configure_qos() {
 
 reload_qos() {
 	local service_name="$1"
-	local cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"
 
 	if [ -z "$service_name" ]; then
 		configure_qos

qosmngr/files/common/etc/uci-defaults/61-qos_classify_generate

@@ -0,0 +1,120 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+classify_no=0
+generate_dns_rule(){
+	classify_no=$((classify_no + 1))
+	uci add qos classify
+	uci rename qos.@classify[-1]="c${classify_no}"
+	uci set qos.@classify[-1].ifname="lo"
+	uci set qos.@classify[-1].proto="udp"
+	uci set qos.@classify[-1].ethertype="IPv4"
+	uci set qos.@classify[-1].dest_port="53"
+	uci set qos.@classify[-1].traffic_class="$1"
+	uci set qos.@classify[-1].order="$classify_no"
+}
+
+generate_dhcp_rule(){
+	classify_no=$((classify_no + 1))
+	uci add qos classify
+	uci rename qos.@classify[-1]="c${classify_no}"
+	uci set qos.@classify[-1].ifname="lo"
+	uci set qos.@classify[-1].proto="udp"
+	uci set qos.@classify[-1].ethertype="IPv4"
+	uci set qos.@classify[-1].dest_port="67"
+	uci set qos.@classify[-1].dest_port_range="68"
+	uci set qos.@classify[-1].traffic_class="$1"
+	uci set qos.@classify[-1].order="$classify_no"
+}
+
+generate_igmp_rule(){
+	classify_no=$((classify_no + 1))
+	uci add qos classify
+	uci rename qos.@classify[-1]="c${classify_no}"
+	uci set qos.@classify[-1].ifname="lo"
+	uci set qos.@classify[-1].proto="IGMP"
+	uci set qos.@classify[-1].ethertype="IPv4"
+	uci set qos.@classify[-1].traffic_class="$1"
+	uci set qos.@classify[-1].order="$classify_no"
+}
+
+generate_icmp_rule(){
+	classify_no=$((classify_no + 1))
+	uci add qos classify
+	uci rename qos.@classify[-1]="c${classify_no}"
+	uci set qos.@classify[-1].ifname="lo"
+	uci set qos.@classify[-1].proto="icmp"
+	uci set qos.@classify[-1].ethertype="IPv4"
+	uci set qos.@classify[-1].traffic_class="$1"
+	uci set qos.@classify[-1].order="$classify_no"
+
+	classify_no=$((classify_no + 1))
+	uci add qos classify
+	uci rename qos.@classify[-1]="c${classify_no}"
+	uci set qos.@classify[-1].proto="icmp"
+	uci set qos.@classify[-1].ethertype="IPv4"
+	uci set qos.@classify[-1].traffic_class="$2"
+	uci set qos.@classify[-1].order="$classify_no"
+}
+
+generate_classify(){
+
+
+	no_queue_file="/tmp/qos/no_queue_per_port"
+	queue_num=$(cat "$no_queue_file")
+	rm -f "$no_queue_file"
+
+	# assign queue type
+	if [ $queue_num -eq 8 ]; then
+		q_def_queue="0"
+		q_low="1"
+		q_besteffort="2"
+		q_normal="3"
+		q_video="4"
+		q_medium="5"
+		q_high="6"
+		q_highest="7"
+	elif [ $queue_num -eq 4 ]; then
+		q_def_queue="0"
+		q_normal="1"
+		q_medium="2"
+		q_highest="3"
+	fi
+
+	# Local generated DNS traffic goes to q_highest
+	generate_dns_rule $q_highest
+	# Local generated IGMP traffic goes to q_highest
+	generate_igmp_rule $q_highest
+	# Local generated DHCP traffic goes to q_highest
+	generate_dhcp_rule $q_highest
+	# Local generated ICMP traffic goes to q_highest rotue as q_normal
+	generate_icmp_rule $q_highest $q_normal
+
+	# VLAN priority tag -> Queue priority
+	for i in `seq 1 7`; do
+		classify_no=$((classify_no + 1))
+		uci add qos classify
+		uci rename qos.@classify[-1]="c${classify_no}"
+		uci set qos.@classify[-1].pcp_check="$i"
+		uci set qos.@classify[-1].traffic_class="$i"
+		uci set qos.@classify[-1].order="$classify_no"
+	done
+
+	uci commit qos
+}
+
+if [ -s "/etc/config/qos" ]; then
+	# cleaning up for upgrade same version that contain firewall.qos
+	if [ -s "/etc/firewall.qos" ]; then
+		rm -f "/etc/firewall.qos"
+		if [ -s "/etc/config/firewall" ]; then
+			uci delete firewall.qos
+		fi
+                generate_classify
+	elif uci -q get qos.@classify[0] >/dev/null; then
+		exit
+	else
+                generate_classify
+	fi
+fi

qosmngr/files/common/lib/qos/ip_rule.sh

@@ -0,0 +1,110 @@
+#!/bin/sh
+# add ip rule from qos uci
+
+IP_RULE=""
+
+init_ip_rule() {
+        IP_RULE=""
+}
+
+ip_rule_match_inif() {
+        IP_RULE="$IP_RULE iif $1"
+}
+
+ip_rule_match_proto() {
+        IP_RULE="$IP_RULE ipproto $1"
+}
+
+ip_rule_match_dest_port() {
+        IP_RULE="$IP_RULE dport $1"
+}
+
+ip_rule_match_src_port() {
+        IP_RULE="$IP_RULE sport $1"
+}
+
+ip_rule_match_dest_ip() {
+        IP_RULE="$IP_RULE to $1"
+}
+
+ip_rule_match_src_ip() {
+        IP_RULE="$IP_RULE from $1"
+}
+
+ip_rule_match_dest_port_range() {
+        IP_RULE="$IP_RULE dport $1-$2"
+}
+
+ip_rule_match_src_port_range() {
+        IP_RULE="$IP_RULE sport $1-$2"
+}
+
+ip_rule_match_tos() {
+	IP_RULE="$IP_RULE tos $1"
+}
+
+ip_rule_match_fwmark() {
+        IP_RULE="$IP_RULE fwmark $1"
+}
+
+handle_ip_rule() {
+	cid=$1
+	fwding_policy=$2
+
+	init_ip_rule
+
+	# get uci value for selector/match
+	config_get dest_ip "$cid" "dest_ip"
+	config_get src_ip "$cid" "src_ip"
+	config_get ifname "$cid" "ifname"
+	config_get proto "$cid" "proto"
+	config_get tos "$cid" "dscp_filter"
+	config_get fwmark "$cid" "traffic_class"
+	config_get dest_port "$cid" "dest_port"
+	config_get dest_port_range "$cid" "dest_port_range"
+	config_get src_port "$cid" "src_port"
+	config_get src_port_range "$cid" "src_port_range"
+
+	# forming selector/match for rule
+	[ -n "$ifname" ] && ip_rule_match_inif $ifname
+
+	[ -n "$proto" ] && ip_rule_match_proto $proto
+
+	if [ -n "$src_port" -a -z "$src_port_range" ]; then
+		ip_rule_match_src_port $src_port
+	fi
+
+	if [ -n "$dest_port" -a -z "$dest_port_range" ]; then
+		ip_rule_match_dest_port $dest_port
+	fi
+
+	[ -n "$src_ip" ] && ip_rule_match_src_ip $src_ip
+
+	[ -n "$dest_ip" ] && ip_rule_match_dest_ip $dest_ip
+
+	if [ -n "$dest_port" -a -n "$dest_port_range" ]; then
+		ip_rule_match_dest_port_range $dest_port $dest_port_range
+	fi
+
+	if [ -n "$src_port" -a -n "$src_port_range" ]; then
+		ip_rule_match_src_port_range $src_port $src_port_range
+	fi
+
+	[ -n "$tos" ] && ip_rule_match_tos $tos
+
+	[ -n "$fwmark" ] && ip_rule_match_fwmark  $fwmark
+
+	# forming full ip rule
+	if [ -n "$IP_RULE" ]; then
+		echo "ip rule add $IP_RULE table $fwding_policy" >> /tmp/qos/classify.iprule
+		echo "ip rule del $IP_RULE table $fwding_policy" >> /tmp/qos/classify.del_iprule
+	fi
+}
+
+flush_ip_rule() {
+	if [ -s "/tmp/qos/classify.del_iprule" ]; then
+		sh /tmp/qos/classify.del_iprule
+		rm -f /tmp/qos/classify.del_iprule
+	fi
+	touch /tmp/qos/classify.del_iprule
+}

qosmngr/files/linux/etc/uci-defaults/60-qos_config_generate

@@ -3,30 +3,26 @@
 . /lib/functions.sh
 
 ethwan="$(db -q get hw.board.ethernetWanPort)"
-cpu_model="$(cat /proc/socinfo  | grep 'SoC Name' | cut -d':' -f2)"
+
+populate_no_of_queue(){
+    queue_num=8
+
+    # writing no. of queue per port into file and read on classify generate
+    if [ ! -d "/tmp/qos" ]; then
+            mkdir -p "/tmp/qos"
+    fi
+    no_queue_file="/tmp/qos/no_queue_per_port"
+    touch "$no_queue_file"
+    echo $queue_num >"$no_queue_file"
+}
 
 generate_queue(){
 	section="$1"
 
 	config_get ifname "$section" "ifname"
 
-	local is_lan=0
-	if [ "$ifname" != "$ethwan" ]; then
-		is_lan=1
-	fi
-
 	local no_of_q="0 1 2 3 4 5 6 7"
 
-        if [ $is_lan -eq 1 ]; then
-		case $cpu_model in
-			BCM68*) no_of_q="0 1 2 3" ;;
-		esac
-
-                if grep -qE '[0-9]+ archer$' /proc/devices; then 
-                        no_of_q="0 1 2 3" 
-                fi 
-	fi
-
 	i=0
 	local total_q=$((${no_of_q##* } + 1))
         for i in $no_of_q; do
@@ -37,14 +33,16 @@ generate_queue(){
 		uci set qos.@queue[-1].ifname="$ifname"
 		uci set qos.@queue[-1].precedence="$order"
 		uci set qos.@queue[-1].scheduling="SP"
-		uci set qos.@queue[-1].rate="0"
-		uci set qos.@queue[-1].burst_size="0"
+		uci set qos.@queue[-1].rate="1000000"
+		uci set qos.@queue[-1].burst_size="1500"
 		uci set qos.@queue[-1].weight="1"
 	done
 
 	uci commit qos
 }
 
+populate_no_of_queue
+
 if [ -s "/etc/config/qos" ]; then
 	if uci -q get qos.@queue[0] >/dev/null; then
 		# return if there is any valid content