Skip to content
This repository has been archived by the owner on Jan 4, 2019. It is now read-only.

Pass socks port, data directory to tor subprocess #553

Merged

Conversation

riastradh-brave
Copy link
Contributor

THIS PR IS NOT ACTUALLY TO BE MERGED! The same semantic changes are to be replayed on top of @darkdh's work to use a utility process rather than LaunchProcess.

Adds option tor_data_dir and adjusts parsing of option tor_proxy, and passes arguments down to the tor program so that tor will run in the right data directory and listen on the right socks port and not pick up any torrc in /etc or whatever.

Addresses #530.

@darkdh darkdh changed the base branch from master to tor_browser_context March 28, 2018 20:06
@darkdh darkdh self-requested a review March 28, 2018 20:08
@darkdh
Copy link
Member

darkdh commented Mar 28, 2018

no need to rebase because the conflict comes from my WIP commit

Copy link
Member

@darkdh darkdh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

++

@darkdh darkdh merged commit e9f5511 into brave:tor_browser_context Mar 28, 2018
cmdline.AppendArg("--DataDirectory");
cmdline.AppendArg(datadir);
}
launchopts.kill_on_parent_death = true;
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this should be guarded by #if defined(OS_LINUX), I will do changes
and all the platforms will have https://github.com/brave/muon/pull/473/files#diff-df5c427fd693f9ebb2e5952cf0e9c8c7R248 to ensure the child process is terminated when parent is down

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants