From 9a9823f7e5bf0e46e360ba327ac6514ecd4bb320 Mon Sep 17 00:00:00 2001
From: Sean Leonard <meanderingcode@aetherislands.net>
Date: Sun, 9 Jun 2013 02:08:52 -0600
Subject: Introducing the EIP class!  Parses eip-service.json for OpenVPN
 gateways and builds VpnProfiles out of them

---
 src/se/leap/openvpn/ConfigParser.java   | 6 +++++-
 src/se/leap/openvpn/OpenVpnService.java | 1 -
 2 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/se/leap/openvpn')

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