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

Add layer2_guard_free()

Browse Source
This commit is contained in:
George Kadianakis 2021-07-09 16:54:24 +03:00
parent a77727cdca
commit 9b464cdc36
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/feature/client/entrynodes.c
View File

@ -3944,6 +3944,19 @@ typedef struct layer2_guard_t {
time_t expire_on_date; time_t expire_on_date;
} layer2_guard_t; } layer2_guard_t;
#define layer2_guard_free(val) \
FREE_AND_NULL(layer2_guard_t, layer2_guard_free_, (val))
static void
layer2_guard_free_(layer2_guard_t *l2)
{
if (!l2) {
return;
}
tor_free(l2);
}
/** Global list and routerset of L2 guards. They are both synced and they get /** Global list and routerset of L2 guards. They are both synced and they get
* updated periodically. We need both the list and the routerset: we use the * updated periodically. We need both the list and the routerset: we use the
* smartlist to keep track of expiration times and the routerset is what we * smartlist to keep track of expiration times and the routerset is what we
@ -4029,7 +4042,7 @@ maintain_layer2_guards(void)
safe_str_client(hex_str(g->identity, DIGEST_LEN))); safe_str_client(hex_str(g->identity, DIGEST_LEN)));
// Nickname may be gone from consensus and doesn't matter anyway // Nickname may be gone from consensus and doesn't matter anyway
control_event_guard("None", g->identity, "BAD_L2"); control_event_guard("None", g->identity, "BAD_L2");
tor_free(g); layer2_guard_free(g);
SMARTLIST_DEL_CURRENT_KEEPORDER(layer2_guards, g); SMARTLIST_DEL_CURRENT_KEEPORDER(layer2_guards, g);
continue; continue;
} }
@ -4040,7 +4053,7 @@ maintain_layer2_guards(void)
safe_str_client(hex_str(g->identity, DIGEST_LEN))); safe_str_client(hex_str(g->identity, DIGEST_LEN)));
// Nickname may be gone from consensus and doesn't matter anyway // Nickname may be gone from consensus and doesn't matter anyway
control_event_guard("None", g->identity, "BAD_L2"); control_event_guard("None", g->identity, "BAD_L2");
tor_free(g); layer2_guard_free(g);
SMARTLIST_DEL_CURRENT_KEEPORDER(layer2_guards, g); SMARTLIST_DEL_CURRENT_KEEPORDER(layer2_guards, g);
continue; continue;
} }
@ -4110,7 +4123,7 @@ purge_vanguards_lite(void)
/* Go through the list and perform any needed expirations */ /* Go through the list and perform any needed expirations */
SMARTLIST_FOREACH_BEGIN(layer2_guards, layer2_guard_t *, g) { SMARTLIST_FOREACH_BEGIN(layer2_guards, layer2_guard_t *, g) {
tor_free(g); layer2_guard_free(g);
} SMARTLIST_FOREACH_END(g); } SMARTLIST_FOREACH_END(g);
smartlist_clear(layer2_guards); smartlist_clear(layer2_guards);
@ -4158,7 +4171,7 @@ entry_guards_free_all(void)
} }
SMARTLIST_FOREACH_BEGIN(layer2_guards, layer2_guard_t *, g) { SMARTLIST_FOREACH_BEGIN(layer2_guards, layer2_guard_t *, g) {
tor_free(g); layer2_guard_free(g);
} SMARTLIST_FOREACH_END(g); } SMARTLIST_FOREACH_END(g);
smartlist_free(layer2_guards); smartlist_free(layer2_guards);