diff options
| author | Roger Dingledine <arma@torproject.org> | 2012-04-24 12:19:07 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2012-04-24 12:19:07 -0400 |
| commit | ae94e36a1ddc792fcf8953ea7932f2a9c408dbdf (patch) | |
| tree | 6879004db87c767dc11c5f9cb58a476c2f9f0b89 | |
| parent | 51841709bf2d709c54ee0fa27830533020b2a7d7 (diff) | |
| parent | cc3515780529277a5f9d788e8a256798e5cd144f (diff) | |
| download | tor-ae94e36a1ddc792fcf8953ea7932f2a9c408dbdf.tar.gz tor-ae94e36a1ddc792fcf8953ea7932f2a9c408dbdf.zip | |
Merge remote-tracking branch 'nickm/bug2497'
| -rw-r--r-- | changes/bug2749 | 8 | ||||
| -rw-r--r-- | src/or/or.h | 2 | ||||
| -rw-r--r-- | src/or/routerlist.c | 2 |
3 files changed, 10 insertions, 2 deletions
diff --git a/changes/bug2749 b/changes/bug2749 new file mode 100644 index 0000000000..964a828859 --- /dev/null +++ b/changes/bug2749 @@ -0,0 +1,8 @@ + o Changed parameters (authorities): + - Authorities are now a little more lenient at accepting older + router descriptors, or newer router descriptors that don't make + big changes. This should help ameliorate past and future issues + where routers think they have uploaded valid descriptors, but the + authorities don't think so. Fix for ticket 2479. + + diff --git a/src/or/or.h b/src/or/or.h index a498a57083..b8fee649ea 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -187,7 +187,7 @@ #define ROUTER_MAX_AGE (60*60*48) /** How old can a router get before we (as a server) will no longer * consider it live? In seconds. */ -#define ROUTER_MAX_AGE_TO_PUBLISH (60*60*20) +#define ROUTER_MAX_AGE_TO_PUBLISH (60*60*24) /** How old do we let a saved descriptor get before force-removing it? */ #define OLD_ROUTER_DESC_MAX_AGE (60*60*24*5) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 160f340dcf..a64b93f3a9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -5082,7 +5082,7 @@ router_reset_descriptor_download_failures(void) /** Any changes in a router descriptor's publication time larger than this are * automatically non-cosmetic. */ -#define ROUTER_MAX_COSMETIC_TIME_DIFFERENCE (12*60*60) +#define ROUTER_MAX_COSMETIC_TIME_DIFFERENCE (2*60*60) /** We allow uptime to vary from how much it ought to be by this much. */ #define ROUTER_ALLOW_UPTIME_DRIFT (6*60*60) |