mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2025-02-25 07:07:52 +01:00
Merge branch 'maint-0.4.4' into maint-0.4.5
This commit is contained in:
commit
ae2254e490
1 changed files with 3 additions and 21 deletions
|
@ -1744,17 +1744,9 @@ handle_relay_cell_command(cell_t *cell, circuit_t *circ,
|
||||||
if (!conn) {
|
if (!conn) {
|
||||||
if (CIRCUIT_IS_ORIGIN(circ)) {
|
if (CIRCUIT_IS_ORIGIN(circ)) {
|
||||||
origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(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) &&
|
if (relay_crypt_from_last_hop(ocirc, layer_hint) &&
|
||||||
connection_half_edge_is_valid_end(ocirc->half_streams,
|
connection_half_edge_is_valid_end(ocirc->half_streams,
|
||||||
rh.stream_id)) {
|
rh->stream_id)) {
|
||||||
>>>>>>> maint-0.3.5
|
|
||||||
|
|
||||||
circuit_read_valid_data(ocirc, rh->length);
|
circuit_read_valid_data(ocirc, rh->length);
|
||||||
log_info(domain,
|
log_info(domain,
|
||||||
|
@ -1963,20 +1955,10 @@ handle_relay_cell_command(cell_t *cell, circuit_t *circ,
|
||||||
|
|
||||||
if (CIRCUIT_IS_ORIGIN(circ)) {
|
if (CIRCUIT_IS_ORIGIN(circ)) {
|
||||||
origin_circuit_t *ocirc = TO_ORIGIN_CIRCUIT(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) &&
|
if (relay_crypt_from_last_hop(ocirc, layer_hint) &&
|
||||||
connection_half_edge_is_valid_resolved(ocirc->half_streams,
|
connection_half_edge_is_valid_resolved(ocirc->half_streams,
|
||||||
rh.stream_id)) {
|
rh->stream_id)) {
|
||||||
circuit_read_valid_data(ocirc, rh.length);
|
circuit_read_valid_data(ocirc, rh->length);
|
||||||
>>>>>>> maint-0.3.5
|
|
||||||
log_info(domain,
|
log_info(domain,
|
||||||
"resolved cell on circ %u valid on half-closed "
|
"resolved cell on circ %u valid on half-closed "
|
||||||
"stream id %d", ocirc->global_identifier, rh->stream_id);
|
"stream id %d", ocirc->global_identifier, rh->stream_id);
|
||||||
|
|
Loading…
Add table
Reference in a new issue