ieee1905: 8.1.11

Add hack to consume configs from custom-devices in a separate feed
custom-devices, but only in that feed and not in other feeds. There is
no value in implementing a generic solution, because the whole genconfig
system will be replaced with something else.

Signed-off-by: Andreas Gnau <andreas.gnau@iopsys.eu>

bbfdm/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.0.8
+PKG_VERSION:=1.0.13
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=346c8412a426441fa928b53210d0bd6127ac72e8
+PKG_SOURCE_VERSION:=a50855795e7e7eadb7c653552e1debec39840d4a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 
@@ -111,6 +111,7 @@ endif
 
 CMAKE_OPTIONS += \
 	-DBBF_TR181=ON
+	-DBBF_WIFI_DATAELEMENTS=ON
 
 ifeq ($(CONFIG_BBF_TR104),y)
 CMAKE_OPTIONS += \
@@ -204,10 +205,12 @@ endef
 
 define Package/bbfdmd/install
 	$(INSTALL_DIR) $(1)/etc/init.d
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/etc/bbfdm
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) ./files/etc/init.d/bbfdmd $(1)/etc/init.d/bbfdmd
+	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/85-bbfdm-sysctl $(1)/etc/hotplug.d/iface/85-bbfdm-sysctl
 	$(INSTALL_CONF) ./files/etc/config/bbfdm $(1)/etc/config/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbfdmd/src/bbfdmd $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/json/input.json $(1)/etc/bbfdm/

bbfdm/files/etc/config/bbfdm

@@ -4,4 +4,5 @@ config bbfdmd 'bbfdmd'
 	option loglevel '1'
 	option refresh_time '10'
 	option transaction_timeout '10'
+	option enable_plugins '1'
 

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

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

bbfdm/files/etc/init.d/bbfdmd

@@ -68,39 +68,23 @@ configure_bbfdmd()
 		echo "$(jq --arg res ${subprocess_level} '.daemon.config += {"subprocess_level": $res}' ${TMP_JSON_INPUT})" > ${TMP_JSON_INPUT}
 	fi
 
+	if [ -n "${enable_plugins}" ]; then
+		echo "$(jq --arg res ${enable_plugins} '.daemon.config += {"enable_plugins": $res}' ${TMP_JSON_INPUT})" > ${TMP_JSON_INPUT}
+	fi
+
 	procd_append_param command -I "${TMP_JSON_INPUT}"
 }
 
-apply_sysctl_configuration() {
-	local sysctl_conf
-
-	sysctl_conf="/etc/bbfdm/sysctl.conf"
-	
-	[ -f "${sysctl_conf}" ] || touch "${sysctl_conf}"
-
-	sysctl -e -p "${sysctl_conf}" >&-
-}
-
 start_service() {
-	local sysctl_reload
-
-	ubus -t 5 wait_for network.device
-	[ "$?" -eq 0 ] && sysctl_reload=1
 
 	procd_open_instance bbf
 	configure_bbfdmd
 	procd_set_param respawn
 	procd_close_instance
 
-	[ "${sysctl_reload}" -eq 1 ] && apply_sysctl_configuration
-}
-
-reload_service() {
-	ubus -t 5 wait_for network.device
-	apply_sysctl_configuration
 }
 
 service_triggers()
 {
-	procd_add_reload_trigger "bbfdm" "network"
+	procd_add_reload_trigger "bbfdm"
 }

bulkdata/Makefile

@@ -7,7 +7,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.0
+PKG_VERSION:=2.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -44,8 +44,9 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bulkdatad $(1)/usr/sbin/
-	$(INSTALL_DIR) $(1)/etc/bbfdm/json
-	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/json
+	$(INSTALL_DIR) $(1)/etc/bbfdm/services
+	$(INSTALL_DIR) $(1)/etc/bbfdm/services/bulkdata
+	$(INSTALL_BIN) $(PKG_BUILD_DIR)/bbf_plugin/*.json $(1)/etc/bbfdm/services/bulkdata
 	$(CP) ./files/* $(1)/
 endef
 

bulkdata/files/etc/bbfdm/services/bulkdata/input.json

@@ -0,0 +1,30 @@
+{
+	"daemon": {
+		"config": {
+			"refresh_time": 3600,
+			"enable_plugins": 0
+		},
+		"input": {
+			"type": "JSON",
+			"name": "/etc/bbfdm/services/bulkdata/bulkdata.json"
+		},
+		"output": {
+			"type": "UBUS",
+			"name": "bbfdm.bulkdata"
+		}
+	},
+	"client": {
+		"config": {
+			"proto": "both",
+			"instance_mode": 0,
+			"enable_plugins": 0
+		},
+		"input": {
+			"type": "UBUS",
+			"name": "bbfdm.bulkdata"
+		},
+		"output": {
+			"type": "CLI"
+		}
+	}
+}

bulkdata/files/etc/init.d/bulkdatad

@@ -5,6 +5,8 @@ STOP=10
 
 USE_PROCD=1
 PROG="/usr/sbin/bulkdatad"
+BBFDMD_PROG="/usr/sbin/bbfdmd"
+BULKDATA_JSON_INPUT="/etc/bbfdm/services/bulkdata/input.json"
 
 start_service() {
 	local enable
@@ -12,12 +14,18 @@ start_service() {
 	config_load bulkdata
 	config_get_bool enable bulkdata enable 1
 
-	procd_open_instance bulkdata
+	procd_open_instance "bbfdm.bulkdata"
+	procd_set_param command "$BBFDMD_PROG"
+	procd_append_param command -I "${BULKDATA_JSON_INPUT}"
+	procd_set_param respawn
+	procd_close_instance "bbfdm.bulkdata"
+
 	[ "$enable" -eq "1" ] && {
+		procd_open_instance "bulkdata"
 		procd_set_param command "$PROG"
-		procd_set_param respawn "3" "7" "0"
-	}
-	procd_close_instance
+		procd_set_param respawn
+		procd_close_instance "bulkdata"
+	}	
 }
 
 reload_service() {

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.0.2.0
+PKG_VERSION:=4.0.2.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=162654487bfbff7d68d0c87ae9498a3def738d84
+PKG_SOURCE_VERSION:=fa1b24690ca00a73401fec1386dbf98932545d05
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/decollector.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

dectmngr/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.8
+PKG_VERSION:=3.5.9
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a9b4e716f5d48b543191ca47b14b4bceafdaa5b4
+PKG_SOURCE_VERSION:=ae9e8f3406f1087464b994cdfbc64a4ce2f86ed4
 PKG_MIRROR_HASH:=skip
 endif
 

dslmngr/Makefile

@@ -13,7 +13,7 @@ PKG_VERSION:=1.2.0
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=bb754ae620a9fc66fd6fc0745f0fead0708c7a17
+PKG_SOURCE_VERSION:=43dec92b1c86be7859521da337e7bd1168848b26
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dslmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.1.10
+PKG_VERSION:=8.1.11
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=52a11c4969039741f19a9a3d748c26761e702607
+PKG_SOURCE_VERSION:=90b8f44ca78b4711d5c86234fb0fc621ebd97fd9
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/ieee1905.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

iop/scripts/genconfig.sh

@@ -19,6 +19,7 @@ function genconfig {
 	armvirt_feed="target/linux/feeds/armvirt"
 	mediatek_feed="target/linux/feeds/mediatek"
 	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
+	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -120,9 +121,11 @@ function genconfig {
 			mediatek=$(cd $mediatek_feed; ./genconfig)
 		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
 			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
+		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
+			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armvirt mediatek ipq95xx; do
+			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -178,6 +181,14 @@ function genconfig {
 		    return
 		fi
 	    done
+
+	    for p in $ipq53xx; do
+		if [ $p == $profile ]; then
+		    target="ipq53xx"
+			target_config_path="$qualcomm_ipq53xx_feed/config"
+		    return
+		fi
+	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -357,10 +368,15 @@ function genconfig {
 		    cat $target_config_path/$BOARDTYPE/config >> .config
 		    echo "" >> .config
 		fi
-
+		# hack to support custom-devices until we have deprecated this genconfig-script...
+		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
+			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
+			echo "" >> .config
+		fi
+		
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx)
+		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"

iop/scripts/genconfig_min.sh

@@ -18,6 +18,7 @@ function genconfig_min {
 	armvirt_feed="target/linux/feeds/armvirt"
 	mediatek_feed="target/linux/feeds/mediatek"
 	qualcomm_ipq95xx_feed="target/linux/feeds/ipq95xx"
+	qualcomm_ipq53xx_feed="target/linux/feeds/ipq53xx"
 
 	Red='\033[0;31m'          # Red
 	Color_Off='\033[0m'       # Text Reset
@@ -119,9 +120,11 @@ function genconfig_min {
 			mediatek=$(cd $mediatek_feed; ./genconfig)
 		[ -e $qualcomm_ipq95xx_feed/genconfig ] &&
 			ipq95xx=$(cd $qualcomm_ipq95xx_feed; ./genconfig)
+		[ -e $qualcomm_ipq53xx_feed/genconfig ] &&
+			ipq53xx=$(cd $qualcomm_ipq53xx_feed; ./genconfig)
 
 	    if [ "$profile" == "LIST" ]; then
-			for list in brcmbca airoha x86 armvirt mediatek ipq95xx; do
+			for list in brcmbca airoha x86 armvirt mediatek ipq95xx ipq53xx; do
 				echo "$list based boards:"
 				for b in ${!list}; do
 					echo -e "\t$b"
@@ -177,6 +180,14 @@ function genconfig_min {
 		    return
 		fi
 	    done
+
+	    for p in $ipq53xx; do
+		if [ $p == $profile ]; then
+		    target="ipq53xx"
+			target_config_path="$qualcomm_ipq53xx_feed/config"
+		    return
+		fi
+	    done
 	}
 
 	git remote -v | grep -qE '(git@|ssh://)' && {
@@ -331,10 +342,15 @@ function genconfig_min {
 		    cat $target_config_path/$BOARDTYPE/config >> .config
 		    echo "" >> .config
 		fi
+		# hack to support custom-devices until we have deprecated this genconfig-script...
+		if [ -f "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" ]; then
+			cat "feeds/custom_devices/devices/$target/config/$BOARDTYPE/config" >> .config
+			echo "" >> .config
+		fi
 
 		# Special handling for targets which use TARGET_DEVICES
 		case "$target" in
-		airoha | mediatek | brcmbca | ipq95xx)
+		airoha | mediatek | brcmbca | ipq95xx | ipq53xx)
 			# This assumes the device name to be unique within one target,
 			# which is a fair assumption to make.
 			local subtarget="$(get_subtarget_for_device "${target/_/-}" "$BOARDTYPE")"

libdsl/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.2.99
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=54d53295b5e4ca74884045d0fa6bb0dc279ace3d
+PKG_SOURCE_VERSION:=f9f3fcd0f4140540db5bd41059bcca7ded083024
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libdsl.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libethernet/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.2.104
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a64c8d1db59f6ca70424356186d279cc6e31213c
+PKG_SOURCE_VERSION:=d777636ca43302a95e571ab030ec44ef50905570
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libethernet.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libqos/Makefile

@@ -10,7 +10,7 @@ PKG_VERSION:=7.2.101
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4287dbe76dc5c8b85368aa2cd101d9d9a445f968
+PKG_SOURCE_VERSION:=93ca0a66d6f82bca208bbe52b75ed582b20aa094
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libqos.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 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:=2a6ef141747ad0f7b32a536b5b5bd174834a7af5
+PKG_SOURCE_VERSION:=0dd7195c935f3a787b45ad72acd7971adf139a70
 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:=401a392a72e2933f527eb92466faaf2907c38730
+PKG_SOURCE_VERSION:=9e73f949fe00e6804eddbcec8a2c5caa1b80d24a
 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.2
+PKG_VERSION:=1.0.3
 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:=7ca102e62fa439a7188f2c5e4c72e3fcfd3fb28a
+PKG_SOURCE_VERSION:=a0d0c8d2ffd534684718302131f69c25391f7ac6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libwifi/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libwifi
-PKG_VERSION:=7.2.101
+PKG_VERSION:=7.2.102
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=04b01464cb6d8c7ffcdfded7f8acacba04a5ba4f
+PKG_SOURCE_VERSION:=fdc70f59ce6f5c121facbf133f844da7469a185c
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/libwifi.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
@@ -44,7 +44,7 @@ else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_CFLAGS +=-DIOPSYS_ECONET
 else ifeq ($(CONFIG_TARGET_ipq95xx),y)
   TARGET_PLATFORM=IPQ95XX
-  TARGET_WIFI_TYPE=MAC80211
+  TARGET_WIFI_TYPE=QUALCOMM MAC80211
   TARGET_CFLAGS +=-DIPQ95XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
   TARGET_PLATFORM=LINUX

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.3.2.3
+PKG_VERSION:=4.3.3.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=d8940d6ecc4b8611c7d2e4bd9a2d5cad302c9c6e
+PKG_SOURCE_VERSION:=84b447dc1e8e851032765988f8acda09baabc926
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.3.0.3
+PKG_VERSION:=4.3.0.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=fb600940ac54456bcde650ccee7055f7c9bb785b
+PKG_SOURCE_VERSION:=2e88092c5b54d12bc77aca6239a6e3f9aeb8e411
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0

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.20
+PKG_VERSION:=2.5.1.21
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=e570731d6544335568a48a5dc4c6e65aed401045
+PKG_SOURCE_VERSION:=693b79873af0017bd53ec001af7f3997565420e8
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-topology.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.xz

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

@@ -67,6 +67,22 @@ config_mcproxy_interfaces() {
 	done
 }
 
+config_sysfs_mcast_snooping() {
+	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
+			echo 1 > /sys/class/net/$downstream/bridge/multicast_snooping
+		fi
+	done
+}
+
 config_mcproxy_instance() {
 	local protocol="$1"
 	local version="$2"
@@ -124,6 +140,10 @@ config_mcproxy_instance() {
 		downstreams=$mld_p_down_interfaces
 	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 "$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

mcastmngr/files/linux/usr/libexec/rpcd/mcast

@@ -0,0 +1,151 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+. /lib/functions.sh
+
+read_mcast_stats() {
+
+	temp_igmp_file='/tmp/igmp_stats_'$$
+	# Sending signal to mcproxy to dump multicast data in /tmp/igmp_snooping_stats
+	mcast_pids=$(pidof mcproxy)
+	for pid in $mcast_pids
+	do
+		$(kill -10 $pid)
+	done
+	cat /tmp/igmp_snooping_stats > temp_igmp_file
+
+	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 < temp_igmp_file
+
+	while read line; do
+	# reading each line
+		case $line in
+		br-*)
+			found_ip=0
+			grp_ip="$(echo $line | awk -F ' ' '{ print $2 }')"
+			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 < temp_igmp_file
+
+	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 < temp_igmp_file
+		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 $2 }')"
+					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 $3 }')"
+					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 $4 }')"
+					json_add_string "device" "$src_port"
+					timeout="$(echo $line | awk -F ' ' '{ print $5 }')"
+					json_add_int "timeout" "$timeout"
+					json_close_object #close the associated device object
+					;;
+				esac
+			done < temp_igmp_file
+			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 temp_igmp_file
+}
+
+case "$1" in
+	list)
+		echo '{ "stats":{} }'
+		;;
+	call)
+		case "$2" in
+			stats)
+				read_mcast_stats
+				;;
+		esac
+		;;
+esac

obuspa/Makefile

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

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

@@ -10,7 +10,7 @@
      {
 --- a/src/core/data_model.h
 +++ b/src/core/data_model.h
-@@ -324,6 +324,7 @@ void DATA_MODEL_DumpSchema(void);
+@@ -325,6 +325,7 @@ void DATA_MODEL_DumpSchema(void);
  void DATA_MODEL_DumpInstances(void);
  char DATA_MODEL_GetJSONParameterType(char *path);
  int DATA_MODEL_SetParameterInDatabase(char *path, char *value);

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

@@ -1,6 +1,6 @@
 --- a/src/core/data_model.c
 +++ b/src/core/data_model.c
-@@ -1239,7 +1239,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
+@@ -1242,7 +1242,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
      // Exit if instance already exists - nothing to do
      if (exists)
      {
@@ -9,7 +9,7 @@
          return USP_ERR_CREATION_FAILURE;
      }
  
-@@ -1324,7 +1324,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
+@@ -1327,7 +1327,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
      // Exit if instance does not exist - nothing to do
      if (exists == false)
      {

obuspa/patches/0007-bdc_csv_format.patch

@@ -1,8 +1,6 @@
-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)
+@@ -547,11 +547,19 @@ int StartSendingReport(bdc_connection_t
  
      // Set the list of headers
      bc->headers = NULL;
@@ -25,8 +23,6 @@ index 3670361..6a6325d 100644
  
      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);
@@ -40,8 +36,6 @@ index ff37a2d..ee29c85 100644
 +#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 @@
@@ -78,7 +72,7 @@ index a7d1b3e..fab9731 100755
  } profile_ctrl_params_t;
  
  //------------------------------------------------------------------------------
-@@ -208,6 +217,7 @@ int Validate_BulkDataEncodingType(dm_req_t *req, char *value);
+@@ -208,6 +217,7 @@ int Validate_BulkDataEncodingType(dm_req
  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);
@@ -86,7 +80,7 @@ index a7d1b3e..fab9731 100755
  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);
+@@ -236,6 +246,8 @@ bulkdata_profile_t *bulkdata_find_profil
  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);
@@ -95,7 +89,7 @@ index a7d1b3e..fab9731 100755
  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);
+@@ -250,6 +262,7 @@ char *bulkdata_platform_calc_uri_query_s
  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);
@@ -135,7 +129,7 @@ index a7d1b3e..fab9731 100755
      // 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)
+@@ -591,9 +611,10 @@ int Validate_BulkDataProtocol(dm_req_t *
  int Validate_BulkDataEncodingType(dm_req_t *req, char *value)
  {
      // Exit if trying to set a value outside of the range we accept
@@ -148,12 +142,10 @@ index a7d1b3e..fab9731 100755
          return USP_ERR_INVALID_VALUE;
      }
  
-@@ -674,6 +695,32 @@ int Validate_BulkDataReportFormat(dm_req_t *req, char *value)
-     return USP_ERR_OK;
- }
+@@ -676,6 +697,32 @@ int Validate_BulkDataReportFormat(dm_req
  
-+/*********************************************************************//**
-+**
+ /*********************************************************************//**
+ **
 +** Validate_BulkDataCSVReportFormat
 +**
 +** Validates Device.BulkData.Profile.{i}.CSVEncoding.ReportFormat
@@ -178,10 +170,12 @@ index a7d1b3e..fab9731 100755
 +    return USP_ERR_OK;
 +}
 +
- /*********************************************************************//**
- **
++/*********************************************************************//**
++**
  ** Validate_BulkDataReportTimestamp
-@@ -1970,6 +2017,14 @@ int bulkdata_platform_get_profile_control_params(bulkdata_profile_t *bp, profile
+ **
+ ** Validates Device.BulkData.Profile.{i}.JSONEncoding.ReportTimestamp
+@@ -1970,6 +2017,14 @@ int bulkdata_platform_get_profile_contro
          return err;
      }
  
@@ -196,7 +190,7 @@ index a7d1b3e..fab9731 100755
      // 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
+@@ -1986,6 +2041,46 @@ int bulkdata_platform_get_profile_contro
          return err;
      }
  
@@ -243,7 +237,7 @@ index a7d1b3e..fab9731 100755
      return USP_ERR_OK;
  }
  
-@@ -2222,7 +2317,7 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+@@ -2222,7 +2317,7 @@ void bulkdata_process_profile_http(bulkd
  {
      int err;
      report_t *cur_report;
@@ -252,7 +246,7 @@ index a7d1b3e..fab9731 100755
      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)
+@@ -2261,10 +2356,23 @@ void bulkdata_process_profile_http(bulkd
      }
  
      // Exit if unable to generate the report
@@ -280,7 +274,7 @@ index a7d1b3e..fab9731 100755
          return;
      }
  
-@@ -2273,14 +2381,14 @@ void bulkdata_process_profile_http(bulkdata_profile_t *bp)
+@@ -2273,14 +2381,14 @@ void bulkdata_process_profile_http(bulkd
      USP_LOG_Info("BULK DATA: using compression method=%s", ctrl.compression);
      if (enable_protocol_trace)
      {
@@ -299,7 +293,7 @@ index a7d1b3e..fab9731 100755
      }
      // NOTE: From this point on, only the compressed_report exists
  
-@@ -2310,9 +2418,15 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+@@ -2310,9 +2418,15 @@ void bulkdata_process_profile_usp_event(
      kv_vector_t event_args;
      kv_pair_t kv;
      report_t *cur_report;
@@ -316,7 +310,7 @@ index a7d1b3e..fab9731 100755
  
      // 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)
+@@ -2321,20 +2435,62 @@ void bulkdata_process_profile_usp_event(
          goto exit;
      }
  
@@ -390,7 +384,7 @@ index a7d1b3e..fab9731 100755
      }
  
      // 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)
+@@ -2354,10 +2510,16 @@ void bulkdata_process_profile_usp_event(
      bp->num_retained_reports = 1;
  
      // Exit if unable to generate the report
@@ -410,7 +404,7 @@ index a7d1b3e..fab9731 100755
          return;
      }
  
-@@ -2365,15 +2527,15 @@ void bulkdata_process_profile_usp_event(bulkdata_profile_t *bp)
+@@ -2365,15 +2527,15 @@ void bulkdata_process_profile_usp_event(
  
      // Construct event_args manually to avoid the overhead of a malloc and copy of the report in KV_VECTOR_Add()
      kv.key = "Data";
@@ -429,12 +423,10 @@ index a7d1b3e..fab9731 100755
  
      // 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;
- }
+@@ -2835,6 +2997,219 @@ char *bulkdata_generate_json_report(bulk
  
-+/*********************************************************************//**
-+**
+ /*********************************************************************//**
+ **
 +** append_string_to_target
 +**
 +** concatenates the src string with target string in newly allocated memory
@@ -646,10 +638,12 @@ index a7d1b3e..fab9731 100755
 +    return output;
 +}
 +
- /*********************************************************************//**
- **
++/*********************************************************************//**
++**
  **  bulkdata_compress_report
-@@ -2986,9 +3361,18 @@ int bulkdata_schedule_sending_http_report(profile_ctrl_params_t *ctrl, bulkdata_
+ **
+ **  Compresses the report to send
+@@ -2986,9 +3361,18 @@ int bulkdata_schedule_sending_http_repor
          flags |= BDC_FLAG_DATE_HEADER;
      }
  

periodicstats/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.4.1
+PKG_VERSION:=1.4.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
@@ -42,9 +42,9 @@ define Package/periodicstats/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr
 	$(INSTALL_DIR) $(1)/usr/sbin
-	$(INSTALL_DIR) $(1)/usr/lib
-	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
-	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/usr/lib/bbfdm
+	$(INSTALL_DIR) $(1)/etc/bbfdm/services
+	$(INSTALL_DIR) $(1)/etc/bbfdm/services/periodicstats
+	$(CP) $(PKG_BUILD_DIR)/bbf_plugin/libperiodicstats.so $(1)/etc/bbfdm/services/periodicstats
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/periodicstatsd $(1)/usr/sbin
 endef
 

periodicstats/files/etc/bbfdm/services/periodicstats/input.json

@@ -0,0 +1,30 @@
+{
+	"daemon": {
+		"config": {
+			"refresh_time": 3600,
+			"enable_plugins": 0
+		},
+		"input": {
+			"type": "DotSo",
+			"name": "/etc/bbfdm/services/periodicstats/libperiodicstats.so"
+		},
+		"output": {
+			"type": "UBUS",
+			"name": "bbfdm.periodicstats"
+		}
+	},
+	"client": {
+		"config": {
+			"proto": "both",
+			"instance_mode": 0,
+			"enable_plugins": 0
+		},
+		"input": {
+			"type": "UBUS",
+			"name": "bbfdm.periodicstats"
+		},
+		"output": {
+			"type": "CLI"
+		}
+	}
+}

periodicstats/files/etc/init.d/periodicstats

@@ -4,7 +4,9 @@ START=99
 STOP=01
 
 USE_PROCD=1
-PROG=/usr/sbin/periodicstatsd
+PROG="/usr/sbin/periodicstatsd"
+BBFDMD_PROG="/usr/sbin/bbfdmd"
+PERIODICSTATS_JSON_INPUT="/etc/bbfdm/services/periodicstats/input.json"
 
 start_service() {
 	local enable
@@ -12,14 +14,18 @@ start_service() {
 	config_load periodicstats
 	config_get_bool enable globals enable 1
 
-	if [ "${enable}" -ne "1" ]; then
-		return 0;
-	fi
-
-	procd_open_instance periodicstatsd
-	procd_set_param command ${PROG}
+	procd_open_instance "bbfdm.periodicstats"
+	procd_set_param command "$BBFDMD_PROG"
+	procd_append_param command -I "${PERIODICSTATS_JSON_INPUT}"
 	procd_set_param respawn
-	procd_close_instance
+	procd_close_instance "bbfdm.periodicstats"
+
+	if [ "${enable}" -eq "1" ]; then
+		procd_open_instance "periodicstatsd"
+		procd_set_param command ${PROG}
+		procd_set_param respawn
+		procd_close_instance "periodicstatsd"
+	fi
 }
 
 service_triggers() {

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=2.1.4
+PKG_VERSION:=2.2.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=a910afbc0b0e812155a445fb6be5c0e41d2b2c3b
+PKG_SOURCE_VERSION:=1edef130673d186c9ffe030b9a1a3614974c1fad
 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.1.4
+PKG_VERSION:=2.2.0
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=472f75509965b297bdeaf07c21d02c813dd25763
+PKG_SOURCE_VERSION:=8797cb3efffdfac3d27a6d665f271b13d07d8335
 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-builder/files/etc/sulu/sulu.sh

@@ -111,6 +111,7 @@ function generate_sulu_conn_config()
 		json_add_string 'toId' "$(_get_endpoint_id)";
 		json_add_int 'port' "$(_get_sulu_tls_port)";
 		json_add_string 'path' "/ws";
+		json_add_boolean 'useSession' 1;
 		json_add_string 'protocol' 'wss';
 			json_add_array 'auth';
 			json_close_array;
@@ -266,6 +267,11 @@ function _update_obuspa_config_rbac() {
 			uci_set obuspa ${sec} Topic "/usp/${agent}/${f}/controller"
 			uci_set obuspa ${sec} mqtt "mqtt_sulu_$f"
 			uci_set obuspa ${sec} assigned_role_name "$f"
+			uci_set obuspa ${sec} SessionMode "Require"
+			restart=1
+		fi
+		if ! uci_get obuspa ${sec} SessionMode >/dev/null 2>&1; then
+			uci_set obuspa ${sec} SessionMode "Require"
 			restart=1
 		fi
 	done

sulu/sulu-multi-ap/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=2.1.4
+PKG_VERSION:=2.1.5
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=95ebfae55435b328f40fc753877fd62bf2e254f8
+PKG_SOURCE_VERSION:=26ab5ba51ea54b805d848ccd698b5d099bc57322
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

urlfilter/Makefile

@@ -6,13 +6,13 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=urlfilter
-PKG_VERSION:=1.1.5
+PKG_VERSION:=1.1.7
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/urlfilter.git
-PKG_SOURCE_VERSION:=e55a2c2c7c992eb5071e82734bdc8850b71b02e0
+PKG_SOURCE_VERSION:=76334ea7d3c01908760fb48608328f6a91cdd973
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

urlfilter/files/etc/bbfdm/json/urlfilter.json

@@ -163,7 +163,7 @@
 								"type": "profile"
 							},
 							"option": {
-								"name": "@Name"
+								"name": "name"
 							}
 						}
 					}

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.1.2
+PKG_VERSION:=1.1.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=467e30c6a41ce4b133284283a7a17d763e6921ff
+PKG_SOURCE_VERSION:=a1324993295d49023649456d90797e8f43a0c36a
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -27,7 +27,7 @@ define Package/usermngr
   SECTION:=utils
   CATEGORY:=Utilities
   SUBMENU:=TRx69
-  DEPENDS:= +shadow-utils +libbbfdm-api
+  DEPENDS:= +shadow-utils +libbbfdm-api +libcrypt
   TITLE:=Package to add Device.Users. datamodel support
 endef
 

voicemngr/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=voicemngr
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE
 
@@ -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:=6f2cc99016eb3c06eb3a22e4d1a0e264208721e6
+PKG_SOURCE_VERSION:=b9933ef78fee574e410a4247e5cc765a632b0822
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif