diff options
| author | cyBerta <cyberta@riseup.net> | 2018-02-06 15:05:02 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2018-02-06 15:05:02 +0100 |
| commit | 1a37ac3f86e0bd44842a0fcd86de7c160acfbb04 (patch) | |
| tree | bc32fb50b59c415097804fd7bbdb296641310cde /app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java | |
| parent | a1ac4910f062ca8aca06e0468fffef751d3bb714 (diff) | |
| parent | edd34192484f4eb618fdcc2a68b18168c155d63c (diff) | |
Merge branch 'origin_0.9.8' into fupduck_8826_custom_provider
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java index 74afd61e..9889754d 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java +++ b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java @@ -261,6 +261,7 @@ public class ConfigParser { "group", "allow-recursive-routing", "ip-win32", + "ifconfig-nowarn", "management-hold", "management", "management-client", @@ -275,6 +276,7 @@ public class ConfigParser { "management-client-user", "management-client-group", "pause-exit", + "preresolve", "plugin", "machine-readable-output", "persist-key", @@ -300,7 +302,8 @@ public class ConfigParser { {"setenv", "IV_GUI_VER"}, {"setenv", "IV_OPENVPN_GUI_VERSION"}, {"engine", "dynamic"}, - {"setenv", "CLIENT_CERT"} + {"setenv", "CLIENT_CERT"}, + {"resolve-retry","60"} }; final String[] connectionOptions = { |