[tor-commits] [tor/master] Remove dead code from rend_cache_lookup_v2_desc_as_dir

[nickm@xxxxxxxxxxxxxx]

commit c90097e74a21ef70d9df2ab70e5b211d7a26dc6d
Author: Robert Ransom <rransom.8774@xxxxxxxxx>
Date:   Sun Mar 13 21:10:32 2011 -0700

    Remove dead code from rend_cache_lookup_v2_desc_as_dir
    
    hid_serv_responsible_for_desc_id's return value is never negative, and
    there is no need to search through the consensus to find out whether we
    are responsible for a descriptor ID before we look in our cache for a
    descriptor.
---
 changes/bug2748     |    5 +++++
 src/or/rendcommon.c |    7 -------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/changes/bug2748 b/changes/bug2748
new file mode 100644
index 0000000..647000d
--- /dev/null
+++ b/changes/bug2748
@@ -0,0 +1,5 @@
+  o Minor bugfixes
+    - Remove dead code from rend_cache_lookup_v2_desc_as_dir.  Fixes
+      part of bug 2748; bugfix on 0.2.0.10-alpha.
+
+
diff --git a/src/or/rendcommon.c b/src/or/rendcommon.c
index d6f5443..ff3a401 100644
--- a/src/or/rendcommon.c
+++ b/src/or/rendcommon.c
@@ -1008,13 +1008,6 @@ rend_cache_lookup_v2_desc_as_dir(const char *desc_id, const char **desc)
              safe_str(desc_id));
     return -1;
   }
-  /* Determine if we are responsible. */
-  if (hid_serv_responsible_for_desc_id(desc_id_digest) < 0) {
-    log_info(LD_REND, "Could not answer fetch request for v2 descriptor; "
-                      "either we are no hidden service directory, or we are "
-                      "not responsible for the requested ID.");
-    return -1;
-  }
   /* Lookup descriptor and return. */
   e = digestmap_get(rend_cache_v2_dir, desc_id_digest);
   if (e) {



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits