nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-21 05:26:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Make some warns into protocol warns

Browse Source 
I'm not sure I agree with this option.
This commit is contained in:
Mike Perry 2019-05-30 16:20:56 -07:00 committed by George Kadianakis
parent ec38b662f2
commit 86f298441b
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2433,14 +2433,14 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell)
circpad_negotiate_t *negotiate; circpad_negotiate_t *negotiate;
if (CIRCUIT_IS_ORIGIN(circ)) { if (CIRCUIT_IS_ORIGIN(circ)) {
log_fn(LOG_WARN, LD_PROTOCOL, log_fn(LOG_WARN, LD_CIRC,
"Padding negotiate cell unsupported at origin."); "Padding negotiate cell unsupported at origin.");
return -1; return -1;
} }
if (circpad_negotiate_parse(&negotiate, cell->payload+RELAY_HEADER_SIZE, if (circpad_negotiate_parse(&negotiate, cell->payload+RELAY_HEADER_SIZE,
CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE) < 0) { CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE) < 0) {
log_fn(LOG_WARN, LD_CIRC, log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
"Received malformed PADDING_NEGOTIATE cell; dropping."); "Received malformed PADDING_NEGOTIATE cell; dropping.");
return -1; return -1;
} }
@ -2451,7 +2451,7 @@ circpad_handle_padding_negotiate(circuit_t *circ, cell_t *cell)
negotiate->machine_type)) { negotiate->machine_type)) {
goto done; goto done;
} }
log_fn(LOG_WARN, LD_CIRC, log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
"Received circuit padding stop command for unknown machine."); "Received circuit padding stop command for unknown machine.");
goto err; goto err;
} else if (negotiate->command == CIRCPAD_COMMAND_START) { } else if (negotiate->command == CIRCPAD_COMMAND_START) {
@ -2491,21 +2491,21 @@ circpad_handle_padding_negotiated(circuit_t *circ, cell_t *cell,
circpad_negotiated_t *negotiated; circpad_negotiated_t *negotiated;
if (!CIRCUIT_IS_ORIGIN(circ)) { if (!CIRCUIT_IS_ORIGIN(circ)) {
log_fn(LOG_WARN, LD_PROTOCOL, log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
"Padding negotiated cell unsupported at non-origin."); "Padding negotiated cell unsupported at non-origin.");
return -1; return -1;
} }
/* Verify this came from the expected hop */ /* Verify this came from the expected hop */
if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) { if (!circpad_padding_is_from_expected_hop(circ, layer_hint)) {
log_fn(LOG_WARN, LD_PROTOCOL, log_fn(LOG_WARN, LD_CIRC,
"Padding negotiated cell from wrong hop!"); "Padding negotiated cell from wrong hop!");
return -1; return -1;
} }
if (circpad_negotiated_parse(&negotiated, cell->payload+RELAY_HEADER_SIZE, if (circpad_negotiated_parse(&negotiated, cell->payload+RELAY_HEADER_SIZE,
CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE) < 0) { CELL_PAYLOAD_SIZE-RELAY_HEADER_SIZE) < 0) {
log_fn(LOG_WARN, LD_CIRC, log_fn(LOG_PROTOCOL_WARN, LD_CIRC,
"Received malformed PADDING_NEGOTIATED cell; " "Received malformed PADDING_NEGOTIATED cell; "
"dropping."); "dropping.");
return -1; return -1;