map_agent: reload wireless after uci commit

Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>
libwifi: don't use private mt.c impl
2025-12-31 08:38:49 +08:00 · 2023-12-18 20:37:28 +01:00 · 2023-12-18 20:36:50 +01:00 · 2023-12-18 20:36:44 +01:00 · 2023-12-18 18:07:59 +01:00 · 2023-12-18 16:59:25 +01:00
21 changed files with 90 additions and 45 deletions
--- a/bbfdm/Makefile
+++ b/bbfdm/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=bbfdm
-PKG_VERSION:=1.4.20
+PKG_VERSION:=1.4.23

 USE_LOCAL:=0
 ifneq ($(USE_LOCAL),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/bbfdm.git
-PKG_SOURCE_VERSION:=753e6893b28b5832a51702f0ce68c772f4443fb9
+PKG_SOURCE_VERSION:=c10303fc51a1034cb87040e0eaf23c95d2b1c658
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/hostmngr/Makefile
+++ b/hostmngr/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=hostmngr
-PKG_VERSION:=1.1.3
+PKG_VERSION:=1.1.4

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=30e1853c097a829f8af138e3929fb17ac77e914b
+PKG_SOURCE_VERSION:=edb5bbe57c5bc83035e217c73071c9b3e878dc22
 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
--- a/icwmp/Makefile
+++ b/icwmp/Makefile
@@ -8,13 +8,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=icwmp
-PKG_VERSION:=9.5.26
+PKG_VERSION:=9.5.27

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/icwmp.git
-PKG_SOURCE_VERSION:=c732e063d95187628f924f44061817930614208e
+PKG_SOURCE_VERSION:=ce1f7e01f0f5e7cc3a5dfeb5378d488f3e2938a0
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
--- a/libqos/Makefile
+++ b/libqos/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libqos
-PKG_VERSION:=7.2.105
+PKG_VERSION:=7.2.106

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=61b15e0fe345186d36d0ca3212a08f384af3609b
+PKG_SOURCE_VERSION:=02dba6571fddd9b4c5b4b671270604b4c0faf9ae
 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
--- a/libwifi/Makefile
+++ b/libwifi/Makefile
@@ -5,12 +5,12 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=libwifi
-PKG_VERSION:=7.4.15
+PKG_VERSION:=7.4.16

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=fc4f8e041cbf9e8180b1b28ca46dae4e1cd0aa85
+PKG_SOURCE_VERSION:=dfafd5f7ea387d6119a9eb692e435f98b16f75a3
 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
@@ -53,7 +53,7 @@ else ifeq ($(CONFIG_TARGET_ipq53xx),y)
  TARGET_CFLAGS +=-DIPQ53XX
 else ifeq ($(CONFIG_TARGET_mediatek),y)
  TARGET_PLATFORM=LINUX
-  TARGET_WIFI_TYPE=MEDIATEK MAC80211
+  TARGET_WIFI_TYPE=MAC80211
  TARGET_CFLAGS +=-DIOPSYS_LINUX
 else
  $(info Unexpected CONFIG_TARGET, use default MAC80211)
--- a/map-agent/Makefile
+++ b/map-agent/Makefile
@@ -16,7 +16,7 @@ PKG_LICENSE_FILES:=LICENSE
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-agent
+PKG_SOURCE_URL:=git@dev.iopsys.eu:multi-ap/map-agent.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
--- a/map-agent/files/etc/hotplug.d/ieee80211/30-generate-map-config
+++ b/map-agent/files/etc/hotplug.d/ieee80211/30-generate-map-config
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-strings /proc/device-tree/compatible | grep -qE '^(econet,|airoha,)' && \
-/lib/wifi/multiap conf
--- a/map-agent/files/lib/multiap/map_genconfig
+++ b/map-agent/files/lib/multiap/map_genconfig
@@ -120,6 +120,7 @@ generate_multiap_config() {
 					uci set wireless.$secname.default_disabled="1"
 					uci set wireless.$secname.multi_ap="1"
 					uci commit wireless
+					wifi reload
 				else
 					ubus call uci set "{\"config\":\"wireless\",\"type\":\"wifi-iface\", \
 						\"match\":{\"mode\":\"sta\", \"ifname\":\"$ifname\", \"device\":\"$device\"},\"values\":{\"multi_ap\":\"1\"}}" 2>/dev/null
--- a/map-controller/Makefile
+++ b/map-controller/Makefile
@@ -13,7 +13,7 @@ PKG_MAINTAINER:=Jakob Olsson <jakob.olsson@iopsys.eu>
 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_URL:=https://dev.iopsys.eu/multi-ap/map-controller
+PKG_SOURCE_URL:=git@dev.iopsys.eu:multi-ap/map-controller.git
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)_$(PKG_SOURCE_VERSION).tar.xz
 PKG_MIRROR_HASH:=skip
 endif
--- a/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate
+++ b/mcastmngr/files/common/etc/uci-defaults/61-mcast_config_generate
@@ -89,15 +89,24 @@ interfaces_ok(){
 	# check if upstream untagged
 	IFS=" "
 	for itf in $up_interf; do
-		# check if there exist a device section for this upstream interface, if yes the
-		# do nothing, if no then split the it at . and use the native interface as
-		# upstream interface
-		dev_section=$(ubus call uci get '{"config":"network", "type":"device", "match":{"name":"'"$itf"'"}}' | jsonfilter -e @.values | jq keys[])
+		# check if there exist a interface section for this upstream interface, if yes the
+		# do nothing, if no then generate config as mcast config is outdated
+		local dev_section=$(uci show network | grep -E "\.device=\'$itf\'" | cut -d'.' -f2)

 		# mcast config is outdated, simply generate as per new logic
 		if [ -z "$dev_section" ]; then
 		       # check if the itf is a native interface	&& return 1
-			[ -f "/proc/net/vlan/$itf" ] || return 1
+			return 1
+		else
+			section_type=$(uci get network.$dev_section)
+			if [ "$section_type" == "interface" ]; then
+				# interface section exits, hence, sync has already happened
+				# nothing to do further, just return
+				return 0
+			else
+				# mcast config is outdated
+				return 1
+			fi
 		fi
 	done
 	return 0
--- a/obuspa/Makefile
+++ b/obuspa/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=obuspa
-PKG_VERSION:=7.0.5.3
+PKG_VERSION:=7.0.5.5

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/obuspa.git
-PKG_SOURCE_VERSION:=899950273c709edbfd75d9762aa8c314215799b7
+PKG_SOURCE_VERSION:=ad32d70ccbe3942b945bf6caf74988bd5660cf96
 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/obuspa/roles.json
+++ b/obuspa/files/etc/obuspa/roles.json
@@ -71,6 +71,28 @@
            "PERMIT_SUBS_EVT_OPER_COMP"
          ]
        },
+        {
+          "object": "Device.Reboot()",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        },
+        {
+          "object": "Device.FactoryReset()",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        },
        {
          "object": "Device.DeviceInfo.",
          "perm": [
@@ -161,6 +183,23 @@
            "PERMIT_SUBS_EVT_OPER_COMP"
          ]
        },
+        {
+          "object":"Device.DHCPv4.Server.Pool.{i}.StaticAddress.",
+          "perm": [
+            "PERMIT_GET",
+            "PERMIT_GET_INST",
+            "PERMIT_OBJ_INFO",
+            "PERMIT_CMD_INFO",
+            "PERMIT_SET",
+            "PERMIT_ADD",
+            "PERMIT_DEL",
+            "PERMIT_OPER",
+            "PERMIT_SUBS_VAL_CHANGE",
+            "PERMIT_SUBS_OBJ_ADD",
+            "PERMIT_SUBS_OBJ_DEL",
+            "PERMIT_SUBS_EVT_OPER_COMP"
+          ]
+        },
        {
          "object":"Device.DHCPv6.",
          "perm": [
--- a/self-diagnostics/Makefile
+++ b/self-diagnostics/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=self-diagnostics
-PKG_VERSION:=1.0.3
+PKG_VERSION:=1.0.4
 PKG_RELEASE:=1

 PKG_LICENSE:=GPL-2.0-only
--- a/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json
+++ b/self-diagnostics/files/usr/share/self-diagnostics/spec/trx69.json
@@ -13,7 +13,7 @@
 		},
 		{
 			"description": "TR-181 Parameters via BBFDM",
-			"cmd": "bbfdmd -c get Device."
+			"cmd": "bbfdmd -c schema Device."
 		},
 		{
 			"description": "TR-181 Parameters via CWMP",
--- a/sulu/sulu-base/Makefile
+++ b/sulu/sulu-base/Makefile
@@ -5,11 +5,11 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=sulu-base
-PKG_VERSION:=3.1.39
+PKG_VERSION:=3.1.42

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu.git
-PKG_SOURCE_VERSION:=4c7d619c27538670823e0cfa7ad9b9bfecee5db6
+PKG_SOURCE_VERSION:=6a0cc2795607895bbe8c8e3598e3f5f435af3499
 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:=3.1.39
+PKG_VERSION:=3.1.42
 PKG_RELEASE:=1

 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/websdk/sulu-builder.git
-PKG_SOURCE_VERSION:=693ef57124d209dacce3a56a7ee2a16bf390bc2f
+PKG_SOURCE_VERSION:=76cb288b1496756e8ed43368348127ecfef5751d
 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)
--- 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:=3.1.38
+PKG_VERSION:=3.1.42

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

 include ../sulu-builder/sulu.mk
--- a/timemngr/Makefile
+++ b/timemngr/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=timemngr
-PKG_VERSION:=1.0.11
+PKG_VERSION:=1.0.13

 LOCAL_DEV:=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/bbf/timemngr.git
-PKG_SOURCE_VERSION:=14ea999ba72e878a0b11b227791e4e45a7bb520c
+PKG_SOURCE_VERSION:=7552c44b6fb4561687e0ce50639fd80396836d51
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -21,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE

 include $(INCLUDE_DIR)/package.mk

-RSTRIP:=:
+#RSTRIP:=:

 define Package/$(PKG_NAME)
  SECTION:=utils
--- a/timemngr/files/etc/init.d/timemngr
+++ b/timemngr/files/etc/init.d/timemngr
@@ -33,20 +33,20 @@ start_service() {
 		return 1
 	}

+	if [ "$enable" != 1 ]; then
+		return 1
+	fi
+
 	procd_open_instance timemngr_ubus
 	procd_set_param command $PROG_UBUS
 	procd_append_param command -l ${loglevel}
 	procd_set_param respawn
 	procd_close_instance

-	bbfdm_add_service "bbfdm.time" "${DM_INPUT}"
-
-	if [ "$enable" != 1 ]; then
-		return 1
-	fi
-
 	generate_config
 	create_service
+
+	bbfdm_add_service "bbfdm.time" "${DM_INPUT}"
 }

 reload_service() {
--- a/tr104/Makefile
+++ b/tr104/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk

 PKG_NAME:=tr104
-PKG_VERSION:=1.0.11
+PKG_VERSION:=1.0.12

 LOCAL_DEV:=0
 ifeq ($(LOCAL_DEV),0)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/voice/tr104.git
-PKG_SOURCE_VERSION:=16a409b82605cf63f67ff716750e3e0c002af300
+PKG_SOURCE_VERSION:=393ad165e64413067de84b452126aebf4bcbcb2d
 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.2.0
+PKG_VERSION:=16.2.1

 LOCAL_DEV=0
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b54db067b1bc19a7f9c654466e0d4048a33278d5
+PKG_SOURCE_VERSION:=48082bc03ef03e0c3a9e843523482b017e8676e1
 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
Janusz Dziedzic	57fa4ec5c3	map_agent: reload wireless after uci commit Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>	2023-12-18 20:37:28 +01:00
Janusz Dziedzic	40da2597a9	libwifi: don't use private mt.c impl Signed-off-by: Janusz Dziedzic <janusz.dziedzic@iopsys.eu>	2023-12-18 20:36:50 +01:00
Janusz Dziedzic	db246c24f4	agent/ctrl use git instead of https	2023-12-18 20:36:44 +01:00
Jakob Olsson	59aad46280	map-agent: remove airoha hotplug script workaround for genconf	2023-12-18 18:07:59 +01:00
Amin Ben Romdhane	65a754935e	bbfdm: 1.4.23	2023-12-18 16:59:25 +01:00
Vivek Kumar Dutta	99f0cc9a01	sulu: 3.1.42	2023-12-18 10:51:45 +05:30
Janusz Dziedzic	371e27e92e	wifimngr: 16.2.1	2023-12-14 12:54:06 +00:00
Janusz Dziedzic	724c62684f	libwifi: 7.4.16	2023-12-14 12:52:04 +00:00
Vivek Kumar Dutta	040123d2b1	tr104: 1.0.12	2023-12-14 15:49:05 +05:30
Marina Maslova	c5f26d1217	libqos: use proc file for airoha, fix pipeline	2023-12-14 11:00:10 +04:00
Rahul Thakur	55e87e47f1	mcastmngr: fix uci-default script to not overwrite on upgrade This commit fixes the bug in the uci-default script due to which the upstream interface in the proxy section was getting overwritten on sysupgrades. The uci-default scripts now validates that if the interface that is set as the upstream_interface is a valid interface in the network uci file, then config does not need to be updated.	2023-12-14 06:37:04 +00:00
Amin Ben Romdhane	bb9b397caa	bbfdm: 1.4.22	2023-12-13 18:05:55 +01:00
Janusz Dziedzic	e1c9006b2d	mapagent: mediatek, generate MAP WiFi config Do similar workaround we have for airoha extender.	2023-12-13 15:46:49 +00:00
Vivek Kumar Dutta	b7a95f200f	bbfdm: 1.4.21 - Minimized tools dependency - Fix Ethernet link FlowControl uci options	2023-12-13 20:50:00 +05:30
Vivek Kumar Dutta	fb15ed7deb	icwmp: 9.5.27	2023-12-13 20:43:19 +05:30
Vivek Kumar Dutta	9535b226ce	timemngr: fix status parameter	2023-12-13 19:40:12 +05:30
Vivek Kumar Dutta	48e6c149a6	sulu: 3.1.41	2023-12-13 19:04:05 +05:30
Vivek Kumar Dutta	068307171c	sulu: 3.1.40	2023-12-13 18:51:38 +05:30
Vivek Kumar Dutta	b7957f5dd4	obuspa: 7.0.5.5	2023-12-13 18:50:26 +05:30
Vivek Kumar Dutta	4c40999c71	timemngr: Fix random crashes	2023-12-13 18:09:33 +05:30
Vivek Kumar Dutta	ff786da6a2	self-diagnostics: Added datamodel schema get	2023-12-13 16:32:10 +05:30
Vivek Kumar Dutta	25955bfeca	obuspa: 7.0.5.4	2023-12-13 16:27:33 +05:30
Jakob Olsson	b9f25bcd90	hostmngr: 1.1.4	2023-12-13 11:26:20 +01:00