Merge pull request #960 from Telecominfraproject/main

ucentral-schema: update to latest HEAD

feeds/ucentral/ucentral-client/files/etc/ucentral/version.json

@@ -1,5 +1,5 @@
 {
 	"major": 4,
 	"minor": 1,
-	"patch": 0
+	"patch": 1
 }

feeds/ucentral/ucentral-event/files/ucentral-event

@@ -275,16 +275,19 @@ 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);
 
+		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,
@@ -293,6 +296,7 @@ handlers = {
 				ubus.call('network.interface.up_none', 'add_device', msg);
 				ubus.call('udevstats', 'add_device', { device: wan, vlan: +notify.data.vlan_id });
 			}
+		}
 
 		let msg = {
 			name: notify.data.ifname,
@@ -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,

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_DATE:=2025-10-16
-PKG_SOURCE_VERSION:=676e1550c53b7d48a54aa759f65d341168627c5e
+PKG_SOURCE_VERSION:=dc9cad95641266a08de73aab85d931d992090159
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause
 

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": {
+					"roaming": true
-						"message-exchange": "ds",
-						"generate-psk": true
-					}
 				}
 			]
 		},