Commit 64d2133a authored by Neel Chauhan's avatar Neel Chauhan
Browse files

Move the connection_edge_process_relay_cell() assignments out of if statements... 

Move the connection_edge_process_relay_cell() assignments out of if statements in circuit_receive_relay_cell()
parent b47adcbc

scripts/maint/practracker/exceptions.txt

+2 −2
Original line number Diff line number Diff line
@@ -117,8 +117,8 @@ problem function-size /src/core/or/connection_or.c:connection_or_compute_authent 
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

src/core/or/relay.c

+5 −4
Original line number Diff line number Diff line
@@ -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. */