map-topology: compilation flag for host wan stats

default enabled compilation flag defained for host was statistics collection.
Update package dectmngr 3.5.11
2025-12-28 06:59:28 +08:00 · 2023-06-15 16:16:04 +05:30 · 2023-06-15 12:43:25 +02:00 · 2023-06-15 06:04:44 +00:00 · 2023-06-14 14:29:53 +05:30 · 2023-06-14 10:12:11 +02:00
24 changed files with 148 additions and 209 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.0.23

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

--- 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/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.7

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=caa4ac86b91b698e73e09a3ba8b60add36ea4b62
+PKG_SOURCE_VERSION:=6293f933dc40c45597edccfa9837d47e431da03d
 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/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.4
 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:=bbfcf0f803f63530ee3d9675c1584a8f8422ecb0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- 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.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:=f2134d372b3f5e5810e18f34d64d5486d17fca64
+PKG_SOURCE_VERSION:=84f1eec3154c96486f6c8662f0431fcc41486010
 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.105

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=a246bf9fd92a1a8c107ffff3eb3428a4174a67df
+PKG_SOURCE_VERSION:=6a8a92753412e2098b9251f671514ea364d0c14b
 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.5
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=6b1347b33333f3ef9884de0745aa862a0a1dabc8
+PKG_SOURCE_VERSION:=9a19126d96995f8ddc544b763436491693d3b3af
 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-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.7
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
-PKG_SOURCE_VERSION:=cadbccc7654a40f16f96f2c48e584b998c03620e
+PKG_SOURCE_VERSION:=8186db3bc0798b949f7e54612844afabae022ab7
 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.22

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
-PKG_SOURCE_VERSION:=693b79873af0017bd53ec001af7f3997565420e8
+PKG_SOURCE_VERSION:=b7fefff9aad74568ec8a7c470cb73c54b736bec2
 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/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.19

 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:=7260ebbc65cc3b6dbd93e4b1a15bdddcf1018eeb
 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
--- 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.5

 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:=25cbdf268e803eeed4f840419825512724df055d
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -28,9 +28,8 @@ 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 \
+	    +PACKAGE_liblxc:liblxc +@BUSYBOX_CONFIG_BUSYBOX \
 	    +@BUSYBOX_CONFIG_FEATURE_SHOW_SCRIPT +@BUSYBOX_CONFIG_SCRIPT \
 	    +swmodd-cgroup +jq +libbbfdm-api
 endef
@@ -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_liblxc),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/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.7

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=93b34813aa41220e57bbec8c13c7a68d390c7a61
+PKG_SOURCE_VERSION:=43c9a37217d08af15ae674d87ba0ec7855032f40
 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
Author	SHA1	Message	Date
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