summaryrefslogtreecommitdiffstats
path: root/src/wireless
diff options
context:
space:
mode:
authorJames Rayner <james@archlinux.org>2009-08-07 16:23:45 +0200
committerJames Rayner <james@archlinux.org>2009-08-07 16:23:45 +0200
commit54e39849f1e60eb043f9d8f0904acf3c79d96a1c (patch)
tree9c10a01ea0ba58d31b3ab8282ead767da49264d3 /src/wireless
parentf7168ae05837a24060b41511be6e4626cb26828a (diff)
downloadnetctl-54e39849f1e60eb043f9d8f0904acf3c79d96a1c.tar.gz
netctl-54e39849f1e60eb043f9d8f0904acf3c79d96a1c.tar.xz
Patch from Jim Pryor
Diffstat (limited to 'src/wireless')
-rw-r--r--src/wireless141
1 files changed, 110 insertions, 31 deletions
diff --git a/src/wireless b/src/wireless
index 62454e4..d27c43b 100644
--- a/src/wireless
+++ b/src/wireless
@@ -1,62 +1,141 @@
+##################################
+##
+# /usr/lib/network/wireless_utils
+##
+##################################
+
# Uses wireless_tools, to check for association to a network.
# wep_check interface [timeout]
-wep_check()
-{
- INTERFACE=$1; TIMEOUT=$2
+wep_check() {
+ local INTERFACE="$1" TIMEOUT="${2:-15}" timeout=0 bssid
- [[ -z "$TIMEOUT" ]] && TIMEOUT=15
- let timeout=0
- while [[ $timeout -ne $TIMEOUT ]]; do
- bssid=`iwgetid $INTERFACE -ra`
- [[ ! "$bssid" = "00:00:00:00:00:00" ]] && return 0
+ while [[ "$timeout" -lt "$TIMEOUT" ]]; do
+ bssid=$(iwgetid "$INTERFACE" -ra)
+ [[ -n "$bssid" && "$bssid" != "00:00:00:00:00:00" ]] && return 0
sleep 1
let timeout++
done
- err_append "Wireless association failed"
+ report_fail "Couldn't associate with wireless network."
return 1
}
# Check if a particular network is within range
-# find_essid interface essid
-find_essid()
-{
- INTERFACE=$1; ESSID=$2; RETRIES=5
- try=0;
- while [[ $try -ne $RETRIES ]]; do
- if iwlist $INTERFACE scan|sed "s/ESSID://g"|grep -q "\"$ESSID\""; then
+# find_essid interface essid connection (we treat ESSID as regexp when CONNECTION=wireless-dbus)
+find_essid() {
+ local INTERFACE="$1" ESSID="$2" CONNECTION="$3" RETRIES=20 try=0 res scanned
+ while [[ "$try" -lt "$RETRIES" ]]; do
+ sleep 0.5
+ let try++
+ if [[ "$CONNECTION" == wireless-dbus ]]; then
+ # JP: ESSID is a regexp
+ found=$(
+ res=$(iwlist "$INTERFACE" scan 2>/dev/null)
+ [[ -z "$res" ]] && exit 1
+ # if results were non-null, process them and exit 0
+ echo "$res" | sed -nr 's/^\s+ESSID:"([^"]*)"$/\1/p' | egrep -xm1 "$ESSID"
+ )
+ else
+ found=$(
+ res=$(iwlist "$INTERFACE" scan 2>/dev/null)
+ [[ -z "$res" ]] && exit 1
+ # if results were non-null, process them and exit 0
+ echo "$res" | sed -nr 's/^\s+ESSID:"([^"]*)"$/\1/p' | fgrep -xm1 "$ESSID"
+ )
+ fi && {
+ scanned=1
+ report_debug find_essid "\"$found\""
+ # we only bother with at most 5 successful scans
+ if (( try < RETRIES-4 )); then try=$((RETRIES-4)); fi
+ }
+ if [[ -n "$found" ]]; then
+ echo "$found" # JP: echo literal ESSID
return 0 # network found
fi
- sleep 1
+ done
+ if [[ "$scanned" -ne 1 ]]; then
+ report_debug find_essid "unable to scan"
+ fi
+ return 1
+}
+
+# Check if a particular network is within range
+# find_ap interface ap
+find_ap() {
+ local INTERFACE="$1" ap=$(echo "$2" | tr 'abcdef' 'ABCDEF') RETRIES=20 try=0 res scanned
+ while [[ "$try" -lt "$RETRIES" ]]; do
+ sleep 0.5
let try++
+ found=$(
+ res=$(iwlist "$INTERFACE" scan 2> /dev/null)
+ [[ -z "$res" ]] && exit 1
+ # if results were non-null, process them and exit 0
+ echo "$res" | sed -nr '/^\s+Cell .. - Address: ([[:xdigit:]:]+)$/ { s//\1/; N; s/(.*)\n\s+ESSID:"([^"]*)"$/\1\t\2/p }' \
+ | egrep -m1 "^$ap\t"
+ ) && {
+ scanned=1
+ report_debug find_ap "\"$found\""
+ # we only bother with at most 5 successful scans
+ if (( try < RETRIES-4 )); then try=$((RETRIES-4)); fi
+ }
+ if [[ -n "$found" ]]; then
+ echo "$found" | cut -f2 # JP: echo literal ESSID
+ return 0
+ fi
done
+ if [[ "$scanned" -ne 1 ]]; then
+ report_debug find_ap "unable to scan"
+ fi
return 1
}
-# Return a filename containing a list of network ESSID's found.
+# Return a filename containing a list of network APs and ESSIDs found (sorted by decreasing signal strength)
# list_networks interface
-list_networks()
-{
+list_networks() {
+ local INTERFACE="$1" essids try=0 RETRIES=20 res scanned
# temp file used, as keeping ESSID's with spaces in their name in arrays
# is hard, obscure and kinda nasty. This is simpler and clearer.
- [[ -z "$1" ]] && return 1
- essids=$(mktemp /tmp/essid.XXXXX)
-
- let try=0;
- RETRIES=6;
- while [[ $try -ne $RETRIES ]]; do
- iwlist $1 scan 2> /dev/null|grep ESSID|sed 's/.*ESSID:"\([^"]\+\)".*/\1/' > $essids
- sleep 0.5; let try++
- done
- sort -u $essids -o $essids
-
+ [[ -z "$INTERFACE" ]] && return 1
+ essids=$(mktemp /tmp/essid.XXXXXXXX)
+
+# # James suggested using this, but it requires wpa_supplicant to be running
+# wpa_cli -i "$INTERFACE" scan 2>/dev/null || { rm $essids; return 1; }
+# sleep 0.5
+# wpa_cli -i "$INTERFACE" scan_results > $essids 2>/dev/null || { rm $essids; return 1; }
+
+ {
+ while [[ "$try" -lt "$RETRIES" ]]; do
+ sleep 0.5
+ let try++
+ # iwlist "$INTERFACE" scan 2> /dev/null | fgrep "ESSID" | sed 's/.*ESSID:"\([^"]\+\)".*/\1/' > $essids
+ res=$(iwlist "$INTERFACE" scan 2> /dev/null)
+ [[ -z "$res" ]] && continue
+ scanned=1
+ # we only bother with at most 5 successful scans
+ if (( try < RETRIES-4 )); then try=$((RETRIES-4)); fi
+ echo "$res" | sed -r '1d; $ { H; ba }; 2 { h; d }; /^\s+Cell /! { H; d }; :a; x; s/\n/ /g'
+ done
+ } \
+ | sed -rne 's/.*Address: ([[:xdigit:]:]+).*ESSID:"([^"]*)".*Quality=([0-9]+).*/\1\t\3\t\1\t\2/p' \
+ -e 's/.*Address: ([[:xdigit:]:]+).*Quality=([0-9]+).*ESSID:"([^"]*)".*/\1\t\2\t\1\t\3/p' \
+ | sort -k1 -k2nr | uniq -w17 \
+ | sort -k2nr \
+ | cut -f3- > "$essids"
+ # 1. make tab-separated fields: ap, signal-strength, ap, essid (easiest way to use uniq and cut here requires ap twice)
+ # 2. eliminate duplicate aps (keeping strongest signal)
+ # 3. sort entire list by decreasing signal
+ # 4. then return tab-separated fields: ap, essid (ap needs to come first so that read can assume format is <word> <rest of line>)
+#
# File of 0 length, ie. no ssid's.
if [[ ! -s $essids ]]; then
+ rm $essids
return 1
fi
echo $essids
return 0
}
+
+
# vim: set ts=4 et sw=4 ft=sh: