Skip to content
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.

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

Jump to bottom

Tor api owning control #260

Merged
merged 9 commits into from Sep 4, 2018
Merged

Tor api owning control #260

merged 9 commits into from Sep 4, 2018

Conversation

Reviewers

@ahf ahf

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
4 participants
@nmathewson @coveralls @ahf @torproject-pusher
@nmathewson
Copy link
Contributor

@nmathewson nmathewson commented Aug 1, 2018

No description provided.

nmathewson added 9 commits Aug 1, 2018
@nmathewson
Extract tor_ersatz_socketpair into a new c file
2884639 
I'm doing this because I want to make it a lower-level function
again, so that we can use it without linking in the rest of the
universe.
@nmathewson
Remove dependency from socketpair.c on address.h
9b24609 
Also refactor some annoying code in tor_ersatz_socketpair.
@nmathewson
Refactor tor_ersatz_socketpair() not to need socket.
fc0dc5a 
This change also makes tor_ersatz_socketpair() follow the same
interface as socketpair() rather than tor_socketpair(), so it now
needs to be wrapped in the same code as socketpair() does.
@nmathewson
Reindent tor_ersatz_socketpair
1b7b9c7
@nmathewson
Document new helper functions in socketpair.c
ff7229b
@nmathewson
tor_api: Extend tor_api code so it can pass extra arguments to main.
9a89450 
We need this so that the tor_api user can specify some arguments,
while the tor_api implementation adds others.

This implementation detail should not be visible to tor_api users.
@nmathewson
Add API for creating an owning controller FD and passing it to tor_main
c77fe82
@nmathewson
Convert __OwningControllerFD to a 64-bit value
fe3bacf 
This lets us potentially use it for internal passing of windows
sockets.
@nmathewson
Changes file for owningcontrollerfd api
820aba7
@coveralls
Copy link

@coveralls coveralls commented Aug 1, 2018

Coverage Status

Coverage decreased (-0.03%) to 59.5% when pulling 820aba7 on nmathewson:tor_api_owning_control into 7e4ac02 on torproject:master.

ahf
ahf reviewed Aug 30, 2018
View changes
src/feature/api/tor_api.c
void
tor_main_configuration_free(tor_main_configuration_t *cfg)
{
if (cfg == NULL)
return;
if (cfg->argv_owned) {
int i;
for (i = 0; i < cfg->argc_owned; ++i) {
Copy link
Member

@ahf ahf Aug 30, 2018

Lift int i into the loop?

@torproject-pusher torproject-pusher merged commit 820aba7 into torproject:master Sep 4, 2018
2 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment