aboutsummaryrefslogtreecommitdiff
path: root/app/src/main
diff options
context:
space:
mode:
authorpacien2018-09-26 00:36:40 +0200
committerpacien2018-09-26 00:54:12 +0200
commitb93bf5513a1c43ac11acef409c81dc7238324d69 (patch)
tree4fdd3479173c66022b095bc966d606c24a1d7d53 /app/src/main
parentc9b813a2c8fcd53543c7aa84a773915d2c7c07d1 (diff)
downloadtincapp-b93bf5513a1c43ac11acef409c81dc7238324d69.tar.gz
Trigger tinc reconnection on network state change
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/org/pacien/tincapp/commands/Tinc.kt4
-rw-r--r--app/src/main/java/org/pacien/tincapp/service/ConnectivityChangeReceiver.kt60
-rw-r--r--app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt6
3 files changed, 70 insertions, 0 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
index 4d00805..dc23935 100644
--- a/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
+++ b/app/src/main/java/org/pacien/tincapp/commands/Tinc.kt
@@ -34,6 +34,10 @@ object Tinc {
34 Executor.call(newCommand(netName).withArguments("stop")) 34 Executor.call(newCommand(netName).withArguments("stop"))
35 .thenApply { } 35 .thenApply { }
36 36
37 fun retry(netName: String): CompletableFuture<Unit> =
38 Executor.call(newCommand(netName).withArguments("retry"))
39 .thenApply { }
40
37 fun pid(netName: String): CompletableFuture<Int> = 41 fun pid(netName: String): CompletableFuture<Int> =
38 Executor.call(newCommand(netName).withArguments("pid")) 42 Executor.call(newCommand(netName).withArguments("pid"))
39 .thenApply { Integer.parseInt(it.first()) } 43 .thenApply { Integer.parseInt(it.first()) }
diff --git a/app/src/main/java/org/pacien/tincapp/service/ConnectivityChangeReceiver.kt b/app/src/main/java/org/pacien/tincapp/service/ConnectivityChangeReceiver.kt
new file mode 100644
index 0000000..ba9aa95
--- /dev/null
+++ b/app/src/main/java/org/pacien/tincapp/service/ConnectivityChangeReceiver.kt
@@ -0,0 +1,60 @@
1/*
2 * Tinc App, an Android binding and user interface for the tinc mesh VPN daemon
3 * Copyright (C) 2017-2018 Pacien TRAN-GIRARD
4 *
5 * This program is free software: you can redistribute it and/or modify
6 * it under the terms of the GNU General Public License as published by
7 * the Free Software Foundation, either version 3 of the License, or
8 * (at your option) any later version.
9 *
10 * This program is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <https://www.gnu.org/licenses/>.
17 */
18
19package org.pacien.tincapp.service
20
21import android.content.BroadcastReceiver
22import android.content.Context
23import android.content.Intent
24import android.content.IntentFilter
25import android.net.ConnectivityManager
26import org.pacien.tincapp.commands.Tinc
27import org.slf4j.LoggerFactory
28
29/**
30 * @author pacien
31 */
32object ConnectivityChangeReceiver : BroadcastReceiver() {
33 private val log by lazy { LoggerFactory.getLogger(this.javaClass)!! }
34 private val tincCtl = Tinc
35 private val tincVpnService = TincVpnService
36
37 override fun onReceive(context: Context, intent: Intent) {
38 log.info("Connectivity change intent received: {}", intent.toString())
39 if (isNetworkAvailable(intent)) attemptReconnect()
40 }
41
42 private fun attemptReconnect() {
43 tincVpnService.getCurrentNetName()?.let { netName ->
44 log.info("Sending immediate reconnection request to the tinc daemon.")
45 tincCtl.retry(netName)
46 }
47 }
48
49 private fun isNetworkAvailable(intent: Intent) =
50 !intent.getBooleanExtra(ConnectivityManager.EXTRA_NO_CONNECTIVITY, false)
51
52 fun registerWatcher(context: Context) {
53 val filter = IntentFilter(ConnectivityManager.CONNECTIVITY_ACTION)
54 context.registerReceiver(this, filter)
55 }
56
57 fun unregisterWatcher(context: Context) {
58 context.unregisterReceiver(this)
59 }
60}
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 45058e2..28f1347 100644
--- a/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
+++ b/app/src/main/java/org/pacien/tincapp/service/TincVpnService.kt
@@ -49,6 +49,7 @@ import java.io.FileNotFoundException
49 */ 49 */
50class TincVpnService : VpnService() { 50class TincVpnService : VpnService() {
51 private val log by lazy { LoggerFactory.getLogger(this.javaClass)!! } 51 private val log by lazy { LoggerFactory.getLogger(this.javaClass)!! }
52 private val connectivityChangeReceiver = ConnectivityChangeReceiver
52 53
53 override fun onDestroy() { 54 override fun onDestroy() {
54 stopVpn() 55 stopVpn()
@@ -150,11 +151,16 @@ class TincVpnService : VpnService() {
150 log.info("tinc daemon started.") 151 log.info("tinc daemon started.")
151 broadcastEvent(Actions.EVENT_CONNECTED) 152 broadcastEvent(Actions.EVENT_CONNECTED)
152 } 153 }
154
155 connectivityChangeReceiver.registerWatcher(this)
153 } 156 }
154 } 157 }
155 158
156 private fun stopVpn(): Unit = synchronized(this) { 159 private fun stopVpn(): Unit = synchronized(this) {
157 log.info("Stopping any running tinc daemon.") 160 log.info("Stopping any running tinc daemon.")
161
162 connectivityChangeReceiver.unregisterWatcher(this)
163
158 getCurrentNetName()?.let { 164 getCurrentNetName()?.let {
159 Tinc.stop(it).thenRun { 165 Tinc.stop(it).thenRun {
160 log.info("All tinc daemons stopped.") 166 log.info("All tinc daemons stopped.")