Bugfix on r13098. Backport candidate.

When we made bridge authorities stop serving bridge descriptors over
unencrypted links, we also broke DirPort reachability testing for
bridges. So bridges with a non-zero DirPort were printing spurious
warns to their logs. Bugfix on 0.2.0.16-alpha. Fixes bug 709.


svn:r17945
This commit is contained in:
Roger Dingledine
2009-01-06 07:13:24 +00:00
parent 55665f25e5
commit d95b63f1e4
3 changed files with 11 additions and 5 deletions
+5 -3
View File
@@ -1412,10 +1412,12 @@ router_rebuild_descriptor(int force)
ri->purpose =
options->BridgeRelay ? ROUTER_PURPOSE_BRIDGE : ROUTER_PURPOSE_GENERAL;
if (!options->BridgeRelay) {
ri->cache_info.send_unencrypted = 1;
ri->cache_info.send_unencrypted = 1;
/* Let bridges serve their own descriptors unencrypted, so they can
* pass reachability testing. (If they want to be harder to notice,
* they can always leave the DirPort off). */
if (!options->BridgeRelay)
ei->cache_info.send_unencrypted = 1;
}
router_get_router_hash(ri->cache_info.signed_descriptor_body,
ri->cache_info.signed_descriptor_digest);