Merge pull request #960 from Telecominfraproject/main

ucentral-schema: update to latest HEAD
2025-10-29 09:32:34 +00:00 · 2025-10-17 13:44:48 -04:00 · 2025-10-16 11:10:03 +02:00 · 2025-10-09 18:39:35 -04:00 · 2025-10-09 12:14:13 +02:00 · 2025-10-09 12:14:13 +02:00
6 changed files with 31 additions and 35 deletions
--- a/feeds/ucentral/ucentral-client/files/etc/ucentral/version.json
+++ b/feeds/ucentral/ucentral-client/files/etc/ucentral/version.json
@@ -1,5 +1,5 @@
 {
 	"major": 4,
 	"minor": 1,
-	"patch": 0
+	"patch": 1
 }
--- a/feeds/ucentral/ucentral-event/files/ucentral-event
+++ b/feeds/ucentral/ucentral-event/files/ucentral-event
@@ -275,23 +275,27 @@ handlers = {
 	},

 	vlan_add: function(notify) {
-		let vlan_id = `${notify.data.vlan_id}`;
-		vlan_refcount[vlan_id] = (vlan_refcount[vlan_id] || 0) + 1;
-
-		if (vlan_refcount[vlan_id] > 1) {
-			return;
-		}
-
 		if (config.config.swconfig)
 			return handlers.vlan_add_swconfig(notify);

-		for (let wan in wan_ports) {
-			let msg = {
-				name: wan,
-				vlan: [ `${notify.data.vlan_id}:t` ]
-			};
-			ubus.call('network.interface.up_none', 'add_device', msg);
-			ubus.call('udevstats', 'add_device', { device: wan, vlan: +notify.data.vlan_id });
+		let vlan_id = `${notify.data.vlan_id}`;
+		vlan_refcount[vlan_id] = (vlan_refcount[vlan_id] || 0) + 1;
+
+		let parts = split(notify.data.ifname, '-v');
+		let is_wifi_iface = (length(parts) == 2 && wildcard(parts[0], 'wlan*'));
+
+		if (vlan_refcount[vlan_id] > 1 && !is_wifi_iface)
+			return;
+
+		if (vlan_refcount[vlan_id] == 1) {
+			for (let wan in wan_ports) {
+				let msg = {
+					name: wan,
+					vlan: [ `${notify.data.vlan_id}:t` ]
+				};
+				ubus.call('network.interface.up_none', 'add_device', msg);
+				ubus.call('udevstats', 'add_device', { device: wan, vlan: +notify.data.vlan_id });
+			}
 		}

 		let msg = {
@@ -304,16 +308,16 @@ handlers = {
 	},

 	vlan_remove: function(notify) {
+		if (config.config.swconfig)
+			return;
+
 		let vlan_id = `${notify.data.vlan_id}`;
 		vlan_refcount[vlan_id] = (vlan_refcount[vlan_id] || 1) - 1;

-		if (vlan_refcount[vlan_id] > 0) {
+		if (vlan_refcount[vlan_id] > 0)
 			return;
-		}
 		delete vlan_refcount[vlan_id];

-		if (config.config.swconfig)
-			return;
 		for (let wan in wan_ports) {
 			let msg = {
 				name: wan,
--- a/feeds/ucentral/ucentral-schema/Makefile
+++ b/feeds/ucentral/ucentral-schema/Makefile
@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
 PKG_RELEASE:=1

 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
-PKG_MIRROR_HASH:=f72d2e5b01ecb7a488d50d860da63664d992e50c7e046fed866be6733bab3c1c
+PKG_MIRROR_HASH:=c0f43db0530a38eb424e81908ad47a14e1d4d8f8a86eb148e34f98187c79ba6b
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_DATE:=2025-09-29
-PKG_SOURCE_VERSION:=676e1550c53b7d48a54aa759f65d341168627c5e
+PKG_SOURCE_DATE:=2025-10-16
+PKG_SOURCE_VERSION:=dc9cad95641266a08de73aab85d931d992090159
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause

--- a/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/multi-psk.json
+++ b/feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/multi-psk.json
@@ -1,17 +1,12 @@
 {
 	"uuid": 2,
 	"radios": [
-		{
-			"band": "6G",
-			"country": "CA",
-			"channel-mode": "HE",
-			"channel-width": 80
-		},
 		{
 			"band": "5G",
 			"country": "CA",
 			"channel-mode": "HE",
-			"channel-width": 80
+			"channel-width": 80,
+			"channel": 36
 		},
 		{
 			"band": "2G",
@@ -57,10 +52,7 @@
 							"key": "bbbbbbbb"
 						}
 					],
-					"roaming": {
-						"message-exchange": "ds",
-						"generate-psk": true
-					}
+					"roaming": true
 				}
 			]
 		},
--- a/profiles/cig_wf189.yml
+++ b/profiles/cig_wf189.yml
@@ -17,4 +17,4 @@ packages:
  - sysstat
  - kmod-cig-poe-judgment
 diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0 
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
--- a/profiles/cig_wf189w.yml
+++ b/profiles/cig_wf189w.yml
@@ -16,4 +16,4 @@ packages:
  - sysstat
  - kmod-cig-poe-judgment
 diffconfig: |
-  CONFIG_KERNEL_IPQ_MEM_PROFILE=0 
+  CONFIG_KERNEL_IPQ_MEM_PROFILE=0
Author	SHA1	Message	Date
jaspreetsachdev	5b69e6a41e	Merge pull request #960 from Telecominfraproject/main ucentral-schema: update to latest HEAD	2025-10-17 13:44:48 -04:00
John Crispin	1a3955554a	ucentral-schema: update to latest HEAD dc9cad9 Update state schema to add chanUtil field in radio Signed-off-by: John Crispin <john@phrozen.org>	2025-10-16 11:10:03 +02:00
jaspreetsachdev	0fb2bd197a	Merge pull request #959 from Telecominfraproject/main merge for v4.1.1 Release	2025-10-09 18:39:35 -04:00
John Crispin	427ad99151	ucentral-schema: update to latest HEAD c836eb5 ssid: fix roaming defaults for PSK and RADIUS configurations Signed-off-by: John Crispin <john@phrozen.org>	2025-10-09 12:14:13 +02:00
John Crispin	02ed19e3ac	ucentral-event: fix VLAN bridge membership during FT roaming During 802.11r Fast Transition roaming, when a client moves between APs (e.g., wlan0 to wlan1) with the same dynamic VLAN assignment, the vlan_add handler's refcount mechanism prevented the new WiFi interface from being added to the bridge. When wlan0-v100 and wlan1-v100 exist simultaneously with VLAN ID 100, the refcount becomes 2, causing vlan_add to exit early for wlan1-v100. This left wlan1-v100 out of the bridge VLAN table, breaking connectivity after roaming despite correct VLAN assignment via RADIUS and RRB frames. Fix by detecting WiFi VLAN interfaces (wlan-v) and always adding them to the bridge regardless of refcount. The refcount mechanism now only controls WAN port VLAN configuration, which should only occur once per VLAN ID. Also reorganise vlan_add/vlan_remove to check swconfig early for clarity. Signed-off-by: John Crispin <john@phrozen.org>	2025-10-09 12:14:13 +02:00
John Crispin	60968f8c89	profiles: fix syntax error / trailing spaces Fixes: WIFI-15170 Signed-off-by: John Crispin <john@phrozen.org>	2025-10-08 17:45:53 +02:00
jaspreetsachdev	7e840d0a84	Merge pull request #957 from Telecominfraproject/main merge for v4.1.1	2025-10-08 10:51:58 -04:00
John Crispin	207a592896	ucentral-client: set version to v4.1.1 Signed-off-by: John Crispin <john@phrozen.org>	2025-10-07 11:31:11 +02:00
John Crispin	1bae90f681	ucentral-schema: set version to v4.1.1 Signed-off-by: John Crispin <john@phrozen.org>	2025-10-07 11:30:57 +02:00