From patchwork Sun Oct 8 22:31:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: [v3] fff-wireless: Reintroduce initial setup of wireless interfaces From: Adrian Schmutzler X-Patchwork-Id: 552 Message-Id: <1507501896-10591-1-git-send-email-freifunk@adrianschmutzler.de> To: franken-dev@freifunk.net Date: Mon, 9 Oct 2017 00:31:36 +0200 Workaround! VARIANTE 1: Rename to wXibss This is required as configurenetwork reads the MAC addresses from the WiFi interfaces. Changes in v3: - Use the correct network name in network.* files Changes in v2: - Fixed call of wifiAddAP Apply only after the KeyX2 patchset! Signed-off-by: Adrian Schmutzler --- .../fff/fff-network/ar71xx/network.tl-wa850re-v1 | 2 +- .../fff/fff-network/ar71xx/network.tl-wa860re-v1 | 2 +- .../fff/fff-network/ar71xx/network.tl-wa901nd-v2 | 2 +- .../fff/fff-network/ar71xx/network.tl-wdr3500-v1 | 2 +- .../fff/fff-network/ar71xx/network.tl-wdr3600-v1 | 2 +- .../fff/fff-network/ar71xx/network.tl-wdr4300-v1 | 2 +- .../fff/fff-network/ar71xx/network.tl-wdr4310-v1 | 2 +- .../fff/fff-network/ar71xx/network.tl-wr740n-v4 | 2 +- .../fff/fff-network/ar71xx/network.tl-wr741nd-v2 | 2 +- .../fff/fff-network/ar71xx/network.tl-wr741nd-v4 | 2 +- .../fff/fff-network/ar71xx/network.ubnt-bullet-m | 2 +- .../fff/fff-network/ar71xx/network.ubnt-loco-m-xw | 2 +- .../fff/fff-network/ar71xx/network.ubnt-nano-m | 2 +- .../fff/fff-network/ar71xx/network.ubnt-unifi | 2 +- .../fff/fff-network/mpc85xx/network.tl-wdr4900-v1 | 2 +- .../files/etc/uci-defaults/60-fff-wireless | 32 ++++++++++++++++++++++ 16 files changed, 47 insertions(+), 15 deletions(-) create mode 100644 src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 index 307a201..65e070b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa850re-v1 @@ -8,4 +8,4 @@ ONE_PORT="YES" . /etc/network.mode ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=w2ibss \ No newline at end of file diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 index 307a201..65e070b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa860re-v1 @@ -8,4 +8,4 @@ ONE_PORT="YES" . /etc/network.mode ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=w2ibss \ No newline at end of file diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 index 307a201..65e070b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wa901nd-v2 @@ -8,4 +8,4 @@ ONE_PORT="YES" . /etc/network.mode ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=w2ibss \ No newline at end of file diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 index 3d0e901..8189ddf 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3500-v1 @@ -5,4 +5,4 @@ WAN_PORTS= BATMAN_PORTS="0t 3 4" ETHMESHMAC= -ROUTERMAC=w2mesh +ROUTERMAC=w2ibss diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 index 897152e..59cd17e 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr3600-v1 @@ -5,4 +5,4 @@ WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" ETHMESHMAC= -ROUTERMAC=w5mesh +ROUTERMAC=w5ibss diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 index 897152e..59cd17e 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4300-v1 @@ -5,4 +5,4 @@ WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" ETHMESHMAC= -ROUTERMAC=w5mesh +ROUTERMAC=w5ibss diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 index 897152e..59cd17e 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wdr4310-v1 @@ -5,4 +5,4 @@ WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" ETHMESHMAC= -ROUTERMAC=w5mesh +ROUTERMAC=w5ibss diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 index fbe5744..8429c55 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr740n-v4 @@ -6,4 +6,4 @@ WAN_PORTS= BATMAN_PORTS="2 3 0t" ETHMESHMAC=eth1 -ROUTERMAC=w2mesh +ROUTERMAC=w2ibss diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 index 85abc31..6fd8e9e 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v2 @@ -6,4 +6,4 @@ WAN_PORTS= BATMAN_PORTS="3 4 0t" ETHMESHMAC=eth1 -ROUTERMAC=w2mesh +ROUTERMAC=w2ibss diff --git a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 index fbe5744..8429c55 100644 --- a/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 +++ b/src/packages/fff/fff-network/ar71xx/network.tl-wr741nd-v4 @@ -6,4 +6,4 @@ WAN_PORTS= BATMAN_PORTS="2 3 0t" ETHMESHMAC=eth1 -ROUTERMAC=w2mesh +ROUTERMAC=w2ibss diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m index 307a201..65e070b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-bullet-m @@ -8,4 +8,4 @@ ONE_PORT="YES" . /etc/network.mode ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=w2ibss \ No newline at end of file diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw index 307a201..65e070b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-loco-m-xw @@ -8,4 +8,4 @@ ONE_PORT="YES" . /etc/network.mode ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=w2ibss \ No newline at end of file diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m b/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m index 307a201..65e070b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-nano-m @@ -8,4 +8,4 @@ ONE_PORT="YES" . /etc/network.mode ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=w2ibss \ No newline at end of file diff --git a/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi b/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi index 307a201..65e070b 100644 --- a/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi +++ b/src/packages/fff/fff-network/ar71xx/network.ubnt-unifi @@ -8,4 +8,4 @@ ONE_PORT="YES" . /etc/network.mode ETHMESHMAC= -ROUTERMAC=w2mesh \ No newline at end of file +ROUTERMAC=w2ibss \ No newline at end of file diff --git a/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 b/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 index 897152e..59cd17e 100644 --- a/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 +++ b/src/packages/fff/fff-network/mpc85xx/network.tl-wdr4900-v1 @@ -5,4 +5,4 @@ WAN_PORTS="0t 1" BATMAN_PORTS="0t 2 3" ETHMESHMAC= -ROUTERMAC=w5mesh +ROUTERMAC=w5ibss diff --git a/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless new file mode 100644 index 0000000..8070cb4 --- /dev/null +++ b/src/packages/fff/fff-wireless/files/etc/uci-defaults/60-fff-wireless @@ -0,0 +1,32 @@ +#!/bin/sh +# Copyright 2016 Tim Niemeyer +# License GPLv3 + +. /lib/functions/fff/wireless + +if ! wifiDelAll; then + echo "Can't delete current wifi setup" + exit 1 +fi + +for phy in $(iw phy | awk '/^Wiphy/{ print $2 }'); do + radio="$(wifiAddPhyCond "$phy" "2" "1")" + radio5="$(wifiAddPhyCond "$phy" "5" "36")" + [ -n "$radio5" ] && radio="$radio5" + if [ -z "$radio" ]; then + echo "Can't create radio for $phy" + exit 1 + fi + + if ! wifiAddAP "$radio" "do.not.use" "mesh" "ap" "0"; then + echo "Can't add AP interface on $radio." + exit 1 + fi + + if ! wifiAddAdHocMesh "$radio" "batman.do.not.use" "02:CA:FF:EE:BA:BE"; then + echo "Can't add AdHocMesh interface on $radio." + exit 1 + fi +done + +# vim: set noexpandtab:tabstop=4