Add Wimax to ONC.

chromeos/network/onc/onc_signature.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromeos/network/onc/onc_signature.h"
 
 #include "components/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
@@ skipping 198 matching lines @@
     { ::onc::wifi::kSecurity, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature wifi_with_state_fields[] = {
     { ::onc::wifi::kBSSID, &kStringSignature},
     { ::onc::wifi::kFrequency, &kIntegerSignature},
     { ::onc::wifi::kFrequencyList, &kIntegerListSignature},
     { ::onc::wifi::kSignalStrength, &kIntegerSignature},
     {NULL}};
 
+const OncFieldSignature wimax_fields[] = {
+    { ::onc::kRecommended, &kRecommendedSignature},
+    { ::onc::wimax::kAutoConnect, &kBoolSignature},
+    { ::onc::wimax::kEAP, &kEAPSignature},
+    {NULL}};
+
+const OncFieldSignature wimax_with_state_fields[] = {
+    { ::onc::wimax::kSignalStrength, &kIntegerSignature},
+    {NULL}};
+
 const OncFieldSignature cellular_provider_fields[] = {
     { ::onc::cellular_provider::kCode, &kStringSignature},
     { ::onc::cellular_provider::kCountry, &kStringSignature},
     { ::onc::cellular_provider::kName, &kStringSignature},
     {NULL}};
 
 const OncFieldSignature cellular_apn_fields[] = {
     { ::onc::cellular_apn::kAccessPointName, &kStringSignature},
     { ::onc::cellular_apn::kName, &kStringSignature},
     { ::onc::cellular_apn::kUsername, &kStringSignature},
@@ skipping 69 matching lines @@
     { ::onc::kRecommended, &kRecommendedSignature},
     { ::onc::kRemove, &kBoolSignature},
 
     // Not supported, yet.
     { ::onc::network_config::kSearchDomains, &kStringListSignature},
 
     { ::onc::network_config::kStaticIPConfig, &kStaticIPConfigSignature},
     { ::onc::network_config::kType, &kStringSignature},
     { ::onc::network_config::kVPN, &kVPNSignature},
     { ::onc::network_config::kWiFi, &kWiFiSignature},
+    { ::onc::network_config::kWimax, &kWiMAXSignature},
     {NULL}};
 
 const OncFieldSignature network_with_state_fields[] = {
     { ::onc::network_config::kCellular, &kCellularWithStateSignature},
     { ::onc::network_config::kConnectionState, &kStringSignature},
     { ::onc::network_config::kConnectable, &kBoolSignature},
     { ::onc::network_config::kErrorState, &kStringSignature},
     { ::onc::network_config::kIPConfigs, &kIPConfigListSignature},
     { ::onc::network_config::kMacAddress, &kStringSignature},
     { ::onc::network_config::kRestrictedConnectivity, &kBoolSignature},
     { ::onc::network_config::kSavedIPConfig, &kSavedIPConfigSignature},
     { ::onc::network_config::kSource, &kStringSignature},
     { ::onc::network_config::kWiFi, &kWiFiWithStateSignature},
+    { ::onc::network_config::kWimax, &kWiMAXWithStateSignature},
     {NULL}};
 
 const OncFieldSignature global_network_configuration_fields[] = {
     { ::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
       &kBoolSignature},
     {NULL}};
 
 const OncFieldSignature certificate_fields[] = {
     { ::onc::certificate::kGUID, &kStringSignature},
     { ::onc::certificate::kPKCS12, &kStringSignature},
@@ skipping 68 matching lines @@
 };
 const OncValueSignature kProxyManualSignature = {
   base::Value::TYPE_DICTIONARY, proxy_manual_fields, NULL
 };
 const OncValueSignature kProxySettingsSignature = {
   base::Value::TYPE_DICTIONARY, proxy_settings_fields, NULL
 };
 const OncValueSignature kWiFiSignature = {
   base::Value::TYPE_DICTIONARY, wifi_fields, NULL
 };
+const OncValueSignature kWiMAXSignature = {
+  base::Value::TYPE_DICTIONARY, wimax_fields, NULL
+};
 const OncValueSignature kCertificateSignature = {
   base::Value::TYPE_DICTIONARY, certificate_fields, NULL
 };
 const OncValueSignature kNetworkConfigurationSignature = {
   base::Value::TYPE_DICTIONARY, network_configuration_fields, NULL
 };
 const OncValueSignature kGlobalNetworkConfigurationSignature = {
   base::Value::TYPE_DICTIONARY, global_network_configuration_fields, NULL
 };
 const OncValueSignature kCertificateListSignature = {
   base::Value::TYPE_LIST, NULL, &kCertificateSignature
 };
 const OncValueSignature kNetworkConfigurationListSignature = {
   base::Value::TYPE_LIST, NULL, &kNetworkConfigurationSignature
 };
 const OncValueSignature kToplevelConfigurationSignature = {
   base::Value::TYPE_DICTIONARY, toplevel_configuration_fields, NULL
 };
 
 // Derived "ONC with State" signatures.
 const OncValueSignature kNetworkWithStateSignature = {
   base::Value::TYPE_DICTIONARY, network_with_state_fields, NULL,
   &kNetworkConfigurationSignature
 };
 const OncValueSignature kWiFiWithStateSignature = {
   base::Value::TYPE_DICTIONARY, wifi_with_state_fields, NULL, &kWiFiSignature
 };
+const OncValueSignature kWiMAXWithStateSignature = {
+  base::Value::TYPE_DICTIONARY, wimax_with_state_fields, NULL, &kWiMAXSignature
+};
 const OncValueSignature kCellularSignature = {
   base::Value::TYPE_DICTIONARY, cellular_fields, NULL
 };
 const OncValueSignature kCellularWithStateSignature = {
   base::Value::TYPE_DICTIONARY, cellular_with_state_fields, NULL,
   &kCellularSignature
 };
 const OncValueSignature kCellularProviderSignature = {
   base::Value::TYPE_DICTIONARY, cellular_provider_fields, NULL
 };
@@ skipping 48 matching lines @@
     if (&signature == entry->value_signature &&
         onc_field_name == entry->field_name) {
       return true;
     }
   }
   return false;
 }
 
 }  // namespace onc
 }  // namespace chromeos