Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1901)

Side by Side Diff: content/browser/geolocation/wifi_data_provider_common_win.cc

Issue 6597044: Revert 76228 - Move core pieces of geolocation from chrome to content.This is... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
(Empty)
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file.
4
5 #include "content/browser/geolocation/wifi_data_provider_common_win.h"
6
7 #include <assert.h>
8
9 #include "base/utf_string_conversions.h"
10 #include "content/browser/geolocation/device_data_provider.h"
11 #include "content/browser/geolocation/wifi_data_provider_common.h"
12
13 bool ConvertToAccessPointData(const NDIS_WLAN_BSSID& data,
14 AccessPointData *access_point_data) {
15 // Currently we get only MAC address, signal strength and SSID.
16 // TODO(steveblock): Work out how to get age, channel and signal-to-noise.
17 DCHECK(access_point_data);
18 access_point_data->mac_address = MacAddressAsString16(data.MacAddress);
19 access_point_data->radio_signal_strength = data.Rssi;
20 // Note that _NDIS_802_11_SSID::Ssid::Ssid is not null-terminated.
21 UTF8ToUTF16(reinterpret_cast<const char*>(data.Ssid.Ssid),
22 data.Ssid.SsidLength,
23 &access_point_data->ssid);
24 return true;
25 }
26
27 int GetDataFromBssIdList(const NDIS_802_11_BSSID_LIST& bss_id_list,
28 int list_size,
29 WifiData::AccessPointDataSet* data) {
30 // Walk through the BSS IDs.
31 int found = 0;
32 const uint8 *iterator = reinterpret_cast<const uint8*>(&bss_id_list.Bssid[0]);
33 const uint8 *end_of_buffer =
34 reinterpret_cast<const uint8*>(&bss_id_list) + list_size;
35 for (int i = 0; i < static_cast<int>(bss_id_list.NumberOfItems); ++i) {
36 const NDIS_WLAN_BSSID *bss_id =
37 reinterpret_cast<const NDIS_WLAN_BSSID*>(iterator);
38 // Check that the length of this BSS ID is reasonable.
39 if (bss_id->Length < sizeof(NDIS_WLAN_BSSID) ||
40 iterator + bss_id->Length > end_of_buffer) {
41 break;
42 }
43 AccessPointData access_point_data;
44 if (ConvertToAccessPointData(*bss_id, &access_point_data)) {
45 data->insert(access_point_data);
46 ++found;
47 }
48 // Move to the next BSS ID.
49 iterator += bss_id->Length;
50 }
51 return found;
52 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698