[tor-commits] [tor/master] Determine whether an intro point was in the last HS desc in a sane way

[nickm at torproject.org]

commit 68331cbd81931b395355553531ee42961d3385e5
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Thu Oct 13 09:41:29 2011 -0700

    Determine whether an intro point was in the last HS desc in a sane way
---
 src/or/rendservice.c |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/or/rendservice.c b/src/or/rendservice.c
index 96ab7a6..ce7295e 100644
--- a/src/or/rendservice.c
+++ b/src/or/rendservice.c
@@ -1947,17 +1947,11 @@ rend_services_introduce(void)
         log_info(LD_REND,"Giving up on %s as intro point for %s.",
                  safe_str_client(extend_info_describe(intro->extend_info)),
                  safe_str_client(service->service_id));
-        if (service->desc) {
-          SMARTLIST_FOREACH(service->desc->intro_nodes, rend_intro_point_t *,
-                            dintro, {
-            if (tor_memeq(dintro->extend_info->identity_digest,
-                intro->extend_info->identity_digest, DIGEST_LEN)) {
-              log_info(LD_REND, "The intro point we are giving up on was "
-                                "included in the last published descriptor. "
-                                "Marking current descriptor as dirty.");
-              service->desc_is_dirty = now;
-            }
-          });
+        if (intro->listed_in_last_desc) {
+          log_info(LD_REND, "The intro point we are giving up on was "
+                   "included in the last published descriptor. "
+                   "Marking current descriptor as dirty.");
+          service->desc_is_dirty = now;
         }
         rend_intro_point_free(intro);
         smartlist_del(service->intro_nodes,j--);