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

Bug 30649: Check that machine is absent before warn

Browse Source
This commit is contained in:
Mike Perry 2019-05-30 15:15:01 -07:00
parent dd62cb788e
commit de3eb8c5e4
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,17 +254,25 @@ circpad_marked_circuit_for_padding(circuit_t *circ, int reason)
return 0; // No machine wanted to keep the circuit open; mark for close return 0; // No machine wanted to keep the circuit open; mark for close
} }
/** Free all the machineinfos in <b>circ</b> that match <b>machine_num</b>. */ /**
static void * Free all the machineinfos in <b>circ</b> that match <b>machine_num</b>.
*
* Returns true if any machineinfos with that number were freed.
* False otherwise. */
static int
free_circ_machineinfos_with_machine_num(circuit_t *circ, int machine_num) free_circ_machineinfos_with_machine_num(circuit_t *circ, int machine_num)
{ {
int found = 0;
FOR_EACH_CIRCUIT_MACHINE_BEGIN(i) { FOR_EACH_CIRCUIT_MACHINE_BEGIN(i) {
if (circ->padding_machine[i] && if (circ->padding_machine[i] &&
circ->padding_machine[i]->machine_num == machine_num) { circ->padding_machine[i]->machine_num == machine_num) {
circpad_circuit_machineinfo_free_idx(circ, i); circpad_circuit_machineinfo_free_idx(circ, i);
circ->padding_machine[i] = NULL; circ->padding_machine[i] = NULL;
found = 1;
} }
} FOR_EACH_CIRCUIT_MACHINE_END; } FOR_EACH_CIRCUIT_MACHINE_END;
return found;
} }
/** /**
@ -2811,7 +2819,10 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell)
if (negotiate->command == CIRCPAD_COMMAND_STOP) { if (negotiate->command == CIRCPAD_COMMAND_STOP) {
/* Free the machine corresponding to this machine type */ /* Free the machine corresponding to this machine type */
free_circ_machineinfos_with_machine_num(circ, negotiate->machine_type); if (free_circ_machineinfos_with_machine_num(circ,
negotiate->machine_type)) {
goto done;
}
log_fn(LOG_WARN, LD_CIRC, log_fn(LOG_WARN, LD_CIRC,
"Received circuit padding stop command for unknown machine."); "Received circuit padding stop command for unknown machine.");
goto err; goto err;