Commit a4400a77 authored by Nick Mathewson's avatar Nick Mathewson 🐛
Browse files

Merge branch 'ticket31343_029' into ticket31343_035

parents 70d0b97e 878f4409
......@@ -2856,7 +2856,7 @@ int
router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2)
{
time_t r1pub, r2pub;
long time_difference;
time_t time_difference;
tor_assert(r1 && r2);
/* r1 should be the one that was published first. */
......@@ -2920,7 +2920,9 @@ router_differences_are_cosmetic(const routerinfo_t *r1, const routerinfo_t *r2)
* give or take some slop? */
r1pub = r1->cache_info.published_on;
r2pub = r2->cache_info.published_on;
time_difference = labs(r2->uptime - (r1->uptime + (r2pub - r1pub)));
time_difference = r2->uptime - (r1->uptime + (r2pub - r1pub));
if (time_difference < 0)
time_difference = - time_difference;
if (time_difference > ROUTER_ALLOW_UPTIME_DRIFT &&
time_difference > r1->uptime * .05 &&
time_difference > r2->uptime * .05)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment