From a18ced652b2f7e6a83c24001b6f394f1e87ad2dd Mon Sep 17 00:00:00 2001
From: Roger Dingledine <arma@torproject.org>
Date: Mon, 17 Nov 2003 07:43:03 +0000
Subject: finally find and possibly fix the circuit_deliver_relay_cell warn bug
svn:r827
---
src/or/circuit.c | 7 ++++---
src/or/config.c | 2 +-
2 files changed, 5 insertions(+), 4 deletions(-)
(limited to 'src')
diff --git a/src/or/circuit.c b/src/or/circuit.c
index 7c363ddd2..ad94f13c3 100644
--- a/src/or/circuit.c
+++ b/src/or/circuit.c
@@ -857,9 +857,10 @@ int circuit_extend(cell_t *cell, circuit_t *circ) {
*/
struct in_addr in;
in.s_addr = htonl(circ->n_addr);
- log_fn(LOG_WARN,"Next router (%s:%d) not connected. Closing.", inet_ntoa(in), circ->n_port);
- /* XXX later we should fail more gracefully here, like with a 'truncated' */
- return -1;
+ log_fn(LOG_INFO,"Next router (%s:%d) not connected. Closing.", inet_ntoa(in), circ->n_port);
+ connection_edge_send_command(NULL, circ, RELAY_COMMAND_TRUNCATED,
+ NULL, 0, NULL);
+ return 0;
}
circ->n_addr = n_conn->addr; /* these are different if we found a twin instead */
diff --git a/src/or/config.c b/src/or/config.c
index 6a4f7965d..414bcf93b 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -265,7 +265,7 @@ void init_options(or_options_t *options) {
options->MaxConn = 900;
options->DirFetchPostPeriod = 600;
options->KeepalivePeriod = 300;
- options->MaxOnionsPending = 10;
+ options->MaxOnionsPending = 100;
options->NewCircuitPeriod = 60; /* once a minute */
options->TotalBandwidth = 800000; /* at most 800kB/s total sustained incoming */
options->NumCpus = 1;
--
cgit v1.2.3