Browse Source

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>
David Goulet 7 years ago
parent
commit
9d7505a62a
3 changed files with 4 additions and 4 deletions
  1. 2 2
      src/or/hs_intropoint.c
  2. 1 1
      src/or/hs_intropoint.h
  3. 1 1
      src/or/rendmid.c

+ 2 - 2
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");
 }

+ 1 - 1
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
 

+ 1 - 1
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;
   }