diff options
| author | Olivier Blin <oblin@mandriva.com> | 2008-03-14 18:51:58 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2008-03-14 18:51:58 +0000 |
| commit | 29272538450b3211f3bc78ad6916d12cd3232738 (patch) | |
| tree | 8cfc8c310040008fb2a11460cd53c28c970b4092 /lib/network/monitor.pm | |
| parent | 9a71524e7ba5fb8052421e8628dbadf0010d5d3b (diff) | |
| download | drakx-net-29272538450b3211f3bc78ad6916d12cd3232738.tar drakx-net-29272538450b3211f3bc78ad6916d12cd3232738.tar.gz drakx-net-29272538450b3211f3bc78ad6916d12cd3232738.tar.bz2 drakx-net-29272538450b3211f3bc78ad6916d12cd3232738.tar.xz drakx-net-29272538450b3211f3bc78ad6916d12cd3232738.zip | |
detect EAP support when parsing iwlist scan
Diffstat (limited to 'lib/network/monitor.pm')
| -rw-r--r-- | lib/network/monitor.pm | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/network/monitor.pm b/lib/network/monitor.pm index 0639e6f..2b0ba94 100644 --- a/lib/network/monitor.pm +++ b/lib/network/monitor.pm @@ -67,14 +67,15 @@ sub list_wireless { $qual =~ s!/0+$!/255!; #- prism54 reports quality with division by zero $qual =~ m!/! ? eval($qual)*100 : $qual; }; - my ($has_key, $has_wpa); + my ($has_key, $has_wpa, $has_eap); foreach (@list) { if ((/^\s*$/ || /Cell/) && exists $net->{ap}) { $net->{current} = to_bool($net->{ap} ? $net->{ap} eq $current_ap : $net->{essid} && $net->{essid} eq $current_essid); $net->{flags} = $has_wpa ? '[WPA]' : $has_key ? '[WEP]' : ''; + $net->{flags} .= '[EAP]' if $has_eap; $networks{$net->{ap}} = $net; $net = {}; - $has_key = $has_wpa = undef; + $has_key = $has_wpa = $has_eap = undef; } /Address: (.*)/ and $net->{ap} = lc($1); /ESSID:"(.*?)"/ and $net->{essid} = $1; @@ -84,6 +85,7 @@ sub list_wireless { m|Signal level:([0-9]+/[0-9]+)| && !$net->{signal_strength} and $net->{signal_strength} = eval($1)*100; /key:(\S*)\s/ && $1 eq 'on' and $has_key = 1; /Extra:wpa_ie=|IE:.*WPA/ and $has_wpa = 1; + /Authentication Suites \(\d+\) :.*\b802\.1x\b/ and $has_eap = 1; } if ($current_ap && exists $networks{$current_ap}) { foreach (`/sbin/iwconfig $o_intf 2>/dev/null`) { |