From 5215d512bf2b960fcf4816fdc27f4e3f2669fc58 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias@strongswan.org>
Date: Wed, 8 Aug 2012 13:45:49 +0200
Subject: [PATCH] Adapter class added around VpnService.Builder which allows to
 access it via JNI

---
 .../android/logic/CharonVpnService.java       | 99 +++++++++++++++++++
 1 file changed, 99 insertions(+)

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 54ca247cc8..2514642d16 100644
--- 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.
-- 
2.47.2