Merge pull request #656 from Telecominfraproject/main

Merge for 3.0.2-rc3
Revert "hostapd: ubus: add DFS channels support during CSA"
2025-10-31 18:38:10 +00:00 · 2024-04-13 09:36:24 -04:00 · 2024-04-13 07:56:38 +02:00 · 2024-04-13 07:56:36 +02:00 · 2024-04-12 12:21:01 -04:00 · 2024-04-12 17:55:50 +02:00
5 changed files with 31 additions and 6 deletions
--- a/feeds/ucentral/ucentral-client/Makefile
+++ b/feeds/ucentral/ucentral-client/Makefile
@@ -4,10 +4,10 @@ PKG_NAME:=ucentral-client
 PKG_RELEASE:=1

 PKG_SOURCE_URL=https://github.com/Telecominfraproject/wlan-ucentral-client.git
-PKG_MIRROR_HASH:=62db7913d8e8495648ac35c5b0ed5f910c42fc7cdd1f6d70bb08394e8af56053
+PKG_MIRROR_HASH:=3fa810edd53a8c08ce3d8090a095fbc1697c70c50e00a78931400df59fe66eaf
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-06-22
-PKG_SOURCE_VERSION:=7628b5c7d4d0c5f6276b64abc371deb9c76f0734
+PKG_SOURCE_VERSION:=f19b1e86b7f36f4adc544e087cadd7907dabb5f0

 PKG_LICENSE:=BSD-3-Clause
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
--- a/feeds/ucentral/ucentral-client/files/etc/ucentral/version.json
+++ b/feeds/ucentral/ucentral-client/files/etc/ucentral/version.json
--- a/feeds/ucentral/ucentral-event/files/ucentral-event
+++ b/feeds/ucentral/ucentral-event/files/ucentral-event
@@ -224,6 +224,15 @@ handlers = {
 		ubus.call('network.interface.up_none', 'add_device', msg);
 		ubus.call('dhcprelay', 'check_devices');
 	},
+
+	vlan_remove: function(notify) {
+		if (ratelimit) {
+			let msg = {
+				device: notify.data.ifname,
+			};
+			ubus.call('ratelimit', 'device_delete', msg);
+		}
+	},
 };


--- 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:=d081fdd3c4655254b8e4be76f0fa881f53f20a0e8bfcf12f3b547701b6ea126b
+PKG_MIRROR_HASH:=5afb439480d12d3e8e5158f056850b034096cf36a91574dbeecd4a98a8830e83
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_DATE:=2022-05-29
-PKG_SOURCE_VERSION:=cb1c18db707dc86c7eeb3e8828c8f37a689fe644
+PKG_SOURCE_VERSION:=cc0bf95db178248a5e0d3adbc3bcfde1001c4802
 PKG_MAINTAINER:=John Crispin <john@phrozen.org>
 PKG_LICENSE:=BSD-3-Clause

@@ -31,7 +31,8 @@ define Build/Compile
 endef

 define Package/ucentral-schema/install
-	$(INSTALL_DIR) $(1)/usr/share/ucentral
+	$(INSTALL_DIR) $(1)/usr/share/ucentral $(1)/etc/ucentral/
+	$(CP) $(PKG_BUILD_DIR)/schema.json $(1)/etc/ucentral/
 	$(CP) $(PKG_BUILD_DIR)/schemareader.uc $(1)/usr/share/ucentral
 	$(CP) $(PKG_BUILD_DIR)/renderer/* $(1)/usr/share/ucentral
 	$(CP) $(PKG_BUILD_DIR)/command/*.uc $(1)/usr/share/ucentral
--- a/feeds/ucentral/udevstats/files/udevstats.uc
+++ b/feeds/ucentral/udevstats/files/udevstats.uc
@@ -129,6 +129,21 @@ function vlan_add(dev, vid, ad)
 	vlans[keystr] = true;
 }

+function vlan_config_push(vlan_config, dev, vid)
+{
+	let vlan_found = false;
+
+	for (let v in vlan_config[dev]) {
+		if (v[0] == vid) {
+			vlan_found = true;
+			break;
+		}
+	}
+
+	if (!vlan_found)
+		push(vlan_config[dev], [ vid, "rx", "tx"]);
+}
+
 function vlan_set_config(config)
 {
 	vlan_config = config;
@@ -221,7 +236,7 @@ function run_service() {
 					return ubus.STATUS_INVALID_ARGUMENT;
 				if (!vlan_config[req.args.device])
 					vlan_config[req.args.device] = [];
-				push(vlan_config[req.args.device], [ req.args.vlan, "rx", "tx"]);
+				vlan_config_push(vlan_config, req.args.device, req.args.vlan);
 				vlan_set_config(vlan_config);
 				return 0;                           
 			},
Author	SHA1	Message	Date
jaspreetsachdev	192261318c	Merge pull request #656 from Telecominfraproject/main Merge for 3.0.2-rc3	2024-04-13 09:36:24 -04:00
John Crispin	ffb843b486	Revert "hostapd: ubus: add DFS channels support during CSA" This reverts commit `4b5eeb48cc`.	2024-04-13 07:56:38 +02:00
John Crispin	741f7a299a	Revert "hostapd: fix opclass during CSA with DFS channels" This reverts commit `5c37272cd6`.	2024-04-13 07:56:36 +02:00
jaspreetsachdev	dcff5c6932	Merge pull request #655 from Telecominfraproject/main Merge for 3.0.2-rc3	2024-04-12 12:21:01 -04:00
Marek Kwaczynski	5c37272cd6	hostapd: fix opclass during CSA with DFS channels During CSA with DFS channels, disable, enable interface is a part of the algorithm. When interface was enabled old operating class before switch and new channel were used causing mismatch in configured_fixed_chan_to_freq function. Example of log when switch from channel 157 to 108 was triggered: "Could not convert op_class 124 channel 108 to operating frequency" Fixes: WIFI-13385 Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>	2024-04-12 17:55:50 +02:00
Marek Kwaczynski	4b5eeb48cc	hostapd: ubus: add DFS channels support during CSA Add options to trigger CSA with DFS channels, without this patch ubus request was rejected: ubus call hostapd.wlan0 switch_chan '{"freq":5260,"bcn_count":10}' Command failed: Operation not supported Fixes: WIFI-13385 Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>	2024-04-12 17:55:50 +02:00
Marek Kwaczynski	1ca8f18b9d	udevstats: fix adding the same vlans to the config Add filtering the same vlans before adding to the vlan config. The issue was detected during connection many WiFi client using dynamic vlans on the network. Fixes: WIFI-13538 Signed-off-by: Marek Kwaczynski <marek@shasta.cloud>	2024-04-12 17:55:36 +02:00
John Crispin	856ac16e86	ucentral-schema: update to latest HEAD cc0bf95 fix un-tagged swconfig upstream ports Signed-off-by: John Crispin <john@phrozen.org>	2024-04-12 15:17:38 +02:00
Arif Alam	cc3906e550	ratelimit: notify ratelimit on vlan remove Fixes WIFI-13560 Signed-off-by: Arif Alam <arif.alam@netexperience.com>	2024-04-10 18:04:53 +02:00
John Crispin	6b3eb3ef99	ucentral-schema: update to latest HEAD b81c129 Revert "do not add a default valid channels list" Fixes: WIFI-13575 Signed-off-by: John Crispin <john@phrozen.org>	2024-04-10 14:49:24 +02:00
John Crispin	bc6da62f1b	ucentral-schema: update to latest HEAD a3b7e31 add the option for providing vendor specific versioning info Signed-off-by: John Crispin <john@phrozen.org>	2024-04-09 16:22:52 +02:00
John Crispin	0eeb14d4d1	ucentral-client: add version.json Signed-off-by: John Crispin <john@phrozen.org>	2024-04-09 16:14:15 +02:00
John Crispin	8a43d39572	ucentral-schema: update to latest HEAD 377c2ab add ap/schema version to capabilities Signed-off-by: John Crispin <john@phrozen.org>	2024-04-09 08:59:44 +02:00
John Crispin	9a80d8b1de	Revert "ucentral-client: update to latest HEAD" This reverts commit `98ef44fc34`. Signed-off-by: John Crispin <john@phrozen.org>	2024-04-09 08:58:57 +02:00