wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 729943 - Fix a potential race if b2g died between associating to the access point and running DHCP. Also move state tracking to the manager. r=cjones

Browse Source
This commit is contained in:
Blake Kaplan 2012-02-23 18:27:57 +01:00
parent 711bc6ec6e
commit 3e93e6981c
1 changed files with 63 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
dom/wifi/nsWifiWorker.js
View File

@ -483,7 +483,13 @@ var WifiManager = (function() {
}
}
function parseStatus(status) {
function notifyStateChange(fields) {
fields.prevState = manager.state;
manager.state = fields.state;
notify("statechange", fields);
}
function parseStatus(status, reconnected) {
if (status === null) {
debug("Unable to get wpa supplicant's status");
return;
@ -493,9 +499,9 @@ var WifiManager = (function() {
for (let i = 0; i < lines.length; ++i) {
let [key, value] = lines[i].split("=");
if (key === "wpa_state") {
notify("statechange", { state: value });
notifyStateChange({ state: value });
if (value === "COMPLETED")
onconnected();
onconnected(reconnected);
}
}
}
@ -507,11 +513,7 @@ var WifiManager = (function() {
if (ok === 0) {
// Tell the event worker to start waiting for events.
retryTimer = null;
waitForEvent();
notify("supplicantconnection");
// Load up the supplicant state.
statusCommand(parseStatus);
didConnectSupplicant(false, function(){});
return;
}
if (connectTries++ < 3) {
@ -530,10 +532,14 @@ var WifiManager = (function() {
}
manager.start = function() {
connectToSupplicant(connectCallback);
// If we reconnected to an already-running supplicant, then manager.state
// will have already been updated to the supplicant's state. Otherwise, we
// started the supplicant ourselves and need to connect.
if (manager.state === "UNINITIALIZED")
connectToSupplicant(connectCallback);
}
function onconnected() {
function dhcpAfterConnect() {
runDhcp(manager.ifname, function (data) {
if (!data) {
debug("DHCP failed to run");
@ -564,6 +570,30 @@ var WifiManager = (function() {
});
}
function onconnected(reconnected) {
if (!reconnected) {
dhcpAfterConnect();
return;
}
// We're in the process of reconnecting to a pre-existing wpa_supplicant.
// Check to see if there was already a DHCP process:
getProperty("init.svc.dhcpcd_" + manager.ifname, "stopped", function(value) {
if (value === "running") {
return;
}
// Some phones use a different property name for the dhcpcd daemon.
getProperty("init.svc.dhcpcd", "stopped", function(value) {
if (value === "running") {
return;
}
dhcpAfterConnect();
});
});
}
var supplicantStatesMap = ["DISCONNECTED", "INACTIVE", "SCANNING", "ASSOCIATING",
"ASSOCIATED", "FOUR_WAY_HANDSHAKE", "GROUP_HANDSHAKE",
"COMPLETED", "DORMANT", "UNINITIALIZED"];
@ -595,7 +625,7 @@ var WifiManager = (function() {
if (!("state" in fields))
return true;
fields.state = supplicantStatesMap[fields.state];
notify("statechange", fields);
notifyStateChange(fields);
return true;
}
if (eventData.indexOf("CTRL-EVENT-DRIVER-STATE") === 0) {
@ -620,15 +650,15 @@ var WifiManager = (function() {
return false;
}
if (eventData.indexOf("CTRL-EVENT-DISCONNECTED") === 0) {
notify("statechange", { state: "DISCONNECTED" });
notifyStateChange({ state: "DISCONNECTED" });
return true;
}
if (eventData.indexOf("CTRL-EVENT-CONNECTED") === 0) {
// Format: CTRL-EVENT-CONNECTED - Connection to 00:1e:58:ec:d5:6d completed (reauth) [id=1 id_str=]
var bssid = eventData.split(" ")[4];
var id = eventData.substr(eventData.indexOf("id=")).split(" ")[0];
notify("statechange", { state: "CONNECTED", BSSID: bssid, id: id });
onconnected();
notifyStateChange({ state: "CONNECTED", BSSID: bssid, id: id });
onconnected(false);
return true;
}
if (eventData.indexOf("CTRL-EVENT-SCAN-RESULTS") === 0) {
@ -670,6 +700,17 @@ var WifiManager = (function() {
setProperty("ctl.stop", "wpa_supplicant", tick);
}
function didConnectSupplicant(reconnected, callback) {
waitForEvent();
notify("supplicantconnection");
// Load up the supplicant state.
statusCommand(function(status) {
parseStatus(status, reconnected);
callback();
});
}
function prepareForStartup(callback) {
// First, check to see if there's a wpa_supplicant running that we can
// connect to.
@ -686,7 +727,11 @@ var WifiManager = (function() {
if (retval === 0) {
// Successfully reconnected! Don't do anything else.
debug("Successfully connected!");
callback(true);
// It is important that we call parseStatus (in
// didConnectSupplicant) before calling the callback here.
// Otherwise, WifiManager.start will reconnect to it.
didConnectSupplicant(true, function() { callback(true) });
return;
}
@ -701,6 +746,7 @@ var WifiManager = (function() {
// Initial state
var airplaneMode = false;
manager.state = "UNINITIALIZED";
// Public interface of the wifi service
manager.setWifiEnabled = function(enable, callback) {
@ -889,14 +935,12 @@ function nsWifiWorker() {
var self = this;
this.state = null;
this.networks = Object.create(null);
WifiManager.onstatechange = function() {
debug("State change: " + self.state + " -> " + this.state);
self.state = this.state;
debug("State change: " + this.prevState + " -> " + this.state);
// TODO Worth adding a more generic API for this?
if (self.state === "INACTIVE")
if (this.state === "INACTIVE")
connectToMozilla();
}