aboutsummaryrefslogtreecommitdiff
path: root/src/feature/nodelist
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2021-10-23 04:18:00 -0400
committerRoger Dingledine <arma@torproject.org>2021-10-24 17:40:28 -0400
commitd66549c20855b4d75b1a26f18c852327f6a75a05 (patch)
tree7e416fed816413ee6770fa9bf359d48daccfc3bf /src/feature/nodelist
parent2f171f30c8fdcf968ea304d48c42db9fbd0efdf4 (diff)
downloadtor-d66549c20855b4d75b1a26f18c852327f6a75a05.tar.gz
tor-d66549c20855b4d75b1a26f18c852327f6a75a05.zip
fetch missing bridge descriptors without delay
Without this change, if we have a working bridge, and we add a new bridge, we will schedule the fetch attempt for that new bridge descriptor for three hours(!) in the future. This change is especially needed because of bug #40396, where if you have one working bridge and one bridge whose descriptor you haven't fetched yet, your Tor will stall until you have successfully fetched that new descriptor -- in this case for hours. In the old design, we would put off all further bridge descriptor fetches once we had any working bridge descriptor. In this new design, we make the decision per bridge based on whether we successfully got *its* descriptor. To make this work, we need to also call learned_bridge_descriptor() every time we get a bridge descriptor, not just when it's a novel descriptor. Fixes bug 40396. Also happens to fix bug 40495 (redundant descriptor fetches for every bridge) since now we delay fetches once we succeed. A side effect of this change is that if we have any configured bridges that *aren't* working, we will keep trying to fetch their descriptors on the modern directory retry schedule -- every couple of seconds for the first half minute, then backing off after that -- which is a lot faster than before.
Diffstat (limited to 'src/feature/nodelist')
-rw-r--r--src/feature/nodelist/routerlist.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/feature/nodelist/routerlist.c b/src/feature/nodelist/routerlist.c
index fbf9e026c2..e64840b5dd 100644
--- a/src/feature/nodelist/routerlist.c
+++ b/src/feature/nodelist/routerlist.c
@@ -1617,6 +1617,13 @@ router_add_to_routerlist(routerinfo_t *router, const char **msg,
"descriptor for router %s",
router_describe(router));
} else {
+ if (router->purpose == ROUTER_PURPOSE_BRIDGE) {
+ /* Even if we're not going to keep this descriptor, we need to
+ * let the bridge descriptor fetch subsystem know that we
+ * succeeded at getting it -- so we can adjust the retry schedule
+ * to stop trying for a while. */
+ learned_bridge_descriptor(router, from_cache);
+ }
log_info(LD_DIR,
"Dropping descriptor that we already have for router %s",
router_describe(router));