Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 813880 - Unable to disable network when user connects to wep network with incorrect password. r=mrbkap

Browse Source
This commit is contained in:
Vincent Chang 2012-11-23 18:30:33 +08:00
parent 03938f4294
commit c31a587835
1 changed files with 40 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
dom/wifi/WifiWorker.js
View File

@ -803,6 +803,26 @@ var WifiManager = (function() {
var driverEventMap = { STOPPED: "driverstopped", STARTED: "driverstarted", HANGED: "driverhung" };
manager.getCurrentNetworkId = function (ssid, callback) {
manager.getConfiguredNetworks(function(networks) {
if (!networks) {
debug("Unable to get configured networks");
return callback(null);
}
for (let net in networks) {
let network = networks[net];
// Trying to get netId from
// 1. CURRENT network.
// 2. Trying to associate with SSID 'ssid' event
if (network.status === "CURRENT" ||
(ssid && ssid === dequote(network.ssid))) {
return callback(net);
}
}
callback(null);
});
}
// handle events sent to us by the event worker
function handleEvent(event) {
debug("Event coming in: " + event);
@ -812,8 +832,8 @@ var WifiManager = (function() {
if (event.indexOf("Association request to the driver failed") !== -1) {
notify("passwordmaybeincorrect");
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
notify("disconnected");
manager.authenticationFailuresCount = 0;
notify("disconnected", {ssid: manager.connectionInfo.ssid});
}
return true;
}
@ -887,21 +907,21 @@ var WifiManager = (function() {
if (eventData.indexOf("CTRL-EVENT-DISCONNECTED") === 0) {
var token = event.split(" ")[1];
var bssid = token.split("=")[1];
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
manager.authenticationFailuresCount = 0;
notify("disconnected", {ssid: manager.connectionInfo.ssid});
}
manager.connectionInfo.bssid = null;
manager.connectionInfo.ssid = null;
manager.connectionInfo.id = -1;
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
notify("disconnected", {BSSID: bssid});
manager.authenticationFailuresCount = 0;
}
return true;
}
// Association reject is triggered mostly on incorrect WEP key.
if (eventData.indexOf("CTRL-EVENT-ASSOC-REJECT") === 0) {
notify("passwordmaybeincorrect");
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
notify("disconnected");
manager.authenticationFailuresCount = 0;
notify("disconnected", {ssid: manager.connectionInfo.ssid});
}
return true;
}
@ -1339,7 +1359,7 @@ var WifiManager = (function() {
manager.loopDetectionCount++;
}
if (manager.loopDetectionCount > MAX_SUPPLICANT_LOOP_ITERATIONS) {
notify("disconnected");
notify("disconnected", {ssid: manager.connectionInfo.ssid});
manager.loopDetectionCount = 0;
}
}
@ -1802,16 +1822,19 @@ function WifiWorker() {
self._needToEnableNetworks = false;
}
var currentNetwork = self.currentNetwork;
if (currentNetwork && !isNaN(currentNetwork.netId)) {
// Disable the network when password is incorrect.
WifiManager.disableNetwork(currentNetwork.netId, function() {});
} else {
// TODO: We can't get netId when connecting to wep network with
// incorrect password, see Bug 813880
}
self._fireEvent("onconnectingfailed", {network: currentNetwork});
};
WifiManager.getCurrentNetworkId(this.ssid, function(netId) {
// Trying to get netId from current network.
if (!netId &&
self.currentNetwork &&
typeof self.currentNetwork.netId !== "undefined") {
netId = self.currentNetwork.netId;
}
if (netId) {
WifiManager.disableNetwork(netId, function() {});
}
});
self._fireEvent("onconnectingfailed", {network: self.currentNetwork});
}
WifiManager.onstatechange = function() {
debug("State change: " + this.prevState + " -> " + this.state);