diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-04-21 21:35:18 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-04-23 19:39:42 -0400 |
| commit | b2641920835b046ae820c608136dfbef1a557fb0 (patch) | |
| tree | 274db44c25611c8c37dc9726e59573bd8840c3c0 /src/or/main.c | |
| parent | cb31978adb3d92d304df0c2a408d9f5f75891667 (diff) | |
| download | tor-b2641920835b046ae820c608136dfbef1a557fb0.tar tor-b2641920835b046ae820c608136dfbef1a557fb0.tar.gz | |
finally get rid of "clique mode"
Diffstat (limited to 'src/or/main.c')
| -rw-r--r-- | src/or/main.c | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/src/or/main.c b/src/or/main.c index 04364bbe1..321fc5a16 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -727,7 +727,6 @@ run_connection_housekeeping(int i, time_t now) /* If we haven't written to an OR connection for a while, then either nuke the connection or send a keepalive, depending. */ if (now >= conn->timestamp_lastwritten + options->KeepalivePeriod) { - routerinfo_t *router = router_get_by_digest(or_conn->identity_digest); int maxCircuitlessPeriod = options->MaxCircuitDirtiness*3/2; if (!connection_state_is_open(conn)) { /* We never managed to actually get this connection open and happy. */ @@ -743,14 +742,11 @@ run_connection_housekeeping(int i, time_t now) conn->s,conn->address, conn->port); connection_mark_for_close(conn); conn->hold_open_until_flushed = 1; - } else if (!clique_mode(options) && !or_conn->n_circuits && + } else if (!or_conn->n_circuits && now >= or_conn->timestamp_last_added_nonpadding + - maxCircuitlessPeriod && - (!router || !server_mode(options) || - !router_is_clique_mode(router))) { + maxCircuitlessPeriod) { log_info(LD_OR,"Expiring non-used OR connection to fd %d (%s:%d) " - "[Not in clique mode].", - conn->s,conn->address, conn->port); + "[idle].", conn->s,conn->address, conn->port); connection_mark_for_close(conn); conn->hold_open_until_flushed = 1; } else if ( @@ -1605,7 +1601,7 @@ dumpmemusage(int severity) tor_log_mallinfo(severity); } -/** Write all statistics to the log, with log level 'severity'. Called +/** Write all statistics to the log, with log level <b>severity</b>. Called * in response to a SIGUSR1. */ static void dumpstats(int severity) |