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

Unified Diff: components/arc/net/arc_net_host_impl.cc

Issue 1925083003: Notify ARC of default network changes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@wifi-change
Patch Set: cache default_network_ changes even if ARC isn't connected yet Created 4 years, 7 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 side-by-side diff with in-line comments
Download patch
« components/arc/common/net.mojom ('K') | « components/arc/net/arc_net_host_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/arc/net/arc_net_host_impl.cc
diff --git a/components/arc/net/arc_net_host_impl.cc b/components/arc/net/arc_net_host_impl.cc
index 2c57bbaefe4aea24039ed0d2ae277f6c298889b7..0261ef4706ef91df90393b3e3bbc989789c24c52 100644
--- a/components/arc/net/arc_net_host_impl.cc
+++ b/components/arc/net/arc_net_host_impl.cc
@@ -366,6 +366,249 @@ void ArcNetHostImpl::ScanCompleted(const chromeos::DeviceState* /*unused*/) {
arc_bridge_service()->net_instance()->ScanCompleted();
}
+mojom::WiFiPtr TranslateONCWifi(const base::DictionaryValue* dict) {
+ mojom::WiFiPtr mojo = mojom::WiFi::New();
+ std::string tmp;
+
+ if (!dict->GetInteger(onc::wifi::kFrequency, &mojo->frequency))
+ NOTREACHED();
+
+ if (!dict->GetString(onc::wifi::kBSSID, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ mojo->bssid = tmp;
+
+ tmp.clear();
+ if (!dict->GetString(onc::wifi::kHexSSID, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ mojo->hex_ssid = tmp;
+
+ if (!dict->GetBoolean(onc::wifi::kHiddenSSID, &mojo->hidden_ssid))
+ NOTREACHED();
+
+ tmp.clear();
+ if (!dict->GetString(onc::wifi::kSecurity, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ if (tmp == onc::wifi::kWEP_PSK)
+ mojo->security = mojom::SecurityType::WEP_PSK;
+ else if (tmp == onc::wifi::kWEP_8021X)
+ mojo->security = mojom::SecurityType::WEP_8021X;
+ else if (tmp == onc::wifi::kWPA_PSK)
+ mojo->security = mojom::SecurityType::WPA_PSK;
+ else if (tmp == onc::wifi::kWPA_EAP)
+ mojo->security = mojom::SecurityType::WPA_EAP;
+ else
+ NOTREACHED();
+
+ if (!dict->GetInteger(onc::wifi::kSignalStrength, &mojo->signal_strength))
+ NOTREACHED();
+
+ return mojo;
+}
+
+mojo::Array<mojo::String> TranslateStringArray(const base::ListValue* list) {
+ mojo::Array<mojo::String> mojos = mojo::Array<mojo::String>::New(0);
+
+ for (size_t i = 0; i < list->GetSize(); i++) {
+ std::string tmp;
+ if (!list->GetString(i, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+
+ mojo::String element;
+ element = tmp;
+ mojos.push_back(element);
+ }
+
+ return mojos;
+}
+
+mojo::Array<mojom::IPConfigurationPtr> TranslateONCIPConfigs(
+ const base::ListValue* list) {
+ mojo::Array<mojom::IPConfigurationPtr> mojos =
+ mojo::Array<mojom::IPConfigurationPtr>::New(0);
+
+ for (size_t i = 0; i < list->GetSize(); i++) {
+ const base::DictionaryValue* ip_dict = nullptr;
+ mojom::IPConfigurationPtr mojo = mojom::IPConfiguration::New();
+
+ list->GetDictionary(i, &ip_dict);
+ DCHECK(ip_dict);
+
+ std::string tmp;
+ if (!ip_dict->GetString(onc::ipconfig::kGateway, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ mojo->gateway = tmp;
+
+ tmp.clear();
+ if (!ip_dict->GetString(onc::ipconfig::kIPAddress, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ mojo->ip_address = tmp;
+
+ const base::ListValue* dns_list;
+ if (ip_dict->GetList(onc::ipconfig::kNameServers, &dns_list))
+ mojo->name_servers = TranslateStringArray(dns_list);
+ else
+ NOTREACHED();
+
+ if (!ip_dict->GetInteger(onc::ipconfig::kRoutingPrefix,
+ &mojo->routing_prefix))
+ NOTREACHED();
+
+ tmp.clear();
+ if (!ip_dict->GetString(onc::ipconfig::kType, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ if (tmp == onc::ipconfig::kIPv4)
+ mojo->type = mojom::IPAddressType::IPV4;
+ else if (tmp == onc::ipconfig::kIPv6)
+ mojo->type = mojom::IPAddressType::IPV6;
+ else
+ NOTREACHED();
+
+ tmp.clear();
+ if (!ip_dict->GetString(onc::ipconfig::kWebProxyAutoDiscoveryUrl, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ mojo->web_proxy_auto_discovery_url = tmp;
+
+ mojos.push_back(std::move(mojo));
+ }
+ return mojos;
+}
+
+mojom::NetworkConfigurationPtr TranslateONCConfiguration(
+ const base::DictionaryValue* dict) {
+ mojom::NetworkConfigurationPtr mojo = mojom::NetworkConfiguration::New();
+ std::string tmp;
+
+ if (!dict->GetString(onc::network_config::kConnectionState, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ if (tmp == onc::connection_state::kConnected)
+ mojo->connection_state = mojom::ConnectionStateType::CONNECTED;
+ else if (tmp == onc::connection_state::kConnecting)
+ mojo->connection_state = mojom::ConnectionStateType::CONNECTING;
+ else if (tmp == onc::connection_state::kNotConnected)
+ mojo->connection_state = mojom::ConnectionStateType::NOT_CONNECTED;
+ else
+ NOTREACHED();
+
+ tmp.clear();
+ if (!dict->GetString(onc::network_config::kGUID, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ mojo->guid = tmp;
+
+ const base::ListValue* ip_config_list = nullptr;
+ if (dict->GetList(onc::network_config::kIPConfigs, &ip_config_list)) {
+ DCHECK(ip_config_list);
+ mojo->ip_configs = TranslateONCIPConfigs(ip_config_list);
+ }
+
+ tmp.clear();
+ if (dict->GetString(onc::network_config::kMacAddress, &tmp)) {
+ DCHECK(!tmp.empty());
+ mojo->mac_address = tmp;
+ }
+
+ tmp.clear();
+ if (!dict->GetString(onc::network_config::kType, &tmp))
+ NOTREACHED();
+ DCHECK(!tmp.empty());
+ if (tmp == onc::network_type::kCellular) {
+ mojo->type = mojom::NetworkType::CELLULAR;
+ } else if (tmp == onc::network_type::kEthernet) {
+ mojo->type = mojom::NetworkType::ETHERNET;
+ } else if (tmp == onc::network_type::kVPN) {
+ mojo->type = mojom::NetworkType::VPN;
+ } else if (tmp == onc::network_type::kWiFi) {
+ mojo->type = mojom::NetworkType::WIFI;
+
+ const base::DictionaryValue* wifi_dict = nullptr;
+ dict->GetDictionary(onc::network_config::kWiFi, &wifi_dict);
+ DCHECK(wifi_dict);
+ mojo->wifi = TranslateONCWifi(wifi_dict);
+ } else if (tmp == onc::network_type::kWimax) {
+ mojo->type = mojom::NetworkType::WIMAX;
+ }
+
+ return mojo;
+}
+
+void GetDefaultNetworkSuccessCallback(
+ const ArcNetHostImpl::GetDefaultNetworkCallback& callback,
+ const std::string& service_path,
+ const base::DictionaryValue& dictionary) {
+ // TODO(cernekee): Figure out how to query Chrome for the default physical
+ // service if a VPN is connected, rather than just reporting the
+ // default logical service in both fields.
+ callback.Run(TranslateONCConfiguration(&dictionary),
+ TranslateONCConfiguration(&dictionary));
+}
+
+void GetDefaultNetworkFailureCallback(
+ const ArcNetHostImpl::GetDefaultNetworkCallback& callback,
+ const std::string& error_name,
+ std::unique_ptr<base::DictionaryValue> error_data) {
+ LOG(ERROR) << "Failed to query default logical network";
+ callback.Run(nullptr, nullptr);
+}
+
+void ArcNetHostImpl::GetDefaultNetwork(
+ const GetDefaultNetworkCallback& callback) {
+ std::string user_id_hash = chromeos::LoginState::Get()->primary_user_hash();
+ GetManagedConfigurationHandler()->GetProperties(
+ user_id_hash, default_network_,
+ base::Bind(&GetDefaultNetworkSuccessCallback, callback),
+ base::Bind(&GetDefaultNetworkFailureCallback, callback));
+}
+
+void DefaultNetworkSuccessCallback(ArcNetHostImpl* instance,
+ const std::string& service_path,
+ const base::DictionaryValue& dictionary) {
+ instance->arc_bridge_service()->net_instance()->DefaultNetworkChanged(
+ TranslateONCConfiguration(&dictionary),
+ TranslateONCConfiguration(&dictionary));
+}
+
+void DefaultNetworkFailureCallback(
+ const std::string& error_name,
+ std::unique_ptr<base::DictionaryValue> error_data) {
+ LOG(ERROR) << "Failed to query default logical network";
+}
+
+void ArcNetHostImpl::DefaultNetworkChanged(
+ const chromeos::NetworkState* network) {
+ if (!network) {
+ default_network_.clear();
+ VLOG(1) << "No default network";
+ } else {
+ default_network_ = network->path();
+ VLOG(1) << "New default network: " << default_network_;
+ }
+
+ if (arc_bridge_service()->net_version() < 2) {
+ VLOG(1) << "ArcBridgeService does not support DefaultNetworkChanged.";
+ return;
+ }
+
+ if (default_network_.empty()) {
+ arc_bridge_service()->net_instance()->DefaultNetworkChanged(nullptr,
+ nullptr);
+ } else {
+ std::string user_id_hash = chromeos::LoginState::Get()->primary_user_hash();
+ GetManagedConfigurationHandler()->GetProperties(
+ user_id_hash, default_network_,
+ base::Bind(&DefaultNetworkSuccessCallback, base::Unretained(this)),
+ base::Bind(&DefaultNetworkFailureCallback));
+ }
+}
+
void ArcNetHostImpl::OnShuttingDown() {
GetStateHandler()->RemoveObserver(this, FROM_HERE);
}
« components/arc/common/net.mojom ('K') | « components/arc/net/arc_net_host_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698