Adapter class added around VpnService.Builder which allows to access it via JNI

diff --git a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
index 54ca247cc8d485429eb5e0d3bc93c5026a0ad11a..2514642d1609503db62713258f4f6562d1d3705f 100644 (file)
--- a/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
+++ b/src/frontends/android/src/org/strongswan/android/logic/CharonVpnService.java
@@ -37,6 +37,7 @@ import android.content.ServiceConnection;
 import android.net.VpnService;
 import android.os.Bundle;
 import android.os.IBinder;
+import android.os.ParcelFileDescriptor;
 import android.util.Log;
 
 public class CharonVpnService extends VpnService implements Runnable
@@ -447,6 +448,104 @@ public class CharonVpnService extends VpnService implements Runnable
                return null;
        }
 
+       /**
+        * Adapter for VpnService.Builder which is used to access it safely via JNI.
+        */
+       public class BuilderAdapter
+       {
+               VpnService.Builder builder;
+
+               public BuilderAdapter(String name)
+               {
+                       builder = new CharonVpnService.Builder();
+                       builder.setSession(name);
+               }
+
+               public synchronized boolean addAddress(String address, int prefixLength)
+               {
+                       try
+                       {
+                               builder.addAddress(address, prefixLength);
+                       }
+                       catch (IllegalArgumentException ex)
+                       {
+                               return false;
+                       }
+                       return true;
+               }
+
+               public synchronized boolean addDnsServer(String address)
+               {
+                       try
+                       {
+                               builder.addDnsServer(address);
+                       }
+                       catch (IllegalArgumentException ex)
+                       {
+                               return false;
+                       }
+                       return true;
+               }
+
+               public synchronized boolean addRoute(String address, int prefixLength)
+               {
+                       try
+                       {
+                               builder.addRoute(address, prefixLength);
+                       }
+                       catch (IllegalArgumentException ex)
+                       {
+                               return false;
+                       }
+                       return true;
+               }
+
+               public synchronized boolean addSearchDomain(String domain)
+               {
+                       try
+                       {
+                               builder.addSearchDomain(domain);
+                       }
+                       catch (IllegalArgumentException ex)
+                       {
+                               return false;
+                       }
+                       return true;
+               }
+
+               public synchronized boolean setMtu(int mtu)
+               {
+                       try
+                       {
+                               builder.setMtu(mtu);
+                       }
+                       catch (IllegalArgumentException ex)
+                       {
+                               return false;
+                       }
+                       return true;
+               }
+
+               public synchronized int establish()
+               {
+                       ParcelFileDescriptor fd;
+                       try
+                       {
+                               fd = builder.establish();
+                       }
+                       catch (Exception ex)
+                       {
+                               ex.printStackTrace();
+                               return -1;
+                       }
+                       if (fd == null)
+                       {
+                               return -1;
+                       }
+                       return fd.detachFd();
+               }
+       }
+
        /*
         * The libraries are extracted to /data/data/org.strongswan.android/...
         * during installation.