From c467a62af36f284a4fdbe2486ff281e1891909eb Mon Sep 17 00:00:00 2001 From: John Crispin Date: Sat, 12 Feb 2022 09:56:35 +0100 Subject: [PATCH] usteer: update to latest HEAD Fixes: WIFI-7049 Signed-off-by: John Crispin --- feeds/ucentral/usteer/Makefile | 4 ++-- feeds/ucentral/usteer/files/etc/config/usteer | 23 +++++++++++++++++++ feeds/ucentral/usteer/files/etc/init.d/usteer | 16 +++++++------ feeds/ucentral/usteer/patches/fix.patch | 15 ++++++++++++ 4 files changed, 49 insertions(+), 9 deletions(-) create mode 100644 feeds/ucentral/usteer/patches/fix.patch diff --git a/feeds/ucentral/usteer/Makefile b/feeds/ucentral/usteer/Makefile index 14030d46e..65a2dc9ad 100644 --- a/feeds/ucentral/usteer/Makefile +++ b/feeds/ucentral/usteer/Makefile @@ -6,8 +6,8 @@ PKG_RELEASE:=1 PKG_SOURCE_URL=https://git.openwrt.org/project/usteer.git PKG_SOURCE_PROTO:=git PKG_SOURCE_DATE:=2021-04-19 -PKG_SOURCE_VERSION:=ab4d89e7429df19fb7af862213bc5f09ca964948 -PKG_MIRROR_HASH:=84f6143fea887aca896337756d393494a4cfb698f5e48da760c38723ceaca226 +PKG_SOURCE_VERSION:=f42bf2962edd0199e4c96ebf19933b2846bcce27 +#PKG_MIRROR_HASH:=fe00f6ba4e188c1235338a6786c8b23a11a5d4b0e663ffb494ac3d2f4bdc1864 PKG_BUILD_PARALLEL:=1 diff --git a/feeds/ucentral/usteer/files/etc/config/usteer b/feeds/ucentral/usteer/files/etc/config/usteer index 5e30ccf74..fb27fd947 100644 --- a/feeds/ucentral/usteer/files/etc/config/usteer +++ b/feeds/ucentral/usteer/files/etc/config/usteer @@ -5,6 +5,9 @@ config usteer # Log messages to syslog (0/1) option 'syslog' '1' + # Use IPv6 for remote exchange + option 'ipv6' '0' + # Minimum level of logged messages # 0 = fatal # 1 = info @@ -14,12 +17,18 @@ config usteer # 5 = all debug messages option 'debug_level' '2' + # Maximum number of neighbor reports set for a node + #option max_neighbor_reports 8 + # Maximum amount of time (ms) a station may be blocked due to policy decisions #option sta_block_timeout 30000 # Maximum amount of time (ms) a local unconnected station is tracked #option local_sta_timeout 120000 + # Maximum amount of time (ms) a measurement report is stored + #option measurement_report_timeout 120000 + # Local station information update interval (ms) #option local_sta_update 1000 @@ -38,6 +47,9 @@ config usteer # Interval (ms) between sending state updates to other APs #option remote_update_interval 1000 + # Number of remote update intervals after which a remote-node is deleted + #option remote_node_timeout 10 + # Allow rejecting assoc requests for steering purposes (0/1) #option assoc_steering 0 @@ -47,6 +59,13 @@ config usteer # Minimum signal-to-noise ratio or signal level (dBm) to remain connected #option min_snr 0 + # Timeout after which a station with snr < min_snr will be kicked + #option min_snr_kick_delay 5000 + + # Timeout (in ms) after which a association following a disassociation is not seen + # as a roam + #option roam_process_timeout 5000 + # Minimum signal-to-noise ratio or signal level (dBm) before attempting to trigger # client scans for roaming #option roam_scan_snr 0 @@ -54,6 +73,10 @@ config usteer # Maximum number of client roaming scan trigger attempts #option roam_scan_tries 3 + # Retry scanning when roam_scan_tries is exceeded after this timeout (in ms) + # In case this option is set to 0, the client is kicked instead + #option roam_scan_timeout 0 + # Minimum time (ms) between client roaming scan trigger attempts #option roam_scan_interval 10000 diff --git a/feeds/ucentral/usteer/files/etc/init.d/usteer b/feeds/ucentral/usteer/files/etc/init.d/usteer index b088bd9db..f6472bac2 100755 --- a/feeds/ucentral/usteer/files/etc/init.d/usteer +++ b/feeds/ucentral/usteer/files/etc/init.d/usteer @@ -65,6 +65,7 @@ uci_usteer() { local cfg="$1" uci_option_to_json_bool "$cfg" syslog + uci_option_to_json_bool "$cfg" ipv6 uci_option_to_json_bool "$cfg" load_kick_enabled uci_option_to_json_bool "$cfg" assoc_steering uci_option_to_json_string "$cfg" node_up_script @@ -74,12 +75,13 @@ uci_usteer() { for opt in \ debug_level \ sta_block_timeout local_sta_timeout local_sta_update \ - max_retry_band seen_policy_timeout \ + max_neighbor_reports max_retry_band seen_policy_timeout \ + measurement_report_timeout \ load_balancing_threshold band_steering_threshold \ - remote_update_interval \ - min_connect_snr min_snr signal_diff_threshold \ - initial_connect_delay \ - roam_kick_delay roam_scan_tries \ + remote_update_interval remote_node_timeout\ + min_connect_snr min_snr min_snr_kick_delay signal_diff_threshold \ + initial_connect_delay roam_process_timeout\ + roam_kick_delay roam_scan_tries roam_scan_timeout \ roam_scan_snr roam_scan_interval \ roam_trigger_snr roam_trigger_interval \ load_kick_threshold load_kick_delay load_kick_min_clients \ @@ -135,11 +137,11 @@ start_service() procd_open_instance procd_set_param command "$PROG" procd_close_instance - + [ "$CHANNEL" -gt 0 ] || return procd_open_instance procd_set_param command "/usr/libexec/uchannel.uc" procd_set_param respawn 1 300 0 - procd_close_instance + procd_close_instancea } diff --git a/feeds/ucentral/usteer/patches/fix.patch b/feeds/ucentral/usteer/patches/fix.patch new file mode 100644 index 000000000..401897a0e --- /dev/null +++ b/feeds/ucentral/usteer/patches/fix.patch @@ -0,0 +1,15 @@ +Index: usteer-2021-04-19-f42bf296/local_node.c +=================================================================== +--- usteer-2021-04-19-f42bf296.orig/local_node.c ++++ usteer-2021-04-19-f42bf296/local_node.c +@@ -476,8 +476,8 @@ usteer_local_node_status_cb(struct ubus_ + node->freq = blobmsg_get_u32(tb[MSG_FREQ]); + if (tb[MSG_CHANNEL]) + node->channel = blobmsg_get_u32(tb[MSG_CHANNEL]); +- if (tb[MSG_FREQ]) +- node->op_class = blobmsg_get_u32(tb[MSG_OP_CLASS]); ++ if (tb[MSG_OP_CLASS]) ++ node->op_class = blobmsg_get_u32(tb[MSG_OP_CLASS]); + } + + static void