From 0c74ab9a790c81ff57ad1d7741489bf5e1839839 Mon Sep 17 00:00:00 2001 From: Nick Hainke Date: Sat, 11 Jun 2022 20:29:28 +0200 Subject: [PATCH] dawn: update to 2022-06-11 4cf9d0b treewide: code and documentation cleanup 48b12ee datastorage: Minor chnages to kicking algorithm to tidy up some handling. 7b615b6 treewide: improve beacon/probe logging 185f31b treewide: improve beacon request handling 0c2e713 datastorage/ubus: Add "soft" kicking algorithm 38f60c5 treewide: RSSI / RCPI handling updates aba3e81 documentation: Parameter defaults and documentation 3979fdf treewide: cleanup code e3b3753 scoring: improve scoring algorithm 33f380f treewide: cleanup code b42193f kicking: improve kicking algorithm 16deab3 treewide: improve mutex handling 31f0a37 test: cleanup tests and add some test scripts 43ca8b8 treewide: fix bugs from Coverity Scan 8ae2a42 utils/storage: improve descriptions 9a9b4dd ubus: Simplify loops and scans in generating hearing map c833064 treewide: rework mutex 1df5bc5 (master) network: cleanup and improve network handling 3bd349a utils: cleanup a855087 utils/storage: cleanup 439fe95 ubus/datastorage/msghandler: cleanup 335ace2 datastorage: improve linked list 40ebf48 ubus/datastorage: cleanup c13c285 utils: cleanup 0e4fc50 documentation: Heavily revised Markdown documentation files Signed-off-by: Nick Hainke --- net/dawn/Makefile | 6 +- net/dawn/files/dawn.config | 135 +++++++++++++++++++------------------ 2 files changed, 73 insertions(+), 68 deletions(-) diff --git a/net/dawn/Makefile b/net/dawn/Makefile index 8c428493b5..8ec41d0c91 100644 --- a/net/dawn/Makefile +++ b/net/dawn/Makefile @@ -5,13 +5,13 @@ include $(TOPDIR)/rules.mk PKG_NAME:=dawn -PKG_SOURCE_DATE:=2022-06-09 +PKG_SOURCE_DATE:=2022-06-11 PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/berlin-open-wireless-lab/DAWN.git -PKG_SOURCE_VERSION:=850a75c18293fef2586513704142728fa0eba712 -PKG_MIRROR_HASH:=c091e9a814f9e653b0d40c2a360adbf001bec3d5a47e28da3dabe54acaf9f6c7 +PKG_SOURCE_VERSION:=5d8df44a3a60381c4e8f51ce81e5d2b2f0c4c75e +PKG_MIRROR_HASH:=b3a76da8aa799a5df0ea287107cd78095c9203a3438fc00817f3c0b28b8c4487 PKG_MAINTAINER:=Nick Hainke PKG_LICENSE:=GPL-2.0-only diff --git a/net/dawn/files/dawn.config b/net/dawn/files/dawn.config index 3d08f749c9..6e6bdeb4ac 100644 --- a/net/dawn/files/dawn.config +++ b/net/dawn/files/dawn.config @@ -1,73 +1,78 @@ -config network - option broadcast_ip '10.0.0.255' - option broadcast_port '1025' - option server_ip '' - option tcp_port '1026' - option network_option '2' # 0 udp broadcast, 1 multicast, 2 tcp - option shared_key 'Niiiiiiiiiiiiick' - option iv 'Niiiiiiiiiiiiick' - option use_symm_enc '0' - option collision_domain '-1' # enter here aps which are in the same collision domain - option bandwidth '-1' # enter network bandwidth +config local + option loglevel '0' -config ordering - option sort_order 'cbfs' +config network + option broadcast_ip '10.0.0.255' + option broadcast_port '1025' + option tcp_port '1026' + option network_option '2' + option shared_key 'Niiiiiiiiiiiiick' + option iv 'Niiiiiiiiiiiiick' + option use_symm_enc '0' + option collision_domain '-1' + option bandwidth '-1' config hostapd - option hostapd_dir '/var/run/hostapd' + option hostapd_dir '/var/run/hostapd' config times - option update_client '10' - option denied_req_threshold '30' - option remove_client '15' - option remove_probe '30' - option remove_ap '460' - option update_hostapd '10' - option update_tcp_con '10' - option update_chan_util '5' - option update_beacon_reports '600' + option update_client '10' + option remove_client '15' + option remove_probe '30' + option remove_ap '460' + option update_hostapd '10' + option update_tcp_con '10' + option update_chan_util '5' + option update_beacon_reports '20' -config metric global - option rssi_weight '0' - option rssi_center '0' - option initial_score '0' - option kicking_threshold '20' - option duration '600' - option rrm_mode 'apt' - option ap_weight '0' - option ht_support '0' - option vht_support '0' - option no_ht_support '0' - option no_vht_support '0' - option rssi '0' - option low_rssi '0' - option freq '0' - option chan_util '0' - option max_chan_util '0' - option rssi_val '-60' - option low_rssi_val '-80' - option chan_util_val '0' - option max_chan_util_val '0' - option min_probe_count '0' - option bandwidth_threshold '6' - option use_station_count '0' - option max_station_diff '0' - option eval_probe_req '0' - option eval_auth_req '0' - option eval_assoc_req '0' - option kicking '0' - option deny_auth_reason '1' - option deny_assoc_reason '17' - option use_driver_recog '1' - option chan_util_avg_period '3' - option set_hostapd_nr '1' +config metric 'global' + option min_probe_count '3' + option bandwidth_threshold '6' + option use_station_count '0' + option max_station_diff '1' + option eval_probe_req '0' + option eval_auth_req '0' + option eval_assoc_req '0' + option kicking '3' + option kicking_threshold '20' + option deny_auth_reason '1' + option deny_assoc_reason '17' + option min_number_to_kick '3' + option chan_util_avg_period '3' + option set_hostapd_nr '0' + option duration '0' + option rrm_mode 'pat' -config metric 802_11a - option rssi_weight '2' - option rssi_center '-70' - option initial_score '125' +config metric '802_11g' + option initial_score '80' + option ht_support '5' + option vht_support '5' + option no_ht_support '0' + option no_vht_support '0' + option rssi '15' + option rssi_val '-60' + option low_rssi_val '-80' + option low_rssi '-15' + option chan_util '0' + option chan_util_val '140' + option max_chan_util '-15' + option max_chan_util_val '170' + option rssi_weight '0' + option rssi_center '-70' -config metric 802_11g - option rssi_weight '2' - option rssi_center '-70' - option initial_score '100' +config metric '802_11a' + option initial_score '100' + option ht_support '5' + option vht_support '5' + option no_ht_support '0' + option no_vht_support '0' + option rssi '15' + option rssi_val '-60' + option low_rssi_val '-80' + option low_rssi '-15' + option chan_util '0' + option chan_util_val '140' + option max_chan_util '-15' + option max_chan_util_val '170' + option rssi_weight '0' + option rssi_center '-70' -- 2.30.2