mirror of
https://github.com/roytam1/palemoon27.git
synced 2026-05-26 14:30:27 +00:00
6bedaf2149
- Bug 1193050 - Update the copy of GentiumPlus used in font-inspector test. r=jdaggett (253fce5764)
- align tests (5b817116a0)
- Bug 1246106 - pass aStyleBorder as reference to ComputeBorderOverflow. r=mats (53ccaa1282)
- align tests (81b3943058)
- Bug 1269080 - Convert NS_ERROR to NS_WARNING when setting an invalid scheme in nsSimpleURI. r=mcmanus (cad86c963d)
- Bug 1248558 - "[Static Analysis][Unintentional integer overflow][CacheFile.cpp::PreloadChunk, CacheFile.cpp::GetChunkLocked]". r=michal (6a9e34dfbe)
- Bug 1121672 - Make CacheFile::IsDoomed() protect mHandle with lock, r=michal (9e925b903a)
- Bug 1253040 - Do not write metadata if CacheFile is killed, r=honzab (c0378088b2)
- grammar as 1268922 (c801618b1d)
- Bug 1247548 - Changed nsCookieService::EnsureReadComplete and nsCookieService::PurgeCookeis to allocate nsTArray instead of AutoTArray. r=jdm (0e2bb0465e)
- var-let (1702e664dc)
- Bug 1233813 - Fix mDNS bug in resolving services with no TXT records. r=schien (4ce7e5fca0)
- Bug 1266632 - Add a null check in nsHostResolver::SizeOfIncludingThis. r=sworkman. (035d4a7130)
- Bug 1267000 - null deref with spdy proxy r=hurley (099db40d0f)
- Bug 1240932 - figure out 'network id' on Linux. r=mcmanus (47ceb12a70)
- Bug 1240932: add Telemetry to record network id successes, r=mcmanus (6985d1a4ce)
- Bug 1205158 - Use channel->Open2() netwerk/test/ (r=sicking) (64de01cda3)
- Bug 1240932 - figure out 'network id' on OS X, r=mcmanus (7ee4875835)
- Bug 1240932 - figure out 'network id' on Windows, r=mcmanus (3227a81c14)
- Bug 1188644 - Use channel->ascynOpen2 in netwerk/test (r=mcmanus) (7097897cdc)
- Bug 1264887: |nsWifiScannerDBus|: Hold DBusMessage references in |RefPtr|, r=josh (7e68e8663f)
- Bug 1196638 - Infer the proper button for synthesized mouse clicks on all callsites. r=jmaher (838230baaa)
- Bug 1258532 - Port test_bug574596.html to mochitest-plain in order to enable it on e10s; r=mrbkap (ae5693ab54)
- Bug 1252855 - allow setting a specific list of prefs from the content process, r=mrbkap,margaret,haik (b13645826a)
- Bug 1215965 - Remove use of non-standard features from toolkit/components/social/SocialService.jsm. r=mixedpuppy (a1d79f295c)
- ship cmpiler for XP (ac60884173)
- Bug 1262814 - Warn on Wlanapi.dll load or init fail, don't fail assertion, r=mcmanus (aa1335320a)
- Bug 1137151: Marked destructors of ref-counted time-zone classes as protected, r=dhylands (5668226442)
- Bug 1225549 - Modify the data type of mThreshold of NetworkParams to long long from long. r=ettseng (7164a517ac)
- Bug 1139805 - B2G NetworkManager: move NetworkManager.js out of EXTRA_PP_COMPONENTS in moz.build. r=echen (e857f53cfc)
- Bug 1087608 - ensuring multitap gestures do not resolve to explore. r=eeejay (6c4b603738)
- bug 1259023 - make nsIAccessible.{Next,Prev}Sibling work with proxied accessibles r=yzen (84b47a82e0)
- bug 1259023 - make nsIAccessible.indexInParent work on proxied accessibles r=yzen (3531b45e35)
- bug 1250882 - implement xpcAccessible::GetState() for proxied accessibles r=davidb (5e58214441)
- bug 1250882 - implement xpcAccessible::Name() for proxied accessibles r=davidb (4b11af6ecc)
- bug 1250882 - implement xpcAccessible::GetDescription() for proxied accessibles r=davidb (d0d0e133fb)
- bug 1250882 - implement xpcAccessible::GetLanguage() for proxied accessibles r=davidb (88e98a5b24)
- bug 1250882 - implement xpcAccessible::GetValue() for proxied accessibles r=davidb (9ad4347d45)
- bug 1250882 - implement xpcAccessible::GetBounds() for proxied accessibles r=davidb (e67f7c551b)
- Bug 1249930 - menupoup shouldn't look for children in XBL anonymous content, r=davidb (14b3e39954)
- Bug 1243233 - Test ALLOW_COMPILER_WARNINGS instead of WARNINGS_AS_ERRORS, and move it to after it is set, r=glandium (216c407d20)
- Bug 1245992 - Update the Safe Browsing phishing interstitial page. r=flod,past (80afbfc6c9)
- Bug 1245260 - Ignore redundant calls to RestyleManager::IncrementAnimationGeneration; r=dbaron (e35571b613)
- Bug 1182778, r=margaret,f=bz (b379c97f8e)
- Bug 1258212 - Hook the parent up to the cild for registerContentHandler. r=gwright (039c75d4d5)
338 lines
9.2 KiB
C++
338 lines
9.2 KiB
C++
/* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
|
|
|
|
#include "nsWifiScannerDBus.h"
|
|
#include "mozilla/ipc/DBusMessageRefPtr.h"
|
|
#include "nsWifiAccessPoint.h"
|
|
|
|
namespace mozilla {
|
|
|
|
nsWifiScannerDBus::nsWifiScannerDBus(nsCOMArray<nsWifiAccessPoint> *aAccessPoints)
|
|
: mAccessPoints(aAccessPoints)
|
|
{
|
|
MOZ_ASSERT(mAccessPoints);
|
|
|
|
mConnection =
|
|
already_AddRefed<DBusConnection>(dbus_bus_get(DBUS_BUS_SYSTEM, nullptr));
|
|
MOZ_ASSERT(mConnection);
|
|
dbus_connection_set_exit_on_disconnect(mConnection, false);
|
|
|
|
MOZ_COUNT_CTOR(nsWifiScannerDBus);
|
|
}
|
|
|
|
nsWifiScannerDBus::~nsWifiScannerDBus()
|
|
{
|
|
MOZ_COUNT_DTOR(nsWifiScannerDBus);
|
|
}
|
|
|
|
nsresult
|
|
nsWifiScannerDBus::Scan()
|
|
{
|
|
return SendMessage("org.freedesktop.NetworkManager",
|
|
"/org/freedesktop/NetworkManager",
|
|
"GetDevices");
|
|
}
|
|
|
|
nsresult
|
|
nsWifiScannerDBus::SendMessage(const char* aInterface,
|
|
const char* aPath,
|
|
const char* aFuncCall)
|
|
{
|
|
RefPtr<DBusMessage> msg = already_AddRefed<DBusMessage>(
|
|
dbus_message_new_method_call("org.freedesktop.NetworkManager",
|
|
aPath, aInterface, aFuncCall));
|
|
if (!msg) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
DBusMessageIter argsIter;
|
|
dbus_message_iter_init_append(msg, &argsIter);
|
|
|
|
if (!strcmp(aFuncCall, "Get")) {
|
|
const char* paramInterface = "org.freedesktop.NetworkManager.Device";
|
|
if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING,
|
|
¶mInterface)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
const char* paramDeviceType = "DeviceType";
|
|
if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING,
|
|
¶mDeviceType)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
} else if (!strcmp(aFuncCall, "GetAll")) {
|
|
const char* param = "";
|
|
if (!dbus_message_iter_append_basic(&argsIter, DBUS_TYPE_STRING, ¶m)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
}
|
|
|
|
DBusError err;
|
|
dbus_error_init(&err);
|
|
|
|
// http://dbus.freedesktop.org/doc/api/html/group__DBusConnection.html
|
|
// Refer to function dbus_connection_send_with_reply_and_block.
|
|
const uint32_t DBUS_DEFAULT_TIMEOUT = -1;
|
|
RefPtr<DBusMessage> reply = already_AddRefed<DBusMessage>(
|
|
dbus_connection_send_with_reply_and_block(mConnection, msg,
|
|
DBUS_DEFAULT_TIMEOUT, &err));
|
|
if (dbus_error_is_set(&err)) {
|
|
dbus_error_free(&err);
|
|
|
|
// In the GetAccessPoints case, if there are no access points, error is set.
|
|
// We don't want to error out here.
|
|
if (!strcmp(aFuncCall, "GetAccessPoints")) {
|
|
return NS_OK;
|
|
}
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
nsresult rv;
|
|
if (!strcmp(aFuncCall, "GetDevices")) {
|
|
rv = IdentifyDevices(reply);
|
|
} else if (!strcmp(aFuncCall, "Get")) {
|
|
rv = IdentifyDeviceType(reply, aPath);
|
|
} else if (!strcmp(aFuncCall, "GetAccessPoints")) {
|
|
rv = IdentifyAccessPoints(reply);
|
|
} else if (!strcmp(aFuncCall, "GetAll")) {
|
|
rv = IdentifyAPProperties(reply);
|
|
} else {
|
|
rv = NS_ERROR_FAILURE;
|
|
}
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsWifiScannerDBus::IdentifyDevices(DBusMessage* aMsg)
|
|
{
|
|
DBusMessageIter iter;
|
|
nsresult rv = GetDBusIterator(aMsg, &iter);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
const char* devicePath;
|
|
do {
|
|
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_OBJECT_PATH) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
dbus_message_iter_get_basic(&iter, &devicePath);
|
|
if (!devicePath) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
rv = SendMessage("org.freedesktop.DBus.Properties", devicePath, "Get");
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
} while (dbus_message_iter_next(&iter));
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsWifiScannerDBus::IdentifyDeviceType(DBusMessage* aMsg, const char* aDevicePath)
|
|
{
|
|
DBusMessageIter args;
|
|
if (!dbus_message_iter_init(aMsg, &args)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
if (dbus_message_iter_get_arg_type(&args) != DBUS_TYPE_VARIANT) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
DBusMessageIter variantIter;
|
|
dbus_message_iter_recurse(&args, &variantIter);
|
|
if (dbus_message_iter_get_arg_type(&variantIter) != DBUS_TYPE_UINT32) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
uint32_t deviceType;
|
|
dbus_message_iter_get_basic(&variantIter, &deviceType);
|
|
|
|
// http://projects.gnome.org/NetworkManager/developers/api/07/spec-07.html
|
|
// Refer to NM_DEVICE_TYPE_WIFI under NM_DEVICE_TYPE.
|
|
const uint32_t NM_DEVICE_TYPE_WIFI = 2;
|
|
nsresult rv = NS_OK;
|
|
if (deviceType == NM_DEVICE_TYPE_WIFI) {
|
|
rv = SendMessage("org.freedesktop.NetworkManager.Device.Wireless",
|
|
aDevicePath, "GetAccessPoints");
|
|
}
|
|
|
|
return rv;
|
|
}
|
|
|
|
nsresult
|
|
nsWifiScannerDBus::IdentifyAccessPoints(DBusMessage* aMsg)
|
|
{
|
|
DBusMessageIter iter;
|
|
nsresult rv = GetDBusIterator(aMsg, &iter);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
const char* path;
|
|
do {
|
|
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_OBJECT_PATH) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
dbus_message_iter_get_basic(&iter, &path);
|
|
if (!path) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
rv = SendMessage("org.freedesktop.DBus.Properties", path, "GetAll");
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
} while (dbus_message_iter_next(&iter));
|
|
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsWifiScannerDBus::IdentifyAPProperties(DBusMessage* aMsg)
|
|
{
|
|
DBusMessageIter arr;
|
|
nsresult rv = GetDBusIterator(aMsg, &arr);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
RefPtr<nsWifiAccessPoint> ap = new nsWifiAccessPoint();
|
|
do {
|
|
DBusMessageIter dict;
|
|
dbus_message_iter_recurse(&arr, &dict);
|
|
|
|
do {
|
|
const char* key;
|
|
dbus_message_iter_get_basic(&dict, &key);
|
|
if (!key) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
dbus_message_iter_next(&dict);
|
|
|
|
DBusMessageIter variant;
|
|
dbus_message_iter_recurse(&dict, &variant);
|
|
|
|
if (!strncmp(key, "Ssid", strlen("Ssid"))) {
|
|
nsresult rv = StoreSsid(&variant, ap);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
break;
|
|
}
|
|
|
|
if (!strncmp(key, "HwAddress", strlen("HwAddress"))) {
|
|
nsresult rv = SetMac(&variant, ap);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
break;
|
|
}
|
|
|
|
if (!strncmp(key, "Strength", strlen("Strength"))) {
|
|
if (dbus_message_iter_get_arg_type(&variant) != DBUS_TYPE_BYTE) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
uint8_t strength;
|
|
dbus_message_iter_get_basic(&variant, &strength);
|
|
ap->setSignal(strength);
|
|
}
|
|
} while (dbus_message_iter_next(&dict));
|
|
} while (dbus_message_iter_next(&arr));
|
|
|
|
mAccessPoints->AppendObject(ap);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsWifiScannerDBus::StoreSsid(DBusMessageIter* aVariant, nsWifiAccessPoint* aAp)
|
|
{
|
|
if (dbus_message_iter_get_arg_type(aVariant) != DBUS_TYPE_ARRAY) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
DBusMessageIter variantMember;
|
|
dbus_message_iter_recurse(aVariant, &variantMember);
|
|
|
|
const uint32_t MAX_SSID_LEN = 32;
|
|
char ssid[MAX_SSID_LEN];
|
|
memset(ssid, '\0', ArrayLength(ssid));
|
|
uint32_t i = 0;
|
|
do {
|
|
if (dbus_message_iter_get_arg_type(&variantMember) != DBUS_TYPE_BYTE) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
dbus_message_iter_get_basic(&variantMember, &ssid[i]);
|
|
i++;
|
|
} while (dbus_message_iter_next(&variantMember) && i < MAX_SSID_LEN);
|
|
|
|
aAp->setSSID(ssid, i);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsWifiScannerDBus::SetMac(DBusMessageIter* aVariant, nsWifiAccessPoint* aAp)
|
|
{
|
|
if (dbus_message_iter_get_arg_type(aVariant) != DBUS_TYPE_STRING) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
// hwAddress format is XX:XX:XX:XX:XX:XX. Need to convert to XXXXXX format.
|
|
char* hwAddress;
|
|
dbus_message_iter_get_basic(aVariant, &hwAddress);
|
|
if (!hwAddress) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
const uint32_t MAC_LEN = 6;
|
|
uint8_t macAddress[MAC_LEN];
|
|
char* token = strtok(hwAddress, ":");
|
|
for (uint32_t i = 0; i < ArrayLength(macAddress); i++) {
|
|
if (!token) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
macAddress[i] = strtoul(token, nullptr, 16);
|
|
token = strtok(nullptr, ":");
|
|
}
|
|
aAp->setMac(macAddress);
|
|
return NS_OK;
|
|
}
|
|
|
|
nsresult
|
|
nsWifiScannerDBus::GetDBusIterator(DBusMessage* aMsg,
|
|
DBusMessageIter* aIterArray)
|
|
{
|
|
DBusMessageIter iter;
|
|
if (!dbus_message_iter_init(aMsg, &iter)) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
if (dbus_message_iter_get_arg_type(&iter) != DBUS_TYPE_ARRAY) {
|
|
return NS_ERROR_FAILURE;
|
|
}
|
|
|
|
dbus_message_iter_recurse(&iter, aIterArray);
|
|
return NS_OK;
|
|
}
|
|
|
|
} // mozilla
|
|
|
|
nsresult
|
|
nsWifiMonitor::DoScan()
|
|
{
|
|
nsCOMArray<nsWifiAccessPoint> accessPoints;
|
|
mozilla::nsWifiScannerDBus wifiScanner(&accessPoints);
|
|
nsCOMArray<nsWifiAccessPoint> lastAccessPoints;
|
|
|
|
while (mKeepGoing) {
|
|
accessPoints.Clear();
|
|
nsresult rv = wifiScanner.Scan();
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
bool accessPointsChanged = !AccessPointsEqual(accessPoints,
|
|
lastAccessPoints);
|
|
ReplaceArray(lastAccessPoints, accessPoints);
|
|
|
|
rv = CallWifiListeners(lastAccessPoints, accessPointsChanged);
|
|
NS_ENSURE_SUCCESS(rv, rv);
|
|
|
|
LOG(("waiting on monitor\n"));
|
|
mozilla::ReentrantMonitorAutoEnter mon(mReentrantMonitor);
|
|
mon.Wait(PR_SecondsToInterval(kDefaultWifiScanInterval));
|
|
}
|
|
|
|
return NS_OK;
|
|
}
|