diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-12-07 12:36:13 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-12-16 11:06:22 -0500 |
| commit | 68679504323b0a676a446b8fb34b976c9dc66b4f (patch) | |
| tree | 89a6a9621fae80e4c41114aee2d0f12aed437dcb /src/or/channel.c | |
| parent | 2b4bfe62ee74b927d65923f5d07fe04f51f8779a (diff) | |
| download | tor-68679504323b0a676a446b8fb34b976c9dc66b4f.tar.gz tor-68679504323b0a676a446b8fb34b976c9dc66b4f.zip | |
Wrap all of the legacy guard code, and its users, in #ifdefs
This will make it easier to see what we remove down the line.
Diffstat (limited to 'src/or/channel.c')
| -rw-r--r-- | src/or/channel.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/channel.c b/src/or/channel.c index 1e3e99c51d..9898148dde 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -2538,6 +2538,7 @@ channel_do_open_actions(channel_t *chan) if (started_here) { circuit_build_times_network_is_live(get_circuit_build_times_mutable()); rep_hist_note_connect_succeeded(chan->identity_digest, now); +#ifdef ENABLE_LEGACY_GUARD_ALGORITHM // XXXX prop271 this call is no longer useful with the new algorithm. if (entry_guard_register_connect_status( chan->identity_digest, 1, 0, now) < 0) { @@ -2549,6 +2550,7 @@ channel_do_open_actions(channel_t *chan) "connection so we can retry the earlier entry guards."); close_origin_circuits = 1; } +#endif router_set_status(chan->identity_digest, 1); } else { /* only report it to the geoip module if it's not a known router */ |