Mageia Bugzilla – Attachment 6368 Details for
Bug 13685
Fix for seeing \x00 (repeated several times) instead of Mac address of a hidden network
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Requests
|
Help
|
Log In
[x]
|
New Account
|
Forgot Password
[patch]
3rd from the patch set
0003-improve-fix-as-tv-suggested-mga-13685.patch (text/plain), 1.58 KB, created by
Marja Van Waes
on 2015-04-27 11:21:00 CEST
(
hide
)
Description:
3rd from the patch set
Filename:
MIME Type:
Creator:
Marja Van Waes
Created:
2015-04-27 11:21:00 CEST
Size:
1.58 KB
patch
obsolete
>From 99920d3862830c16a07f61d5cee4303990bf093e Mon Sep 17 00:00:00 2001 >From: Marja van Waes <marja@mageia.org> >Date: Mon, 27 Apr 2015 11:14:48 +0200 >Subject: [PATCH 3/3] improve fix as tv suggested (mga#13685) > >--- > lib/network/monitor.pm | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) > >diff --git a/lib/network/monitor.pm b/lib/network/monitor.pm >index de08b79..b8e79c2 100644 >--- a/lib/network/monitor.pm >+++ b/lib/network/monitor.pm >@@ -35,9 +35,7 @@ sub list_wireless { > #- bssid / frequency / signal level / flags / ssid > while ($results =~ /^((?:[0-9a-f]{2}:){5}[0-9a-f]{2})\t(\d+)\t(-?\d+)\t(.*?)\t(.*)$/mg) { > my ($ap, $frequency, $signal_strength, $flags, $essid) = ($1, $2, $3, $4, $5); >- $_ = $essid; >- s/\\x00//g; >- $essid = $_; >+ $essid =~ s/\\x00//g; > $networks{$ap}{ap} ||= $ap; > #- wpa_supplicant may list the network two times, use ||= > $networks{$ap}{frequency} ||= $frequency; >@@ -92,9 +90,7 @@ sub list_wireless { > my ($has_key, $has_wpa, $has_eap); > foreach (@list) { > if ((/^\s*$/ || /Cell/) && exists $net->{ap}) { >- $_ = $net->{essid}; >- s/\\x00//g; >- $net->{essid} = $_; >+ $net->{essid} =~ s/\\x00//g; > $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; >-- >2.3.2 >
From 99920d3862830c16a07f61d5cee4303990bf093e Mon Sep 17 00:00:00 2001 From: Marja van Waes <marja@mageia.org> Date: Mon, 27 Apr 2015 11:14:48 +0200 Subject: [PATCH 3/3] improve fix as tv suggested (mga#13685) --- lib/network/monitor.pm | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/lib/network/monitor.pm b/lib/network/monitor.pm index de08b79..b8e79c2 100644 --- a/lib/network/monitor.pm +++ b/lib/network/monitor.pm @@ -35,9 +35,7 @@ sub list_wireless { #- bssid / frequency / signal level / flags / ssid while ($results =~ /^((?:[0-9a-f]{2}:){5}[0-9a-f]{2})\t(\d+)\t(-?\d+)\t(.*?)\t(.*)$/mg) { my ($ap, $frequency, $signal_strength, $flags, $essid) = ($1, $2, $3, $4, $5); - $_ = $essid; - s/\\x00//g; - $essid = $_; + $essid =~ s/\\x00//g; $networks{$ap}{ap} ||= $ap; #- wpa_supplicant may list the network two times, use ||= $networks{$ap}{frequency} ||= $frequency; @@ -92,9 +90,7 @@ sub list_wireless { my ($has_key, $has_wpa, $has_eap); foreach (@list) { if ((/^\s*$/ || /Cell/) && exists $net->{ap}) { - $_ = $net->{essid}; - s/\\x00//g; - $net->{essid} = $_; + $net->{essid} =~ s/\\x00//g; $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; -- 2.3.2
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 13685
:
5262
|
6354
|
6355
|
6363
|
6364
|
6365
|
6366
|
6367
| 6368 |
9207
|
9208
|
9217
|
9218
|
9349