ics-openvpn receives ifconfig from the server.

Refactored AndroidManifest to include launchvpn and openvpnservice.

Imported changes from ics-openvpn-upstream

9 files changed, 232 insertions, 7 deletions

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 0c6d0b3f..ef26024d 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
         android:label="@string/app" >
 
         <service
-            android:name="se.leap.openvpn.OpenVpnService"
+            android:name="de.blinkt.openvpn.core.OpenVpnService"
             android:permission="android.permission.BIND_VPN_SERVICE" >
             <intent-filter>
                 <action android:name="android.net.VpnService" />
@@ -54,7 +54,7 @@
         </receiver>
 	
         <activity
-            android:name="se.leap.openvpn.LaunchVPN"
+            android:name="de.blinkt.openvpn.LaunchVPN"
             android:label="@string/vpn_launch_title" >
         </activity>
 
diff --git a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
index 000fc47c..da0298f2 100644
--- a/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/app/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -727,8 +727,8 @@ public class VpnProfile implements Serializable {
     //! Return an error if somethign is wrong
     public int checkProfile(Context context) {
         if (mAuthenticationType == TYPE_KEYSTORE || mAuthenticationType == TYPE_USERPASS_KEYSTORE) {
-            if (mAlias == null)
-                return R.string.no_keystore_cert_selected;
+            // if (mAlias == null)
+            //     return R.string.no_keystore_cert_selected;
         }
 
         if (!mUsePull || mAuthenticationType == TYPE_STATICKEYS) {
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 378b6b92..32e5cabb 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
@@ -26,6 +26,14 @@ public class ConfigParser {
 
 	private boolean extraRemotesAsCustom=false;
 
+    /*
+     * TODO: We shouldn't be using this method. 
+     * We need to figure out how to use just parseConfig, probably removing parseOptions.
+     */
+    public void setDefinition(HashMap<String,Vector<Vector<String>>> args) {
+	options = args;
+    }
+
 	public void parseConfig(Reader reader) throws IOException, ConfigParseError {
 
 
diff --git a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
index 8281aed8..d7bb827e 100644
--- a/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
+++ b/app/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
@@ -72,6 +72,14 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
     private String mLastTunCfg;
     private String mRemoteGW;
 
+    //TODO We should know if this is running or not without this method
+    public boolean isRunning() {
+	if (mStarting == true || mProcessThread != null)
+	    return true;
+	else
+	    return false;
+    }
+    
     // From: http://stackoverflow.com/questions/3758606/how-to-convert-byte-size-into-human-readable-format-in-java
     public static String humanReadableByteCount(long bytes, boolean mbit) {
         if (mbit)
diff --git a/app/src/main/java/se/leap/bitmaskclient/EIP.java b/app/src/main/java/se/leap/bitmaskclient/EIP.java
index 7d001865..0058eff2 100644
--- a/app/src/main/java/se/leap/bitmaskclient/EIP.java
+++ b/app/src/main/java/se/leap/bitmaskclient/EIP.java
@@ -536,7 +536,10 @@ public final class EIP extends IntentService {
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			
+
+            // We are always client, because the ifconfig will be received by a needed command
+            options.put("client", null);
+
 			try {
 				arg.add(remote);
 				arg.add(mGateway.getString(remote));
diff --git a/app/src/main/res/values/untranslatable.xml b/app/src/main/res/values/untranslatable.xml
index 79c53ff7..13717505 100644
--- a/app/src/main/res/values/untranslatable.xml
+++ b/app/src/main/res/values/untranslatable.xml
@@ -359,4 +359,194 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 </resources>
\ No newline at end of file
diff --git a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/VpnProfile.java b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
index afa70100..0596684c 100644
--- a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
+++ b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/VpnProfile.java
@@ -725,8 +725,8 @@ public class VpnProfile implements Serializable {
     //! Return an error if somethign is wrong
     public int checkProfile(Context context) {
         if (mAuthenticationType == TYPE_KEYSTORE || mAuthenticationType == TYPE_USERPASS_KEYSTORE) {
-            if (mAlias == null)
-                return R.string.no_keystore_cert_selected;
+            // if (mAlias == null)
+            //     return R.string.no_keystore_cert_selected;
         }
 
         if (!mUsePull || mAuthenticationType == TYPE_STATICKEYS) {
diff --git a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
index 378b6b92..32e5cabb 100644
--- a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
+++ b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/ConfigParser.java
@@ -26,6 +26,14 @@ public class ConfigParser {
 
 	private boolean extraRemotesAsCustom=false;
 
+    /*
+     * TODO: We shouldn't be using this method. 
+     * We need to figure out how to use just parseConfig, probably removing parseOptions.
+     */
+    public void setDefinition(HashMap<String,Vector<Vector<String>>> args) {
+	options = args;
+    }
+
 	public void parseConfig(Reader reader) throws IOException, ConfigParseError {
 
 
diff --git a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
index 8281aed8..d7bb827e 100644
--- a/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
+++ b/ics-openvpn-stripped/main/src/main/java/de/blinkt/openvpn/core/OpenVpnService.java
@@ -72,6 +72,14 @@ public class OpenVpnService extends VpnService implements StateListener, Callbac
     private String mLastTunCfg;
     private String mRemoteGW;
 
+    //TODO We should know if this is running or not without this method
+    public boolean isRunning() {
+	if (mStarting == true || mProcessThread != null)
+	    return true;
+	else
+	    return false;
+    }
+    
     // From: http://stackoverflow.com/questions/3758606/how-to-convert-byte-size-into-human-readable-format-in-java
     public static String humanReadableByteCount(long bytes, boolean mbit) {
         if (mbit)