diff options
author | pacien | 2018-08-05 22:12:46 +0200 |
---|---|---|
committer | pacien | 2018-08-05 22:12:46 +0200 |
commit | 9012ef92ed810f4a08b5f01cd2c18430a277eacf (patch) | |
tree | 7e2dc8f9b61698e895fab07bc524575af5ec484b /app/src/main/java/org/pacien/tincapp/commands | |
parent | a9d1ac81374119e33871484c8749a94d11a71cae (diff) | |
download | tincapp-9012ef92ed810f4a08b5f01cd2c18430a277eacf.tar.gz |
Code style
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/commands')
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/commands/Executor.kt | 2 | ||||
-rw-r--r-- | app/src/main/java/org/pacien/tincapp/commands/Tincd.kt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt index 7630b61..9558b15 100644 --- a/app/src/main/java/org/pacien/tincapp/commands/Executor.kt +++ b/app/src/main/java/org/pacien/tincapp/commands/Executor.kt | |||
@@ -42,7 +42,7 @@ internal object Executor { | |||
42 | /** | 42 | /** |
43 | * @return FAILED (-1) on error, forked child PID otherwise | 43 | * @return FAILED (-1) on error, forked child PID otherwise |
44 | */ | 44 | */ |
45 | private external fun forkExec(argcv: Array<String>): Int | 45 | private external fun forkExec(args: Array<String>): Int |
46 | 46 | ||
47 | /** | 47 | /** |
48 | * @return FAILED (-1) on error, the exit status of the process otherwise | 48 | * @return FAILED (-1) on error, the exit status of the process otherwise |
diff --git a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt index 86d2583..b55e9a1 100644 --- a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt +++ b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt | |||
@@ -31,7 +31,7 @@ object Tincd { | |||
31 | .withOption("pidfile", AppPaths.pidFile(netName).absolutePath) | 31 | .withOption("pidfile", AppPaths.pidFile(netName).absolutePath) |
32 | .withOption("logfile", AppPaths.logFile(netName).absolutePath) | 32 | .withOption("logfile", AppPaths.logFile(netName).absolutePath) |
33 | .withOption("option", "DeviceType=fd") | 33 | .withOption("option", "DeviceType=fd") |
34 | .withOption("option", "Device=" + deviceFd) | 34 | .withOption("option", "Device=$deviceFd") |
35 | .apply { if (ed25519PrivateKeyFd != null) withOption("option", "Ed25519PrivateKeyFile=/proc/self/fd/$ed25519PrivateKeyFd") } | 35 | .apply { if (ed25519PrivateKeyFd != null) withOption("option", "Ed25519PrivateKeyFile=/proc/self/fd/$ed25519PrivateKeyFd") } |
36 | .apply { if (rsaPrivateKeyFd != null) withOption("option", "PrivateKeyFile=/proc/self/fd/$rsaPrivateKeyFd") }) | 36 | .apply { if (rsaPrivateKeyFd != null) withOption("option", "PrivateKeyFile=/proc/self/fd/$rsaPrivateKeyFd") }) |
37 | } | 37 | } |