scottk/wlan-ap
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-ap.git synced 2025-10-30 18:07:52 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #959 from Telecominfraproject/main

Browse Source 
merge for v4.1.1 Release
This commit is contained in:
jaspreetsachdev
2025-10-09 18:39:35 -04:00
committed by GitHub
parent 7e840d0a84 427ad99151
commit 0fb2bd197a
5 changed files with 30 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
feeds/ucentral/ucentral-event/files/ucentral-event
View File

@@ -275,16 +275,19 @@ handlers = {
}, },
vlan_add: function(notify) { 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) if (config.config.swconfig)
return handlers.vlan_add_swconfig(notify); 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) { for (let wan in wan_ports) {
let msg = { let msg = {
name: wan, name: wan,
@@ -293,6 +296,7 @@ handlers = {
ubus.call('network.interface.up_none', 'add_device', msg); ubus.call('network.interface.up_none', 'add_device', msg);
ubus.call('udevstats', 'add_device', { device: wan, vlan: +notify.data.vlan_id }); ubus.call('udevstats', 'add_device', { device: wan, vlan: +notify.data.vlan_id });
} }
}
let msg = { let msg = {
name: notify.data.ifname, name: notify.data.ifname,
@@ -304,16 +308,16 @@ handlers = {
}, },
vlan_remove: function(notify) { vlan_remove: function(notify) {
if (config.config.swconfig)
return;
let vlan_id = `${notify.data.vlan_id}`; let vlan_id = `${notify.data.vlan_id}`;
vlan_refcount[vlan_id] = (vlan_refcount[vlan_id] || 1) - 1; vlan_refcount[vlan_id] = (vlan_refcount[vlan_id] || 1) - 1;
if (vlan_refcount[vlan_id] > 0) { if (vlan_refcount[vlan_id] > 0)
return; return;
}
delete vlan_refcount[vlan_id]; delete vlan_refcount[vlan_id];
if (config.config.swconfig)
return;
for (let wan in wan_ports) { for (let wan in wan_ports) {
let msg = { let msg = {
name: wan, name: wan,

6
feeds/ucentral/ucentral-schema/Makefile
View File

@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-schema
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-schema.git
PKG_MIRROR_HASH:=83c6f6ae9898086f12cf6b3d611019ad024b1581533bdff1838180d3777ef7e1 PKG_MIRROR_HASH:=92aba982ede40d6db5ab4b4847d578f4a7718e4db1ed757a412970c6e4e852e6
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
PKG_SOURCE_DATE:=2025-09-29 PKG_SOURCE_DATE:=2025-10-09
PKG_SOURCE_VERSION:=c7e15eb3406db6015fc3e9a86c116695552bb12b PKG_SOURCE_VERSION:=c836eb5cf446e7b2f8657b57b0518b83b0699411
PKG_MAINTAINER:=John Crispin <john@phrozen.org> PKG_MAINTAINER:=John Crispin <john@phrozen.org>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause

14
feeds/ucentral/ucentral-schema/files/etc/ucentral/examples/multi-psk.json
View File

@@ -1,17 +1,12 @@
{ {
"uuid": 2, "uuid": 2,
"radios": [ "radios": [
{
"band": "6G",
"country": "CA",
"channel-mode": "HE",
"channel-width": 80
},
{ {
"band": "5G", "band": "5G",
"country": "CA", "country": "CA",
"channel-mode": "HE", "channel-mode": "HE",
"channel-width": 80 "channel-width": 80,
"channel": 36
}, },
{ {
"band": "2G", "band": "2G",
@@ -57,10 +52,7 @@
"key": "bbbbbbbb" "key": "bbbbbbbb"
} }
], ],
"roaming": { "roaming": true
"message-exchange": "ds",
"generate-psk": true
}
} }
] ]
}, },