diff options
| author | Nick Mathewson <nickm@torproject.org> | 2019-08-19 11:26:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2019-08-19 11:26:58 -0400 |
| commit | 29bd43ab03fd09e9d23b33ae4f126382008739ea (patch) | |
| tree | b0e9c11915a643aceea1b9a45e6550c5c2e7c645 | |
| parent | b51a822a80c5a4d391a3c5f294230982aeccf46b (diff) | |
| parent | 64d2133a6164e201edb075154124e210cbbffe51 (diff) | |
| download | tor-29bd43ab03fd09e9d23b33ae4f126382008739ea.tar.gz tor-29bd43ab03fd09e9d23b33ae4f126382008739ea.zip | |
Merge remote-tracking branch 'tor-github/pr/1224'
| -rw-r--r-- | scripts/maint/practracker/exceptions.txt | 4 | ||||
| -rw-r--r-- | src/core/or/relay.c | 9 |
2 files changed, 7 insertions, 6 deletions
diff --git a/scripts/maint/practracker/exceptions.txt b/scripts/maint/practracker/exceptions.txt index a6f10a99a6..4f3943f21c 100644 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@ -122,8 +122,8 @@ problem include-count /src/core/or/or.h 49 problem file-size /src/core/or/policies.c 3249 problem function-size /src/core/or/policies.c:policy_summarize() 107 problem function-size /src/core/or/protover.c:protover_all_supported() 117 -problem file-size /src/core/or/relay.c 3263 -problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 126 +problem file-size /src/core/or/relay.c 3264 +problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 127 problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 109 problem function-size /src/core/or/relay.c:connection_ap_process_end_not_open() 192 problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell_not_open() 137 diff --git a/src/core/or/relay.c b/src/core/or/relay.c index d66caf3ad0..a437b54792 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -265,8 +265,8 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, if (cell_direction == CELL_DIRECTION_OUT) { ++stats_n_relay_cells_delivered; log_debug(LD_OR,"Sending away from origin."); - if ((reason = connection_edge_process_relay_cell(cell, circ, conn, NULL)) - < 0) { + reason = connection_edge_process_relay_cell(cell, circ, conn, NULL); + if (reason < 0) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, "connection_edge_process_relay_cell (away from origin) " "failed."); @@ -276,8 +276,9 @@ circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, if (cell_direction == CELL_DIRECTION_IN) { ++stats_n_relay_cells_delivered; log_debug(LD_OR,"Sending to origin."); - if ((reason = connection_edge_process_relay_cell(cell, circ, conn, - layer_hint)) < 0) { + reason = connection_edge_process_relay_cell(cell, circ, conn, + layer_hint); + if (reason < 0) { /* If a client is trying to connect to unknown hidden service port, * END_CIRC_AT_ORIGIN is sent back so we can then close the circuit. * Do not log warn as this is an expected behavior for a service. */ |