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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chromeos/network/onc/onc_translation_tables.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.cc ('k') | chromeos/network/onc/onc_translator_onc_to_shill.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chromeos/network/onc/onc_translation_tables.cc
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index 94af3ecc42f0a66757627ba78e189bd1cef0bf3e..8c8fe9918cc202b79863e2a17aa2ff9fd324f3a6 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -22,161 +22,162 @@ namespace onc {
namespace {
const FieldTranslationEntry eap_fields[] = {
- { ::onc::eap::kAnonymousIdentity, shill::kEapAnonymousIdentityProperty},
- { ::onc::eap::kIdentity, shill::kEapIdentityProperty},
+ {::onc::eap::kAnonymousIdentity, shill::kEapAnonymousIdentityProperty},
+ {::onc::eap::kIdentity, shill::kEapIdentityProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::eap::kInner, shill::kEapPhase2AuthProperty },
// This field is converted during translation, see onc_translator_*.
// { ::onc::eap::kOuter, shill::kEapMethodProperty },
- { ::onc::eap::kPassword, shill::kEapPasswordProperty},
- { ::onc::eap::kSaveCredentials, shill::kSaveCredentialsProperty},
- { ::onc::eap::kServerCAPEMs, shill::kEapCaCertPemProperty},
- { ::onc::eap::kUseSystemCAs, shill::kEapUseSystemCasProperty},
+ {::onc::eap::kPassword, shill::kEapPasswordProperty},
+ {::onc::eap::kSaveCredentials, shill::kSaveCredentialsProperty},
+ {::onc::eap::kServerCAPEMs, shill::kEapCaCertPemProperty},
+ {::onc::eap::kUseSystemCAs, shill::kEapUseSystemCasProperty},
{NULL}};
const FieldTranslationEntry ipsec_fields[] = {
// This field is converted during translation, see onc_translator_*.
// { ::onc::ipsec::kAuthenticationType, shill::kL2tpIpsecAuthenticationType
// },
- { ::onc::ipsec::kGroup, shill::kL2tpIpsecTunnelGroupProperty},
+ {::onc::ipsec::kGroup, shill::kL2tpIpsecTunnelGroupProperty},
// Ignored by Shill, not necessary to synchronize.
// { ::onc::ipsec::kIKEVersion, shill::kL2tpIpsecIkeVersion },
- { ::onc::ipsec::kPSK, shill::kL2tpIpsecPskProperty},
+ {::onc::ipsec::kPSK, shill::kL2tpIpsecPskProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty},
- { ::onc::ipsec::kServerCAPEMs, shill::kL2tpIpsecCaCertPemProperty},
+ {::onc::ipsec::kServerCAPEMs, shill::kL2tpIpsecCaCertPemProperty},
{NULL}};
const FieldTranslationEntry xauth_fields[] = {
- { ::onc::vpn::kPassword, shill::kL2tpIpsecXauthPasswordProperty},
- { ::onc::vpn::kUsername, shill::kL2tpIpsecXauthUserProperty},
+ {::onc::vpn::kPassword, shill::kL2tpIpsecXauthPasswordProperty},
+ {::onc::vpn::kUsername, shill::kL2tpIpsecXauthUserProperty},
{NULL}};
const FieldTranslationEntry l2tp_fields[] = {
- { ::onc::vpn::kPassword, shill::kL2tpIpsecPasswordProperty},
+ {::onc::vpn::kPassword, shill::kL2tpIpsecPasswordProperty},
// We don't synchronize l2tp's SaveCredentials field for now, as Shill
// doesn't support separate settings for ipsec and l2tp.
// { ::onc::vpn::kSaveCredentials, &kBoolSignature },
- { ::onc::vpn::kUsername, shill::kL2tpIpsecUserProperty}, {NULL}};
+ {::onc::vpn::kUsername, shill::kL2tpIpsecUserProperty},
+ {NULL}};
const FieldTranslationEntry openvpn_fields[] = {
- { ::onc::openvpn::kAuth, shill::kOpenVPNAuthProperty},
- { ::onc::openvpn::kAuthNoCache, shill::kOpenVPNAuthNoCacheProperty},
- { ::onc::openvpn::kAuthRetry, shill::kOpenVPNAuthRetryProperty},
- { ::onc::openvpn::kCipher, shill::kOpenVPNCipherProperty},
- { ::onc::openvpn::kCompLZO, shill::kOpenVPNCompLZOProperty},
- { ::onc::openvpn::kCompNoAdapt, shill::kOpenVPNCompNoAdaptProperty},
- { ::onc::openvpn::kIgnoreDefaultRoute,
- shill::kOpenVPNIgnoreDefaultRouteProperty},
- { ::onc::openvpn::kKeyDirection, shill::kOpenVPNKeyDirectionProperty},
- { ::onc::openvpn::kNsCertType, shill::kOpenVPNNsCertTypeProperty},
+ {::onc::openvpn::kAuth, shill::kOpenVPNAuthProperty},
+ {::onc::openvpn::kAuthNoCache, shill::kOpenVPNAuthNoCacheProperty},
+ {::onc::openvpn::kAuthRetry, shill::kOpenVPNAuthRetryProperty},
+ {::onc::openvpn::kCipher, shill::kOpenVPNCipherProperty},
+ {::onc::openvpn::kCompLZO, shill::kOpenVPNCompLZOProperty},
+ {::onc::openvpn::kCompNoAdapt, shill::kOpenVPNCompNoAdaptProperty},
+ {::onc::openvpn::kIgnoreDefaultRoute,
+ shill::kOpenVPNIgnoreDefaultRouteProperty},
+ {::onc::openvpn::kKeyDirection, shill::kOpenVPNKeyDirectionProperty},
+ {::onc::openvpn::kNsCertType, shill::kOpenVPNNsCertTypeProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::vpn::kOTP, shill::kOpenVPNTokenProperty or kOpenVPNOTPProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::vpn::kPassword, shill::kOpenVPNPasswordProperty},
- { ::onc::openvpn::kPort, shill::kOpenVPNPortProperty},
- { ::onc::openvpn::kProto, shill::kOpenVPNProtoProperty},
- { ::onc::openvpn::kPushPeerInfo, shill::kOpenVPNPushPeerInfoProperty},
- { ::onc::openvpn::kRemoteCertEKU, shill::kOpenVPNRemoteCertEKUProperty},
+ {::onc::openvpn::kPort, shill::kOpenVPNPortProperty},
+ {::onc::openvpn::kProto, shill::kOpenVPNProtoProperty},
+ {::onc::openvpn::kPushPeerInfo, shill::kOpenVPNPushPeerInfoProperty},
+ {::onc::openvpn::kRemoteCertEKU, shill::kOpenVPNRemoteCertEKUProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::openvpn::kRemoteCertKU, shill::kOpenVPNRemoteCertKUProperty },
- { ::onc::openvpn::kRemoteCertTLS, shill::kOpenVPNRemoteCertTLSProperty},
- { ::onc::openvpn::kRenegSec, shill::kOpenVPNRenegSecProperty},
+ {::onc::openvpn::kRemoteCertTLS, shill::kOpenVPNRemoteCertTLSProperty},
+ {::onc::openvpn::kRenegSec, shill::kOpenVPNRenegSecProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::vpn::kSaveCredentials, shill::kSaveCredentialsProperty},
- { ::onc::openvpn::kServerCAPEMs, shill::kOpenVPNCaCertPemProperty},
- { ::onc::openvpn::kServerPollTimeout,
- shill::kOpenVPNServerPollTimeoutProperty},
- { ::onc::openvpn::kShaper, shill::kOpenVPNShaperProperty},
- { ::onc::openvpn::kStaticChallenge, shill::kOpenVPNStaticChallengeProperty},
- { ::onc::openvpn::kTLSAuthContents, shill::kOpenVPNTLSAuthContentsProperty},
- { ::onc::openvpn::kTLSRemote, shill::kOpenVPNTLSRemoteProperty},
- { ::onc::vpn::kUsername, shill::kOpenVPNUserProperty},
- { ::onc::openvpn::kVerifyHash, shill::kOpenVPNVerifyHashProperty},
+ {::onc::openvpn::kServerCAPEMs, shill::kOpenVPNCaCertPemProperty},
+ {::onc::openvpn::kServerPollTimeout,
+ shill::kOpenVPNServerPollTimeoutProperty},
+ {::onc::openvpn::kShaper, shill::kOpenVPNShaperProperty},
+ {::onc::openvpn::kStaticChallenge, shill::kOpenVPNStaticChallengeProperty},
+ {::onc::openvpn::kTLSAuthContents, shill::kOpenVPNTLSAuthContentsProperty},
+ {::onc::openvpn::kTLSRemote, shill::kOpenVPNTLSRemoteProperty},
+ {::onc::vpn::kUsername, shill::kOpenVPNUserProperty},
+ {::onc::openvpn::kVerifyHash, shill::kOpenVPNVerifyHashProperty},
{NULL}};
const FieldTranslationEntry verify_x509_fields[] = {
- { ::onc::verify_x509::kName, shill::kOpenVPNVerifyX509NameProperty},
- { ::onc::verify_x509::kType, shill::kOpenVPNVerifyX509TypeProperty},
+ {::onc::verify_x509::kName, shill::kOpenVPNVerifyX509NameProperty},
+ {::onc::verify_x509::kType, shill::kOpenVPNVerifyX509TypeProperty},
{NULL}};
const FieldTranslationEntry vpn_fields[] = {
- { ::onc::vpn::kAutoConnect, shill::kAutoConnectProperty},
+ {::onc::vpn::kAutoConnect, shill::kAutoConnectProperty},
// These fields are converted during translation, see onc_translator_*.
// { ::onc::vpn::kHost, shill::kProviderHostProperty},
// { ::onc::vpn::kType, shill::kProviderTypeProperty },
{NULL}};
const FieldTranslationEntry wifi_fields[] = {
- { ::onc::wifi::kAutoConnect, shill::kAutoConnectProperty},
- { ::onc::wifi::kBSSID, shill::kWifiBSsid},
+ {::onc::wifi::kAutoConnect, shill::kAutoConnectProperty},
+ {::onc::wifi::kBSSID, shill::kWifiBSsid},
// This dictionary is converted during translation, see onc_translator_*.
// { ::onc::wifi::kEAP, shill::kEap*},
- { ::onc::wifi::kFrequency, shill::kWifiFrequency},
- { ::onc::wifi::kFrequencyList, shill::kWifiFrequencyListProperty},
- { ::onc::wifi::kHexSSID, shill::kWifiHexSsid},
- { ::onc::wifi::kHiddenSSID, shill::kWifiHiddenSsid},
- { ::onc::wifi::kPassphrase, shill::kPassphraseProperty},
+ {::onc::wifi::kFrequency, shill::kWifiFrequency},
+ {::onc::wifi::kFrequencyList, shill::kWifiFrequencyListProperty},
+ {::onc::wifi::kHexSSID, shill::kWifiHexSsid},
+ {::onc::wifi::kHiddenSSID, shill::kWifiHiddenSsid},
+ {::onc::wifi::kPassphrase, shill::kPassphraseProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::wifi::kSecurity, shill::kSecurityClassProperty },
- { ::onc::wifi::kSignalStrength, shill::kSignalStrengthProperty},
+ {::onc::wifi::kSignalStrength, shill::kSignalStrengthProperty},
{NULL}};
const FieldTranslationEntry wimax_fields[] = {
- { ::onc::wimax::kAutoConnect, shill::kAutoConnectProperty},
+ {::onc::wimax::kAutoConnect, shill::kAutoConnectProperty},
// This dictionary is converted during translation, see onc_translator_*.
// { ::onc::wimax::kEAP, shill::kEap*},
- { ::onc::wimax::kSignalStrength, shill::kSignalStrengthProperty},
+ {::onc::wimax::kSignalStrength, shill::kSignalStrengthProperty},
{NULL}};
const FieldTranslationEntry cellular_apn_fields[] = {
- { ::onc::cellular_apn::kAccessPointName, shill::kApnProperty},
- { ::onc::cellular_apn::kName, shill::kApnNameProperty},
- { ::onc::cellular_apn::kUsername, shill::kApnUsernameProperty},
- { ::onc::cellular_apn::kPassword, shill::kApnPasswordProperty},
- { ::onc::cellular_apn::kLocalizedName, shill::kApnLocalizedNameProperty},
- { ::onc::cellular_apn::kLanguage, shill::kApnLanguageProperty},
+ {::onc::cellular_apn::kAccessPointName, shill::kApnProperty},
+ {::onc::cellular_apn::kName, shill::kApnNameProperty},
+ {::onc::cellular_apn::kUsername, shill::kApnUsernameProperty},
+ {::onc::cellular_apn::kPassword, shill::kApnPasswordProperty},
+ {::onc::cellular_apn::kLocalizedName, shill::kApnLocalizedNameProperty},
+ {::onc::cellular_apn::kLanguage, shill::kApnLanguageProperty},
{NULL}};
const FieldTranslationEntry cellular_found_network_fields[] = {
- { ::onc::cellular_found_network::kNetworkId, shill::kNetworkIdProperty},
- { ::onc::cellular_found_network::kStatus, shill::kStatusProperty},
- { ::onc::cellular_found_network::kTechnology, shill::kTechnologyProperty},
- { ::onc::cellular_found_network::kShortName, shill::kShortNameProperty},
- { ::onc::cellular_found_network::kLongName, shill::kLongNameProperty},
+ {::onc::cellular_found_network::kNetworkId, shill::kNetworkIdProperty},
+ {::onc::cellular_found_network::kStatus, shill::kStatusProperty},
+ {::onc::cellular_found_network::kTechnology, shill::kTechnologyProperty},
+ {::onc::cellular_found_network::kShortName, shill::kShortNameProperty},
+ {::onc::cellular_found_network::kLongName, shill::kLongNameProperty},
{NULL}};
const FieldTranslationEntry cellular_provider_fields[] = {
- { ::onc::cellular_provider::kCode, shill::kOperatorCodeKey},
- { ::onc::cellular_provider::kCountry, shill::kOperatorCountryKey},
- { ::onc::cellular_provider::kName, shill::kOperatorNameKey},
+ {::onc::cellular_provider::kCode, shill::kOperatorCodeKey},
+ {::onc::cellular_provider::kCountry, shill::kOperatorCountryKey},
+ {::onc::cellular_provider::kName, shill::kOperatorNameKey},
{NULL}};
const FieldTranslationEntry sim_lock_status_fields[] = {
- { ::onc::sim_lock_status::kLockEnabled, shill::kSIMLockEnabledProperty},
- { ::onc::sim_lock_status::kLockType, shill::kSIMLockTypeProperty},
- { ::onc::sim_lock_status::kRetriesLeft, shill::kSIMLockRetriesLeftProperty},
+ {::onc::sim_lock_status::kLockEnabled, shill::kSIMLockEnabledProperty},
+ {::onc::sim_lock_status::kLockType, shill::kSIMLockTypeProperty},
+ {::onc::sim_lock_status::kRetriesLeft, shill::kSIMLockRetriesLeftProperty},
{NULL}};
// This must only contain Service properties and not Device properties.
// For Device properties see kCellularDeviceTable.
const FieldTranslationEntry cellular_fields[] = {
- { ::onc::cellular::kActivationType, shill::kActivationTypeProperty},
+ {::onc::cellular::kActivationType, shill::kActivationTypeProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::cellular::kActivationState, shill::kActivationStateProperty},
- { ::onc::vpn::kAutoConnect, shill::kAutoConnectProperty},
- { ::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty},
+ {::onc::vpn::kAutoConnect, shill::kAutoConnectProperty},
+ {::onc::cellular::kNetworkTechnology, shill::kNetworkTechnologyProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::cellular::kRoamingState, shill::kRoamingStateProperty},
- { ::onc::cellular::kSignalStrength, shill::kSignalStrengthProperty},
+ {::onc::cellular::kSignalStrength, shill::kSignalStrengthProperty},
{NULL}};
const FieldTranslationEntry network_fields[] = {
- { ::onc::network_config::kGUID, shill::kGuidProperty},
- { ::onc::network_config::kConnectable, shill::kConnectableProperty },
- { ::onc::network_config::kErrorState, shill::kErrorProperty },
- { ::onc::network_config::kPriority, shill::kPriorityProperty },
+ {::onc::network_config::kGUID, shill::kGuidProperty},
+ {::onc::network_config::kConnectable, shill::kConnectableProperty},
+ {::onc::network_config::kErrorState, shill::kErrorProperty},
+ {::onc::network_config::kPriority, shill::kPriorityProperty},
// Shill doesn't allow setting the name for non-VPN networks.
// Name is conditionally translated, see onc_translator_*.
@@ -196,22 +197,22 @@ const FieldTranslationEntry network_fields[] = {
{NULL}};
const FieldTranslationEntry ipconfig_fields[] = {
- { ::onc::ipconfig::kIPAddress, shill::kAddressProperty},
- { ::onc::ipconfig::kGateway, shill::kGatewayProperty},
- { ::onc::ipconfig::kRoutingPrefix, shill::kPrefixlenProperty},
- { ::onc::ipconfig::kNameServers, shill::kNameServersProperty},
+ {::onc::ipconfig::kIPAddress, shill::kAddressProperty},
+ {::onc::ipconfig::kGateway, shill::kGatewayProperty},
+ {::onc::ipconfig::kRoutingPrefix, shill::kPrefixlenProperty},
+ {::onc::ipconfig::kNameServers, shill::kNameServersProperty},
// This field is converted during translation, see ShillToONCTranslator::
// TranslateIPConfig. It is only converted from Shill->ONC.
// { ::onc::ipconfig::kType, shill::kMethodProperty},
- { ::onc::ipconfig::kWebProxyAutoDiscoveryUrl,
- shill::kWebProxyAutoDiscoveryUrlProperty},
+ {::onc::ipconfig::kWebProxyAutoDiscoveryUrl,
+ shill::kWebProxyAutoDiscoveryUrlProperty},
{NULL}};
const FieldTranslationEntry static_or_saved_ipconfig_fields[] = {
- { ::onc::ipconfig::kIPAddress, shill::kAddressProperty},
- { ::onc::ipconfig::kGateway, shill::kGatewayProperty},
- { ::onc::ipconfig::kRoutingPrefix, shill::kPrefixlenProperty},
- { ::onc::ipconfig::kNameServers, shill::kNameServersProperty},
+ {::onc::ipconfig::kIPAddress, shill::kAddressProperty},
+ {::onc::ipconfig::kGateway, shill::kGatewayProperty},
+ {::onc::ipconfig::kRoutingPrefix, shill::kPrefixlenProperty},
+ {::onc::ipconfig::kNameServers, shill::kNameServersProperty},
{NULL}};
struct OncValueTranslationEntry {
@@ -220,30 +221,29 @@ struct OncValueTranslationEntry {
};
const OncValueTranslationEntry onc_value_translation_table[] = {
- { &kEAPSignature, eap_fields },
- { &kIPsecSignature, ipsec_fields },
- { &kL2TPSignature, l2tp_fields },
- { &kXAUTHSignature, xauth_fields },
- { &kOpenVPNSignature, openvpn_fields },
- { &kVerifyX509Signature, verify_x509_fields },
- { &kVPNSignature, vpn_fields },
- { &kWiFiSignature, wifi_fields },
- { &kWiFiWithStateSignature, wifi_fields },
- { &kWiMAXSignature, wimax_fields },
- { &kWiMAXWithStateSignature, wimax_fields },
- { &kCellularApnSignature, cellular_apn_fields },
- { &kCellularFoundNetworkSignature, cellular_found_network_fields },
- { &kCellularProviderSignature, cellular_provider_fields },
- { &kSIMLockStatusSignature, sim_lock_status_fields },
- { &kCellularSignature, cellular_fields },
- { &kCellularWithStateSignature, cellular_fields },
- { &kNetworkWithStateSignature, network_fields },
- { &kNetworkConfigurationSignature, network_fields },
- { &kIPConfigSignature, ipconfig_fields },
- { &kSavedIPConfigSignature, static_or_saved_ipconfig_fields },
- { &kStaticIPConfigSignature, static_or_saved_ipconfig_fields },
- { NULL }
-};
+ {&kEAPSignature, eap_fields},
+ {&kIPsecSignature, ipsec_fields},
+ {&kL2TPSignature, l2tp_fields},
+ {&kXAUTHSignature, xauth_fields},
+ {&kOpenVPNSignature, openvpn_fields},
+ {&kVerifyX509Signature, verify_x509_fields},
+ {&kVPNSignature, vpn_fields},
+ {&kWiFiSignature, wifi_fields},
+ {&kWiFiWithStateSignature, wifi_fields},
+ {&kWiMAXSignature, wimax_fields},
+ {&kWiMAXWithStateSignature, wimax_fields},
+ {&kCellularApnSignature, cellular_apn_fields},
+ {&kCellularFoundNetworkSignature, cellular_found_network_fields},
+ {&kCellularProviderSignature, cellular_provider_fields},
+ {&kSIMLockStatusSignature, sim_lock_status_fields},
+ {&kCellularSignature, cellular_fields},
+ {&kCellularWithStateSignature, cellular_fields},
+ {&kNetworkWithStateSignature, network_fields},
+ {&kNetworkConfigurationSignature, network_fields},
+ {&kIPConfigSignature, ipconfig_fields},
+ {&kSavedIPConfigSignature, static_or_saved_ipconfig_fields},
+ {&kStaticIPConfigSignature, static_or_saved_ipconfig_fields},
+ {NULL}};
struct NestedShillDictionaryEntry {
const OncValueSignature* onc_signature;
@@ -251,21 +251,15 @@ struct NestedShillDictionaryEntry {
const char* const* shill_property_path;
};
-const char* cellular_apn_path_entries[] = {
- shill::kCellularApnProperty,
- NULL
-};
+const char* cellular_apn_path_entries[] = {shill::kCellularApnProperty, NULL};
-const char* static_ip_config_path_entries[] = {
- shill::kStaticIPConfigProperty,
- NULL
-};
+const char* static_ip_config_path_entries[] = {shill::kStaticIPConfigProperty,
+ NULL};
const NestedShillDictionaryEntry nested_shill_dictionaries[] = {
- { &kCellularApnSignature, cellular_apn_path_entries },
- { &kStaticIPConfigSignature, static_ip_config_path_entries },
- { NULL }
-};
+ {&kCellularApnSignature, cellular_apn_path_entries},
+ {&kStaticIPConfigSignature, static_ip_config_path_entries},
+ {NULL}};
} // namespace
@@ -273,55 +267,56 @@ const StringTranslationEntry kNetworkTypeTable[] = {
// This mapping is ensured in the translation code.
// { network_type::kEthernet, shill::kTypeEthernet },
// { network_type::kEthernet, shill::kTypeEthernetEap },
- { ::onc::network_type::kWiFi, shill::kTypeWifi},
- { ::onc::network_type::kWimax, shill::kTypeWimax},
- { ::onc::network_type::kCellular, shill::kTypeCellular},
- { ::onc::network_type::kVPN, shill::kTypeVPN},
+ {::onc::network_type::kWiFi, shill::kTypeWifi},
+ {::onc::network_type::kWimax, shill::kTypeWimax},
+ {::onc::network_type::kCellular, shill::kTypeCellular},
+ {::onc::network_type::kVPN, shill::kTypeVPN},
{NULL}};
const StringTranslationEntry kVPNTypeTable[] = {
- { ::onc::vpn::kTypeL2TP_IPsec, shill::kProviderL2tpIpsec},
- { ::onc::vpn::kOpenVPN, shill::kProviderOpenVpn},
- { ::onc::vpn::kThirdPartyVpn, shill::kProviderThirdPartyVpn},
+ {::onc::vpn::kTypeL2TP_IPsec, shill::kProviderL2tpIpsec},
+ {::onc::vpn::kOpenVPN, shill::kProviderOpenVpn},
+ {::onc::vpn::kThirdPartyVpn, shill::kProviderThirdPartyVpn},
{NULL}};
const StringTranslationEntry kWiFiSecurityTable[] = {
- { ::onc::wifi::kSecurityNone, shill::kSecurityNone},
- { ::onc::wifi::kWEP_PSK, shill::kSecurityWep},
- { ::onc::wifi::kWPA_PSK, shill::kSecurityPsk},
- { ::onc::wifi::kWPA_EAP, shill::kSecurity8021x},
+ {::onc::wifi::kSecurityNone, shill::kSecurityNone},
+ {::onc::wifi::kWEP_PSK, shill::kSecurityWep},
+ {::onc::wifi::kWPA_PSK, shill::kSecurityPsk},
+ {::onc::wifi::kWPA_EAP, shill::kSecurity8021x},
{NULL}};
const StringTranslationEntry kEAPOuterTable[] = {
- { ::onc::eap::kPEAP, shill::kEapMethodPEAP},
- { ::onc::eap::kEAP_TLS, shill::kEapMethodTLS},
- { ::onc::eap::kEAP_TTLS, shill::kEapMethodTTLS},
- { ::onc::eap::kLEAP, shill::kEapMethodLEAP},
+ {::onc::eap::kPEAP, shill::kEapMethodPEAP},
+ {::onc::eap::kEAP_TLS, shill::kEapMethodTLS},
+ {::onc::eap::kEAP_TTLS, shill::kEapMethodTTLS},
+ {::onc::eap::kLEAP, shill::kEapMethodLEAP},
{NULL}};
// Translation of the EAP.Inner field in case of EAP.Outer == PEAP
const StringTranslationEntry kEAP_PEAP_InnerTable[] = {
- { ::onc::eap::kMD5, shill::kEapPhase2AuthPEAPMD5},
- { ::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthPEAPMSCHAPV2}, {NULL}};
+ {::onc::eap::kMD5, shill::kEapPhase2AuthPEAPMD5},
+ {::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthPEAPMSCHAPV2},
+ {NULL}};
// Translation of the EAP.Inner field in case of EAP.Outer == TTLS
const StringTranslationEntry kEAP_TTLS_InnerTable[] = {
- { ::onc::eap::kMD5, shill::kEapPhase2AuthTTLSMD5},
- { ::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthTTLSMSCHAPV2},
- { ::onc::eap::kPAP, shill::kEapPhase2AuthTTLSPAP},
+ {::onc::eap::kMD5, shill::kEapPhase2AuthTTLSMD5},
+ {::onc::eap::kMSCHAPv2, shill::kEapPhase2AuthTTLSMSCHAPV2},
+ {::onc::eap::kPAP, shill::kEapPhase2AuthTTLSPAP},
{NULL}};
const StringTranslationEntry kActivationStateTable[] = {
- { ::onc::cellular::kActivated, shill::kActivationStateActivated},
- { ::onc::cellular::kActivating, shill::kActivationStateActivating},
- { ::onc::cellular::kNotActivated, shill::kActivationStateNotActivated},
- { ::onc::cellular::kPartiallyActivated,
- shill::kActivationStatePartiallyActivated},
+ {::onc::cellular::kActivated, shill::kActivationStateActivated},
+ {::onc::cellular::kActivating, shill::kActivationStateActivating},
+ {::onc::cellular::kNotActivated, shill::kActivationStateNotActivated},
+ {::onc::cellular::kPartiallyActivated,
+ shill::kActivationStatePartiallyActivated},
{NULL}};
const StringTranslationEntry kRoamingStateTable[] = {
- { ::onc::cellular::kRoamingHome, shill::kRoamingStateHome},
- { ::onc::cellular::kRoamingRoaming, shill::kRoamingStateRoaming},
+ {::onc::cellular::kRoamingHome, shill::kRoamingStateHome},
+ {::onc::cellular::kRoamingRoaming, shill::kRoamingStateRoaming},
{NULL}};
// This must contain only Shill Device properties and no Service properties.
@@ -329,30 +324,30 @@ const StringTranslationEntry kRoamingStateTable[] = {
const FieldTranslationEntry kCellularDeviceTable[] = {
// This field is converted during translation, see onc_translator_*.
// { ::onc::cellular::kAPNList, shill::kCellularApnListProperty},
- { ::onc::cellular::kAllowRoaming, shill::kCellularAllowRoamingProperty},
- { ::onc::cellular::kCarrier, shill::kCarrierProperty},
- { ::onc::cellular::kESN, shill::kEsnProperty},
- { ::onc::cellular::kFamily, shill::kTechnologyFamilyProperty},
- { ::onc::cellular::kFirmwareRevision, shill::kFirmwareRevisionProperty},
+ {::onc::cellular::kAllowRoaming, shill::kCellularAllowRoamingProperty},
+ {::onc::cellular::kCarrier, shill::kCarrierProperty},
+ {::onc::cellular::kESN, shill::kEsnProperty},
+ {::onc::cellular::kFamily, shill::kTechnologyFamilyProperty},
+ {::onc::cellular::kFirmwareRevision, shill::kFirmwareRevisionProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::cellular::kFoundNetworks, shill::kFoundNetworksProperty},
- { ::onc::cellular::kHardwareRevision, shill::kHardwareRevisionProperty},
+ {::onc::cellular::kHardwareRevision, shill::kHardwareRevisionProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::cellular::kHomeProvider, shill::kHomeProviderProperty},
- { ::onc::cellular::kICCID, shill::kIccidProperty},
- { ::onc::cellular::kIMEI, shill::kImeiProperty},
- { ::onc::cellular::kIMSI, shill::kImsiProperty},
- { ::onc::cellular::kManufacturer, shill::kManufacturerProperty},
- { ::onc::cellular::kMDN, shill::kMdnProperty},
- { ::onc::cellular::kMEID, shill::kMeidProperty},
- { ::onc::cellular::kMIN, shill::kMinProperty},
- { ::onc::cellular::kModelID, shill::kModelIDProperty},
- { ::onc::cellular::kPRLVersion, shill::kPRLVersionProperty},
+ {::onc::cellular::kICCID, shill::kIccidProperty},
+ {::onc::cellular::kIMEI, shill::kImeiProperty},
+ {::onc::cellular::kIMSI, shill::kImsiProperty},
+ {::onc::cellular::kManufacturer, shill::kManufacturerProperty},
+ {::onc::cellular::kMDN, shill::kMdnProperty},
+ {::onc::cellular::kMEID, shill::kMeidProperty},
+ {::onc::cellular::kMIN, shill::kMinProperty},
+ {::onc::cellular::kModelID, shill::kModelIDProperty},
+ {::onc::cellular::kPRLVersion, shill::kPRLVersionProperty},
// This field is converted during translation, see onc_translator_*.
// { ::onc::cellular::kSIMLockStatus, shill::kSIMLockStatusProperty},
- { ::onc::cellular::kSIMPresent, shill::kSIMPresentProperty},
- { ::onc::cellular::kSupportedCarriers, shill::kSupportedCarriersProperty},
- { ::onc::cellular::kSupportNetworkScan, shill::kSupportNetworkScanProperty},
+ {::onc::cellular::kSIMPresent, shill::kSIMPresentProperty},
+ {::onc::cellular::kSupportedCarriers, shill::kSupportedCarriersProperty},
+ {::onc::cellular::kSupportNetworkScan, shill::kSupportNetworkScanProperty},
{NULL}};
const FieldTranslationEntry* GetFieldTranslationTable(
@@ -384,8 +379,8 @@ std::vector<std::string> GetPathToNestedShillDictionary(
bool GetShillPropertyName(const std::string& onc_field_name,
const FieldTranslationEntry table[],
std::string* shill_property_name) {
- for (const FieldTranslationEntry* it = table;
- it->onc_field_name != NULL; ++it) {
+ for (const FieldTranslationEntry* it = table; it->onc_field_name != NULL;
+ ++it) {
if (it->onc_field_name != onc_field_name)
continue;
*shill_property_name = it->shill_property_name;
« no previous file with comments | « chromeos/network/onc/onc_signature.cc ('k') | chromeos/network/onc/onc_translator_onc_to_shill.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698