diff options
| author | teor <teor2345@gmail.com> | 2016-11-09 11:22:08 +1100 |
|---|---|---|
| committer | teor <teor2345@gmail.com> | 2016-11-09 11:23:51 +1100 |
| commit | 0ec94588ab4e83dbc8d405dc780139cd3e596880 (patch) | |
| tree | e71d820f34aa87079ad409296375c6d59e0afc32 /src | |
| parent | 5dca9487c422f06a056711591c3f8f4344fd075f (diff) | |
| download | tor-0ec94588ab4e83dbc8d405dc780139cd3e596880.tar.gz tor-0ec94588ab4e83dbc8d405dc780139cd3e596880.zip | |
Stop logging single onion and Tor2web long-term one-hop circuits
Single onion services and Tor2web deliberately create long-term one-hop
circuits to their intro and rend points, respectively.
These log messages are intended to diagnose issue 8387, which relates to
circuits hanging around forever for no reason.
Fixes bug 20613; bugfix on 0.2.9.1-alpha. Reported by "pastly".
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/circuituse.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 18cd7e3a5b..84574cd5b9 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -788,6 +788,8 @@ static time_t last_expired_clientside_circuits = 0; * As a diagnostic for bug 8387, log information about how many one-hop * circuits we have around that have been there for at least <b>age</b> * seconds. Log a few of them. + * Ignores Single Onion Service intro and Tor2web redezvous circuits, they are + * expected to be long-term one-hop circuits. */ void circuit_log_ancient_one_hop_circuits(int age) @@ -805,6 +807,19 @@ circuit_log_ancient_one_hop_circuits(int age) continue; if (circ->timestamp_created.tv_sec >= cutoff) continue; + /* Single Onion Services deliberately make long term one-hop intro + * connections. We only ignore active intro point connections, if we take + * a long time establishing, that's worth logging. */ + if (rend_service_allow_non_anonymous_connection(options) && + circ->purpose == CIRCUIT_PURPOSE_S_INTRO) + continue; + /* Tor2web deliberately makes long term one-hop rend connections, + * particularly when Tor2webRendezvousPoints is used. We only ignore + * active rend point connections, if we take a long time to rendezvous, + * that's worth logging. */ + if (rend_client_allow_non_anonymous_connection(options) && + circ->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) + continue; ocirc = CONST_TO_ORIGIN_CIRCUIT(circ); if (ocirc->build_state && ocirc->build_state->onehop_tunnel) { |