sulu: Add support to set env options

cherry-pick of fix from devel b41ec4ff65
Added hook of hosts config.change in topologyd service_trigger.

bbfdm/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.1.4
+PKG_VERSION:=1.1.15
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=dec994de5a1338bbda82c2fb01218d70bef9b09d
+PKG_SOURCE_VERSION:=a3f4807ea6ae75e05eff18a519137927fb3dca9b
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

bbfdm/files/etc/config/bbfdm

@@ -2,6 +2,6 @@
 config bbfdmd 'bbfdmd'
 	option enabled '1'
 	option loglevel '1'
-	option refresh_time '10'
-	option transaction_timeout '10'
+	option refresh_time '0'
+	option transaction_timeout '30'
 

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.0.2.6
+PKG_VERSION:=4.0.2.8
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=944a981d8d3f9548f464c862778b67455aee9112
+PKG_SOURCE_VERSION:=147d5d63cd4eec40bbfe25cf8af201df620b5a23
 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.11
+PKG_VERSION:=3.5.17
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=18dece420502e25a9bd9f3b534bc6c338fcc9377
+PKG_SOURCE_VERSION:=3e2eeaf2e5ed25d2ec31ee3878e9fe58eeaf4f78
 PKG_MIRROR_HASH:=skip
 endif
 

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.3.8
+PKG_VERSION:=9.3.8.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=09b7cd7a6b647dd8cbc038698af9298883b5c262
+PKG_SOURCE_VERSION:=4f4a43b31d5ff18ee5814acc21683dc30eaa6b33
 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.16
+PKG_VERSION:=8.1.18.1
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=4843afa0069c8eff18c6bdde6a5dd76625dc1ac5
+PKG_SOURCE_VERSION:=eecbdf46c506e640d8fa66ddb211f88f1de098f8
 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

libvoice-airoha/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.5
+PKG_VERSION:=1.0.7
 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:=3f4cdca981b30d54ec5a426775fdcec2a63f83d9
+PKG_SOURCE_VERSION:=5e1befd02c6734ee8b94b7ef54d6171ba1086042
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

libvoice-airoha/files/lib/voice/codecs.json

@@ -21,7 +21,8 @@
 		"ptime_max": 30,
 		"ptime_default": 20,
 		"ptime_increment": 10,
-		"bitrate": 16
+		"bitrate": 16,
+		"rtp_payload": 80
 	},
 	"g723": {
 		"name": "G.723.1",

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.1
+PKG_VERSION:=1.0.5
 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:=548f8fccc9f8f0b5dd6bb39bdd9cac8659400cb6
+PKG_SOURCE_VERSION:=8c8fa2b70e2bd570deb291478b31fa81a4ab3c1a
 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.6
+PKG_VERSION:=1.0.11
 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:=062a265754b93a865cfcd2745f200aa09fb4a668
+PKG_SOURCE_VERSION:=a30a6fa713f23ac46b99842e9bf099a6c2559b94
 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.107
+PKG_VERSION:=7.2.112
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1bd819ac21f86a0956b1f69ef1d110665e240a5f
+PKG_SOURCE_VERSION:=94e7f25c5a1f4d4ab3dc01b8a17219a7473f3a0d
 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

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.3.3.10
+PKG_VERSION:=4.3.3.18
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=644884a8b421fd830f793b94779876395eecd8e6
+PKG_SOURCE_VERSION:=e825ad6c077ff0217ffaf94934402696c2c3eb44
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause

map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul

@@ -2,7 +2,7 @@
 
 . /lib/network/utils.sh
 
-conn_ports_file="/tmp/map.connected.ports"
+conn_ports_file="/var/run/multiap/map.connected.ports"
 map_bh_file="/var/run/multiap/multiap.backhaul"
 al_bridge="$(uci -q get mapagent.agent.al_bridge)"
 [ "${al_bridge:0:3}" = "br-" ] || exit 0
@@ -16,6 +16,7 @@ if [ -n "$(which dynbhd)" ]; then
 	pidof dynbhd >/dev/null && exit 0 # dynbhd is managing the links
 
 	if [ ! -f $conn_ports_file ]; then
+		mkdir -p /var/run/multiap
 		touch $conn_ports_file
 		if [ "$LINK" = "up" ]; then
 			touch $conn_ports_file

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.3.0.8
+PKG_VERSION:=4.3.0.14
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=0d83f8acd66a4cb97f2f123149696334d7f03e6e
+PKG_SOURCE_VERSION:=a389d10448ff0cd244baafab37796bebb6c5206b
 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.24
+PKG_VERSION:=2.5.1.26
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=9f15e813c39ff23cef27975ce138bd3286f30adf
+PKG_SOURCE_VERSION:=f948eb6e5df4f75be10808798fcda0cb134a2c8f
 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
@@ -66,6 +66,7 @@ define Package/map-topology/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/topologyd $(1)/usr/sbin/
+	$(INSTALL_DATA) ./files/lib/hosts/hosts_acl.sh $(1)/lib/hosts/
 endef
 
 $(eval $(call BuildPackage,map-topology))

map-topology/files/etc/firewall.hosts

@@ -1,114 +1,7 @@
 #!/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=""
-}
+. /lib/hosts/hosts_acl.sh
 
 iptables -w -F hosts_forward
 ip6tables -w -F hosts_forward

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

@@ -1,11 +1,14 @@
 #!/bin/sh /etc/rc.common
 
+. /lib/hosts/hosts_acl.sh
+
 START=97
 STOP=21
 
 USE_PROCD=1
 
 IS_CFG_VALID=1
+EXTRA_COMMANDS="notify_hosts_acl"
 
 validate_topology_config() {
 	uci_validate_section topology topology "topology" \
@@ -81,11 +84,18 @@ start_service() {
 #	procd_set_param stdout 1
 	procd_set_param stderr 1
 	procd_close_instance
+	hosts_acl
+}
+
+notify_hosts_acl()
+{
+	hosts_acl
 }
 
 service_triggers()
 {
 	procd_add_reload_trigger "network"
+	procd_add_config_trigger "config.change" "hosts" /etc/init.d/topologyd notify_hosts_acl
 }
 
 reload_service() {

map-topology/files/lib/hosts/hosts_acl.sh

@@ -0,0 +1,234 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+day=""
+next_days=""
+prev_days=""
+IP_RULE=""
+IP_RULE1=""
+
+get_next_day() {
+	local weekday="$1"
+	case "$weekday" in
+		"Mon"|"Monday") echo "Tuesday"
+		;;
+		"Tue"|"Tuesday") echo "Wednesday"
+		;;
+		"Wed"|"Wednesday") echo "Thursday"
+		;;
+		"Thu"|"Thursday") echo "Friday"
+		;;
+		"Fri"|"Friday") echo "Saturday"
+		;;
+		"Sat"|"Saturday") echo "Sunday"
+		;;
+		"Sun"|"Sunday") echo "Monday"
+		;;
+	esac
+}
+
+get_previous_day() {
+	local weekday="$1"
+	case "$weekday" in
+		"Mon"|"Monday") echo "Sunday"
+		;;
+		"Tue"|"Tuesday") echo "Monday"
+		;;
+		"Wed"|"Wednesday") echo "Tuesday"
+		;;
+		"Thu"|"Thursday") echo "Wednesday"
+		;;
+		"Fri"|"Friday") echo "Thursday"
+		;;
+		"Sat"|"Saturday") echo "Friday"
+		;;
+		"Sun"|"Sunday") echo "Saturday"
+		;;
+	esac
+}
+
+ip_rule_west_zone() {
+	local utc_start_t_h="$1"
+	local utc_stop_t_h="$2"
+	local local_start_t_h="$3"
+	local local_stop_t_h="$4"
+	local utc_start_time="$5"
+	local utc_stop_time="$6"
+
+	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
+		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
+		if [ -n "$next_days" ]; then
+			IP_RULE="$IP_RULE --weekdays $next_days"
+		fi
+	else
+		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
+			IP_RULE1="$IP_RULE"
+			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop 23:59"
+			IP_RULE1="$IP_RULE1 -m time --timestart 00:00 --timestop $utc_stop_time"
+			if [ -n "$next_days" ]; then
+				IP_RULE1="$IP_RULE1 --weekdays $next_days"
+			fi
+		else
+			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
+		fi
+		if [ -n "$day" ]; then
+			IP_RULE="$IP_RULE --weekdays $day"
+		fi
+	fi
+}
+
+ip_rule_east_zone() {
+	local utc_start_t_h="$1"
+	local utc_stop_t_h="$2"
+	local local_start_t_h="$3"
+	local local_stop_t_h="$4"
+	local utc_start_time="$5"
+	local utc_stop_time="$6"
+
+	if [ "$utc_start_t_h" -lt "$local_start_t_h" ]; then
+		IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
+		if [ -n "$day" ]; then
+			IP_RULE="$IP_RULE --weekdays $day"
+		fi
+	else
+		if [ "$utc_stop_t_h" -lt "$local_stop_t_h" ]; then
+			IP_RULE1="$IP_RULE"
+			IP_RULE="$IP_RULE -m time --timestart 00:00 --timestop $utc_stop_time"
+			IP_RULE1="$IP_RULE1 -m time --timestart $utc_start_time --timestop 23:59"
+			if [ -n "$prev_days" ]; then
+				IP_RULE1="$IP_RULE1 --weekdays $prev_days"
+			fi
+		else
+			IP_RULE="$IP_RULE -m time --timestart $utc_start_time --timestop $utc_stop_time"
+		fi
+		if [ -n "$day" ]; then
+			IP_RULE="$IP_RULE --weekdays $day"
+		fi
+	fi
+}
+
+process_ac_schedule() {
+	local acs_id="$1"
+	local is_enabled
+	local access_control
+	local start_time=""
+	local mac=""
+
+
+	handle_day_list() {
+		local value=$1
+
+		val=$(echo $value | cut -c 1-3)
+		next_day_val=$(get_next_day $val)
+		prev_day_val=$(get_previous_day $val)
+		if [ -z $day ]; then
+			day="$val"
+			next_days="$next_day_val"
+			prev_days="$prev_day_val"
+		else
+			day="$day,$val"
+			next_days="$next_days,$next_day_val"
+			prev_days="$prev_days,$prev_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=""
+	IP_RULE1=""
+
+	config_get is_enabled "$access_control" "enable" 1
+	if [ "$is_enabled" == "0" ]; then
+		return
+	fi
+	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
+
+	zone=$(date +%z | cut -c 1)
+	local_start_time=$start_time
+        if [ -n "$duration" ]; then
+		hh=$(echo $local_start_time | awk -F: '{ print $1 }')
+                mm=$(echo $local_start_time | awk -F: '{ print $2 }')
+                hh_s=`expr $hh \* 3600`
+                mm_s=`expr $mm \* 60`
+                ss=$(( hh_s + mm_s ))
+		local_start_hh=$hh
+
+		stop_ss=$(( ss + duration ))
+		hh=$(( stop_ss / 3600 ))
+		rem_ss=$(( stop_ss % 3600 ))
+		mm=$(( rem_ss / 60 ))
+		ss=$(( rem_ss % 60 ))
+		local_stop_time="$hh:$mm:$ss"
+		local_stop_hh=$hh
+	fi
+
+	utc_start_time=$(date -u -d @$(date "+%s" -d "$local_start_time") +%H:%M)
+	utc_stop_time=$(date -u -d @$(date "+%s" -d "$local_stop_time") +%H:%M)
+	utc_start_hh=$(echo $utc_start_time | awk -F: '{ print $1 }')
+	utc_stop_hh=$(echo $utc_stop_time | awk -F: '{ print $1 }')
+	if [ "$zone" == "-" ]; then
+		ip_rule_west_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
+	else
+		ip_rule_east_zone $utc_start_hh $utc_stop_hh $local_start_hh $local_stop_hh $utc_start_time $utc_stop_time
+	fi
+
+	if [ "$access_policy" == "Deny" ]; then
+		IP_RULE="$IP_RULE -j DROP"
+		if [ -n "$IP_RULE1" ]; then
+			IP_RULE1="$IP_RULE1 -j DROP"
+		fi
+	else
+		IP_RULE="$IP_RULE -j ACCEPT"
+		if [ -n "$IP_RULE1" ]; then
+			IP_RULE1="$IP_RULE1 -j ACCEPT"
+		fi
+	fi
+
+	iptables -w -A hosts_forward ${IP_RULE}
+	ip6tables -w -A hosts_forward ${IP_RULE}
+	if [ -n "$IP_RULE1" ]; then
+		iptables -w -A hosts_forward ${IP_RULE1}
+		ip6tables -w -A hosts_forward ${IP_RULE1}
+	fi
+
+	day=""
+	next_days=""
+	prev_days=""
+}
+
+hosts_acl() {
+	iptables -w -F hosts_forward
+	ip6tables -w -F hosts_forward
+
+	hosts_forward=$(iptables -t filter --list | grep hosts_forward)
+	if [ -z "$hosts_forward" ]; then
+		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
+	fi
+
+	# Load /etc/config/hosts UCI file
+	config_load hosts
+	config_foreach process_ac_schedule ac_schedule
+}

obuspa/Makefile

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

obuspa/files/etc/config/obuspa

@@ -4,9 +4,9 @@ config obuspa 'global'
 	option log_level '1'
 	option prototrace '0'
 	option db_file '/etc/obuspa/usp.db'
-	#option role_file '/etc/obuspa/roles.json'
+	option role_file '/etc/obuspa/roles.json'
 	option dm_caching_exclude '/etc/obuspa/dmcaching_exclude.json'
 	#option trust_cert '/etc/obuspa/rootCA.pem'
 	#option client_cert '/etc/obuspa/client.pem'
-	#option log_dest '/var/log/obuspa'
+	#option log_dest '/tmp/obuspa.log'
 

obuspa/files/etc/obuspa/roles.json

@@ -1,7 +1,18 @@
 {
   "roles": [
     {
-      "name": "admin",
+      "name": "full_access",
+      "permission": [
+        {
+          "object": "Device.",
+          "perm": [
+            "PERMIT_ALL"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "Untrusted",
       "permission": [
         {
           "object": "Device.",
@@ -13,31 +24,44 @@
           "object": "Device.DeviceInfo.",
           "perm": [
             "PERMIT_GET",
-            "PERMIT_GET_INST"
-          ]
-        },
-        {
-          "object": "Device.WiFi.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_SET",
-            "PERMIT_ADD",
-            "PERMIT_DEL",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP",
             "PERMIT_GET_INST",
             "PERMIT_OBJ_INFO",
             "PERMIT_CMD_INFO"
           ]
         },
         {
-          "object": "Device.IP.",
+          "object": "Device.DeviceInfo.ProcessStatus.",
           "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST"
+            "PERMIT_NONE"
+          ]
+        },
+        {
+          "object": "Device.DeviceInfo.VendorConfigFile.",
+          "perm": [
+            "PERMIT_NONE"
+          ]
+        },
+        {
+          "object": "Device.DeviceInfo.VendorLogFile.",
+          "perm": [
+            "PERMIT_NONE"
+          ]
+        },
+        {
+          "object": "Device.DeviceInfo.Processor.",
+          "perm": [
+            "PERMIT_NONE"
+          ]
+        }
+      ]
+    },
+    {
+      "name": "admin",
+      "permission": [
+        {
+          "object": "Device.",
+          "perm": [
+            "PERMIT_ALL"
           ]
         }
       ]
@@ -55,40 +79,289 @@
           "object": "Device.DeviceInfo.",
           "perm": [
             "PERMIT_GET",
-            "PERMIT_GET_INST"
-          ]
-        },
-        {
-          "object": "Device.WiFi.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP",
             "PERMIT_GET_INST",
             "PERMIT_OBJ_INFO",
             "PERMIT_CMD_INFO"
           ]
         },
+        {
+          "object":"Device.Time.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.UPnP.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.Bridging.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.Ethernet.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.DHCPv4.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.DHCPv6.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.Hosts.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.NAT.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.PPP.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.Routing.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.IEEE1905.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.InterfaceStack.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.DynamicDNS.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.LANConfigSecurity.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.Security.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.RouterAdvertisement.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.Services.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.UserInterface.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.PeriodicStatistics.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.SoftwareModules.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.Users.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object":"Device.XMPP.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO"
+          ]
+        },
+        {
+          "object": "Device.LocalAgent.Subscription.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_ADD",
+            "PERMIT_SET",
+            "PERMIT_DEL"
+          ]
+        },
+        {
+          "object": "Device.WiFi.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        },
+        {
+          "object": "Device.DNS.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        },
         {
           "object": "Device.IP.",
           "perm": [
             "PERMIT_GET",
-            "PERMIT_GET_INST"
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP"
           ]
         }
       ]
     },
     {
-      "name": "undefined-1"
-    },
-    {
-      "name": "undefined-2"
-    },
-    {
-      "name": "undefined-3"
+      "name": "extender",
+      "permission": [
+        {
+          "object": "Device.",
+          "perm": [
+            "PERMIT_NONE"
+          ]
+        },
+        {
+          "object": "Device.SSH.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        }
+      ]
     },
     {
       "name": "undefined-4"

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

@@ -392,10 +392,10 @@ create_ebtables_chains() {
     ebtables -t broute -N qos
     ret=$?
     if [ $ret -eq 0 ]; then
-        ebtables -t broute -I BROUTING -j qos
+        ebtables -t broute -A BROUTING -j qos
     else
         ebtables -t broute -D BROUTING -j qos
-        ebtables -t broute -I BROUTING -j qos
+        ebtables -t broute -A BROUTING -j qos
     fi
 }
 

self-diagnostics/Makefile

@@ -0,0 +1,35 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=self-diagnostics
+PKG_VERSION:=1.0.2
+PKG_RELEASE:=1
+
+PKG_LICENSE:=GPL-2.0-only
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/self-diagnostics
+  CATEGORY:=Utilities
+  TITLE:=System Report
+  DEPENDS:=+@CONFIG_BUSYBOX_CONFIG_TIMEOUT +@CONFIG_BUSYBOX_CONFIG_FEATURE_FIND_PATH +@CONFIG_BUSYBOX_CONFIG_TEE \
+           +@CONFIG_BUSYBOX_CONFIG_GZIP
+endef
+
+define Package/self-diagnostics/description
+	Generate Self test diagnostics report
+endef
+
+#define Build/Prepare
+#	mkdir -p $(PKG_BUILD_DIR)
+#	$(CP) ./files/* $(PKG_BUILD_DIR)/
+#endef
+
+define Build/Compile
+endef
+
+define Package/self-diagnostics/install
+	$(INSTALL_DIR) $(1)/etc/self-diagnostics/spec/
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,self-diagnostics))

self-diagnostics/README.md

@@ -0,0 +1,188 @@
+# Self Test Diagnostics and Reports
+
+Self test diagnostics package provides a set of tools and recipes to run diagnostics/commands and collect logs.
+
+It provides a cli utility called `self-diagnostics`, which executes recipes defined in json files and collect logs.
+```bash
+# self-diagnostics -h
+Generate self diagnostics report
+
+Syntax: /usr/sbin/self-diagnostics [-m|h|l|j]
+
+Options:
+  l     List available module(s)
+  m     Generate system report of specific module(s)
+  j     Enable JSON output
+  h     Print this help
+```
+
+It also has an uci file to configure the various parameters:
+
+```bash
+# cat /etc/config/self-diagnostics 
+config globals 'globals'
+        option extended_spec_dir '/etc/self-diagnostics/spec'
+        option exec_timeout '5'
+        option report_name 'self-diagnostics-report-$MODEL-$SERIAL'
+        option verbose '0'
+        option compression_level '9'
+```
+
+Here:
+
+| Options            |  Description                    |
+| ------------------ | ------------------------------- |
+| extended_spec_dir  | Directory path to store 3rd-party/user diagnostics recipes |
+| exec_timeout       | Timeout used for each command |
+| report_name        | Name of the generated report file, here $MODEL and $SERIAL replaced with ProductModel and SerialNumber |
+| verbose            | Logs everythings to logread as well |
+| commpression_level | Gzip compression_level 0-9, if not set, then report will not gziped |
+
+
+It also provide, a rpcd script to expose `self-diagnostics` over ubus
+
+```bash
+# ubus -v list self-diagnostics
+'self-diagnostics' @2c0b768d
+        "list":{}
+        "generate":{"modules":"String"}
+```
+
+## Recipe(s)
+
+It has core modules and extended modules.
+
+Core module recipes are present in `/usr/share/self-diagnostics/spec/` path, where as
+extended module recipes are defined in uci option 'self-diagnostics.globals.extended_spec_dir'
+
+Both the spec directories has recipes to run diagnostics and collect logs, these recipes are defined in json files.
+
+```bash
+# ls /usr/share/self-diagnostics/spec/
+config.json   network.json  trx69.json    wifi.json
+multiap.json  system.json   voice.json
+```
+
+Each json file need to follow below structure:
+
+```json
+{
+  "description": "<Description of module>",
+  "dependency": [
+    {
+      "type": "file",
+      "file": "<filepath>"
+    }
+  ],
+  "exec": [
+    {
+      "description": "<Description of command>",
+      "cmd": "<command To Execute>",
+      "dependency": [
+        {
+          "type": "file",
+          "file": "<filepath>"
+        }
+      ]
+    },
+    {
+      "description": "<Next command description>",
+      "cmd": "<command to execute>"
+    }
+  ]
+}
+```
+
+## How to use
+
+This can be run from command line, ubus , USP-Controller and ACS.
+
+### List available core/extension modules
+
+```bash
+# self-diagnostics -l
+
+Core Module(s):
+ - config
+ - multiap
+ - network
+ - system
+ - trx69
+ - voice
+ - wifi
+
+Extension Module(s):
+```
+
+### Run and collect logs
+
+```bash
+# self-diagnostics 
+/tmp/self-diagnostics-report-EX600-Y.0721140081.tar.gz
+```
+
+### List available core/extension modules over ubus
+
+```bash
+# ubus call self-diagnostics list
+{
+        "CoreModules": [
+                "config",
+                "multiap",
+                "network",
+                "system",
+                "trx69",
+                "voice",
+                "wifi"
+        ],
+        "ExtensionModules": [
+
+        ]
+}
+```
+
+### Run specific module from ubus
+
+```bash
+# ubus call self-diagnostics generate '{"modules":"config"}'
+{
+        "result": "/tmp/self-diagnostics-report-EX600-Y.0721140081.tar.gz"
+}
+```
+
+## TR-181 Integration
+
+
+TR-181 (USP) provides an Operate command `Device.SelfTestDiagnostics()` to execute it from USP-controllers.
+TR-181 (CWMP) provides a diagnostics object `Device.SelfTestDiagnostics.` for the same, so its can be triggered from ACS as well.
+
+```bash
+# ubus call bbfdm operate '{"command":"Device.SelfTestDiagnostics()"}'
+{
+        "results": [
+                {
+                        "path": "Device.SelfTestDiagnostics()",
+                        "data": "",
+                        "output": [
+                                {
+                                        "Results": "Device.DeviceInfo.VendorLogFile.2",
+                                        "Status": "Complete"
+                                }
+                        ]
+                }
+        ]
+}
+```
+
+
+Once the opreate command is done, it generate a new entry in VendorLogFile, like below:
+
+```bash
+# bbfdmd -c get Device.DeviceInfo.VendorLogFile.2.
+Device.DeviceInfo.VendorLogFile.2.Alias => cpe-2
+Device.DeviceInfo.VendorLogFile.2.Name => /tmp/self-diagnostics-report-EX600-Y.0721140081.tar.gz
+Device.DeviceInfo.VendorLogFile.2.MaximumSize => 0
+Device.DeviceInfo.VendorLogFile.2.Persistent => 0
+```
+
+Which is then can be uploaded to a server using `Device.DeviceInfo.VendorLogFile.{i}.Upload()` operate command.

self-diagnostics/files/etc/config/self-diagnostics

@@ -0,0 +1,6 @@
+config globals 'globals'
+	option extended_spec_dir '/etc/self-diagnostics/spec'
+	option exec_timeout '5'
+	option report_name 'self-diagnostics-report-$MODEL-$SERIAL'
+	option verbose '0'
+	option compression_level '9'

self-diagnostics/files/usr/libexec/rpcd/self-diagnostics

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+BIN="/usr/sbin/self-diagnostics"
+. /usr/share/libubox/jshn.sh
+
+case "$1" in
+	list)
+		echo '{"list": {}, "generate" : {"modules":"String"}}'
+	;;
+	call)
+		case "$2" in
+			generate)
+				read -t 1 -r input
+
+				json_load "${input}"
+				json_get_var modules modules
+				if [ -z "${modules}" ]; then
+					${BIN} -j
+				else
+					${BIN} -j -m "${modules}"
+				fi
+			;;
+			list)
+				${BIN} -j -l
+			;;
+		esac
+	;;
+esac

self-diagnostics/files/usr/sbin/self-diagnostics

@@ -0,0 +1,383 @@
+#!/bin/sh
+
+. /usr/share/libubox/jshn.sh
+
+JSON_OUT=0
+SPEC_DIR="/usr/share/self-diagnostics/spec"
+SPEC_EXT_DIR="/etc/self-diagnostics/spec"
+REPORT_DIR="$(mktemp -d)"
+REPORT_NAME="self-test-diagnostics"
+VERBOSE=0
+COMPOPTS=""
+TIMEOUT=5
+
+cleanup()
+{
+	[ -d "${REPORT_DIR}" ] && \
+		rm -rf ${REPORT_DIR}
+}
+
+trap cleanup EXIT
+
+help()
+{
+	echo "Generate self diagnostics report"
+	echo
+	echo "Syntax: $0 [-m|h|l|j]"
+	echo
+	echo "Options:"
+	echo "  l     List available module(s)"
+	echo "  m     Generate system report of specific module(s)"
+	echo "  j     Enable JSON output"
+	echo "  h     Print this help"
+	echo
+}
+
+log()
+{
+	log_file="${REPORT_DIR}/execution.log"
+	if [ "$VERBOSE" -eq 1 ]; then
+		logger -t $0 "$*" 
+	fi
+	echo "[$(date +%Y:%m:%d-%H:%M:%S)] $*" >> ${log_file}
+}
+
+# Alias ubus to have a smaller 5-second timeout on all subsequent calls
+ubus()
+{
+	if [ "${1}" == "call" ]; then
+		if command ubus list $2 >/dev/null 2>&1; then
+			command ubus "$@";
+		fi
+	else
+		command ubus "$@";
+	fi
+
+}
+
+config_load()
+{
+	local temp
+	local MODEL SERIAL
+
+	log "# Starting Self diagnostics tests #"
+
+	MODEL="$(db get device.deviceinfo.ModelName)"
+	SERIAL="$(db get device.deviceinfo.SerialNumber)"
+
+	temp="$(uci -q get self-diagnostics.globals.extended_spec_dir)"
+	[ -d "${temp}" ] && \
+		SPEC_EXT_DIR="${temp}"
+
+	temp="$(uci -q get self-diagnostics.globals.exec_timeout)"
+	[ -n "${temp}" ] && \
+		TIMEOUT="${temp}"
+
+	temp="$(uci -q get self-diagnostics.globals.report_name)"
+	[ -n "${temp}" ] && \
+		REPORT_NAME="$(eval echo ${temp})"
+
+	REPORT_NAME="${REPORT_NAME// /_}"
+
+	temp="$(uci -q get self-diagnostics.globals.compression_level)"
+	[ -n "${temp}" ] && \
+		COMPOPTS="${temp}"
+
+	temp="$(uci -q get self-diagnostics.globals.verbose)"
+	[ -n "${temp}" ] && \
+		VERBOSE="${temp}"
+}
+
+exec_spec()
+{
+	local json_file exec_skip name timeout exec_timeout rc
+
+	json_file="$1"
+	[ -z "$json_file" ] && {
+		log "No/invalid spec json_file"
+		return 1
+	}
+
+	log "Loading $json_file ..."
+
+	json_init
+	json_load_file "${json_file}" || {
+		log "Failed to load ${json_file} spec file"
+		return 1
+	}
+
+	name="$(basename ${json_file})"
+	export_path="${REPORT_DIR}/${name//.json/.log}"
+
+	exec_skip=0
+	if json_is_a dependency array; then
+		json_select "dependency"
+		json_get_keys ekeys
+
+		for key in $ekeys; do
+			if json_is_a $key object; then
+				json_select $key
+				json_get_var type type
+
+				if [ "$type" == "file" ]; then
+					json_get_var file file
+					if [ ! -e "$file" ]; then
+						log "${json_file} has unmet file dependency $file"
+						exec_skip=1
+						json_select ..
+						continue
+					fi
+				fi
+				json_select ..
+			fi
+		done
+		json_select ..
+	fi
+
+	[ "${exec_skip}" -eq 1 ] && {
+		log "Dependency not satisfied for ${json_file}"
+		return 0
+	}
+
+	json_get_var description description
+	log "Description: $description"
+
+	if json_is_a exec array; then
+		json_select "exec"
+		json_get_keys keys
+
+		for key in $keys; do
+			if json_is_a $key object; then
+				json_select $key
+				cmd_skip=0
+				if json_is_a dependency array; then
+					json_select "dependency"
+					json_get_keys d_keys
+
+					for d_key in $d_keys; do
+						if json_is_a $d_key object; then
+							json_select $d_key
+							json_get_var type type
+							if [ "$type" == "file" ]; then
+								json_get_var file file
+								if [ ! -e $file ]; then
+									json_select ..
+									cmd_skip=1
+									continue
+								fi
+							fi
+							json_select ..
+						fi
+					done
+					json_select ..
+				fi
+
+				[ $cmd_skip -eq 1 ] && {
+					json_select ..
+					log "Dependency not satisfied for ${file}"
+					continue
+				}
+
+				json_get_var description description
+				json_get_var cmd cmd
+				json_get_var timeout timeout
+
+				if [ -n "$timeout" ]; then
+					exec_timeout=$timeout
+				else
+					exec_timeout=$TIMEOUT
+				fi
+				log "Executing $cmd with timeout $exec_timeout"
+				echo "##########################################" >> $export_path
+				echo "# $description #">> $export_path
+				echo "# Exec [$cmd], timeout [$exec_timeout] #" >> $export_path
+				echo "##########################################" >> $export_path
+				if [ "$VERBOSE" -eq 1 ]; then
+					if [[ "$cmd" == *"logread "* ]]; then
+						eval timeout ${exec_timeout} $cmd 2>&1 | tee -a $export_path
+						rc=$?
+					else
+						eval timeout ${exec_timeout} $cmd 2>&1 | tee -a $export_path | logger -t self-diagnostics
+						rc=$?
+					fi
+				else
+					eval timeout ${exec_timeout} $cmd >> $export_path 2>&1
+					rc=$?
+				fi
+				echo "######## Execution return code $rc ######" >> $export_path
+
+				if [ "$rc" -eq 0 ]; then
+					log "Execution [$cmd] completed"
+				else
+					log "Execution [$cmd] Failed/Timeout with $rc exit code"
+				fi
+
+				echo >> $export_path
+				json_select ..
+			fi
+		done
+		json_select ..
+	fi
+
+	log "Handling of $json_file done"
+	log ""
+}
+
+generate_module()
+{
+	local modules="${@}"
+	local file module
+
+	config_load
+
+	log "Modules [$@]"
+	for module in $modules; do
+		module="${module/.json/}"
+		file="$(find $SPEC_DIR -type f -name ${module}.json)"
+		[ -z "$file" ] && {
+			[ -d "${SPEC_EXT_DIR}" ] && \
+				file="$(find $SPEC_EXT_DIR -type f -name ${module}.json)"
+		}
+
+		[ -f "$file" ] && \
+			exec_spec "$file"
+	done
+}
+
+generate_all()
+{
+	local files
+
+	config_load
+
+	files="$(find ${SPEC_DIR} -type f -name *.json)"
+	[ -d "${SPEC_EXT_DIR}" ] && \
+		files="${files} $(find $SPEC_EXT_DIR -type f -name *.json)"
+
+	[ -z "$files" ] && {
+		return 0
+	}
+
+	for file in $files; do
+		exec_spec "$file"
+	done
+
+}
+
+list_modules()
+{
+	local files
+
+	if [ "${JSON_OUT}" -eq 1 ]; then
+		json_init
+		json_add_array "CoreModules"
+	else
+		echo
+		echo "Core Module(s):"
+	fi
+
+	cd ${SPEC_DIR} && {
+		for file in $(ls); do
+			if [ "${JSON_OUT}" -eq 1 ]; then
+				json_add_string "" "${file/.json/}"
+			else
+				echo " - ${file/.json/}"
+			fi
+		done
+	}
+
+	if [ "${JSON_OUT}" -eq 1 ]; then
+		json_close_array
+		json_add_array "ExtensionModules"
+	else
+		echo
+		echo "Extension Module(s):"
+	fi
+
+	cd ${SPEC_EXT_DIR} && {
+		for file in $(ls); do
+			if [ "${JSON_OUT}" -eq 1 ]; then
+				json_add_string "" "${file/.json/}"
+			else
+				echo " - ${file/.json/}"
+			fi
+		done
+	}
+
+	if [ "${JSON_OUT}" -eq 1 ]; then
+		json_close_array
+		json_dump
+	else
+		echo
+	fi
+}
+
+generate_report()
+{
+	local filename report_path
+
+	report_path="$(dirname "${REPORT_DIR}")"
+	filename="${report_path}/${REPORT_NAME}"
+
+	[ -f "${filename}.tar" ] && rm "${filename}.tar"
+	[ -f "${filename}.tar.gz" ] && rm "${filename}.tar.gz"
+
+	log "# Report generation completed #"
+	cd ${REPORT_DIR} && {
+		filename="${filename}.tar"
+		tar -cf "${filename}" *
+	}
+
+	rm -r "$REPORT_DIR"
+
+	if [ -n "$COMPOPTS" ]; then
+		gzip -${COMPOPTS} -f "${filename}"
+		filename="${filename}.gz"
+	fi
+
+	if [ "${JSON_OUT}" -eq 1 ]; then
+		json_init
+		json_add_string result "${filename}"
+		json_dump
+	else
+		echo "${filename}"
+	fi
+}
+
+[ ! -d "${SPEC_DIR}" ] && {
+	log "# ${SPEC_DIR} does not exits"
+	exit 1
+}
+
+list=0
+modules=""
+
+while getopts "m:hlj" opts; do
+	case $opts in
+		h)
+			help
+			exit;;
+		j)
+			JSON_OUT=1
+			;;
+		l)
+			list=1
+			;;
+		m)
+			modules="$modules ${OPTARG}"
+			;;
+	esac
+done
+
+if [ "${list}" -eq 1 ]; then
+	list_modules
+	exit 0
+fi
+
+if [ -z "${modules}" ]; then
+	generate_all
+else
+	generate_module ${modules}
+fi
+
+generate_report

self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_assoclist.sh

@@ -0,0 +1,11 @@
+interfaces=$(uci show wireless | grep "ifname=" |  awk -F'[.,=]' '{print$2}')
+for int in $interfaces; do
+	mode=$(uci get "wireless.${int}.mode")
+	if [ "$mode" = "ap" ] ; then
+		ap_int=$(uci get "wireless.${int}.ifname")
+		echo "Get assoc list for ${ap_int}"
+		ubus call "wifi.ap.${ap_int}" assoclist
+		echo "Get station info for ${ap_int}"
+		ubus call "wifi.ap.${ap_int}" stations
+	fi
+done

self-diagnostics/files/usr/share/self-diagnostics/helper/wifi_radio_scan.sh

@@ -0,0 +1,5 @@
+for radio_if in $(ubus list 'wifi.radio.*'); do
+	ubus call "${radio_if}" scan
+	sleep 2
+	ubus call "${radio_if}" scanresults
+done

self-diagnostics/files/usr/share/self-diagnostics/spec/config.json

@@ -0,0 +1,29 @@
+{
+	"description": "Gathering configuration data",
+	"exec" : [
+		{
+			"description": "OS Release",
+			"cmd": "cat /etc/os-release"
+		},
+		{
+			"description": "Installed Packages",
+			"cmd": "opkg list-installed"		
+		},
+		{
+			"description": "Database",
+			"cmd": "db export"		
+		},
+		{
+			"description": "Configuration",
+			"cmd": "uci export"		
+		},
+		{
+			"description": "Runtime Configuration",
+			"cmd": "cat /var/state/*"
+		},
+		{
+			"description": "Firmware Environment",
+			"cmd": "fw_printenv"		
+		}										
+	]
+}

self-diagnostics/files/usr/share/self-diagnostics/spec/multiap.json

@@ -0,0 +1,67 @@
+{
+	"description": "Gathering EasyMesh state",
+	"dependency" : [
+		{
+			"type": "file",
+			"file": "/etc/config/mapagent"
+		},
+		{
+			"type": "file",
+			"file": "/etc/config/ieee1905"
+		}	
+	],
+	"exec" : [
+		{
+			"description": "Topology Hosts",
+			"cmd": "ubus call topology hosts"
+		},
+		{
+			"description": "Topology Dump",
+			"cmd": "ubus call topology dump"
+		},
+		{
+			"description": "IEEE1905 Info",
+			"cmd": "ubus call ieee1905 info"
+		},
+		{
+			"description": "IEEE1905 Links",
+			"cmd": "ubus call ieee1905 links"
+		},
+		{
+			"description": "IEEE1905 Neighbors",
+			"cmd": "ubus call ieee1905 neighbors"
+		},
+		{
+			"description": "IEEE1905 Others",
+			"cmd": "ubus call ieee1905 others"
+		},
+		{
+			"description": "MAP Agent Info",
+			"cmd": "ubus call map.agent info"
+		},				
+		{
+			"description": "MAP Agent Status",
+			"cmd": "ubus call map.agent status"
+		},
+		{
+			"description": "MAP Agent Backhaul Info",
+			"cmd": "ubus call map.agent backhaul_info"
+		},		
+		{
+			"description": "MAP Controller Status",
+			"cmd": "ubus call map.controller status"
+		},
+		{
+			"description": "MAP Controller List MACs",
+			"cmd": "ubus call map.controller.dbg list_macs"
+		},
+		{
+			"description": "MAP Controller BH Topology Dump",
+			"cmd": "ubus call map.controller.dbg bh_topology_dump"
+		},
+		{
+			"description": "Data Elements Dump",
+			"cmd": "ubus call wifi.dataelements.collector refresh; sleep 2; ubus call wifi.dataelements.collector dump2"
+		}																																			
+	]
+}

self-diagnostics/files/usr/share/self-diagnostics/spec/network.json

@@ -0,0 +1,89 @@
+{
+	"description": "Gathering network state",
+	"exec" : [
+		{
+			"description": "Network Device Status",
+			"cmd": "ubus call network.device status"
+		},
+		{
+			"description": "Network Interface Dump",
+			"cmd": "ubus call network.interface dump"
+		},
+		{
+			"description": "Linux Network Interface Config",
+			"cmd": "ifconfig -a"
+		},		
+		{
+			"description": "IPv4 Routes",
+			"cmd": "ip -d r"
+		},
+		{
+			"description": "IPv6 Routes",
+			"cmd": "ip -d -6 r"
+		},
+		{
+			"description": "Neighbor Table",
+			"cmd": "ip n"
+		},
+		{
+			"description": "ARP Table",
+			"cmd": "cat /proc/net/arp"
+		},
+		{
+			"description": "Conntrack Table",
+			"cmd": "cat /proc/net/nf_conntrack"
+		},
+		{
+			"description": "Network Interface Status",
+			"cmd": "ip -d a"
+		},
+		{
+			"description": "IPv4 Firewall Status",
+			"cmd": "iptables -xvnL"
+		},
+		{
+			"description": "IPv6 Firewall Status",
+			"cmd": "ip6tables -xvnL"
+		},
+		{
+			"description": "Bridge Info",
+			"cmd": "brctl show"
+		},
+		{
+			"description": "Bridge Link",
+			"cmd": "bridge link"
+		},
+		{
+			"description": "Bridge VLAN",
+			"cmd": "bridge vlan"
+		},
+		{
+			"description": "Bridge FDB",
+			"cmd": "bridge fdb"
+		},					
+		{
+			"description": "TCP listened ports",
+			"cmd": "netstat -tlnp"
+		},
+		{
+			"description": "UDP listened ports",
+			"cmd": "netstat -ulnp"
+		},
+		{
+			"description": "MAC layer firewall status list",
+			"cmd": "ebtables -L"
+		},
+		{
+			"description": "MAC layer firewall status",
+			"cmd": "ebtables -t broute -L"
+		},
+		{
+			"description": "QoS queue stats",
+			"cmd": "ubus call qos queue_stats"
+		},
+		{
+			"description": "IGMP Snooping Table",
+			"cmd": "ubus call mcast stats"
+		}
+	]
+}

self-diagnostics/files/usr/share/self-diagnostics/spec/system.json

@@ -0,0 +1,67 @@
+{
+	"description": "Gathering system information",
+	"exec" : [
+		{
+			"description": "Firmware banks",
+			"cmd": "ubus call fwbank dump"		
+		},	
+		{
+			"description": "System Info",
+			"cmd": "ubus call system info"
+		},
+		{
+			"description": "Board Info",
+			"cmd": "ubus call system board"		
+		},
+		{
+			"description": "Running Processes",
+			"cmd": "top -b -n 1"		
+		},
+		{
+			"description": "Kernel Parameters",
+			"cmd": "sysctl -A  2>/dev/null"		
+		},		
+		{
+			"description": "System Log",
+			"cmd": "timeout 5 logread -l 1000"		
+		},
+		{
+			"description": "Driver Message",
+			"cmd": "timeout 5 dmesg"		
+		},
+		{
+			"description": "PCI Devices",
+			"cmd": "lspci -k"		
+		},
+		{
+			"description": "Installed Modules",
+			"cmd": "lsmod"		
+		},
+		{
+			"description": "CPU Info",
+			"cmd": "cat /proc/cpuinfo"		
+		},
+		{
+			"description": "Memory Info",
+			"cmd": "cat /proc/meminfo"		
+		},
+		{
+			"description": "Slab Info",
+			"cmd": "cat /proc/slabinfo"		
+		},
+		{
+			"description": "eMMC Partition/Volume Info",
+			"cmd": "fdisk -l",
+			"dependency" : {
+				"file": "/sbin/fdisk"
+			}			
+		},
+		{
+			"description": "NAND Partition/Volume Info",
+			"cmd": "ubinfo --all",
+			"dependency" : {
+				"file": "/usr/sbin/ubinfo"
+			}			
+		}										
+	]
+}

self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json

@@ -0,0 +1,56 @@
+{
+	"description": "Gathering TR-x69 state",
+	"dependency" : [
+		{
+			"type": "file",
+			"file": "/etc/config/cwmp"
+		}	
+	],
+	"exec" : [
+		{
+			"description": "TR-181 DM MAP",
+			"cmd": "uci -c /etc/bbfdm/dmmap export"
+		},		
+		{
+			"description": "TR-181 Parameters via BBFDM",
+			"cmd": "bbfdmd -c get Device."
+		},
+		{
+			"description": "TR-181 Parameters via CWMP",
+			"cmd": "icwmpd -c get Device."
+		},				
+		{
+			"description": "TR-069 status",
+			"cmd": "ubus call tr069 status"
+		},
+		{
+			"description": "TR-069 Logs",
+			"cmd": "cat /var/log/icwmpd.log",
+			"dependency" : [
+				{
+					"type": "file",
+					"file": "/var/log/icwmpd.log"
+				}
+			]		
+		},
+		{
+			"description": "TR-181 Parameters via USP",
+			"cmd": "obuspa -c get Device.",
+			"timeout": 10
+		},		
+		{
+			"description": "USP Agent Database",
+			"cmd": "obuspa -f $(uci -q get obuspa.global.db_file) -c show database"
+		},		
+		{
+			"description": "USP Logs",
+			"cmd": "cat /var/log/obuspa.log",
+			"dependency" : [
+				{
+					"type": "file",
+					"file": "/var/log/obuspa.log"
+				}
+			]		
+		}									
+	]
+}

self-diagnostics/files/usr/share/self-diagnostics/spec/voice.json

@@ -0,0 +1,43 @@
+{
+	"description": "Gathering Voice state",
+	"dependency" : [
+		{
+			"type": "file",
+			"file": "/etc/config/asterisk"
+		}	
+	],
+	"exec" : [
+		{
+			"description": "Endpoint Status",
+			"cmd": "ubus call endpt status"
+		},
+		{
+			"description": "Endpoint Count",
+			"cmd": "ubus call endpt count"
+		},	
+		{
+			"description": "Voice Status",
+			"cmd": "ubus call voice.asterisk status"
+		},
+		{
+			"description": "DECT Status",
+			"cmd": "ubus call dect status",
+			"dependency" : [
+				{
+					"type": "file",
+					"file": "/etc/config/dect"
+				}
+			]			
+		},
+		{
+			"description": "DECT Handsets",
+			"cmd": "ubus call dect handsets",
+			"dependency" : [
+				{
+					"type": "file",
+					"file": "/etc/config/dect"
+				}
+			]			
+		}																																	
+	]
+}

self-diagnostics/files/usr/share/self-diagnostics/spec/wifi.json

@@ -0,0 +1,31 @@
+{
+	"description": "Gathering WiFi state",
+	"dependency" : [
+		{
+			"type": "file",
+			"file": "/sys/class/ieee80211"
+		}	
+	],
+	"exec" : [
+		{
+			"description": "Wireless Status",
+			"cmd": "ubus call network.wireless status"
+		},
+		{
+			"description": "Wireless Radio Status",
+			"cmd": "ubus call wifi status"
+		},
+		{
+			"description": "Get radio scan",
+			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_radio_scan.sh"
+		},
+		{
+			"description": "Get Assoc List",
+			"cmd": "sh /usr/share/self-diagnostics/helper/wifi_assoclist.sh"
+		},
+		{
+			"description": "iwinfo interface details",
+			"cmd": "/usr/bin/iwinfo"
+		}																															
+	]
+}

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=2.3.0
+PKG_VERSION:=2.3.0.8
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=f7d77710c288668c7abf84ec82eeffc613723004
+PKG_SOURCE_VERSION:=ec4c539dd4455e55d4cd1e21743e40b126f0d166
 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.3.0
+PKG_VERSION:=2.3.0.9
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=6d4933ac821600b051193951f24765569da2c9a4
+PKG_SOURCE_VERSION:=851d6f1d9071b35ce5be9f1838c44bcdc83b7b2e
 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)
@@ -81,6 +81,12 @@ define Package/sulu-builder/config
 			You can specify the list of non core sulu package,
 			so that sulu-builder include them before building the core.
 
+	config SULU_ENV_DATA
+		depends on PACKAGE_sulu-builder
+		string "Sulu env data"
+		help
+			Use this option to initialize sulu build time environment options.
+
 	config SULU_PWA_APP
 		depends on PACKAGE_sulu-builder
 		bool "Enable SULU PWA App support"
@@ -120,7 +126,6 @@ define Package/sulu/install/Default
 	$(INSTALL_BIN) ./files/etc/init.d/sulu $(1)/etc/init.d/sulu
 
 	$(INSTALL_DIR) $(1)/etc/sulu
-	$(INSTALL_DATA) ./files/etc/sulu/roles.json $(1)/etc/sulu/
 	$(INSTALL_BIN) ./files/etc/sulu/sulu.sh $(1)/etc/sulu/
 	$(INSTALL_DATA) ./files/etc/sulu/nginx.locations $(1)/etc/sulu/
 

sulu/sulu-builder/files/etc/sulu/roles.json

@@ -1,299 +0,0 @@
-{
-  "roles": [
-    {
-      "name": "admin",
-      "permission": [
-        {
-          "object": "Device.",
-          "perm": [
-            "PERMIT_ALL"
-          ]
-        }
-      ]
-    },
-    {
-      "name": "user",
-      "permission": [
-        {
-          "object": "Device.",
-          "perm": [
-            "PERMIT_NONE"
-          ]
-        },
-        {
-          "object": "Device.DeviceInfo.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.Time.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.UPnP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.Bridging.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.Ethernet.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.DHCPv4.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.DHCPv6.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.Hosts.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.NAT.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.PPP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.Routing.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.IEEE1905.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.InterfaceStack.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.DynamicDNS.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.LANConfigSecurity.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.Security.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.RouterAdvertisement.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.Services.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.UserInterface.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.PeriodicStatistics.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.SoftwareModules.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.Users.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object":"Device.XMPP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO"
-          ]
-        },
-        {
-          "object": "Device.LocalAgent.Subscription.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_ADD",
-            "PERMIT_SET",
-            "PERMIT_DEL"
-          ]
-        },
-        {
-          "object": "Device.WiFi.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.DNS.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        },
-        {
-          "object": "Device.IP.",
-          "perm": [
-            "PERMIT_GET",
-            "PERMIT_GET_INST",
-            "PERMIT_OBJ_INFO",
-            "PERMIT_CMD_INFO",
-            "PERMIT_OPER",
-            "PERMIT_SUBS_VAL_CHANGE",
-            "PERMIT_SUBS_OBJ_ADD",
-            "PERMIT_SUBS_OBJ_DEL",
-            "PERMIT_SUBS_EVT_OPER_COMP"
-          ]
-        }
-      ]
-    },
-    {
-      "name": "undefined-1"
-    },
-    {
-      "name": "undefined-2"
-    },
-    {
-      "name": "undefined-3"
-    },
-    {
-      "name": "undefined-4"
-    }
-  ]
-}

sulu/sulu-builder/files/etc/sulu/sulu.sh

@@ -287,9 +287,6 @@ function _update_obuspa_config_rbac() {
 			restart=1
 		fi
 	done
-	if [ -f "/etc/sulu/roles.json" ]; then
-		uci_set obuspa global role_file "/etc/sulu/roles.json"
-	fi
 	return "${restart}"
 }
 

sulu/sulu-builder/sulu.mk

@@ -39,6 +39,11 @@ endif
 
 define Build/Compile
 	# Skip compilation, will be build with sulu-builder
+ifeq ($(SULU_MOD),core)
+ifneq ($(CONFIG_SULU_ENV_DATA),)
+	echo -e "$(CONFIG_SULU_ENV_DATA)" > $(PKG_BUILD_DIR)/.env
+endif
+endif
 endef
 
 ifeq ($(SULU_PLUGIN_INSTALL),0)

sulu/sulu-multi-ap/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=2.2.18
+PKG_VERSION:=2.3.0.8
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=ae4cb0a27b7d084aaad69e81cb4d96d88ecdffee
+PKG_SOURCE_VERSION:=b7162eebb32b518be29c1cb16525e8826179a6ff
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

voicemngr/Makefile

@@ -10,8 +10,8 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=voicemngr
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.4
-PKG_LICENSE:=PROPRIETARY
+PKG_VERSION:=1.0.10
+PKG_LICENSE:=MIT
 PKG_LICENSE_FILES:=LICENSE
 
 LOCAL_SRC_DIR:=~/git/voip/$(PKG_NAME)
@@ -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:=190cc528047a834597007f2763abdc381cde93c1
+PKG_SOURCE_VERSION:=7ad15dc84ce950f7ce8dd723877a9f8fd81194a7
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -75,6 +75,12 @@ define Build/Prepare
 endef
 endif
 
+#installs files into ./staging_dir/. that shared with asterisk-chan-voicemngr
+define Build/InstallDev
+	$(INSTALL_DIR) $(STAGING_DIR)/usr/include
+	$(CP) $(PKG_BUILD_DIR)/libvoice/voice-types.h $(STAGING_DIR)/usr/include
+endef
+
 define Package/$(PKG_NAME)/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin

xmppc/Makefile

@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=xmppc
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.1.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/xmppc.git
-PKG_SOURCE_VERSION:=6576bad7849ca4027dd1214086a91eb046f7aa53
+PKG_SOURCE_VERSION:=39115d2a5b28a047d836a972e1c4d317e617779f
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif