ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 08:25:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ControlPort needs "unix:" prefix for Tor, and allocate SOCKSPort

Browse Source
This commit is contained in:
meejah 2016-10-03 16:21:50 -06:00 committed by Brian Warner
parent 89eb86c5a4
commit 646fad69ed
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/allmydata/util/tor_provider.py
View File

@ -71,15 +71,22 @@ def _launch_tor(reactor, tor_executable, private_dir, txtorcon):
tor_config.DataDirectory = data_directory(private_dir) tor_config.DataDirectory = data_directory(private_dir)
if True: # unix-domain control socket if True: # unix-domain control socket
tor_config.ControlPort = os.path.join(private_dir, "tor.control") tor_config.ControlPort = "unix:" + os.path.join(private_dir, "tor.control")
tor_control_endpoint_desc = "unix:%s" % tor_config.ControlPort tor_control_endpoint_desc = tor_config.ControlPort
else: else:
# we allocate a new TCP control port each time # we allocate a new TCP control port each time
tor_config.ControlPort = allocate_tcp_port() tor_config.ControlPort = allocate_tcp_port()
tor_control_endpoint_desc = "tcp:127.0.0.1:%d" % tor_config.ControlPort tor_control_endpoint_desc = "tcp:127.0.0.1:%d" % tor_config.ControlPort
tpp = yield txtorcon.launch_tor(tor_config, reactor, tor_config.SOCKSPort = allocate_tcp_port()
tor_binary=tor_executable)
tpp = yield txtorcon.launch_tor(
tor_config, reactor,
tor_binary=tor_executable,
# stdout=sys.stdout,
# stderr=sys.stderr,
)
# now tor is launched and ready to be spoken to # now tor is launched and ready to be spoken to
# as a side effect, we've got an ITorControlProtocol ready to go # as a side effect, we've got an ITorControlProtocol ready to go
tor_control_proto = tpp.tor_protocol tor_control_proto = tpp.tor_protocol
@ -89,6 +96,10 @@ def _launch_tor(reactor, tor_executable, private_dir, txtorcon):
# mock out txtorcon.launch_tor(), so there will never be a real Tor # mock out txtorcon.launch_tor(), so there will never be a real Tor
# process. So I guess we don't need to track the process. # process. So I guess we don't need to track the process.
# If we do want to do anything with it, we can call tpp.quit()
# (because it's a TorProcessProtocol) which returns a Deferred
# that fires when Tor has actually exited.
returnValue((tor_control_endpoint_desc, tor_control_proto)) returnValue((tor_control_endpoint_desc, tor_control_proto))
@inlineCallbacks @inlineCallbacks