[pkg-wpa-devel] r1537 - in /wpasupplicant/trunk/debian: changelog ifupdown/functions.sh ifupdown/wpa_action

[kelmo-guest at users.alioth.debian.org]

Author: kelmo-guest
Date: Sun May  2 08:41:33 2010
New Revision: 1537

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1537
Log:
* Remove sleep loops which wait for creation of interface specific
  control sockets, these are now created before the process is
  backgrounded (http://w1.fi/bugz/show_bug.cgi?id=283).
* After a disconnected event, attempt to reassociate to a network
  when using wpa-roam.

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/ifupdown/functions.sh
    wpasupplicant/trunk/debian/ifupdown/wpa_action

Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=1537&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun May  2 08:41:33 2010
@@ -29,8 +29,13 @@
   * Remove pm-utils stuff from debian/ifupdown/action_wpa.sh.
   * Add 11_wpa_supplicant_enable_network_tweak.patch to fix semantics of
     enable_network command.
-
- -- Kel Modderman <kel at otaku42.de>  Sun, 02 May 2010 11:26:02 +1000
+  * Remove sleep loops which wait for creation of interface specific
+    control sockets, these are now created before the process is
+    backgrounded (http://w1.fi/bugz/show_bug.cgi?id=283).
+  * After a disconnected event, attempt to reassociate to a network
+    when using wpa-roam.
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 02 May 2010 18:40:49 +1000
 
 wpasupplicant (0.6.10-2) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1537&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Sun May  2 08:41:33 2010
@@ -224,9 +224,9 @@
 		wpa_msg verbose "wpa-driver $IF_WPA_DRIVER"
 		case "$IF_WPA_DRIVER" in
 			hostap|ipw|madwifi|ndiswrapper)
-				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D wext"
+				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D nl80211,wext"
 				wpa_msg stderr "\"$IF_WPA_DRIVER\" wpa-driver is unsupported"
-				wpa_msg stderr "using \"wext\" wpa-driver instead ..."
+				wpa_msg stderr "using \"nl80211,wext\" wpa-driver instead ..."
 				;;
 			*)
 				WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D $IF_WPA_DRIVER"
@@ -234,7 +234,7 @@
 		esac
 	else
 		WPA_SUP_OPTIONS="$WPA_SUP_OPTIONS -D nl80211,wext"
-		wpa_msg verbose "using default driver type: wpa-driver nl80211,wext"
+		wpa_msg verbose "wpa-driver nl80211,wext (default)"
 	fi
 
 	if [ -n "$IF_WPA_DEBUG_LEVEL" ]; then
@@ -280,46 +280,9 @@
 	fi
 
 	if [ -n "$WPA_SUP_OMIT_PIDFILE" ]; then
-		local WPA_PIDFILE_WAIT
-		local MAX_WPA_PIDFILE_WAIT
-		WPA_PIDFILE_WAIT="0"
-		MAX_WPA_PIDFILE_WAIT="5"
-		until [ -s "$WPA_SUP_PIDFILE" ]; do
-			if [ "$WPA_PIDFILE_WAIT" -ge "$MAX_WPA_PIDFILE_WAIT" ]; then
-				wpa_msg stderr "timed out waiting for creation of $WPA_SUP_PIDFILE"
-				return 1
-			else
-				wpa_msg verbose "waiting for \"$WPA_SUP_PIDFILE\": " \
-					"$WPA_PIDFILE_WAIT (max. $MAX_WPA_PIDFILE_WAIT)"
-			fi
-
-			WPA_PIDFILE_WAIT=$(($WPA_PIDFILE_WAIT + 1))
-			sleep 1
-		done
 		wpa_msg verbose "creating sendsigs omission pidfile: $WPA_SUP_OMIT_PIDFILE"
 		cat "$WPA_SUP_PIDFILE" > "$WPA_SUP_OMIT_PIDFILE"
-	else
-		wpa_msg verbose "sendsigs omission pidfile not created"
-	fi
-
-	local WPA_SOCKET_WAIT
-	local MAX_WPA_SOCKET_WAIT
-	WPA_SOCKET_WAIT="0"
-	MAX_WPA_SOCKET_WAIT="5"
-	until [ -S "$WPA_CTRL_DIR/$WPA_IFACE" ]; do
-		if [ "$WPA_SOCKET_WAIT" -ge "$MAX_WPA_SOCKET_WAIT" ]; then
-			wpa_msg stderr "ctrl_interface socket not found at $WPA_CTRL_DIR/$WPA_IFACE"
-			return 1
-		else
-			wpa_msg verbose "waiting for \"$WPA_CTRL_DIR/$WPA_IFACE\": " \
-				"$WPA_SOCKET_WAIT (max. $MAX_WPA_SOCKET_WAIT)"
-		fi
-		
-		WPA_SOCKET_WAIT=$(($WPA_SOCKET_WAIT + 1))
-		sleep 1
-	done
-	
-	wpa_msg verbose "ctrl_interface socket located at $WPA_CTRL_DIR/$WPA_IFACE"
+	fi
 }
 
 #####################################################################

Modified: wpasupplicant/trunk/debian/ifupdown/wpa_action
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/wpa_action?rev=1537&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/wpa_action (original)
+++ wpasupplicant/trunk/debian/ifupdown/wpa_action Sun May  2 08:41:33 2010
@@ -54,6 +54,7 @@
 		wpa_hysteresis_check || exit 1
 		ifdown
 		if_post_down_up
+		wpa_cli reassociate
 		;;
 
 	"stop"|"down")