From 1c2e5c91d9976d94ad47b064ce6c26502a519fe2 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 20 Sep 2023 15:33:51 +0200 Subject: [PATCH] usteer2: rename to rrmd Signed-off-by: John Crispin --- feeds/ucentral/{usteer2 => rrmd}/Makefile | 10 +++++----- .../usteer2 => rrmd/files/etc/config/rrmd} | 0 .../usteer2 => rrmd/files/etc/init.d/rrmd} | 2 +- .../bin/usteer.uc => rrmd/files/usr/bin/rrmd.uc} | 6 +++--- .../files/usr/share/rrmd}/command.uc | 16 ++++++++-------- .../files/usr/share/rrmd}/config.uc | 2 +- .../files/usr/share/rrmd}/event.uc | 0 .../files/usr/share/rrmd}/local.uc | 2 +- .../files/usr/share/rrmd}/neighbor.uc | 0 .../usteer => rrmd/files/usr/share/rrmd}/phy.uc | 0 .../files/usr/share/rrmd}/policy.uc | 2 +- .../files/usr/share/rrmd}/policy_snr.uc | 0 .../files/usr/share/rrmd}/station.uc | 0 feeds/ucentral/ucentral-schema/Makefile | 4 ++-- profiles/ucentral-ap.yml | 2 +- 15 files changed, 23 insertions(+), 23 deletions(-) rename feeds/ucentral/{usteer2 => rrmd}/Makefile (69%) rename feeds/ucentral/{usteer2/files/etc/config/usteer2 => rrmd/files/etc/config/rrmd} (100%) rename feeds/ucentral/{usteer2/files/etc/init.d/usteer2 => rrmd/files/etc/init.d/rrmd} (77%) rename feeds/ucentral/{usteer2/files/usr/bin/usteer.uc => rrmd/files/usr/bin/rrmd.uc} (93%) rename feeds/ucentral/{usteer2/files/usr/share/usteer => rrmd/files/usr/share/rrmd}/command.uc (70%) rename feeds/ucentral/{usteer2/files/usr/share/usteer => rrmd/files/usr/share/rrmd}/config.uc (72%) rename feeds/ucentral/{usteer2/files/usr/share/usteer => rrmd/files/usr/share/rrmd}/event.uc (100%) rename feeds/ucentral/{usteer2/files/usr/share/usteer => rrmd/files/usr/share/rrmd}/local.uc (99%) rename feeds/ucentral/{usteer2/files/usr/share/usteer => rrmd/files/usr/share/rrmd}/neighbor.uc (100%) rename feeds/ucentral/{usteer2/files/usr/share/usteer => rrmd/files/usr/share/rrmd}/phy.uc (100%) rename feeds/ucentral/{usteer2/files/usr/share/usteer => rrmd/files/usr/share/rrmd}/policy.uc (95%) rename feeds/ucentral/{usteer2/files/usr/share/usteer => rrmd/files/usr/share/rrmd}/policy_snr.uc (100%) rename feeds/ucentral/{usteer2/files/usr/share/usteer => rrmd/files/usr/share/rrmd}/station.uc (100%) diff --git a/feeds/ucentral/usteer2/Makefile b/feeds/ucentral/rrmd/Makefile similarity index 69% rename from feeds/ucentral/usteer2/Makefile rename to feeds/ucentral/rrmd/Makefile index 3c0dacf46..ae22edfb2 100644 --- a/feeds/ucentral/usteer2/Makefile +++ b/feeds/ucentral/rrmd/Makefile @@ -1,6 +1,6 @@ include $(TOPDIR)/rules.mk -PKG_NAME:=usteer2 +PKG_NAME:=rrmd PKG_RELEASE:=1 PKG_LICENSE:=ISC @@ -8,11 +8,11 @@ PKG_MAINTAINER:=John Crispin include $(INCLUDE_DIR)/package.mk -define Package/usteer2 +define Package/rrmd SECTION:=utils CATEGORY:=Utilities DEPENDS:=+ucrun - TITLE:=wifi client steering + TITLE:=radio resource management endef define Build/Compile/Default @@ -20,8 +20,8 @@ define Build/Compile/Default endef Build/Compile = $(Build/Compile/Default) -define Package/usteer2/install +define Package/rrmd/install $(CP) ./files/* $(1)/ endef -$(eval $(call BuildPackage,usteer2)) +$(eval $(call BuildPackage,rrmd)) diff --git a/feeds/ucentral/usteer2/files/etc/config/usteer2 b/feeds/ucentral/rrmd/files/etc/config/rrmd similarity index 100% rename from feeds/ucentral/usteer2/files/etc/config/usteer2 rename to feeds/ucentral/rrmd/files/etc/config/rrmd diff --git a/feeds/ucentral/usteer2/files/etc/init.d/usteer2 b/feeds/ucentral/rrmd/files/etc/init.d/rrmd similarity index 77% rename from feeds/ucentral/usteer2/files/etc/init.d/usteer2 rename to feeds/ucentral/rrmd/files/etc/init.d/rrmd index 93ec8eddc..9a7d85b69 100755 --- a/feeds/ucentral/usteer2/files/etc/init.d/usteer2 +++ b/feeds/ucentral/rrmd/files/etc/init.d/rrmd @@ -7,7 +7,7 @@ USE_PROCD=1 start_service() { procd_open_instance - procd_set_param command /usr/bin/usteer.uc + procd_set_param command /usr/bin/rrmd.uc procd_set_param respawn 3600 5 0 procd_close_instance } diff --git a/feeds/ucentral/usteer2/files/usr/bin/usteer.uc b/feeds/ucentral/rrmd/files/usr/bin/rrmd.uc similarity index 93% rename from feeds/ucentral/usteer2/files/usr/bin/usteer.uc rename to feeds/ucentral/rrmd/files/usr/bin/rrmd.uc index 0131fa5c8..ee4347cab 100755 --- a/feeds/ucentral/usteer2/files/usr/bin/usteer.uc +++ b/feeds/ucentral/rrmd/files/usr/bin/rrmd.uc @@ -1,17 +1,17 @@ #!/usr/bin/ucrun -push(REQUIRE_SEARCH_PATH, '/usr/share/usteer/*.uc'); +push(REQUIRE_SEARCH_PATH, '/usr/share/rrmd/*.uc'); global.nl80211 = require("nl80211"); global.fs = require('fs'); global.ulog = { - identity: 'usteer', + identity: 'rrm', channels: [ 'stdio', 'syslog' ], }; global.ubus = { - object: 'usteer2', + object: 'rrm', connect: function() { printf('connected to ubus\n'); diff --git a/feeds/ucentral/usteer2/files/usr/share/usteer/command.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/command.uc similarity index 70% rename from feeds/ucentral/usteer2/files/usr/share/usteer/command.uc rename to feeds/ucentral/rrmd/files/usr/share/rrmd/command.uc index f93d96c1a..a2ec9c947 100644 --- a/feeds/ucentral/usteer2/files/usr/share/usteer/command.uc +++ b/feeds/ucentral/rrmd/files/usr/share/rrmd/command.uc @@ -10,7 +10,7 @@ function result(error, event, text, data) { } const actions = { - // ubus call usteer2 command '{"action": "kick", "addr": "1c:57:dc:37:3c:b1", "reason": 5, "ban_time": 30 }' + // ubus call rrmd command '{"action": "kick", "addr": "1c:57:dc:37:3c:b1", "reason": 5, "ban_time": 30 }' kick: function(msg) { if (!global.station.kick(msg)) return result(1, msg.event, 'station ' + msg.addr + ' is unknown', { action: 'kick', addr: msg.addr }); @@ -18,9 +18,9 @@ const actions = { return result(0, 0, 'station ' + msg.addr + ' was kicked', { action: 'kick', addr: msg.addr }); }, - // ubus call usteer2 command '{"action": "beacon_request", "addr": "4e:7f:3e:2c:8a:68", "params": "channel": 1}' - // ubus call usteer2 command '{"action": "beacon_request", "addr": "4e:7f:3e:2c:8a:68", "params": "ssid": "Pluto" }' - // ubus call usteer2 get_beacon_request '{"addr": "4e:7f:3e:2c:8a:68"}' + // ubus call rrmd command '{"action": "beacon_request", "addr": "4e:7f:3e:2c:8a:68", "params": "channel": 1}' + // ubus call rrmd command '{"action": "beacon_request", "addr": "4e:7f:3e:2c:8a:68", "params": "ssid": "Pluto" }' + // ubus call rrmd get_beacon_request '{"addr": "4e:7f:3e:2c:8a:68"}' beacon_request: function(msg) { if (!global.station.beacon_request(msg)) return result(1, msg.event, 'station ' + msg.addr + ' is unknown', { action: 'beacon_request', addr: msg.addr }); @@ -28,7 +28,7 @@ const actions = { return result(0, 0, 'station ' + msg.addr + ' beacon-request sent', { action: 'beacon_request', addr: msg.addr }); }, - // ubus call usteer2 command '{"action": "channel_switch", "bssid": "34:eF:b6:aF:48:b1", "channel": 4 }' + // ubus call rrmd command '{"action": "channel_switch", "bssid": "34:eF:b6:aF:48:b1", "channel": 4 }' channel_switch: function(msg) { if (!global.local.switch_chan(msg)) return result(1, msg.event, 'BSS ' + msg.bssid + ' failed to trigger channel switch', { action: 'channel_switch', bssid: msg.bssid }); @@ -36,7 +36,7 @@ const actions = { return result(0, msg.event, 'BSS ' + msg.bssid + ' triggered channel switch', { action: 'channel_switch', bssid: msg.bssid }); }, - // ubus call usteer2 command '{"action": "tx_power", "bssid": "34:eF:b6:aF:48:b1", "level": 20}' + // ubus call rrmd command '{"action": "tx_power", "bssid": "34:eF:b6:aF:48:b1", "level": 20}' tx_power: function(msg) { if (!global.phy.txpower(msg)) return result(1, msg.event, 'BSS ' + msg.bssid + ' failed to set TX power', { action: 'tx_power', bssid: msg.bssid }); @@ -45,7 +45,7 @@ const actions = { return result(0, msg.event, 'BSS ' + msg.bssid + ' changed TX power', { action: 'tx_power', bssid: msg.bssid, level }); }, - // ubus call usteer2 command '{"action": "bss_transition", "addr": "4e:7f:3e:2c:8a:68", "neighbors": ["34:ef:b6:af:48:b1"] }' + // ubus call rrmd command '{"action": "bss_transition", "addr": "4e:7f:3e:2c:8a:68", "neighbors": ["34:ef:b6:af:48:b1"] }' bss_transition: function(msg) { if (!global.station.bss_transition(msg)) return result(1, msg.event, 'BSS transition ' + msg.addr + ' failed to trigger', { action: 'bss_transition', addr: msg.addr }); @@ -53,7 +53,7 @@ const actions = { return result(0, 0, 'BSS transition ' + msg.addr + ' triggered'); }, - // ubus call usteer2 command '{"action": "neighbors", "neighbors": [ [ "00:11:22:33:44:55", "OpenWifi", "34efb6af48b1af4900005301070603010300" ], [ "aa:bb:cc:dd:ee:ff", "OpenWifi2", "34efb6af48b1af4900005301070603010300" ] ] }' + // ubus call rrmd command '{"action": "neighbors", "neighbors": [ [ "00:11:22:33:44:55", "OpenWifi", "34efb6af48b1af4900005301070603010300" ], [ "aa:bb:cc:dd:ee:ff", "OpenWifi2", "34efb6af48b1af4900005301070603010300" ] ] }' neighbors: function(msg) { if (!global.neighbor.remote(msg)) return result(1, msg.event, 'Failed to set neighbors', { action: 'neighbors' }); diff --git a/feeds/ucentral/usteer2/files/usr/share/usteer/config.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/config.uc similarity index 72% rename from feeds/ucentral/usteer2/files/usr/share/usteer/config.uc rename to feeds/ucentral/rrmd/files/usr/share/rrmd/config.uc index 71aa4c07a..4a3797398 100644 --- a/feeds/ucentral/usteer2/files/usr/share/usteer/config.uc +++ b/feeds/ucentral/rrmd/files/usr/share/rrmd/config.uc @@ -3,7 +3,7 @@ return { station_expiry: 120, init: function() { - let options = uci.get_all('usteer2', '@base[-1]'); + let options = uci.get_all('rrmd', '@base[-1]'); for (let key in options) this[key] = options[key]; }, diff --git a/feeds/ucentral/usteer2/files/usr/share/usteer/event.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/event.uc similarity index 100% rename from feeds/ucentral/usteer2/files/usr/share/usteer/event.uc rename to feeds/ucentral/rrmd/files/usr/share/rrmd/event.uc diff --git a/feeds/ucentral/usteer2/files/usr/share/usteer/local.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/local.uc similarity index 99% rename from feeds/ucentral/usteer2/files/usr/share/usteer/local.uc rename to feeds/ucentral/rrmd/files/usr/share/rrmd/local.uc index 405178f82..710dd6c0e 100644 --- a/feeds/ucentral/usteer2/files/usr/share/usteer/local.uc +++ b/feeds/ucentral/rrmd/files/usr/share/rrmd/local.uc @@ -91,7 +91,7 @@ function hapd_subunsub(path, sub) { if (!status) return; - let cfg = uci.get_all('usteer2', status.uci_section); + let cfg = uci.get_all('rrmd', status.uci_section); if (!cfg) cfg = {}; diff --git a/feeds/ucentral/usteer2/files/usr/share/usteer/neighbor.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/neighbor.uc similarity index 100% rename from feeds/ucentral/usteer2/files/usr/share/usteer/neighbor.uc rename to feeds/ucentral/rrmd/files/usr/share/rrmd/neighbor.uc diff --git a/feeds/ucentral/usteer2/files/usr/share/usteer/phy.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/phy.uc similarity index 100% rename from feeds/ucentral/usteer2/files/usr/share/usteer/phy.uc rename to feeds/ucentral/rrmd/files/usr/share/rrmd/phy.uc diff --git a/feeds/ucentral/usteer2/files/usr/share/usteer/policy.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/policy.uc similarity index 95% rename from feeds/ucentral/usteer2/files/usr/share/usteer/policy.uc rename to feeds/ucentral/rrmd/files/usr/share/rrmd/policy.uc index 5d5a267d6..4bcb2055b 100644 --- a/feeds/ucentral/usteer2/files/usr/share/usteer/policy.uc +++ b/feeds/ucentral/rrmd/files/usr/share/rrmd/policy.uc @@ -1,7 +1,7 @@ let policies = {}; return { init: function() { - let config = global.uci.get_all('usteer2'); + let config = global.uci.get_all('rrmd'); for (let section in config) { if (config[section]['.type'] != 'policy' || !config[section].name) continue; diff --git a/feeds/ucentral/usteer2/files/usr/share/usteer/policy_snr.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/policy_snr.uc similarity index 100% rename from feeds/ucentral/usteer2/files/usr/share/usteer/policy_snr.uc rename to feeds/ucentral/rrmd/files/usr/share/rrmd/policy_snr.uc diff --git a/feeds/ucentral/usteer2/files/usr/share/usteer/station.uc b/feeds/ucentral/rrmd/files/usr/share/rrmd/station.uc similarity index 100% rename from feeds/ucentral/usteer2/files/usr/share/usteer/station.uc rename to feeds/ucentral/rrmd/files/usr/share/rrmd/station.uc diff --git a/feeds/ucentral/ucentral-schema/Makefile b/feeds/ucentral/ucentral-schema/Makefile index 58745feae..6439a2bd1 100644 --- 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:=246a66992df8137726f38b4cdcf463fb78ab90191b9b110b7889cd72ecef8e58 +PKG_MIRROR_HASH:=4e8353d5e5be5adf607ef7fe1087786e0a56d90f5695ecec89620844306e751b PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2022-05-29 -PKG_SOURCE_VERSION:=1fe5413ec595e697930b1e31d826bf6844b5ac74 +PKG_SOURCE_VERSION:=214f74425fa65409adde65f9043d5924e0ca935c PKG_MAINTAINER:=John Crispin PKG_LICENSE:=BSD-3-Clause diff --git a/profiles/ucentral-ap.yml b/profiles/ucentral-ap.yml index 7bc15c8c3..d9f112faa 100644 --- a/profiles/ucentral-ap.yml +++ b/profiles/ucentral-ap.yml @@ -46,7 +46,7 @@ packages: - ucentral-tools - udhcprelay - ugps - - usteer2 + - rrmd - ucrun - ucode - unetd