diff options
| author | Nick Mathewson <nickm@torproject.org> | 2021-06-10 09:55:55 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2021-06-10 09:55:55 -0400 |
| commit | 7be37a26ac769e3059223553970b09b7b41688f7 (patch) | |
| tree | 755eec86d4e8e329b582f2060a5d8e51bd71f29c | |
| parent | 3260d323a663da3a1a2b65085dce1b469be101bb (diff) | |
| parent | ae2254e490ebfed746bed7e5ec359737cbb14085 (diff) | |
| download | tor-7be37a26ac769e3059223553970b09b7b41688f7.tar.gz tor-7be37a26ac769e3059223553970b09b7b41688f7.zip | |
Merge branch 'maint-0.4.5' into maint-0.4.6
| -rw-r--r-- | src/core/or/relay.c | 24 |
1 files changed, 3 insertions, 21 deletions
diff --git a/src/core/or/relay.c b/src/core/or/relay.c index 5ceee468c9..f5a9e73856 100644 --- a/src/core/or/relay.c +++ b/src/core/or/relay.c @@ -1744,17 +1744,9 @@ handle_relay_cell_command(cell_t *cell, circuit_t *circ, if (!conn) { if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); -<<<<<<< HEAD - if (connection_half_edge_is_valid_end(ocirc->half_streams, - rh->stream_id)) { -||||||| d71bf986b4faf7 - if (connection_half_edge_is_valid_end(ocirc->half_streams, - rh.stream_id)) { -======= if (relay_crypt_from_last_hop(ocirc, layer_hint) && connection_half_edge_is_valid_end(ocirc->half_streams, - rh.stream_id)) { ->>>>>>> maint-0.3.5 + rh->stream_id)) { circuit_read_valid_data(ocirc, rh->length); log_info(domain, @@ -1963,20 +1955,10 @@ handle_relay_cell_command(cell_t *cell, circuit_t *circ, if (CIRCUIT_IS_ORIGIN(circ)) { origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(circ); -<<<<<<< HEAD - if (connection_half_edge_is_valid_resolved(ocirc->half_streams, - rh->stream_id)) { - circuit_read_valid_data(ocirc, rh->length); -||||||| d71bf986b4faf7 - if (connection_half_edge_is_valid_resolved(ocirc->half_streams, - rh.stream_id)) { - circuit_read_valid_data(ocirc, rh.length); -======= if (relay_crypt_from_last_hop(ocirc, layer_hint) && connection_half_edge_is_valid_resolved(ocirc->half_streams, - rh.stream_id)) { - circuit_read_valid_data(ocirc, rh.length); ->>>>>>> maint-0.3.5 + rh->stream_id)) { + circuit_read_valid_data(ocirc, rh->length); log_info(domain, "resolved cell on circ %u valid on half-closed " "stream id %d", ocirc->global_identifier, rh->stream_id); |