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

Side by Side Diff: chromeos/network/onc/onc_translation_tables.cc

Issue 1058973002: Add an ONC property for disabling LCP echo (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Typo "Enabled" instead of "Disabled" Created 5 years, 8 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/network/onc/onc_translation_tables.h" 5 #include "chromeos/network/onc/onc_translation_tables.h"
6 6
7 #include <cstddef> 7 #include <cstddef>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "components/onc/onc_constants.h" 10 #include "components/onc/onc_constants.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 const FieldTranslationEntry xauth_fields[] = { 51 const FieldTranslationEntry xauth_fields[] = {
52 {::onc::vpn::kPassword, shill::kL2tpIpsecXauthPasswordProperty}, 52 {::onc::vpn::kPassword, shill::kL2tpIpsecXauthPasswordProperty},
53 {::onc::vpn::kUsername, shill::kL2tpIpsecXauthUserProperty}, 53 {::onc::vpn::kUsername, shill::kL2tpIpsecXauthUserProperty},
54 {NULL}}; 54 {NULL}};
55 55
56 const FieldTranslationEntry l2tp_fields[] = { 56 const FieldTranslationEntry l2tp_fields[] = {
57 {::onc::vpn::kPassword, shill::kL2tpIpsecPasswordProperty}, 57 {::onc::vpn::kPassword, shill::kL2tpIpsecPasswordProperty},
58 // We don't synchronize l2tp's SaveCredentials field for now, as Shill 58 // We don't synchronize l2tp's SaveCredentials field for now, as Shill
59 // doesn't support separate settings for ipsec and l2tp. 59 // doesn't support separate settings for ipsec and l2tp.
60 // { ::onc::vpn::kSaveCredentials, &kBoolSignature }, 60 // { ::onc::vpn::kSaveCredentials, &kBoolSignature },
61 {::onc::vpn::kUsername, shill::kL2tpIpsecUserProperty}, 61 {::onc::vpn::kUsername, shill::kL2tpIpsecUserProperty},
stevenjb 2015/04/03 23:45:31 nit: s/vpn/l2tp/
62 {::onc::l2tp::kLcpEchoDisabled, shill::kL2tpIpsecLcpEchoDisabledProperty},
62 {NULL}}; 63 {NULL}};
63 64
64 const FieldTranslationEntry openvpn_fields[] = { 65 const FieldTranslationEntry openvpn_fields[] = {
65 {::onc::openvpn::kAuth, shill::kOpenVPNAuthProperty}, 66 {::onc::openvpn::kAuth, shill::kOpenVPNAuthProperty},
66 {::onc::openvpn::kAuthNoCache, shill::kOpenVPNAuthNoCacheProperty}, 67 {::onc::openvpn::kAuthNoCache, shill::kOpenVPNAuthNoCacheProperty},
67 {::onc::openvpn::kAuthRetry, shill::kOpenVPNAuthRetryProperty}, 68 {::onc::openvpn::kAuthRetry, shill::kOpenVPNAuthRetryProperty},
68 {::onc::openvpn::kCipher, shill::kOpenVPNCipherProperty}, 69 {::onc::openvpn::kCipher, shill::kOpenVPNCipherProperty},
69 {::onc::openvpn::kCompLZO, shill::kOpenVPNCompLZOProperty}, 70 {::onc::openvpn::kCompLZO, shill::kOpenVPNCompLZOProperty},
70 {::onc::openvpn::kCompNoAdapt, shill::kOpenVPNCompNoAdaptProperty}, 71 {::onc::openvpn::kCompNoAdapt, shill::kOpenVPNCompNoAdaptProperty},
71 {::onc::openvpn::kIgnoreDefaultRoute, 72 {::onc::openvpn::kIgnoreDefaultRoute,
(...skipping 354 matching lines...) Expand 10 before | Expand all | Expand 10 after
426 continue; 427 continue;
427 *onc_value = table[i].onc_value; 428 *onc_value = table[i].onc_value;
428 return true; 429 return true;
429 } 430 }
430 LOG(ERROR) << "Value '" << shill_value << "' cannot be translated to ONC"; 431 LOG(ERROR) << "Value '" << shill_value << "' cannot be translated to ONC";
431 return false; 432 return false;
432 } 433 }
433 434
434 } // namespace onc 435 } // namespace onc
435 } // namespace chromeos 436 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698