Extending the translation from ONC to Shill.

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 "chromeos/network/onc/onc_constants.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 using base::Value;
@@ skipping 36 matching lines @@
 };
 
 const OncFieldSignature eap_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
   { eap::kAnonymousIdentity, flimflam::kEapAnonymousIdentityProperty,
     &kStringSignature },
   { eap::kClientCertPattern, NULL, &kCertificatePatternSignature },
   { eap::kClientCertRef, NULL, &kStringSignature },
   { eap::kClientCertType, NULL, &kStringSignature },
   { eap::kIdentity, flimflam::kEapIdentityProperty, &kStringSignature },
-  { eap::kInner, flimflam::kEapPhase2AuthProperty, &kStringSignature },
-  { eap::kOuter, flimflam::kEapMethodProperty, &kStringSignature },
+  // This field is converted during translation, see onc_translator_*.
+  { eap::kInner, NULL, &kStringSignature },
+  // This field is converted during translation, see onc_translator_*.
+  { eap::kOuter, NULL, &kStringSignature },
   { eap::kPassword, flimflam::kEapPasswordProperty, &kStringSignature },
   { eap::kSaveCredentials, flimflam::kSaveCredentialsProperty,
     &kBoolSignature },
   { eap::kServerCARef, flimflam::kEapCaCertNssProperty, &kStringSignature },
   { eap::kUseSystemCAs, flimflam::kEapUseSystemCasProperty, &kBoolSignature },
   { NULL }
 };
 
 const OncFieldSignature ipsec_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
@@ skipping 50 matching lines @@
   { vpn::kRemoteCertEKU, flimflam::kOpenVPNRemoteCertEKUProperty,
     &kStringSignature },
   // This field is converted during translation, see onc_translator_*.
   { vpn::kRemoteCertKU, NULL, &kStringListSignature },
   { vpn::kRemoteCertTLS, flimflam::kOpenVPNRemoteCertTLSProperty,
     &kStringSignature },
   { vpn::kRenegSec, flimflam::kOpenVPNRenegSecProperty, &kIntegerSignature },
   { vpn::kSaveCredentials, flimflam::kSaveCredentialsProperty,
     &kBoolSignature },
   { vpn::kServerCARef, flimflam::kOpenVPNCaCertNSSProperty, &kStringSignature },
+  // Not supported, yet.
   { vpn::kServerCertRef, NULL, &kStringSignature },
   { vpn::kServerPollTimeout, flimflam::kOpenVPNServerPollTimeoutProperty,
     &kIntegerSignature },
   { vpn::kShaper, flimflam::kOpenVPNShaperProperty, &kIntegerSignature },
   { vpn::kStaticChallenge, flimflam::kOpenVPNStaticChallengeProperty,
     &kStringSignature },
   { vpn::kTLSAuthContents, flimflam::kOpenVPNTLSAuthContentsProperty,
     &kStringSignature },
   { vpn::kTLSRemote, flimflam::kOpenVPNTLSRemoteProperty, &kStringSignature },
   { vpn::kUsername, flimflam::kOpenVPNUserProperty, &kStringSignature },
+  // Not supported, yet.
   { vpn::kVerb, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature vpn_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
   { vpn::kHost, flimflam::kProviderHostProperty, &kStringSignature },
   { vpn::kIPsec, NULL, &kIPsecSignature },
   { vpn::kL2TP, NULL, &kL2TPSignature },
   { vpn::kOpenVPN, NULL, &kOpenVPNSignature },
   // This field is converted during translation, see onc_translator_*.
-  { kType, NULL, &kStringSignature },
+  { vpn::kType, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature ethernet_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
+  // Not supported, yet.
   { ethernet::kAuthentication, NULL, &kStringSignature },
   { ethernet::kEAP, NULL, &kEAPSignature },
   { NULL }
 };
 
 const OncFieldSignature ipconfig_fields[] = {
   { ipconfig::kGateway, NULL, &kStringSignature },
   { ipconfig::kIPAddress, NULL, &kStringSignature },
   { kNameServers, NULL, &kStringSignature },
   { ipconfig::kRoutingPrefix, NULL, &kIntegerSignature },
   { kSearchDomains, NULL, &kStringListSignature },
-  // This field is converted during translation, see onc_translator_*.
-  { kType, NULL, &kStringSignature },
+  { ipconfig::kType, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature proxy_location_fields[] = {
   { proxy::kHost, NULL, &kStringSignature },
   { proxy::kPort, NULL, &kIntegerSignature },
   { NULL }
 };
 
 const OncFieldSignature proxy_manual_fields[] = {
   { proxy::kFtp, NULL, &kProxyLocationSignature },
   { proxy::kHttp, NULL, &kProxyLocationSignature },
   { proxy::kHttps, NULL, &kProxyLocationSignature },
   { proxy::kSocks, NULL, &kProxyLocationSignature },
   { NULL }
 };
 
 const OncFieldSignature proxy_settings_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
   { proxy::kExcludeDomains, NULL, &kStringListSignature },
   { proxy::kManual, NULL, &kProxyManualSignature },
   { proxy::kPAC, NULL, &kStringSignature },
-  { kType, NULL, &kStringSignature },
+  { proxy::kType, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature wifi_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
   { wifi::kAutoConnect, flimflam::kAutoConnectProperty, &kBoolSignature },
   { wifi::kEAP, NULL, &kEAPSignature },
   { wifi::kHiddenSSID, flimflam::kWifiHiddenSsid, &kBoolSignature },
   { wifi::kPassphrase, flimflam::kPassphraseProperty, &kStringSignature },
   { wifi::kSSID, flimflam::kSSIDProperty, &kStringSignature },
-  { wifi::kSecurity, flimflam::kSecurityProperty, &kStringSignature },
+  // This field is converted during translation, see onc_translator_*.
+  { wifi::kSecurity, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature network_configuration_fields[] = {
   { kRecommended, NULL, &kRecommendedSignature },
   { kEthernet, NULL, &kEthernetSignature },
   { kGUID, flimflam::kGuidProperty, &kStringSignature },
   { kIPConfigs, NULL, &kIPConfigListSignature },
-  { kName, flimflam::kNameProperty, &kStringSignature },
+  // Shill doesn't allow setting the name for non-VPN networks.
+  // This field is conditionally translated, see onc_translator_*.
+  { kName, NULL, &kStringSignature },
   { kNameServers, NULL, &kStringListSignature },
   { kProxySettings, NULL, &kProxySettingsSignature },
   { kRemove, NULL, &kBoolSignature },
   { kSearchDomains, NULL, &kStringListSignature },
   // This field is converted during translation, see onc_translator_*.
   { kType, NULL, &kStringSignature },
   { kVPN, NULL, &kVPNSignature },
   { kWiFi, NULL, &kWiFiSignature },
   { NULL }
 };
 
 const OncFieldSignature certificate_fields[] = {
   { kGUID, flimflam::kGuidProperty, &kStringSignature },
   { certificate::kPKCS12, NULL, &kStringSignature },
   { kRemove, NULL, &kBoolSignature },
   { certificate::kTrust, NULL, &kStringListSignature },
-  { kType, NULL, &kStringSignature },
+  { certificate::kType, NULL, &kStringSignature },
   { certificate::kX509, NULL, &kStringSignature },
   { NULL }
 };
 
 const OncFieldSignature toplevel_configuration_fields[] = {
   { kCertificates, NULL, &kCertificateListSignature },
   { kNetworkConfigurations, NULL, &kNetworkConfigurationListSignature },
   { kType, NULL, &kStringSignature },
   { encrypted::kCipher, NULL, &kStringSignature },
   { encrypted::kCiphertext, NULL, &kStringSignature },
@@ skipping 73 matching lines @@
   for (const OncFieldSignature* field_signature = signature.fields;
        field_signature->onc_field_name != NULL; ++field_signature) {
     if (onc_field_name == field_signature->onc_field_name)
       return field_signature;
   }
   return NULL;
 }
 
 }  // namespace onc
 }  // namespace chromeos