mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'maint-0.4.4'

Browse source
This commit is contained in:
David Goulet 2020-06-25 07:36:56 -04:00
commit c370b4a049
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
changes/bug40001 Normal file
View file

@ -0,0 +1,3 @@
o Minor features (entry guards):
- Reinstate support for GUARD NEW/UP/DOWN control port events.
Closes ticket 40001.

13
src/feature/client/entrynodes.c
View file

@ -906,6 +906,11 @@ entry_guard_add_to_sample_impl(guard_selection_t *gs,
guard->in_selection = gs; guard->in_selection = gs;
entry_guard_set_filtered_flags(get_options(), gs, guard); entry_guard_set_filtered_flags(get_options(), gs, guard);
entry_guards_changed_for_guard_selection(gs); entry_guards_changed_for_guard_selection(gs);
/* Just added this guard to the sampled set and hence it might be used as a
* guard in the future: send GUARD NEW control event. */
control_event_guard(guard->nickname, guard->identity, "NEW");
return guard; return guard;
} }
@ -2259,6 +2264,9 @@ entry_guards_note_guard_failure(guard_selection_t *gs,
if (guard->failing_since == 0) if (guard->failing_since == 0)
guard->failing_since = approx_time(); guard->failing_since = approx_time();
/* This guard not reachable: send GUARD DOWN event */
control_event_guard(guard->nickname, guard->identity, "DOWN");
log_info(LD_GUARD, "Recorded failure for %s%sguard %s", log_info(LD_GUARD, "Recorded failure for %s%sguard %s",
guard->is_primary?"primary ":"", guard->is_primary?"primary ":"",
guard->confirmed_idx>=0?"confirmed ":"", guard->confirmed_idx>=0?"confirmed ":"",
@ -2284,6 +2292,11 @@ entry_guards_note_guard_success(guard_selection_t *gs,
const time_t last_time_on_internet = gs->last_time_on_internet; const time_t last_time_on_internet = gs->last_time_on_internet;
gs->last_time_on_internet = approx_time(); gs->last_time_on_internet = approx_time();
/* If guard was not already marked as reachable, send a GUARD UP signal */
if (guard->is_reachable != GUARD_REACHABLE_YES) {
control_event_guard(guard->nickname, guard->identity, "UP");
}
guard->is_reachable = GUARD_REACHABLE_YES; guard->is_reachable = GUARD_REACHABLE_YES;
guard->failing_since = 0; guard->failing_since = 0;
guard->is_pending = 0; guard->is_pending = 0;