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

oom: Consider edge connections as well

Browse Source 
Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2021-09-09 10:32:55 -04:00
parent 58aca27265
commit bd0aabe20f
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/core/or/circuitlist.c
View File

@ -2602,6 +2602,7 @@ circuits_handle_oom(size_t current_allocation)
size_t mem_recovered=0; size_t mem_recovered=0;
int n_circuits_killed=0; int n_circuits_killed=0;
int n_dirconns_killed=0; int n_dirconns_killed=0;
int n_edgeconns_killed = 0;
uint32_t now_ts; uint32_t now_ts;
log_notice(LD_GENERAL, "We're low on memory (cell queues total alloc:" log_notice(LD_GENERAL, "We're low on memory (cell queues total alloc:"
" %"TOR_PRIuSZ" buffer total alloc: %" TOR_PRIuSZ "," " %"TOR_PRIuSZ" buffer total alloc: %" TOR_PRIuSZ ","
@ -2668,12 +2669,19 @@ circuits_handle_oom(size_t current_allocation)
if (conn_age < circ->age_tmp) { if (conn_age < circ->age_tmp) {
break; break;
} }
if (conn->type == CONN_TYPE_DIR && conn->linked_conn == NULL) { /* Also consider edge connections so we don't accumulate bytes on the
* outbuf due to a malicious destination holding off the read on us. */
if ((conn->type == CONN_TYPE_DIR && conn->linked_conn == NULL) ||
CONN_IS_EDGE(conn)) {
if (!conn->marked_for_close) if (!conn->marked_for_close)
connection_mark_for_close(conn); connection_mark_for_close(conn);
mem_recovered += single_conn_free_bytes(conn); mem_recovered += single_conn_free_bytes(conn);
++n_dirconns_killed; if (conn->type == CONN_TYPE_DIR) {
++n_dirconns_killed;
} else {
++n_edgeconns_killed;
}
if (mem_recovered >= mem_to_recover) if (mem_recovered >= mem_to_recover)
goto done_recovering_mem; goto done_recovering_mem;
@ -2703,11 +2711,12 @@ circuits_handle_oom(size_t current_allocation)
done_recovering_mem: done_recovering_mem:
log_notice(LD_GENERAL, "Removed %"TOR_PRIuSZ" bytes by killing %d circuits; " log_notice(LD_GENERAL, "Removed %"TOR_PRIuSZ" bytes by killing %d circuits; "
"%d circuits remain alive. Also killed %d non-linked directory " "%d circuits remain alive. Also killed %d non-linked directory "
"connections.", "connections. Killed %d edge connections",
mem_recovered, mem_recovered,
n_circuits_killed, n_circuits_killed,
smartlist_len(circlist) - n_circuits_killed, smartlist_len(circlist) - n_circuits_killed,
n_dirconns_killed); n_dirconns_killed,
n_edgeconns_killed);
return mem_recovered; return mem_recovered;
} }