aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDavid Goulet <dgoulet@torproject.org>2016-11-15 14:18:48 -0500
committerDavid Goulet <dgoulet@torproject.org>2017-01-18 16:58:34 -0500
commit9d7505a62aebaaf2fdf0e3a8178b80be17047e7b (patch)
tree18f31254e03891926a928ec396775311daa9a87b /src
parente1497744c8887c883541d3cb6d3d63d9ab51f9ad (diff)
downloadtor-9d7505a62aebaaf2fdf0e3a8178b80be17047e7b.tar.gz
tor-9d7505a62aebaaf2fdf0e3a8178b80be17047e7b.zip
prop224: Rename hs_intro_circuit_is_suitable()
Adds a better semantic and it also follows the same interface for the INTRODUCE1 API which is circuit_is_suitable_for_introduce1(). Signed-off-by: David Goulet <dgoulet@torproject.org>
Diffstat (limited to 'src')
-rw-r--r--src/or/hs_intropoint.c4
-rw-r--r--src/or/hs_intropoint.h2
-rw-r--r--src/or/rendmid.c2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/or/hs_intropoint.c b/src/or/hs_intropoint.c
index 42b20552c6..2da3ee9243 100644
--- a/src/or/hs_intropoint.c
+++ b/src/or/hs_intropoint.c
@@ -215,7 +215,7 @@ handle_establish_intro(or_circuit_t *circ, const uint8_t *request,
circ->p_circ_id);
/* Check that the circuit is in shape to become an intro point */
- if (!hs_intro_circuit_is_suitable(circ)) {
+ if (!hs_intro_circuit_is_suitable_for_establish_intro(circ)) {
goto err;
}
@@ -286,7 +286,7 @@ circuit_is_suitable_intro_point(const or_circuit_t *circ,
/* Return True if circuit is suitable for becoming an intro circuit. */
int
-hs_intro_circuit_is_suitable(const or_circuit_t *circ)
+hs_intro_circuit_is_suitable_for_establish_intro(const or_circuit_t *circ)
{
return circuit_is_suitable_intro_point(circ, "ESTABLISH_INTRO");
}
diff --git a/src/or/hs_intropoint.h b/src/or/hs_intropoint.h
index e1bad47fc8..08b3470bca 100644
--- a/src/or/hs_intropoint.h
+++ b/src/or/hs_intropoint.h
@@ -33,7 +33,7 @@ int hs_intro_received_introduce1(or_circuit_t *circ, const uint8_t *request,
MOCK_DECL(int, hs_intro_send_intro_established_cell,(or_circuit_t *circ));
/* also used by rendservice.c */
-int hs_intro_circuit_is_suitable(const or_circuit_t *circ);
+int hs_intro_circuit_is_suitable_for_establish_intro(const or_circuit_t *circ);
#ifdef HS_INTROPOINT_PRIVATE
diff --git a/src/or/rendmid.c b/src/or/rendmid.c
index 3319a639b9..b873ad7cca 100644
--- a/src/or/rendmid.c
+++ b/src/or/rendmid.c
@@ -38,7 +38,7 @@ rend_mid_establish_intro_legacy(or_circuit_t *circ, const uint8_t *request,
"Received a legacy ESTABLISH_INTRO request on circuit %u",
(unsigned) circ->p_circ_id);
- if (!hs_intro_circuit_is_suitable(circ)) {
+ if (!hs_intro_circuit_is_suitable_for_establish_intro(circ)) {
reason = END_CIRC_REASON_TORPROTOCOL;
goto err;
}