summaryrefslogtreecommitdiff
path: root/src/se/leap/openvpn/ConfigParser.java
diff options
context:
space:
mode:
authorcyBerta <richy@cyborgsociety.org>2013-11-30 01:47:29 +0100
committercyBerta <richy@cyborgsociety.org>2013-11-30 01:47:29 +0100
commit7b95df801bb5db47cce68814b7fc5a472d92c196 (patch)
tree2a5add2db43bb4ca1a9e4977dc878aaa17a3e57a /src/se/leap/openvpn/ConfigParser.java
parent8462f8a65eacbc47d8e63db058584bed0898e279 (diff)
parentf9f69298e7d0b5e4258ea27095f50f9da7c6ff9b (diff)
Merge branch 'feature/clearer-wording' of https://github.com/parmegv/bitmask_android into feature/clearer_wording
Diffstat (limited to 'src/se/leap/openvpn/ConfigParser.java')
-rw-r--r--src/se/leap/openvpn/ConfigParser.java6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/se/leap/openvpn/ConfigParser.java b/src/se/leap/openvpn/ConfigParser.java
index 3d369fa6..36585d29 100644
--- a/src/se/leap/openvpn/ConfigParser.java
+++ b/src/se/leap/openvpn/ConfigParser.java
@@ -355,6 +355,12 @@ public class ConfigParser {
np.mServerName = remote.get(1);
}
}
+
+ // Parse remote config
+ Vector<String> location = getOption("location",1,2);
+ if(location != null && location.size() == 2){
+ np.mLocation = location.get(1).replace("__", ", ");
+ }
Vector<Vector<String>> dhcpoptions = getAllOption("dhcp-option", 2, 2);
if(dhcpoptions!=null) {