mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 11:25:00 +00:00
Bug 1023115 - Add retry count for EAP connection error. r=vchang
This commit is contained in:
parent
a72ee3c3fb
commit
2c4e446c07
@ -630,7 +630,7 @@ var WifiManager = (function() {
|
||||
if (!dhcpInfo) {
|
||||
if (++manager.dhcpFailuresCount >= MAX_RETRIES_ON_DHCP_FAILURE) {
|
||||
manager.dhcpFailuresCount = 0;
|
||||
notify("disconnected", {ssid: manager.connectionInfo.ssid});
|
||||
notify("disconnected", {connectionInfo: manager.connectionInfo});
|
||||
return;
|
||||
}
|
||||
// NB: We have to call disconnect first. Otherwise, we only reauth with
|
||||
@ -658,7 +658,7 @@ var WifiManager = (function() {
|
||||
|
||||
var driverEventMap = { STOPPED: "driverstopped", STARTED: "driverstarted", HANGED: "driverhung" };
|
||||
|
||||
manager.getCurrentNetworkId = function (ssid, callback) {
|
||||
manager.getNetworkId = function (ssid, callback) {
|
||||
manager.getConfiguredNetworks(function(networks) {
|
||||
if (!networks) {
|
||||
debug("Unable to get configured networks");
|
||||
@ -667,9 +667,10 @@ var WifiManager = (function() {
|
||||
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" ||
|
||||
// 1. network matching SSID if SSID is provided.
|
||||
// 2. current network if no SSID is provided, it's not guaranteed that
|
||||
// current network matches requested SSID.
|
||||
if ((!ssid && network.status === "CURRENT") ||
|
||||
(ssid && ssid === dequote(network.ssid))) {
|
||||
return callback(net);
|
||||
}
|
||||
@ -682,14 +683,20 @@ var WifiManager = (function() {
|
||||
if (event.indexOf("CTRL-EVENT-EAP-FAILURE") !== -1) {
|
||||
if (event.indexOf("EAP authentication failed") !== -1) {
|
||||
notify("passwordmaybeincorrect");
|
||||
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
|
||||
manager.authenticationFailuresCount = 0;
|
||||
notify("disconnected", {connectionInfo: manager.connectionInfo});
|
||||
}
|
||||
}
|
||||
return true;
|
||||
}
|
||||
if (event.indexOf("CTRL-EVENT-EAP-TLS-CERT-ERROR") !== -1) {
|
||||
// Cert Error
|
||||
manager.disconnect(function() {
|
||||
manager.reassociate(function(){});
|
||||
});
|
||||
notify("passwordmaybeincorrect");
|
||||
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
|
||||
manager.authenticationFailuresCount = 0;
|
||||
notify("disconnected", {connectionInfo: manager.connectionInfo});
|
||||
}
|
||||
return true;
|
||||
}
|
||||
if (event.indexOf("CTRL-EVENT-EAP-STARTED") !== -1) {
|
||||
@ -709,7 +716,7 @@ var WifiManager = (function() {
|
||||
notify("passwordmaybeincorrect");
|
||||
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
|
||||
manager.authenticationFailuresCount = 0;
|
||||
notify("disconnected", {ssid: manager.connectionInfo.ssid});
|
||||
notify("disconnected", {connectionInfo: manager.connectionInfo});
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -797,7 +804,7 @@ var WifiManager = (function() {
|
||||
var bssid = token.split("=")[1];
|
||||
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
|
||||
manager.authenticationFailuresCount = 0;
|
||||
notify("disconnected", {ssid: manager.connectionInfo.ssid});
|
||||
notify("disconnected", {connectionInfo: manager.connectionInfo});
|
||||
}
|
||||
manager.connectionInfo.bssid = null;
|
||||
manager.connectionInfo.ssid = null;
|
||||
@ -809,7 +816,7 @@ var WifiManager = (function() {
|
||||
notify("passwordmaybeincorrect");
|
||||
if (manager.authenticationFailuresCount > MAX_RETRIES_ON_AUTHENTICATION_FAILURE) {
|
||||
manager.authenticationFailuresCount = 0;
|
||||
notify("disconnected", {ssid: manager.connectionInfo.ssid});
|
||||
notify("disconnected", {connectionInfo: manager.connectionInfo});
|
||||
}
|
||||
return true;
|
||||
}
|
||||
@ -1223,7 +1230,7 @@ var WifiManager = (function() {
|
||||
var errors = 0;
|
||||
for (var n = 1; n < lines.length; ++n) {
|
||||
var result = lines[n].split("\t");
|
||||
var netId = result[0];
|
||||
var netId = parseInt(result[0], 10);
|
||||
var config = networks[netId] = { netId: netId };
|
||||
switch (result[3]) {
|
||||
case "[CURRENT]":
|
||||
@ -1407,7 +1414,7 @@ var WifiManager = (function() {
|
||||
manager.loopDetectionCount++;
|
||||
}
|
||||
if (manager.loopDetectionCount > MAX_SUPPLICANT_LOOP_ITERATIONS) {
|
||||
notify("disconnected", {ssid: manager.connectionInfo.ssid});
|
||||
notify("disconnected", {connectionInfo: manager.connectionInfo});
|
||||
manager.loopDetectionCount = 0;
|
||||
}
|
||||
}
|
||||
@ -2020,10 +2027,12 @@ function WifiWorker() {
|
||||
self._needToEnableNetworks = false;
|
||||
}
|
||||
|
||||
WifiManager.getCurrentNetworkId(this.ssid, function(netId) {
|
||||
let connectionInfo = this.connectionInfo;
|
||||
WifiManager.getNetworkId(connectionInfo.ssid, function(netId) {
|
||||
// Trying to get netId from current network.
|
||||
if (!netId &&
|
||||
self.currentNetwork &&
|
||||
self.currentNetwork.ssid == dequote(connectionInfo.ssid) &&
|
||||
typeof self.currentNetwork.netId !== "undefined") {
|
||||
netId = self.currentNetwork.netId;
|
||||
}
|
||||
@ -3126,6 +3135,11 @@ WifiWorker.prototype = {
|
||||
this._reconnectOnDisconnect = (this.currentNetwork &&
|
||||
(this.currentNetwork.ssid === ssid));
|
||||
WifiManager.removeNetwork(configured.netId, function(ok) {
|
||||
if (self._needToEnableNetworks) {
|
||||
self._enableAllNetworks();
|
||||
self._needToEnableNetworks = false;
|
||||
}
|
||||
|
||||
if (!ok) {
|
||||
self._sendMessage(message, false, "Unable to remove the network", msg);
|
||||
self._reconnectOnDisconnect = false;
|
||||
|
Loading…
Reference in New Issue
Block a user