diff options
| author | Jim Pryor <profjim@jimpryor.net> | 2009-08-11 14:04:54 +0200 |
|---|---|---|
| committer | James Rayner <james@archlinux.org> | 2009-08-15 04:28:26 +0200 |
| commit | a2a257c1d87dc384b224dd8f024b7dc7661e161c (patch) | |
| tree | dfe0e9ecf70e8f73c35f101a15486401ceaae970 /src/connections | |
| parent | 0d3ccc0c91b944f318a6d0648d96fd7f99405f22 (diff) | |
| download | netctl-a2a257c1d87dc384b224dd8f024b7dc7661e161c.tar.gz netctl-a2a257c1d87dc384b224dd8f024b7dc7661e161c.tar.xz | |
wpa_cli, start/stop_wpa, wpa_check tweaks
* Supply -i switch to wpa_cli
* Have wpa_check call stop_wpa on failure, instead of duplicating
(only some of) the termination code.
* Need brief sleep in termination code.
* Note that functions which call wpa_check don't need to call
stop_wpa themselves, when wpa_check fails.
* Functions which call wpa_check and start_wpa are however
responsible for all error reporting on failure.
* Add some debugging calls to announce calls to wpa_start/wpa_check
Signed-off-by: Jim Pryor <profjim@jimpryor.net>
Diffstat (limited to 'src/connections')
| -rw-r--r-- | src/connections/ethernet | 3 | ||||
| -rw-r--r-- | src/connections/ethernet-iproute | 4 | ||||
| -rw-r--r-- | src/connections/wireless | 18 |
3 files changed, 14 insertions, 11 deletions
diff --git a/src/connections/ethernet b/src/connections/ethernet index 86d8b96..0e72ad3 100644 --- a/src/connections/ethernet +++ b/src/connections/ethernet @@ -24,12 +24,13 @@ ethernet_up() { [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf" [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwired" report_debug ethernet_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" - if ! start_wpa $INTERFACE $WPA_CONF $WPA_OPTS; then + if ! start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS"; then report_fail "wpa_supplicant did not start, possible configuration error" return 1 fi if ! wpa_check "$INTERFACE"; then ifconfig "$INTERFACE" down + report_fail "WPA Authentication/Association Failed" return 1 fi fi diff --git a/src/connections/ethernet-iproute b/src/connections/ethernet-iproute index 2f0c485..6264497 100644 --- a/src/connections/ethernet-iproute +++ b/src/connections/ethernet-iproute @@ -31,13 +31,15 @@ ethernet_up() { [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf" [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwired" - if ! start_wpa $INTERFACE $WPA_CONF $WPA_OPTS; then + report_debug ethernet_iproute_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" + if ! start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS"; then report_fail "wpa_supplicant did not start, possible configuration error" return 1 fi if ! wpa_check "$INTERFACE"; then ip link set $INTERFACE down + report_fail "WPA Authentication/Association Failed" return 1 fi fi diff --git a/src/connections/wireless b/src/connections/wireless index 10f751e..98320fa 100644 --- a/src/connections/wireless +++ b/src/connections/wireless @@ -40,7 +40,7 @@ wireless_up() { # Kill any lingering wpa_supplicants. report_debug wireless_up stop_wpa "$INTERFACE" - stop_wpa $INTERFACE + stop_wpa "$INTERFACE" # Most drivers (mac80211) need mode set before device is brought up # Drivers generally default to managed, but set this to be sure. @@ -92,7 +92,6 @@ wireless_up() { quirk "predown" && ifconfig $INTERFACE up # madwifi FS#10585 report_debug ethernet_up wep_check - if ! wep_check $INTERFACE $TIMEOUT; then report_fail "WEP Association Failed" return 1 @@ -118,12 +117,14 @@ wireless_up() { # Connect! [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwext" - report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF/wpa.conf" "$WPA_OPTS" - start_wpa $INTERFACE $WPA_CONF $WPA_OPTS || return 1 + report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" + if ! start_wpa $INTERFACE $WPA_CONF $WPA_OPTS; then + report_fail "wpa_supplicant did not start, possible configuration error" + return 1 + fi report_debug wireless_up wpa_check - if ! wpa_check $INTERFACE $TIMEOUT; then + if ! wpa_check "$INTERFACE" "$TIMEOUT"; then report_fail "WPA Authentication/Association Failed" - stop_wpa $INTERFACE return 1 fi ;; @@ -132,14 +133,13 @@ wireless_up() { [[ -z "$WPA_CONF" ]] && WPA_CONF="/etc/wpa_supplicant.conf" # defaults [[ -z "$WPA_OPTS" ]] && WPA_OPTS="-Dwext" report_debug wireless_up start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS" - if ! start_wpa $INTERFACE $WPA_CONF $WPA_OPTS; then + if ! start_wpa "$INTERFACE" "$WPA_CONF" "$WPA_OPTS"; then report_fail "wpa_supplicant did not start, possible configuration error" return 1 fi report_debug wireless_up wpa_check - if ! wpa_check $INTERFACE $TIMEOUT; then + if ! wpa_check "$INTERFACE" "$TIMEOUT"; then report_fail "WPA Authentication/Association Failed" - stop_wpa $INTERFACE return 1 fi ;; |