qosmngr : QoS UCI updated

latest patch to resolve precedence issue causes regression.
Bug: queues for any port not configured at boot
fix: create the folders which store queue precedence

bbf/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libbbfdm
-PKG_VERSION:=2.4-2020-09-29
+PKG_VERSION:=3.1-2020-12-03
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/bbf.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b20b69273697eaf6c5c80b3ac7468b04d12dff77
+PKG_SOURCE_VERSION:=67389689539e72411eb246527c5db9fc124c1a14
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)

easy-soc-libs/Makefile

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

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=5.0-2020-09-29
+PKG_VERSION:=5.0-2020-11-26
 PKG_FIXUP:=autoreconf
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/icwmp.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2366020f504cccf64d2c11067ad2e97704c943a8
+PKG_SOURCE_VERSION:=772cafc55b332555ab1c73180ccd420054823df5
 PKG_RELEASE=$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
@@ -40,14 +40,6 @@ define Package/icwmp-tr098
   DEPENDS:=+PACKAGE_icwmp-tr098:libuci +PACKAGE_icwmp-tr098:libmicroxml +PACKAGE_icwmp-tr098:libubox +PACKAGE_icwmp-tr098:jshn +PACKAGE_icwmp-tr098:libubus +PACKAGE_icwmp-tr098:libblobmsg-json +PACKAGE_icwmp-tr098:libpthread +PACKAGE_icwmp-tr098:ubusd +PACKAGE_icwmp-tr098:shflags +PACKAGE_icwmp-tr098:getopt +PACKAGE_icwmp-tr098:zlib +PACKAGE_icwmp-tr098:libjson-c +PACKAGE_icwmp-tr098:libopenssl +PACKAGE_icwmp-tr098:curl +PACKAGE_icwmp-tr098:libcurl +PACKAGE_icwmp-tr098:libtr098
 endef
 
-define Package/icwmp-notifd
-  SECTION:=utils
-  CATEGORY:=Utilities
-  SUBMENU:=TRx69
-  TITLE:=CWMP Active Notifications Detect tool
-  DEPENDS:=+libubox +libuci +libbbfdm +libjson-c +libubus +libblobmsg-json
-endef
-
 define Package/$(PKG_NAME)
   SECTION:=utils
   CATEGORY:=Utilities
@@ -79,11 +71,6 @@ CONFIGURE_ARGS += \
 	--enable-icwmp_tr098
 endif
 
-ifeq ($(CONFIG_PACKAGE_icwmp-notifd),y)
-CONFIGURE_ARGS += \
-	--enable-icwmp_notifd
-endif
-
 ifneq ($(CWMP_REVISION)_,_)
 ifneq ($(CWMP_REVISION),exported)
 ifneq ($(CWMP_REVISION),Unversioned directory)
@@ -140,11 +127,6 @@ define Package/icwmp-tr098/install
 	$(CP) $(PKG_BUILD_DIR)/bin/icwmp_tr098d $(1)/usr/sbin
 endef
 
-define Package/icwmp-notifd/install
-	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bin/icwmp_notifd $(1)/usr/sbin/icwmp_notifd
-endef
-
 define Package/$(PKG_NAME)/postinst
 	#!/bin/sh
 	if [ -z "$${IPKG_INSTROOT}" ]; then
@@ -165,4 +147,3 @@ endef
 
 $(eval $(call BuildPackage,$(PKG_NAME)))
 $(eval $(call BuildPackage,icwmp-tr098))
-$(eval $(call BuildPackage,icwmp-notifd))

icwmp/files/etc/config/cwmp

@@ -38,7 +38,8 @@ config cpe 'cpe'
 	option notification '1'
 	option datamodel 'tr181'
 	option exec_download '0'
-	option polling_period '5'
+	option periodic_notify_enable '1'
+	option periodic_notify_interval '10'
 	
 config lwn 'lwn'
 	option enable '1'

icwmp/files/etc/init.d/icwmpd

@@ -10,7 +10,6 @@ STOP=10
 
 USE_PROCD=1
 PROG="/usr/sbin/icwmpd"
-PROG098="/usr/sbin/icwmp_tr098d"
 
 EXTRA_COMMANDS="notify"
 EXTRA_HELP="	start	[GetRPCMethods] Start icwmpd service and send GetRPCMethods"
@@ -196,11 +195,7 @@ start_service() {
 		get_acs_url
 
 		procd_open_instance
-		if [ "$(uci -q get cwmp.cpe.datamodel)" == "tr098" ]; then
-			procd_set_param command "$PROG098"
-		else
-			procd_set_param command "$PROG"
-		fi
+		procd_set_param command "$PROG"
 		if [ "$1" = "GetRPCMethods" ];then
 			procd_append_param command -g
 		elif [ -f /etc/icwmpd/.icwmpd_boot ]; then
@@ -208,11 +203,9 @@ start_service() {
 		fi
 		procd_set_param respawn "3" "7" "0"
 		procd_close_instance
-		procd_open_instance
-			if [ "$(uci -q get cwmp.cpe.notification)" == "1" ]; then                                                  
-			        procd_append_param command "/usr/sbin/icwmp_notifd"                                 
-			fi
-		procd_close_instance
+		#procd_open_instance
+		#[ "$(uci -q get cwmp.cpe.notification)" == "1" ] && procd_append_param command "/usr/sbin/icwmp_notifd"
+		#procd_close_instance
 	fi
 }
 
@@ -227,11 +220,5 @@ notify() {
 
 service_triggers() {
 	procd_add_config_trigger "config.change" "cwmp"  /etc/init.d/icwmpd reload
-        if [ "$(uci -q get cwmp.cpe.notification)" == "1" ]; then
-		for conf in $(ls /etc/config/); do
-			[ "$conf" == "cwmp" ] && continue
-			procd_add_config_trigger "config.change" "$conf" /etc/init.d/icwmpd notify
-		done
-	fi
 }
 

icwmp/files/lib/upgrade/post-rootfs-fixup.d/215-icwmp

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+# As part of sysupgrade we copy CWMP Backup Session XML file.
+
+
+# Abort on any error.
+set -e
+
+
+# Do nothing if user want to discard old settings.
+if [ -n "$SAVE_CONFIG" ] && [ $SAVE_CONFIG -eq 0 ]; then
+	exit 0
+fi
+
+# Source functions.
+for f in /lib/upgrade/iopsys*.sh; do
+	[ -r "$f" -a -s "$f" ] || continue
+	source $f
+done
+
+
+if [ -s "${2}/etc/icwmpd/.icwmpd_backup_session.xml" ]; then
+	cat "${2}/etc/icwmpd/.icwmpd_backup_session.xml" > "/etc/icwmpd/.icwmpd_backup_session.xml"
+fi
+
+# Report success.
+log "post-hooks" "CWMP Backup Session XML file migrated"
+
+exit 0

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=2.0.28
+PKG_VERSION:=2.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=6b4c4d8ed7095ba23add4694ac01d80c7b68899d
+PKG_SOURCE_VERSION:=a0bcdb6eb791f5bebff4dc9024b99f51d00ed53b
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif

iop/config

@@ -7,6 +7,8 @@ CONFIG_PACKAGE_6in4=y
 CONFIG_PACKAGE_6rd=y
 CONFIG_PACKAGE_6to4=y
 CONFIG_PACKAGE_alsa-lib=y
+CONFIG_PACKAGE_atftp=m
+CONFIG_PACKAGE_atftpd=m
 CONFIG_PACKAGE_bulkdata=y
 CONFIG_PACKAGE_chat=y
 CONFIG_PACKAGE_comgt=y
@@ -15,8 +17,6 @@ CONFIG_PACKAGE_comgt-ncm=y
 CONFIG_PACKAGE_ddns-scripts=y
 CONFIG_PACKAGE_ds-lite=y
 CONFIG_PACKAGE_ethtool=y
-CONFIG_PACKAGE_fatrace=y
-CONFIG_PACKAGE_gdb=m
 CONFIG_PACKAGE_getopt=y
 CONFIG_PACKAGE_glib2=y
 CONFIG_PACKAGE_icwmp=y
@@ -49,8 +49,8 @@ CONFIG_PACKAGE_juci-theme-iopsys=y
 CONFIG_PACKAGE_libdaemon=y
 CONFIG_PACKAGE_libgmp=y
 CONFIG_PACKAGE_libreadline=y
+CONFIG_PACKAGE_libreswan=m
 CONFIG_PACKAGE_libwifi=y
-CONFIG_PACKAGE_loop-detector=m
 CONFIG_PACKAGE_lscpu=y
 CONFIG_PACKAGE_map=y
 CONFIG_PACKAGE_miniupnpd=y
@@ -84,8 +84,8 @@ CONFIG_PACKAGE_relayd=y
 CONFIG_PACKAGE_resolveip=y
 CONFIG_PACKAGE_rpcd=y
 CONFIG_PACKAGE_rpcd-mod-rpcsys=y
-CONFIG_PACKAGE_rsync=m
 CONFIG_PACKAGE_rulengd=y
+CONFIG_PACKAGE_rsync=y
 CONFIG_PACKAGE_strace=y
 CONFIG_PACKAGE_swmodd=m
 CONFIG_PACKAGE_tc=y

iop/scripts/taas.sh

@@ -0,0 +1,95 @@
+
+# Shorthand command for doing a HIL runtime smoketest on the
+# latest built image. Does the image boot up correctly?
+# More info here:
+# https://dev.iopsys.eu/iopsys/iopsys-taas
+
+
+#--------------------------------------------------------------
+function taas-init() {
+	local f
+
+	# Path to TaaS binarys. Try some likely ones.
+	if ! which taas-smoketest >/dev/null; then
+		PATH="${PATH}:${PWD}/../iopsys-taas/bin"
+		PATH="${PATH}:${PWD}/../taas/bin"
+		PATH="${PATH}:${HOME}/iopsys-taas/bin"
+		PATH="${PATH}:${HOME}/taas/bin"
+		PATH="${PATH}:${HOME}/bin"
+		PATH="${PATH}:/opt/iopsys-taas/bin"
+		PATH="${PATH}:/opt/taas/bin"
+	fi
+
+	if ! which taas-smoketest >/dev/null; then
+		echo "Error; TaaS is missing! Install it with:"
+		echo "git clone git@dev.iopsys.eu:iopsys/iopsys-taas.git ../iopsys-taas"
+		exit 1
+	fi
+
+	# NAND erase block size.
+	nandBlkSz=$(grep CONFIG_TARGET_NAND_BLOCKSZ .config | \
+		tr -s "=\"" " " | cut -d " " -f 2)
+	nandBlkSz=$((nandBlkSz / 1024))
+
+	# Create a list of all images which might be of use.
+	for f in ${PWD}/bin/targets/iopsys-*/generic/last.* \
+			${PWD}/build_dir/target-arm*/bcmkernel/bcm963xx/targets/9*/bcm*_linux_raw_image_${nandBlkSz}.bin; do
+		[[ -s "$f" ]] && images+=("$f")
+	done
+
+	# Convert Iopsys target name to the TaaS product name format
+	# according to what is available in the remote lab for HIL.
+	# Also find a suitable image.
+	product=$(grep CONFIG_TARGET_PROFILE .config | \
+		tr -s "=\"" " " | cut -d " " -f 2) || exit
+	case "$product" in
+		smarthub3)
+			export product="SmartHub3a"
+			;;
+		dg400prime|eg400|ex600)
+			export product=$(echo -n "$product" | tr [[:lower:]] [[:upper:]])
+			;;
+		*)
+			echo "Unsupported target; skipping!"
+			exit 0
+			;;
+	esac
+
+	if [[ ${#images[@]} -eq 0 ]]; then
+		echo "No image found"
+		exit 1
+	fi
+}
+
+
+
+#--------------------------------------------------------------
+function taas-smoketest {
+	declare -a images
+
+	taas-init || return
+	echo "Testing a $product with ${images[@]}..."
+	command taas-smoketest "${images[@]}" "$product" "$@"
+}
+
+
+
+#--------------------------------------------------------------
+function taas-bootstrap {
+	declare -a images
+
+	if [[ -n "$1" ]]; then
+		taas-init || return
+		echo "Flashing $1..."
+		command taas-bootstrap "${images[@]}" "$@"
+	else
+		echo "Usage: ./iop taas-bootstrap dutX"
+		exit 1
+	fi
+}
+
+
+
+register_command "taas-bootstrap" "Write image to a remote lab device."
+register_command "taas-smoketest" "Write image to a remote lab device and test it."
+

map-1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-1905
-PKG_VERSION:=0.0.10
+PKG_VERSION:=0.0.13
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=7cdc6d38674bef2c6003a4b60b63be8a789421be
+PKG_SOURCE_VERSION:=31e30c589cb2a522fb66261640ff1a5f8ff58ac4
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/map-1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 endif

map-topology/Makefile

@@ -6,11 +6,11 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=map-topology
-PKG_VERSION:=1.5.5
+PKG_VERSION:=1.5.6
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=55ae3fea1a6eb5372610452e3ad965ad5afa828c
+PKG_SOURCE_VERSION:=8d008ef712227986263e9a2a1b188ce3a27e17f8
 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

qosmngr/files/etc/uci-defaults/60-qos_queue_generate

@@ -24,15 +24,17 @@ generate_queue(){
 	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="$i"
+		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="-1"
+		uci set qos.@queue[-1].burst_size="0"
 		uci set qos.@queue[-1].weight="1"
 	done
 

qosmngr/files/lib/qos/broadcom.sh

@@ -6,27 +6,141 @@ BR_RULE=""
 is_bcm968=0
 
 POLICER_COUNT=0
+INTF_NAME=""
+Q_COUNT=0
+ITER=0
+PREV_ORDER=""
+CURR_ORDER=""
+MAX_ORDER=""
 
-#function to handle a queue section
-handle_queue() {
+# Function to handle a queue order and
+# update total number of queues
+handle_q_order() {
 	qid="$1" #queue section ID
 
 	config_get is_enable "$qid" "enable"
 
-	#no need to configure disabled queues
+	# No need to configure disabled queues
 	if [ $is_enable == '0' ]; then
 		return
 	fi
 
 	config_get ifname "$qid" "ifname"
-	#if ifname is empty that is good enough to break
+	# If ifname is empty that is good enough to break
 	if [ -z "$ifname" ];then
 		return
 	fi
 
+	# Create precedence file containing queue order per
+	# interface.
+	local precedence_file="/tmp/qos/$ifname/q_order"
 	local q_no=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
-	#lower the value, lower the priority of queue on this chip
-	config_get order "$qid" "precedence"
+
+	config_get precedence "$qid" "precedence"
+	value=${precedence}_q${q_no}
+	echo $value >> $precedence_file
+
+	# Update the number of queues per interface.
+	q_no=$((q_no + 1))
+	echo $q_no > /tmp/qos/queue_stats/$ifname/q_idx
+}
+
+# Function to check if values are greater than (total number
+# of queue -1) and map them to corresponding value.
+configure_precedence_to_file() {
+	order="$1"
+	line="$2"
+	order_file="$3"
+
+	if [ $order == $PREV_ORDER ]; then
+		queue_id=${line#*_}
+		val=${CURR_ORDER}_${queue_id}
+		echo $val >> $order_file
+	else
+		PREV_ORDER=$order
+		queue_id=${line#*_}
+		val=${MAX_ORDER}_${queue_id}
+		echo $val >> $order_file
+		CURR_ORDER=$MAX_ORDER
+		MAX_ORDER=$((MAX_ORDER - 1))
+	fi
+}
+
+# Fucntion to map queue precedence per interface
+# ranging from 1-X to 0-(no of queues -1)
+map_queue_precedence() {
+	ifname="$1"
+	total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
+	q_no=`expr $total_q - 1`
+
+	MAX_ORDER=$q_no
+
+	local precedence_file="/tmp/qos/$ifname/q_precedence"
+	local order_file="/tmp/qos/$ifname/q_order"
+
+	sort -n -r -k1 $order_file >> $precedence_file
+	rm $order_file
+
+	while read line
+	do
+		order=${line%_*}
+		if [ $order  -gt $q_no ]; then
+			ITER=$((ITER + 1))
+			configure_precedence_to_file $order $line $order_file
+		else
+			if [ $ITER == '0' ]; then
+				echo $line >> $order_file
+			else
+				configure_precedence_to_file $order $line $order_file
+			fi
+		fi
+
+	done < $precedence_file
+}
+
+map_precedence() {
+	for interf in $(db -q get hw.board.ethernetPortOrder); do
+		map_queue_precedence $interf
+	done
+}
+
+# function to handle a queue section
+handle_queue() {
+	qid="$1" #queue section ID
+
+	config_get is_enable "$qid" "enable"
+
+	# no need to configure disabled queues
+	if [ $is_enable == '0' ]; then
+		return
+	fi
+
+	config_get ifname "$qid" "ifname"
+	# if ifname is empty that is good enough to break
+	if [ -z "$ifname" ];then
+		return
+	fi
+
+	# This is to get the qid per interface.
+	if [ $INTF_NAME == $ifname ]; then
+		Q_COUNT=$((Q_COUNT + 1))
+	else
+		Q_COUNT='0'
+	fi
+
+	INTF_NAME=$ifname
+
+	local total_q=$(cat /tmp/qos/queue_stats/$ifname/q_idx)
+	q_no=`expr $total_q - 1` local
+	precedence_file="/tmp/qos/$ifname/q_order"
+
+	# TR181 suggests lower the precedence value higher the priority
+	# but in the chip its the opposite ie lower the value, lower
+	# the priority of queue on this chip. So we need to reverse the
+	# precedence value.
+	precedence="$(grep -i q${Q_COUNT} $precedence_file)"
+	precedence=${precedence%_*}
+	order=`expr $q_no - $precedence`
 
 	config_get sc_alg "$qid" "scheduling"
 	config_get wgt "$qid" "weight"
@@ -48,7 +162,7 @@ handle_queue() {
 	esac
 
 	# Call tmctl which is a broadcomm command to configure queues on a port.
-	tmctl setqcfg --devtype 0 --if $ifname --qid $q_no --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
+	tmctl setqcfg --devtype 0 --if $ifname --qid $Q_COUNT --priority $order --qsize $qsize --weight $wgt --schedmode $salg --shapingrate $rate --burstsize $bs
 
 	# In BCM968 chips, the counters for queues are read, on other model, its read and reset. So, to maintain counter
 	# value and uniform behaviour, we are storing counter value for each queue in files
@@ -67,8 +181,6 @@ handle_queue() {
 	touch $f_name
 	echo 0 > $f_name
 
-	q_no=$((q_no + 1))
-	echo $q_no > /tmp/qos/queue_stats/$ifname/q_idx
 }
 
 #function to handle a policer section
@@ -204,6 +316,8 @@ broute_append_rule() {
 handle_ebtables_rules() {
 	sid=$1
 	local is_l2_rule=0
+	local src_dhcp_options=""
+	local dst_dhcp_options=""
 
 	init_broute_rule
 
@@ -213,6 +327,14 @@ handle_ebtables_rules() {
 	config_get pcp_check "$sid" "pcp_check"
 	config_get eth_type "$sid" "ethertype"
 	config_get vid "$sid" "vid_check"
+	config_get dhcp_type "$sid" "dhcp_type" # dhcpv4 or v6
+	config_get src_vcid "$sid" "src_vendor_class_id" # dhcp option 60
+	config_get dst_vcid "$sid" "dst_vendor_class_id" # dhcp option 60
+	config_get src_clid "$sid" "src_client_id" # dhcp option 61
+	config_get dst_clid "$sid" "dst_client_id" # dhcp option 61
+	config_get src_ucid "$sid" "src_user_class_id" # dhcp option 77
+	config_get dst_ucid "$sid" "dst_user_class_id" # dhcp option 77
+
 	config_get traffic_class "$sid" "traffic_class"
 
 	if [ -n "$src_if" ]; then
@@ -250,6 +372,70 @@ handle_ebtables_rules() {
 		is_l2_rule=1
 	fi
 
+	# first process options that will help figure our source mac address
+	# dhcp option for "vendor class id"
+	if [ -n "$src_vcid" ]; then
+		src_dhcp_options="$src_dhcp_options vcid=$src_vcid"
+		is_l2_rule=1
+	fi
+
+	# dhcp option for "client id"
+	if [ -n "$src_clid" ]; then
+		src_dhcp_options="$src_dhcp_options clid=$src_clid"
+		is_l2_rule=1
+	fi
+
+	# dhcp option for "user class id"
+	if [ -n "$src_ucid" ]; then
+		src_dhcp_options="$src_dhcp_options ucid=$src_ucid"
+		is_l2_rule=1
+	fi
+
+	# if src mac is already a classification criteria, then it
+	# does not really make sense to add it as a criteria to
+	# filter packets again based on source mac
+	if [ -n "$src_dhcp_options" -a -z "$src_mac" ]; then
+		comp="$(grep -i "$src_dhcp_options" /tmp/dhcp.client.options)"
+		if [ -n "$comp" ]; then
+			s_mac_add="$(echo $comp | head -n1 | awk '{print $1;}')"
+			if [ -n "$s_mac_add" ]; then
+				broute_filter_on_src_mac $s_mac_add
+			fi
+		fi
+	fi
+
+	# Now process options that will help figure our destination mac address
+	# dhcp option for "vendor class id"
+	if [ -n "$dst_vcid" ]; then
+		dst_dhcp_options="$dst_dhcp_options vcid=$dst_vcid"
+		is_l2_rule=1
+	fi
+
+	# dhcp option for "client id"
+	if [ -n "$dst_clid" ]; then
+		dst_dhcp_options="$dst_dhcp_options clid=$dst_clid"
+		is_l2_rule=1
+	fi
+
+	# dhcp option for "user class id"
+	if [ -n "$dst_ucid" ]; then
+		dst_dhcp_options="$dst_dhcp_options ucid=$dst_ucid"
+		is_l2_rule=1
+	fi
+
+	# if dst mac is already a classification criteria, then it
+	# does not really make sense to add it as a criteria to
+	# filter packets again based on dstination mac
+	if [ -n "$dst_dhcp_options" -a -z "$dst_mac" ]; then
+		comp="$(grep -i "$dst_dhcp_options" /tmp/dhcp.client.options)"
+		if [ -n "$comp" ]; then
+			d_mac_add="$(echo $comp | head -n1 | awk '{print $1;}')"
+			if [ -n "$d_mac_add" ]; then
+				broute_filter_on_dst_mac $d_mac_add
+			fi
+		fi
+	fi
+
 	if [ $is_l2_rule -eq 0 ]; then
 		return
 	fi
@@ -449,12 +635,34 @@ handle_iptables_rules() {
 	fi
 }
 
+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 i=0
+	for port in $portorder; do
+		if [ "$ifname" == "$port" ]; then
+			if [ "$wanport" == "$port" ]; then
+				bs /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
+			else
+				bs /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
+			fi
+			break
+		fi
+		i=$((i + 1))
+	done
+}
+
 handle_policer_rules() {
 	local c_sec=$1
 	local policer_name
 	local ifname
 	local pname
 	local pindex=-1
+	local ingress_rate=0
+	local in_burst_size=0
 
 	config_get policer_name "$c_sec" "policer"
 	if [ -z "$policer_name" ];then
@@ -480,6 +688,8 @@ handle_policer_rules() {
 		pname="$(uci -q get qos.@policer[$i].name)"
 		if [ "$policer_name" == "$pname" ]; then
 			pindex=$i
+			ingress_rate=$(uci -q get qos.@policer[$i].committed_rate)
+			in_burst_rate=$(uci -q get qos.@policer[$i].committed_burst_size)
 			break
 		fi
 		i=$((i + 1))
@@ -490,21 +700,40 @@ handle_policer_rules() {
 		return
 	fi
 
-	local portorder="$(db -q get hw.board.ethernetPortOrder)"
+	# The policer object is not available on non BCM968* chips
+	if [ $is_bcm968 -eq 1 ]; then
+		assign_policer_to_port $ifname $pindex
+	else
+		config_ingress_rate_limit $ifname $ingress_rate $in_burst_size
+	fi
+
+}
+
+config_ingress_rate_limit() {
+	local ifname="$1"
+	local ingress_rate=$2
+	local in_burst_size=$3
 	local wanport="$(db -q get hw.board.ethernetWanPort)"
 
-	i=0
-	for port in $portorder; do
-		if [ "$ifname" == "$port" ]; then
-			if [ "$wanport" == "$port" ]; then
-				bs /b/configure port/index=wan0 ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
-			else
-				bs /b/configure port/index=lan$i ingress_rate_limit={traffic_types=8,policer={policer/dir=us,index=$pindex}}
-			fi
-			break
-		fi
-		i=$((i + 1))
-	done
+	if [ "$ifname" == "$wanport" ]; then
+		logger -t qosmngr "policing is not support on port $ifname"
+		return
+	fi
+
+	# Unit in uci file is in bps while that accepted by ethswctl is kbits
+	if [ $ingress_rate -lt 1000 ]; then
+		return
+	fi
+
+	ingress_rate=$((ingress_rate / 1000))
+
+	if [ $in_burst_size -eq 0 ]; then
+		in_burst_size=$ingress_rate
+	else
+		in_burst_size=$((in_burst_size / 1000))
+	fi
+
+	ethswctl -c rxratectrl -n 1 -p $ifname -x $ingress_rate -y $in_burst_size
 }
 
 #function to handle a classify section
@@ -568,6 +797,8 @@ configure_queue() {
 	rm -rf /tmp/qos/queue_stats
 
 	for intf in $(db get hw.board.ethernetPortOrder); do
+		rm -rf /tmp/qos/$intf
+
 		mkdir -p /tmp/qos/queue_stats/$intf
 		touch /tmp/qos/queue_stats/$intf/q_idx
 		echo 0 > /tmp/qos/queue_stats/$intf/q_idx
@@ -575,14 +806,30 @@ configure_queue() {
 		for i in 0 1 2 3 4 5 6 7; do
 			tmctl delqcfg --devtype 0 --if $intf --qid $i &>/dev/null
 		done
+
+		mkdir -p /tmp/qos/$intf
+		touch /tmp/qos/$intf/q_order
+		touch /tmp/qos/$intf/q_precedence
 	done
 
 	# Load UCI file
 	config_load qos
+	config_foreach handle_q_order queue
+	map_precedence
 	config_foreach handle_queue queue
 }
 
 configure_policer() {
+	# The policer object is not available on non BCM968* chips, just clean up
+	# the old config if any and return
+	if [ $is_bcm968 -eq 0 ]; then
+		for intf in $(db get hw.board.ethernetPortOrder); do
+			# setting rate and burst size to 0 disables rate limiting
+			ethswctl -c rxratectrl -n 1 -p $intf -x 0 -y 0
+		done
+		return
+	fi
+
 	# Delete policer
 	local i=0
 	local max_p_inst=0
@@ -616,6 +863,12 @@ configure_qos() {
 
 reload_qos() {
 	local service_name="$1"
+	local cpu_model="$(grep Hardware /proc/cpuinfo  | awk '{print$NF}')"
+
+	case $cpu_model in
+		BCM968*) is_bcm968=1 ;;
+	esac
+
 	if [ -z "$service_name" ]; then
 		configure_qos
 	elif [ "$service_name" == "shaper" ]; then
@@ -842,6 +1095,7 @@ read_queue_stats() {
 	itf="$1"
 	q_idx="$2"
 	local cpu_model="$(grep Hardware /proc/cpuinfo  | awk '{print$NF}')"
+
 	case $cpu_model in
 		BCM968*) is_bcm968=1 ;;
 	esac

rulengd/Makefile

@@ -12,7 +12,7 @@ PKG_INSTALL:=1
 
 PKG_SOURCE_PROTO=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/rulengd.git
-PKG_SOURCE_VERSION:=ad94ccdd82b22527ab32937ca1a2682030319ed3
+PKG_SOURCE_VERSION:=d7a4d24e653ea0dc02679e24f8ec3c817aafdb37
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_SOURCE_SUBDIR:=${PKG_NAME}-${PKG_VERSION}
 PKG_INSTALL:=1

wfadatad/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wfadatad
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.3.1
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=26701fdc83440a748aeff183bad2f67287764fb4
+PKG_SOURCE_VERSION:=bdcf390f970facc20d7ac51fbb59ac4912b7fbfc
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wfadatad.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 

wifimngr/Makefile

@@ -5,10 +5,10 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=wifimngr
-PKG_VERSION:=8.2.8
+PKG_VERSION:=8.2.9
 
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=025a1594ab0c8d44c8c3532a99e4873727c50941
+PKG_SOURCE_VERSION:=ff879d814caba6807f64288de22db6f78c03438c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>