July 2017 - tor-commits - lists.torproject.org

[tor/master] If writing a heartbeat message fails, retry after MIN_HEARTBEAT_PERIOD.
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 9de12397cf4882e83f199616d52ec9c90e0d6d8e Author: Isis Lovecruft <isis(a)torproject.org> Date: Wed Jul 12 02:40:24 2017 +0000 If writing a heartbeat message fails, retry after MIN_HEARTBEAT_PERIOD. * FIXES #19476. --- src/or/config.c | 4 ---- src/or/config.h | 4 ++++ src/or/main.c | 12 ++++++++---- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/or/config.c b/src/or/config.c index 5b5bb90..5da871d 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -2804,10 +2804,6 @@ compute_publishserverdescriptor(or_options_t *options) * will generate too many circuits and potentially overload the network. */ #define MIN_CIRCUIT_STREAM_TIMEOUT 10 -/** Lowest allowable value for HeartbeatPeriod; if this is too low, we might - * expose more information than we're comfortable with. */ -#define MIN_HEARTBEAT_PERIOD (30*60) - /** Lowest recommended value for CircuitBuildTimeout; if it is set too low * and LearnCircuitBuildTimeout is off, the failure rate for circuit * construction may be very high. In that case, if it is set below this diff --git a/src/or/config.h b/src/or/config.h index 27aec7f..3cfa7c4 100644 --- a/src/or/config.h +++ b/src/or/config.h @@ -18,6 +18,10 @@ #define KERNEL_MAY_SUPPORT_IPFW #endif +/** Lowest allowable value for HeartbeatPeriod; if this is too low, we might + * expose more information than we're comfortable with. */ +#define MIN_HEARTBEAT_PERIOD (30*60) + MOCK_DECL(const char*, get_dirportfrontpage, (void)); MOCK_DECL(const or_options_t *, get_options, (void)); MOCK_DECL(or_options_t *, get_options_mutable, (void)); diff --git a/src/or/main.c b/src/or/main.c index 4116740..f7b9cc8 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2060,6 +2060,9 @@ check_fw_helper_app_callback(time_t now, const or_options_t *options) /** * Periodic callback: write the heartbeat message in the logs. + * + * If writing the heartbeat message to the logs fails for some reason, retry + * again after <b>MIN_HEARTBEAT_PERIOD</b> seconds. */ static int heartbeat_callback(time_t now, const or_options_t *options) @@ -2078,12 +2081,13 @@ heartbeat_callback(time_t now, const or_options_t *options) } /* Write the heartbeat message */ - int r = log_heartbeat(now); - if (r == 0) { + if (log_heartbeat(now) == 0) { return options->HeartbeatPeriod; + } else { + /* If we couldn't write the heartbeat log message, try again in the minimum + * interval of time. */ + return MIN_HEARTBEAT_PERIOD; } - - return PERIODIC_EVENT_NO_UPDATE; } #define CDM_CLEAN_CALLBACK_INTERVAL 600

1 0

[tor/master] Merge remote-tracking branch 'isis/bug19476'
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 62d241ad22b173ee908ad9cc2c55f5b10d22c2d9 Merge: 66a564f 175451d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:58:45 2017 -0400 Merge remote-tracking branch 'isis/bug19476' changes/bug19476 | 3 +++ src/or/config.c | 4 ---- src/or/config.h | 4 ++++ src/or/main.c | 19 ++++++++++++++----- 4 files changed, 21 insertions(+), 9 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 05ca8ab5b69cb51e708e74ddeb32188f5f169ca3 Merge: 11b2d36 66258f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:55:06 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug22883-config | 7 +++++++ doc/tor.1.txt | 10 ++++++++++ src/or/config.c | 1 + src/or/consdiffmgr.c | 13 ++++++++++++- src/or/or.h | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'fewer-diffs' into maint-0.3.1
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 66258f8878abe6323c56bcf0b20796e1c43d66fc Merge: 1ea155b abb9a5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:55:02 2017 -0400 Merge branch 'fewer-diffs' into maint-0.3.1 changes/bug22883-config | 7 +++++++ doc/tor.1.txt | 10 ++++++++++ src/or/config.c | 1 + src/or/consdiffmgr.c | 13 ++++++++++++- src/or/or.h | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] Merge branch 'fewer-diffs' into maint-0.3.1
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 66258f8878abe6323c56bcf0b20796e1c43d66fc Merge: 1ea155b abb9a5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:55:02 2017 -0400 Merge branch 'fewer-diffs' into maint-0.3.1 changes/bug22883-config | 7 +++++++ doc/tor.1.txt | 10 ++++++++++ src/or/config.c | 1 + src/or/consdiffmgr.c | 13 ++++++++++++- src/or/or.h | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-)

1 0

[tor/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 66a564fad8a99a21bd6cda6a70982858376b78e9 Merge: ec29cae 66258f8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:55:06 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22883-config | 7 +++++++ doc/tor.1.txt | 10 ++++++++++ src/or/config.c | 1 + src/or/consdiffmgr.c | 13 ++++++++++++- src/or/or.h | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-)

1 0

[tor/maint-0.3.1] New configuration option MaxConsensusAgeForDiffs
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit abb9a5bdda9bde028704c01c47191c64cfa088c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 12 13:15:16 2017 -0400 New configuration option MaxConsensusAgeForDiffs Relay operators (especially bridge operators) can use this to lower or raise the number of consensuses that they're willing to hold for diff generation purposes. This enables a workaround for bug 22883. --- changes/bug22883-config | 7 +++++++ doc/tor.1.txt | 10 ++++++++++ src/or/config.c | 1 + src/or/consdiffmgr.c | 13 ++++++++++++- src/or/or.h | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/changes/bug22883-config b/changes/bug22883-config new file mode 100644 index 0000000..d60594d --- /dev/null +++ b/changes/bug22883-config @@ -0,0 +1,7 @@ + o Minor features (directory cache, consensus diff): + - Add a new MaxConsensusAgeForDiffs option to allow directory cache + operators with low-resource environments to adjust the number of + consensuses they'll store and generate diffs from. Most cache operators + should leave it unchanged. Helps to work around bug 22883. + + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2459969..e17c111 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2072,6 +2072,16 @@ details.) because clients connect via the ORPort by default. Setting either DirPort or BridgeRelay and setting DirCache to 0 is not supported. (Default: 1) +[[MaxConsensusAgeForDiffs]] **MaxConsensusAgeForDiffs** __N__ **minutes**|**hours**|**days**|**weeks**:: + When this option is nonzero, Tor caches will not try to generate + consensus diffs for any consensus older than this amount of time. + If this option is set to zero, Tor will pick a reasonable default from + the current networkstatus document. You should not set this + option unless your cache is severely low on disk space or CPU. + If you need to set it, keeping it above 3 or 4 hours will help clients + much more than setting it to zero. + (Default: 0) + DIRECTORY AUTHORITY SERVER OPTIONS ---------------------------------- diff --git a/src/or/config.c b/src/or/config.c index 7d2ebbd..a0ff0e8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -393,6 +393,7 @@ static config_var_t option_vars_[] = { V(MaxAdvertisedBandwidth, MEMUNIT, "1 GB"), V(MaxCircuitDirtiness, INTERVAL, "10 minutes"), V(MaxClientCircuitsPending, UINT, "32"), + V(MaxConsensusAgeForDiffs, INTERVAL, "0 seconds"), VAR("MaxMemInQueues", MEMUNIT, MaxMemInQueues_raw, "0"), OBSOLETE("MaxOnionsPending"), V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 638fcd6..a3ffed1 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -14,6 +14,7 @@ #define CONSDIFFMGR_PRIVATE #include "or.h" +#include "config.h" #include "conscache.h" #include "consdiff.h" #include "consdiffmgr.h" @@ -462,12 +463,22 @@ cdm_cache_lookup_consensus(consensus_flavor_t flavor, time_t valid_after) static int32_t get_max_age_to_cache(void) { - /* The parameter is in hours. */ const int32_t DEFAULT_MAX_AGE_TO_CACHE = 8192; const int32_t MIN_MAX_AGE_TO_CACHE = 0; const int32_t MAX_MAX_AGE_TO_CACHE = 8192; const char MAX_AGE_TO_CACHE_NAME[] = "max-consensus-age-to-cache-for-diff"; + const or_options_t *options = get_options(); + + if (options->MaxConsensusAgeForDiffs) { + const int v = options->MaxConsensusAgeForDiffs; + if (v >= MAX_MAX_AGE_TO_CACHE * 3600) + return MAX_MAX_AGE_TO_CACHE; + else + return v; + } + + /* The parameter is in hours, so we multiply */ return 3600 * networkstatus_get_param(NULL, MAX_AGE_TO_CACHE_NAME, DEFAULT_MAX_AGE_TO_CACHE, diff --git a/src/or/or.h b/src/or/or.h index 1f55b55..77207bc 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4558,6 +4558,11 @@ typedef struct { /** Bool (default: 0): Tells if a %include was used on torrc */ int IncludeUsed; + + /** The seconds after expiration which we as a relay should keep old + * consensuses around so that we can generate diffs from them. If 0, + * use the default. */ + int MaxConsensusAgeForDiffs; } or_options_t; /** Persistent state for an onion router, as saved to disk. */

1 0

[tor/release-0.3.1] New configuration option MaxConsensusAgeForDiffs
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit abb9a5bdda9bde028704c01c47191c64cfa088c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 12 13:15:16 2017 -0400 New configuration option MaxConsensusAgeForDiffs Relay operators (especially bridge operators) can use this to lower or raise the number of consensuses that they're willing to hold for diff generation purposes. This enables a workaround for bug 22883. --- changes/bug22883-config | 7 +++++++ doc/tor.1.txt | 10 ++++++++++ src/or/config.c | 1 + src/or/consdiffmgr.c | 13 ++++++++++++- src/or/or.h | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/changes/bug22883-config b/changes/bug22883-config new file mode 100644 index 0000000..d60594d --- /dev/null +++ b/changes/bug22883-config @@ -0,0 +1,7 @@ + o Minor features (directory cache, consensus diff): + - Add a new MaxConsensusAgeForDiffs option to allow directory cache + operators with low-resource environments to adjust the number of + consensuses they'll store and generate diffs from. Most cache operators + should leave it unchanged. Helps to work around bug 22883. + + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2459969..e17c111 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2072,6 +2072,16 @@ details.) because clients connect via the ORPort by default. Setting either DirPort or BridgeRelay and setting DirCache to 0 is not supported. (Default: 1) +[[MaxConsensusAgeForDiffs]] **MaxConsensusAgeForDiffs** __N__ **minutes**|**hours**|**days**|**weeks**:: + When this option is nonzero, Tor caches will not try to generate + consensus diffs for any consensus older than this amount of time. + If this option is set to zero, Tor will pick a reasonable default from + the current networkstatus document. You should not set this + option unless your cache is severely low on disk space or CPU. + If you need to set it, keeping it above 3 or 4 hours will help clients + much more than setting it to zero. + (Default: 0) + DIRECTORY AUTHORITY SERVER OPTIONS ---------------------------------- diff --git a/src/or/config.c b/src/or/config.c index 7d2ebbd..a0ff0e8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -393,6 +393,7 @@ static config_var_t option_vars_[] = { V(MaxAdvertisedBandwidth, MEMUNIT, "1 GB"), V(MaxCircuitDirtiness, INTERVAL, "10 minutes"), V(MaxClientCircuitsPending, UINT, "32"), + V(MaxConsensusAgeForDiffs, INTERVAL, "0 seconds"), VAR("MaxMemInQueues", MEMUNIT, MaxMemInQueues_raw, "0"), OBSOLETE("MaxOnionsPending"), V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 638fcd6..a3ffed1 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -14,6 +14,7 @@ #define CONSDIFFMGR_PRIVATE #include "or.h" +#include "config.h" #include "conscache.h" #include "consdiff.h" #include "consdiffmgr.h" @@ -462,12 +463,22 @@ cdm_cache_lookup_consensus(consensus_flavor_t flavor, time_t valid_after) static int32_t get_max_age_to_cache(void) { - /* The parameter is in hours. */ const int32_t DEFAULT_MAX_AGE_TO_CACHE = 8192; const int32_t MIN_MAX_AGE_TO_CACHE = 0; const int32_t MAX_MAX_AGE_TO_CACHE = 8192; const char MAX_AGE_TO_CACHE_NAME[] = "max-consensus-age-to-cache-for-diff"; + const or_options_t *options = get_options(); + + if (options->MaxConsensusAgeForDiffs) { + const int v = options->MaxConsensusAgeForDiffs; + if (v >= MAX_MAX_AGE_TO_CACHE * 3600) + return MAX_MAX_AGE_TO_CACHE; + else + return v; + } + + /* The parameter is in hours, so we multiply */ return 3600 * networkstatus_get_param(NULL, MAX_AGE_TO_CACHE_NAME, DEFAULT_MAX_AGE_TO_CACHE, diff --git a/src/or/or.h b/src/or/or.h index 1f55b55..77207bc 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4558,6 +4558,11 @@ typedef struct { /** Bool (default: 0): Tells if a %include was used on torrc */ int IncludeUsed; + + /** The seconds after expiration which we as a relay should keep old + * consensuses around so that we can generate diffs from them. If 0, + * use the default. */ + int MaxConsensusAgeForDiffs; } or_options_t; /** Persistent state for an onion router, as saved to disk. */

1 0

[tor/master] New configuration option MaxConsensusAgeForDiffs
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit abb9a5bdda9bde028704c01c47191c64cfa088c8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 12 13:15:16 2017 -0400 New configuration option MaxConsensusAgeForDiffs Relay operators (especially bridge operators) can use this to lower or raise the number of consensuses that they're willing to hold for diff generation purposes. This enables a workaround for bug 22883. --- changes/bug22883-config | 7 +++++++ doc/tor.1.txt | 10 ++++++++++ src/or/config.c | 1 + src/or/consdiffmgr.c | 13 ++++++++++++- src/or/or.h | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-) diff --git a/changes/bug22883-config b/changes/bug22883-config new file mode 100644 index 0000000..d60594d --- /dev/null +++ b/changes/bug22883-config @@ -0,0 +1,7 @@ + o Minor features (directory cache, consensus diff): + - Add a new MaxConsensusAgeForDiffs option to allow directory cache + operators with low-resource environments to adjust the number of + consensuses they'll store and generate diffs from. Most cache operators + should leave it unchanged. Helps to work around bug 22883. + + diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 2459969..e17c111 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -2072,6 +2072,16 @@ details.) because clients connect via the ORPort by default. Setting either DirPort or BridgeRelay and setting DirCache to 0 is not supported. (Default: 1) +[[MaxConsensusAgeForDiffs]] **MaxConsensusAgeForDiffs** __N__ **minutes**|**hours**|**days**|**weeks**:: + When this option is nonzero, Tor caches will not try to generate + consensus diffs for any consensus older than this amount of time. + If this option is set to zero, Tor will pick a reasonable default from + the current networkstatus document. You should not set this + option unless your cache is severely low on disk space or CPU. + If you need to set it, keeping it above 3 or 4 hours will help clients + much more than setting it to zero. + (Default: 0) + DIRECTORY AUTHORITY SERVER OPTIONS ---------------------------------- diff --git a/src/or/config.c b/src/or/config.c index 7d2ebbd..a0ff0e8 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -393,6 +393,7 @@ static config_var_t option_vars_[] = { V(MaxAdvertisedBandwidth, MEMUNIT, "1 GB"), V(MaxCircuitDirtiness, INTERVAL, "10 minutes"), V(MaxClientCircuitsPending, UINT, "32"), + V(MaxConsensusAgeForDiffs, INTERVAL, "0 seconds"), VAR("MaxMemInQueues", MEMUNIT, MaxMemInQueues_raw, "0"), OBSOLETE("MaxOnionsPending"), V(MaxOnionQueueDelay, MSEC_INTERVAL, "1750 msec"), diff --git a/src/or/consdiffmgr.c b/src/or/consdiffmgr.c index 638fcd6..a3ffed1 100644 --- a/src/or/consdiffmgr.c +++ b/src/or/consdiffmgr.c @@ -14,6 +14,7 @@ #define CONSDIFFMGR_PRIVATE #include "or.h" +#include "config.h" #include "conscache.h" #include "consdiff.h" #include "consdiffmgr.h" @@ -462,12 +463,22 @@ cdm_cache_lookup_consensus(consensus_flavor_t flavor, time_t valid_after) static int32_t get_max_age_to_cache(void) { - /* The parameter is in hours. */ const int32_t DEFAULT_MAX_AGE_TO_CACHE = 8192; const int32_t MIN_MAX_AGE_TO_CACHE = 0; const int32_t MAX_MAX_AGE_TO_CACHE = 8192; const char MAX_AGE_TO_CACHE_NAME[] = "max-consensus-age-to-cache-for-diff"; + const or_options_t *options = get_options(); + + if (options->MaxConsensusAgeForDiffs) { + const int v = options->MaxConsensusAgeForDiffs; + if (v >= MAX_MAX_AGE_TO_CACHE * 3600) + return MAX_MAX_AGE_TO_CACHE; + else + return v; + } + + /* The parameter is in hours, so we multiply */ return 3600 * networkstatus_get_param(NULL, MAX_AGE_TO_CACHE_NAME, DEFAULT_MAX_AGE_TO_CACHE, diff --git a/src/or/or.h b/src/or/or.h index 1f55b55..77207bc 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -4558,6 +4558,11 @@ typedef struct { /** Bool (default: 0): Tells if a %include was used on torrc */ int IncludeUsed; + + /** The seconds after expiration which we as a relay should keep old + * consensuses around so that we can generate diffs from them. If 0, + * use the default. */ + int MaxConsensusAgeForDiffs; } or_options_t; /** Persistent state for an onion router, as saved to disk. */

1 0

[tor/master] Merge branch 'fewer-diffs' into maint-0.3.1
by nickm＠torproject.org 13 Jul '17

13 Jul '17

commit 66258f8878abe6323c56bcf0b20796e1c43d66fc Merge: 1ea155b abb9a5b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 13 16:55:02 2017 -0400 Merge branch 'fewer-diffs' into maint-0.3.1 changes/bug22883-config | 7 +++++++ doc/tor.1.txt | 10 ++++++++++ src/or/config.c | 1 + src/or/consdiffmgr.c | 13 ++++++++++++- src/or/or.h | 5 +++++ 5 files changed, 35 insertions(+), 1 deletion(-)

1 0