[pkg-wpa-devel] r884 - in /wpasupplicant/trunk/debian: changelog ifupdown/functions.sh ifupdown/wpa_action.sh
kelmo-guest at users.alioth.debian.org
kelmo-guest at users.alioth.debian.org
Sat Nov 3 13:23:37 UTC 2007
Author: kelmo-guest
Date: Sat Nov 3 13:23:37 2007
New Revision: 884
URL: http://svn.debian.org/wsvn/pkg-wpa/?sc=1&rev=884
Log:
* wpa_action: check status with respect to ifupdown after CONNECTED event
has ensued. If the interface is not recorded in ifupdown's state file
attempt reassociation. (Closes: #428304).
Modified:
wpasupplicant/trunk/debian/changelog
wpasupplicant/trunk/debian/ifupdown/functions.sh
wpasupplicant/trunk/debian/ifupdown/wpa_action.sh
Modified: wpasupplicant/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/changelog?rev=884&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/changelog (original)
+++ wpasupplicant/trunk/debian/changelog Sat Nov 3 13:23:37 2007
@@ -33,8 +33,11 @@
* debian/patches/40_debian_doc_examples.dpatch does not apply to git
snapshot, remove it and rethink how we can best integrate our debian
specific bits.
-
- -- Kel Modderman <kel at otaku42.de> Sat, 03 Nov 2007 22:00:42 +1000
+ * wpa_action: check status with respect to ifupdown after CONNECTED event
+ has ensued. If the interface is not recorded in ifupdown's state file
+ attempt reassociation. (Closes: #428304).
+
+ -- Kel Modderman <kel at otaku42.de> Sat, 03 Nov 2007 23:03:00 +1000
wpasupplicant (0.6.0-4) 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=884&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/functions.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/functions.sh Sat Nov 3 13:23:37 2007
@@ -749,6 +749,17 @@
return 0
}
+ifupdown_status () {
+ if grep -s -q "^${WPA_IFACE}=${WPA_LOGICAL_IFACE}" "$IFSTATE_FILE"; then
+ echo "Interface \"$WPA_IFACE\" connected successfully."
+ return 0
+ fi
+
+ echo "Interface \"$WPA_IFACE\" failed to establish a connection."
+ echo "Attempting reassociation..."
+ return 1
+}
+
#####################################################################
## apply mapping logic and ifup logical interface
# Apply mapping logic via id_str or external mapping script, check
Modified: wpasupplicant/trunk/debian/ifupdown/wpa_action.sh
URL: http://svn.debian.org/wsvn/pkg-wpa/wpasupplicant/trunk/debian/ifupdown/wpa_action.sh?rev=884&op=diff
==============================================================================
--- wpasupplicant/trunk/debian/ifupdown/wpa_action.sh (original)
+++ wpasupplicant/trunk/debian/ifupdown/wpa_action.sh Sat Nov 3 13:23:37 2007
@@ -42,11 +42,10 @@
wpa_hysteresis_check || exit 1
wpa_log_action
wpa_log_environment
- if ifupdown_check; then
- ifup
- fi
+ ifupdown_check && ifup
wpa_hysteresis_event
wpa_cli status
+ ifupdown_status || wpa_cli reassociate
;;
"DISCONNECTED")
@@ -63,9 +62,7 @@
"stop"|"down")
test_wpa_supplicant || exit 1
kill_wpa_cli
- if ifupdown_check; then
- ifdown
- fi
+ ifupdown_check && ifdown
kill_wpa_supplicant
wpa_log_init
wpa_log_action
More information about the Pkg-wpa-devel
mailing list