From fc07e620e834dfa3495323e29ae10e21c3621804 Mon Sep 17 00:00:00 2001
From: Yves Fischer <yvesf-git@xapek.org>
Date: Sun, 17 Aug 2014 00:32:47 +0200
Subject: Detect issue #4 and display specific error message

---
 res/layout/fragment_status.xml                |  2 +-
 src/org/xapek/andiodine/FragmentList.java     |  2 --
 src/org/xapek/andiodine/FragmentStatus.java   | 18 ++++++------
 src/org/xapek/andiodine/IodineVpnService.java | 42 ++++++++++++++++++++-------
 tests/AndroidManifest.xml                     |  6 ++--
 5 files changed, 44 insertions(+), 26 deletions(-)

diff --git a/res/layout/fragment_status.xml b/res/layout/fragment_status.xml
index d6030e3..65f63b1 100644
--- a/res/layout/fragment_status.xml
+++ b/res/layout/fragment_status.xml
@@ -37,7 +37,7 @@
 
         <Button
                 android:drawableLeft="@drawable/cancel"
-                android:text="Cancel"
+                android:text="Close"
                 android:id="@+id/status_cancel"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
diff --git a/src/org/xapek/andiodine/FragmentList.java b/src/org/xapek/andiodine/FragmentList.java
index e07aee4..10a0875 100644
--- a/src/org/xapek/andiodine/FragmentList.java
+++ b/src/org/xapek/andiodine/FragmentList.java
@@ -17,8 +17,6 @@ import android.view.MenuInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
-import android.widget.ImageButton;
-import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;
 
diff --git a/src/org/xapek/andiodine/FragmentStatus.java b/src/org/xapek/andiodine/FragmentStatus.java
index aaa64fb..198271a 100644
--- a/src/org/xapek/andiodine/FragmentStatus.java
+++ b/src/org/xapek/andiodine/FragmentStatus.java
@@ -21,19 +21,19 @@ public class FragmentStatus extends Fragment {
     private TextView mStatus;
     private TextView mLogmessages;
     private ScrollView mScrollview;
-    private Button mCancel;
+    private Button mClose;
 
     private final BroadcastReceiver broadcastReceiverStatusUpdates = new BroadcastReceiver() {
         @Override
         public void onReceive(Context context, Intent intent) {
             Log.d(TAG, "Got intent: " + intent);
             if (IodineVpnService.ACTION_STATUS_ERROR.equals(intent.getAction())) {
-                new AlertDialog.Builder(FragmentStatus.this.getActivity())//
-                        .setIcon(R.drawable.error) //
-                        .setTitle(intent.getStringExtra(IodineVpnService.EXTRA_ERROR_MESSAGE)) //
-                        .setMessage(mLogmessages.getText()) //
-                        .create() //
-                        .show();
+            	new AlertDialog.Builder(FragmentStatus.this.getActivity())//
+					.setIcon(R.drawable.error)	//
+					.setTitle("Error") //
+					.setMessage(intent.getStringExtra(IodineVpnService.EXTRA_ERROR_MESSAGE)) //
+					.create() //
+					.show();
             } else if (IodineVpnService.ACTION_STATUS_CONNECT.equals(intent.getAction())) {
                 mStatus.setText("Connect");
             } else if (IodineVpnService.ACTION_STATUS_CONNECTED.equals(intent.getAction())) {
@@ -61,8 +61,8 @@ public class FragmentStatus extends Fragment {
         mStatus = (TextView) getActivity().findViewById(R.id.status_message);
         mLogmessages = (TextView) getActivity().findViewById(R.id.status_logmessages);
         mScrollview = (ScrollView) getActivity().findViewById(R.id.status_scrollview);
-        mCancel = (Button) getActivity().findViewById(R.id.status_cancel);
-        mCancel.setOnClickListener(new View.OnClickListener() {
+        mClose = (Button) getActivity().findViewById(R.id.status_cancel);
+        mClose.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
                 requestDisconnect();
diff --git a/src/org/xapek/andiodine/IodineVpnService.java b/src/org/xapek/andiodine/IodineVpnService.java
index 971b757..7c4443e 100644
--- a/src/org/xapek/andiodine/IodineVpnService.java
+++ b/src/org/xapek/andiodine/IodineVpnService.java
@@ -11,6 +11,7 @@ import android.util.Log;
 import org.xapek.andiodine.config.ConfigDatabase;
 import org.xapek.andiodine.config.IodineConfiguration;
 
+import java.io.IOException;
 import java.net.InetAddress;
 import java.net.UnknownHostException;
 
@@ -151,7 +152,10 @@ public class IodineVpnService extends VpnService implements Runnable {
     }
 
     private void shutdown() {
-        setStatus(ACTION_STATUS_DISCONNECT, mConfiguration.getId(), null);
+    	if (mConfiguration != null)
+    		setStatus(ACTION_STATUS_DISCONNECT, mConfiguration.getId(), null);
+    	else
+    		setStatus(ACTION_STATUS_IDLE, null, null);
 
         if (mThread != null) {
             mThread.interrupt();
@@ -221,7 +225,7 @@ public class IodineVpnService extends VpnService implements Runnable {
                 case 0:
                     Log.d(TAG, "Handshake successful");
                     setStatus(ACTION_STATUS_CONNECTED, currentConfigurationId, null);
-                    runTunnel();
+                    runTunnel(); // this blocks until connection is closed
                     setStatus(ACTION_STATUS_IDLE, null, null);
                     break;
                 case 1:
@@ -311,12 +315,22 @@ public class IodineVpnService extends VpnService implements Runnable {
             Log.d(TAG, "Set default route");
             b.addRoute("0.0.0.0", 0); // Default Route
         }
-        b.setMtu(mtu); // bug https://github.com/yvesf/andiodine/issues/4
-        // the VPN framework fails if mtu < 1280
-        // b.setMtu(1280);
-
-        Log.d(TAG, "Build tunnel interface");
-        ParcelFileDescriptor parcelFD = b.establish();
+        b.setMtu(mtu);
+
+		Log.d(TAG, "Build tunnel interface");
+		ParcelFileDescriptor parcelFD;
+		try {
+			parcelFD = b.establish();
+		} catch (Exception e) {
+			if (e.getMessage().contains("fwmark") || e.getMessage().contains("iptables")) {
+				// bug https://github.com/yvesf/andiodine/issues/4
+				throw new IodineVpnException(
+						"Error while creating interface, please check issue #4 at https://github.com/yvesf/andiodine/issues/4");
+			} else {
+				throw new IodineVpnException("Error while creating interface: "
+						+ e.getMessage());
+			}
+		}
 
         protect(IodineClient.getDnsFd());
 
@@ -324,7 +338,13 @@ public class IodineVpnService extends VpnService implements Runnable {
 
         setStatus(ACTION_STATUS_CONNECTED, mConfiguration.getId(), null);
 
-        Log.d(TAG, "Tunnel active");
-        IodineClient.tunnel(tun_fd);
-    }
+		Log.d(TAG, "Tunnel active");
+		IodineClient.tunnel(tun_fd);
+		try {
+			ParcelFileDescriptor.adoptFd(tun_fd).close();
+		} catch (IOException e) {
+			throw new IodineVpnException(
+					"Failed to close fd after tunnel exited");
+		}
+	}
 }
diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index e9e5343..75082fb 100644
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.HelloJni.tests"
+    package="org.xapek.andiodine.tests"
     android:versionCode="1"
     android:versionName="1.0" >
 
@@ -24,7 +24,7 @@
     -->
     <instrumentation
         android:name="android.test.InstrumentationTestRunner"
-        android:label="Tests for HelloJni"
-        android:targetPackage="com.example.HelloJni" />
+        android:label="Tests for Andiodine"
+        android:targetPackage="org.xapek.andiodine" />
 
 </manifest>
\ No newline at end of file
-- 
cgit v1.2.1