Commit 52c5b8aa authored by George Kadianakis's avatar George Kadianakis
Browse files

Simplify cannibalization logic now that all HS is vanguards 



Co-authored-by: default avatarMike Perry <mikeperry-git@torproject.org>
parent 9afd9d09

src/core/or/circuituse.c

+4 −6
Original line number Original line Diff line number Diff line
@@ -2049,13 +2049,11 @@ circuit_should_cannibalize_to_build(uint8_t purpose_to_build, 
    return 0;

    return 0;

  }

  }





  /* For vanguards, the server-side intro circ is not cannibalized

  /* The server-side intro circ is not cannibalized because it only

   * because we pre-build 4 hop HS circuits, and it only needs a 3 hop

   * needs a 3 hop circuit. It is also long-lived, so it is more

   * circuit. It is also long-lived, so it is more important that

   * important that it have lower latency than get built fast.

   * it have lower latency than get built fast.

   */

   */

  if (circuit_should_use_vanguards(purpose_to_build) &&

  if (purpose_to_build == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO) {

      purpose_to_build == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO) {

    return 0;

    return 0;

  }

  }