nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 05:03:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Resolve remaining merge conflicts in relay.c

Browse Source 
(My bad!)
This commit is contained in:
Nick Mathewson 2021-06-10 09:55:35 -04:00
parent 0f2d45328d
commit 014345ed6a
1 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/core/or/relay.c
View File

@ -1735,17 +1735,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,
@ -1954,20 +1946,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);