diff options
| author | Sean Leonard <meanderingcode@aetherislands.net> | 2013-06-09 02:08:52 -0600 |
|---|---|---|
| committer | Sean Leonard <meanderingcode@aetherislands.net> | 2013-06-20 18:40:45 -0600 |
| commit | 9a9823f7e5bf0e46e360ba327ac6514ecd4bb320 (patch) | |
| tree | 06d47a316037c131f1b605b6131c45c9b8e2b60e /src/se/leap/openvpn | |
| parent | 195d5ab2d518f6f3960edd3c636e941830c2664d (diff) | |
Introducing the EIP class! Parses eip-service.json for OpenVPN gateways and builds VpnProfiles out of them
Diffstat (limited to 'src/se/leap/openvpn')
| -rw-r--r-- | src/se/leap/openvpn/ConfigParser.java | 6 | ||||
| -rw-r--r-- | src/se/leap/openvpn/OpenVpnService.java | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/se/leap/openvpn/ConfigParser.java b/src/se/leap/openvpn/ConfigParser.java index f57bbae9..3d369fa6 100644 --- a/src/se/leap/openvpn/ConfigParser.java +++ b/src/se/leap/openvpn/ConfigParser.java @@ -47,6 +47,9 @@ public class ConfigParser { options.get(optionname).add(args); } } + public void setDefinition(HashMap<String,Vector<Vector<String>>> args) { + options = args; + } private void checkinlinefile(Vector<String> args, BufferedReader br) throws IOException, ConfigParseError { String arg0 = args.get(0); @@ -247,7 +250,8 @@ public class ConfigParser { // Pull, client, tls-client np.clearDefaults(); - if(options.containsKey("client") || options.containsKey("pull")) { + // XXX we are always client + if(/*options.containsKey("client") || options.containsKey("pull")*/ true) { np.mUsePull=true; options.remove("pull"); options.remove("client"); diff --git a/src/se/leap/openvpn/OpenVpnService.java b/src/se/leap/openvpn/OpenVpnService.java index c745ee3b..42c1de8a 100644 --- a/src/se/leap/openvpn/OpenVpnService.java +++ b/src/se/leap/openvpn/OpenVpnService.java @@ -35,7 +35,6 @@ import android.net.LocalSocket; import android.net.LocalSocketAddress; import android.net.VpnService; import android.os.Binder; -import android.os.Handler; import android.os.Handler.Callback; import android.os.Build; import android.os.IBinder; |