Improved and fixed some wireless autonconf freatures. Channel syntax has...

Improved and fixed some wireless autonconf freatures. Channel syntax has changed. Some changes in init scripts to fix vlanX problem

files/etc/init.d/qmp-fix-vlan

 #!/bin/sh /etc/rc.common
 # Copyright (C) 2006 OpenWrt.org
 
-START=20
+START=45
 STOP=98
 
 start() {
 	[ -f /proc/net/vlan/config ] && vconfig set_name_type DEV_PLUS_VID_NO_PAD
+	ifup -a
 }
 
 stop() {

packages/qmp-small-node/files/etc/config/qmp

@@ -24,13 +24,16 @@ config 'qmp' 'wireless'
         option 'bssid' '02:CA:FF:EE:BA:BE'
 
 config 'wireless'
-        option 'name' 'qmp'
-         
+        option 'mode' 'adhoc'
+		option 'channel' '44+'
+		option 'name'	'qMp'
+ 
 config 'wireless'
-        option 'channel' '10'
         option 'mode' 'ap'
-        option 'name' 'qmp.cat'
-         
+		option 'name' 'qMp-AP'
+     
+config 'wireless'
+        option 'mode' 'adhoc'
 
 
 

packages/qmp-small-node/files/etc/init.d/qmp_autoconf

@@ -16,11 +16,13 @@ configure() {
 	echo "[Configuring networking]"
 	. $QMP_DIR/qmp_functions.sh
 	qmp_configure
+	/etc/init.d/qmp-fix-vlan start
 #	/etc/init.d/network restart	                       
-#	/etc/init.d/bmx6 restart	
+#	ifup -a
+	/etc/init.d/bmx6 restart	
 	touch "$CONTROL_FILE"
 	echo "Done, rebooting system to complete configuration"
-	reboot
+#	reboot
 }
 
 start() {

packages/qmp-small-node/files/etc/qmp/qmp_common.sh

@@ -8,6 +8,7 @@ qmp_uci_get() {
 	u="$(uci -q get qmp.$1)"
 	r=$?
 	echo "$u"
+	echo "$u" >> /tmp/uci_get
 	[ $r -ne 0 ] && logger -t qMp "UCI returned an error (uci get qmp.$1)"
 	return $r
 }
@@ -98,7 +99,7 @@ qmp_get_wifi_mac_devices() {
 # Returns the device name that corresponds to the MAC address
 # qmp_get_dev_from_mac 00:22:11:33:44:55
 qmp_get_dev_from_mac() {
-        ip l | grep $1 -i -B1 | grep -v \@ | grep -v ether | awk '{print $2}' | tr -d :            
+        ip l | grep $1 -i -B1 | grep -v \@ | grep -v ether | awk '{print $2}' | tr -d : | awk NR==1
 }          
 
 #########################
@@ -106,7 +107,7 @@ qmp_get_dev_from_mac() {
 #########################
 
 # Print the content of the parameters in reverse order (separed by spaces)
-reverse_order() {
+qmp_reverse_order() {
 	echo "$@" | awk '{for (i=NF; i>0; i--) printf("%s ",$i);print ""}'
 }
 

packages/qmp-small-node/files/etc/qmp/qmp_wireless.sh

 #!/bin/sh
 
+##############################
+# Global variables definition
+##############################
+
 QMP_PATH="/etc/qmp"
 OWRT_WIRELESS_CONFIG="/etc/config/wireless"
 TEMPLATE_BASE="$QMP_PATH/templates/wireless" # followed by .driver.mode (wireless.mac80211.adhoc)
@@ -7,11 +11,18 @@ WIFI_DEFAULT_CONFIG="$QMP_PATH/templates/wireless.default.config"
 TMP="/tmp"
 QMPINFO="/etc/qmp/qmpinfo"
 
-#Importing files
+#######################
+# Importing files
+######################
+
 . $QMP_PATH/qmp_common.sh
 
+###########################
+# Find wireless interface 
+##########################
+# Returns the index from wifi-iface (config/wireless) associated to the device or first free if not found
+
 qmp_find_wireless_iface() {
-	# Returns the index from wifi-iface (config/wireless) associated to the device or first free if not found
 	device=$1
 	i=0
 	while true; do
@@ -24,6 +35,40 @@ qmp_find_wireless_iface() {
 	echo $i
 }
 
+###################################
+# Check channel for wifi interface
+###################################
+# First parameter: device
+# Second parameter: channel
+# Third parameter: mode (adhoc, ap)
+# It returns the same channel if it is right, and the new one fixet if not
+
+qmp_check_channel() {
+		dev="$1"
+		right_channel="$2"
+		channel="$(echo $2 | tr -d +-)"
+		ht40="$(echo $2 | tr -d [A-z])"
+		mode="$3"
+		[ ! -z "$channel" ] && chaninfo="$($QMPINFO channels $1 | grep -q $channel)"
+
+		# Checking if some thing related with channel is wrong
+		wrong=0
+		[ -z "$channel" ] || [ -z "$chaninfo" ] && wrong=1
+		[ "$mode" == "adhoc" ] && [ -z "$(echo $chaninfo | grep adhoc)" ] && wrong=1
+		[ "$ht40" == "+" ] && [ -z "$(echo $chaninfo | grep +)" ] && wrong=1 
+		[ "$ht40" == "-" ] && [ -z "$(echo $chaninfo | grep -)" ] && wrong=1
+		
+		# If something wrong, asking for default parameter
+		[ $wrong -ne 0 ] && right_channel="$(qmp_wifi_get_default channel $dev $mode)"
+
+		echo "$right_channel"
+}
+
+#############################
+# Configure driver from wifi
+#############################
+# This function reload modules from madwifi and mac80211 
+# Also depending on which driver is configured in config file, modifies the files from /etc/modules.d 
 
 qmp_configure_wifi_driver() {
 	mac80211_modules="mac80211 ath ath5k ath9k_hw ath9k_common ath9k"
@@ -31,10 +76,10 @@ qmp_configure_wifi_driver() {
 
 	#Removing all modules
 	echo "Removing wifi modules..."
-	for m in $(reverse_order $mac80211_modules); do                   
+	for m in $(qmp_reverse_order $mac80211_modules); do                   
 		rmmod -f $m 2>/dev/null                                            
 	done   
-	for m in $(reverse_order $madwifi_modules); do                    
+	for m in $(qmp_reverse_order $madwifi_modules); do                    
 		rmmod -f $m 2>/dev/null
 	done   	
 		
@@ -62,10 +107,13 @@ qmp_configure_wifi_driver() {
 	esac
 }
 
-qmp_configure_wifi_device() {
-	#Configure a wifi device according qmp config file
-	#Parameters are: 1-> qmp config id, 2-> device name
+########################
+# Configure wifi device
+########################
+# Configure a wifi device according qmp config file
+# Parameters are: 1-> qmp config id, 2-> device name
 
+qmp_configure_wifi_device() {
 	echo ""
 	echo "Configuring device $2"
 
@@ -122,9 +170,13 @@ qmp_configure_wifi_device() {
 	rm -f $TMP/qmp_wireless_temp
 }
 
-qmp_configure_wifi() {
+#############################
+# Configure all wifi devices
+#############################
 #This function search for all wifi devices and leave them configured according qmp config file
 
+qmp_configure_wifi() {
+
 	echo "Configuring driver..."
 	qmp_configure_wifi_driver
 
@@ -150,11 +202,13 @@ qmp_configure_wifi() {
 	echo "Done. All devices configured according qmp configuration"
 }
 
-
-#This function returns the default values
-# first parameter is always what are you asking for (mode, channel, name,...)
-# second one is device name, only needed by mode and channel
-# third one is configured mode, only needed by chanel
+####################
+# Get default values
+####################
+# This function returns the default values
+#  - first parameter: is always what are you asking for (mode, channel, name,...)
+#  - second parameter: is device name, only needed by mode and channel
+#  - third parameter: is configured mode, only needed by chanel
 
 qmp_wifi_get_default() {
 	what="$1"
@@ -172,7 +226,7 @@ qmp_wifi_get_default() {
 		fi
 	
 	# CHANNEL
-	# Default channel depends on the card and in configured mode
+	# Default channel depends on the card and on configured mode
 	#  Highest channel -> adhoc or not-configured
 	#  Lower channel -> ap
 
@@ -180,14 +234,15 @@ qmp_wifi_get_default() {
 		[ -z "$device" ] && qmp_error "Device not found?" 
 		mode="$3"
 
-		# with index var we are using the devices in differents channels
+		# we are using index var to put devices in different channels
 		index=$(echo $device | tr -d [A-z])
 		index=$(( $index * 2 ))
 
 		# QMPINFO returns a list of avaiable channels in this format: 130 ht40+ adhoc
+		echo $mode >> /tmp/debug
 		[ "$mode" == "adhoc" ] || [ -z "$mode" ] && channel_info="$(qmp_tac $QMPINFO channels $device | grep adhoc | awk NR==$index+1)"
-		[ "$mode" == "ap" ] && channel_info="$($QMPINFO channels $device | awk NR==$index+1 )"
-
+		[ "$mode" == "ap" ] && { channel_info="$($QMPINFO channels $device | awk NR==$index+1)"; echo "Debug: $channel_info" >> /tmp/debug; }
+		
 		# if there is some problem, channel 6 is used
 		if [ -z "$channel_info" ]; then
 			qmp_log "Warning, not usable channels found in device $device "
@@ -197,15 +252,11 @@ qmp_wifi_get_default() {
 		
 		# let's see if we can use ht40 mode
 		# if it is avaiable, channel must be configured with + or - symbol 
-		mode_n="$($QMPINFO modes $2 | grep n)"
 		channel="$(echo $channel_info | cut -d' ' -f1)"
-
-		if [ ! -z "$mode_n" ]; then
-			ht40="$(echo $channel_info | cut -d' ' -f2)"
-			[ "$ht40" == "ht40+" ] && channel="${channel}+"
-			[ "$ht40" == "ht40-" ] && channel="${channel}-"
-		fi
-
+		ht40="$(echo $channel_info | cut -d' ' -f2)"
+		[ "$ht40" == "ht40+" ] && channel="${channel}+"
+		[ "$ht40" == "ht40-" ] && channel="${channel}-"
+			
 		echo "$channel"			
 
 	# REST OF DEFAULT VAULES
@@ -234,10 +285,24 @@ qmp_configure_wifi_initial() {
 				device="$(qmp_get_dev_from_mac $m)"
 				id_configured="$id_configured $j" 
 				echo "Found configured device: $m"
-		        	[ -z "$(qmp_uci_get @wireless[$j].mode)" ] && qmp_uci_set @wireless[$j].mode $(qmp_wifi_get_default mode $device)
-					mode="$(qmp_uci_get @wireless[$j].mode)"
-					[ -z "$(qmp_uci_get @wireless[$j].channel)" ] && qmp_uci_set @wireless[$j].channel $(qmp_wifi_get_default channel $device $mode)
-        			[ -z "$(qmp_uci_get @wireless[$j].name)" ] && qmp_uci_set @wireless[$j].name $(qmp_wifi_get_default name)
+		        [ -z "$(qmp_uci_get @wireless[$j].mode)" ] && qmp_uci_set @wireless[$j].mode $(qmp_wifi_get_default mode $device)
+        		[ -z "$(qmp_uci_get @wireless[$j].name)" ] && qmp_uci_set @wireless[$j].name $(qmp_wifi_get_default name)
+	
+				# If channel is configured, we are going to check it
+				# if not, using default one
+				sleep 1 && mode="$(qmp_uci_get @wireless[$j].mode)"
+				channel="$(qmp_uci_get @wireless[$j].channel)"
+				if [ -z "$channel" ]; then 
+					 qmp_uci_set @wireless[$j].channel $(qmp_wifi_get_default channel $device $mode)
+
+				else
+					newchan="$(qmp_check_channel $device $channel $mode)"
+					if [ "$newchan" != "$channel" ]; then
+						qmp_log Warning: "Channel $channel for device $device in mode $mode is not right, using default one"
+						qmp_uci_set @wireless[$j].channel $newchan	
+					fi  
+				fi			
+								 
 				qmp_uci_set @wireless[$j].device $device
 				break
 			fi
@@ -256,9 +321,10 @@ qmp_configure_wifi_initial() {
 		while [ ! -z "$(echo $id_configured | grep $j)" ]; do j=$(( $j +1 )); done
 		#Now we have a free slot, let's go to configure device
 		[ -z "$(qmp_uci_get @wireless[$j])" ] && qmp_uci_add wireless
-		[ -z "$(qmp_uci_get @wireless[$j].channel)" ] && qmp_uci_set @wireless[$j].channel $(qmp_wifi_get_default channel $device)
 		[ -z "$(qmp_uci_get @wireless[$j].mode)" ] && qmp_uci_set @wireless[$j].mode $(qmp_wifi_get_default mode $device)
-		[ -z "$(qmp_uci_get @wireless[$j].name)" ] && qmp_uci_set @wireless[$j].name $(qmp_wifi_get_default name $device)
+		[ -z "$(qmp_uci_get @wireless[$j].name)" ] && qmp_uci_set @wireless[$j].name $(qmp_wifi_get_default name)
+		sleep 1 && mode="$(qmp_uci_get @wireless[$j].mode)"
+		[ -z "$(qmp_uci_get @wireless[$j].channel)" ] && qmp_uci_set @wireless[$j].channel $(qmp_wifi_get_default channel $device $mode)
 		qmp_uci_set @wireless[$j].mac $m
 		qmp_uci_set @wireless[$j].device $device
 		id_configured="$id_configured $j"

packages/qmp-small-node/files/etc/qmp/qmpinfo

@@ -28,13 +28,12 @@ function print_channels()
 	local output = ""
 	local data = qmp.get_channels(dev)
 	for _,d in ipairs(data) do
-		partial = d.channel
-		if d.ht40p then partial = partial .. " ht40+" end
-		if d.ht40m then partial = partial .. " ht40-" end
-		if d.adhoc then partial = partial .. " adhoc" end
-		output = output .. partial .. "\n"
+		output = d.channel
+		if d.ht40p then output = output .. " ht40+" end
+		if d.ht40m then output = output .. " ht40-" end
+		if d.adhoc then output = output .. " adhoc" end
+		print(output)
 	end
-	print(output)
 end
 	
 if #arg ~= 2 then

packages/qmp-small-node/files/etc/qmp/qmpinfo.lua

@@ -20,6 +20,8 @@ function qmpinfo.get_channels(dev)
 	local pc = 0 -- previous channel
 	local clist = {} -- output channel list
 	local adhoc
+	local ht40_support = qmpinfo.get_modes(dev).n
+	
 
 	for i,f in ipairs(freqs) do
 		c = f.channel
@@ -67,7 +69,15 @@ function qmpinfo.get_channels(dev)
 				ch.adhoc = true
 			end
 		end
+
+		-- If the device does not support ht40, both vars (+/-) are false
+		if not ht40_support then
+			ch.ht40p = false
+			ch.ht40m = false
+		end
+
 		table.insert(clist,ch)
+
 	end	
 	return clist
 end