Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-13 03:09:04 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dynamic-tor-ports' into 'master'

Browse Source 
Make Tor ports configurable at runtime

See merge request briar/briar!1537
This commit is contained in:
akwizgran
2021-11-04 11:00:09 +00:00
parent 6517f3f2d0 e0f36ade92
commit e688448537
15 changed files with 164 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
briar-headless/src/main/java/org/briarproject/briar/headless/HeadlessModule.kt
View File

@@ -7,7 +7,11 @@ import org.briarproject.bramble.account.AccountModule
import org.briarproject.bramble.api.FeatureFlags
import org.briarproject.bramble.api.db.DatabaseConfig
import org.briarproject.bramble.api.plugin.PluginConfig
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_CONTROL_PORT
import org.briarproject.bramble.api.plugin.TorConstants.DEFAULT_SOCKS_PORT
import org.briarproject.bramble.api.plugin.TorControlPort
import org.briarproject.bramble.api.plugin.TorDirectory
import org.briarproject.bramble.api.plugin.TorSocksPort
import org.briarproject.bramble.api.plugin.TransportId
import org.briarproject.bramble.api.plugin.duplex.DuplexPluginFactory
import org.briarproject.bramble.api.plugin.simplex.SimplexPluginFactory
@@ -73,6 +77,14 @@ internal class HeadlessModule(private val appDir: File) {
return File(appDir, "tor")
}
@Provides
@TorSocksPort
internal fun provideTorSocksPort(): Int = DEFAULT_SOCKS_PORT
@Provides
@TorControlPort
internal fun provideTorControlPort(): Int = DEFAULT_CONTROL_PORT
@Provides
@Singleton
internal fun providePluginConfig(tor: UnixTorPluginFactory): PluginConfig {