diff options
| author | cyberta <cyberta@riseup.net> | 2021-11-15 15:12:19 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2021-11-15 15:12:19 +0000 |
| commit | 9b2b57d8617e60c0b69713e1e5f14dbb8e57c70a (patch) | |
| tree | 94e2dfa2f6c4d82a82ef24df6be5ccd219b4e69b /app/src/main/java/de/blinkt/openvpn/core | |
| parent | 5b4db114cb35c5c9012c744c82656b1071aacda0 (diff) | |
| parent | f18a85e4cd95f938c9ed78b31b8d27b2a02994c7 (diff) | |
Merge branch 'obfs4_no_udp_no_ipv6' into 'master'
Obfs4: no udp no ipv6
See merge request leap/bitmask_android!142
Diffstat (limited to 'app/src/main/java/de/blinkt/openvpn/core')
| -rw-r--r-- | app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java | 4 |
1 files changed, 4 insertions, 0 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 5b4ab361..4a8bcf99 100644 --- a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java +++ b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java @@ -714,6 +714,10 @@ public class ConfigParser { Vector<Vector<String>> connectionBlocks = getAllOption("connection", 1, 1); + if (connectionBlocks == null && np.mConnections.length == 0) { + throw new ConfigParseError("No --remote or <connection> block found."); + } + if (np.mConnections.length > 0 && connectionBlocks != null) { throw new ConfigParseError("Using a <connection> block and --remote is not allowed."); } |