From patchwork Sun Mar  4 00:04:43 2018
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: fff-network: Tidy up AutoConf functions
From: Adrian Schmutzler <freifunk@adrianschmutzler.de>
X-Patchwork-Id: 809
Message-Id: <1520121883-3492-1-git-send-email-freifunk@adrianschmutzler.de>
To: franken-dev@freifunk.net
Date: Sun,  4 Mar 2018 01:04:43 +0100

This patch
- moves AutoConf functions to library
- Fixes wrong function name in Usage comment
- Stores sysctl file name in variable

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 .../fff-network/files/lib/functions/fff/network    | 34 ++++++++++++++++++++++
 .../fff-network/files/usr/sbin/configurenetwork    | 33 ---------------------
 2 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/src/packages/fff/fff-network/files/lib/functions/fff/network b/src/packages/fff/fff-network/files/lib/functions/fff/network
index af9b343..2e1d6f8 100644
--- a/src/packages/fff/fff-network/files/lib/functions/fff/network
+++ b/src/packages/fff/fff-network/files/lib/functions/fff/network
@@ -96,3 +96,37 @@ macFlipLocalBit() {
 	echo "$mac" | awk -F: '{ printf("%02x:%s:%s:%s:%s:%s\n", xor(("0x"$1),2), $2, $3, $4, $5, $6) }'
 	return 0
 }
+
+setAutoConf() {
+	# Sets ipv6 auto configuration on an interface to on/off
+	# Usage: setAutoConf <interface> <[0|1]>
+	local iface=$1
+	local on=$2
+
+	sysctlfile="/etc/sysctl.d/51-fff-network-$iface.conf"
+	echo "# Generated from configurenetwork" > "$sysctlfile"
+	echo "net.ipv6.conf.$iface.accept_ra = $on" >> "$sysctlfile"
+	echo "net.ipv6.conf.$iface.accept_ra_defrtr = $on" >> "$sysctlfile"
+	echo "net.ipv6.conf.$iface.accept_ra_pinfo = $on" >> "$sysctlfile"
+	echo "net.ipv6.conf.$iface.autoconf = $on" >> "$sysctlfile"
+	echo "net.ipv6.conf.$iface.accept_ra_rtr_pref = $on" >> "$sysctlfile"
+	echo "net.ipv6.conf.$iface.forwarding = 0" >> "$sysctlfile"
+
+	/sbin/sysctl -p "$sysctlfile"
+}
+
+enableAutoConf() {
+	# Enables ipv6 auto configuration on an interface
+	# Usage: enableAutoConf <interface>
+	local iface=$1
+
+	setAutoConf "$iface" "1"
+}
+
+disableAutoConf() {
+	# Disables ipv6 auto configuration on an interface
+	# Usage: disableAutoConf <interface>
+	local iface=$1
+
+	setAutoConf "$iface" "0"
+}
diff --git a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
index 2b1c89e..4658c04 100755
--- a/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
+++ b/src/packages/fff/fff-network/files/usr/sbin/configurenetwork
@@ -28,39 +28,6 @@ setupPorts() {
     fi
 }
 
-setAutoConf() {
-    # Sets ipv6 auto configuration on an interface to on/off
-    # Usage: enableAutoConf <interface> <[0|1]>
-    local iface=$1
-    local on=$2
-
-    echo "# Generated from configurenetwork" > "/etc/sysctl.d/51-fff-network-$iface.conf"
-    echo "net.ipv6.conf.$iface.accept_ra = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf"
-    echo "net.ipv6.conf.$iface.accept_ra_defrtr = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf"
-    echo "net.ipv6.conf.$iface.accept_ra_pinfo = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf"
-    echo "net.ipv6.conf.$iface.autoconf = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf"
-    echo "net.ipv6.conf.$iface.accept_ra_rtr_pref = $on" >> "/etc/sysctl.d/51-fff-network-$iface.conf"
-    echo "net.ipv6.conf.$iface.forwarding = 0" >> "/etc/sysctl.d/51-fff-network-$iface.conf"
-
-    /sbin/sysctl -p "/etc/sysctl.d/51-fff-network-$iface.conf"
-}
-
-enableAutoConf() {
-    # Enables ipv6 auto configuration on an interface
-    # Usage: enableAutoConf <interface>
-    local iface=$1
-
-    setAutoConf "$iface" "1"
-}
-
-disableAutoConf() {
-    # Disables ipv6 auto configuration on an interface
-    # Usage: disableAutoConf <interface>
-    local iface=$1
-
-    setAutoConf "$iface" "0"
-}
-
 BOARD="$(uci get board.model.name)"
 . /etc/network.$BOARD