Commit dd63e8cf authored by David Goulet's avatar David Goulet 🐼
Browse files

hs: Transfer ccontrol from circuit to cpath 



Once the cpath is finalized, e2e encryption setup, transfer the ccontrol
from the rendezvous circuit to the cpath.

This allows the congestion control subsystem to properly function for
both upload and download side of onion services.

Closes #40586

Signed-off-by: David Goulet's avatarDavid Goulet <dgoulet@torproject.org>
parent 7ce17c2b

changes/ticket40586

0 → 100644
+5 −0
Original line number Diff line number Diff line 
  o Major bugfixes (onion service, congestion control):

    - Fix the onion service upload case where the congestion control parameters

      were not added to the right object. Fixes bug 40586; bugfix on

      0.4.7.4-alpha.

src/feature/hs/hs_circuit.c

+16 −0
Original line number Diff line number Diff line
@@ -131,6 +131,12 @@ finalize_rend_circuit(origin_circuit_t *circ, crypt_path_t *hop, 
   * so we can actually use it. */

  circ->hs_circ_has_timed_out = 0;



  /* If congestion control, transfer ccontrol onto the cpath. */

  if (TO_CIRCUIT(circ)->ccontrol) {

    hop->ccontrol = TO_CIRCUIT(circ)->ccontrol;

    TO_CIRCUIT(circ)->ccontrol = NULL;

  }



  /* Append the hop to the cpath of this circuit */

  cpath_extend_linked_list(&circ->cpath, hop);
@@ -416,6 +422,11 @@ launch_rendezvous_point_circuit,(const hs_service_t *service, 
      .sendme_inc_cells = congestion_control_sendme_inc(),

    };



    /* It is setup on the circuit in order to indicate that congestion control

     * is enabled. It will be transferred to the RP crypt_path_t once the

     * handshake is finalized in finalize_rend_circuit() because the final hop

     * is not available until then. */



    /* Initialize ccontrol for appropriate path type */

    if (service->config.is_single_onion) {

      TO_CIRCUIT(circ)->ccontrol = congestion_control_new(&circ_params,
@@ -533,6 +544,11 @@ retry_service_rendezvous_point(const origin_circuit_t *circ) 
      .sendme_inc_cells = TO_CIRCUIT(circ)->ccontrol->sendme_inc,

    };



    /* It is setup on the circuit in order to indicate that congestion control

     * is enabled. It will be transferred to the RP crypt_path_t once the

     * handshake is finalized in finalize_rend_circuit() because the final hop

     * is not available until then. */



    /* As per above, in this case, we are a full 3 hop rend, even if we're a

     * single-onion service */

    if (get_options()->HSLayer3Nodes) {

src/feature/hs/hs_client.c

+5 −0
Original line number Diff line number Diff line
@@ -826,6 +826,11 @@ setup_rendezvous_circ_congestion_control(origin_circuit_t *circ) 
  if (circ_params.cc_enabled) {

    circ_params.sendme_inc_cells = desc->encrypted_data.sendme_inc;



    /* It is setup on the circuit in order to indicate that congestion control

     * is enabled. It will be transferred to the RP crypt_path_t once the

     * handshake is finalized in finalize_rend_circuit() because the final hop

     * is not available until then. */



    if (desc->encrypted_data.single_onion_service) {

      TO_CIRCUIT(circ)->ccontrol = congestion_control_new(&circ_params,

                                                          CC_PATH_ONION_SOS);