commit d4cf3fadec94169e4610717beaf4597456cbd961 Author: David Goulet dgoulet@torproject.org Date: Wed Jan 12 11:49:04 2022 -0500
cc: Change edge_get_ccontrol() to look at both cpath and on_circuit
Signed-off-by: David Goulet dgoulet@torproject.org --- src/core/or/congestion_control_flow.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/core/or/congestion_control_flow.c b/src/core/or/congestion_control_flow.c index d61da73627..c8b5ba2473 100644 --- a/src/core/or/congestion_control_flow.c +++ b/src/core/or/congestion_control_flow.c @@ -62,12 +62,15 @@ static uint32_t xon_rate_bytes; static inline const congestion_control_t * edge_get_ccontrol(const edge_connection_t *edge) { - if (edge->cpath_layer) - return edge->cpath_layer->ccontrol; - else if (edge->on_circuit) - return edge->on_circuit->ccontrol; - else - return NULL; + congestion_control_t *ccontrol = NULL; + + if (edge->on_circuit && edge->on_circuit->ccontrol) { + ccontrol = edge->on_circuit->ccontrol; + } else if (edge->cpath_layer && edge->cpath_layer->ccontrol) { + ccontrol = edge->cpath_layer->ccontrol; + } + + return ccontrol; }
/**