diff options
author | bartfab <bartfab@chromium.org> | 2015-03-18 16:58:36 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-03-18 23:59:30 +0000 |
commit | 82bb909334491a927f4e77ae5e2f0326fe4da0e2 (patch) | |
tree | 430d33fdec0f616ed32d82cdc48e2b5e964b88eb /components/onc | |
parent | 07840d895caf8b511ffd2209d3ce2ffb1ae4efe7 (diff) | |
download | chromium_src-82bb909334491a927f4e77ae5e2f0326fe4da0e2.zip chromium_src-82bb909334491a927f4e77ae5e2f0326fe4da0e2.tar.gz chromium_src-82bb909334491a927f4e77ae5e2f0326fe4da0e2.tar.bz2 |
Add an ONC property for the third-party VPN provider extension ID
This CL maps the third-party VPN provider extension ID (which is
stored in shill's |Provider.Host| field) to an ONC property.
BUG=460428
TEST=Extended unit tests and API test
Review URL: https://codereview.chromium.org/1019033002
Cr-Commit-Position: refs/heads/master@{#321238}
Diffstat (limited to 'components/onc')
-rw-r--r-- | components/onc/docs/onc_spec.html | 37 | ||||
-rw-r--r-- | components/onc/onc_constants.cc | 4 | ||||
-rw-r--r-- | components/onc/onc_constants.h | 4 |
3 files changed, 43 insertions, 2 deletions
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html index b364ab7..7c6c553 100644 --- a/components/onc/docs/onc_spec.html +++ b/components/onc/docs/onc_spec.html @@ -850,6 +850,16 @@ OpenVPN settings. </dd> + <dt class="field">ThirdPartyVPN</dt> + <dd> + <span class="field_meta"> + (required if <span class="field">Type</span> is + <span class="value">ThirdPartyVPN</span>, otherwise ignored) + <span class="type">ThirdPartyVPN</span> + </span> + Third-party VPN provider settings. + </dd> + <dt class="field">Type</dt> <dd> <span class="field_meta"> @@ -859,8 +869,9 @@ <span class="rule"> <span class="rule_id"></span> Allowed values are <span class="value">IPsec</span>, - <span class="value">L2TP-IPsec</span>, and - <span class="value">OpenVPN</span>. + <span class="value">L2TP-IPsec</span>, + <span class="value">OpenVPN</span>, and + <span class="value">ThirdPartyVPN</span>. </span> Type of the VPN. </dd> @@ -1580,7 +1591,29 @@ Determines which of the host's X.509 names will be verified. Allowed values are <span class="value">name</span>, <span class="value">name-prefix</span> and <span class="value">subject</span>. See OpenVPN's documentation for "--verify-x509-name" for the meaning of each value. Defaults to OpenVPN's default if not specified. </dd> </dl> +</section> + +<section> + <h1>Third-party VPN provider based connections and types</h1> + <p> + <span class="field">VPN.Type</span> must be + <span class="value">ThirdPartyVPN</span>. + </p> + <p> + <span class="type">ThirdPartyVPN</span> type contains the following: + </p> + + <dl class="field_list"> + <dt class="field">ExtensionID</dt> + <dd> + <span class="field_meta"> + (required) + <span class="type">string</span> + </span> + The extension ID of the third-party VPN provider used by this network. + </dd> + </dl> </section> </section> diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc index 0c14f23..8945059 100644 --- a/components/onc/onc_constants.cc +++ b/components/onc/onc_constants.cc @@ -349,6 +349,10 @@ const char kPassword[] = "Password"; const char kPasswordAndOTP[] = "PasswordAndOTP"; } // openvpn_user_auth_type +namespace third_party_vpn { +const char kExtensionID[] = "ExtensionID"; +} // third_party_vpn + namespace verify_x509 { const char kName[] = "Name"; const char kType[] = "Type"; diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h index 6329ff8..e3b6594 100644 --- a/components/onc/onc_constants.h +++ b/components/onc/onc_constants.h @@ -367,6 +367,10 @@ ONC_EXPORT extern const char kPassword[]; ONC_EXPORT extern const char kPasswordAndOTP[]; } // openvpn_user_auth_type +namespace third_party_vpn { +ONC_EXPORT extern const char kExtensionID[]; +} // third_party_vpn + namespace verify_x509 { ONC_EXPORT extern const char kName[]; ONC_EXPORT extern const char kType[]; |