[pkg-wpa-devel] r1579 - in /wpasupplicant/trunk/debian: changelog config/kfreebsd config/linux ifupdown/functions.sh ifupdown/wpa_action

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

Author: kelmo-guest
Date: Sun Apr 17 10:15:01 2011
New Revision: 1579

URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=1579
Log:
* Restore code which loop waits for wpa_supplicant generated PID and
  UNIX socket on the filesystem before proceeeding with execution of
  ifupdown script. (Closes: #622757, #622589)
* On DISCONNECTED event using wpa-roam, do not immediately issue
  reassociation command. (Closes: #622821)
* Enable CONFIG_IEEE80211W in build configuration. (Closes: #622587)

Modified:
    wpasupplicant/trunk/debian/changelog
    wpasupplicant/trunk/debian/config/kfreebsd
    wpasupplicant/trunk/debian/config/linux
    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=1579&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sun Apr 17 10:15:01 2011
@@ -1,8 +1,17 @@
 wpasupplicant (0.7.3-3) UNRELEASED; urgency=low
 
+  [ Stefan Lippers-Hollmann ]
   * NOT RELEASED YET
 
- -- Stefan Lippers-Hollmann <s.l-h at gmx.de>  Fri, 15 Apr 2011 04:13:38 +0200
+  [ Kel Modderman ]
+  * Restore code which loop waits for wpa_supplicant generated PID and
+    UNIX socket on the filesystem before proceeeding with execution of
+    ifupdown script. (Closes: #622757, #622589)
+  * On DISCONNECTED event using wpa-roam, do not immediately issue
+    reassociation command. (Closes: #622821)
+  * Enable CONFIG_IEEE80211W in build configuration. (Closes: #622587)
+
+ -- Kel Modderman <kel at otaku42.de>  Sun, 17 Apr 2011 19:57:56 +1000
 
 wpasupplicant (0.7.3-2) unstable; urgency=low
 

Modified: wpasupplicant/trunk/debian/config/kfreebsd
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/kfreebsd?rev=1579&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/kfreebsd (original)
+++ wpasupplicant/trunk/debian/config/kfreebsd Sun Apr 17 10:15:01 2011
@@ -29,7 +29,7 @@
 CONFIG_ELOOP=eloop
 CONFIG_L2_PACKET=freebsd
 CONFIG_PEERKEY=y
-#CONFIG_IEEE80211W=y
+CONFIG_IEEE80211W=y
 CONFIG_TLS=openssl
 CONFIG_CTRL_IFACE_DBUS=y
 CONFIG_IEEE80211R=y

Modified: wpasupplicant/trunk/debian/config/linux
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/config/linux?rev=1579&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/config/linux (original)
+++ wpasupplicant/trunk/debian/config/linux Sun Apr 17 10:15:01 2011
@@ -30,7 +30,7 @@
 CONFIG_ELOOP=eloop
 CONFIG_L2_PACKET=linux
 CONFIG_PEERKEY=y
-#CONFIG_IEEE80211W=y
+CONFIG_IEEE80211W=y
 CONFIG_TLS=openssl
 CONFIG_CTRL_IFACE_DBUS=y
 CONFIG_CTRL_IFACE_DBUS_NEW=y

Modified: wpasupplicant/trunk/debian/ifupdown/functions.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/functions.sh?rev=1579&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Sun Apr 17 10:15:01 2011
@@ -280,9 +280,46 @@
 	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"
-	fi
+	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"
 }
 
 #####################################################################

Modified: wpasupplicant/trunk/debian/ifupdown/wpa_action
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/wpa_action?rev=1579&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/wpa_action (original)
+++ wpasupplicant/trunk/debian/ifupdown/wpa_action Sun Apr 17 10:15:01 2011
@@ -54,7 +54,6 @@
 		wpa_hysteresis_check || exit 1
 		ifdown
 		if_post_down_up
-		wpa_cli reassociate
 		;;
 
 	"stop"|"down")