diff options
author | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
---|---|---|
committer | kwadronaut <kwadronaut@leap.se> | 2017-05-17 11:05:41 +0200 |
commit | ac4047ce11c91a752c910f4afcd24f69a1621ef3 (patch) | |
tree | 044b866f2bd9a83246a6128c0e6f8afc4ce5a9d0 /app/src/main/java/de/blinkt/openvpn/core/Connection.java | |
parent | 66c79953db6876ec17a7ebf50dc4fd07d24fae37 (diff) | |
parent | 59985587c758f93844df7600f18c0837c672f259 (diff) |
Merge branch 'develop' move to 'master-'based development
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/Connection.java')
-rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/Connection.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/Connection.java b/app/src/main/java/de/blinkt/openvpn/core/Connection.java index b10664ce..3455450b 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/Connection.java +++ b/app/src/main/java/de/blinkt/openvpn/core/Connection.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012-2014 Arne Schwabe + * Copyright (c) 2012-2016 Arne Schwabe * Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt */ @@ -16,6 +16,7 @@ public class Connection implements Serializable, Cloneable { public String mCustomConfiguration=""; public boolean mUseCustomConfig=false; public boolean mEnabled=true; + public int mConnectTimeout = 0; private static final long serialVersionUID = 92031902903829089L; @@ -33,6 +34,10 @@ public class Connection implements Serializable, Cloneable { else cfg += " tcp-client\n"; + if (mConnectTimeout!=0) + cfg += String.format(" connect-timeout %d\n" , mConnectTimeout); + + if (!TextUtils.isEmpty(mCustomConfiguration) && mUseCustomConfig) { cfg += mCustomConfiguration; cfg += "\n"; |