1 files changed, 66 insertions, 39 deletions

diff --git a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
index 12ac17f..cd1dd74 100644
--- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
+++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
@@ -5,7 +5,10 @@ import android.content.Intent
 import android.net.Uri
 import android.net.VpnService
 import android.os.ParcelFileDescriptor
+import android.util.Log
+import org.apache.commons.configuration2.ex.ConversionException
 import org.pacien.tincapp.BuildConfig
+import org.pacien.tincapp.R
 import org.pacien.tincapp.commands.Tinc
 import org.pacien.tincapp.commands.Tincd
 import org.pacien.tincapp.context.App
@@ -13,9 +16,8 @@ import org.pacien.tincapp.context.AppPaths
 import org.pacien.tincapp.data.VpnInterfaceConfiguration
 import org.pacien.tincapp.extensions.Java.applyIgnoringException
 import org.pacien.tincapp.extensions.VpnServiceBuilder.applyCfg
-import org.pacien.tincapp.intent.action.ACTION_START_SERVICE
-import org.pacien.tincapp.intent.action.ACTION_STOP_SERVICE
 import org.pacien.tincapp.intent.action.TINC_SCHEME
+import java.io.FileNotFoundException
 import java.io.IOException
 
 /**
@@ -23,65 +25,90 @@ import java.io.IOException
  */
 class TincVpnService : VpnService() {
 
-    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
-        when (intent.action) {
-            ACTION_START_SERVICE -> startVpn(intent.data.schemeSpecificPart)
-            ACTION_STOP_SERVICE -> onDestroy()
-        }
-
-        return Service.START_STICKY
+    override fun onDestroy() {
+        stopVpn()
+        super.onDestroy()
     }
 
-    override fun onDestroy() {
-        connected = false
-
-        try {
-            if (netName != null) Tinc.stop(netName!!)
-            fd?.close()
-        } catch (e: IOException) {
-            e.printStackTrace()
-        } finally {
-            netName = null
-            interfaceCfg = null
-            fd = null
-            super.onDestroy()
-        }
+    override fun onStartCommand(intent: Intent, flags: Int, startId: Int): Int {
+        if (isConnected()) stopVpn()
+        startVpn(intent.data.schemeSpecificPart)
+        return Service.START_REDELIVER_INTENT
     }
 
     private fun startVpn(netName: String) {
-        if (isConnected()) onDestroy()
-        TincVpnService.netName = netName
-        TincVpnService.interfaceCfg = VpnInterfaceConfiguration.fromIfaceConfiguration(AppPaths.netConfFile(netName))
-
-        val net = Builder().setSession(netName).applyCfg(TincVpnService.interfaceCfg!!)
-        applyIgnoringException(net::addDisallowedApplication, BuildConfig.APPLICATION_ID)
-
-        try {
-            fd = net.establish()
-            Tincd.start(netName, fd!!.fd)
-        } catch (e: IOException) {
-            e.printStackTrace()
+        if (netName.isBlank())
+            return reportError(resources.getString(R.string.message_no_network_name_provided), docTopic = "intent-api")
+
+        if (!AppPaths.confDir(netName).exists())
+            return reportError(resources.getString(R.string.message_no_configuration_for_network_format, netName), docTopic = "configuration")
+
+        Log.i(TAG, "Starting tinc daemon for network \"$netName\".")
+
+        val interfaceCfg = try {
+            VpnInterfaceConfiguration.fromIfaceConfiguration(AppPaths.existing(AppPaths.netConfFile(netName)))
+        } catch (e: FileNotFoundException) {
+            return reportError(resources.getString(R.string.message_network_config_not_found_format, e.message!!), e, "configuration")
+        } catch (e: ConversionException) {
+            return reportError(resources.getString(R.string.message_network_config_invalid_format, e.message!!), e, "network-interface")
         }
 
-        connected = true
+        val fd = try {
+            Builder().setSession(netName)
+                    .applyCfg(interfaceCfg)
+                    .also { applyIgnoringException(it::addDisallowedApplication, BuildConfig.APPLICATION_ID) }
+                    .establish()
+        } catch (e: IllegalArgumentException) {
+            return reportError(resources.getString(R.string.message_network_config_invalid_format, e.message!!), e, "network-interface")
+        }
+
+        Tincd.start(netName, fd!!.fd)
+        setState(true, netName, interfaceCfg, fd)
+        Log.i(TAG, "tinc daemon started.")
+    }
+
+    private fun reportError(msg: String, e: Throwable? = null, docTopic: String? = null) {
+        if (e != null)
+            Log.e(TAG, msg, e)
+        else
+            Log.e(TAG, msg)
+
+        App.alert(R.string.title_unable_to_start_tinc, msg,
+                if (docTopic != null) resources.getString(R.string.app_doc_url_format, docTopic) else null)
     }
 
     companion object {
 
+        val TAG = this::class.java.canonicalName!!
+
         private var connected: Boolean = false
         private var netName: String? = null
         private var interfaceCfg: VpnInterfaceConfiguration? = null
         private var fd: ParcelFileDescriptor? = null
 
+        private fun setState(connected: Boolean, netName: String?, interfaceCfg: VpnInterfaceConfiguration?, fd: ParcelFileDescriptor?) {
+            TincVpnService.connected = connected
+            TincVpnService.netName = netName
+            TincVpnService.interfaceCfg = interfaceCfg
+            TincVpnService.fd = fd
+        }
+
         fun startVpn(netName: String) {
             App.getContext().startService(Intent(App.getContext(), TincVpnService::class.java)
-                    .setAction(ACTION_START_SERVICE)
                     .setData(Uri.Builder().scheme(TINC_SCHEME).opaquePart(netName).build()))
         }
 
         fun stopVpn() {
-            App.getContext().startService(Intent(App.getContext(), TincVpnService::class.java)
-                    .setAction(ACTION_STOP_SERVICE))
+            try {
+                Log.i(TAG, "Stopping any running tinc daemon.")
+                if (netName != null) Tinc.stop(netName!!)
+                fd?.close()
+                Log.i(TAG, "All tinc daemons stopped.")
+            } catch (e: IOException) {
+                Log.wtf(TAG, e)
+            } finally {
+                setState(false, null, null, null)
+            }
         }
 
         fun getCurrentNetName() = netName