map-agent: 4.3.3.16

map-agent: dynbhd: fix connected ports file path
map-agent: 4.3.3.15
2025-12-25 03:24:14 +08:00 · 2023-08-28 14:02:10 +05:30 · 2023-08-25 16:59:21 +02:00 · 2023-08-25 09:24:01 +02:00 · 2023-08-24 14:09:46 +00:00 · 2023-08-24 10:11:02 +00:00
48 changed files with 491 additions and 393 deletions
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bbfdm
-PKG_VERSION:=1.0.20
+PKG_VERSION:=1.1.4

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=4a8d286201efdff814f106e92147c697c32a94a9
+PKG_SOURCE_VERSION:=37c3906dd06da7749987e217a481b4f156ec513e
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

@@ -225,7 +225,9 @@ define Package/userinterface/install
 	$(INSTALL_BIN) ./files/etc/init.d/userinterface $(1)/etc/init.d/userinterface
 	$(INSTALL_BIN) ./files/etc/uci-defaults/93-userinterface-firewall $(1)/etc/uci-defaults/93-userinterface-firewall
 	$(INSTALL_BIN) ./files/etc/uci-defaults/94-userinterface-json $(1)/etc/uci-defaults/94-userinterface-json
+	$(INSTALL_BIN) ./files/etc/uci-defaults/95-portmap-firewall $(1)/etc/uci-defaults/95-portmap-firewall
 	$(INSTALL_BIN) ./files/etc/firewall.userinterface $(1)/etc/firewall.userinterface
+	$(INSTALL_BIN) ./files/etc/firewall.portmap $(1)/etc/firewall.portmap
 endef

 Package/libbbfdm/prerm = $(Package/libbbfdm/default/prerm)
--- a/bbfdm/files/etc/config/bbfdm
+++ b/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'

--- a/bbfdm/files/etc/firewall.portmap
+++ b/bbfdm/files/etc/firewall.portmap
@@ -0,0 +1,74 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+log() {
+	echo "${@}"|logger -t firewall.dnat -p info
+}
+
+exec_cmd() {
+	if ! eval "$*"; then
+		log "Failed to run [$*]"
+	fi
+}
+
+reorder_dnat_rules() {
+	nat_chains=$(iptables -t nat -S | grep -E "^-N zone[a-zA-Z0-9_]+prerouting$" | cut -d' ' -f 2)
+
+	for chain in ${nat_chains}; do
+		# Collect empty remote host & empty dport rules
+		EMPTY_HOST_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep -v "\-s ")
+		if [ -n "${EMPTY_HOST_PORT}" ]; then
+			echo "${EMPTY_HOST_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
+
+		# Collect empty remote host but non empty dport rules
+		EMPTY_HOST=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep "\-\-dport" | grep -v "\-s ")
+		if [ -n "${EMPTY_HOST}" ]; then
+			echo "${EMPTY_HOST}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
+
+		# Collect non empty remote host but empty dport rules
+		EMPTY_PORT=$(iptables -t nat -S ${chain} | grep -E "REDIRECT|DNAT" | grep -v "\-\-dport" | grep "\-s ")
+		if [ -n "${EMPTY_PORT}" ]; then
+			echo "${EMPTY_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd | sed 's/-A /-D /g')"
+				exec_cmd $cmd1
+			done
+		fi
+
+		# Now add rules as per datamodel precedence shown below
+		## Non empty remote host, empty dport
+		## empty remote host, non empty dport
+		## empty remote host, empty dport
+		if [ -n "${EMPTY_PORT}" ]; then
+			echo "${EMPTY_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
+
+		if [ -n "${EMPTY_HOST}" ]; then
+			echo "${EMPTY_HOST}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
+
+		if [ -n "${EMPTY_HOST_PORT}" ]; then
+			echo "${EMPTY_HOST_PORT}" | while read cmd; do
+				cmd1="iptables -t nat $(echo $cmd)"
+				exec_cmd $cmd1
+			done
+		fi
+	done
+}
+
+# Re-order portmapping rules according to precedence hierarchy
+reorder_dnat_rules
--- a/bbfdm/files/etc/uci-defaults/95-portmap-firewall
+++ b/bbfdm/files/etc/uci-defaults/95-portmap-firewall
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+uci -q batch <<-EOT
+        delete firewall.port_hook
+        set firewall.port_hook=include
+        set firewall.port_hook.path=/etc/firewall.portmap
+        set firewall.port_hook.reload=1
+        commit firewall
+EOT
+
+exit 0
+
--- a/decollector/Makefile
+++ b/decollector/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=decollector
-PKG_VERSION:=4.0.2.1
+PKG_VERSION:=4.0.2.8

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fa1b24690ca00a73401fec1386dbf98932545d05
+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
--- a/decollector/files/decollector.init
+++ b/decollector/files/decollector.init
@@ -17,10 +17,11 @@ start_service() {

 		config_load mapcontroller
 		config_get en controller enabled "0"
+		config_get collect_int controller de_collect_interval

 		[ $en -gt 0 ] && {
 			procd_open_instance
-			procd_set_param command "$PROG" "-d"
+			procd_set_param command "$PROG" "-d" "${collect_int:+-t $collect_int}"
 			#procd_set_param stdout 1
 			#procd_set_param stderr 1
 			procd_set_param respawn
--- a/dectmngr/Makefile
+++ b/dectmngr/Makefile
@@ -8,13 +8,13 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=dectmngr
 PKG_RELEASE:=3
-PKG_VERSION:=3.5.9
+PKG_VERSION:=3.5.11

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/dectmngr.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=ae9e8f3406f1087464b994cdfbc64a4ce2f86ed4
+PKG_SOURCE_VERSION:=18dece420502e25a9bd9f3b534bc6c338fcc9377
 PKG_MIRROR_HASH:=skip
 endif

--- a/ethmngr/files/broadcom/lib/ethernet/broadcom.sh
+++ b/ethmngr/files/broadcom/lib/ethernet/broadcom.sh
@@ -6,16 +6,16 @@ get_max_port_speed() {
 	fi

 	local ifname="$1"
-	local phycap="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Capabilities' | awk '{print$NF}' | cut -d'|' -f1)"
+	local phycap="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Speed Capabilities' | awk '{print$NF}')"
 	local speed=1000

 	case "$phycap" in
-		10GFD) speed=10000 ;;
-		5GFD) speed=5000 ;;
-		2.5GFD) speed=2500 ;;
-		1GFD|1GHD) speed=1000 ;;
-		100MFD|100MHD) speed=100 ;;
-		10MFD|10MHD) speed=10 ;;
+		10GFD*) speed=10000 ;;
+		5GFD*) speed=5000 ;;
+		2.5GFD*) speed=2500 ;;
+		1GFD*) speed=1000 ;;
+		100MFD*|100MHD*) speed=100 ;;
+		10MFD*|10MHD*) speed=10 ;;
 	esac

 	echo $speed
@@ -84,21 +84,16 @@ set_port_settings() {
 	[ "$duplex" == 0 ] && dplx="HD" || dplx="FD"
 	[ "$autoneg" == "on" ] && media_type="auto" || media_type="$speed$dplx"

-	phycrossbar="$(ethctl $ifname phy-crossbar | head -1)"
-	crossbartype="$(echo $phycrossbar | awk '{print$2$3}')"
-	# Take only the last PHY Endpoint (non-Serdes) into account as Serdes port number precedes
-	[ "$crossbartype" == "oncrossbar" ] && pyhendpoint="$(echo $phycrossbar | awk '{print$NF}')"
-
-	phycaps="$(ethctl $ifname media-type ${pyhendpoint:+ port $pyhendpoint} | awk -F'PHY Capabilities: ' '{print$2}')"
-	numofcaps="$(echo $phycaps | tr '|' ' ' | wc -w)"
+	phycaps="$(ethctl $ifname media-type 2>/dev/null | grep 'PHY Speed Capabilities' | awk '{print$NF}')"
+	numofcaps="$(echo $phycaps | tr ':' ' ' | wc -w)"

        # Reset the port before setting new params
        reset_port $ifname

 	if [ "$numofcaps" == "1" ]; then
-		logger -t "port-management" "$ifname is capable of $phycaps only; not setting speed/duplex"
+		logger -t "ethmngr" "$ifname is capable of $phycaps only; not setting speed/duplex"
 	else
-		logger -t "port-management" "$ifname is capable of $phycaps; setting speed/duplex to $media_type"
+		logger -t "ethmngr" "$ifname is capable of $phycaps; setting speed/duplex to $media_type"
 		ethctl $ifname media-type $media_type ${pyhendpoint:+ port $pyhendpoint} &>/dev/null
 	fi

--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,11 +8,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=9.3.5
+PKG_VERSION:=9.3.8

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=caa4ac86b91b698e73e09a3ba8b60add36ea4b62
+PKG_SOURCE_VERSION:=09b7cd7a6b647dd8cbc038698af9298883b5c262
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip

--- a/icwmp/files/etc/icwmpd/update.sh
+++ b/icwmp/files/etc/icwmpd/update.sh
@@ -14,6 +14,8 @@ handle_icwmp_update() {
 		return 0
 	fi

+	# wait for some time to avoid interface fluctuation
+	sleep 10
 	ret=$(ubus call service list '{"name":"icwmpd"}' | jsonfilter -qe '@.icwmpd.instances.icwmp.running')

 	if [ "$ret" = "true" ]; then
--- a/icwmp/files/etc/init.d/icwmpd
+++ b/icwmp/files/etc/init.d/icwmpd
@@ -488,20 +488,17 @@ reload_service() {
 	fi
 }

-service_triggers() {
-       procd_add_reload_trigger "cwmp"
-
-       procd_open_trigger
-               json_add_array
-                       json_add_string "" "interface.update"
-                       json_add_array
-                               json_add_array
-                                       json_add_string "" "run_script"
-                                       json_add_string "" "/etc/icwmpd/update.sh"
-                               json_close_array
-                       json_close_array
-                       json_add_int "" "2000"
-               json_close_array
-       procd_close_trigger
+add_interface_trigger() {
+        procd_add_interface_trigger "interface.update" "$1" /etc/icwmpd/update.sh
+}
+
+service_triggers() {
+       local wan_interface
+
+       config_load cwmp
+       config_get wan_interface cpe default_wan_interface "wan"
+
+       procd_add_reload_trigger "cwmp"
+       add_interface_trigger ${default_wan_interface}
 }

--- a/ieee1905/Makefile
+++ b/ieee1905/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=ieee1905
-PKG_VERSION:=8.1.11
+PKG_VERSION:=8.1.18

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=90b8f44ca78b4711d5c86234fb0fc621ebd97fd9
+PKG_SOURCE_VERSION:=7623445bf3d10f06b635319fc103570f94250153
 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
--- a/libdsl/Makefile
+++ b/libdsl/Makefile
@@ -36,6 +36,18 @@ else ifeq ($(CONFIG_TARGET_armvirt),y)
  TARGET_CFLAGS +=-DIOPSYS_TEST
 endif

+TARGET_CFLAGS += \
+	-I$(STAGING_DIR)/usr/include \
+	-I$(STAGING_DIR)/usr/include/openssl \
+	-I$(STAGING_DIR)/usr/include/libnl3
+
+MAKE_FLAGS += \
+	CFLAGS="$(TARGET_CFLAGS) -Wall -I./" \
+	LDFLAGS="$(TARGET_LDFLAGS)" \
+	FPIC="$(FPIC)" \
+	PLATFORM="$(TARGET_PLATFORM)" \
+	subdirs="$(subdirs)"
+
 define Package/libdsl
  SECTION:=libs
  CATEGORY:=Libraries
--- a/libvoice-airoha/Makefile
+++ b/libvoice-airoha/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libvoice-airoha
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.3
+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:=3043d53818166ce02644d53f99b5830d228f78dd
+PKG_SOURCE_VERSION:=3f4cdca981b30d54ec5a426775fdcec2a63f83d9
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libvoice-airoha/files/lib/voice/codecs.json
+++ b/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",
@@ -48,7 +49,7 @@
 		"bitrate": 15.2
 	},
 	"gsm": {
-		"name": "GSM-AMR",
+		"name": "AMR",
 		"ptime_min": 10,
 		"ptime_max": 30,
 		"ptime_default": 20,
--- a/libvoice-broadcom/Makefile
+++ b/libvoice-broadcom/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libvoice-broadcom
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.0
+PKG_VERSION:=1.0.1
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE

@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=dc227982c48ee6d722f3fe18dc9db71495ce9758
+PKG_SOURCE_VERSION:=548f8fccc9f8f0b5dd6bb39bdd9cac8659400cb6
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libvoice-broadcom/files/lib/voice/codecs.json
+++ b/libvoice-broadcom/files/lib/voice/codecs.json
@@ -48,7 +48,7 @@
 		"bitrate": 15.2
 	},
 	"gsm": {
-		"name": "GSM-AMR",
+		"name": "AMR",
 		"ptime_min": 10,
 		"ptime_max": 30,
 		"ptime_default": 20,
--- a/libvoice-d2/Makefile
+++ b/libvoice-d2/Makefile
@@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk

 PKG_NAME:=libvoice-d2
 PKG_RELEASE:=1
-PKG_VERSION:=1.0.4
+PKG_VERSION:=1.0.6
 PKG_LICENSE:=PROPRIETARY
 PKG_LICENSE_FILES:=LICENSE

@@ -17,7 +17,7 @@ LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/$(PKG_NAME).git
-PKG_SOURCE_VERSION:=f2134d372b3f5e5810e18f34d64d5486d17fca64
+PKG_SOURCE_VERSION:=062a265754b93a865cfcd2745f200aa09fb4a668
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libvoice-d2/files/lib/voice/codecs.json
+++ b/libvoice-d2/files/lib/voice/codecs.json
@@ -15,14 +15,6 @@
 		"ptime_increment": 10,
 		"bitrate": 64
 	},
-	"g729a": {
-		"name": "G.729a",
-		"ptime_min": 10,
-		"ptime_max": 40,
-		"ptime_default": 20,
-		"ptime_increment": 10,
-		"bitrate": 64
-	},
 	"g729": {
 		"name": "G.729",
 		"ptime_min": 10,
--- a/libwifi/Makefile
+++ b/libwifi/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libwifi
-PKG_VERSION:=7.2.104
+PKG_VERSION:=7.2.112

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a246bf9fd92a1a8c107ffff3eb3428a4174a67df
+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
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-agent
-PKG_VERSION:=4.3.3.2
+PKG_VERSION:=4.3.3.16
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6b1347b33333f3ef9884de0745aa862a0a1dabc8
+PKG_SOURCE_VERSION:=961b0665b6d36d168224414306b61e53fd999528
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 PKG_LICENSE:=BSD-3-Clause
@@ -28,7 +28,7 @@ define Package/map-agent
  CATEGORY:=Utilities
  TITLE:=WiFi multi-AP Agent (EasyMesh R2)
  DEPENDS:=+libwifi +libuci +libubox +ubus +libeasy +libieee1905 +ieee1905 \
-	   +map-plugin +ip-bridge +@BUSYBOX_CONFIG_PATCH +@BUSYBOX_CONFIG_DIFF
+	  +map-plugin +ip-bridge
 endef


--- a/map-agent/files/etc/config/mapagent
+++ b/map-agent/files/etc/config/mapagent
@@ -8,6 +8,7 @@ config agent 'agent'
 	option eth_onboards_wifi_bhs '0'
 #	option controller_macaddr '0a:1b:2c:3d:4e:50'
 	option scan_on_boot_only '0'
+	list map_port 'all'

 config dynamic_backhaul
 	option missing_bh_timer '60'
--- a/map-agent/files/etc/hotplug.d/ethernet/map-dynamic-backhaul
+++ b/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
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -5,9 +5,9 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=map-controller
-PKG_VERSION:=4.3.0.6
+PKG_VERSION:=4.3.0.11
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=cadbccc7654a40f16f96f2c48e584b998c03620e
+PKG_SOURCE_VERSION:=6c643513889f5868cd311b262b3059d0273b36ba
 PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>

 LOCAL_DEV=0
--- a/map-controller/files/etc/init.d/mapcontroller
+++ b/map-controller/files/etc/init.d/mapcontroller
@@ -155,6 +155,10 @@ validate_controller_config() {
 	return 0
 }

+create_dir() {
+	mkdir -p /etc/multiap
+}
+
 start_service() {
 	local enabled

@@ -164,6 +168,8 @@ start_service() {
 	config_get_bool enabled controller enabled 1
 	[ "$enabled" -eq 0 ] && return

+	create_dir
+
 	procd_open_instance
 	procd_set_param command "/usr/sbin/mapcontroller" "-d"

--- a/map-topology/Config.in
+++ b/map-topology/Config.in
@@ -18,5 +18,9 @@ config TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI
 	enabled through TOPOLOGYD_EASYMESH_VENDOR_EXT. Please provide the Vendor's OUI
 	through which such features would be exposed.

+config TOPOLOGYD_HOST_WAN_STATS
+	bool "Enable wan statistics collection per hosts"
+	default y
+
 endmenu
 endif
--- a/map-topology/Makefile
+++ b/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.21
+PKG_VERSION:=2.5.1.25

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=693b79873af0017bd53ec001af7f3997565420e8
+PKG_SOURCE_VERSION:=b8a967ad69baea0d892c775ae31beca89a41e704
 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
@@ -52,6 +52,9 @@ ifeq ($(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT),y)
 TARGET_CFLAGS += -DEASYMESH_VENDOR_EXT_OUI=\\\"$(CONFIG_TOPOLOGYD_EASYMESH_VENDOR_EXT_OUI)\\\"
 endif

+ifeq ($(CONFIG_TOPOLOGYD_HOST_WAN_STATS),y)
+TARGET_CFLAGS += -DHOST_WAN_STATS
+endif

 ifeq ($(LOCAL_DEV),1)
 define Build/Prepare
--- a/mcastmngr/files/linux/lib/mcast/linux.sh
+++ b/mcastmngr/files/linux/lib/mcast/linux.sh
@@ -10,37 +10,81 @@ PROG_EXE=/usr/sbin/mcproxy
 PROG_PARAMS=
 PROG_PARAMS_SEPARATOR=:

-setup_mcast_mode() {
-	 unused(){ :;}
+
+__device_is_bridge() {
+	local device="$2"
+	local devsec__="$(uci show network | grep name=.*$device | cut -d'.' -f2)"
+	local sectype="$(uci -q get network.$devsec__)"
+	local devtype="$(uci -q get network.$devsec__.type)"
+	[ "$sectype" != "device" -o "$devtype" != "bridge" ] && return 1
+	eval "$1=$devsec__"
+}
+
+device_is_bridge() {
+	local device="$1"
+	local devsec=
+	__device_is_bridge devsec "$device" || return 1
+}
+
+device_ports() {
+	local device="$1"
+	local devsec=
+
+	if __device_is_bridge devsec "$device"; then
+		echo "$(uci get network.$devsec.ports)"
+	else
+		echo "$device"
+	fi
+}
+
+device_has_ip() {
+	local protocol="$1"
+	local device="$2"
+
+	# Read the openwrt interface for the device.
+	# Device can have multiple logical interfaces like wan and wan6
+	# but same l3 device
+	# NB. Don't use 'get_network_of' here.
+	# This function fails in some uci configurations for interfaces that refer
+	# to a device indirectly.
+	local ifaces=$(ubus call network.interface dump | jsonfilter -e "@.interface[@.device='$device'].interface")
+	for iface in $ifaces; do
+		local ip=
+		case "$protocol" in
+			"igmp") network_get_ipaddr ip "$iface" ;;
+			"mld") network_get_ipaddr6 ip "$iface" ;;
+		esac
+		[ -n "$ip" ] && return
+	done
+
+	return 1
 }

 config_mcproxy_interfaces() {
-	local upstreams="$1"
-	local downstreams="$2"
-	local exceptions="$3"
+	local protocol="$1"
+	local upstreams="$2"
+	local downstreams="$3"
+	local exceptions="$4"
+
+	if [ -z "$upstreams" ] || [ -z "$downstreams" ]; then
+		return 1
+	fi

 	local str_up=""
-	if [ -n "$upstreams" ]; then
-		for upstream in $upstreams; do
-			str_up="$str_up \"$upstream\""
-		done
-	fi
+	for upstream in $upstreams; do
+		device_has_ip "$protocol" "$upstream" || continue
+		str_up="$str_up \"$upstream\""
+	done
+	[ -z "$str_up" ] && return 1

 	local str_down=""
-	if [ -n "$downstreams" ]; then
-		for downstream in $downstreams; do
-			str_down="$str_down \"$downstream\""
-		done
-	fi
+	for downstream in $downstreams; do
+		device_has_ip "$protocol" "$downstream" || continue
+		str_down="$str_down \"$downstream\""
+	done
+	[ -z "$str_down" ] && return 1

-	if [ ! -z $downstream ]; then
-		echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE
-	fi
-
-
-	if [ -z "$exceptions" ] || [ -z "$upstreams" ]; then
-		return
-	fi
+	echo -e "pinstance main:$str_up ==>$str_down;\n" >> $CONFFILE

 	for excp in $exceptions; do
 		local filter=""
@@ -56,34 +100,63 @@ config_mcproxy_interfaces() {
 			;;
 		esac

-		for upstream in $upstreams; do
-			echo "pinstance main upstream \"$upstream\" in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main upstream \"$upstream\" out blacklist table{$filter };" >> $CONFFILE
+		for upstream in $str_up; do
+			echo "pinstance main upstream $upstream in blacklist table{$filter };" >> $CONFFILE
+			echo "pinstance main upstream $upstream out blacklist table{$filter };" >> $CONFFILE
 		done

-		for downstream in $downstreams; do
-			echo "pinstance main downstream \"$downstream\" in blacklist table{$filter };" >> $CONFFILE
-			echo "pinstance main downstream \"$downstream\" out blacklist table{$filter };" >> $CONFFILE
+		for downstream in $str_down; do
+			echo "pinstance main downstream $downstream in blacklist table{$filter };" >> $CONFFILE
+			echo "pinstance main downstream $downstream out blacklist table{$filter };" >> $CONFFILE
 		done
 	done
 }

 config_sysfs_mcast_snooping() {
-	local devsec=
-	local sectype=
-	local devtype=
-	local ports=
+	local downstreams="$1"

 	for downstream in $downstreams; do
-		devsec="$(uci show network | grep name=.*$downstream | cut -d'.' -f2)"
-		sectype="$(uci -q get network.$devsec)"
-		devtype="$(uci -q get network.$devsec.type)"
-		if [ "$sectype" == "device" -a "$devtype" == "bridge" ]; then
+		if device_is_bridge "$downstream"; then
 			echo 1 > /sys/class/net/$downstream/bridge/multicast_snooping
 		fi
 	done
 }

+config_sysfs_mcast_fastleave() {
+	local downstreams="$1"
+	local fastleave="$2"
+	local prt
+
+	for downstream in $downstreams; do
+		for prt in $(device_ports $downstream); do
+			if [ -f  /sys/class/net/$prt/brport/multicast_fast_leave ]; then
+				echo $fastleave > /sys/class/net/$prt/brport/multicast_fast_leave
+			fi
+		done
+	done
+}
+
+config_sysfs_mcast_mode() {
+	local downstreams=$1
+	local mcast_mode=$2
+	local prt
+
+	local mcast_flood=
+	if [ $mcast_mode == "2" ]; then # disable mcast flood
+		mcast_flood=0
+	else
+		mcast_flood=1
+	fi
+
+	for downstream in $downstreams; do
+		for prt in $(device_ports $downstream); do
+			if [ -f  /sys/class/net/$prt/brport/multicast_flood ]; then
+				echo $mcast_flood > /sys/class/net/$prt/brport/multicast_flood
+			fi
+		done
+	done
+}
+
 config_mcproxy_instance() {
 	local protocol="$1"
 	local version="$2"
@@ -96,7 +169,7 @@ config_mcproxy_instance() {
 	local exceptions=
 	local upstreams=
 	local downstreams=
-	local intf_has_ip=
+	local mcast_mode=2 # default value 2 is for blocking mode

 	CONFFILE=/var/etc/mcproxy_"$protocol".conf
 	rm -f $CONFFILE
@@ -121,6 +194,7 @@ config_mcproxy_instance() {

 		upstreams=$igmp_p_up_interfaces
 		downstreams=$igmp_p_down_interfaces
+		mcast_mode=$igmp_p_mode
 	elif [ "$protocol" == "mld" ]; then
 		case "$version" in
 			[1-2])
@@ -140,59 +214,26 @@ config_mcproxy_instance() {

 		upstreams=$mld_p_up_interfaces
 		downstreams=$mld_p_down_interfaces
+		mcast_mode=$mld_p_mode
 	fi

-	# for snooping to work we should enable it on the bridge, doing it from
-	# here instead of from inside network config
-	config_sysfs_mcast_snooping
-
 	[ -n "$max_groups" ] && echo -e "max_groups $max_groups;" >> $CONFFILE
 	[ -n "$robustness" ] && echo -e "rv $robustness;" >> $CONFFILE
 	[ -n "$query_interval" ] && echo -e "qi $query_interval;" >> $CONFFILE
 	[ -n "$q_resp_interval" ] && echo -e "qri $q_resp_interval;" >> $CONFFILE
 	[ -n "$last_mem_q_int" ] && echo -e "lmqi $last_mem_q_int;" >> $CONFFILE
-	if [[ -n $fast_leave ]]; then
-		echo -e "fastleave $fast_leave;\n" >> $CONFFILE
-		config_sysfs_mcast_fastleave $fast_leave
-	fi
+	[ -n "$fast_leave" ] && echo -e "fastleave $fast_leave;\n" >> $CONFFILE

-	[ -n "$upstreams" ] && [ -n "$downstreams" ] &&
-		config_mcproxy_interfaces "$upstreams" "$downstreams" "$exceptions"
+	config_mcproxy_interfaces "$protocol" "$upstreams" "$downstreams" "$exceptions" || return

-	# In case on proxy, upstreams is a list. Iterating and running the mcproxy
-	# for each valid upstream interface
-	for upstream_device in $upstreams;
-	do
-		# Read the upstream interface for the upstream device
-		# upstream device can have multiple logical interfaces like wan and wan6
-		# but same l3 device
-		local upstream_ifaces=$(get_network_of $upstream_device)
+	# for snooping to work we should enable it on the bridge, doing it from
+	# here instead of from inside network config
+	config_sysfs_mcast_snooping "$downstreams"
+	[ -n $fast_leave ] &&
+		config_sysfs_mcast_fastleave "$downstreams" "$fast_leave"
+	config_sysfs_mcast_mode "$downstreams" "$mcast_mode"

-		for iface in $upstream_ifaces;
-		do
-			if [ "$protocol" == "igmp" ]; then
-				network_get_ipaddr upstream_ip $iface
-				if [ ! -z "${upstream_ip}" ]; then
-					intf_has_ip=1
-					break
-				fi
-			fi
-
-			if [ "$protocol" == "mld" ]; then
-				network_get_ipaddr6 upstream_ip $iface
-				if [ ! -z "${upstream_ip}" ]; then
-					intf_has_ip=1
-					break
-				fi
-			fi
-		done
-
-		if [ -z "${intf_has_ip}" ]; then
-			continue
-		fi
-
-		PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
-	done
+	PROG_PARAMS="${PROG_PARAMS} -f ${CONFFILE}${PROG_PARAMS_SEPARATOR}"
 }

 config_mcproxy() {
@@ -205,28 +246,6 @@ config_mcproxy() {
 	fi
 }

-config_sysfs_mcast_fastleave() {
-	local devsec=
-	local sectype=
-	local devtype=
-	local ports=
-
-	for downstream in $downstreams; do
-		devsec="$(uci show network | grep name=.*$downstream | cut -d'.' -f2)"
-		sectype="$(uci -q get network.$devsec)"
-		devtype="$(uci -q get network.$devsec.type)"
-		if [ "$sectype" == "device" -a "$devtype" == "bridge" ]; then
-			ports="$(uci get network.$devsec.ports)"
-			for prt in $ports; do
-				echo $1 > /sys/class/net/$prt/brport/multicast_fast_leave
-			done
-		else
-			[[ -f  /sys/class/net/$downstream/brport/multicast_fast_leave ]] && echo $1 > /sys/class/net/$downstream/brport/multicast_fast_leave
-		fi
-	done
-
-}
-
 configure_mcast() {
 	config_global_params "set_max_groups_and_sources"

--- a/mcastmngr/files/linux/usr/libexec/rpcd/mcast
+++ b/mcastmngr/files/linux/usr/libexec/rpcd/mcast
@@ -4,15 +4,27 @@
 . /lib/functions.sh

 read_mcast_stats() {
+	local temp_igmp_file='/tmp/igmp_stats_'$$
+	local snooping_stats='/tmp/igmp_snooping_stats'
+	local old_mod_time=$(date +%s 2>/dev/null -r "$snooping_stats")

-	temp_igmp_file='/tmp/igmp_stats_'$$
 	# Sending signal to mcproxy to dump multicast data in /tmp/igmp_snooping_stats
-	mcast_pids=$(pidof mcproxy)
+	local mcast_pids=$(pidof mcproxy)
 	for pid in $mcast_pids
 	do
 		$(kill -10 $pid)
 	done
-	cat /tmp/igmp_snooping_stats > temp_igmp_file
+
+	# Wait for signal is being processed by mcproxy
+	if [ -n "$mcast_pids" ]; then
+		for i in 1 2 3; do
+			local new_mod_time=$(date +%s 2>/dev/null -r "$snooping_stats")
+			[ -n "$new_mod_time" ] && [ "$new_mod_time" != "$old_mod_time" ] && break
+			sleep 0.1
+		done
+	fi
+
+	cat "$snooping_stats" > "$temp_igmp_file"

 	local mcast_addrs=""
 	local ifaces=""
@@ -42,7 +54,7 @@ read_mcast_stats() {
 			fi
 			;;
 		esac
-	done < temp_igmp_file
+	done < "$temp_igmp_file"

 	while read line; do
 	# reading each line
@@ -69,7 +81,7 @@ read_mcast_stats() {
 			fi
 			;;
 		esac
-	done < temp_igmp_file
+	done < "$temp_igmp_file"

 	json_init
 	json_add_array "snooping"
@@ -89,7 +101,7 @@ read_mcast_stats() {
 				break
 				;;
 			esac
-		done < temp_igmp_file
+		done < "$temp_igmp_file"
 		IFS=" "
 		for gip_addr in $mcast_addrs; do
 			grp_obj_added=0
@@ -124,7 +136,7 @@ read_mcast_stats() {
 					json_close_object #close the associated device object
 					;;
 				esac
-			done < temp_igmp_file
+			done < "$temp_igmp_file"
 			json_close_array #close the associated devices array
 			json_close_object # close the groups object
 		done # close the loop for group addresses
@@ -134,7 +146,7 @@ read_mcast_stats() {
 	json_close_array # close the snooping array
 	json_dump

-	rm -f temp_igmp_file
+	rm -f "$temp_igmp_file"
 }

 case "$1" in
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.2.16
+PKG_VERSION:=7.0.2.22.2

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=312a739dc9106e8ff490288ba22270f4ce7e1fed
+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
--- a/obuspa/files/etc/init.d/obuspa
+++ b/obuspa/files/etc/init.d/obuspa
@@ -12,7 +12,7 @@ KEEP_FILE="/lib/upgrade/keep.d/obuspa"

 RESET_FILE="/tmp/obuspa/obuspa_param_reset.txt"
 SQL_DB_FILE="/tmp/obuspa/usp.db"
-DB_DUMP="/tmp/obuspa/usp.dump"
+DB_DUMP="/tmp/obuspa/usp.dump_$(date +%s)"

 BASEPATH=""
 INSTANCE_COUNT=0
@@ -76,7 +76,7 @@ db_set()

 dump_db()
 {
-	${PROG} -f ${SQL_DB_FILE} -c show database |awk 'NR>1 {print $1 " \"" $3 "\""}' | sort  > ${DB_DUMP}
+	${PROG} -v0 -f ${SQL_DB_FILE} -c show database |awk '/^Device./ || /^Internal./ {print $1 " \"" $3 "\""}' | sort  > ${DB_DUMP}
 }

 # if db present then check if it matches with existing instances
@@ -196,6 +196,10 @@ validate_obuspa_section()
 		'debug:bool:0' \
 		'prototrace:bool:0' \
 		'log_level:uinteger' \
+		'min_num_to_group:uinteger' \
+		'max_group_sep:uinteger' \
+		'max_cache_time:uinteger' \
+		'ipc_timeout:uinteger' \
 		'log_dest:string' \
 		'db_file:string' \
 		'role_file:file'
@@ -1032,8 +1036,8 @@ register_service()

 	configure_obuspa
 	procd_set_param respawn \
-			"${respawn_threshold:-5}" \
-			"${respawn_timeout:-10}" "${respawn_retry:-3}"
+			"${respawn_threshold:-10}" \
+			"${respawn_timeout:-10}" "${respawn_retry:-5}"

 	procd_set_param watch bbfdm
 	procd_close_instance
--- a/ponmngr/files/etc/bbfdm/json/xpon.json
+++ b/ponmngr/files/etc/bbfdm/json/xpon.json
@@ -587,7 +587,7 @@
 					],
 					"datatype": "string",
 					"enumerations": [
-						"GPON",
+						"G-PON",
 						"XG-PON",
 						"NG-PON2",
 						"XGS-PON"
@@ -858,7 +858,7 @@
 							}
 						]
 					},
-					"ModuleVendor": {
+					"VendorName": {
 						"type": "string",
 						"read": true,
 						"write": false,
@@ -871,11 +871,11 @@
 							{
 								"data": "@Parent",
 								"type": "json",
-								"key": "ModuleVendor"
+								"key": "VendorName"
 							}
 						]
 					},
-					"ModuleName": {
+					"VendorPartNumber": {
 						"type": "string",
 						"read": true,
 						"write": false,
@@ -888,11 +888,11 @@
 							{
 								"data": "@Parent",
 								"type": "json",
-								"key": "ModuleName"
+								"key": "VendorPartNumber"
 							}
 						]
 					},
-					"ModuleVersion": {
+					"VendorRevision": {
 						"type": "string",
 						"read": true,
 						"write": false,
@@ -905,24 +905,7 @@
 							{
 								"data": "@Parent",
 								"type": "json",
-								"key": "ModuleVersion"
-							}
-						]
-					},
-					"ModuleFirmwareVersion": {
-						"type": "string",
-						"read": true,
-						"write": false,
-						"protocols": [
-							"cwmp",
-							"usp"
-						],
-						"datatype": "string",
-						"mapping": [
-							{
-								"data": "@Parent",
-								"type": "json",
-								"key": "ModuleFirmwareVersion"
+								"key": "VendorRevision"
 							}
 						]
 					},
--- a/sulu/Readme.md
+++ b/sulu/Readme.md
@@ -85,3 +85,19 @@ After adding the makefile, user need to specify the list of plugins in below con
 ```bash
 CONFIG_SULU_EXTRA_PACKAGES="sulu-plugin1 sulu-plugin2 sulu-theme1"
 ```
+
+# SULU PWA (Progressive Web App)
+PWA applications generally used for well know secured sites, which can be installed directly from web-browser as desktop/mobile application.
+
+> Note:
+>  1. It requires well defined SSL keys for deployment of PWA for a defined site.
+>  2. It should be used with sites with well defined FQDN
+
+To enable SULU PWA application, user need to select PWA in sulu/sulu-builder config options and provide the path of the pwa key file
+
+```bash
+CONFIG_SULU_PWA_APP=y
+CONFIG_SULU_PWA_KEYS_PATH="/somepath_with_pwa.{crt,key}"
+```
+
+>Note: Replacing/changing the keys might requires uninstall/install of PWA App and CTRL+Shift+R in browser to drop the cached site and load the new site with new keys.
--- a/sulu/sulu-base/Makefile
+++ b/sulu/sulu-base/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-base
-PKG_VERSION:=2.2.5
+PKG_VERSION:=2.3.0

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=2964b4263ee25fe16a0a74e833e269889dc8375f
+PKG_SOURCE_VERSION:=f7d77710c288668c7abf84ec82eeffc613723004
 PKG_MIRROR_HASH:=skip

 SULU_MOD:=core
--- a/sulu/sulu-builder/Makefile
+++ b/sulu/sulu-builder/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-builder
-PKG_VERSION:=2.2.5
+PKG_VERSION:=2.3.0
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=046bb209b4650564cc07d288112f3eb367aabca2
+PKG_SOURCE_VERSION:=6d4933ac821600b051193951f24765569da2c9a4
 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)
@@ -28,7 +28,8 @@ define Package/sulu/default
 	CATEGORY:=Utilities
 	SUBMENU:=SULU
 	TITLE:=SULU-CE
-	DEPENDS:=+nginx +mosquitto-auth-shadow +usermngr +jq
+	DEPENDS:=+mosquitto-auth-shadow +usermngr +jq
+	EXTRA_DEPENDS:=nginx
 endef

 define Package/sulu
@@ -41,10 +42,10 @@ endef

 define Package/sulu-builder
 	$(Package/sulu/default)
+	CONFLICTS:=sulu
 	TITLE += (Builder)
 	VARIANT:=builder
 	DEPENDS+=+sulu-base $(foreach plugin,$(SULU_PLUGINS), +PACKAGE_$(plugin):$(plugin)) $(foreach plugin,$(SULU_EXTRA), +PACKAGE_$(plugin):$(plugin))
-	MENU:=1
 endef

 define Package/sulu/description
@@ -55,16 +56,45 @@ define Package/sulu-builder/description
 	SULU-CE ReactJS based Web UI builder.
 endef

+define Package/sulu/config
+	config SULU_PWA_APP
+		depends on PACKAGE_sulu
+		bool "Enable SULU PWA App support"
+		default n
+		help
+			Enable SULU PWA (Progressive Web App) support, this requires
+			'pwa.crt' and 'pwa.key' to be installed in '/etc/sulu/' directory.
+
+	config SULU_PWA_KEYS_PATH
+		depends on PACKAGE_sulu
+		string "Path of pwa.crt and pwa.key for sulu/PWA"
+		help
+			Provide directory path for the certficates for PWA,
+			directory must contain 'pwa.crt' and 'pwa.key'.
+endef
+
 define Package/sulu-builder/config
-	menu "Configuration"
-		depends on PACKAGE_sulu-builder
-	
 	config SULU_EXTRA_PACKAGES
+		depends on PACKAGE_sulu-builder
 		string "Space separated list of sulu packages"
 		help
 			You can specify the list of non core sulu package,
 			so that sulu-builder include them before building the core.
-	endmenu
+
+	config SULU_PWA_APP
+		depends on PACKAGE_sulu-builder
+		bool "Enable SULU PWA App support"
+		default n
+		help
+			Enable SULU PWA (Progressive Web App) support, this requires
+			'pwa.crt' and 'pwa.key' to be installed in '/etc/sulu/' directory.
+
+	config SULU_PWA_KEYS_PATH
+		depends on PACKAGE_sulu-builder
+		string "Path of pwa.crt and pwa.key for sulu/PWA"
+		help
+			Provide directory path for the certficates for PWA,
+			directory must contain 'pwa.crt' and 'pwa.key'.
 endef

 ifeq ($(BUILD_VARIANT),builder)
@@ -99,11 +129,19 @@ define Package/sulu/install/Default
 	$(INSTALL_BIN) ./files/etc/uci-defaults/40-add-sulu-nginx-config $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/01-update-nginx-uci-template $(1)/etc/uci-defaults/
 	$(INSTALL_BIN) ./files/etc/uci-defaults/10-add-mqtt-config $(1)/etc/uci-defaults/
+ifeq ($(CONFIG_SULU_PWA_APP),y)
+	$(INSTALL_BIN) ./files/etc/uci-defaults/99-eval-set-sulu-pwa-keys $(1)/etc/uci-defaults/
+	$(INSTALL_DATA) $(CONFIG_SULU_PWA_KEYS_PATH)/pwa.crt $(1)/etc/sulu/
+	$(INSTALL_DATA) $(CONFIG_SULU_PWA_KEYS_PATH)/pwa.key $(1)/etc/sulu/
+endif
 endef

 define Package/sulu/install
 	$(Package/sulu/install/Default)
 	$(CP) $(PKG_BUILD_DIR)/dist/* $(1)/sulu
+ifneq ($(CONFIG_SULU_PWA_APP),y)
+	$(CP) $(PKG_BUILD_DIR)/dist/nonPWA.html $(1)/sulu/index.html
+endif
 ifneq ($(CONFIG_PACKAGE_skopeo)$(CONFIG_PACKAGE_umoci),yy)
 	$(RM) $(1)/sulu/config/widgets/lcm-store.json
 endif
@@ -112,6 +150,9 @@ endef
 define Package/sulu-builder/install
 	$(Package/sulu/install/Default)
 	$(CP) $(PKG_BUILD_DIR)/build/dist/* $(1)/sulu
+ifneq ($(CONFIG_SULU_PWA_APP),y)
+	$(CP) $(PKG_BUILD_DIR)/build/dist/nonPWA.html $(1)/sulu/index.html
+endif
 	$(CP) $(PKG_BUILD_DIR)/build/src/config/*.json $(1)/sulu/config/
 	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/diagnostics.json $(1)/sulu/config/widgets/
 	$(CP) $(PKG_BUILD_DIR)/build/src/config/widgets/wan.json $(1)/sulu/config/widgets/
--- a/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config
+++ b/sulu/sulu-builder/files/etc/uci-defaults/40-add-sulu-nginx-config
@@ -9,15 +9,14 @@ add_sulu_nginx_uci()
 	if ! uci_get nginx _sulu_s >/dev/null 2>&1; then
 		uci_add nginx server _sulu_s
 		uci_set nginx _sulu_s root '/sulu'
-		uci_add_list nginx _sulu_s listen "8443 http2 ssl"
-		uci_add_list nginx _sulu_s listen "[::]:8443 http2 ssl"
+		uci_add_list nginx _sulu_s listen "8443 ssl default_server"
+		uci_add_list nginx _sulu_s listen "[::]:8443 ssl default_server"
 		uci_set nginx _sulu_s server_name '_sulu_s'
 		uci_add_list nginx _sulu_s include '/etc/sulu/nginx.locations'
 		uci_set nginx _sulu_s uci_manage_ssl 'self-signed'
        	uci_set nginx _sulu_s ssl_certificate '/etc/nginx/conf.d/_lan.crt'
 	        uci_set nginx _sulu_s ssl_certificate_key '/etc/nginx/conf.d/_lan.key'
-	        uci_set nginx _sulu_s ssl_session_cache 'shared:SSL:32k'
-        	uci_set nginx _sulu_s ssl_session_timeout '64m'
+	        uci_set nginx _sulu_s ssl_session_cache 'none'
 		uci_set nginx _sulu_s access_log 'off; # logd openwrt'
 		uci_set nginx _sulu_s error_log '/dev/null'
 	fi
@@ -27,7 +26,7 @@ add_sulu_nginx_uci()
 		uci_add_list nginx _suluredirect listen "8080"
 		uci_add_list nginx _suluredirect listen "[::]:8080"
 		uci_set nginx _suluredirect server_name '_suluredirect'
-		uci_set nginx _suluredirect return 'https://$host:8443$request_uri'
+		uci_set nginx _suluredirect return '302 https://$host:8443$request_uri'
 	fi
 }

--- a/sulu/sulu-builder/files/etc/uci-defaults/99-eval-set-sulu-pwa-keys
+++ b/sulu/sulu-builder/files/etc/uci-defaults/99-eval-set-sulu-pwa-keys
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+. /lib/functions.sh
+
+set_sulu_pwa_key()
+{
+	if [ -f "/etc/sulu/pwa.crt" -a -f "/etc/sulu/pwa.key" ]; then
+		uci_load nginx
+		uci_set nginx _sulu_s ssl_certificate '/etc/sulu/pwa.crt'
+		uci_set nginx _sulu_s ssl_certificate_key '/etc/sulu/pwa.key'
+	fi
+}
+
+set_sulu_pwa_key
--- a/sulu/sulu-lcm/Makefile
+++ b/sulu/sulu-lcm/Makefile
@@ -4,11 +4,11 @@

 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-lcm
-PKG_VERSION:=2.2.4
+PKG_VERSION:=2.2.12

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-lcm.git
-PKG_SOURCE_VERSION:=46975426ffa53ffcc3b0d9e9160f6b3d4b6d82fd
+PKG_SOURCE_VERSION:=bc866b3679d07a80828aa40f7fcdaf18d48c7c61
 PKG_MIRROR_HASH:=skip

 SULU_PLUGIN_INSTALL:=1
--- a/sulu/sulu-multi-ap/Makefile
+++ b/sulu/sulu-multi-ap/Makefile
@@ -4,11 +4,11 @@

 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-multi-ap
-PKG_VERSION:=2.2.4
+PKG_VERSION:=2.2.18

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-multi-ap.git
-PKG_SOURCE_VERSION:=d77f19d8d964c9ecf8ab6d2cc3c8ddc369135d7e
+PKG_SOURCE_VERSION:=ae4cb0a27b7d084aaad69e81cb4d96d88ecdffee
 PKG_MIRROR_HASH:=skip

 include ../sulu-builder/sulu.mk
--- a/sulu/sulu-parental-control/Makefile
+++ b/sulu/sulu-parental-control/Makefile
@@ -4,11 +4,11 @@

 include $(TOPDIR)/rules.mk
 PKG_NAME:=sulu-parental-control
-PKG_VERSION:=2.2.3
+PKG_VERSION:=2.2.12

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-parental-control.git
-PKG_SOURCE_VERSION:=27f3859e30efbbed211c033f923f35974b3619fd
+PKG_SOURCE_VERSION:=e005dd22fd98342df9589e05dd89e322265a2dcc
 PKG_MIRROR_HASH:=skip

 include ../sulu-builder/sulu.mk
--- a/swmodd/Config.in
+++ b/swmodd/Config.in
@@ -1,83 +1,53 @@
-config SWMODD_REGISTRY_PULL_SUPPORT
-	bool "Add support to pull images from container image registries (i.e: docker.io, quay.io)"
+menu "Configuration"
 	depends on PACKAGE_swmodd
-	default n
-	select PACKAGE_skopeo
-	select PACKAGE_umoci

-config SWMODD_LXC_SUPPORT
-	bool "Handles LXC based containers"
-	depends on PACKAGE_swmodd
-	default y
-	select PACKAGE_lxc
-	select PACKAGE_lxc-attach
-	select PACKAGE_lxc-auto
-	select PACKAGE_lxc-cgroup
-	select PACKAGE_lxc-checkconfig
-	select PACKAGE_lxc-common
-	select PACKAGE_lxc-config
-	select PACKAGE_lxc-configs
-	select PACKAGE_lxc-console
-	select PACKAGE_lxc-create
-	select PACKAGE_lxc-destroy
-	select PACKAGE_lxc-execute
-	select PACKAGE_lxc-freeze
-	select PACKAGE_lxc-hooks
-	select PACKAGE_lxc-info
-	select PACKAGE_lxc-init
-	select PACKAGE_lxc-ls
-	select PACKAGE_lxc-device
-	select PACKAGE_lxc-start
-	select PACKAGE_lxc-stop
-	select PACKAGE_lxc-templates
-	select PACKAGE_lxc-top
-	select PACKAGE_lxc-unfreeze
-	select PACKAGE_lxc-unprivileged
-	select PACKAGE_lxc-unshare
-	select PACKAGE_lxc-user-nic
-	select PACKAGE_lxc-usernsexec
-	select PACKAGE_lxc-wait
+	config SWMODD_LXC_SUPPORT
+		bool "Handles LXC based containers"
+		default y

-config SWMODD_OCI_SUPPORT
-	bool "Handles OCI containers"
-	depends on PACKAGE_swmodd
-	default y
-	select PACKAGE_crun
+	config SWMODD_OCI_SUPPORT
+		bool "Handles OCI containers"
+		default y
+		depends on PACKAGE_swmodd
+		select PACKAGE_crun

-config SWMODD_KERNEL_OPTIONS
-	bool "Enable kernel support for LXC and OCI containers"
-	depends on PACKAGE_swmodd
-	default y
-	select LXC_KERNEL_OPTIONS
-	select LXC_BUSYBOX_OPTIONS
-	select LXC_SECCOMP
-	select LXC_NETWORKING
-	select KERNEL_CGROUPS
-	select KERNEL_CGROUP_SCHED
-	select KERNEL_CGROUP_DEVICE
-	select KERNEL_CGROUP_FREEZER
-	select KERNEL_CGROUP_CPUACCT
-	select KERNEL_CGROUP_NET_PRIO
-	select KERNEL_NET_CLS_CGROUP
-	select KERNEL_NAMESPACES
-	select KERNEL_DEVPTS_MULTIPLE_INSTANCES
-	select KERNEL_POSIX_MQUEUE
-	select KERNEL_FAIR_GROUP_SCHED
-	select KERNEL_RT_GROUP_SCHED
-	select KERNEL_MEMCG
-	select KERNEL_MEMCG_KMEM
-	select KERNEL_CPUSETS
-	select PACKAGE_kmod-ikconfig
-	help
-	  Select needed kernel options for LXC and CRUN related utilities. Options
-	  include cgroups, namespaces and other miscellaneous options. These
-	  options unfortunately can not be installed as a module.
+	config SWMODD_REGISTRY_PULL_SUPPORT
+		bool "Add support to pull images from container image registries (i.e: docker.io, quay.io)"
+		default n
+		depends on PACKAGE_swmodd
+		select PACKAGE_skopeo
+		select PACKAGE_umoci

-config SWMODD_NETWORKING
-	bool "Enable networking support for LXC/OCI containers"
-	depends on PACKAGE_swmodd
-	default y
-	select PACKAGE_kmod-veth
-	select PACKAGE_kmod-macvlan
-	help
-	  Enable "veth pair device" and "macvlan"
+	config SWMODD_KERNEL_OPTIONS
+		bool "Enable kernel support for LXC and OCI containers"
+		default y
+		select KERNEL_CGROUPS
+		select KERNEL_CGROUP_SCHED
+		select KERNEL_CGROUP_DEVICE
+		select KERNEL_CGROUP_FREEZER
+		select KERNEL_CGROUP_CPUACCT
+		select KERNEL_CGROUP_NET_PRIO
+		select KERNEL_NET_CLS_CGROUP
+		select KERNEL_NAMESPACES
+		select KERNEL_DEVPTS_MULTIPLE_INSTANCES
+		select KERNEL_POSIX_MQUEUE
+		select KERNEL_FAIR_GROUP_SCHED
+		select KERNEL_RT_GROUP_SCHED
+		select KERNEL_MEMCG
+		select KERNEL_MEMCG_KMEM
+		select KERNEL_CPUSETS
+		select PACKAGE_kmod-ikconfig
+		help
+		  Select needed kernel options for LXC and CRUN related utilities. Options
+		  include cgroups, namespaces and other miscellaneous options. These
+		  options unfortunately can not be installed as a module.
+
+	config SWMODD_NETWORKING
+		bool "Enable networking support for LXC/OCI containers"
+		default y
+		select PACKAGE_kmod-veth
+		select PACKAGE_kmod-macvlan
+		help
+		  Enable "veth pair device" and "macvlan"
+
+endmenu
--- a/swmodd/Makefile
+++ b/swmodd/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=swmodd
-PKG_VERSION:=2.3.4
+PKG_VERSION:=2.2.7

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/lcm/swmodd.git
-PKG_SOURCE_VERSION:=d29418d26e630894079de73fae66bf04b5db0ab3
+PKG_SOURCE_VERSION:=e202399a238369b792d20aded0e085ab71d1b120
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,7 +28,6 @@ define Package/swmodd
  CATEGORY:=Utilities
  SUBMENU:=TRx69
  TITLE:= Software Modules Daemon
-  MENU:=1
  DEPENDS:=+libuci +libubox +ubus +libuuid +opkg +libcurl \
 	    +PACKAGE_lxc:lxc +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
 	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
@@ -55,12 +54,12 @@ TARGET_CFLAGS += \
 	-D_GNU_SOURCE \
 	-Wall -Werror

-ifeq ($(CONFIG_SWMODD_OCI_SUPPORT),y)
+ifeq ($(CONFIG_PACKAGE_crun),y)
 MAKE_FLAGS += \
 	SWMOD_CRUN="yes"
 endif

-ifeq ($(CONFIG_SWMODD_LXC_SUPPORT),y)
+ifeq ($(CONFIG_PACKAGE_lxc),y)
 MAKE_FLAGS += \
 	SWMOD_LXC="yes"
 endif
--- a/swmodd/files/etc/init.d/crun
+++ b/swmodd/files/etc/init.d/crun
@@ -14,34 +14,6 @@ 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
@@ -66,7 +38,6 @@ configure_crun_container() {
 	fi

 	if [ "${type}" != "crun" ]; then
-		configure_lxc_container "${type}" "${name}" "${requested_state}" "${du_status}" "${BUNDLE}"
 		return 0;
 	fi

--- a/swmodd/files/etc/init.d/swmodd
+++ b/swmodd/files/etc/init.d/swmodd
@@ -6,11 +6,6 @@ STOP=01
 USE_PROCD=1
 PROG=/usr/sbin/swmodd

-log()
-{
-        logger -t swmodd.init "$*"
-}
-
 validate_globals_section()
 {
 	uci_validate_section swmodd swmodd "globals" \
@@ -23,23 +18,15 @@ validate_globals_section()
 }

 start_lxc_container() {
-	local root
-
 	config_get name "${1}" name ""
 	config_get type "${1}" type ""
 	config_get autostart "${1}" autostart "0"
 	config_get timeout "${1}" timeout "300"
-	root="${2}"

 	if [ -z "${name}" ] || [ -z "${type}" ]; then
 		return 0;
 	fi

-	# workaround to install lxc container with installdu and autostart them
-	if [ -f "${root}/$name/config" ]; then
-		type=lxc
-	fi
-
 	if [ "${type}" != "lxc" ]; then
 		return 0;
 	fi
@@ -52,12 +39,12 @@ start_lxc_container() {
 	if [ "${autostart}" == "0" ]; then
 		if [ "${state}" == "RUNNING" ]; then
 			# stop the container if running
-			lxc-stop -k -n "${name}" &
+			lxc-stop -n "${name}" -t "${timeout}" &
 			return 0;
 		elif [ "${state}" == "FROZEN" ]; then
 			# first unfreeze then stop
 			lxc-unfreeze -n "${name}"
-			lxc-stop -k -n "${name}" &
+			lxc-stop -n "${name}" -t "${timeout}" &
 			return 0;
 		fi
 	else
@@ -72,12 +59,6 @@ start_lxc_container() {
 	fi
 }

-stop_lxc_containers() {
-	for f in `lxc-ls`; do
-		lxc-stop -k -n $f >/dev/null 2>&1;
-	done
-}
-
 start_service() {
 	local enabled debug log_level sock lxc_bundle_root oci_bundle_root

@@ -89,15 +70,9 @@ start_service() {

 	[ "${enabled}" -eq 0 ] && return 0

-        if [ ! -d "${lxc_bundle_root}" ]; then
-                log "# Not staring lxc [${lxc_bundle_root}] not present/defined"
-                return 1
-        fi
-
-        if [ ! -d "${oci_bundle_root}" ]; then
-                log "# Not staring oci [${oci_bundle_root}] not present/defined"
-                return 1
-        fi
+	# Create the bundle paths if not present
+	[ -n "${lxc_bundle_root}" ] && mkdir -p "${lxc_bundle_root}"
+	[ -n "${oci_bundle_root}" ] && mkdir -p "${oci_bundle_root}"

 	procd_open_instance swmodd
 	procd_set_param command ${PROG}
@@ -119,17 +94,8 @@ start_service() {
 	if [ -f "${lxc_bundle_root}/lxccontainer" ]; then
 		UCI_CONFIG_DIR="${lxc_bundle_root}"
 		config_load lxccontainer
-		config_foreach start_lxc_container container ${lxc_bundle_root}
+		config_foreach start_lxc_container container
 	fi
-	if [ -f "${oci_bundle_root}/ocicontainer" ]; then
-		UCI_CONFIG_DIR="${oci_bundle_root}"
-		config_load ocicontainer
-		config_foreach start_lxc_container du_eu_assoc ${oci_bundle_root}
-	fi
-}
-
-stop_service() {
-	stop_lxc_containers
 }

 reload_service() {
--- a/swmodd/files/etc/uci-defaults/01-fix-bundle-path
+++ b/swmodd/files/etc/uci-defaults/01-fix-bundle-path
@@ -21,18 +21,23 @@ if [ -n "${lxc_bundle}" ]; then
 elif [ -n "${lxc}" ]; then
 	# if lxc_bundle_root not define in swmodd, update it with lxc path
 	uci_set swmodd globals lxc_bundle_root ${lxc}
+	uci_commit
 else
 	mkdir -p /etc/lxc
 	echo "lxc.lxcpath = /srv/" > /etc/lxc/lxc.conf
 	uci_set swmodd globals lxc_bundle_root "/srv/"
+	uci_commit
 fi

 if [ -z "${oci_bundle}" ] && [ -n "${lxc_bundle}" ]; then
 	# if oci_bundle_root not defined in swmodd, update it with lxc_bundle_root if defined
 	uci_set swmodd globals oci_bundle_root ${lxc_bundle}
+	uci_commit
 elif [ -z "${oci_bundle}" ] && [ -n "${lxc}" ]; then
 	# if oci_bundle_root not defined in swmodd, update it with lxc path
 	uci_set swmodd globals oci_bundle_root ${lxc}
+	uci_commit
 elif [ -z "${oci_bundle}" ]; then
 	uci_set swmodd globals oci_bundle_root "/srv/"
+	uci_commit
 fi
--- a/voicemngr/Makefile
+++ b/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.5
+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:=11b27a3bbf80f87ddfe10ed984d2945655ce3ba1
+PKG_SOURCE_VERSION:=e174820ea544498d56ff89d03307ef883607d792
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/wifimngr/Makefile
+++ b/wifimngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=wifimngr
-PKG_VERSION:=16.0.6
+PKG_VERSION:=16.0.9

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=93b34813aa41220e57bbec8c13c7a68d390c7a61
+PKG_SOURCE_VERSION:=1d2ac09305a6540c5b495fa8ba669599e9e75826
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/wifimngr.git
 PKG_MAINTAINER:=Anjan Chanda <anjan.chanda@iopsys.eu>
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
--- a/wifimngr/files/etc/init.d/wifimngr
+++ b/wifimngr/files/etc/init.d/wifimngr
@@ -20,6 +20,3 @@ reload_service() {
        start
 }

-service_triggers() {
-	procd_add_reload_trigger "wireless"
-}
Author	SHA1	Message	Date
nevadita.chatterjee	c3bdae0ea3	map-agent: 4.3.3.16	2023-08-28 14:02:10 +05:30
Jakob Olsson	ee7b06fa4f	map-agent: dynbhd: fix connected ports file path	2023-08-25 16:59:21 +02:00
Filip Matusiak	b6948a6b49	map-agent: 4.3.3.15	2023-08-25 09:24:01 +02:00
Marek Puzyniak	c3edf99c0b	libwifi: 7.2.112	2023-08-24 14:09:46 +00:00
Marek Puzyniak	eefe92f36b	map-agent: 4.3.3.14	2023-08-24 10:11:02 +00:00
Vivek Kumar Dutta	0ae8e5d14d	obuspa: Fix deadlock in push notifications	2023-08-22 15:39:43 +05:30
Vivek Kumar Dutta	d8bdbcc724	bbfdm: Multiple fixes - c4e1784 Deffered schema/instance updater for transaction - aa8af74 Debug transaction status - 0171e09 Fix transaction maxtimeout - Disable instance updater	2023-08-22 15:37:21 +05:30
Marek Puzyniak	2a4a74be71	ieee1905: 8.1.18	2023-08-17 09:04:16 +00:00
Marek Puzyniak	2892e90289	decollector: 4.0.2.8	2023-08-17 09:02:03 +00:00
Marek Puzyniak	ebe627ad4d	map-controller: 4.3.0.11	2023-08-17 09:00:24 +00:00
Jakob Olsson	ad57b4442b	Revert "ieee1905: 8.1.18" This reverts commit `3eef7470aa`.	2023-08-16 17:47:34 +02:00
Jakob Olsson	18f734b5c1	map-agent: 4.3.3.13	2023-08-16 17:17:46 +02:00
Marek Puzyniak	3eef7470aa	ieee1905: 8.1.18	2023-08-16 11:11:34 +00:00
Marek Puzyniak	be901d600c	map-agent: 4.3.3.12	2023-08-16 08:00:37 +00:00
Marek Puzyniak	ccbb639cea	map-topology: 2.5.1.25	2023-08-14 16:21:07 +00:00
Marek Puzyniak	3f65288875	map-controller: 4.3.0.10	2023-08-14 16:18:27 +00:00
Marek Puzyniak	26f6df0a9e	map-agent: 4.3.3.11	2023-08-14 16:16:56 +00:00
Marek Puzyniak	309c6de284	decollector: 4.0.2.7	2023-08-14 16:15:16 +00:00
Marek Puzyniak	2c26158986	ieee1905: 8.1.17	2023-08-14 16:13:35 +00:00
Sukru Senli	6dd9944f8c	Revert "bbfdm: Fix AccessPoint and SSID mappings" This reverts commit `2bc05fc355`.	2023-08-10 14:55:27 +02:00
George Yang	a5503b09eb	Add RTP payload type for G726 codec	2023-08-10 09:56:06 +02:00
Sukru Senli	75dd54326b	voicemngr: correct LICENSE	2023-08-10 09:55:49 +02:00
Grzegorz Sluja	763757fd30	voicemngr: Handle clid info in call waiting	2023-08-10 09:55:46 +02:00
nevadita.chatterjee	7016375eec	ieee1905: 8.1.16	2023-08-08 19:03:51 +05:30
Vivek Kumar Dutta	2bc05fc355	bbfdm: Fix AccessPoint and SSID mappings	2023-08-08 12:05:45 +05:30
Vivek Kumar Dutta	b04105b0be	obuspa: ipc_timeout config option	2023-08-07 12:12:11 +05:30
nevadita.chatterjee	0ce7697b9e	ieee1905: 8.1.15.1	2023-08-07 09:49:16 +05:30
Vivek Kumar Dutta	399e9368ab	sulu: Option to enable PWA - Added option to enable PWA support - Option to define path of PWA certificates - Form validation fix	2023-08-03 19:45:23 +05:30
Vivek Kumar Dutta	1bf86ea636	sulu: 2.2.18	2023-08-01 09:57:02 +02:00
Vivek Kumar Dutta	7c5081b21d	sulu: 2.2.17	2023-07-28 15:13:26 +05:30
Vivek Kumar Dutta	e84b61eed9	bbfdm: 1.1.3	2023-07-27 14:19:44 +05:30
Lukasz Kotasa	fe42f1cf3e	bbfdm: 1.1.2	2023-07-26 13:35:47 +00:00
Vivek Kumar Dutta	22a8cf7d3d	sulu: 2.2.16	2023-07-26 09:56:26 +02:00
Vivek Kumar Dutta	53ebf47632	sulu: fix site redirection	2023-07-26 09:56:23 +02:00
Vivek Kumar Dutta	dedb73eda7	sulu: 2.2.14	2023-07-20 19:13:49 +05:30
Vivek Kumar Dutta	d83fc6510e	sulu: 2.2.13	2023-07-20 19:13:38 +05:30
Vivek Kumar Dutta	6f69d1862c	sulu: 2.2.12	2023-07-20 19:13:26 +05:30
Vivek Kumar Dutta	0c2d5f0434	swmodd: 2.2.7	2023-07-20 19:10:21 +05:30
Vivek Kumar Dutta	a4b7083bf4	swmodd: 2.2.6	2023-07-20 15:58:00 +05:30
Janusz Dziedzic	d165368adc	libwifi: 7.2.107	2023-07-20 10:46:52 +02:00
Michael Polyntsov	1bc5f8ebad	libvoice-airoha: 1.0.5 Add tone maps for Colombia, Panama and India, fix minor issues for the USA tone map	2023-07-20 09:53:04 +02:00
Filip Matusiak	585457537c	map-agent: 4.3.3.10	2023-07-13 12:35:13 +02:00
Anatoly Mirin	9773c8c2ad	mcastmngr: fixed mcproxy crash for multiupstream config If more than one upstream iface is defined, mcastmngr runs mcproxy multiple times for each protocol (e.g. igmp) with the same config. So second mcproxy process fails because it can't lock the MRT flag (/proc/sys/net/ipv/default/mc_forwarding) already blocked by the first process. If one good and one bad (no IP address) upstream interfaces are defined, mcastmngr generates wrong filter configuration and mcproxy cannot start at all. Now upstream and downstream ifaces are checked in the 'config_mcproxy_interfaces' function and only good interfaces (with IP) are written to the mcproxy config. Only one mcproxy process is started per protocol (igmp, mld), configured to handle multiple interfaces if necessary. 'get_network_of' function removed. This function fails in some uci configurations for interfaces that refer to a device indirectly. Example - network.wan6.device='@wan'	2023-07-13 11:33:02 +02:00
Amin Ben Romdhane	a39025fea6	bbfdm: 1.1.1	2023-07-10 10:36:43 +02:00
Vivek Kumar Dutta	7a56796959	sulu: 2.2.11 (cherry picked from commit `2fb2b24201`)	2023-07-06 12:21:44 +00:00
Vivek Kumar Dutta	bd3896dba0	sulu: 2.2.10 (cherry picked from commit `c07da46687`)	2023-07-06 12:21:21 +00:00
Vivek Kumar Dutta	fe7d43ec63	sulu: 2.2.9 (cherry picked from commit `e5c76f17f6`)	2023-07-06 12:20:55 +00:00
Vivek Kumar Dutta	117c470eb6	decollector: 4.0.2.6	2023-07-06 13:54:38 +02:00
Sukru Senli	8387a42f6a	decontroller: periodically refresh based on mapcontroller config de_collect_interval option	2023-07-06 13:54:28 +02:00
Vivek Kumar Dutta	0e906f2189	bbfdm: Fix usp events	2023-07-06 15:58:05 +05:30
Vivek Kumar Dutta	546b14bed3	obuspa: 7.0.2.22	2023-06-29 17:29:02 +05:30
Jakob Olsson	c4523c6040	map-agent: 4.3.3.9	2023-06-28 16:56:37 +02:00
Marina Maslova	072d786a14	wifimngr: 16.0.9	2023-06-28 13:30:01 +03:00
Marina Maslova	2703fead62	wifimngr: to not trigger reload on wireless change mac80211.sh will handle it by sending of SIGHUP to wifimngr	2023-06-28 10:17:07 +00:00
Yalu Zhang	c3922b7f3b	libvoice-d2-1.0.6: Fix some errors in voice_connection_parm_update()	2023-06-28 11:05:04 +02:00
Vivek Kumar Dutta	ac1abfa6c3	bbfdm: 1.0.30	2023-06-27 19:29:51 +05:30
Wenpeng Song	40b8dd2869	voicemngr: Support ptime change on a connection Also with refactoring below. - Support codec and ptime change in one place - Can support other parameter changes in the future, e.g. echo cancellation, silence suppression libvoice-broadcom, libvoice-airoha: API updated. libvoice-d2: Dummy API for ptime.	2023-06-27 13:01:49 +02:00
Lukasz Kotasa	578a4815ff	bbfdm: 1.0.29	2023-06-27 12:29:13 +02:00
Amin Ben Romdhane	68db860632	bbfdm: 1.0.28	2023-06-27 09:45:41 +02:00
Anjan Chanda	a804d28cef	decollector: 4.0.2.5	2023-06-26 20:34:45 +02:00
Jakob Olsson	81a0b6345e	map-agent: 4.3.3.8	2023-06-26 13:00:50 +02:00
Vivek Kumar Dutta	3568f7c38d	sulu: 2.2.8	2023-06-22 20:49:53 +05:30
Sukru Senli	7ba3ca8af4	ethmngr: update logger type	2023-06-22 14:48:13 +02:00
Sukru Senli	17b4588e03	ethmngr: adapt set port speed to updated ethctl for broadcom	2023-06-22 14:20:12 +02:00
Vivek Kumar Dutta	0c7040bab0	sulu: 2.2.7	2023-06-22 17:39:36 +05:30
Grzegorz Sluja	cab73a2760	Update package libvoice-airoha 40710f1 Add support for the US country code ed40f7e Keep the default country setting is the configured country is not supported	2023-06-22 14:06:25 +02:00
Jakob Olsson	0b7165a05e	map-agent: add map_port list to package config	2023-06-22 13:45:55 +02:00
Jakob Olsson	792981e80f	map-agent: 4.3.3.7	2023-06-22 13:38:21 +02:00
Amin Ben Romdhane	d9faf65cb5	icwmp: 9.3.8	2023-06-22 09:40:29 +02:00
Amit Kumar	11b83611ba	ponmnger: datamodel parameter name correction	2023-06-22 05:40:26 +00:00
Rahul Thakur	3a2674270b	mcastmngr: implement snoop mode for linux targets	2023-06-22 04:38:35 +00:00
Vivek Kumar Dutta	a3d9850ae4	obuspa: 7.0.2.21	2023-06-21 21:08:45 +05:30
Sukru Senli	edb39ef5d8	ethmngr: update get_max_speed function for Broadcom	2023-06-21 16:02:30 +02:00
Vivek Kumar Dutta	e63d02dbb8	obuspa: 7.0.2.20	2023-06-21 18:00:34 +05:30
Vivek Kumar Dutta	81104955be	ieee1905: 8.1.15	2023-06-20 19:08:09 +05:30
Yalu Zhang	8f30e41569	Update packages libvoice-broadcom and libvoice-airoha Replace GSM-AMR with AMR	2023-06-20 15:29:05 +02:00
Amin Ben Romdhane	1d49d924fe	bbfdm: 1.0.27	2023-06-19 17:30:50 +02:00
Amin Ben Romdhane	b24d674d6a	bbfdm: 1.0.26	2023-06-19 16:13:50 +02:00
Suvendhu Hansa	5779233ec1	bbfdm: Fix port mapping rules precedence	2023-06-19 14:11:34 +00:00
Marek Puzyniak	8c768bb802	map-topology: 2.5.1.24	2023-06-19 11:46:59 +00:00
Anjan Chanda	bc51e940da	ieee1905: 8.1.14	2023-06-19 13:21:07 +02:00
Vivek Kumar Dutta	1793cecba3	sulu: 2.2.6	2023-06-19 09:44:48 +05:30
Amin Ben Romdhane	17dcae26d4	bbfdm: 1.0.25	2023-06-16 09:47:27 +02:00
Jakob Olsson	1858923fec	map-controller: 4.3.0.8	2023-06-15 15:28:10 +02:00
Jakob Olsson	2a392a4b98	map-agent: 4.3.3.6	2023-06-15 15:26:03 +02:00
Anjan Chanda	a6ce979c65	decollector: 4.0.2.3	2023-06-15 14:38:52 +02:00
Anjan Chanda	ed3659afe6	wifimngr: 16.0.8	2023-06-15 14:36:28 +02:00
Elena Vengerova	4abb86d20b	libwifi: 7.2.106	2023-06-15 14:27:50 +02:00
Jakob Olsson	e762a9a87b	map-topology: 2.5.1.23	2023-06-15 14:08:06 +02:00
Vivek Kumar Dutta	85fe1dbc92	bbfdm: 1.0.24	2023-06-15 17:37:29 +05:30
Amit Kumar	8489b6c3b6	map-topology: compilation flag for host wan stats default enabled compilation flag defained for host was statistics collection.	2023-06-15 16:16:04 +05:30
Grzegorz Sluja	d7e070db29	Update package dectmngr 3.5.11 Anonymous call to DECT should be displayed as "Withheld"	2023-06-15 12:43:25 +02:00
Rahul Thakur	8bca63207f	libdsl: update makefile for broadcom target	2023-06-15 06:04:44 +00:00
Vivek Kumar Dutta	358e5721fe	icwmp: 9.3.7	2023-06-14 14:29:53 +05:30
Jakob Olsson	807b7ed64d	map-agent: 4.3.3.5	2023-06-14 10:12:11 +02:00
Amin Ben Romdhane	89bc51cace	bbfdm: 1.0.23	2023-06-14 09:34:55 +02:00
Yalu Zhang	f3b90dfa4c	libvoice-d2-1.0.5: Implementation of the API for changing codec on a connection	2023-06-13 16:16:49 +02:00
Yalu Zhang	79894a4580	Remove g729a from /lib/voice/codecs.json	2023-06-13 16:15:20 +02:00
Grzegorz Sluja	2a98ed289a	Update package dectmngr 6ea57b3 Fix the bug that missed calls are not cleared after reading from the handset	2023-06-13 10:54:58 +02:00
Anatoly Mirin	e9f64893ac	mcastmngr: fix mcast stats script Fixed worng temp_igmp_file variable accessing, which caused the same 'temp_igmp_file' file to be used each time 'ubus call mcast stats' was called instead of /tmp/igmp_stats_<PID> file. Because of this, temp file was sometimes overwritten by the next call before it had time to read and the IPTV_IGMP_4-12-1-24_2401.py test ended with an error. A waiting loop has also been added so that mcproxy has time to process the signal and write the dump to a file.	2023-06-12 23:48:08 +03:00
Marek Puzyniak	caa0653bfe	libwifi: 7.2.105	2023-06-12 06:55:07 +00:00
Marek Puzyniak	bcb5366e68	wifimngr: 16.0.7	2023-06-12 06:52:58 +00:00
Amin Ben Romdhane	b1158f5f60	bbfdm: 1.0.22	2023-06-09 17:09:22 +02:00
Vivek Kumar Dutta	a400700c49	obuspa: 7.0.2.19	2023-06-09 19:26:13 +05:30
Wenpeng Song	b571fd47c9	libvoice-airoha: Update codec only if the new codec is different from the current one	2023-06-09 09:45:35 +00:00
Jakob Olsson	8b952700ef	map-controller: 4.3.0.7: create and use /etc/multiap	2023-06-08 16:45:08 +02:00
Vivek Kumar Dutta	23579fc961	obuspa: Fix crash on operate cmd failure	2023-06-08 19:38:20 +05:30
Jakob Olsson	76b388bb75	Revert "map-agent: add dependency on patch and diff" This reverts commit `0d5aae21d7`.	2023-06-08 13:27:32 +00:00
Jakob Olsson	0c7d3eaee4	map-agent: 4.3.3.4	2023-06-08 15:23:38 +02:00
Wenpeng Song	3986be824a	libvoice-airoha: 1.0.4 Implementation of the API to set codec on a connection	2023-06-08 12:57:28 +00:00
Jakob Olsson	ba7b94d4e5	map-agent: 4.3.3.3	2023-06-08 14:21:00 +02:00
Amin Ben Romdhane	e1520fdd48	bbfdm: 1.0.21	2023-06-07 16:20:18 +02:00
Vivek Kumar Dutta	8d20d4ba45	obuspa: Added caching for refresh instances	2023-06-05 19:48:18 +05:30
Vivek Kumar Dutta	723c52bcf5	icwmp: Fix interface update handler This change includes multiple fixes: - Fix inform sent on interface.update with non-configured wan interface - Fix Device.WiFi.NeighboringWiFiDiagnostic. for cwmp	2023-06-05 19:43:41 +05:30
suvendhu	6e3490b985	swmodd: uci-default scrip to migrate lxc-auto config In release-6.5 lxc-auto used for autostart of lxc containers, this uci-default migration script shall migrate the autostart info to the configured path.	2023-06-05 19:39:55 +05:30