aboutsummaryrefslogtreecommitdiff
path: root/src/or/main.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2004-04-01 03:44:49 +0000
committerRoger Dingledine <arma@torproject.org>2004-04-01 03:44:49 +0000
commitcc3c4245cb80cb7bb98be4868f053fb9421176d3 (patch)
tree5893239bebad7b637548ece00a9484214c17087d /src/or/main.c
parent9feb44d3c45ebeb6bb42ef98adabf68c20695c73 (diff)
downloadtor-cc3c4245cb80cb7bb98be4868f053fb9421176d3.tar.gz
tor-cc3c4245cb80cb7bb98be4868f053fb9421176d3.zip
let the circuit-launcher choose the exit node (if he wants)
svn:r1428
Diffstat (limited to 'src/or/main.c')
-rw-r--r--src/or/main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/main.c b/src/or/main.c
index 44e734f9a6..76d9bc7436 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -391,11 +391,12 @@ static void run_scheduled_events(time_t now) {
circuit_reset_failure_count();
if(circ && circ->timestamp_dirty) {
log_fn(LOG_INFO,"Youngest circuit dirty; launching replacement.");
- circuit_launch_new(CIRCUIT_PURPOSE_C_GENERAL); /* make a new circuit */
+ /* make a new circuit */
+ circuit_launch_new(CIRCUIT_PURPOSE_C_GENERAL, NULL);
} else if (options.RunTesting && circ &&
circ->timestamp_created + TESTING_CIRCUIT_INTERVAL < now) {
log_fn(LOG_INFO,"Creating a new testing circuit.");
- circuit_launch_new(CIRCUIT_PURPOSE_C_GENERAL);
+ circuit_launch_new(CIRCUIT_PURPOSE_C_GENERAL, NULL);
}
time_to_new_circuit = now + options.NewCircuitPeriod;
}
@@ -404,7 +405,7 @@ static void run_scheduled_events(time_t now) {
/* if there's no open circ, and less than 3 are on the way,
* go ahead and try another.
*/
- circuit_launch_new(CIRCUIT_PURPOSE_C_GENERAL);
+ circuit_launch_new(CIRCUIT_PURPOSE_C_GENERAL, NULL);
}
}