diff options
author | mef@chromium.org <mef@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 03:13:21 +0000 |
---|---|---|
committer | mef@chromium.org <mef@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-04 03:13:21 +0000 |
commit | e09ef5becdb4edfe3851039fb5a8289f160fbee3 (patch) | |
tree | dab70c250d116d177624497e18a9061913dcbaaa /components/wifi/wifi_test.cc | |
parent | 77f43f93e32a3d9328329d8853f5e11f2a1909f8 (diff) | |
download | chromium_src-e09ef5becdb4edfe3851039fb5a8289f160fbee3.zip chromium_src-e09ef5becdb4edfe3851039fb5a8289f160fbee3.tar.gz chromium_src-e09ef5becdb4edfe3851039fb5a8289f160fbee3.tar.bz2 |
Use WiFi.Frequency property to set desired band for networkingPrivateApi.StartConnect().
BUG=267667
Review URL: https://codereview.chromium.org/86123003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238540 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'components/wifi/wifi_test.cc')
-rw-r--r-- | components/wifi/wifi_test.cc | 52 |
1 files changed, 38 insertions, 14 deletions
diff --git a/components/wifi/wifi_test.cc b/components/wifi/wifi_test.cc index 161eae3..eae084f 100644 --- a/components/wifi/wifi_test.cc +++ b/components/wifi/wifi_test.cc @@ -3,7 +3,6 @@ // found in the LICENSE file. #include <stdio.h> -#include <iostream> #include <string> #include "base/at_exit.h" @@ -65,15 +64,14 @@ class WiFiTest { WiFiTest::Result WiFiTest::Main(int argc, const char* argv[]) { if (!ParseCommandLine(argc, argv)) { - fprintf(stderr, - "usage: %s [--list]" - " [--get_properties]" - " [--connect]" - " [--disconnect]" - " [--network_guid=<network_guid>]" - " [--frequency=0|2400|5000]" - " [<network_guid>]\n", - argv[0]); + VLOG(0) << "Usage: " << argv[0] << + " [--list]" + " [--get_properties]" + " [--connect]" + " [--disconnect]" + " [--network_guid=<network_guid>]" + " [--frequency=0|2400|5000]" + " [<network_guid>]\n"; return RESULT_WRONG_USAGE; } @@ -88,6 +86,8 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) { const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); std::string network_guid = parsed_command_line.GetSwitchValueASCII("network_guid"); + std::string frequency = + parsed_command_line.GetSwitchValueASCII("frequency"); if (parsed_command_line.GetArgs().size() == 1) { #if defined(OS_WIN) @@ -113,7 +113,7 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) { if (parsed_command_line.HasSwitch("list")) { ListValue network_list; wifi_service->GetVisibleNetworks(std::string(), &network_list); - std::cout << network_list; + VLOG(0) << network_list; return true; } @@ -122,16 +122,35 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) { DictionaryValue properties; std::string error; wifi_service->GetProperties(network_guid, &properties, &error); - std::cout << error << ":\n" << properties; + VLOG(0) << error << ":\n" << properties; return true; } } + // Optional properties (frequency, password) to use for connect. + scoped_ptr<DictionaryValue> connect_properties(new DictionaryValue()); + + if (parsed_command_line.HasSwitch("frequency")) { + int value = 0; + if (!network_guid.empty() && + !frequency.empty() && + base::StringToInt(frequency, &value)) { + connect_properties->SetInteger("WiFi.Frequency", value); + // fall through to connect. + } + } + if (parsed_command_line.HasSwitch("connect")) { if (network_guid.length() > 0) { std::string error; + if (!connect_properties->empty()) { + VLOG(0) << "Using connect properties: " << *connect_properties; + wifi_service->SetProperties(network_guid, + connect_properties.Pass(), + &error); + } wifi_service->StartConnect(network_guid, &error); - std::cout << error; + VLOG(0) << error; return true; } } @@ -140,7 +159,7 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) { if (network_guid.length() > 0) { std::string error; wifi_service->StartDisconnect(network_guid, &error); - std::cout << error; + VLOG(0) << error; return true; } } @@ -151,6 +170,11 @@ bool WiFiTest::ParseCommandLine(int argc, const char* argv[]) { } // namespace wifi int main(int argc, const char* argv[]) { + CommandLine::Init(argc, argv); + logging::LoggingSettings settings; + settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG; + logging::InitLogging(settings); + wifi::WiFiTest wifi_test; return wifi_test.Main(argc, argv); } |