aboutsummaryrefslogtreecommitdiff
path: root/src/or/or.h
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-18 13:36:53 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-18 13:36:53 -0400
commitf1bf9bf8198fcfaf078fdc12eb2ad5adf1901d29 (patch)
treef6847f99adba9f8caa216cf42ab6c3e54cf2af50 /src/or/or.h
parentf0daaf8d60be8bfcfaa99e3a878cd90967a84bb0 (diff)
downloadtor-f1bf9bf8198fcfaf078fdc12eb2ad5adf1901d29.tar.gz
tor-f1bf9bf8198fcfaf078fdc12eb2ad5adf1901d29.zip
Add __OwningControllerFD to allow controllers without controlports
This feature should help programs that want to launch and manage a Tor process, as well as programs that want to launch and manage a Tor instance in a separate thread. Right now, they have to open a controlport, and then connect to it, with attendant authentication issues. This feature allows them to just start with an authenticated connection. Bug 23900.
Diffstat (limited to 'src/or/or.h')
-rw-r--r--src/or/or.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h
index 5bd07ba6a3..048dbc591c 100644
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -4066,6 +4066,8 @@ typedef struct {
/** Process specifier for a controller that ‘owns’ this Tor
* instance. Tor will terminate if its owning controller does. */
char *OwningControllerProcess;
+ /** FD specifier for a controller that owns this Tor instance. */
+ int OwningControllerFD;
int ShutdownWaitLength; /**< When we get a SIGINT and we're a server, how
* long do we wait before exiting? */