diff options
| author | Roger Dingledine <arma@torproject.org> | 2009-01-06 07:13:24 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2009-01-06 07:13:24 +0000 |
| commit | d95b63f1e4492507b1950d74f7ec845a6786d80e (patch) | |
| tree | 932e0f31004f84b5f00d460eb186f939f8263600 /src/or/router.c | |
| parent | 55665f25e58981022667115e8fc9778e54cf0ea3 (diff) | |
| download | tor-d95b63f1e4492507b1950d74f7ec845a6786d80e.tar.gz tor-d95b63f1e4492507b1950d74f7ec845a6786d80e.zip | |
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
Diffstat (limited to 'src/or/router.c')
| -rw-r--r-- | src/or/router.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/or/router.c b/src/or/router.c index 7ed4af17d9..1cdcd20652 100644 --- a/src/or/router.c +++ b/src/or/router.c @@ -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); |