From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sun, 23 Sep 2012 20:12:41 +0000 (+0000)
Subject: Move hostapd functions into their own file.
X-Git-Tag: 005~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0e035311cea97d4d361523a1efd2758e2786d214;p=network.git

Move hostapd functions into their own file.
---

diff --git a/functions.hostapd b/functions.hostapd
new file mode 100644
index 00000000..ea44b0aa
--- /dev/null
+++ b/functions.hostapd
@@ -0,0 +1,222 @@
+#!/bin/bash
+###############################################################################
+#                                                                             #
+# IPFire.org - A linux based firewall                                         #
+# Copyright (C) 2012  IPFire Network Development Team                         #
+#                                                                             #
+# This program is free software: you can redistribute it and/or modify        #
+# it under the terms of the GNU General Public License as published by        #
+# the Free Software Foundation, either version 3 of the License, or           #
+# (at your option) any later version.                                         #
+#                                                                             #
+# This program is distributed in the hope that it will be useful,             #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of              #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               #
+# GNU General Public License for more details.                                #
+#                                                                             #
+# You should have received a copy of the GNU General Public License           #
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.       #
+#                                                                             #
+###############################################################################
+
+function hostapd_config_dir() {
+	local device=${1}
+	
+	echo "${RUN_DIR}/hostapd/${device}"
+}
+
+function hostapd_config_write() {
+	local device=${1}
+	shift
+
+	assert device_exists ${device}
+
+	local broadcast_ssid
+	local channel
+	local country_code
+	local encryption
+	local key
+	local mode
+	local ssid
+
+	while [ $# -gt 0 ]; do
+		case "${1}" in
+			--broadcast-ssid=*)
+				broadcast_ssid=${1#--broadcast-ssid=}
+				;;
+			--channel=*)
+				channel=${1#--channel=}
+				;;
+			--country-code=*)
+				country_code=${1#--country-code=}
+				;;
+			--mode=*)
+				mode=${1#--mode=}
+				;;
+			--ssid=*)
+				ssid=${1#--ssid=}
+				;;
+			--encryption=*)
+				encryption=$(cli_get_val ${1})
+				;;
+			--key=*)
+				key=$(cli_get_val ${1})
+				;;
+			*)
+				warning_log "Ignoring unknown argument '${1}'."
+				;;			
+		esac
+		shift
+	done
+
+	assert isset broadcast_ssid
+	assert isbool broadcast_ssid
+
+	assert isset channel
+	assert isinteger channel
+
+	assert isset country_code
+	assert isset mode
+	assert isset ssid
+
+	# Check if key is set when encryption is used.
+	if isset encryption; then
+		assert isoneof encryption WPA WPA2 WPA/WPA2
+		assert isset key
+	fi
+
+	local ignore_broadcast_ssid
+	if enabled broadcast_ssid; then
+		ignore_broadcast_ssid="0"
+	else
+		ignore_broadcast_ssid="1"
+	fi
+
+	local hw_mode ieee80211n="0"
+	if [ "${mode}" = "n" ]; then
+		if [ ${channel} -le 15 ]; then
+			hw_mode="g"
+		else
+			hw_mode="a"
+		fi
+		ieee80211n="1"
+	fi
+
+	cat <<EOF
+### Hostapd configuration for ${device}
+
+# Interface configuration
+driver=nl80211
+interface=${device}
+
+# Wireless configuration
+channel=${channel}
+country_code=${country_code}
+hw_mode=${hw_mode}
+ieee80211n=${ieee80211n}
+ignore_broadcast_ssid=${ignore_broadcast_ssid}
+ssid=${ssid}
+
+# Dump file
+dump_file=$(hostapd_config_dir ${device}/dump)
+
+ctrl_interface=/var/run/hostapd
+ctrl_interface_group=0
+
+EOF
+
+	if isset encryption; then
+		local encryption_mode=0
+		case "${encryption}" in
+			WPA)
+				encryption_mode=1
+				;;
+			WPA2)
+				encryption_mode=2
+				;;
+			WPA/WPA2)
+				encryption_mode=3
+				;;
+		esac
+
+		print "# Encryption settings."
+		print "wpa=${encryption_mode}"
+		print "wpa_passphrase=${key}"
+		print "wpa_key_mgmt=WPA-PSK"
+		print "wpa_pairwise=TKIP"
+		print "rsn_pairwise=CCMP"
+		print
+	fi
+
+	return ${EXIT_OK}
+}
+
+function hostapd_start() {
+	local device=${1}
+	shift
+
+	assert isset device
+
+	local config_dir=$(hostapd_config_dir ${device})
+	mkdir -p ${config_dir}
+
+	local config_file=${config_dir}/config
+	hostapd_config_write ${device} $@ > ${config_file}
+
+	service_start "hostapd@${device}.service"
+	local ret=$?
+
+	case "${ret}" in
+		0)
+			log DEBUG "Hostapd was successfully started for '${device}'."
+			return ${EXIT_OK}
+			;;
+		1)
+			error_log "Could not start hostapd properly for '${device}'."
+			
+			error_log "Configuration file dump:"
+			local line
+			while read line; do
+				error_log "  ${line}"
+			done < ${config_file}
+
+			return ${EXIT_ERROR}
+			;;
+	esac
+}
+
+function hostapd_stop() {
+	local device=${1}
+	assert isset device
+
+	service_stop "hostapd@${device}.service"
+
+	rm -rf $(hostapd_config_dir ${device})
+}
+
+function hostapd_get_pid() {
+	local device=${1}
+
+	assert isset device
+
+	local pid_file="$(hostapd_config_dir ${device})/pid"
+
+	[ -e "${pid_file}" ] || return ${EXIT_ERROR}
+
+	cat ${pid_file} 2>/dev/null
+	return ${EXIT_OK}
+}
+
+function hostapd_is_running() {
+	local device=${1}
+
+	assert isset device
+
+	local pid=$(hostapd_get_pid ${device})
+
+	if isset pid && [ -d "/proc/${pid}" ]; then
+		return ${EXIT_OK}
+	fi
+
+	return ${EXIT_ERROR}
+}
diff --git a/functions.wireless b/functions.wireless
index 4913eae9..eacc6abf 100644
--- a/functions.wireless
+++ b/functions.wireless
@@ -2,7 +2,7 @@
 ###############################################################################
 #                                                                             #
 # IPFire.org - A linux based firewall                                         #
-# Copyright (C) 2010  Michael Tremer & Christian Schmidt                      #
+# Copyright (C) 2012  IPFire Network Development Team                         #
 #                                                                             #
 # This program is free software: you can redistribute it and/or modify        #
 # it under the terms of the GNU General Public License as published by        #
@@ -64,208 +64,6 @@ function wireless_set_channel() {
 	iw dev ${device} set channel ${channel} $@
 }
 
-function hostapd_config_dir() {
-	local device=${1}
-	
-	echo "${RUN_DIR}/hostapd/${device}"
-}
-
-function hostapd_config_write() {
-	local device=${1}
-	shift
-
-	assert device_exists ${device}
-
-	local broadcast_ssid
-	local channel
-	local country_code
-	local encryption
-	local key
-	local mode
-	local ssid
-
-	while [ $# -gt 0 ]; do
-		case "${1}" in
-			--broadcast-ssid=*)
-				broadcast_ssid=${1#--broadcast-ssid=}
-				;;
-			--channel=*)
-				channel=${1#--channel=}
-				;;
-			--country-code=*)
-				country_code=${1#--country-code=}
-				;;
-			--mode=*)
-				mode=${1#--mode=}
-				;;
-			--ssid=*)
-				ssid=${1#--ssid=}
-				;;
-			--encryption=*)
-				encryption=$(cli_get_val ${1})
-				;;
-			--key=*)
-				key=$(cli_get_val ${1})
-				;;
-			*)
-				warning_log "Ignoring unknown argument '${1}'."
-				;;			
-		esac
-		shift
-	done
-
-	assert isset broadcast_ssid
-	assert isbool broadcast_ssid
-
-	assert isset channel
-	assert isinteger channel
-
-	assert isset country_code
-	assert isset mode
-	assert isset ssid
-
-	# Check if key is set when encryption is used.
-	if isset encryption; then
-		assert isoneof encryption WPA WPA2 WPA/WPA2
-		assert isset key
-	fi
-
-	local ignore_broadcast_ssid
-	if enabled broadcast_ssid; then
-		ignore_broadcast_ssid="0"
-	else
-		ignore_broadcast_ssid="1"
-	fi
-
-	local hw_mode ieee80211n="0"
-	if [ "${mode}" = "n" ]; then
-		if [ ${channel} -le 15 ]; then
-			hw_mode="g"
-		else
-			hw_mode="a"
-		fi
-		ieee80211n="1"
-	fi
-
-	cat <<EOF
-### Hostapd configuration for ${device}
-
-# Interface configuration
-driver=nl80211
-interface=${device}
-
-# Wireless configuration
-channel=${channel}
-country_code=${country_code}
-hw_mode=${hw_mode}
-ieee80211n=${ieee80211n}
-ignore_broadcast_ssid=${ignore_broadcast_ssid}
-ssid=${ssid}
-
-# Dump file
-dump_file=$(hostapd_config_dir ${device}/dump)
-
-ctrl_interface=/var/run/hostapd
-ctrl_interface_group=0
-
-EOF
-
-	if isset encryption; then
-		local encryption_mode=0
-		case "${encryption}" in
-			WPA)
-				encryption_mode=1
-				;;
-			WPA2)
-				encryption_mode=2
-				;;
-			WPA/WPA2)
-				encryption_mode=3
-				;;
-		esac
-
-		print "# Encryption settings."
-		print "wpa=${encryption_mode}"
-		print "wpa_passphrase=${key}"
-		print "wpa_key_mgmt=WPA-PSK"
-		print "wpa_pairwise=TKIP"
-		print "rsn_pairwise=CCMP"
-		print
-	fi
-
-	return ${EXIT_OK}
-}
-
-function hostapd_start() {
-	local device=${1}
-	shift
-
-	assert isset device
-
-	local config_dir=$(hostapd_config_dir ${device})
-	mkdir -p ${config_dir}
-
-	local config_file=${config_dir}/config
-	hostapd_config_write ${device} $@ > ${config_file}
-
-	service_start "hostapd@${device}.service"
-	local ret=$?
-
-	case "${ret}" in
-		0)
-			log DEBUG "Hostapd was successfully started for '${device}'."
-			return ${EXIT_OK}
-			;;
-		1)
-			error_log "Could not start hostapd properly for '${device}'."
-			
-			error_log "Configuration file dump:"
-			local line
-			while read line; do
-				error_log "  ${line}"
-			done < ${config_file}
-
-			return ${EXIT_ERROR}
-			;;
-	esac
-}
-
-function hostapd_stop() {
-	local device=${1}
-	assert isset device
-
-	service_stop "hostapd@${device}.service"
-
-	rm -rf $(hostapd_config_dir ${device})
-}
-
-function hostapd_get_pid() {
-	local device=${1}
-
-	assert isset device
-
-	local pid_file="$(hostapd_config_dir ${device})/pid"
-
-	[ -e "${pid_file}" ] || return ${EXIT_ERROR}
-
-	cat ${pid_file} 2>/dev/null
-	return ${EXIT_OK}
-}
-
-function hostapd_is_running() {
-	local device=${1}
-
-	assert isset device
-
-	local pid=$(hostapd_get_pid ${device})
-
-	if isset pid && [ -d "/proc/${pid}" ]; then
-		return ${EXIT_OK}
-	fi
-
-	return ${EXIT_ERROR}
-}
-
 function wpa_supplicant_config_write() {
 	local device=${1}
 	shift