diff options
| author | pacien | 2018-02-10 14:16:15 +0100 |
|---|---|---|
| committer | pacien | 2018-02-10 14:16:15 +0100 |
| commit | 87ec3620d2259064831356c2f4000ae591756fd2 (patch) | |
| tree | 9312da1d357fdd3790d5b80af221653696b23089 /app/src/main/java/org/pacien/tincapp/commands/Tincd.kt | |
| parent | d1c39ba87bb32308c2d3a7a749abffeb773541ef (diff) | |
| download | tincapp-87ec3620d2259064831356c2f4000ae591756fd2.tar.gz | |
Reformat code
Diffstat (limited to 'app/src/main/java/org/pacien/tincapp/commands/Tincd.kt')
| -rw-r--r-- | app/src/main/java/org/pacien/tincapp/commands/Tincd.kt | 22 |
1 files changed, 11 insertions, 11 deletions
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 d44d930..d9c665d 100644 --- a/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt +++ b/app/src/main/java/org/pacien/tincapp/commands/Tincd.kt | |||
| @@ -7,16 +7,16 @@ import org.pacien.tincapp.context.AppPaths | |||
| 7 | */ | 7 | */ |
| 8 | object Tincd { | 8 | object Tincd { |
| 9 | 9 | ||
| 10 | fun start(netName: String, deviceFd: Int, ed25519PrivateKeyFd: Int? = null, rsaPrivateKeyFd: Int? = null) { | 10 | fun start(netName: String, deviceFd: Int, ed25519PrivateKeyFd: Int? = null, rsaPrivateKeyFd: Int? = null) { |
| 11 | Executor.forkExec(Command(AppPaths.tincd().absolutePath) | 11 | Executor.forkExec(Command(AppPaths.tincd().absolutePath) |
| 12 | .withOption("no-detach") | 12 | .withOption("no-detach") |
| 13 | .withOption("config", AppPaths.confDir(netName).absolutePath) | 13 | .withOption("config", AppPaths.confDir(netName).absolutePath) |
| 14 | .withOption("pidfile", AppPaths.pidFile(netName).absolutePath) | 14 | .withOption("pidfile", AppPaths.pidFile(netName).absolutePath) |
| 15 | .withOption("logfile", AppPaths.logFile(netName).absolutePath) | 15 | .withOption("logfile", AppPaths.logFile(netName).absolutePath) |
| 16 | .withOption("option", "DeviceType=fd") | 16 | .withOption("option", "DeviceType=fd") |
| 17 | .withOption("option", "Device=" + deviceFd) | 17 | .withOption("option", "Device=" + deviceFd) |
| 18 | .apply { if (ed25519PrivateKeyFd != null) withOption("option", "Ed25519PrivateKeyFile=/proc/self/fd/$ed25519PrivateKeyFd") } | 18 | .apply { if (ed25519PrivateKeyFd != null) withOption("option", "Ed25519PrivateKeyFile=/proc/self/fd/$ed25519PrivateKeyFd") } |
| 19 | .apply { if (rsaPrivateKeyFd != null) withOption("option", "PrivateKeyFile=/proc/self/fd/$rsaPrivateKeyFd") }) | 19 | .apply { if (rsaPrivateKeyFd != null) withOption("option", "PrivateKeyFile=/proc/self/fd/$rsaPrivateKeyFd") }) |
| 20 | } | 20 | } |
| 21 | 21 | ||
| 22 | } | 22 | } |