diff options
| author | David Goulet <dgoulet@torproject.org> | 2021-03-17 11:53:14 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2021-03-17 11:53:14 -0400 |
| commit | 15a95df376f8b8e27072db8d36f28b7054d13cef (patch) | |
| tree | f5aac5cd56451b2562e5290aa76300e0855fdab3 /src/app | |
| parent | 0ac03390e482a7ff1008f0051ac647114ce00c09 (diff) | |
| parent | 066748c9cde058db4c12dec0675c036ac11d7e84 (diff) | |
| download | tor-15a95df376f8b8e27072db8d36f28b7054d13cef.tar.gz tor-15a95df376f8b8e27072db8d36f28b7054d13cef.zip | |
Merge branch 'tor-gitlab/mr/337'
Diffstat (limited to 'src/app')
| -rw-r--r-- | src/app/config/config.c | 5 | ||||
| -rw-r--r-- | src/app/config/or_options_st.h | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/src/app/config/config.c b/src/app/config/config.c index f9f09dcd63..e0eb0dac13 100644 --- a/src/app/config/config.c +++ b/src/app/config/config.c @@ -422,8 +422,9 @@ static const config_var_t option_vars_[] = { OBSOLETE("DynamicDHGroups"), VPORT(DNSPort), OBSOLETE("DNSListenAddress"), - V(DormantClientTimeout, INTERVAL, "24 hours"), - V(DormantTimeoutDisabledByIdleStreams, BOOL, "1"), + V(DormantClientTimeout, INTERVAL, "24 hours"), + V(DormantTimeoutEnabled, BOOL, "1"), + V(DormantTimeoutDisabledByIdleStreams, BOOL, "1"), V(DormantOnFirstStartup, BOOL, "0"), V(DormantCanceledByStartup, BOOL, "0"), V(DownloadExtraInfo, BOOL, "0"), diff --git a/src/app/config/or_options_st.h b/src/app/config/or_options_st.h index 0a0b6483ff..641d276ff3 100644 --- a/src/app/config/or_options_st.h +++ b/src/app/config/or_options_st.h @@ -1033,6 +1033,13 @@ struct or_options_t { **/ int DormantClientTimeout; + /** + * Boolean: If enabled, then we consider the timeout when deciding whether + * to be dormant. If not enabled, then only the SIGNAL ACTIVE/DORMANT + * controls can change our status. + **/ + int DormantTimeoutEnabled; + /** Boolean: true if having an idle stream is sufficient to prevent a client * from becoming dormant. **/ |