diff options
| author | Nick Mathewson <nickm@torproject.org> | 2016-11-21 17:23:25 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2016-11-30 14:42:53 -0500 |
| commit | dbbaa515183e250e20c40fa7b4c00df9487058fa (patch) | |
| tree | ad7047ded85f1c231ff158e6aad8201824a72148 /src/or/bridges.c | |
| parent | de617a471442342fc2abafdde4e250fd31eb45ac (diff) | |
| download | tor-dbbaa515183e250e20c40fa7b4c00df9487058fa.tar.gz tor-dbbaa515183e250e20c40fa7b4c00df9487058fa.zip | |
Use the new guard notification/selection APIs throughout Tor
This patch doesn't cover every case; omitted cases are marked with
"XXXX prop271", as usual. It leaves both the old interface and the
new interface for guard status notification, since they don't
actually work in the same way: the new API wants to be told when a
circuit has failed or succeeded, whereas the old API wants to know
when a channel has failed or succeeded.
I ran into some trouble with directory guard stuff, since when we
pick the directory guard, we don't actually have a circuit to
associate it with. I solved that by allowing guard states to be
associated with directory connections, not just circuits.
Diffstat (limited to 'src/or/bridges.c')
| -rw-r--r-- | src/or/bridges.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/bridges.c b/src/or/bridges.c index 508c77fc9e..2170cc668a 100644 --- a/src/or/bridges.c +++ b/src/or/bridges.c @@ -724,6 +724,7 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) from_cache ? "cached" : "fresh", router_describe(ri)); /* set entry->made_contact so if it goes down we don't drop it from * our entry node list */ + // XXXX prop271 use new interface here when we hit bridges? entry_guard_register_connect_status(ri->cache_info.identity_digest, 1, 0, now); if (first) { @@ -743,6 +744,7 @@ int any_bridge_descriptors_known(void) { tor_assert(get_options()->UseBridges); + // XXXX prop271 this needs to get fixed. -- bridges return choose_random_entry(NULL) != NULL; } |