nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 12:23:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Drop the minimum guard lifetime back down to one month

Browse Source 
Mike believes that raising the default to 2 months with no way to lower
it may create horrible load-balancing issues.
This commit is contained in:
Nick Mathewson 2013-03-11 22:16:25 -04:00
parent cf734a08f6
commit 18752bca5b
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/tor.1.txt
View File

@ -962,7 +962,7 @@ The following options are useful only for clients (that is, if
**GuardLifetime** __N__ **days**|**weeks**|**months**:: **GuardLifetime** __N__ **days**|**weeks**|**months**::
If nonzero, and UseEntryGuards is set, minimum time to keep a guard before If nonzero, and UseEntryGuards is set, minimum time to keep a guard before
picking a new one. If zero, we use the GuardLifetime parameter from the picking a new one. If zero, we use the GuardLifetime parameter from the
consensus directory. No value here may be less than 2 months or greater consensus directory. No value here may be less than 1 month or greater
than 5 years; out-of-range values are clamped. (Default: 0) than 5 years; out-of-range values are clamped. (Default: 0)
**SafeSocks** **0**|**1**:: **SafeSocks** **0**|**1**::

6
src/or/circuitbuild.c
View File

@ -4290,13 +4290,15 @@ entry_guard_free(entry_guard_t *e)
/** /**
* Return the minimum lifetime of working entry guard, in seconds, * Return the minimum lifetime of working entry guard, in seconds,
* as given in the consensus networkstatus. * as given in the consensus networkstatus. (Plus CHOSEN_ON_DATE_SLOP,
* so that we can do the chosen_on_date randomization while achieving the
* desired minimum lifetime.)
*/ */
static int32_t static int32_t
guards_get_lifetime(void) guards_get_lifetime(void)
{ {
const or_options_t *options = get_options(); const or_options_t *options = get_options();
#define DFLT_GUARD_LIFETIME (86400 * 60) /* Two months. */ #define DFLT_GUARD_LIFETIME (86400 * 30) /* One month. */
#define MIN_GUARD_LIFETIME (86400 * 60) /* Two months. */ #define MIN_GUARD_LIFETIME (86400 * 60) /* Two months. */
#define MAX_GUARD_LIFETIME (86400 * 1826) /* Five years. */ #define MAX_GUARD_LIFETIME (86400 * 1826) /* Five years. */