nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 06:13:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rewriting entry_is_time_to_retry() using table approach.

Browse Source
This commit is contained in:
rl1987 2014-08-19 22:12:19 +03:00 committed by Nick Mathewson
parent 2937de2180
commit 197d855009
2 changed files with 31 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug12205 Normal file
View File

@ -0,0 +1,4 @@
o Minor refactoring:
- Refactoring and unit-testing entry_is_time_to_retry() in
entrynodes.c. Resolves ticket 12205.

37
src/or/entrynodes.c
View File

@ -159,18 +159,35 @@ entry_guard_set_status(entry_guard_t *e, const node_t *node,
static int static int
entry_is_time_to_retry(const entry_guard_t *e, time_t now) entry_is_time_to_retry(const entry_guard_t *e, time_t now)
{ {
long diff; struct guard_retry_period_s {
time_t period_duration;
time_t interval_during_period;
};
struct guard_retry_period_s periods[] = {
{ 6*60*60, 60*60 },
{ 3*24*60*60, 4*60*60 },
{ 7*24*60*60, 18*60*60 },
{ TIME_MAX, 36*60*60 }
};
time_t ith_deadline_for_retry;
time_t unreachable_for;
int i;
if (e->last_attempted < e->unreachable_since) if (e->last_attempted < e->unreachable_since)
return 1; return 1;
diff = now - e->unreachable_since;
if (diff < 6*60*60) unreachable_for = now - e->unreachable_since;
return now > (e->last_attempted + 60*60);
else if (diff < 3*24*60*60) for (i = 0; ; i++) {
return now > (e->last_attempted + 4*60*60); if (unreachable_for <= periods[i].period_duration) {
else if (diff < 7*24*60*60) ith_deadline_for_retry = e->last_attempted +
return now > (e->last_attempted + 18*60*60); periods[i].interval_during_period;
else
return now > (e->last_attempted + 36*60*60); return (now > ith_deadline_for_retry);
}
}
} }
/** Return the node corresponding to <b>e</b>, if <b>e</b> is /** Return the node corresponding to <b>e</b>, if <b>e</b> is