From ece5735cd19987e2143b2bab1d3ec8ccd24bd6bb Mon Sep 17 00:00:00 2001 From: Daniel Pawlik Date: Mon, 14 Oct 2024 09:02:08 +0200 Subject: [PATCH] Update main and dumbAP router config; go back to DAWN --- configs/common/dumb_ap | 8 +-- configs/common/main-router | 8 +-- openwrt-configure.sh | 4 +- settings-configs/AX3200-dumb-ap/dawn | 2 +- settings-configs/AX3200-dumb-ap/usteer | 2 + settings-configs/AX3200-dumb-ap/wireless | 42 ++++++------ settings-configs/BPI-R4/dawn | 2 +- settings-configs/BPI-R4/sqm | 8 +-- settings-configs/BPI-R4/usteer | 2 + settings-configs/BPI-R4/wireless | 87 +++++++++++++++--------- 10 files changed, 97 insertions(+), 68 deletions(-) diff --git a/configs/common/dumb_ap b/configs/common/dumb_ap index 02d26b2..c67cd74 100644 --- a/configs/common/dumb_ap +++ b/configs/common/dumb_ap @@ -65,12 +65,12 @@ CONFIG_PACKAGE_collectd-mod-dns=y ## Better roaming: dawn vs usteer => choose one ## dawn -#CONFIG_PACKAGE_dawn=y -#CONFIG_PACKAGE_luci-app-dawn=y +CONFIG_PACKAGE_dawn=y +CONFIG_PACKAGE_luci-app-dawn=y ### usteer -CONFIG_PACKAGE_usteer=y -CONFIG_PACKAGE_luci-app-usteer=y +# CONFIG_PACKAGE_usteer=y +# CONFIG_PACKAGE_luci-app-usteer=y # language CONFIG_LUCI_LANG_pl=y diff --git a/configs/common/main-router b/configs/common/main-router index 358894a..0b12344 100644 --- a/configs/common/main-router +++ b/configs/common/main-router @@ -69,12 +69,12 @@ CONFIG_PACKAGE_collectd-mod-dns=y ## Better roaming: dawn vs usteer => choose one ## dawn -#CONFIG_PACKAGE_dawn=y -#CONFIG_PACKAGE_luci-app-dawn=y +CONFIG_PACKAGE_dawn=y +CONFIG_PACKAGE_luci-app-dawn=y ### usteer -CONFIG_PACKAGE_usteer=y -CONFIG_PACKAGE_luci-app-usteer=y +# CONFIG_PACKAGE_usteer=y +# CONFIG_PACKAGE_luci-app-usteer=y # sqm CONFIG_PACKAGE_luci-app-sqm=y diff --git a/openwrt-configure.sh b/openwrt-configure.sh index dbeefaa..17f6878 100755 --- a/openwrt-configure.sh +++ b/openwrt-configure.sh @@ -9,8 +9,8 @@ ROUTER_IP="${ROUTER_IP=$1}" DEVICE="${DEVICE:-$2}" FULL_WPAD="${FULL_WPAD:-'true'}" INSTALL_BRIDGER=${INSTALL_BRIDGER:-'false'} -INSTALL_DAWN=${INSTALL_DAWN:-'false'} -INSTALL_USTEER=${INSTALL_USTEER:-'true'} +INSTALL_DAWN=${INSTALL_DAWN:-'true'} +INSTALL_USTEER=${INSTALL_USTEER:-'false'} INSTALL_HTTPS_DNS_PROXY=${INSTALL_HTTPS_DNS_PROXY:-'false'} INSTALL_DNSCRYPT_PROXY2=${INSTALL_DNSCRYPT_PROXY2:-'true'} CRYPTO_LIB=${CRYPTO_LIB:-'openssl'} # wolfssl or openssl; if empty - mbedtls diff --git a/settings-configs/AX3200-dumb-ap/dawn b/settings-configs/AX3200-dumb-ap/dawn index fdece1c..4000609 100644 --- a/settings-configs/AX3200-dumb-ap/dawn +++ b/settings-configs/AX3200-dumb-ap/dawn @@ -34,7 +34,7 @@ config metric 'global' option eval_probe_req '0' option eval_auth_req '0' option eval_assoc_req '0' - option kicking '3' + option kicking '1' option kicking_threshold '20' option deny_auth_reason '1' option deny_assoc_reason '17' diff --git a/settings-configs/AX3200-dumb-ap/usteer b/settings-configs/AX3200-dumb-ap/usteer index 6ab17ba..4bca312 100644 --- a/settings-configs/AX3200-dumb-ap/usteer +++ b/settings-configs/AX3200-dumb-ap/usteer @@ -10,4 +10,6 @@ config usteer option min_snr '-85' option roam_scan_tries '0' option max_neighbor_reports '6' + option signal_diff_threshold '12' + option load_balancing_threshold '0' diff --git a/settings-configs/AX3200-dumb-ap/wireless b/settings-configs/AX3200-dumb-ap/wireless index 37c6393..490fdcf 100644 --- a/settings-configs/AX3200-dumb-ap/wireless +++ b/settings-configs/AX3200-dumb-ap/wireless @@ -2,11 +2,12 @@ config wifi-device 'radio0' option type 'mac80211' option phy 'wl0' - option country 'PL' - option cell_density '0' option band '2g' - option channel '8' - option txpower '20' + option channel '3' + option txpower '18' + option cell_density '0' + option htmode 'HT40' + option country 'PL' config wifi-iface 'default_radio0' option device 'radio0' @@ -14,40 +15,38 @@ config wifi-iface 'default_radio0' option mode 'ap' option ssid 'MYWIFI_2G' option encryption 'psk2' + option skip_inactivity_poll '1' + option disassoc_low_ack '0' option key 'PASSWORD1234' option wnm_sleep_mode '1' option bss_transition '1' - option skip_inactivity_poll '1' - option disassoc_low_ack '0' + option max_inactivity '86400' config wifi-device 'radio1' option type 'mac80211' option phy 'wl1' + option band '5g' + option channel '124' + option htmode 'HE160' + option txpower '20' option country 'PL' option cell_density '0' - option htmode 'HE160' - option band '5g' - option channel '48' - option txpower '23' config wifi-iface 'default_radio1' option device 'radio1' option network 'lan' option mode 'ap' option ssid 'MYWIFI' - option encryption 'sae-mixed' - option dtim_period '3' + option encryption 'sae' option key 'PASSWORD1234' - option ieee80211r '1' - option nasid 'ax3200-5' - option mobility_domain 'abab' - option ft_over_ds '1' option ieee80211k '1' - option time_advertisement '2' - option time_zone 'CET-1CEST,M3.5.0,M10.5.0/3' option wnm_sleep_mode '1' option bss_transition '1' option ocv '0' + option dtim_period '3' + option time_advertisement '2' + option time_zone 'CET-1CEST,M3.5.0,M10.5.0/3' + option proxy_arp '1' config wifi-iface 'wifinet2' option device 'radio1' @@ -55,8 +54,11 @@ config wifi-iface 'wifinet2' option ssid 'MYWIFI_iot' option encryption 'sae' option key 'PASSWORD1234' - option network 'lan' option wnm_sleep_mode '1' option bss_transition '1' - option ieee80211k '1' + option ocv '0' + option network 'lan' + option dtim_period '3' + option max_inactivity '86400' + option disabled '1' diff --git a/settings-configs/BPI-R4/dawn b/settings-configs/BPI-R4/dawn index fdece1c..4000609 100644 --- a/settings-configs/BPI-R4/dawn +++ b/settings-configs/BPI-R4/dawn @@ -34,7 +34,7 @@ config metric 'global' option eval_probe_req '0' option eval_auth_req '0' option eval_assoc_req '0' - option kicking '3' + option kicking '1' option kicking_threshold '20' option deny_auth_reason '1' option deny_assoc_reason '17' diff --git a/settings-configs/BPI-R4/sqm b/settings-configs/BPI-R4/sqm index 70d1b21..4a6d7a5 100644 --- a/settings-configs/BPI-R4/sqm +++ b/settings-configs/BPI-R4/sqm @@ -2,10 +2,10 @@ config queue 'eth1' option enabled '0' option interface 'br-wan' - option download '550000' - option upload '550000' - option qdisc 'cake' - option script 'piece_of_cake.qos' + option download '850000' + option upload '850000' + option qdisc 'fq_codel' + option script 'simplest.qos' option linklayer 'ethernet' option debug_logging '0' option verbosity '5' diff --git a/settings-configs/BPI-R4/usteer b/settings-configs/BPI-R4/usteer index 6ab17ba..4bca312 100644 --- a/settings-configs/BPI-R4/usteer +++ b/settings-configs/BPI-R4/usteer @@ -10,4 +10,6 @@ config usteer option min_snr '-85' option roam_scan_tries '0' option max_neighbor_reports '6' + option signal_diff_threshold '12' + option load_balancing_threshold '0' diff --git a/settings-configs/BPI-R4/wireless b/settings-configs/BPI-R4/wireless index d42a34a..9f89642 100644 --- a/settings-configs/BPI-R4/wireless +++ b/settings-configs/BPI-R4/wireless @@ -1,13 +1,13 @@ config wifi-device 'radio0' option type 'mac80211' - option path 'soc/11310000.pcie/pci0001:00/0001:00:00.0/0001:01:00.0' - option channel '36' - option band '5g' - option htmode 'HE80' - option txpower '20' - option cell_density '0' + option path 'soc/11300000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0' + option band '2g' + option channel '8' option country 'PL' + option cell_density '0' + option htmode 'EHT40' + option txpower '20' config wifi-iface 'default_radio0' option device 'radio0' @@ -15,46 +15,69 @@ config wifi-iface 'default_radio0' option mode 'ap' option ssid 'MYWIFI_2G' option encryption 'psk2' + option skip_inactivity_poll '1' + option disassoc_low_ack '0' option key 'PASSWORD1234' - option disabled '1' - -config wifi-iface 'wifinet1' - option device 'radio0' - option mode 'ap' - option ssid 'MYWIFI' - option encryption 'sae-mixed' - option dtim_period '3' - option key 'PASSWORD1234' - option ieee80211r '1' - option nasid '4-5' - option mobility_domain 'abab' - option ft_over_ds '1' - option ieee80211k '1' - option time_advertisement '2' - option time_zone 'CET-1CEST,M3.5.0,M10.5.0/3' option wnm_sleep_mode '1' option bss_transition '1' - option network 'lan' - option ocv '0' + option max_inactivity '86400' -config wifi-device 'radio2' +config wifi-device 'radio1' option type 'mac80211' - option path 'soc/11300000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0' + option path 'soc/11300000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0+1' option band '5g' - option channel '40' + option channel '100' + option htmode 'HE160' + option txpower '20' option country 'PL' option cell_density '0' - option htmode 'HE80' - option txpower '20' + +config wifi-iface 'default_radio1' + option device 'radio1' + option network 'lan' + option mode 'ap' + option ssid 'MYWIFI' + option encryption 'sae' + option key 'PASSWORD1234' + option ieee80211k '1' + option wnm_sleep_mode '1' + option bss_transition '1' + option ocv '0' + option dtim_period '3' + option time_advertisement '2' + option time_zone 'CET-1CEST,M3.5.0,M10.5.0/3' + option proxy_arp '1' config wifi-iface 'wifinet3' - option device 'radio2' + option device 'radio1' option mode 'ap' option ssid 'MYWIFI_iot' option encryption 'sae' option key 'PASSWORD1234' option wnm_sleep_mode '1' option bss_transition '1' - option network 'lan' - option ieee80211k '1' option ocv '0' + option network 'lan' + option dtim_period '3' + option max_inactivity '86400' + option disabled '1' + +config wifi-device 'radio2' + option type 'mac80211' + option path 'soc/11300000.pcie/pci0000:00/0000:00:00.0/0000:01:00.0+2' + option band '6g' + option channel '53' + option htmode 'HE160' + option country 'PL' + option cell_density '0' + option log_level '1' + +config wifi-iface 'default_radio2' + option device 'radio2' + option network 'lan' + option mode 'ap' + option ssid 'MYWIFI_6G' + option encryption 'sae' + option key 'PASSWORD1234' + option ocv '0' + option max_inactivity '86400'