dslmngr: remove dependency on board-db

Implement a stub for setup_mcast_mode() on
non-Broadcom platforms.

Change-Id: Idd0c75f564f0de5fe698c1fc32088a32a029ac96

bbfdm/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bbfdm
-PKG_VERSION:=1.3.12
+PKG_VERSION:=1.3.30
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=5197103b42d383e54abc70bb67eec192e390be09
+PKG_SOURCE_VERSION:=60171c88176bd0e8d8cb67ddea3cb4f40b834f17
 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 '0'
+	option refresh_time '10'
 	option transaction_timeout '30'
 

bbfdm/files/etc/init.d/bbfdmd

@@ -1,12 +1,13 @@
 #!/bin/sh /etc/rc.common
 
-START=60
+START=65
 STOP=10
 
 USE_PROCD=1
 PROG=/usr/sbin/bbfdmd
 
 BBFDM_JSON_INPUT="/etc/bbfdm/input.json"
+BBFDM_TEMP_JSON="/tmp/bbfdm.json"
 
 log() {
 	echo "${@}"|logger -t bbfdmd.init -p info
@@ -16,43 +17,47 @@ validate_bbfdm_bbfdmd_section()
 {
 	uci_validate_section bbfdm bbfdmd "bbfdmd" \
 		'enabled:bool:true' \
-		'debug:bool:false' \
-		'loglevel:uinteger' \
 		'sock:string' \
-		'refresh_time:uinteger' \
-		'transaction_timeout:uinteger' \
+		'debug:bool:false' \
+		'loglevel:uinteger:1' \
+		'refresh_time:uinteger:0' \
+		'transaction_timeout:uinteger:30' \
 		'subprocess_level:uinteger'
 }
 
 configure_bbfdmd()
 {
-	local enabled debug sock
+	local enabled debug sock update
+	local jlog jrefresh jtimeout
 
+	update=0
 	config_load bbfdm
-
 	validate_bbfdm_bbfdmd_section || {
 		log "Validation of bbfdmd section failed"
 		return 1;
 	}
 
 	[ "${enabled}" -eq 0 ] && return 0
-
 	[ ! -f "${BBFDM_JSON_INPUT}" ] && return 0
 
-	if [ -n "${loglevel}" ]; then
-		echo "$(jq --arg res ${loglevel} '.daemon.config += {"loglevel": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	jlog="$(jq '.daemon.config.loglevel' ${BBFDM_JSON_INPUT})"
+	if [ "\"${loglevel}\"" != "${jlog}" ]; then
+		update=1
 	fi
 
-	if [ -n "${refresh_time}" ]; then
-		echo "$(jq --arg res ${refresh_time} '.daemon.config += {"refresh_time": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	jrefresh="$(jq '.daemon.config.refresh_time' ${BBFDM_JSON_INPUT})"
+	if [ "\"${refresh_time}\"" != "${jrefresh}" ]; then
+		update=1
 	fi
 
-	if [ -n "${transaction_timeout}" ]; then
-		echo "$(jq --arg res ${transaction_timeout} '.daemon.config += {"transaction_timeout": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	jtimeout="$(jq '.daemon.config.transaction_timeout' ${BBFDM_JSON_INPUT})"
+	if [ "\"${transaction_timeout}\"" != "${jtimeout}" ]; then
+		update=1
 	fi
 
-	if [ -n "${subprocess_level}" ]; then
-		echo "$(jq --arg res ${subprocess_level} '.daemon.config += {"subprocess_level": $res}' ${BBFDM_JSON_INPUT})" > ${BBFDM_JSON_INPUT}
+	if [ "${update}" -eq "1" ]; then
+		echo "$(jq --arg log ${loglevel} --arg tran ${transaction_timeout} --arg refresh ${refresh_time} '.daemon.config += {"loglevel": $log, "refresh_time": $refresh, "transaction_timeout": $tran}' ${BBFDM_JSON_INPUT})" > ${BBFDM_TEMP_JSON}
+		mv ${BBFDM_TEMP_JSON} ${BBFDM_JSON_INPUT}
 	fi
 
 	procd_set_param command ${PROG}
@@ -72,6 +77,13 @@ start_service()
 	configure_bbfdmd
 	procd_set_param respawn
 	procd_close_instance "bbfdm"
+
+	ubus call service state '{"name":"bbfdm.services", "spawn":true}'
+}
+
+stop_service()
+{
+	ubus call service state '{"name":"bbfdm.services", "spawn":false}'
 }
 
 service_triggers()

bbfdm/files/etc/uci-defaults/96-sysctl-translation

@@ -0,0 +1,62 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+bbfdm_sysctl_conf="/etc/bbfdm/sysctl.conf"
+
+update_device_section() {
+	local section="${1}"
+	local dev_name="${2}"
+	local ipv6="${3}"
+	local name
+
+	# Get name value
+	config_get name "${section}" name
+
+	# Retrun if the name value is different to the dev_name value
+	[ "${name}" != "${dev_name}" ] && return
+	
+	if [ "${ipv6}" = "0" ]; then
+		ipv6="1"
+	else
+		ipv6="0"
+	fi
+
+	# Add ipv6 option
+	uci -q set network.${section}.ipv6="${ipv6}"
+}
+
+parse_bbfdm_sysctl_conf_file() {
+	# Check if the file exists
+	[ -f "${bbfdm_sysctl_conf}" ] || return
+
+	# Create a temporary file
+	tmpfile=$(mktemp)
+
+	# Load network config
+	config_load network
+
+	# Read each line of the file
+	while read -r line; do
+		if echo "$line" | grep -Eq '^net\.ipv6\.conf\.(.+)\.disable_ipv6=([0-1])$'; then
+			name=$(echo "$line" | sed -n 's/^net\.ipv6\.conf\.\(.*\)\.disable_ipv6=[0-1]$/\1/p')
+			value=$(echo "$line" | sed -n 's/^net\.ipv6\.conf\.\(.*\)\.disable_ipv6=\([0-1]\)$/\2/p')
+
+			config_foreach update_device_section device "${name}" "${value}"
+		else
+			# If the line doesn't match, preserve it in the temporary file
+			echo "$line" >> "$tmpfile"
+		fi
+	done < "${bbfdm_sysctl_conf}"
+
+	# Replace the original file with the modified content
+	mv "$tmpfile" "${bbfdm_sysctl_conf}"
+
+	# Apply the changes
+	uci commit network
+	sysctl -e -p "${bbfdm_sysctl_conf}" >&-
+}
+
+parse_bbfdm_sysctl_conf_file
+
+exit 0

bulkdata/Makefile

@@ -7,13 +7,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=bulkdata
-PKG_VERSION:=2.1.1
+PKG_VERSION:=2.1.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bulkdata.git
-PKG_SOURCE_VERSION:=2dd55d9c9eb01ed1b11e16bad9e2c3e8badfffeb
+PKG_SOURCE_VERSION:=d83c42070e7f10178dc1c2d0ce078e3d6d42d889
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

bulkdata/files/etc/init.d/bulkdatad

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=99
+START=60
 STOP=10
 
 . /etc/bbfdm/bbfdm_services.sh

decollector/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=decollector
-PKG_VERSION:=4.1.0.3
+PKG_VERSION:=4.1.0.4
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5d05bc25fb32e2680f99543a713d5cbf8cac6300
+PKG_SOURCE_VERSION:=566f0b7d148c0ece72f311c4f4b6b5f8e11d6f97
 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

@@ -1,20 +1,14 @@
-#
-# Copyright (C) 2021 IOPSYS Software Solutions AB
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.13
+PKG_VERSION:=3.5.14
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=2465b94d72b8d54102c10565e624847d4f0b39ee
+PKG_SOURCE_VERSION:=4f16755f8ac09d373234565f050832c049bdf543
 PKG_MIRROR_HASH:=skip
 endif
 

dslmngr/files/broadcom/lib/dsl/broadcom.sh

@@ -302,6 +302,8 @@ xdsl_stop() {
 }
 
 xdsl_init() {
+	[ -d /sys/class/net/dsl0/ ] || exit
+
 	prioritize_arp
 
 	echo "Starting DSL"

dslmngr/files/common/etc/init.d/dsl

@@ -26,10 +26,6 @@ stop_service() {
 }
 
 boot() {
-	local HASADSL="$(db -q get hw.board.hasAdsl)"
-	local HASVDSL="$(db -q get hw.board.hasVdsl)"
-	[ "$HASADSL" == "1" -o "$HASVDSL" == "1" ] || return
-
 	xdsl_init
 
 	start

hostmngr/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=hostmngr
-PKG_VERSION:=0.21.0
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=0414573a693b4b25d0430c566ea8c3b08b4e9ce3
+PKG_SOURCE_VERSION:=bfb9098121d665a324c86a2a9ee0971871d6c22e
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/hostmngr.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
@@ -31,7 +31,8 @@ define Package/hostmngr
   DEPENDS= +libubox +libuci +libubus +ubus +libeasy +libnl-genl \
 	   +libjson-c +libblobmsg-json +libnfnetlink +libmnl \
 	   +libnetfilter-conntrack \
-	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi
+	   +HOSTMNGR_PLATFORM_HAS_WIFI:libwifi +libbbfdm-api
+
 endef
 
 define Package/hostmngr/config
@@ -58,7 +59,10 @@ MAKE_PATH:=src
 define Package/hostmngr/install
 	$(CP) ./files/* $(1)/
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(INSTALL_DIR) $(1)/etc/hostmngr/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/hostmngr $(1)/usr/sbin/
+	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/bbf_plugin/libhostmngr.so $(1)/etc/hostmngr/
+	$(INSTALL_DATA) ./files/etc/hostmngr/input.json $(1)/etc/hostmngr/	
 endef
 
 ifeq ($(LOCAL_DEV),1)

hostmngr/files/etc/config/hosts

@@ -3,7 +3,7 @@ config global 'global'
 	option enabled '1'
 	option history '1'
 	option history_file '/etc/hosts_history.json'
-	option history_timeout '604800'
+	option history_timeout '86400'
 
 config interface
 	list ifname 'br-lan'

hostmngr/files/etc/hostmngr/input.json

@@ -0,0 +1,16 @@
+{
+	"daemon": {
+		"input": {
+			"type": "DotSo",
+			"name": "/etc/hostmngr/libhostmngr.so"
+		},
+		"output": {
+			"type": "UBUS",
+			"name": "bbfdm.hosts",
+			"parent_dm": "Device.",
+			"object": "Hosts",
+			"root_obj": "bbfdm"
+		}
+	}
+}
+

hostmngr/files/etc/init.d/hostmngr

@@ -3,16 +3,22 @@
 START=97
 STOP=20
 
+. /etc/bbfdm/bbfdm_services.sh
+
 USE_PROCD=1
 
+HOSTS_JSON_INPUT="/etc/hostmngr/input.json"
+
 start_service() {
 	procd_open_instance
-        procd_set_param command "/usr/sbin/hostmngr" "--config hosts" "-o"  "/tmp/hostmngr.log" "-f"
+	procd_set_param command "/usr/sbin/hostmngr" "--config hosts" "-o"  "/tmp/hostmngr.log" "-f"
 #	procd_set_param respawn
 	procd_set_param limits core="unlimited"
 #	procd_set_param stdout 1
 #	procd_set_param stderr 1
 	procd_close_instance
+	
+	bbfdm_add_service "bbfdm.hosts" "${HOSTS_JSON_INPUT}"
 }
 
 service_triggers()

hostmngr/files/etc/uci-defaults/993-topology-hosts-to-hostmngr-hosts-config

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+uci -q get hosts.global.ageing_timer || exit 0
+
+
+# Old hosts UCI config is detected; Convert to new format
+
+ageing_timer="$(uci -q get hosts.global.ageing_timer)"
+history_timeout=$((ageing_timer*60))
+
+uci -q set hosts.global.enabled=1
+uci -q delete hosts.global.ageing_timer
+uci -q set hosts.global.history_timeout="$history_timeout"
+uci -q rename hosts.global.reboot_persistent=history
+uci -q set hosts.global.history_file="/etc/hosts_history.json"
+
+uci -q add hosts interface
+for ifname in $(uci -q get hosts.global.ifname); do
+	uci -q add_list hosts.@interface[-1].ifname="$ifname"
+done
+
+uci -q delete hosts.global.ifname
+exit 0

icwmp/Makefile

@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.1
+PKG_VERSION:=9.5.8
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=8167cfa5a0ce77f467ad173e44d0012a6cb9b3e3
+PKG_SOURCE_VERSION:=79871c5365cf89ce718b922b0863c8a68c09a771
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 

icwmp/files/etc/icwmpd/update.sh

@@ -18,14 +18,7 @@ handle_icwmp_update() {
 	sleep 10
 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')
 
-	if [ "$ret" = "true" ]; then
-		# read status from var/state/icwmp
-		status=$(uci -q -c /var/state get icwmp.sess_status.current_status)
-		if [ "$status" != "running" ]; then
-			log "Trigger out of bound inform, since last inform status was failure"
-			ubus -t 10 call tr069 inform >/dev/null 2>&1
-		fi
-	else
+	if [ "$ret" != "true" ]; then
 		log "Restarting icwmp tr069 object"
 		/etc/init.d/icwmpd restart
 	fi

icwmp/files/etc/init.d/icwmpd

@@ -566,16 +566,8 @@ reload_service() {
 	fi
 
 	status="$(echo "${tr069_status}" | jsonfilter -qe '@.cwmp.status')"
-	ret="$?"
 	if [ "$status" = "up" ]; then
 		ubus -t 1 call tr069 command '{"command":"reload"}'
-		ret="$?"
-	fi
-
-	if [ "$status" = "init" ] || [ "$ret" -ne "0" ]; then
-		log "Restarting CWMP client"
-		stop
-		start
 	fi
 }
 
@@ -590,6 +582,6 @@ service_triggers() {
        config_get wan_interface cpe default_wan_interface "wan"
 
        procd_add_reload_trigger "cwmp"
-       add_interface_trigger ${default_wan_interface}
+       add_interface_trigger ${wan_interface}
 }
 

ieee1905/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=ieee1905
-PKG_VERSION:=8.2.3
+PKG_VERSION:=8.2.19
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=97d4a638b24e6e0c8844f5a9601461c4c6114a44
+PKG_SOURCE_VERSION:=3d175485a7461ce567e3bee47e1c760e15434367
 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

ieee1905/files/etc/config/ieee1905

@@ -2,13 +2,16 @@ config ieee1905 'ieee1905'
 	option enabled '1'
 	option extension '1'
 	list extmodule 'map'
+	list extmodule 'topology'
 	option registrar '2 5 6'
 #	option macaddress '0a:1b:2c:3d:4e:50'
 
 config al-iface
 	option enabled '1'
-	option ifname 'br-lan'
-	option type 'bridge'
+	list ifname 'br-lan'
+	list ifname '/eth.*'
+	list ifname '/wl.*'
+	list ifname '/wds.*'
 
 # ap sections are auto-generated/overwritten during onboarding
 #

iop/config

@@ -59,19 +59,17 @@ CONFIG_PACKAGE_inbd=y
 CONFIG_PACKAGE_qosmngr=y
 CONFIG_PACKAGE_libwifiutils=y
 CONFIG_PACKAGE_wifimngr=y
-CONFIG_PACKAGE_hostmngr=y
 
 # Multi-AP #
 CONFIG_PACKAGE_ieee1905=y
+CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
 CONFIG_PACKAGE_topology-plugin=y
 CONFIG_PACKAGE_decollector=y
 CONFIG_PACKAGE_map-agent=y
 CONFIG_PACKAGE_map-controller=y
-CONFIG_PACKAGE_map-topology=y
-
-CONFIG_IEEE1905_CMDU_SA_IS_ALMAC=y
 
 # Network #
+CONFIG_PACKAGE_hostmngr=y
 CONFIG_PACKAGE_netmode=y
 CONFIG_PACKAGE_urlfilter=y
 
@@ -95,6 +93,7 @@ CONFIG_PACKAGE_udpecho-client=y
 CONFIG_PACKAGE_udpecho-server=y
 CONFIG_PACKAGE_userinterface=y
 CONFIG_PACKAGE_xmppc=y
+CONFIG_PACKAGE_timemngr=y
 
 # WebGUI #
 CONFIG_PACKAGE_sulu=y

libethernet/Makefile

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libethernet
-PKG_VERSION:=7.2.104
+PKG_VERSION:=7.2.105
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=d777636ca43302a95e571ab030ec44ef50905570
+PKG_SOURCE_VERSION:=4a363a699c4a8024054ca095f1b7818f8bd56ded
 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

@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libqos
-PKG_VERSION:=7.2.102
+PKG_VERSION:=7.2.105
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=1b75f263b65ca7e808513904d90c6c5fedaa387d
+PKG_SOURCE_VERSION:=78cc1481feff7adc09749e73a3513fae4d9ded28
 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
@@ -37,14 +37,11 @@ else ifeq ($(CONFIG_TARGET_armvirt),y)
 else ifeq ($(CONFIG_TARGET_airoha),y)
   TARGET_PLATFORM=ECONET
   TARGET_CFLAGS +=-DIOPSYS_ECONET
-else ifeq ($(CONFIG_TARGET_ipq95xx),y)
-  TARGET_PLATFORM=IPQ95XX
-  TARGET_CFLAGS +=-DIPQ95XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
-  TARGET_PLATFORM=LINUX
-  TARGET_CFLAGS +=-DIOPSYS_LINUX
+  TARGET_PLATFORM=MEDIATEK
+  TARGET_CFLAGS +=-DIOPSYS_MEDIATEK
 else
-  $(info Unexpected CONFIG_TARGET, use default LINUX)
+  $(info Using default LINUX)
   TARGET_PLATFORM=LINUX
   TARGET_CFLAGS +=-DIOPSYS_LINUX
 endif

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

@@ -2,7 +2,7 @@
 	"ulaw": {
 		"name": "G.711MuLaw",
 		"ptime_min": 10,
-		"ptime_max": 30,
+		"ptime_max": 60,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 64
@@ -10,7 +10,7 @@
 	"alaw": {
 		"name": "G.711ALaw",
 		"ptime_min": 10,
-		"ptime_max": 30,
+		"ptime_max": 60,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 64
@@ -18,7 +18,7 @@
 	"g726": {
 		"name": "G.726",
 		"ptime_min": 10,
-		"ptime_max": 30,
+		"ptime_max": 60,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 16,
@@ -27,7 +27,7 @@
 	"g723": {
 		"name": "G.723.1",
 		"ptime_min": 10,
-		"ptime_max": 30,
+		"ptime_max": 60,
 		"ptime_default": 30,
 		"ptime_increment": 30,
 		"bitrate": 5.3
@@ -35,26 +35,18 @@
 	"g729": {
 		"name": "G.729",
 		"ptime_min": 10,
-		"ptime_max": 30,
+		"ptime_max": 60,
 		"ptime_default": 20,
 		"ptime_increment": 10,
 		"bitrate": 8
 	},
-	"ilbc": {
-		"name": "iLBC",
+	"g722": {
+		"name": "G.722",
 		"ptime_min": 10,
-		"ptime_max": 30,
+		"ptime_max": 60,
 		"ptime_default": 20,
-		"ptime_increment": 30,
-		"bitrate": 15.2
-	},
-	"gsm": {
-		"name": "AMR",
-		"ptime_min": 10,
-		"ptime_max": 30,
-		"ptime_default": 20,
-		"ptime_increment": 20,
-		"bitrate": 12.2
+		"ptime_increment": 10,
+		"bitrate": 64
 	}
 }
 

libvoice-broadcom/Makefile

@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.2
+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:=139397e7e0a80af4a83119ff8f15379f206ccbdf
+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.7
+PKG_VERSION:=1.0.12
 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:=123c1f14202c011777cb09f792cf065ea280a1c4
+PKG_SOURCE_VERSION:=e60fdaa93e1385bbea08751dcd392cddffdf3345
 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.3.1
+PKG_VERSION:=7.4.3
 
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=5c6be5899ca223de7606017f35d2dabf28432768
+PKG_SOURCE_VERSION:=66cd6a376308ab28b0650883e6ba7bb1952ce6fc
 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
@@ -46,6 +46,10 @@ else ifeq ($(CONFIG_TARGET_ipq95xx),y)
   TARGET_PLATFORM=IPQ95XX
   TARGET_WIFI_TYPE=QUALCOMM MAC80211
   TARGET_CFLAGS +=-DIPQ95XX
+else ifeq ($(CONFIG_TARGET_ipq53xx),y)
+  TARGET_PLATFORM=IPQ53XX
+  TARGET_WIFI_TYPE=QUALCOMM MAC80211
+  TARGET_CFLAGS +=-DIPQ53XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
   TARGET_PLATFORM=LINUX
   TARGET_WIFI_TYPE=MEDIATEK MAC80211
@@ -57,6 +61,10 @@ else
   TARGET_CFLAGS +=-DIOPSYS_MAC80211
 endif
 
+ifneq ($(CONFIG_PACKAGE_kmod-mt7915e),)
+  TARGET_CFLAGS=-DMT7915_VENDOR_EXT
+endif
+
 PKG_BUILD_DEPENDS:=PACKAGE_kmod-mt7915e:mt76
 
 ifneq ($(CONFIG_PACKAGE_libwifi),)

map-agent/Config.in

@@ -45,5 +45,12 @@ config AGENT_LOCAL_ACS_SERVICE
 config AGENT_STRICT_OPER_CHANNEL_REPORT
 	bool "Report operation channel strictly, skip some unsolicited reports"
 
+config AGENT_WIRELESS_EXPLICIT_RELOAD
+	bool "Reload wireless after UCI commit"
+
+config AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST
+	bool "Use config opt to determine if Oper Channel Report CMDU is send as relayed multicast or directly to controller"
+	default y
+
 endmenu
 endif

map-agent/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-agent
-PKG_VERSION:=4.3.5.10
+PKG_VERSION:=4.3.7.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=43240cec17c02f12f6fa5356ecbf349b51614ab7
+PKG_SOURCE_VERSION:=03a85b04d10c08dccd96381ef6f2ece91d16dc52
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 PKG_LICENSE:=BSD-3-Clause
@@ -94,6 +94,14 @@ ifeq ($(CONFIG_AGENT_STRICT_OPER_CHANNEL_REPORT),y)
 TARGET_CFLAGS += -DSTRICT_OPER_CHANNEL_REPORT
 endif
 
+ifeq ($(CONFIG_AGENT_WIRELESS_EXPLICIT_RELOAD),y)
+TARGET_CFLAGS += -DWIRELESS_EXPLICIT_RELOAD
+endif
+
+ifeq ($(CONFIG_AGENT_OPER_CHANNEL_CHANGE_RELAY_MCAST),y)
+TARGET_CFLAGS += -DOPER_CHAN_CHANGE_RELAY_MCAST
+endif
+
 MAKE_PATH:=src
 
 define Package/map-agent/install

map-agent/files/etc/config/mapagent

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

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

@@ -19,6 +19,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-agent/files/lib/multiap/map_genconfig

@@ -36,17 +36,20 @@ generate_multiap_config() {
 		mode_band=""
 		priority=
 		dpp_chan=
+		channels=
 
 		case "$band" in
 			2g)
 				mode_band=2
 				priority=2
 				dpp_chan="81/1"
+				channels="1 6 11"
 			;;
 			5g)
 				mode_band=5
 				priority=1
 				dpp_chan="128/36"
+				channels="36-64 100-112"
 			;;
 			6g)
 				mode_band=6
@@ -65,6 +68,8 @@ generate_multiap_config() {
 			ifprefix="wlan%_%"
 			ifname="wlan${devidx}_0"
 			ifname_bh="wlan${devidx}_1"
+			uci set wireless.$dev.channels="$channels"
+			uci commit wireless
 		elif is_broadcom; then
 			ifprefix="wl"
 			ifname="wl${devidx}"
@@ -76,9 +81,9 @@ generate_multiap_config() {
 			ifname="wlan${devidx}"
 			ifname_bh="wlan${devidx}-1"
 		else
-			ifprefix="wlan%-%"
+			ifprefix="wlan%-"
 			ifname="wlan$devidx"
-			ifname_bh="$ifname-0"
+			ifname_bh="$ifname-1"
 		fi
 
 		if [ $generate_mapagent_config -eq 1 ]; then

map-controller/Makefile

@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=map-controller
-PKG_VERSION:=4.3.2.2
+PKG_VERSION:=4.3.3.0
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=5c57a6e2788b556f3d21ed39b415bc7e8e5db5ab
+PKG_SOURCE_VERSION:=cc50001914d500655ffdb8eede3c38f650417209
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 
 LOCAL_DEV=0

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

@@ -246,6 +246,10 @@ config_mcproxy() {
 	fi
 }
 
+setup_mcast_mode() {
+	:
+}
+
 configure_mcast() {
 	config_global_params "set_max_groups_and_sources"
 

obuspa/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.2.28
+PKG_VERSION:=7.0.4.4
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=7d7b22328b9a3d62607e63d420e7e245352065cf
+PKG_SOURCE_VERSION:=7ae856494f6cae9e81510818a7944b1259ca55b2
 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/uci-defaults/00-obuspa-extender-mode

@@ -5,7 +5,9 @@
 config_load obuspa
 config_get interface global interface ""
 
-mode="$(fw_printenv -n netmode)"
-if [ "${mode}" == "extender" -a -z "$interface" ] ; then
-	uci_set obuspa global interface "lan"
+if command -v fw_printenv; then
+	mode="$(fw_printenv -n netmode)"
+	if [ "${mode}" == "extender" -a -z "$interface" ] ; then
+		uci_set obuspa global interface "lan"
+	fi
 fi

obuspa/files/etc/udhcpc.user.d/udhcpc_obuspa_opt125.user

@@ -124,6 +124,21 @@ get_vivsoi() {
 	done
 }
 
+get_netmode()
+{
+	local mode
+
+	if command -v fw_printenv; then
+		mode="$(fw_printenv -n netmode)"
+	fi
+
+	if [ "$mode" != "extender" ]; then
+		mode="full_access"
+	fi
+
+	echo "$mode"
+}
+
 config_load obuspa
 config_get_bool enable_obuspa global enabled 1
 config_get wan_intf global interface "wan"
@@ -210,12 +225,8 @@ if [ "${wan_intf}" == "${INTERFACE}" ]; then
 				mtp_encrypt="0"
 			fi
 		fi
-		mode="$(fw_printenv -n netmode)"
-		if [ "$mode" == "extender" ]; then
-			uci -q set obuspa.dhcpcontroller.assigned_role_name='extender'
-		else
-			uci -q set obuspa.dhcpcontroller.assigned_role_name='full_access'
-		fi
+
+		uci -q set obuspa.dhcpcontroller.assigned_role_name="$(get_netmode)"
 		uci -q set obuspa.dhcpcontroller.Enable='1'
 		uci_change=1
 	fi

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

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

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

@@ -1,6 +1,6 @@
 --- a/src/core/data_model.c
 +++ b/src/core/data_model.c
-@@ -1242,7 +1242,7 @@ int DATA_MODEL_NotifyInstanceAdded(char
+@@ -1243,7 +1243,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;
      }
  
-@@ -1327,7 +1327,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
+@@ -1328,7 +1328,7 @@ int DATA_MODEL_NotifyInstanceDeleted(cha
      // Exit if instance does not exist - nothing to do
      if (exists == false)
      {

obuspa/patches/0005-optimise_ubus_calls_cli.patch

@@ -1,16 +1,14 @@
-diff --git a/src/core/data_model.c b/src/core/data_model.c
-index 2cf4b6c..b92cf59 100644
 --- a/src/core/data_model.c
 +++ b/src/core/data_model.c
-@@ -136,6 +136,7 @@ void DumpDataModelNodeMap(void);
- int GetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *buf, int len, dm_req_t *req);
+@@ -137,6 +137,7 @@ int GetVendorParam(dm_node_t *node, char
  int SetVendorParam(dm_node_t *node, char *path, dm_instances_t *inst, char *value, dm_req_t *req);
+ double_link_t *FindLinkToFirstObject(double_linked_list_t *list);
  
 +extern bool is_running_cli_local_command;
  /*********************************************************************//**
  **
  ** DATA_MODEL_Init
-@@ -223,7 +224,9 @@ int DATA_MODEL_Init(void)
+@@ -224,7 +225,9 @@ int DATA_MODEL_Init(void)
      }
  
      // Set the default values of OUI, Serial Number and (LocalAgent) EndpointID, and cache EndpointID

obuspc/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=obuspc
-PKG_VERSION:=1.0.1.4
+PKG_VERSION:=1.0.1.5
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa-test-controller.git
-PKG_SOURCE_VERSION:=34faea6f68e718fa4f0cfd418cba418f22c81d38
+PKG_SOURCE_VERSION:=61f14c5a1fba8c251cf1cfb18c163eab62d5674d
 PKG_MAINTAINER:=Vivek Dutta <vivek.dutta@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

obuspc/files/etc/config/uspc

@@ -2,7 +2,7 @@ config global 'global'
 	option enabled '1'
 	option debug '1'
 	option log_level '1'
-	option prototrace '1'
+	option prototrace '0'
 
 config mqtt 'mqtt'
 	option BrokerAddress '127.0.0.1'
@@ -15,5 +15,10 @@ config controller 'controller'
 	option ResponseTopicConfigured '/usp/discovery/controller'
 	option mqtt 'mqtt'
 
+config proxy 'usp'
+	option protocol 'USP'
+	option parent_dm 'Device.'
+	option mount_point 'Node'
+
 config agent 'agent'
 	option Topic '/usp/endpoint'

periodicstats/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=periodicstats
-PKG_VERSION:=1.5.1
+PKG_VERSION:=1.5.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/periodicstats.git
-PKG_SOURCE_VERSION:=e68c87c5648182cc08e69c5fd368e8d178f24804
+PKG_SOURCE_VERSION:=375c71ebaabffa2e47aa37a04e072232492eff25
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

periodicstats/files/etc/init.d/periodicstats

@@ -1,6 +1,6 @@
 #!/bin/sh /etc/rc.common
 
-START=99
+START=61
 STOP=01
 
 . /etc/bbfdm/bbfdm_services.sh

ponmngr/files/etc/bbfdm/json/xpon.json

@@ -911,6 +911,7 @@
 					},
 					"PONMode": {
 						"type": "string",
+						"default": "Unknown",
 						"read": true,
 						"write": false,
 						"protocols": [
@@ -928,6 +929,7 @@
 					},
 					"Connector": {
 						"type": "string",
+						"default": "Unknown",
 						"read": true,
 						"write": false,
 						"protocols": [

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

@@ -15,6 +15,25 @@ SP_Q_PRIO=7
 cfg_name=""
 cfg_type=""
 
+get_port_number() {
+	[ -z "$1" ] && return
+	local ports="0 1 2 3 4 5 6 7 8"
+	local units="0 1"
+	local port="$1"
+	local prt
+	local ifname
+
+	for unit in $units; do
+		for prt in $ports; do
+			ifname="$(ethswctl getifname $unit $prt 2>/dev/null | awk '{print$NF}')"
+			if [ "$ifname" == "$port" ]; then
+				echo "$unit $prt"
+				return
+			fi
+		done
+	done
+}
+
 get_rate_per_queue() {
 	echo "0"
 }

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

@@ -392,10 +392,10 @@ create_ebtables_chains() {
     ebtables -t broute -N qos 2> /dev/null
     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
 }
 

stunc/Makefile

@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=stunc
 PKG_RELEASE:=1
-PKG_VERSION:=1.3.0
+PKG_VERSION:=1.3.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/stunc.git
-PKG_SOURCE_VERSION:=8bf66ef0fac9dcbc63cb2b98cbce787d23059cd1
+PKG_SOURCE_VERSION:=3e56818cd219f285263d6d1a7d41f751bbb0fe08
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

sulu/sulu-base/Makefile

@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=sulu-base
-PKG_VERSION:=3.0.3
+PKG_VERSION:=3.1.7
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=a121bb5f3f287c880cf6dd907007f4e9e8559591
+PKG_SOURCE_VERSION:=f9b7325a81d3cd43a683cfb2b01fd1ef35e58c70
 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:=3.0.4
+PKG_VERSION:=3.1.7
 PKG_RELEASE:=1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=aefa6f82bb2f93677dafb45b2ecbab87b866fdc6
+PKG_SOURCE_VERSION:=bdda8098426361b6e703dad3b26f38fad78a3841
 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

@@ -92,6 +92,16 @@ function _get_sulu_tls_port()
 	echo "${port:-8443}"
 }
 
+function _get_sulu_http_port()
+{
+	local port listen
+
+	listen="$(uci -q get nginx._sulu_http.listen)"
+	port="$(echo $listen|grep -Eo '[0-9]+'|head -n 1)"
+
+	echo "${port:-8080}"
+}
+
 function update_nginx_template()
 {
 	local port
@@ -134,6 +144,18 @@ function generate_sulu_conn_config()
 			json_add_array 'auth';
 			json_close_array;
 
+			json_add_array 'urlOverrides';
+				json_add_object "";
+					json_add_object 'match';
+						json_add_string 'protocol' 'http:'
+					json_close_object
+					json_add_object 'override';
+						json_add_string 'protocol' 'ws'
+						json_add_int 'port' "$(_get_sulu_http_port)";
+					json_close_object
+				json_close_object
+			json_close_array
+
 			json_add_object 'overrides';
 			for f in ${users}; do
 				json_add_object "${f}";
@@ -156,6 +178,18 @@ function generate_sulu_conn_config()
 		json_add_string 'subscribeEndpoint' "/usp/controller";
 			json_add_array 'auth';
 			json_close_array;
+
+			json_add_array 'urlOverrides';
+				json_add_object "";
+					json_add_object 'match';
+						json_add_string 'protocol' 'http:'
+					json_close_object
+					json_add_object 'override';
+						json_add_string 'protocol' 'ws'
+						json_add_int 'port' "$(_get_sulu_http_port)";
+					json_close_object
+				json_close_object
+			json_close_array
 		json_close_object;
 	json_close_object;
 

sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config

@@ -21,6 +21,7 @@ add_sulu_nginx_uci()
 		uci_set nginx _sulu_s error_log '/dev/null'
 	fi
 
+# To host on http, disable _suluredirect and enable _sulu_http
 	if ! uci_get nginx _suluredirect >/dev/null 2>&1; then
 		uci_add nginx server _suluredirect
 		uci_add_list nginx _suluredirect listen "8080"
@@ -28,6 +29,17 @@ add_sulu_nginx_uci()
 		uci_set nginx _suluredirect server_name '_suluredirect'
 		uci_set nginx _suluredirect return '302 https://$host:8443$request_uri'
 	fi
+
+#	if ! uci_get nginx _sulu_http >/dev/null 2>&1; then
+#		uci_add nginx server _sulu_http
+#		uci_set nginx _sulu_http root '/sulu'
+#		uci_add_list nginx _sulu_http listen "8080"
+#		uci_add_list nginx _sulu_http listen "[::]:8080"
+#		uci_set nginx _sulu_http server_name '_sulu_http'
+#		uci_add_list nginx _sulu_http include '/etc/sulu/nginx.locations'
+#	        uci_set nginx _sulu_http ssl_session_cache 'none'
+#		uci_set nginx _sulu_http access_log 'off; # logd openwrt'
+#	fi
 }
 
 

sulu/sulu-lcm/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-lcm
-PKG_VERSION:=3.0.0
+PKG_VERSION:=3.1.1
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
-PKG_SOURCE_VERSION:=ac2e418026a0570bec16a77186a948e18e49d4c7
+PKG_SOURCE_VERSION:=d4c0522c9a7cc59e621d5f967fa6b001a025c7ae
 PKG_MIRROR_HASH:=skip
 
 SULU_PLUGIN_INSTALL:=1

sulu/sulu-multi-ap/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=3.0.3
+PKG_VERSION:=3.1.6
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=a8ae1ce9cbbfbae9ee4234272f0af9dc55698f1b
+PKG_SOURCE_VERSION:=07da9a4d69452a6b092cd0c529186a5cb3b3c538
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

sulu/sulu-parental-control/Makefile

@@ -4,11 +4,11 @@
 
 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-parental-control
-PKG_VERSION:=3.0.0
+PKG_VERSION:=3.1.0
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=b50857e88d14de9752bd081159a6c71e8ea03539
+PKG_SOURCE_VERSION:=c7ac55a741ac36a126e2fb806f97b8c2625a4499
 PKG_MIRROR_HASH:=skip
 
 include ../sulu-builder/sulu.mk

swmodd/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=swmodd
-PKG_VERSION:=2.3.3
+PKG_VERSION:=2.4.0
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/swmodd.git
-PKG_SOURCE_VERSION:=f73adba35daa8e24b7f28dc73eb58f53761a0d3b
+PKG_SOURCE_VERSION:=cd1b40094b46e8223d13253e4bc41a8a2f000cf1
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

swmodd/files/etc/init.d/crun

@@ -14,6 +14,34 @@ is_container_running() {
 	return $?
 }
 
+
+configure_lxc_container() {
+	local requested_state name ctype du_status BUNDLE
+
+	ctype="${1}"
+	name="${2}"
+	requested_state="${3}"
+	du_state="${4}"
+	BUNDLE="${5}"
+
+	if [ "${ctype}" != "lxc" ]; then
+		return 0;
+	fi
+
+	if [ "${du_status}" = "Uninstalling" ]; then
+		lxc-stop -q -k "${name}"
+		if [ -d "${BUNDLE:?}/${name:?}" ]; then
+			rm -rf "${BUNDLE:?}/${name:?}"
+		fi
+	fi
+
+	if [ "${requested_state}" = "Idle" ]; then
+		lxc-stop -q -k "${name}"
+	elif [ "${requested_state}" = "Active" ]; then
+		lxc-start -q "${name}" >/dev/null 2>&1
+	fi
+}
+
 configure_crun_container() {
 	local name type autostart du_status requested_state url username password
 	local BRIDGE BUNDLE BOOT
@@ -38,6 +66,7 @@ configure_crun_container() {
 	fi
 
 	if [ "${type}" != "crun" ]; then
+		configure_lxc_container "${type}" "${name}" "${requested_state}" "${du_status}" "${BUNDLE}"
 		return 0;
 	fi
 

timemngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=timemngr
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.3
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
-PKG_SOURCE_VERSION:=7803c29c7c16e808f10dec226ec66d1ade5e84ec
+PKG_SOURCE_VERSION:=1ffb220f42e37befb37e40ac2286ba31fddfb157
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -49,12 +49,14 @@ endif
 define Package/$(PKG_NAME)/install
 	$(INSTALL_DIR) $(1)/etc/timemngr/
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
+	$(INSTALL_DIR) $(1)/etc/hotplug.d/ntp
 	$(INSTALL_DIR) $(1)/usr/sbin
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/timemngr $(1)/usr/sbin/timemngr
 	$(INSTALL_DATA) $(PKG_BUILD_DIR)/src/libtimemngr.so $(1)/etc/timemngr/
 	$(INSTALL_DATA) ./files/etc/timemngr/input.json $(1)/etc/timemngr/
 	$(INSTALL_BIN) ./files/etc/hotplug.d/iface/21-timemngr $(1)/etc/hotplug.d/iface/
+	$(INSTALL_BIN) ./files/etc/hotplug.d/ntp/40-firstUseDate $(1)/etc/hotplug.d/ntp/
 	$(INSTALL_BIN) ./files/etc/init.d/timemngr $(1)/etc/init.d/
 ifeq ($(CONFIG_TIMEMNGR_MIGRATE_SYSTEM),y)
 	$(INSTALL_DIR) $(1)/etc/uci-defaults

timemngr/files/etc/hotplug.d/iface/21-timemngr

@@ -9,7 +9,7 @@ configure_ntp_servers()
 	local ntp_interface
 
 	# Only change the ntp servers if interface matches with the defined interface
-	ntp_interface="$(uci -q get ${NAME}.dhcp_driven.client_interface)"
+	ntp_interface="$(uci -q get ${NAME}.dhcp_driven.interface)"
 
 	if [ "${ntp_interface}" != "${1}" ]; then
 		return 0
@@ -19,11 +19,12 @@ configure_ntp_servers()
 	json_select data
 	json_get_var servers ntpserver ""
 
-	dhcp_ntp_server="${servers// /,}"
-
 	exist_dhcp_ntp_server="$(uci -q get ${NAME}.dhcp_driven.server)"
-	if [ "${dhcp_ntp_server}" != "${exist_dhcp_ntp_server}" ]; then
-		uci -q set ${NAME}.dhcp_driven.server="${dhcp_ntp_server}"
+	if [ "${servers}" != "${exist_dhcp_ntp_server}" ]; then
+		uci -q del ${NAME}.dhcp_driven.server
+		for server in ${servers}; do
+			uci -q add_list ${NAME}.dhcp_driven.server="${server}"
+		done
 		eval ubus call uci commit '{\"config\":\"$NAME\"}'
 	fi
 }

timemngr/files/etc/hotplug.d/ntp/40-firstUseDate

@@ -0,0 +1,10 @@
+#!/bin/sh
+# This hotplug script set the firstUseDate if not already set
+
+[ "$ACTION" = stratum ] || exit 0
+[ -f "/etc/config/time" ] || exit 0
+
+if ! uci -q get time.global.first_use_date > /dev/null 2>&1; then
+        uci -q set time.global.first_use_date="$(date -u +'%Y-%m-%dT%H:%M:%SZ')"
+        uci commit time
+fi

timemngr/files/etc/init.d/timemngr

@@ -49,12 +49,12 @@ reload_service() {
 service_triggers() {
 	procd_add_reload_trigger "time"
 
-	local enable_server server_mode ttl interface
+	local enable mode ttl interface
 	validate_server_section || {
 		return 1
 	}
 
-	if [ "$enable_server" != 0 ] && [ "$server_mode" = "Broadcast" ] && [ -n "$interface" ]; then
+	if [ "$enable" != 0 ] && [ "$mode" = "Broadcast" ] && [ -n "$interface" ]; then
 		procd_open_trigger
 		procd_add_interface_trigger "interface.*.up" $interface /etc/init.d/timemngr restart
 		procd_close_trigger

timemngr/files/etc/timemngr/ntpd_config.sh

@@ -21,22 +21,22 @@ validate_global_section() {
 
 validate_server_section() {
 	uci_validate_section time server server \
-		'enable_server:bool:1'\
-		'server_mode:string:Unicast'\
+		'enable:bool:1'\
+		'mode:string:Unicast'\
 		'ttl:uinteger:255'\
 		'interface:string'
 }
 
 validate_client_section() {
 	uci_validate_section time client $1 \
-		'enable_client:bool:1'\
+		'enable:bool:1'\
 		'iburst:bool:1'\
 		'version:uinteger:4'\
 		'peer:bool:0'\
 		'minpoll:uinteger:6'\
 		'maxpoll:uinteger:10'\
-		'client_mode:string:Unicast'\
-		'server:string'
+		'mode:string:Unicast'\
+		'server:list(host)'
 }
 
 generate_config() {
@@ -49,21 +49,37 @@ generate_config() {
 		return 1
 	fi
 
-	enable_client_sec=$(uci -q show time | grep enable_client=\'1\' | cut -d'.' -f 2)
-	local enable_client iburst version peer minpoll maxpoll client_mode server
+	local enable_client_sec
+	enabled_sec=$(uci -q show time | grep enable=\'1\' | cut -d'.' -f 2)
+	for sec in $enabled_sec; do
+		type=$(uci -q get time.$sec)
+		if [ "${type}" == "client" ]; then
+			enable_client_sec=$sec
+			break
+		fi
+	done
+
+	local client_mode enable_client
+	local enable iburst version peer minpoll maxpoll mode server
 	if [ -n $enable_client_sec ]; then
 		validate_client_section $enable_client_sec || {
 			return 1
 		}
+		client_mode=$mode
+		enable_client=$enable
 	else
 		enable_client=0
 	fi
 
-	local enable_server server_mode ttl interface
+	local server_mode enable_server
+	local enable mode ttl interface
 	validate_server_section || {
 		return 1
 	}
 
+	server_mode=$mode
+	enable_server=$enable
+
 	[ "$enable_client" = 0 ] && [ "$enable_server" = 0 ] && return
 
 	trunc
@@ -97,7 +113,7 @@ generate_config() {
 		elif [ "$client_mode" = "Manycast" ]; then
 			emit "manycastclient 224.0.1.1 minpoll $minpoll maxpoll $maxpoll version $version\n"
 		else
-			for i in ${server//,/ }; do
+			for i in $server; do
 				str="server $i minpoll $minpoll maxpoll $maxpoll version $version"
 				if [ "$iburst" != 0 ]; then
 					str="${str} iburst"
@@ -106,7 +122,7 @@ generate_config() {
 			done
 
 			if [ "$peer" != 0 ]; then
-				for i in ${server//,/ }; do
+				for i in $server; do
 					str="peer $i minpoll $minpoll maxpoll $maxpoll version $version"
 					if [ "$iburst" != 0 ]; then
 						str="${str} iburst"

timemngr/files/etc/uci-defaults/96-system-ntp-migrate

@@ -23,31 +23,32 @@ if uci -q get system.ntp >/dev/null 2>&1; then
 			enabled="1"
 		fi
 
-		uci -q set time.client.enable_client="$enabled"
+		uci -q set time.client.enable="$enabled"
 		uci -q set time.client.iburst="1"
 		uci -q set time.client.version="4"
 		uci -q set time.client.peer="0"
 		uci -q set time.client.minpoll="6"
 		uci -q set time.client.maxpoll="10"
-		uci -q set time.client.client_mode="Unicast"
+		uci -q set time.client.mode="Unicast"
 
 		servers="$(get_system_ntp_option server)"
-		if [ -n "${servers}" ]; then
-			servers="${servers// /,}"
-		else
-			servers="ntp1.sth.netnod.se,ntp1.gbg.netnod.se"
+		if [ -z "${servers}" ]; then
+			servers="ntp1.sth.netnod.se ntp1.gbg.netnod.se"
 		fi
-		uci -q set time.client.server="${servers}"
+
+		for server in $servers; do
+			uci -q add_list time.client.server="${server}"
+		done
 
 		# DHCP client instance
 		uci -q set time.dhcp_driven="client"
-		uci -q set time.dhcp_driven.enable_client="0"
+		uci -q set time.dhcp_driven.enable="0"
 
 		interface="$(get_system_ntp_option interface)"
 		if [ -n "${interface}" ]; then
-			uci -q set time.dhcp_driven.client_interface="${interface}"
+			uci -q set time.dhcp_driven.interface="${interface}"
 		else
-			uci -q set time.dhcp_driven.client_interface="wan"
+			uci -q set time.dhcp_driven.interface="wan"
 		fi
 
 		uci -q set time.dhcp_driven.iburst="1"
@@ -55,12 +56,12 @@ if uci -q get system.ntp >/dev/null 2>&1; then
 		uci -q set time.dhcp_driven.peer="0"
 		uci -q set time.dhcp_driven.minpoll="6"
 		uci -q set time.dhcp_driven.maxpoll="10"
-		uci -q set time.dhcp_driven.client_mode="Unicast"
+		uci -q set time.dhcp_driven.mode="Unicast"
 
 		# Add timeserver
 		uci -q set time.server="server"
-		uci -q set time.server.enable_server="$(get_system_ntp_option enable_server)"
-		uci -q set time.server.server_mode="Unicast"
+		uci -q set time.server.enable="$(get_system_ntp_option enable_server)"
+		uci -q set time.server.mode="Unicast"
 		uci -q set time.server.ttl="255"
 		uci -q commit time
 	fi

tr104/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=tr104
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.7
 
 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=1e7e8b910fcb498c940bf043be57a7a63cd7b765
+PKG_SOURCE_VERSION:=63a9876a4f7f030bac433fc44427884e7e97baf5
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

twamp/Makefile

@@ -6,13 +6,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=twamp
-PKG_VERSION:=1.4.0
+PKG_VERSION:=1.4.1
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/twamp-light.git
-PKG_SOURCE_VERSION:=9523a75f4c4059b729d462e741f7edd462c28147
+PKG_SOURCE_VERSION:=f3d35a5499e8815721ba384e79fda8181f76b8f8
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

usermngr/Makefile

@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=usermngr
-PKG_VERSION:=1.2.1
+PKG_VERSION:=1.2.2
 
 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/usermngr.git
-PKG_SOURCE_VERSION:=b1021fd6cba8291657a3b127e47c6fd91b8a0976
+PKG_SOURCE_VERSION:=76a7e491ed533b5d2684eef8ace9fd52ecc232e0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif

voicemngr/Makefile

@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=voicemngr
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.6
+PKG_VERSION:=1.0.10
 PKG_LICENSE:=MIT
 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:=75bf5ac920694461360e786f11ad1f668eab90bd
+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

wifimngr/Makefile

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