diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-04-27 15:18:34 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-04-27 15:18:34 -0400 |
| commit | cba1d29b7ff041dc222d69640f4d4330d31f7ea1 (patch) | |
| tree | 8f52efee15436a71368bb056df99dffbc6db2c29 /src | |
| parent | 247cbab6c8a37c5e6225bfd60491b071a29331e4 (diff) | |
| download | tor-cba1d29b7ff041dc222d69640f4d4330d31f7ea1.tar tor-cba1d29b7ff041dc222d69640f4d4330d31f7ea1.tar.gz | |
make make check-spaces happier.
(still not happy.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuituse.c | 9 | ||||
| -rw-r--r-- | src/or/dirserv.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index fd1cf6b9b..8503dae46 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -433,11 +433,11 @@ circuit_expire_building(void) "Extremely large value for circuit build timeout: %lds. " "Assuming clock jump. Purpose %d (%s)", (long)(now.tv_sec - victim->timestamp_created.tv_sec), - victim->purpose, + victim->purpose, circuit_purpose_to_string(victim->purpose)); } else if (circuit_build_times_count_close(&circ_times, - first_hop_succeeded, - victim->timestamp_created.tv_sec)) { + first_hop_succeeded, + victim->timestamp_created.tv_sec)) { circuit_build_times_set_timeout(&circ_times); } } @@ -770,7 +770,8 @@ circuit_expire_old_circuits_clientside(void) * on it, mark it for close. */ if (circ->timestamp_dirty && - circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < now.tv_sec && + circ->timestamp_dirty + get_options()->MaxCircuitDirtiness < + now.tv_sec && !TO_ORIGIN_CIRCUIT(circ)->p_streams /* nothing attached */ ) { log_debug(LD_CIRC, "Closing n_circ_id %d (dirty %ld sec ago, " "purpose %d)", diff --git a/src/or/dirserv.h b/src/or/dirserv.h index a8a7060a3..569abfca2 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -52,7 +52,7 @@ MAX_V_LINE_LEN \ ) -#define UNNAMED_ROUTER_NICKNAME "Unnamed" +#define UNNAMED_ROUTER_NICKNAME "Unnamed" int connection_dirserv_flushed_some(dir_connection_t *conn); |