mcastmngr: fixed mcproxy crash for multiupstream config

If more than one upstream iface is defined, mcastmngr runs mcproxy
multiple times for each protocol (e.g. igmp) with the same config.
So second mcproxy process fails because it can't lock the MRT flag
(/proc/sys/net/ipv/default/mc_forwarding) already blocked by the
first process.

If one good and one bad (no IP address) upstream interfaces are defined,
mcastmngr generates wrong filter configuration and mcproxy cannot start
at all.

Now upstream and downstream ifaces are checked in the
'config_mcproxy_interfaces' function and only good interfaces (with IP)
are written to the mcproxy config. Only one mcproxy process is started
per protocol (igmp, mld), configured to handle multiple interfaces
if necessary.

'get_network_of' function removed. This function fails in some
uci configurations for interfaces that refer to a device indirectly.
Example - network.wan6.device='@wan'

bbfdm/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.0.27
+PKG_VERSION:=1.0.34
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=bc5060eb28de8855e957befe05194a68f688aa78
+PKG_SOURCE_VERSION:=8dbbaa8f3c947f42a6b6cd8cfbfdfdcb1091aa59
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.0.2.3
+PKG_VERSION:=4.0.2.6
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d33a3ffec1a960aa7b5d8491a77ce4e83a9a50b1
+PKG_SOURCE_VERSION:=944a981d8d3f9548f464c862778b67455aee9112
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

decollector/files/decollector.init

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

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

@@ -84,21 +84,16 @@ set_port_settings() {
 	[ "$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)"
+	phycaps="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Speed Capabilities' | awk '{print$NF}')"
+	numofcaps="$(echo $phycaps | tr ':' ' ' | wc -w)"
 
         # Reset the port before setting new params
         reset_port $ifname
 
 	if [ "$numofcaps" == "1" ]; then
-		logger -t "port-management" "$ifname is capable of $phycaps only; not setting speed/duplex"
+		logger -t "ethmngr" "$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"
+		logger -t "ethmngr" "$ifname is capable of $phycaps; setting speed/duplex to $media_type"
 		ethctl $ifname media-type $media_type ${pyhendpoint:+ port $pyhendpoint} &>/dev/null
 	fi
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.3.7
+PKG_VERSION:=9.3.9
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=6293f933dc40c45597edccfa9837d47e431da03d
+PKG_SOURCE_VERSION:=bf2e74f8eb7501d75aa65298fa8ac91031092c01
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

icwmp/files/etc/firewall.cwmp

@@ -5,46 +5,58 @@ log() {
 	echo "${@}"|logger -t firewall.cwmp -p info
 }
 
-if [ ! -f "/var/state/icwmp" ]; then
+get_firewall_zone() {
+	zone="$(uci show firewall|grep network|grep ${1}|cut -d. -f 2)"
+	zone="${zone:-wan}" # defaults to wan zone
+	echo "$zone"
+}
+
+cleanup_exiting_rules() {
+        while iptables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
+		rule_num="$(iptables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Open_ACS_port" | head -1|awk '{print $1}')"
+		if [ -n "${rule_num}" ]; then
+			iptables -w 1 -D zone_"${1}"_input "${rule_num}";
+		fi
+	done
+        while ip6tables -w 1 -nL zone_"${1}"_input --line-numbers 2>/dev/null | grep "Open_ACS_port"; do
+		rule_num="$(ip6tables -w 1 -nL zone_"${1}"_input --line-numbers | grep "Open_ACS_port" | head -1|awk '{print $1}')"
+		if [ -n "${rule_num}" ]; then
+			ip6tables -w 1 -D zone_"${1}"_input "${rule_num}";
+		fi
+	done
+}
+
+enable="$(uci -q get cwmp.cpe.enable)"
+enable="${enable:-1}"
+
+if [ "$enable" -eq 0 ]; then
+	log "CWMP not enabled"
 	exit 0;
 fi
 
-zone_name=$(uci -c /var/state -q get icwmp.acs.zonename)
+wan="$(uci -q get cwmp.cpe.default_wan_interface)"
+wan="${wan:-wan}"
+
+zone_name="$(get_firewall_zone $wan)"
+
 port=$(uci -q get cwmp.cpe.port)
+port="${port:-7547}"
+
+incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|awk '{print tolower($0)}')
+incoming_rule="${incoming_rule:-port_only}"
+
 ipaddr=$(uci -c /var/state -q get icwmp.acs.ip)
 ip6addr=$(uci -c /var/state -q get icwmp.acs.ip6)
-incoming_rule=$(uci -q get cwmp.cpe.incoming_rule|tr 'A-Z' 'a-z')
-
-if [ -z "${zone_name}" ]; then
-	log "empty firewall zone name"
-	exit 0
-elif [ "$zone_name" = "icwmp" ]; then
-	iptables -nL zone_icwmp_input 2> /dev/null
-	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
-	else			
-		iptables -w 1 -F zone_icwmp_input
-		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
-	iptables -w 1 -t filter -D INPUT -j zone_icwmp_input 2> /dev/null
-	iptables -w 1 -X zone_icwmp_input 2> /dev/null
-fi
 
 cmd="iptables -w 1 -I zone_${zone_name}_input -p tcp"
 cmd6="ip6tables -w 1 -I zone_${zone_name}_input -p tcp"
 
 # default incoming rule is Port only
-if [ -z "${incoming_rule}" ]; then
-	incoming_rule="port_only"
-fi
-
 if [ "${incoming_rule}" = "ip_only" ]; then
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
+	fi
+	if [ -n "${ip6addr}" ]; then
 		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 elif [ "${incoming_rule}" = "port_only" ]; then
@@ -55,6 +67,9 @@ elif [ "${incoming_rule}" = "port_only" ]; then
 else
 	if [ -n "${ipaddr}" ]; then
 		cmd="${cmd} -s ${ipaddr}"
+	fi
+
+	if [ -n "${ip6addr}" ]; then
 		cmd6="${cmd6} -s ${ip6addr}"
 	fi
 
@@ -64,17 +79,23 @@ else
 	fi
 fi
 
+cleanup_exiting_rules "${zone_name}"
+
 echo "${cmd}"|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd="${cmd} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd}
+	log "Applied [${cmd}]"
 fi
 
 echo "${cmd6}"|grep -q "\-\-dport \|\-s "
 if [ "$?" -eq 0 ]; then
 	cmd6="${cmd6} -j ACCEPT -m comment --comment=Open_ACS_port"
 	${cmd6}
+	log "Applied [${cmd6}]"
 fi
 
-uci -c /var/state -q set icwmp.cpe.firewall_restart="init"
-uci -c /var/state -q commit icwmp
+if [ -f "/var/state/icwmp" ]; then
+	uci -c /var/state -q set icwmp.cpe.firewall_restart="init"
+	uci -c /var/state -q commit icwmp
+fi

libvoice-airoha/Makefile

@@ -17,7 +17,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:=bbfcf0f803f63530ee3d9675c1584a8f8422ecb0
+PKG_SOURCE_VERSION:=8ced85cd48f8bdd7d238fc1ded3a218dd19aeae9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-broadcom/Makefile

@@ -17,7 +17,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:=5466f832abaac677f25a750ddf19793dadf3774c
+PKG_SOURCE_VERSION:=548f8fccc9f8f0b5dd6bb39bdd9cac8659400cb6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-d2/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.6
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -17,7 +17,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:=84f1eec3154c96486f6c8662f0431fcc41486010
+PKG_SOURCE_VERSION:=062a265754b93a865cfcd2745f200aa09fb4a668
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.3.3.6
+PKG_VERSION:=4.3.4.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=aafe248932eb8e4802bb70daf6eea199d97f5222
+PKG_SOURCE_VERSION:=7b627c29de85b46b6da79c3dcbefdb35c61866eb
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-agent/files/etc/config/mapagent

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

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

@@ -10,70 +10,81 @@ PROG_EXE=/usr/sbin/mcproxy
 PROG_PARAMS=
 PROG_PARAMS_SEPARATOR=:
 
-setup_mcast_mode() {
-	local snooped_interface=$1
-	local mcast_mode=$2
 
-	local mcast_flood=
+__device_is_bridge() {
+	local device="$2"
+	local devsec__="$(uci show network | grep name=.*$device | cut -d'.' -f2)"
+	local sectype="$(uci -q get network.$devsec__)"
+	local devtype="$(uci -q get network.$devsec__.type)"
+	[ "$sectype" != "device" -o "$devtype" != "bridge" ] && return 1
+	eval "$1=$devsec__"
+}
+
+device_is_bridge() {
+	local device="$1"
 	local devsec=
-	local sectype=
-	local devtype=
-	local ports=
-	if [ -z "$snooped_interface" ]; then
-		return
-	fi
+	__device_is_bridge devsec "$device" || return 1
+}
 
-	if [ $mcast_mode == "2" ]; then # disable mcast flood
-		mcast_flood=0
+device_ports() {
+	local device="$1"
+	local devsec=
+
+	if __device_is_bridge devsec "$device"; then
+		echo "$(uci get network.$devsec.ports)"
 	else
-		mcast_flood=1
+		echo "$device"
 	fi
+}
 
-	for intf in $snooped_interface;
-	do
-		devsec="$(uci show network | grep name=.*$intf | cut -d'.' -f2)"
-		sectype="$(uci -q get network.$devsec)"
-		devtype="$(uci -q get network.$devsec.type)"
-		if [ "$sectype" == "device" -a "$devtype" == "bridge" ]; then
-			ports="$(uci get network.$devsec.ports)"
-			for prt in $ports; do
-				echo $mcast_flood > /sys/class/net/$prt/brport/multicast_flood
-			done
-		else
-			if [ -f  /sys/class/net/$intf/brport/multicast_flood ]; then
-				echo $mcast_flood > /sys/class/net/$intf/brport/multicast_flood
-			fi
-		fi
+device_has_ip() {
+	local protocol="$1"
+	local device="$2"
+
+	# Read the openwrt interface for the device.
+	# Device can have multiple logical interfaces like wan and wan6
+	# but same l3 device
+	# NB. Don't use 'get_network_of' here.
+	# This function fails in some uci configurations for interfaces that refer
+	# to a device indirectly.
+	local ifaces=$(ubus call network.interface dump | jsonfilter -e "@.interface[@.device='$device'].interface")
+	for iface in $ifaces; do
+		local ip=
+		case "$protocol" in
+			"igmp") network_get_ipaddr ip "$iface" ;;
+			"mld") network_get_ipaddr6 ip "$iface" ;;
+		esac
+		[ -n "$ip" ] && return
 	done
+
+	return 1
 }
 
 config_mcproxy_interfaces() {
-	local upstreams="$1"
-	local downstreams="$2"
-	local exceptions="$3"
+	local protocol="$1"
+	local upstreams="$2"
+	local downstreams="$3"
+	local exceptions="$4"
+
+	if [ -z "$upstreams" ] || [ -z "$downstreams" ]; then
+		return 1
+	fi
 
 	local str_up=""
-	if [ -n "$upstreams" ]; then
-		for upstream in $upstreams; do
-			str_up="$str_up \"$upstream\""
-		done
-	fi
+	for upstream in $upstreams; do
+		device_has_ip "$protocol" "$upstream" || continue
+		str_up="$str_up \"$upstream\""
+	done
+	[ -z "$str_up" ] && return 1
 
 	local str_down=""
-	if [ -n "$downstreams" ]; then
-		for downstream in $downstreams; do
-			str_down="$str_down \"$downstream\""
-		done
-	fi
+	for downstream in $downstreams; do
+		device_has_ip "$protocol" "$downstream" || continue
+		str_down="$str_down \"$downstream\""
+	done
+	[ -z "$str_down" ] && return 1
 
-	if [ ! -z $downstream ]; then
-		echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
-	fi
-
-
-	if [ -z "$exceptions" ] || [ -z "$upstreams" ]; then
-		return
-	fi
+	echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
 
 	for excp in $exceptions; do
 		local filter=""
@@ -89,34 +100,63 @@ config_mcproxy_interfaces() {
 			;;
 		esac
 
-		for upstream in $upstreams; do
-			echo "pinstance main upstream \"$upstream\" in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main upstream \"$upstream\" out blacklist table{$filter };" >> $CONFFILE
+		for upstream in $str_up; do
+			echo "pinstance main upstream $upstream in blacklist table{$filter };" >> $CONFFILE
+			echo "pinstance main upstream $upstream out blacklist table{$filter };" >> $CONFFILE
 		done
 
-		for downstream in $downstreams; do
-			echo "pinstance main downstream \"$downstream\" in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main downstream \"$downstream\" out blacklist table{$filter };" >> $CONFFILE
+		for downstream in $str_down; do
+			echo "pinstance main downstream $downstream in blacklist table{$filter };" >> $CONFFILE
+			echo "pinstance main downstream $downstream out blacklist table{$filter };" >> $CONFFILE
 		done
 	done
 }
 
 config_sysfs_mcast_snooping() {
-	local devsec=
-	local sectype=
-	local devtype=
-	local ports=
+	local downstreams="$1"
 
 	for downstream in $downstreams; do
-		devsec="$(uci show network | grep name=.*$downstream | cut -d'.' -f2)"
-		sectype="$(uci -q get network.$devsec)"
-		devtype="$(uci -q get network.$devsec.type)"
-		if [ "$sectype" == "device" -a "$devtype" == "bridge" ]; then
+		if device_is_bridge "$downstream"; then
 			echo 1 > /sys/class/net/$downstream/bridge/multicast_snooping
 		fi
 	done
 }
 
+config_sysfs_mcast_fastleave() {
+	local downstreams="$1"
+	local fastleave="$2"
+	local prt
+
+	for downstream in $downstreams; do
+		for prt in $(device_ports $downstream); do
+			if [ -f  /sys/class/net/$prt/brport/multicast_fast_leave ]; then
+				echo $fastleave > /sys/class/net/$prt/brport/multicast_fast_leave
+			fi
+		done
+	done
+}
+
+config_sysfs_mcast_mode() {
+	local downstreams=$1
+	local mcast_mode=$2
+	local prt
+
+	local mcast_flood=
+	if [ $mcast_mode == "2" ]; then # disable mcast flood
+		mcast_flood=0
+	else
+		mcast_flood=1
+	fi
+
+	for downstream in $downstreams; do
+		for prt in $(device_ports $downstream); do
+			if [ -f  /sys/class/net/$prt/brport/multicast_flood ]; then
+				echo $mcast_flood > /sys/class/net/$prt/brport/multicast_flood
+			fi
+		done
+	done
+}
+
 config_mcproxy_instance() {
 	local protocol="$1"
 	local version="$2"
@@ -129,7 +169,6 @@ config_mcproxy_instance() {
 	local exceptions=
 	local upstreams=
 	local downstreams=
-	local intf_has_ip=
 	local mcast_mode=2 # default value 2 is for blocking mode
 
 	CONFFILE=/var/etc/mcproxy_"$protocol".conf
@@ -178,58 +217,23 @@ config_mcproxy_instance() {
 		mcast_mode=$mld_p_mode
 	fi
 
-	# for snooping to work we should enable it on the bridge, doing it from
-	# here instead of from inside network config
-	config_sysfs_mcast_snooping
-
 	[ -n "$max_groups" ] && echo -e "max_groups $max_groups;" >> $CONFFILE
 	[ -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
-	if [[ -n $fast_leave ]]; then
-		echo -e "fastleave $fast_leave;\n" >> $CONFFILE
-		config_sysfs_mcast_fastleave $fast_leave
-	fi
+	[ -n "$fast_leave" ] && echo -e "fastleave $fast_leave;\n" >> $CONFFILE
 
-	setup_mcast_mode $downstreams $mcast_mode
-	[ -n "$upstreams" ] && [ -n "$downstreams" ] &&
-		config_mcproxy_interfaces "$upstreams" "$downstreams" "$exceptions"
+	config_mcproxy_interfaces "$protocol" "$upstreams" "$downstreams" "$exceptions" || return
 
-	# In case on proxy, upstreams is a list. Iterating and running the mcproxy
-	# for each valid upstream interface
-	for upstream_device in $upstreams;
-	do
-		# Read the upstream interface for the upstream device
-		# upstream device can have multiple logical interfaces like wan and wan6
-		# but same l3 device
-		local upstream_ifaces=$(get_network_of $upstream_device)
+	# for snooping to work we should enable it on the bridge, doing it from
+	# here instead of from inside network config
+	config_sysfs_mcast_snooping "$downstreams"
+	[ -n $fast_leave ] &&
+		config_sysfs_mcast_fastleave "$downstreams" "$fast_leave"
+	config_sysfs_mcast_mode "$downstreams" "$mcast_mode"
 
-		for iface in $upstream_ifaces;
-		do
-			if [ "$protocol" == "igmp" ]; then
-				network_get_ipaddr upstream_ip $iface
-				if [ ! -z "${upstream_ip}" ]; then
-					intf_has_ip=1
-					break
-				fi
-			fi
-
-			if [ "$protocol" == "mld" ]; then
-				network_get_ipaddr6 upstream_ip $iface
-				if [ ! -z "${upstream_ip}" ]; then
-					intf_has_ip=1
-					break
-				fi
-			fi
-		done
-
-		if [ -z "${intf_has_ip}" ]; then
-			continue
-		fi
-
-		PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
-	done
+	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
 }
 
 config_mcproxy() {
@@ -242,28 +246,6 @@ config_mcproxy() {
 	fi
 }
 
-config_sysfs_mcast_fastleave() {
-	local devsec=
-	local sectype=
-	local devtype=
-	local ports=
-
-	for downstream in $downstreams; do
-		devsec="$(uci show network | grep name=.*$downstream | cut -d'.' -f2)"
-		sectype="$(uci -q get network.$devsec)"
-		devtype="$(uci -q get network.$devsec.type)"
-		if [ "$sectype" == "device" -a "$devtype" == "bridge" ]; then
-			ports="$(uci get network.$devsec.ports)"
-			for prt in $ports; do
-				echo $1 > /sys/class/net/$prt/brport/multicast_fast_leave
-			done
-		else
-			[[ -f  /sys/class/net/$downstream/brport/multicast_fast_leave ]] && echo $1 > /sys/class/net/$downstream/brport/multicast_fast_leave
-		fi
-	done
-
-}
-
 configure_mcast() {
 	config_global_params "set_max_groups_and_sources"
 

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.2.21
+PKG_VERSION:=7.0.2.23
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=7d9ae65ca28a558214d99f4fa5674bbfef006c97
+PKG_SOURCE_VERSION:=cb4f6a8370bca0fc350c74f46399b30b71813332
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=2.2.6
+PKG_VERSION:=2.2.11
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=e4b1ddd2fd1d1300f5d8b4528068a9794565c1e8
+PKG_SOURCE_VERSION:=715356e5e8a78b965b52392995c09dece08bc789
 PKG_MIRROR_HASH:=skip
 
 SULU_MOD:=core

sulu/sulu-builder/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-builder
-PKG_VERSION:=2.2.6
+PKG_VERSION:=2.2.11
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=ecc31912a4fa340f3dce109c33a36a42217251d8
+PKG_SOURCE_VERSION:=b243997322a31c9086b9bd16eef6acbe778288cf
 PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_SOURCE_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_BUILD_DIR:=$(BUILD_DIR)/sulu-$(PKG_VERSION)/sulu-builder-$(PKG_SOURCE_VERSION)

sulu/sulu-lcm/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-lcm
-PKG_VERSION:=2.2.4
+PKG_VERSION:=2.2.11
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
-PKG_SOURCE_VERSION:=46975426ffa53ffcc3b0d9e9160f6b3d4b6d82fd
+PKG_SOURCE_VERSION:=142de2eba8fb53736d8d804e8b94a13d3b198116
 PKG_MIRROR_HASH:=skip
 
 SULU_PLUGIN_INSTALL:=1

sulu/sulu-multi-ap/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=2.2.4
+PKG_VERSION:=2.2.11
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=d77f19d8d964c9ecf8ab6d2cc3c8ddc369135d7e
+PKG_SOURCE_VERSION:=7956eae38697dd8482f3a9ce9eaa7ffb276aaf44
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

sulu/sulu-parental-control/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-parental-control
-PKG_VERSION:=2.2.6
+PKG_VERSION:=2.2.11
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=bb953d9604736584cb90e3b03c9afb6fbe2a6e5d
+PKG_SOURCE_VERSION:=41c397b609e4a2595ce0b2b997403a185224dc11
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

voicemngr/Makefile

@@ -19,7 +19,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:=11b27a3bbf80f87ddfe10ed984d2945655ce3ba1
+PKG_SOURCE_VERSION:=190cc528047a834597007f2763abdc381cde93c1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

wifimngr/Makefile

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

wifimngr/files/etc/init.d/wifimngr

@@ -20,6 +20,3 @@ reload_service() {
         start
 }
 
-service_triggers() {
-	procd_add_reload_trigger "wireless"
-}