aboutsummaryrefslogtreecommitdiff
path: root/src/or/router.c
diff options
context:
space:
mode:
authorteor (Tim Wilson-Brown) <teor2345@gmail.com>2016-04-28 11:36:27 +1000
committerteor (Tim Wilson-Brown) <teor2345@gmail.com>2016-04-28 12:26:39 +1000
commit211e56ad87740da1303832d900bf2943ed702526 (patch)
treec50ead98ad027df148eff666b9235903f31f1f5f /src/or/router.c
parentb51316c0e77ed8d931d17263076af1e9787fa333 (diff)
downloadtor-211e56ad87740da1303832d900bf2943ed702526.tar.gz
tor-211e56ad87740da1303832d900bf2943ed702526.zip
Remove redundant descriptor checks for OR/Dir reachability
The ORPort and DirPort must be reachable, or we won't publish a descriptor.
Diffstat (limited to 'src/or/router.c')
-rw-r--r--src/or/router.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/or/router.c b/src/or/router.c
index a9d992f1b3..86fd787598 100644
--- a/src/or/router.c
+++ b/src/or/router.c
@@ -1247,9 +1247,6 @@ decide_to_advertise_dirport(const or_options_t *options, uint16_t dir_port)
return dir_port;
if (net_is_disabled())
return 0;
- /* redundant - if DirPort is unreachable, we don't publish a descriptor */
- if (!check_whether_dirport_reachable())
- return 0;
if (!router_get_advertised_dir_port(options, dir_port))
return 0;
@@ -1280,9 +1277,6 @@ decide_to_advertise_begindir(const or_options_t *options,
return 1;
if (net_is_disabled())
return 0;
- /* redundant - if ORPort is unreachable, we don't publish a descriptor */
- if (!check_whether_orport_reachable())
- return 0;
if (!router_get_advertised_or_port(options))
return 0;