nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Rename rend_circuit_validate_purpose() based on Nick's review.

Browse Source
This commit is contained in:
George Kadianakis 2017-07-06 13:51:06 +03:00 committed by Nick Mathewson
parent fee95dabcf
commit b490ae68c7
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/or/hs_circuit.c
View File

@ -16,16 +16,16 @@
#include "hs_ntor.h" #include "hs_ntor.h"
/* A circuit is about to become an e2e rendezvous circuit. Check /* A circuit is about to become an e2e rendezvous circuit. Check
* <b>circ_purpose</b> and ensure that it's properly set. Return 0 if circuit * <b>circ_purpose</b> and ensure that it's properly set. Return true iff
* purpose is properly set, otherwise return -1. */ * circuit purpose is properly set, otherwise return false. */
static int static int
rend_circuit_validate_purpose(unsigned int circ_purpose, int is_service_side) circuit_purpose_is_correct_for_rend(unsigned int circ_purpose, int is_service_side)
{ {
if (is_service_side) { if (is_service_side) {
if (circ_purpose != CIRCUIT_PURPOSE_S_CONNECT_REND) { if (circ_purpose != CIRCUIT_PURPOSE_S_CONNECT_REND) {
log_fn(LOG_PROTOCOL_WARN, LD_GENERAL, log_fn(LOG_PROTOCOL_WARN, LD_GENERAL,
"HS e2e circuit setup with wrong purpose(%d)", circ_purpose); "HS e2e circuit setup with wrong purpose(%d)", circ_purpose);
return -1; return 0;
} }
} }
@ -34,11 +34,11 @@ rend_circuit_validate_purpose(unsigned int circ_purpose, int is_service_side)
circ_purpose != CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) { circ_purpose != CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED) {
log_fn(LOG_PROTOCOL_WARN, LD_GENERAL, log_fn(LOG_PROTOCOL_WARN, LD_GENERAL,
"Client e2e circuit setup with wrong purpose(%d)", circ_purpose); "Client e2e circuit setup with wrong purpose(%d)", circ_purpose);
return -1; return 0;
} }
} }
return 0; return 1;
} }
/* Create and return a crypt path for the final hop of a v3 prop224 rendezvous /* Create and return a crypt path for the final hop of a v3 prop224 rendezvous
@ -172,8 +172,8 @@ hs_circuit_setup_e2e_rend_circ(origin_circuit_t *circ,
const uint8_t *ntor_key_seed, const uint8_t *ntor_key_seed,
int is_service_side) int is_service_side)
{ {
if (BUG(rend_circuit_validate_purpose(TO_CIRCUIT(circ)->purpose, if (BUG(!circuit_purpose_is_correct_for_rend(TO_CIRCUIT(circ)->purpose,
is_service_side)) < 0) { is_service_side))) {
return -1; return -1;
} }
@ -197,7 +197,9 @@ int
hs_circuit_setup_e2e_rend_circ_legacy_client(origin_circuit_t *circ, hs_circuit_setup_e2e_rend_circ_legacy_client(origin_circuit_t *circ,
const uint8_t *rend_cell_body) const uint8_t *rend_cell_body)
{ {
if (BUG(rend_circuit_validate_purpose(TO_CIRCUIT(circ)->purpose, 0)) < 0) {
if (BUG(!circuit_purpose_is_correct_for_rend(
TO_CIRCUIT(circ)->purpose, 0))) {
return -1; return -1;
} }