Skip to content

allow non-daemon Tor for linux/macos based on torrc configuration #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MilosHavranek wants to merge 1 commit into
base: master
Choose a base branch
from
Open

allow non-daemon Tor for linux/macos based on torrc configuration #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions tor.native/src/main/kotlin/org/berndpruenster/netlayer/tor/TorContext.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ class Torrc @Throws(IOException::class) internal constructor(defaults: InputStre
return ByteArrayInputStream(outputStream.toByteArray())
}

internal val runAsDaemon = rc.getOrDefault("RunAsDaemon", "0").toBoolean()

companion object {
@Throws(IOException::class)
private fun parse(src: InputStream?): LinkedHashMap<String, String>? {
Expand Down Expand Up @@ -168,6 +170,7 @@ abstract class TorContext @Throws(IOException::class) protected constructor(val
internal val torrcFile = File(workingDirectory, FILE_TORRC)
internal val torExecutableFile get() = File(workingDirectory, torExecutableFileName)
internal val cookieFile = File(workingDirectory, FILE_AUTH_COOKIE)
private var runAsDaemon: Boolean = false

@Throws(IOException::class)
open fun installFiles() {
Expand Down Expand Up @@ -219,8 +222,11 @@ abstract class TorContext @Throws(IOException::class) protected constructor(val
getByName(FILE_TORRC).use { str ->
Torrc(str, overrides).inputStream.use { rc ->
getByName(FILE_TORRC_DEFAULTS).use {
Torrc(rc, it).inputStream.use {
cleanInstallFile(it, torrcFile)
runAsDaemon = with(Torrc(rc, it)) {
this.inputStream.use {
cleanInstallFile(it, torrcFile)
}
this.runAsDaemon
}
}
}
Expand Down Expand Up @@ -347,7 +353,7 @@ abstract class TorContext @Throws(IOException::class) protected constructor(val
// This does create a condition where the process has exited due to
// a problem but we should hopefully
// detect that when we try to use the control connection.
if (OsType.current != OsType.WIN) {
if (OsType.current != OsType.WIN && runAsDaemon) {
val exit = torProcess.waitFor()
torProcess = null
if (exit != 0) {
Expand Down