summaryrefslogtreecommitdiffstats
path: root/lib/network
diff options
context:
space:
mode:
authorEugeni Dodonov <eugeni@mandriva.org>2009-10-27 13:45:24 +0000
committerEugeni Dodonov <eugeni@mandriva.org>2009-10-27 13:45:24 +0000
commitd75832220b42f1a93af510d27a31ce84d5c28a82 (patch)
tree98d4cd64cb6fd043fae54cf90dee11312ecde6ba /lib/network
parent8a762d3e97e6fe1bc11e4f09fe93c3f203fd93f3 (diff)
downloaddrakx-net-d75832220b42f1a93af510d27a31ce84d5c28a82.tar
drakx-net-d75832220b42f1a93af510d27a31ce84d5c28a82.tar.gz
drakx-net-d75832220b42f1a93af510d27a31ce84d5c28a82.tar.bz2
drakx-net-d75832220b42f1a93af510d27a31ce84d5c28a82.tar.xz
drakx-net-d75832220b42f1a93af510d27a31ce84d5c28a82.zip
Ignoring non-fatal wpa_supplicant messages (#54002)
Diffstat (limited to 'lib/network')
-rw-r--r--lib/network/connection_manager.pm18
1 files changed, 10 insertions, 8 deletions
diff --git a/lib/network/connection_manager.pm b/lib/network/connection_manager.pm
index 33ca700..827da6f 100644
--- a/lib/network/connection_manager.pm
+++ b/lib/network/connection_manager.pm
@@ -484,14 +484,16 @@ sub setup_dbus_handlers {
if ($msg->get_interface eq 'com.mandriva.monitoring.wireless' && $msg->get_member eq 'Event') {
my ($event, $interface) = $msg->get_args_list;
print "got wireless event: $event $interface\n";
- my $cmanager = find { $_->{connection}->get_interface eq $interface } @$cmanagers;
- if ($cmanager && $cmanager->{wait_message}) {
- # CTRL-EVENT-CONNECTED does not have to be handled, further status will be handled by interface status code
- if ($event =~ /Authentication with (.+?) timed out/) {
- undef $cmanager->{wait_message};
- $cmanager->{in}->ask_warn(N("Error"), N("Connection failed."));
- }
- }
+ # eugeni: wpa_supplicant seems to issue 'Authentication..timed out messages' even if they
+ # are not fatal (#54002). We should either handle them with more care, or just ignore them altogether
+# my $cmanager = find { $_->{connection}->get_interface eq $interface } @$cmanagers;
+# if ($cmanager && $cmanager->{wait_message}) {
+# # CTRL-EVENT-CONNECTED does not have to be handled, further status will be handled by interface status code
+# if ($event =~ /Authentication with (.+?) timed out/) {
+# undef $cmanager->{wait_message};
+# $cmanager->{in}->ask_warn(N("Error"), N("Connection failed."));
+# }
+# }
}
});
$dbus->{connection}->add_match("type='signal',interface='com.mandriva.network'");