From 2d049469602f5e6efbe8f1ded0cbcd3aa957f3eb Mon Sep 17 00:00:00 2001 From: Ivan Markin Date: Sun, 16 Oct 2016 20:08:26 +0000 Subject: Do not mark circs for close again after relay_send_command_from_edge() --- src/or/rendmid.c | 8 ++------ src/or/rendservice.c | 6 ++---- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'src') diff --git a/src/or/rendmid.c b/src/or/rendmid.c index ca0ad7b0d4..96993b6019 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -106,7 +106,7 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request, RELAY_COMMAND_INTRO_ESTABLISHED, "", 0, NULL)<0) { log_info(LD_GENERAL, "Couldn't send INTRO_ESTABLISHED cell."); - goto err; + return -1; } /* Now, set up this circuit. */ @@ -208,7 +208,6 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request, RELAY_COMMAND_INTRODUCE_ACK, NULL,0,NULL)) { log_warn(LD_GENERAL, "Unable to send INTRODUCE_ACK cell to Tor client."); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); return -1; } @@ -220,8 +219,6 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request, RELAY_COMMAND_INTRODUCE_ACK, nak_body, 1, NULL)) { log_warn(LD_GENERAL, "Unable to send NAK to Tor client."); - /* Is this right? */ - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_INTERNAL); } return -1; } @@ -269,8 +266,7 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request, RELAY_COMMAND_RENDEZVOUS_ESTABLISHED, "", 0, NULL)<0) { log_warn(LD_PROTOCOL, "Couldn't send RENDEZVOUS_ESTABLISHED cell."); - reason = END_CIRC_REASON_INTERNAL; - goto err; + return -1; } circuit_change_purpose(TO_CIRCUIT(circ), CIRCUIT_PURPOSE_REND_POINT_WAITING); diff --git a/src/or/rendservice.c b/src/or/rendservice.c index ab7ec3f5f1..3aeade8ee3 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3060,8 +3060,7 @@ rend_service_intro_has_opened(origin_circuit_t *circuit) log_info(LD_GENERAL, "Couldn't send introduction request for service %s on circuit %u", serviceid, (unsigned)circuit->base_.n_circ_id); - reason = END_CIRC_REASON_INTERNAL; - goto err; + goto done; } /* We've attempted to use this circuit */ @@ -3223,8 +3222,7 @@ rend_service_rendezvous_has_opened(origin_circuit_t *circuit) buf, REND_COOKIE_LEN+DH_KEY_LEN+DIGEST_LEN, circuit->cpath->prev)<0) { log_warn(LD_GENERAL, "Couldn't send RENDEZVOUS1 cell."); - reason = END_CIRC_REASON_INTERNAL; - goto err; + goto done; } crypto_dh_free(hop->rend_dh_handshake_state); -- cgit v1.2.3-54-g00ecf From 23b878b875d7feab195be0e856da4aa3f5ac2e15 Mon Sep 17 00:00:00 2001 From: Ivan Markin Date: Mon, 17 Oct 2016 16:06:36 +0000 Subject: Do assert when calling relay_send_command_from_edge() on OR-side circs --- src/or/relay.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') diff --git a/src/or/relay.c b/src/or/relay.c index 823e0743bd..aa29cc805e 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -617,7 +617,7 @@ relay_send_command_from_edge_(streamid_t stream_id, circuit_t *circ, cell.circ_id = TO_OR_CIRCUIT(circ)->p_circ_id; cell_direction = CELL_DIRECTION_IN; } else { - return -1; + tor_assert(0); } memset(&rh, 0, sizeof(rh)); -- cgit v1.2.3-54-g00ecf From 70b9e79700f85ac07b931a2c836b4d63d0ba70c1 Mon Sep 17 00:00:00 2001 From: David Goulet Date: Thu, 27 Oct 2016 10:34:02 -0400 Subject: Slightly refactor and fix couple callsites Signed-off-by: David Goulet --- src/or/relay.c | 7 +++---- src/or/rendmid.c | 13 +++++++++---- 2 files changed, 12 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/or/relay.c b/src/or/relay.c index aa29cc805e..f5e9a6bb8c 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -610,14 +610,13 @@ relay_send_command_from_edge_(streamid_t stream_id, circuit_t *circ, memset(&cell, 0, sizeof(cell_t)); cell.command = CELL_RELAY; - if (cpath_layer) { + if (CIRCUIT_IS_ORIGIN(circ)) { + tor_assert(cpath_layer); cell.circ_id = circ->n_circ_id; cell_direction = CELL_DIRECTION_OUT; - } else if (! CIRCUIT_IS_ORIGIN(circ)) { + } else { cell.circ_id = TO_OR_CIRCUIT(circ)->p_circ_id; cell_direction = CELL_DIRECTION_IN; - } else { - tor_assert(0); } memset(&rh, 0, sizeof(rh)); diff --git a/src/or/rendmid.c b/src/or/rendmid.c index 96993b6019..f39c92afae 100644 --- a/src/or/rendmid.c +++ b/src/or/rendmid.c @@ -106,7 +106,7 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request, RELAY_COMMAND_INTRO_ESTABLISHED, "", 0, NULL)<0) { log_info(LD_GENERAL, "Couldn't send INTRO_ESTABLISHED cell."); - return -1; + goto err_no_close; } /* Now, set up this circuit. */ @@ -122,8 +122,9 @@ rend_mid_establish_intro(or_circuit_t *circ, const uint8_t *request, log_warn(LD_PROTOCOL, "Rejecting truncated ESTABLISH_INTRO cell."); reason = END_CIRC_REASON_TORPROTOCOL; err: - if (pk) crypto_pk_free(pk); circuit_mark_for_close(TO_CIRCUIT(circ), reason); + err_no_close: + if (pk) crypto_pk_free(pk); return -1; } @@ -201,13 +202,15 @@ rend_mid_introduce(or_circuit_t *circ, const uint8_t *request, (char*)request, request_len, NULL)) { log_warn(LD_GENERAL, "Unable to send INTRODUCE2 cell to Tor client."); - goto err; + /* Stop right now, the circuit has been closed. */ + return -1; } /* And send an ack down the client's circuit. Empty body means succeeded. */ if (relay_send_command_from_edge(0,TO_CIRCUIT(circ), RELAY_COMMAND_INTRODUCE_ACK, NULL,0,NULL)) { log_warn(LD_GENERAL, "Unable to send INTRODUCE_ACK cell to Tor client."); + /* Stop right now, the circuit has been closed. */ return -1; } @@ -266,6 +269,7 @@ rend_mid_establish_rendezvous(or_circuit_t *circ, const uint8_t *request, RELAY_COMMAND_RENDEZVOUS_ESTABLISHED, "", 0, NULL)<0) { log_warn(LD_PROTOCOL, "Couldn't send RENDEZVOUS_ESTABLISHED cell."); + /* Stop right now, the circuit has been closed. */ return -1; } @@ -342,7 +346,8 @@ rend_mid_rendezvous(or_circuit_t *circ, const uint8_t *request, log_warn(LD_GENERAL, "Unable to send RENDEZVOUS2 cell to client on circuit %u.", (unsigned)rend_circ->p_circ_id); - goto err; + /* Stop right now, the circuit has been closed. */ + return -1; } /* Join the circuits. */ -- cgit v1.2.3-54-g00ecf