mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
bugfix: only close old circuits if they have no connections!
svn:r251
This commit is contained in:
+1
-1
@@ -630,7 +630,7 @@ void circuit_expire_unused_circuits(void) {
|
||||
while(circ) {
|
||||
tmpcirc = circ;
|
||||
circ = circ->next;
|
||||
if(tmpcirc != youngest && (!tmpcirc->p_conn || tmpcirc->p_conn->type == CONN_TYPE_AP)) {
|
||||
if(tmpcirc != youngest && !tmpcirc->p_conn) {
|
||||
log(LOG_DEBUG,"circuit_expire_unused_circuits(): Closing n_aci %d",tmpcirc->n_aci);
|
||||
circuit_close(tmpcirc);
|
||||
}
|
||||
|
||||
+1
-1
@@ -327,7 +327,7 @@ int prepare_for_poll(int *timeout) {
|
||||
circuit_launch_new(-1); /* tell it to forget about previous failures */
|
||||
circ = circuit_get_newest_by_edge_type(EDGE_AP);
|
||||
if(!circ || circ->dirty) {
|
||||
log(LOG_INFO,"prepare_for_poll(): Youngest circuit missing or dirty; launching replacement.");
|
||||
log(LOG_INFO,"prepare_for_poll(): Youngest circuit %s; launching replacement.", circ ? "dirty" : "missing");
|
||||
circuit_launch_new(0); /* make an onion and lay the circuit */
|
||||
}
|
||||
time_to_new_circuit = now.tv_sec + options.NewCircuitPeriod;
|
||||
|
||||
Reference in New Issue
Block a user