From c89fd2f73f8a84f9ef7742e39476a9645e6d3863 Mon Sep 17 00:00:00 2001
From: cyBerta <cyberta@riseup.net>
Date: Thu, 1 Feb 2018 15:30:39 +0100
Subject: #8832 add all ics-openvpn code changes

---
 app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java')

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 = {
-- 
cgit v1.2.3