dawn: update to 2021-08-05

* c70773a - datastorage: use signal strength as a metric
* 14e0f83 - Don't display debugging output with DAWN_NO_OUTPUT
* 97e5de1 - uci: add neighbor list priority options
* 2b1a53c - dawn_uci: set default values
* 6eb747b - Use separate configs for 802.11g & 802.11a bands
* 1e34357 - Verify compatibility before parsing config message
* a7a8309 - List all neighbors with same score when kicking
* 3ba0fa4 - Change beacon request fields to appropriate values
* 009aab9 - Change mode config parameter from int to string

Signed-off-by: Nick Hainke <vincent@systemli.org>
(cherry picked from commit 2039e3fce068d39ff51cf2be514bf50f66468043)

diff --git a/net/dawn/Makefile b/net/dawn/Makefile
index d13583527dafce68ab25341c927ad178e90f3a9d..67371fecce48f5fae2bb20e5e7aeca67f20b075f 100644 (file)
--- a/net/dawn/Makefile
+++ b/net/dawn/Makefile
@@ -5,13 +5,13 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=dawn
-PKG_SOURCE_DATE:=2021-07-27
+PKG_SOURCE_DATE:=2021-08-05
 PKG_RELEASE:=$(AUTORELEASE)
 
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://github.com/berlin-open-wireless-lab/DAWN.git
-PKG_SOURCE_VERSION:=276ca169a7c5c07932e54c03f4aa05c9eb192b38
-PKG_MIRROR_HASH:=4abc5b0aa14553c8b9787641da009efbf7fc4f2994720c2ccf1b2b31fc949ca5
+PKG_SOURCE_VERSION:=c9f6684021a644e99e8bfcf9fa860a4d82d5d9ae
+PKG_MIRROR_HASH:=254b8755ddca3c39f79987d17ec0797f2913e25b7d0871aed9a2d6119fb87dba
 
 PKG_MAINTAINER:=Nick Hainke <vincent@systemli.org>
 PKG_LICENSE:=GPL-2.0-only

diff --git a/net/dawn/files/dawn.config b/net/dawn/files/dawn.config
index ccbaa1c997c9e64794954c77b8dac9d2acb9b6d9..a0a003d6b876eb3ea0e8384c06bba36b235fe166 100644 (file)
--- a/net/dawn/files/dawn.config
+++ b/net/dawn/files/dawn.config
@@ -4,8 +4,8 @@ config network
     option server_ip            ''
     option tcp_port             '1026'
     option network_option       '2' # 0 udp broadcast, 1 multicast, 2 tcp
-    option shared_key           'Niiiiiiiiiiiiiik'
-    option iv                   'Niiiiiiiiiiiiiik'
+    option shared_key           'Niiiiiiiiiiiiick'
+    option iv                   'Niiiiiiiiiiiiick'
     option use_symm_enc         '1'
     option collision_domain     '-1'     # enter here aps which are in the same collision domain
     option bandwidth            '-1'     # enter network bandwidth
@@ -25,38 +25,49 @@ config times
     option update_hostapd        '10'
     option update_tcp_con        '10'
     option update_chan_util      '5'
-    option update_beacon_reports '20'
+    option update_beacon_reports '600'
 
-config metric
+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                 '10'
-    option low_rssi             '-500'
-    option freq                 '100' # some kind of band-steering
+    option rssi                 '0'
+    option low_rssi             '0'
+    option freq                 '0'
     option chan_util            '0'
-    option max_chan_util        '-500'
+    option max_chan_util        '0'
     option rssi_val             '-60'
     option low_rssi_val         '-80'
-    option chan_util_val        '140'
-    option max_chan_util_val    '170'
+    option chan_util_val        '0'
+    option max_chan_util_val    '0'
     option min_probe_count      '0'
     option bandwidth_threshold  '6'
-    option use_station_count    '1'
-    option max_station_diff     '1'
+    option use_station_count    '0'
+    option max_station_diff     '0'
     option eval_probe_req       '0'
-    option eval_auth_req        '0'     # no real reasoncode...
-    option eval_assoc_req       '0'     # just deny assocs...
+    option eval_auth_req        '0'
+    option eval_assoc_req       '0'
     option kicking              '0'
-    option deny_auth_reason     '1'     # unspecified
-    option deny_assoc_reason    '17'    # assoc rejected can't handle new station
+    option deny_auth_reason     '1'
+    option deny_assoc_reason    '17'
     option use_driver_recog     '1'
-    option min_number_to_kick   '3'
     option chan_util_avg_period '3'
     option set_hostapd_nr       '1'
-    option op_class             '0' #802.11k stuff...
-    option duration             '0'
-    option mode                 '0'
-    option scan_channel         '0'
+
+config metric 802_11a
+    option rssi_weight          '2'
+    option rssi_center          '-70'
+    option initial_score        '125'
+
+config metric 802_11g
+    option rssi_weight          '2'
+    option rssi_center          '-70'
+    option initial_score        '100'