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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/network/onc/onc_signature.cc

Issue 1031253002: Format ONC translation files (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chromeos/network/onc/onc_signature.h ('k') | chromeos/network/onc/onc_translation_tables.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_signature.cc
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index ad05682c962a840bb3f43658901c824b49f3b0a1..568d150a27d03946c40ee57cb29a9b42841e7d5d 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -13,469 +13,478 @@ namespace chromeos {
namespace onc {
namespace {
-const OncValueSignature kBoolSignature = {
- base::Value::TYPE_BOOLEAN, NULL
-};
-const OncValueSignature kStringSignature = {
- base::Value::TYPE_STRING, NULL
-};
-const OncValueSignature kIntegerSignature = {
- base::Value::TYPE_INTEGER, NULL
-};
-const OncValueSignature kDoubleSignature = {
- base::Value::TYPE_DOUBLE, NULL
-};
-const OncValueSignature kStringListSignature = {
- base::Value::TYPE_LIST, NULL, &kStringSignature
-};
-const OncValueSignature kIntegerListSignature = {
- base::Value::TYPE_LIST, NULL, &kIntegerSignature
-};
-const OncValueSignature kIPConfigListSignature = {
- base::Value::TYPE_LIST, NULL, &kIPConfigSignature
-};
-const OncValueSignature kCellularApnListSignature = {
- base::Value::TYPE_LIST, NULL, &kCellularApnSignature
-};
+const OncValueSignature kBoolSignature = {base::Value::TYPE_BOOLEAN, NULL};
+const OncValueSignature kStringSignature = {base::Value::TYPE_STRING, NULL};
+const OncValueSignature kIntegerSignature = {base::Value::TYPE_INTEGER, NULL};
+const OncValueSignature kDoubleSignature = {base::Value::TYPE_DOUBLE, NULL};
+const OncValueSignature kStringListSignature = {base::Value::TYPE_LIST,
+ NULL,
+ &kStringSignature};
+const OncValueSignature kIntegerListSignature = {base::Value::TYPE_LIST,
+ NULL,
+ &kIntegerSignature};
+const OncValueSignature kIPConfigListSignature = {base::Value::TYPE_LIST,
+ NULL,
+ &kIPConfigSignature};
+const OncValueSignature kCellularApnListSignature = {base::Value::TYPE_LIST,
+ NULL,
+ &kCellularApnSignature};
const OncValueSignature kCellularFoundNetworkListSignature = {
- base::Value::TYPE_LIST, NULL, &kCellularFoundNetworkSignature
-};
+ base::Value::TYPE_LIST,
+ NULL,
+ &kCellularFoundNetworkSignature};
const OncFieldSignature issuer_subject_pattern_fields[] = {
- { ::onc::client_cert::kCommonName, &kStringSignature},
- { ::onc::client_cert::kLocality, &kStringSignature},
- { ::onc::client_cert::kOrganization, &kStringSignature},
- { ::onc::client_cert::kOrganizationalUnit, &kStringSignature},
+ {::onc::client_cert::kCommonName, &kStringSignature},
+ {::onc::client_cert::kLocality, &kStringSignature},
+ {::onc::client_cert::kOrganization, &kStringSignature},
+ {::onc::client_cert::kOrganizationalUnit, &kStringSignature},
{NULL}};
const OncFieldSignature certificate_pattern_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::client_cert::kEnrollmentURI, &kStringListSignature},
- { ::onc::client_cert::kIssuer, &kIssuerSubjectPatternSignature},
- { ::onc::client_cert::kIssuerCARef, &kStringListSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::client_cert::kEnrollmentURI, &kStringListSignature},
+ {::onc::client_cert::kIssuer, &kIssuerSubjectPatternSignature},
+ {::onc::client_cert::kIssuerCARef, &kStringListSignature},
// Used internally. Not officially supported.
- { ::onc::client_cert::kIssuerCAPEMs, &kStringListSignature},
- { ::onc::client_cert::kSubject, &kIssuerSubjectPatternSignature},
+ {::onc::client_cert::kIssuerCAPEMs, &kStringListSignature},
+ {::onc::client_cert::kSubject, &kIssuerSubjectPatternSignature},
{NULL}};
const OncFieldSignature eap_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::eap::kAnonymousIdentity, &kStringSignature},
- { ::onc::client_cert::kClientCertPattern, &kCertificatePatternSignature},
- { ::onc::client_cert::kClientCertRef, &kStringSignature},
- { ::onc::client_cert::kClientCertType, &kStringSignature},
- { ::onc::eap::kIdentity, &kStringSignature},
- { ::onc::eap::kInner, &kStringSignature},
- { ::onc::eap::kOuter, &kStringSignature},
- { ::onc::eap::kPassword, &kStringSignature},
- { ::onc::eap::kSaveCredentials, &kBoolSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::eap::kAnonymousIdentity, &kStringSignature},
+ {::onc::client_cert::kClientCertPattern, &kCertificatePatternSignature},
+ {::onc::client_cert::kClientCertRef, &kStringSignature},
+ {::onc::client_cert::kClientCertType, &kStringSignature},
+ {::onc::eap::kIdentity, &kStringSignature},
+ {::onc::eap::kInner, &kStringSignature},
+ {::onc::eap::kOuter, &kStringSignature},
+ {::onc::eap::kPassword, &kStringSignature},
+ {::onc::eap::kSaveCredentials, &kBoolSignature},
// Used internally. Not officially supported.
- { ::onc::eap::kServerCAPEMs, &kStringListSignature},
- { ::onc::eap::kServerCARef, &kStringSignature},
- { ::onc::eap::kServerCARefs, &kStringListSignature},
- { ::onc::eap::kUseSystemCAs, &kBoolSignature},
+ {::onc::eap::kServerCAPEMs, &kStringListSignature},
+ {::onc::eap::kServerCARef, &kStringSignature},
+ {::onc::eap::kServerCARefs, &kStringListSignature},
+ {::onc::eap::kUseSystemCAs, &kBoolSignature},
{NULL}};
const OncFieldSignature ipsec_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::ipsec::kAuthenticationType, &kStringSignature},
- { ::onc::client_cert::kClientCertPattern, &kCertificatePatternSignature},
- { ::onc::client_cert::kClientCertRef, &kStringSignature},
- { ::onc::client_cert::kClientCertType, &kStringSignature},
- { ::onc::ipsec::kGroup, &kStringSignature},
- { ::onc::ipsec::kIKEVersion, &kIntegerSignature},
- { ::onc::ipsec::kPSK, &kStringSignature},
- { ::onc::vpn::kSaveCredentials, &kBoolSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::ipsec::kAuthenticationType, &kStringSignature},
+ {::onc::client_cert::kClientCertPattern, &kCertificatePatternSignature},
+ {::onc::client_cert::kClientCertRef, &kStringSignature},
+ {::onc::client_cert::kClientCertType, &kStringSignature},
+ {::onc::ipsec::kGroup, &kStringSignature},
+ {::onc::ipsec::kIKEVersion, &kIntegerSignature},
+ {::onc::ipsec::kPSK, &kStringSignature},
+ {::onc::vpn::kSaveCredentials, &kBoolSignature},
// Used internally. Not officially supported.
- { ::onc::ipsec::kServerCAPEMs, &kStringListSignature},
- { ::onc::ipsec::kServerCARef, &kStringSignature},
- { ::onc::ipsec::kServerCARefs, &kStringListSignature},
- { ::onc::ipsec::kXAUTH, &kXAUTHSignature},
+ {::onc::ipsec::kServerCAPEMs, &kStringListSignature},
+ {::onc::ipsec::kServerCARef, &kStringSignature},
+ {::onc::ipsec::kServerCARefs, &kStringListSignature},
+ {::onc::ipsec::kXAUTH, &kXAUTHSignature},
// Not yet supported.
// { ipsec::kEAP, &kEAPSignature },
{NULL}};
const OncFieldSignature xauth_fields[] = {
- { ::onc::vpn::kPassword, &kStringSignature},
- { ::onc::vpn::kUsername, &kStringSignature},
+ {::onc::vpn::kPassword, &kStringSignature},
+ {::onc::vpn::kUsername, &kStringSignature},
{NULL}};
const OncFieldSignature l2tp_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::vpn::kPassword, &kStringSignature},
- { ::onc::vpn::kSaveCredentials, &kBoolSignature},
- { ::onc::vpn::kUsername, &kStringSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::vpn::kPassword, &kStringSignature},
+ {::onc::vpn::kSaveCredentials, &kBoolSignature},
+ {::onc::vpn::kUsername, &kStringSignature},
{NULL}};
const OncFieldSignature openvpn_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::openvpn::kAuth, &kStringSignature},
- { ::onc::openvpn::kAuthNoCache, &kBoolSignature},
- { ::onc::openvpn::kAuthRetry, &kStringSignature},
- { ::onc::openvpn::kCipher, &kStringSignature},
- { ::onc::client_cert::kClientCertPattern, &kCertificatePatternSignature},
- { ::onc::client_cert::kClientCertRef, &kStringSignature},
- { ::onc::client_cert::kClientCertType, &kStringSignature},
- { ::onc::openvpn::kCompLZO, &kStringSignature},
- { ::onc::openvpn::kCompNoAdapt, &kBoolSignature},
- { ::onc::openvpn::kIgnoreDefaultRoute, &kBoolSignature},
- { ::onc::openvpn::kKeyDirection, &kStringSignature},
- { ::onc::openvpn::kNsCertType, &kStringSignature},
- { ::onc::openvpn::kOTP, &kStringSignature},
- { ::onc::openvpn::kPassword, &kStringSignature},
- { ::onc::openvpn::kPort, &kIntegerSignature},
- { ::onc::openvpn::kProto, &kStringSignature},
- { ::onc::openvpn::kPushPeerInfo, &kBoolSignature},
- { ::onc::openvpn::kRemoteCertEKU, &kStringSignature},
- { ::onc::openvpn::kRemoteCertKU, &kStringListSignature},
- { ::onc::openvpn::kRemoteCertTLS, &kStringSignature},
- { ::onc::openvpn::kRenegSec, &kIntegerSignature},
- { ::onc::vpn::kSaveCredentials, &kBoolSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::openvpn::kAuth, &kStringSignature},
+ {::onc::openvpn::kAuthNoCache, &kBoolSignature},
+ {::onc::openvpn::kAuthRetry, &kStringSignature},
+ {::onc::openvpn::kCipher, &kStringSignature},
+ {::onc::client_cert::kClientCertPattern, &kCertificatePatternSignature},
+ {::onc::client_cert::kClientCertRef, &kStringSignature},
+ {::onc::client_cert::kClientCertType, &kStringSignature},
+ {::onc::openvpn::kCompLZO, &kStringSignature},
+ {::onc::openvpn::kCompNoAdapt, &kBoolSignature},
+ {::onc::openvpn::kIgnoreDefaultRoute, &kBoolSignature},
+ {::onc::openvpn::kKeyDirection, &kStringSignature},
+ {::onc::openvpn::kNsCertType, &kStringSignature},
+ {::onc::openvpn::kOTP, &kStringSignature},
+ {::onc::openvpn::kPassword, &kStringSignature},
+ {::onc::openvpn::kPort, &kIntegerSignature},
+ {::onc::openvpn::kProto, &kStringSignature},
+ {::onc::openvpn::kPushPeerInfo, &kBoolSignature},
+ {::onc::openvpn::kRemoteCertEKU, &kStringSignature},
+ {::onc::openvpn::kRemoteCertKU, &kStringListSignature},
+ {::onc::openvpn::kRemoteCertTLS, &kStringSignature},
+ {::onc::openvpn::kRenegSec, &kIntegerSignature},
+ {::onc::vpn::kSaveCredentials, &kBoolSignature},
// Used internally. Not officially supported.
- { ::onc::openvpn::kServerCAPEMs, &kStringListSignature},
- { ::onc::openvpn::kServerCARef, &kStringSignature},
- { ::onc::openvpn::kServerCARefs, &kStringListSignature},
+ {::onc::openvpn::kServerCAPEMs, &kStringListSignature},
+ {::onc::openvpn::kServerCARef, &kStringSignature},
+ {::onc::openvpn::kServerCARefs, &kStringListSignature},
// Not supported, yet.
- { ::onc::openvpn::kServerCertPEM, &kStringSignature},
- { ::onc::openvpn::kServerCertRef, &kStringSignature},
- { ::onc::openvpn::kServerPollTimeout, &kIntegerSignature},
- { ::onc::openvpn::kShaper, &kIntegerSignature},
- { ::onc::openvpn::kStaticChallenge, &kStringSignature},
- { ::onc::openvpn::kTLSAuthContents, &kStringSignature},
- { ::onc::openvpn::kTLSRemote, &kStringSignature},
- { ::onc::openvpn::kUserAuthenticationType, &kStringSignature},
- { ::onc::vpn::kUsername, &kStringSignature},
+ {::onc::openvpn::kServerCertPEM, &kStringSignature},
+ {::onc::openvpn::kServerCertRef, &kStringSignature},
+ {::onc::openvpn::kServerPollTimeout, &kIntegerSignature},
+ {::onc::openvpn::kShaper, &kIntegerSignature},
+ {::onc::openvpn::kStaticChallenge, &kStringSignature},
+ {::onc::openvpn::kTLSAuthContents, &kStringSignature},
+ {::onc::openvpn::kTLSRemote, &kStringSignature},
+ {::onc::openvpn::kUserAuthenticationType, &kStringSignature},
+ {::onc::vpn::kUsername, &kStringSignature},
// Not supported, yet.
- { ::onc::openvpn::kVerb, &kStringSignature},
- { ::onc::openvpn::kVerifyHash, &kStringSignature},
- { ::onc::openvpn::kVerifyX509, &kVerifyX509Signature},
+ {::onc::openvpn::kVerb, &kStringSignature},
+ {::onc::openvpn::kVerifyHash, &kStringSignature},
+ {::onc::openvpn::kVerifyX509, &kVerifyX509Signature},
{NULL}};
const OncFieldSignature third_party_vpn_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::third_party_vpn::kExtensionID, &kStringSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::third_party_vpn::kExtensionID, &kStringSignature},
{NULL}};
const OncFieldSignature verify_x509_fields[] = {
- { ::onc::verify_x509::kName, &kStringSignature},
- { ::onc::verify_x509::kType, &kStringSignature},
+ {::onc::verify_x509::kName, &kStringSignature},
+ {::onc::verify_x509::kType, &kStringSignature},
{NULL}};
const OncFieldSignature vpn_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::vpn::kAutoConnect, &kBoolSignature},
- { ::onc::vpn::kHost, &kStringSignature},
- { ::onc::vpn::kIPsec, &kIPsecSignature},
- { ::onc::vpn::kL2TP, &kL2TPSignature},
- { ::onc::vpn::kOpenVPN, &kOpenVPNSignature},
- { ::onc::vpn::kThirdPartyVpn, &kThirdPartyVPNSignature},
- { ::onc::vpn::kType, &kStringSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::vpn::kAutoConnect, &kBoolSignature},
+ {::onc::vpn::kHost, &kStringSignature},
+ {::onc::vpn::kIPsec, &kIPsecSignature},
+ {::onc::vpn::kL2TP, &kL2TPSignature},
+ {::onc::vpn::kOpenVPN, &kOpenVPNSignature},
+ {::onc::vpn::kThirdPartyVpn, &kThirdPartyVPNSignature},
+ {::onc::vpn::kType, &kStringSignature},
{NULL}};
const OncFieldSignature ethernet_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::ethernet::kAuthentication, &kStringSignature},
- { ::onc::ethernet::kEAP, &kEAPSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::ethernet::kAuthentication, &kStringSignature},
+ {::onc::ethernet::kEAP, &kEAPSignature},
{NULL}};
const OncFieldSignature ipconfig_fields[] = {
- { ::onc::ipconfig::kGateway, &kStringSignature},
- { ::onc::ipconfig::kIPAddress, &kStringSignature},
- { ::onc::ipconfig::kNameServers, &kStringListSignature},
- { ::onc::ipconfig::kRoutingPrefix, &kIntegerSignature},
- { ::onc::ipconfig::kSearchDomains, &kStringListSignature},
- { ::onc::ipconfig::kType, &kStringSignature},
- { ::onc::ipconfig::kWebProxyAutoDiscoveryUrl, &kStringSignature},
+ {::onc::ipconfig::kGateway, &kStringSignature},
+ {::onc::ipconfig::kIPAddress, &kStringSignature},
+ {::onc::ipconfig::kNameServers, &kStringListSignature},
+ {::onc::ipconfig::kRoutingPrefix, &kIntegerSignature},
+ {::onc::ipconfig::kSearchDomains, &kStringListSignature},
+ {::onc::ipconfig::kType, &kStringSignature},
+ {::onc::ipconfig::kWebProxyAutoDiscoveryUrl, &kStringSignature},
{NULL}};
const OncFieldSignature proxy_location_fields[] = {
- { ::onc::proxy::kHost, &kStringSignature},
- { ::onc::proxy::kPort, &kIntegerSignature}, {NULL}};
+ {::onc::proxy::kHost, &kStringSignature},
+ {::onc::proxy::kPort, &kIntegerSignature},
+ {NULL}};
const OncFieldSignature proxy_manual_fields[] = {
- { ::onc::proxy::kFtp, &kProxyLocationSignature},
- { ::onc::proxy::kHttp, &kProxyLocationSignature},
- { ::onc::proxy::kHttps, &kProxyLocationSignature},
- { ::onc::proxy::kSocks, &kProxyLocationSignature},
+ {::onc::proxy::kFtp, &kProxyLocationSignature},
+ {::onc::proxy::kHttp, &kProxyLocationSignature},
+ {::onc::proxy::kHttps, &kProxyLocationSignature},
+ {::onc::proxy::kSocks, &kProxyLocationSignature},
{NULL}};
const OncFieldSignature proxy_settings_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::proxy::kExcludeDomains, &kStringListSignature},
- { ::onc::proxy::kManual, &kProxyManualSignature},
- { ::onc::proxy::kPAC, &kStringSignature},
- { ::onc::proxy::kType, &kStringSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::proxy::kExcludeDomains, &kStringListSignature},
+ {::onc::proxy::kManual, &kProxyManualSignature},
+ {::onc::proxy::kPAC, &kStringSignature},
+ {::onc::proxy::kType, &kStringSignature},
{NULL}};
const OncFieldSignature wifi_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::wifi::kAllowGatewayARPPolling, &kBoolSignature},
- { ::onc::wifi::kAutoConnect, &kBoolSignature},
- { ::onc::wifi::kEAP, &kEAPSignature},
- { ::onc::wifi::kHexSSID, &kStringSignature},
- { ::onc::wifi::kHiddenSSID, &kBoolSignature},
- { ::onc::wifi::kPassphrase, &kStringSignature},
- { ::onc::wifi::kSSID, &kStringSignature},
- { ::onc::wifi::kSecurity, &kStringSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::wifi::kAllowGatewayARPPolling, &kBoolSignature},
+ {::onc::wifi::kAutoConnect, &kBoolSignature},
+ {::onc::wifi::kEAP, &kEAPSignature},
+ {::onc::wifi::kHexSSID, &kStringSignature},
+ {::onc::wifi::kHiddenSSID, &kBoolSignature},
+ {::onc::wifi::kPassphrase, &kStringSignature},
+ {::onc::wifi::kSSID, &kStringSignature},
+ {::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},
+ {::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},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::wimax::kAutoConnect, &kBoolSignature},
+ {::onc::wimax::kEAP, &kEAPSignature},
{NULL}};
const OncFieldSignature wimax_with_state_fields[] = {
- { ::onc::wimax::kSignalStrength, &kIntegerSignature},
+ {::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},
+ {::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},
- { ::onc::cellular_apn::kPassword, &kStringSignature},
- { ::onc::cellular_apn::kLocalizedName, &kStringSignature},
- { ::onc::cellular_apn::kLanguage, &kStringSignature},
+ {::onc::cellular_apn::kAccessPointName, &kStringSignature},
+ {::onc::cellular_apn::kName, &kStringSignature},
+ {::onc::cellular_apn::kUsername, &kStringSignature},
+ {::onc::cellular_apn::kPassword, &kStringSignature},
+ {::onc::cellular_apn::kLocalizedName, &kStringSignature},
+ {::onc::cellular_apn::kLanguage, &kStringSignature},
{NULL}};
const OncFieldSignature cellular_found_network_fields[] = {
- { ::onc::cellular_found_network::kStatus, &kStringSignature},
- { ::onc::cellular_found_network::kNetworkId, &kStringSignature},
- { ::onc::cellular_found_network::kShortName, &kStringSignature},
- { ::onc::cellular_found_network::kLongName, &kStringSignature},
- { ::onc::cellular_found_network::kTechnology, &kStringSignature},
+ {::onc::cellular_found_network::kStatus, &kStringSignature},
+ {::onc::cellular_found_network::kNetworkId, &kStringSignature},
+ {::onc::cellular_found_network::kShortName, &kStringSignature},
+ {::onc::cellular_found_network::kLongName, &kStringSignature},
+ {::onc::cellular_found_network::kTechnology, &kStringSignature},
{NULL}};
const OncFieldSignature sim_lock_status_fields[] = {
- { ::onc::sim_lock_status::kLockEnabled, &kBoolSignature},
- { ::onc::sim_lock_status::kLockType, &kStringSignature},
- { ::onc::sim_lock_status::kRetriesLeft, &kDoubleSignature},
+ {::onc::sim_lock_status::kLockEnabled, &kBoolSignature},
+ {::onc::sim_lock_status::kLockType, &kStringSignature},
+ {::onc::sim_lock_status::kRetriesLeft, &kDoubleSignature},
{NULL}};
const OncFieldSignature cellular_fields[] = {
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::cellular::kAPN, &kCellularApnSignature },
- { ::onc::cellular::kAPNList, &kCellularApnListSignature},
- { ::onc::vpn::kAutoConnect, &kBoolSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::cellular::kAPN, &kCellularApnSignature},
+ {::onc::cellular::kAPNList, &kCellularApnListSignature},
+ {::onc::vpn::kAutoConnect, &kBoolSignature},
{NULL}};
const OncFieldSignature cellular_with_state_fields[] = {
- { ::onc::cellular::kActivationType, &kStringSignature},
- { ::onc::cellular::kActivationState, &kStringSignature},
- { ::onc::cellular::kAllowRoaming, &kBoolSignature},
- { ::onc::cellular::kCarrier, &kStringSignature},
- { ::onc::cellular::kESN, &kStringSignature},
- { ::onc::cellular::kFamily, &kStringSignature},
- { ::onc::cellular::kFirmwareRevision, &kStringSignature},
- { ::onc::cellular::kFoundNetworks, &kCellularFoundNetworkListSignature},
- { ::onc::cellular::kHardwareRevision, &kStringSignature},
- { ::onc::cellular::kHomeProvider, &kCellularProviderSignature},
- { ::onc::cellular::kICCID, &kStringSignature},
- { ::onc::cellular::kIMEI, &kStringSignature},
- { ::onc::cellular::kIMSI, &kStringSignature},
- { ::onc::cellular::kLastGoodAPN, &kCellularApnSignature },
- { ::onc::cellular::kManufacturer, &kStringSignature},
- { ::onc::cellular::kMDN, &kStringSignature},
- { ::onc::cellular::kMEID, &kStringSignature},
- { ::onc::cellular::kMIN, &kStringSignature},
- { ::onc::cellular::kModelID, &kStringSignature},
- { ::onc::cellular::kNetworkTechnology, &kStringSignature},
- { ::onc::cellular::kPRLVersion, &kIntegerSignature},
- { ::onc::cellular::kRoamingState, &kStringSignature},
- { ::onc::cellular::kServingOperator, &kCellularProviderSignature},
- { ::onc::cellular::kSignalStrength, &kIntegerSignature},
- { ::onc::cellular::kSIMLockStatus, &kSIMLockStatusSignature},
- { ::onc::cellular::kSIMPresent, &kBoolSignature},
- { ::onc::cellular::kSupportNetworkScan, &kBoolSignature},
- { ::onc::cellular::kSupportedCarriers, &kStringListSignature},
+ {::onc::cellular::kActivationType, &kStringSignature},
+ {::onc::cellular::kActivationState, &kStringSignature},
+ {::onc::cellular::kAllowRoaming, &kBoolSignature},
+ {::onc::cellular::kCarrier, &kStringSignature},
+ {::onc::cellular::kESN, &kStringSignature},
+ {::onc::cellular::kFamily, &kStringSignature},
+ {::onc::cellular::kFirmwareRevision, &kStringSignature},
+ {::onc::cellular::kFoundNetworks, &kCellularFoundNetworkListSignature},
+ {::onc::cellular::kHardwareRevision, &kStringSignature},
+ {::onc::cellular::kHomeProvider, &kCellularProviderSignature},
+ {::onc::cellular::kICCID, &kStringSignature},
+ {::onc::cellular::kIMEI, &kStringSignature},
+ {::onc::cellular::kIMSI, &kStringSignature},
+ {::onc::cellular::kLastGoodAPN, &kCellularApnSignature},
+ {::onc::cellular::kManufacturer, &kStringSignature},
+ {::onc::cellular::kMDN, &kStringSignature},
+ {::onc::cellular::kMEID, &kStringSignature},
+ {::onc::cellular::kMIN, &kStringSignature},
+ {::onc::cellular::kModelID, &kStringSignature},
+ {::onc::cellular::kNetworkTechnology, &kStringSignature},
+ {::onc::cellular::kPRLVersion, &kIntegerSignature},
+ {::onc::cellular::kRoamingState, &kStringSignature},
+ {::onc::cellular::kServingOperator, &kCellularProviderSignature},
+ {::onc::cellular::kSignalStrength, &kIntegerSignature},
+ {::onc::cellular::kSIMLockStatus, &kSIMLockStatusSignature},
+ {::onc::cellular::kSIMPresent, &kBoolSignature},
+ {::onc::cellular::kSupportNetworkScan, &kBoolSignature},
+ {::onc::cellular::kSupportedCarriers, &kStringListSignature},
{NULL}};
const OncFieldSignature network_configuration_fields[] = {
- { ::onc::network_config::kCellular, &kCellularSignature},
- { ::onc::network_config::kEthernet, &kEthernetSignature},
- { ::onc::network_config::kGUID, &kStringSignature},
- { ::onc::network_config::kIPAddressConfigType, &kStringSignature},
- { ::onc::network_config::kName, &kStringSignature},
- { ::onc::network_config::kNameServersConfigType, &kStringSignature},
- { ::onc::network_config::kPriority, &kIntegerSignature},
- { ::onc::network_config::kProxySettings, &kProxySettingsSignature},
- { ::onc::kRecommended, &kRecommendedSignature},
- { ::onc::kRemove, &kBoolSignature},
- { ::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},
+ {::onc::network_config::kCellular, &kCellularSignature},
+ {::onc::network_config::kEthernet, &kEthernetSignature},
+ {::onc::network_config::kGUID, &kStringSignature},
+ {::onc::network_config::kIPAddressConfigType, &kStringSignature},
+ {::onc::network_config::kName, &kStringSignature},
+ {::onc::network_config::kNameServersConfigType, &kStringSignature},
+ {::onc::network_config::kPriority, &kIntegerSignature},
+ {::onc::network_config::kProxySettings, &kProxySettingsSignature},
+ {::onc::kRecommended, &kRecommendedSignature},
+ {::onc::kRemove, &kBoolSignature},
+ {::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},
+ {::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},
+ {::onc::global_network_config::kAllowOnlyPolicyNetworksToAutoconnect,
+ &kBoolSignature},
{NULL}};
const OncFieldSignature certificate_fields[] = {
- { ::onc::certificate::kGUID, &kStringSignature},
- { ::onc::certificate::kPKCS12, &kStringSignature},
- { ::onc::kRemove, &kBoolSignature},
- { ::onc::certificate::kTrustBits, &kStringListSignature},
- { ::onc::certificate::kType, &kStringSignature},
- { ::onc::certificate::kX509, &kStringSignature},
+ {::onc::certificate::kGUID, &kStringSignature},
+ {::onc::certificate::kPKCS12, &kStringSignature},
+ {::onc::kRemove, &kBoolSignature},
+ {::onc::certificate::kTrustBits, &kStringListSignature},
+ {::onc::certificate::kType, &kStringSignature},
+ {::onc::certificate::kX509, &kStringSignature},
{NULL}};
const OncFieldSignature toplevel_configuration_fields[] = {
- { ::onc::toplevel_config::kCertificates, &kCertificateListSignature},
- { ::onc::toplevel_config::kNetworkConfigurations,
- &kNetworkConfigurationListSignature},
- { ::onc::toplevel_config::kGlobalNetworkConfiguration,
- &kGlobalNetworkConfigurationSignature},
- { ::onc::toplevel_config::kType, &kStringSignature},
- { ::onc::encrypted::kCipher, &kStringSignature},
- { ::onc::encrypted::kCiphertext, &kStringSignature},
- { ::onc::encrypted::kHMAC, &kStringSignature},
- { ::onc::encrypted::kHMACMethod, &kStringSignature},
- { ::onc::encrypted::kIV, &kStringSignature},
- { ::onc::encrypted::kIterations, &kIntegerSignature},
- { ::onc::encrypted::kSalt, &kStringSignature},
- { ::onc::encrypted::kStretch, &kStringSignature}, {NULL}};
+ {::onc::toplevel_config::kCertificates, &kCertificateListSignature},
+ {::onc::toplevel_config::kNetworkConfigurations,
+ &kNetworkConfigurationListSignature},
+ {::onc::toplevel_config::kGlobalNetworkConfiguration,
+ &kGlobalNetworkConfigurationSignature},
+ {::onc::toplevel_config::kType, &kStringSignature},
+ {::onc::encrypted::kCipher, &kStringSignature},
+ {::onc::encrypted::kCiphertext, &kStringSignature},
+ {::onc::encrypted::kHMAC, &kStringSignature},
+ {::onc::encrypted::kHMACMethod, &kStringSignature},
+ {::onc::encrypted::kIV, &kStringSignature},
+ {::onc::encrypted::kIterations, &kIntegerSignature},
+ {::onc::encrypted::kSalt, &kStringSignature},
+ {::onc::encrypted::kStretch, &kStringSignature},
+ {NULL}};
} // namespace
-const OncValueSignature kRecommendedSignature = {
- base::Value::TYPE_LIST, NULL, &kStringSignature
-};
-const OncValueSignature kEAPSignature = {
- base::Value::TYPE_DICTIONARY, eap_fields, NULL
-};
+const OncValueSignature kRecommendedSignature = {base::Value::TYPE_LIST,
+ NULL,
+ &kStringSignature};
+const OncValueSignature kEAPSignature = {base::Value::TYPE_DICTIONARY,
+ eap_fields,
+ NULL};
const OncValueSignature kIssuerSubjectPatternSignature = {
- base::Value::TYPE_DICTIONARY, issuer_subject_pattern_fields, NULL
-};
+ base::Value::TYPE_DICTIONARY,
+ issuer_subject_pattern_fields,
+ NULL};
const OncValueSignature kCertificatePatternSignature = {
- base::Value::TYPE_DICTIONARY, certificate_pattern_fields, NULL
-};
-const OncValueSignature kIPsecSignature = {
- base::Value::TYPE_DICTIONARY, ipsec_fields, NULL
-};
-const OncValueSignature kXAUTHSignature = {
- base::Value::TYPE_DICTIONARY, xauth_fields, NULL
-};
-const OncValueSignature kL2TPSignature = {
- base::Value::TYPE_DICTIONARY, l2tp_fields, NULL
-};
-const OncValueSignature kOpenVPNSignature = {
- base::Value::TYPE_DICTIONARY, openvpn_fields, NULL
-};
-const OncValueSignature kThirdPartyVPNSignature = {
- base::Value::TYPE_DICTIONARY, third_party_vpn_fields, NULL
-};
-const OncValueSignature kVerifyX509Signature = {
- base::Value::TYPE_DICTIONARY, verify_x509_fields, NULL
-};
-const OncValueSignature kVPNSignature = {
- base::Value::TYPE_DICTIONARY, vpn_fields, NULL
-};
-const OncValueSignature kEthernetSignature = {
- base::Value::TYPE_DICTIONARY, ethernet_fields, NULL
-};
-const OncValueSignature kIPConfigSignature = {
- base::Value::TYPE_DICTIONARY, ipconfig_fields, NULL
-};
-const OncValueSignature kSavedIPConfigSignature = {
- base::Value::TYPE_DICTIONARY, ipconfig_fields, NULL
-};
+ base::Value::TYPE_DICTIONARY,
+ certificate_pattern_fields,
+ NULL};
+const OncValueSignature kIPsecSignature = {base::Value::TYPE_DICTIONARY,
+ ipsec_fields,
+ NULL};
+const OncValueSignature kXAUTHSignature = {base::Value::TYPE_DICTIONARY,
+ xauth_fields,
+ NULL};
+const OncValueSignature kL2TPSignature = {base::Value::TYPE_DICTIONARY,
+ l2tp_fields,
+ NULL};
+const OncValueSignature kOpenVPNSignature = {base::Value::TYPE_DICTIONARY,
+ openvpn_fields,
+ NULL};
+const OncValueSignature kThirdPartyVPNSignature = {base::Value::TYPE_DICTIONARY,
+ third_party_vpn_fields,
+ NULL};
+const OncValueSignature kVerifyX509Signature = {base::Value::TYPE_DICTIONARY,
+ verify_x509_fields,
+ NULL};
+const OncValueSignature kVPNSignature = {base::Value::TYPE_DICTIONARY,
+ vpn_fields,
+ NULL};
+const OncValueSignature kEthernetSignature = {base::Value::TYPE_DICTIONARY,
+ ethernet_fields,
+ NULL};
+const OncValueSignature kIPConfigSignature = {base::Value::TYPE_DICTIONARY,
+ ipconfig_fields,
+ NULL};
+const OncValueSignature kSavedIPConfigSignature = {base::Value::TYPE_DICTIONARY,
+ ipconfig_fields,
+ NULL};
const OncValueSignature kStaticIPConfigSignature = {
- base::Value::TYPE_DICTIONARY, ipconfig_fields, NULL
-};
-const OncValueSignature kProxyLocationSignature = {
- base::Value::TYPE_DICTIONARY, proxy_location_fields, NULL
-};
-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
-};
+ base::Value::TYPE_DICTIONARY,
+ ipconfig_fields,
+ NULL};
+const OncValueSignature kProxyLocationSignature = {base::Value::TYPE_DICTIONARY,
+ proxy_location_fields,
+ NULL};
+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
-};
+ 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
-};
+ 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
-};
+ base::Value::TYPE_LIST,
+ NULL,
+ &kNetworkConfigurationSignature};
const OncValueSignature kToplevelConfigurationSignature = {
- base::Value::TYPE_DICTIONARY, toplevel_configuration_fields, NULL
-};
+ 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
-};
+ 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
-};
+ 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
-};
+ base::Value::TYPE_DICTIONARY,
+ cellular_with_state_fields,
+ NULL,
+ &kCellularSignature};
const OncValueSignature kCellularProviderSignature = {
- base::Value::TYPE_DICTIONARY, cellular_provider_fields, NULL
-};
-const OncValueSignature kCellularApnSignature = {
- base::Value::TYPE_DICTIONARY, cellular_apn_fields, NULL
-};
+ base::Value::TYPE_DICTIONARY,
+ cellular_provider_fields,
+ NULL};
+const OncValueSignature kCellularApnSignature = {base::Value::TYPE_DICTIONARY,
+ cellular_apn_fields,
+ NULL};
const OncValueSignature kCellularFoundNetworkSignature = {
- base::Value::TYPE_DICTIONARY, cellular_found_network_fields, NULL
-};
-const OncValueSignature kSIMLockStatusSignature = {
- base::Value::TYPE_DICTIONARY, sim_lock_status_fields, NULL
-};
+ base::Value::TYPE_DICTIONARY,
+ cellular_found_network_fields,
+ NULL};
+const OncValueSignature kSIMLockStatusSignature = {base::Value::TYPE_DICTIONARY,
+ sim_lock_status_fields,
+ NULL};
const OncFieldSignature* GetFieldSignature(const OncValueSignature& signature,
const std::string& onc_field_name) {
« no previous file with comments | « chromeos/network/onc/onc_signature.h ('k') | chromeos/network/onc/onc_translation_tables.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698