From: teor (Tim Wilson-Brown) <teor2345@gmail.com>
Date: Thu, 28 Apr 2016 01:36:27 +0000 (+1000)
Subject: Remove redundant descriptor checks for OR/Dir reachability
X-Git-Tag: tor-0.2.8.3-alpha~22^2^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=211e56ad87740da1303832d900bf2943ed702526;p=thirdparty%2Ftor.git

Remove redundant descriptor checks for OR/Dir reachability

The ORPort and DirPort must be reachable, or we won't publish a
descriptor.
---

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;