summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chromeos/network/onc/onc_signature.cc1
-rw-r--r--chromeos/network/onc/onc_translation_tables.cc2
-rw-r--r--components/onc/docs/onc_spec.html16
-rw-r--r--components/onc/onc_constants.cc1
-rw-r--r--components/onc/onc_constants.h1
5 files changed, 21 insertions, 0 deletions
diff --git a/chromeos/network/onc/onc_signature.cc b/chromeos/network/onc/onc_signature.cc
index f647450..eb469ad 100644
--- a/chromeos/network/onc/onc_signature.cc
+++ b/chromeos/network/onc/onc_signature.cc
@@ -112,6 +112,7 @@ const OncFieldSignature openvpn_fields[] = {
{ ::onc::vpn::kClientCertType, &kStringSignature},
{ ::onc::openvpn::kCompLZO, &kStringSignature},
{ ::onc::openvpn::kCompNoAdapt, &kBoolSignature},
+ { ::onc::openvpn::kIgnoreDefaultRoute, &kBoolSignature},
{ ::onc::openvpn::kKeyDirection, &kStringSignature},
{ ::onc::openvpn::kNsCertType, &kStringSignature},
{ ::onc::vpn::kPassword, &kStringSignature},
diff --git a/chromeos/network/onc/onc_translation_tables.cc b/chromeos/network/onc/onc_translation_tables.cc
index e09c030..820c177 100644
--- a/chromeos/network/onc/onc_translation_tables.cc
+++ b/chromeos/network/onc/onc_translation_tables.cc
@@ -67,6 +67,8 @@ const FieldTranslationEntry openvpn_fields[] = {
{ ::onc::openvpn::kCipher, shill::kOpenVPNCipherProperty},
{ ::onc::openvpn::kCompLZO, shill::kOpenVPNCompLZOProperty},
{ ::onc::openvpn::kCompNoAdapt, shill::kOpenVPNCompNoAdaptProperty},
+ { ::onc::openvpn::kIgnoreDefaultRoute,
+ shill::kOpenVPNIgnoreDefaultRouteProperty},
{ ::onc::openvpn::kKeyDirection, shill::kOpenVPNKeyDirectionProperty},
{ ::onc::openvpn::kNsCertType, shill::kOpenVPNNsCertTypeProperty},
{ ::onc::vpn::kPassword, shill::kOpenVPNPasswordProperty},
diff --git a/components/onc/docs/onc_spec.html b/components/onc/docs/onc_spec.html
index 10b2f0f..b93b151 100644
--- a/components/onc/docs/onc_spec.html
+++ b/components/onc/docs/onc_spec.html
@@ -1022,6 +1022,22 @@
Disables adaptive compression.
</dd>
+ <dt class="field">IgnoreDefaultRoute</dt>
+ <dd>
+ <span class="field_meta">
+ (optional, defaults to <span class="value">false</span>)
+ <span class="type">bool</span>
+ </span>
+ Omits a default route to the VPN gateway while the connection is active.
+ By default, the client creates a default route to the gateway address
+ advertised by the VPN server. Setting this value to
+ <span class="value">true</span> will allow split tunnelling for
+ configurations where the VPN server omits explicit default routes.
+ This is roughly equivalent to omitting "redirect-gateway" OpenVPN client
+ configuration option. If the server pushes a "redirect-gateway"
+ configuration flag to the client, this option is ignored.
+ </dd>
+
<dt class="field">KeyDirection</dt>
<dd>
<span class="field_meta">
diff --git a/components/onc/onc_constants.cc b/components/onc/onc_constants.cc
index 260d19a..9155612 100644
--- a/components/onc/onc_constants.cc
+++ b/components/onc/onc_constants.cc
@@ -260,6 +260,7 @@ const char kAuth[] = "Auth";
const char kCipher[] = "Cipher";
const char kCompLZO[] = "CompLZO";
const char kCompNoAdapt[] = "CompNoAdapt";
+const char kIgnoreDefaultRoute[] = "IgnoreDefaultRoute";
const char kInteract[] = "interact";
const char kKeyDirection[] = "KeyDirection";
const char kNoInteract[] = "nointeract";
diff --git a/components/onc/onc_constants.h b/components/onc/onc_constants.h
index c68536a..5732908 100644
--- a/components/onc/onc_constants.h
+++ b/components/onc/onc_constants.h
@@ -277,6 +277,7 @@ ONC_EXPORT extern const char kAuth[];
ONC_EXPORT extern const char kCipher[];
ONC_EXPORT extern const char kCompLZO[];
ONC_EXPORT extern const char kCompNoAdapt[];
+ONC_EXPORT extern const char kIgnoreDefaultRoute[];
ONC_EXPORT extern const char kInteract[];
ONC_EXPORT extern const char kKeyDirection[];
ONC_EXPORT extern const char kNoInteract[];