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

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

Issue 540613002: Translate Saved/StaticIPConfig properties from ONC to Shill (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix tests Created 6 years, 3 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_shill_to_onc.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 b538145c12145d22b8a51adda7462efc8b47ace3..9a538cde4a96869240d39f6d298c1f08b41495da 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -185,6 +185,24 @@ const FieldTranslationEntry ipconfig_fields[] = {
// 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},
+ {NULL}};
+
+const FieldTranslationEntry saved_ipconfig_fields[] = {
+ { ::onc::ipconfig::kIPAddress, shill::kSavedIPAddressProperty},
+ { ::onc::ipconfig::kGateway, shill::kSavedIPGatewayProperty},
+ { ::onc::ipconfig::kRoutingPrefix, shill::kSavedIPPrefixlenProperty},
+ // NameServers are converted during translation, see onc_translator_*.
+ // { ::onc::ipconfig::kNameServers, shill::kSavedIPNameServersProperty},
+ {NULL}};
+
+const FieldTranslationEntry static_ipconfig_fields[] = {
+ { ::onc::ipconfig::kIPAddress, shill::kStaticIPAddressProperty},
+ { ::onc::ipconfig::kGateway, shill::kStaticIPGatewayProperty},
+ { ::onc::ipconfig::kRoutingPrefix, shill::kStaticIPPrefixlenProperty},
+ // NameServers are converted during translation, see onc_translator_*.
+ // { ::onc::ipconfig::kNameServers, shill::kStaticIPNameServersProperty},
{NULL}};
struct OncValueTranslationEntry {
@@ -211,6 +229,8 @@ const OncValueTranslationEntry onc_value_translation_table[] = {
{ &kNetworkWithStateSignature, network_fields },
{ &kNetworkConfigurationSignature, network_fields },
{ &kIPConfigSignature, ipconfig_fields },
+ { &kSavedIPConfigSignature, saved_ipconfig_fields },
+ { &kStaticIPConfigSignature, static_ipconfig_fields },
{ NULL }
};
« no previous file with comments | « chromeos/network/onc/onc_signature.cc ('k') | chromeos/network/onc/onc_translator_shill_to_onc.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698