From 94a2376e01a5a35b3ce030874a15faba56ea6322 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Mon, 9 Mar 2020 16:00:50 +0200 Subject: [PATCH 1/3] Document __OwningControllerProcess torrc option and mention polling interval --- changes/doc32971 | 3 +++ doc/tor.1.txt | 5 +++++ 2 files changed, 8 insertions(+) create mode 100644 changes/doc32971 diff --git a/changes/doc32971 b/changes/doc32971 new file mode 100644 index 0000000000..014d2a7cec --- /dev/null +++ b/changes/doc32971 @@ -0,0 +1,3 @@ + o Documentation (manpage): + - Document __OwningControllerProcess torrc option and specify polling + interval. Resolves issue 32971. diff --git a/doc/tor.1.txt b/doc/tor.1.txt index f517a78f6d..91c558e88b 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -760,6 +760,11 @@ forward slash (/) in the configuration file and on the command line. This setting will be ignored for connections to the loopback addresses (127.0.0.0/8 and ::1). +[[OwningControllerProcess]] **$$__$$OwningControllerProcess** __PID__:: + Make Tor instance periodically check for presence of a controller process + with given PID and terminate itself if this process is no longer alive. + Polling interval is 15 seconds. + [[PerConnBWBurst]] **PerConnBWBurst** __N__ **bytes**|**KBytes**|**MBytes**|**GBytes**|**TBytes**|**KBits**|**MBits**|**GBits**|**TBits**:: If this option is set manually, or via the "perconnbwburst" consensus field, Tor will use it for separate rate limiting for each connection From f89c32ccd0ea9ce8bbe4620257f8a754de8b8b17 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Mon, 9 Mar 2020 16:03:43 +0200 Subject: [PATCH 2/3] Document poll_interval_tv in procmon.c --- src/lib/evloop/procmon.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/lib/evloop/procmon.c b/src/lib/evloop/procmon.c index 3276cb1808..718c7d4777 100644 --- a/src/lib/evloop/procmon.c +++ b/src/lib/evloop/procmon.c @@ -165,8 +165,8 @@ tor_validate_process_specifier(const char *process_spec, return parse_process_specifier(process_spec, &ppspec, msg); } -/* DOCDOC poll_interval_tv */ -static const struct timeval poll_interval_tv = {15, 0}; +/* We check this often for presence of owning controller process. */ +static const struct timeval poll_interval_tv = {15, 0}; // 15 seconds. /** Create a process-termination monitor for the process specifier * given in process_spec. Return a newly allocated From 72550c18c82fe7bafaf01a539fc9ef0f0dbf5e75 Mon Sep 17 00:00:00 2001 From: rl1987 Date: Mon, 9 Mar 2020 20:51:46 +0200 Subject: [PATCH 3/3] Tweak double-underscore --- doc/tor.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 91c558e88b..8f5b43ca5f 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -760,7 +760,7 @@ forward slash (/) in the configuration file and on the command line. This setting will be ignored for connections to the loopback addresses (127.0.0.0/8 and ::1). -[[OwningControllerProcess]] **$$__$$OwningControllerProcess** __PID__:: +[[OwningControllerProcess]] **{dbl_}OwningControllerProcess** __PID__:: Make Tor instance periodically check for presence of a controller process with given PID and terminate itself if this process is no longer alive. Polling interval is 15 seconds.