torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add options to control dormant-client feature.

Browse Source 
The DormantClientTimeout option controls how long Tor will wait before
going dormant.  It also provides a way to disable the feature by setting
DormantClientTimeout to e.g. "50 years".

The DormantTimeoutDisabledByIdleStreams option controls whether open but
inactive streams count as "client activity".  To implement it, I had to
make it so that reading or writing on a client stream *always* counts as
activity.

Closes ticket 28429.
This commit is contained in:
Nick Mathewson
2018-11-15 13:16:58 -05:00
parent 53ccdb6945
commit 3743f79695
6 changed files with 51 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/mainloop/mainloop.c
+10 -9
View File
@@ -2018,24 +2018,25 @@ check_network_participation_callback(time_t now, const or_options_t *options)
goto found_activity;
}
/* XXXX Add an option to never become dormant. */
/* If we have any currently open entry streams other than "linked"
* connections used for directory requests, those count as user activity.
*/
/* XXXX make this configurable? */
if (connection_get_by_type_nonlinked(CONN_TYPE_AP) != NULL) {
goto found_activity;
if (options->DormantTimeoutDisabledByIdleStreams) {
if (connection_get_by_type_nonlinked(CONN_TYPE_AP) != NULL) {
goto found_activity;
}
}
/* XXXX Make this configurable? */
/** How often do we check whether we have had network activity? */
#define CHECK_PARTICIPATION_INTERVAL (5*60)
/** Become dormant if there has been no user activity in this long. */
/* XXXX make this configurable! */
#define BECOME_DORMANT_AFTER_INACTIVITY (24*60*60)
if (get_last_user_activity_time() + BECOME_DORMANT_AFTER_INACTIVITY >= now) {
/* Become dormant if there has been no user activity in a long time.
* (The funny checks below are in order to prevent overflow.) */
time_t time_since_last_activity = 0;
if (get_last_user_activity_time() < now)
time_since_last_activity = now - get_last_user_activity_time();
if (time_since_last_activity >= options->DormantClientTimeout) {
log_notice(LD_GENERAL, "No user activity in a long time: becoming"
" dormant.");
set_network_participation(false);