Add an ONC property for disabling LCP echo

This CL maps an ONC property for disabling L2TP connection
monitoring via PPP LCP frames.

BUG=463602
TEST=Expanded test ONC and JSON test sets

Review URL: https://codereview.chromium.org/1058973002

Cr-Commit-Position: refs/heads/master@{#323943}

chromeos/network/onc/onc_signature.cc

@@ -95,9 +95,10 @@ const OncFieldSignature xauth_fields[] = {
 
 const OncFieldSignature l2tp_fields[] = {
     {::onc::kRecommended, &kRecommendedSignature},
-    {::onc::vpn::kPassword, &kStringSignature},
-    {::onc::vpn::kSaveCredentials, &kBoolSignature},
-    {::onc::vpn::kUsername, &kStringSignature},
+    {::onc::l2tp::kPassword, &kStringSignature},
+    {::onc::l2tp::kSaveCredentials, &kBoolSignature},
+    {::onc::l2tp::kUsername, &kStringSignature},
+    {::onc::l2tp::kLcpEchoDisabled, &kBoolSignature},
     {NULL}};
 
 const OncFieldSignature openvpn_fields[] = {

chromeos/network/onc/onc_translation_tables.cc

@@ -54,11 +54,12 @@ const FieldTranslationEntry xauth_fields[] = {
     {NULL}};
 
 const FieldTranslationEntry l2tp_fields[] = {
-    {::onc::vpn::kPassword, shill::kL2tpIpsecPasswordProperty},
+    {::onc::l2tp::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},
+    // { ::onc::l2tp::kSaveCredentials, &kBoolSignature },
+    {::onc::l2tp::kUsername, shill::kL2tpIpsecUserProperty},
+    {::onc::l2tp::kLcpEchoDisabled, shill::kL2tpIpsecLcpEchoDisabledProperty},
     {NULL}};
 
 const FieldTranslationEntry openvpn_fields[] = {

chromeos/test/data/network/l2tpipsec_clientcert_with_cert_pems.onc

@@ -29,7 +29,8 @@
       },
       "L2TP": {
           "Username": "some username",
-          "Password": "some password"
+          "Password": "some password",
+          "LcpEchoDisabled": true
       }
   }
 }

chromeos/test/data/network/shill_l2tpipsec.json

@@ -8,5 +8,6 @@
   "L2TPIPsec.XauthPassword": "some xauth password",
   "L2TPIPsec.XauthUser": "some xauth username",
   "L2TPIPsec.Password": "some password",
+  "L2TPIPsec.LCPEchoDisabled": true,
   "SaveCredentials": true
 }

chromeos/test/data/network/shill_l2tpipsec_clientcert.json

@@ -4,6 +4,7 @@
    "L2TPIPsec.User": "some username",
    "L2TPIPsec.XauthPassword": "some xauth password",
    "L2TPIPsec.XauthUser": "some xauth username",
+   "L2TPIPsec.LCPEchoDisabled": true,
    "Name": "MyL2TPVPN",
    "Provider.Host": "some.host.org",
    "Provider.Type": "l2tpipsec",

chromeos/test/data/network/shill_output_l2tpipsec.json

@@ -3,6 +3,7 @@
   "Name": "MyL2TPVPN",
   "Provider": {
     "Host": "some.host.org",
+    "L2TPIPsec.LCPEchoDisabled": true,
     "L2TPIPsec.PSK": "some_preshared_key",
     "L2TPIPsec.User": "some username",
     "L2TPIPsec.XauthPassword": "some xauth password",

chromeos/test/data/network/translation_of_shill_l2tpipsec.onc

@@ -21,6 +21,7 @@
     "L2TP": {
       "Username": "some username",
       "Password": "some password",
+      "LcpEchoDisabled": true,
     },
   }
 }

chromeos/test/data/network/valid_l2tpipsec.onc

@@ -16,7 +16,8 @@
     },
     "L2TP": {
       "Username": "some username",
-      "Password": "some password"
+      "Password": "some password",
+      "LcpEchoDisabled": true
     }
   }
 }

components/onc/onc_constants.cc

@@ -314,6 +314,13 @@ const char kServerCARefs[] = "ServerCARefs";
 const char kXAUTH[] = "XAUTH";
 }  // namespace ipsec
 
+namespace l2tp {
+const char kLcpEchoDisabled[] = "LcpEchoDisabled";
+const char kPassword[] = "Password";
+const char kSaveCredentials[] = "SaveCredentials";
+const char kUsername[] = "Username";
+}  // namespace l2tp
+
 namespace openvpn {
 const char kAuthNoCache[] = "AuthNoCache";
 const char kAuthRetry[] = "AuthRetry";

components/onc/onc_constants.h

@@ -332,6 +332,13 @@ ONC_EXPORT extern const char kServerCARefs[];
 ONC_EXPORT extern const char kXAUTH[];
 }  // namespace ipsec
 
+namespace l2tp {
+ONC_EXPORT extern const char kLcpEchoDisabled[];
+ONC_EXPORT extern const char kPassword[];
+ONC_EXPORT extern const char kSaveCredentials[];
+ONC_EXPORT extern const char kUsername[];
+}  // namespace l2tp
+
 namespace openvpn {
 ONC_EXPORT extern const char kAuthNoCache[];
 ONC_EXPORT extern const char kAuthRetry[];