summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHendrik Donner <hendrik@rennod.org>2016-03-02 23:31:37 +0100
committerPatrik Flykt <patrik.flykt@linux.intel.com>2016-03-08 15:53:00 +0200
commit27f3cc1ad123055871131f8b499d2b79d29b3ada (patch)
tree505f26f794b95cc955787bb967be07f26d472161
parent6918ec2291f428f232ccff2082cbee11f447df67 (diff)
downloadconnman-27f3cc1ad123055871131f8b499d2b79d29b3ada.tar.gz
doc: Add tap device related configuration options for VPNC
-rw-r--r--doc/connman-vpn-provider.config.5.in4
-rw-r--r--doc/vpn-config-format.txt3
2 files changed, 7 insertions, 0 deletions
diff --git a/doc/connman-vpn-provider.config.5.in b/doc/connman-vpn-provider.config.5.in
index 6b5306ae..ef704352 100644
--- a/doc/connman-vpn-provider.config.5.in
+++ b/doc/connman-vpn-provider.config.5.in
@@ -201,6 +201,10 @@ Enable single DES encryption.
.TP
.B VPNC.NoEncryption=true \fR|\fB false
Enable usage of no encryption for data traffic.
+.TP
+.BI VPNC.DeviceType= tun \fR|\fB tap
+Whether the VPN should use a tun (OSI layer 3) or tap (OSI layer 2) device.
+Defaults to tun if omitted.
.SS L2TP
The following keys are optional for l2tp (\fBxl2tp.conf\fP(5), \fBpppd\fP(8))
networks:
diff --git a/doc/vpn-config-format.txt b/doc/vpn-config-format.txt
index 64eaebaf..0bc62c08 100644
--- a/doc/vpn-config-format.txt
+++ b/doc/vpn-config-format.txt
@@ -131,6 +131,9 @@ VPNC VPN supports following options (see vpnc(8) for details):
VPNC.SingleDES Enable Single DES enables single DES encryption (O)
VPNC.NoEncryption Enable no encryption enables using no encryption for data
traffic (O)
+ VPNC.DeviceType Interface mode Whether the VPN should use a tun (OSI
+ layer 3) or tap (OSI layer 2) device.
+ Value is "tun" (default) or "tap" (O)
L2TP VPN supports following options (see xl2tpd.conf(5) and pppd(8) for details)
Option name xl2tpd config value Description