tor

commit 0667eaa9bfdd18fe602f964840d662c0b934247a
parent 8734eea31ba1634474d519240b7bc5141c4becbd
Author: Nick Mathewson <nickm@torproject.org>
Date:   Thu, 10 Jun 2021 09:55:55 -0400

Merge branch 'maint-0.4.6'

Diffstat:
M
src/core/or/relay.c
 | 
24
+++---------------------

1 file changed, 3 insertions(+), 21 deletions(-)
diff --git 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);