Merge branch 'jb51498' into 'master'

Add Force DPD interval and fix MTU for OpenConnect See merge request mer-core/connman!295
sailfishos · Nov 4, 2020 · f310403 · f310403
2 parents 8e611cc + b213573
commit f310403
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/connman/doc/vpn-config-format.txt b/connman/doc/vpn-config-format.txt
@@ -57,8 +57,12 @@ OpenConnect VPN supports following options (see openconnect(8) for details):
  OpenConnect.ClientCert --certificate      Client certificate file, needed
                                            by web authentication when AuthType
                                            is set as "publickey" (O)
- VPN.MTU                --mtu              Request MTU from server as the MTU
-                                           of the tunnel (O)
+ OpenConnect.MTU        --base-mtu         Indicate MTU as the path MTU between
+                                           client and server on the unencrypted
+                                           network. Newer servers will
+                                           automatically calculate the MTU to
+                                           be used on the tunnel from this
+                                           value. (O)
  OpenConnect.Cookie     --cookie-on-stdin  Cookie received as a result of the
                                            web authentication. As the cookie
                                            lifetime can be very limited, it
@@ -125,6 +129,11 @@ OpenConnect VPN supports following options (see openconnect(8) for details):
  OpenConnect.UserPrivateKey --sslkey       SSL private key file needed by web
                                            authentication when AuthType is set
                                            as "publickey" (O)
+ OpenConnect.ForceDPD   --force-dpd        Force use of Dead Peer Detection.
+                                           When set, this is forced to be used
+                                           as the minimum DPD interval for CSTP
+                                           and DTLS, even when the server
+                                           doesn't request it.
 
 The VPN agent will be contacted to supply the information based on the
 authentication type as follows:

diff --git a/connman/vpn/plugins/openconnect.c b/connman/vpn/plugins/openconnect.c
@@ -79,7 +79,8 @@ struct {
 	{ "OpenConnect.ServerCert", "--servercert", 1, 1, OPT_STRING},
 	{ "OpenConnect.Usergroup", "--usergroup", 1, 1, OPT_STRING},
 	{ "OpenConnect.UserPrivateKey", NULL, 1, 0, OPT_STRING},
-	{ "VPN.MTU", "--base-mtu", 1, 1, OPT_STRING},
+	{ "OpenConnect.ForceDPD", "--force-dpd", 1, 1, OPT_STRING},
+	{ "OpenConnect.MTU", "--base-mtu", 1, 1, OPT_STRING},
 };
 
 enum oc_connect_type {