Skip to content

fix torrc overrides, support setting manual control port #13

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

fix torrc overrides, support setting manual control port #13

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
49 changes: 28 additions & 21 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 @@ -79,8 +79,8 @@ class Torrc @Throws(IOException::class) internal constructor(defaults: InputStre
private val rc = LinkedHashMap<String, String>()

init {
overrides?.forEach { rc.put(it.key, it.value.trim()) }
parse(defaults)?.forEach { rc.put(it.key, it.value.trim()) }
overrides?.forEach { rc.put(it.key, it.value.trim()) }
}

internal val inputStream: InputStream
Expand Down Expand Up @@ -130,29 +130,36 @@ abstract class TorContext @Throws(IOException::class) protected constructor(val
private val EVENTS = listOf("CIRC", "WARN", "ERR")

private fun parseBootstrap(inputStream: InputStream, latch: CountDownLatch, port: AtomicReference<Int>) {
Thread({
Thread.currentThread().name = "NFO"
BufferedReader(inputStream.reader()).use { reader ->
reader.forEachLine {
logger?.debug { it }
if (it.contains("Control listener listening on port ")) {
port.set(Integer.parseInt(it.substring(it.lastIndexOf(" ") + 1, it.length - 1)))
latch.countDown()
}
}
}
}).start()
Thread {
Thread.currentThread().name = "NFO"
BufferedReader(inputStream.reader()).use { reader ->
reader.forEachLine {
logger?.debug { it }
if (latch.count > 0L) {
if (it.contains("Control listener listening on port ")) {
// Automatic port
port.set(Integer.parseInt(it.substring(it.lastIndexOf(" ") + 1, it.length - 1)))
latch.countDown()
} else if (it.contains("Opened Control listener connection")) {
// Manual port
port.set(Integer.parseInt(it.substring(it.lastIndexOf(":") + 1, it.length).trim()))
latch.countDown()
}
}
}
}
}.start()
}

private fun forwardErr(inputStream: InputStream) {
Thread({
Thread.currentThread().name = "ERR"
BufferedReader(inputStream.reader()).use { reader ->
reader.forEachLine {
logger?.error { it }
}
}
}).start()
Thread {
Thread.currentThread().name = "ERR"
BufferedReader(inputStream.reader()).use { reader ->
reader.forEachLine {
logger?.error { it }
}
}
}.start()
}
}

Expand Down