--- trunk/magellan-initscripts/etc/rc.d/init.d/network	2005/08/03 17:54:05	181
+++ trunk/magellan-initscripts/etc/rc.d/init.d/network	2005/09/20 20:22:05	243
@@ -1,5 +1,5 @@
 #!/bin/bash
-# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.4 2005-08-03 17:54:05 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/magellan-initscripts/etc/rc.d/init.d/network,v 1.5 2005-09-20 20:22:05 niro Exp $
 
 #%rlevels: 0:k 1:k 2:k 3:s 4:s 5:s 6:k
 #%start: 20
@@ -13,7 +13,61 @@
 source /etc/sysconfig/rc
 source ${rc_functions}
 
-checkconfig() {
+# read values from files
+read_value()
+{
+	local var="$1"
+	local file="$2"
+	local value
+
+	# local all possible vars
+	# global
+	local ONBOOT
+	local NETWORKING
+	
+	# static
+	local IP
+	local NETMASK
+	local BROADCAST
+	local NETWORKING
+	local FORCE_MAC_TO
+
+	# dhcp
+	local DHCP_PROG
+	local DHCP_START
+	local DHCP_STOP
+
+	# default gw
+	local GATEWAY
+	local GATEWAY_IF
+
+	# wireless extensions
+	local WIRELESS_AP
+	local WIRELESS_AUTH_MODE
+	local WIRELESS_BITRATE
+	local WIRELESS_CHANNEL
+	local WIRELESS_DEFAULT_KEY
+	local WIRELESS_ESSID
+	local WIRELESS_FREQUENCY
+	local WIRELESS_KEY
+	local WIRELESS_KEY_ASCII
+	local WIRELESS_KEY_0
+	local WIRELESS_KEY_1
+	local WIRELESS_KEY_2
+	local WIRELESS_KEY_3
+	local WIRELESS_KEY_LENGTH
+	local WIRELESS_MODE
+	local WIRELESS_NICK
+	local WIRELESS_NWID
+	local WIRELESS_POWER
+
+	source ${file}
+	eval value=\$$(echo ${var})
+	echo "${value}"
+}
+
+checkconfig()
+{
 	if [ -z "${NETWORKING}" ]
 	then
 		echo "NETWORKING missing in net.${interface}, aborted"
@@ -53,93 +107,129 @@
 	esac
 }
 
-
-case "$1" in
-	start)
-		for file in $(grep -il "ONBOOT=\"yes\"" ${network_settings}/net.*)
-		do
-			interface=$(basename ${file} | sed s/net.//)
-			case "${interface}" in
+# onboot_interface_list /path/to/files*
+onboot_interface_list()
+{
+	local file
+	local devices
+	local iface
+
+	# get list of all devices
+	for file in $@
+	do
+		if [[ $(read_value ONBOOT ${file}) = yes ]]
+		then
+			iface="$(basename ${file} | sed s/net.//)"
+			# exclude backup files
+			case "${iface}" in
 				*~) ;;
-				*)
-					source ${network_settings}/net.${interface} || exit 1
-					checkconfig
-
-					# first set mac address forcing
-					[ -n "${FORCE_MAC_TO}" ] && ifconfig ${interface} hw ether "${FORCE_MAC_TO}"
-
-					case "${NETWORKING}" in
-						dhcp)
-							echo -e ${COLOREDSTAR}"Bringing up interface ${COLBLUE}${interface}${COLDEFAULT} ..."
-							${CURS_UP}
-							${SET_WWCOL}
-							echo "[DHCP]"
-							loadproc ${DHCP_PROG} ${DHCP_START}
-							;;
-						static)
-							echo -e ${COLOREDSTAR}"Bringing up interface ${COLBLUE}${interface}${COLDEFAULT} ..."
-							${CURS_UP}
-							${SET_WWCOL}
-							echo "[STATIC]"
-							ifconfig ${interface} ${IP} netmask ${NETMASK} broadcast ${BROADCAST}
-							evaluate_retval
-							;;
-					esac
-				;;
+				*) devices="${devices} $(basename ${file} | sed s/net.//)" ;;
 			esac
-		done
+		fi
+	done
+
+	echo "${devices}"
+}
 
-		if [ -n "${GATEWAY}" -a -n "${GATEWAY_IF}" ]
+networking_start()
+{
+	local iface
+
+	# get list of all devices
+	for iface in $(onboot_interface_list ${network_settings}/net.*)
+	do
+		# checkconfig
+		source ${network_settings}/net.${iface} || exit 1
+		checkconfig
+
+		echo -e ${COLOREDSTAR}"Bringing up interface ${COLBLUE}${iface}${COLDEFAULT} ..."
+
+		# setup mac
+		[ -n "${FORCE_MAC_TO}" ] && ifconfig ${iface} hw ether "${FORCE_MAC_TO}"
+
+		# setup static or dhcp
+		case ${NETWORKING} in
+			dhcp|DHCP)
+				${CURS_UP}
+				${SET_WWCOL}
+				echo "[DHCP]"
+				loadproc ${DHCP_PROG} ${DHCP_START}
+				;;
+			static|STATIC)
+				${CURS_UP}
+				${SET_WWCOL}
+				echo "[STATIC]"
+				ifconfig "${iface}" "${IP}" netmask "${NETMASK}" broadcast "${BROADCAST}"
+				evaluate_retval
+				;;
+		esac
+
+		# setup def gw
+		if [[ -n ${GATEWAY} ]]
 		then
 			echo -e ${COLOREDSTAR}"Setting up default gateway ..."
-			route add default gateway ${GATEWAY} metric 1 \
-				dev ${GATEWAY_IF}
+			route add default gateway ${GATEWAY} metric 1 dev ${iface}
 			evaluate_retval
 		fi
 
-		update_svcstatus $1
-		splash svc_started "$(basename $0)" 0
-		;;
+		# setup wlan extensions
+		if [ -x /usr/sbin/iwconfig ]
+		then
+			[[ -n ${WIRELESS_BITRATE} ]] && iwconfig "${iface}" rate "${WIRELESS_BITRATE}"
+			[[ -n ${WIRELESS_CHANNEL} ]] && iwconfig "${iface}" channel "${WIRELESS_CHANNEL}"
+			[[ -n ${WIRELESS_ESSID} ]] && iwconfig "${iface}" essid "${WIRELESS_ESSID}"
+			[[ -n ${WIRELESS_FREQUENCY} ]] && iwconfig "${iface}" freq "${WIRELESS_FREQUENCY}"
+			[[ -n ${WIRELESS_MODE} ]] && iwconfig "${iface}" mode "${WIRELESS_MODE}"
+			[[ -n ${WIRELESS_NICK} ]] && iwconfig "${iface}" nick "${WIRELESS_NICK}"
+			[[ -n ${WIRELESS_AUTH_MODE} ]] && iwconfig "${iface}" enc "${WIRELESS_AUTH_MODE}"
+			[[ -n ${WIRELESS_KEY_LENGTH} ]] && iwconfig "${iface}" enc "${WIRELESS_KEY_LENGTH}"
+			[[ -n ${WIRELESS_KEY} ]] && iwconfig "${iface}" key "${WIRELESS_KEY}"
+			[[ -n ${WIRELESS_KEY_ASCII} ]] && iwconfig "${iface}" key s:"${WIRELESS_KEY_ASCII}"
+		fi
+	done
+}
 
-	stop)
-		if [ -n "${GATEWAY}" ]
+networking_stop()
+{
+	# get list of all devices
+	for iface in $(onboot_interface_list ${network_settings}/net.*)
+	do
+		source ${network_settings}/net.${iface} || exit 1
+		checkconfig
+
+		if [[ -n ${GATEWAY} ]]
 		then
 			echo -e ${COLOREDSTAR}"Removing default gateway ..."
 			route del -net default
 			evaluate_retval
 		fi
 
-		for file in $(grep -il "ONBOOT=\"yes\"" ${network_settings}/net.*)
-		do
-			interface=$(basename ${file} | sed s/net.//)
-			case "${interface}" in
-				*~) ;;
-				*)
-					#$network_devices/ifdown $interface
-					source ${network_settings}/net.${interface} || exit 1
-					checkconfig
-					echo -e ${COLOREDSTAR}"Bringing down interface ${COLBLUE}${interface}${COLDEFAULT} ..."
-					ifconfig ${interface} down
-					evaluate_retval
-
-					#shutdown dhcp-daemon
-					if [ "${NETWORKING}" == dhcp ]
-					then
-						my_runlevel="`runlevel | cut -d ' ' -f2`"
-						if [ -n "$(pidof ${DHCP_PROG})" ]
-						then
-							echo -e ${COLOREDSTAR}"Stopping the dhcp-daemon ..."
-							${CURS_UP}
-							${SET_WWCOL}
-							echo "[$(basename ${DHCP_PROG})]"
-							${DHCP_PROG} ${DHCP_STOP}
-							evaluate_retval
-						fi
-					fi
-					;;
-			esac
-		done
+		echo -e ${COLOREDSTAR}"Bringing down interface ${COLBLUE}${iface}${COLDEFAULT} ..."
+		ifconfig ${iface} down
+		evaluate_retval
+
+		# shutdown dhcp-daemon
+		if [[ ${NETWORKING} = dhcp ]] && [[ -n $(pidof ${DHCP_PROG}) ]]
+		then
+			echo -e ${COLOREDSTAR}"Stopping the dhcp-daemon ..."
+			${CURS_UP}
+			${SET_WWCOL}
+			echo "[$(basename ${DHCP_PROG})]"
+			${DHCP_PROG} ${DHCP_STOP}
+			evaluate_retval
+		fi
+	done
+}
 
+case $1 in
+	start)
+		networking_start
+		update_svcstatus $1
+		splash svc_started "$(basename $0)" 0
+		;;
+
+	stop)
+		networking_stop
 		update_svcstatus $1
 		splash svc_stopped "$(basename $0)" 0
 		;;