Commit 657cec70 authored by Stephan's avatar Stephan
Browse files

remove adhoc (can not supported any more). mesh 802.11s works stable

parent 55fe61ec
Pipeline #2270 passed with stages
in 105 minutes and 47 seconds
......@@ -3,13 +3,14 @@
--------------------------------------------------
firewall - fix issue where seldomly backbone connection was created through
freifunk network / freifunk gateway
wifi - use 802.11s meshing only (adhoc can not supported anymore)
2022-04-15 [8.0.3]
--------------------------------------------------
wifi - change ath10 firmware for more stable connection for Fritzbox 4040
- ath10k, disable dnyack (could be the reason for bad connections
- ath10k, disable dnyack (could be the reason for bad connections
speeds for IPQ4018 (fritzbox 4040)
Targets with this chip are not stable with openwrt.
Targets with this chip are not stable with openwrt.
- disable adhoc per default (which is not supported by some wifi
firmwares and is replaced with 802.11s)
openwrt - update to 21.02.2
......
......@@ -643,12 +643,12 @@ upgrade_8_0_2()
upgrade_8_0_3()
{
eval $(cat /etc/board.json | jsonfilter -e model='@.model.id' -e model2='@.model.name')
case "$model" in
"avm,fritzbox-4040")
uci set ddmesh.network.mesh_mode='mesh'
;;
esac
true
}
upgrade_8_0_4()
{
uci set ddmesh.network.mesh_mode='mesh'
}
##################################
......
......@@ -7,6 +7,9 @@
export TITLE="Verwaltung > Konfiguration: Knoten ignorieren"
. /usr/lib/www/page-pre.sh ${0%/*}
adhoc=true
[ "$(uci -q get ddmesh.network.mesh_mode)" = "mesh" ] && adhoc=false
cat<<EOM
<script type="text/javascript">
......@@ -20,7 +23,7 @@ EOM
[ -n "$mesh_vlan_ifname" ] && echo '|| document.form_node_new.form_opt_vlan.checked'
[ -n "$mesh_lan_ifname" -o -n "$mesh_wan_ifname" ] && echo '|| document.form_node_new.form_opt_lan.checked'
[ -n "$tbb_fastd_ifname" -o -n "$tbb_wg_ifname" ] && echo '|| document.form_node_new.form_opt_tbb.checked'
[ -n "$wifi_adhoc_ifname" ] && echo '|| document.form_node_new.form_opt_wifi_adhoc.checked'
${adhoc} && [ -n "$wifi_adhoc_ifname" ] && echo '|| document.form_node_new.form_opt_wifi_adhoc.checked'
[ -n "$wifi_mesh2g_ifname" ] && echo '|| document.form_node_new.form_opt_wifi_mesh2g.checked'
[ -n "$wifi_mesh5g_ifname" ] && echo '|| document.form_node_new.form_opt_wifi_mesh5g.checked'
cat<<EOM
......@@ -54,7 +57,7 @@ EOM
[ -n "$mesh_vlan_ifname" ] && echo "<th>VLAN</th>"
[ -n "$mesh_lan_ifname" -o -n "$mesh_wan_ifname" ] && echo "<th>LAN/WAN</th>"
[ -n "$tbb_fastd_ifname" -o -n "$tbb_wg_ifname" ] && echo "<th>Backbone</th>"
[ -n "$wifi_adhoc_ifname" ] && echo "<th>Wifi-Adhoc</th>"
${adhoc} && [ -n "$wifi_adhoc_ifname" ] && echo "<th>Wifi-Adhoc</th>"
[ -n "$wifi_mesh2g_ifname" ] && echo "<th>Wifi-802.11s 2.4GHz</th>"
[ -n "$wifi_mesh5g_ifname" ] && echo "<th>Wifi-802.11s 5GHz</th>"
echo "<th></th></tr>"
......@@ -82,7 +85,7 @@ print_node() {
[ -n "$mesh_vlan_ifname" ] && echo "<td><input disabled name=\"form_opt_vlan\" type=\"checkbox\" value=\"1\" $(if [ "$opt_vlan" = "1" ];then echo 'checked="checked"';fi)></td>"
[ -n "$mesh_lan_ifname" -o -n "$mesh_wan_ifname" ] && echo "<td><input disabled name=\"form_opt_lan\" type=\"checkbox\" value=\"1\" $(if [ "$opt_lan" = "1" ];then echo 'checked="checked"';fi)></td>"
[ -n "$tbb_fastd_ifname" -o -n "$tbb_wg_ifname" ] && echo "<td><input disabled name=\"form_opt_tbb\" type=\"checkbox\" value=\"1\" $(if [ "$opt_tbb" = "1" ];then echo 'checked="checked"';fi)></td>"
[ -n "$wifi_adhoc_ifname" ] && echo "<td><input disabled name=\"form_opt_wifi_adhoc\" type=\"checkbox\" value=\"1\" $(if [ "$opt_wifi_adhoc" = "1" ];then echo 'checked="checked"';fi)></td>"
${adhoc} && [ -n "$wifi_adhoc_ifname" ] && echo "<td><input disabled name=\"form_opt_wifi_adhoc\" type=\"checkbox\" value=\"1\" $(if [ "$opt_wifi_adhoc" = "1" ];then echo 'checked="checked"';fi)></td>"
[ -n "$wifi_mesh2g_ifname" ] && echo "<td><input disabled name=\"form_opt_wifi_mesh2g\" type=\"checkbox\" value=\"1\" $(if [ "$opt_wifi_mesh2g" = "1" ];then echo 'checked="checked"';fi)></td>"
[ -n "$wifi_mesh5g_ifname" ] && echo "<td><input disabled name=\"form_opt_wifi_mesh5g\" type=\"checkbox\" value=\"1\" $(if [ "$opt_wifi_mesh5g" = "1" ];then echo 'checked="checked"';fi)></td>"
echo "<td valign=bottom><FORM name=\"form_node_del_"$C"\" ACTION=\"ignore.cgi\" METHOD=\"POST\">"
......@@ -115,7 +118,7 @@ EOM
[ -n "$mesh_vlan_ifname" ] && echo "<th>VLAN</th>"
[ -n "$mesh_lan_ifname" -o -n "$mesh_wan_ifname" ] && echo "<th>LAN/WAN</th>"
[ -n "$tbb_fastd_ifname" -o -n "$tbb_wg_ifname" ] && echo "<th>Backbone</th>"
[ -n "$wifi_adhoc_ifname" ] && echo "<th>Wifi-Adhoc</th>"
${adhoc} && [ -n "$wifi_adhoc_ifname" ] && echo "<th>Wifi-Adhoc</th>"
[ -n "$wifi_mesh2g_ifname" ] && echo "<th>Wifi-802.11s 2.4GHz</th>"
[ -n "$wifi_mesh5g_ifname" ] && echo "<th>Wifi-802.11s 5GHz</th>"
echo "<th></th></tr>"
......@@ -125,7 +128,7 @@ EOM
[ -n "$mesh_vlan_ifname" ] && echo '<td><input name="form_opt_vlan" type="checkbox" value="1" ></td>'
[ -n "$mesh_lan_ifname" -o -n "$mesh_wan_ifname" ] && echo '<td><input name="form_opt_lan" type="checkbox" value="1" ></td>'
[ -n "$tbb_fastd_ifname" -o -n "$tbb_wg_ifname" ] && echo '<td><input name="form_opt_tbb" type="checkbox" value="1" ></td>'
[ -n "$wifi_adhoc_ifname" ] && echo '<td><input name="form_opt_wifi_adhoc" type="checkbox" value="1" ></td>'
${adhoc} && [ -n "$wifi_adhoc_ifname" ] && echo '<td><input name="form_opt_wifi_adhoc" type="checkbox" value="1" ></td>'
[ -n "$wifi_mesh2g_ifname" ] && echo '<td><input name="form_opt_wifi_mesh2g" type="checkbox" value="1" ></td>'
[ -n "$wifi_mesh5g_ifname" ] && echo '<td><input name="form_opt_wifi_mesh5g" type="checkbox" value="1" ></td>'
cat<<EOM
......
......@@ -106,6 +106,9 @@ $(iwinfo $wifi_status_radio2g_phy txpowerlist | awk '{if(match($1,"*")){sel="sel
</tr>
<tr><td></td><td><font color="red">Falsche oder zu hohe Werte k&ouml;nnen den Router zerst&ouml;ren!</font></td></tr>
EOM
if [ "$(uci -q get ddmesh.network.mesh_mode)" != "mesh" ]; then
cat<<EOM
<tr><th>Ad-hoc-SSID:</th>
<td><input name="form_wifi_adhoc_ssid" size="32" type="text" value="$(uci get wireless.wifi_adhoc.ssid)" disabled></td>
</tr>
......@@ -113,6 +116,9 @@ $(iwinfo $wifi_status_radio2g_phy txpowerlist | awk '{if(match($1,"*")){sel="sel
<tr><th>BSSID:</th>
<td><input name="form_wifi_bssid" size="32" type="text" value="$(uci get credentials.wifi_2g.bssid)" disabled></td>
</tr>
EOM
fi
cat<<EOM
<tr><th></th><td></td></tr>
<tr><th>Access-Point-SSID:</th>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment