From patchwork Sun Aug 13 06:50:46 2017
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: [RFC] Add hidden AP for dez. keyxchange
From: Christian Dresel <fff@chrisi01.de>
X-Patchwork-Id: 424
Message-Id: <1502607046-2729-1-git-send-email-fff@chrisi01.de>
To: franken-dev@freifunk.net
Date: Sun, 13 Aug 2017 08:50:46 +0200

and fix a little variable bug in 60-fff-wireless

Signed-off-by: Christian Dresel <fff@chrisi01.de>
---
 .../files/etc/uci-defaults/60-fff-wireless         |  9 ++++--
 .../fff-wireless/files/lib/functions/fff/wireless  | 35 +++++++++++++++++++++-
 2 files changed, 41 insertions(+), 3 deletions(-)

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
index 59239b3..a3de470 100644
--- 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
@@ -30,12 +30,17 @@ for phy in $(iw phy | awk '/^Wiphy/{ print $2 }'); do
 	fi
 
 	if ! wifiAddAP "$radio" "$ESSID_AP"; then
-		echo "Can't add AP interface on $radio0."
+		echo "Can't add AP interface on $radio."
+		exit 1
+	fi
+
+	if ! wifiAddDezAP "$radio" "config.franken.freifunk.net"; then
+		echo "Can't add AP interface on $radio."
 		exit 1
 	fi
 
 	if ! wifiAddAdHocMesh "$radio" "$ESSID_MESH" "$BSSID_MESH"; then
-		echo "Can't add AP interface on $radio0."
+		echo "Can't add AP interface on $radio."
 		exit 1
 	fi
 done
diff --git a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
index 59c8ce2..d99507f 100644
--- a/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
+++ b/src/packages/fff/fff-wireless/files/lib/functions/fff/wireless
@@ -114,4 +114,37 @@ wifiAddAP() {
 	echo "${iface}"
 }
 
-# vim: set noexpandtab:tabstop=4
+wifiAddDezAP() {
+	if [ $# -ne "2" ]
+	then
+		echo "Usage: wifiAdddezAP <radio> <essid>"
+		return 1
+	fi
+
+	local radio=$1
+	local essid=$2
+
+	local channel=$(uci get "wireless.${radio}.channel")
+	local iface="w2dezap"
+	if [ "$channel" -gt "14" ]; then
+		iface="w5dezap"
+	fi
+	uci batch <<-__EOF__
+		set wireless.${iface}='wifi-iface'
+		set wireless.${iface}.device='${radio}'
+		set wireless.${iface}.network='dezkey'
+		set wireless.${iface}.ifname='${iface}'
+		set wireless.${iface}.mode='ap'
+		set wireless.${iface}.ssid='${essid}'
+		set wireless.${iface}.encryption='none'
+		set wireless.${iface}.hidden='1'
+		set network.dezkey=interface
+		set network.dezkey.proto='static'
+		set network.dezkey.ipaddr='192.168.214.1'
+		set network.dezkey.netmask='255.255.255.0'
+
+		commit wireless
+	__EOF__
+
+	echo "${iface}"
+}