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

hs: Transfer ccontrol from circuit to cpath

Browse Source 
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 <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2022-03-16 11:01:56 -04:00
parent 7ce17c2b00
commit dd63e8cf9d
3 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket40586 Normal file
View File

@ -0,0 +1,5 @@
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.

16
src/feature/hs/hs_circuit.c
View File

@ -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) {

5
src/feature/hs/hs_client.c
View File

@ -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);