[tor-commits] [tor/maint-0.2.2] Clear last_hid_serv_requests on SIGNAL NEWNYM

[nickm@xxxxxxxxxxxxxx]

commit b0e7925c0205a68d730025cc8832110c1675cfd7
Author: Robert Ransom <rransom.8774@xxxxxxxxx>
Date:   Thu Jun 2 02:46:04 2011 -0700

    Clear last_hid_serv_requests on SIGNAL NEWNYM
    
    Fixes bug #3309.
---
 changes/bug3309     |    9 +++++++++
 src/or/main.c       |    1 +
 src/or/rendclient.c |   19 +++++++++++++++++++
 src/or/rendclient.h |    1 +
 4 files changed, 30 insertions(+), 0 deletions(-)

diff --git a/changes/bug3309 b/changes/bug3309
new file mode 100644
index 0000000..5df0d9d
--- /dev/null
+++ b/changes/bug3309
@@ -0,0 +1,9 @@
+  o Minor bugfixes:
+    - Clear the table recording the time of the last request for each
+      hidden service descriptor from each HS directory on SIGNAL
+      NEWNYM.  Previously, we would clear our HS descriptor cache on
+      SIGNAL NEWNYM, but if we had previously retrieved a descriptor
+      (or tried to) from every directory responsible for it, we would
+      refuse to fetch it again for up to 15 minutes.  Bugfix on
+      0.2.2.25-alpha; fixes bug 3309.
+
diff --git a/src/or/main.c b/src/or/main.c
index adbde90..3c84dda 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -855,6 +855,7 @@ signewnym_impl(time_t now)
   addressmap_clear_transient();
   rend_cache_purge();
   rend_client_cancel_descriptor_fetches();
+  rend_client_purge_last_hid_serv_requests();
   time_of_last_signewnym = now;
   signewnym_is_pending = 0;
 }
diff --git a/src/or/rendclient.c b/src/or/rendclient.c
index ec6e3f2..12b54df 100644
--- a/src/or/rendclient.c
+++ b/src/or/rendclient.c
@@ -444,6 +444,25 @@ directory_clean_last_hid_serv_requests(void)
   }
 }
 
+/** Purge the history of request times to hidden service directories,
+ * so that future lookups of an HS descriptor will not fail because we
+ * accessed all of the HSDir relays responsible for the descriptor
+ * recently. */
+void
+rend_client_purge_last_hid_serv_requests(void)
+{
+  /* Don't create the table if it doesn't exist yet (and it may very
+   * well not exist if the user hasn't accessed any HSes)... */
+  strmap_t *old_last_hid_serv_requests = last_hid_serv_requests_;
+  /* ... and let get_last_hid_serv_requests re-create it for us if
+   * necessary. */
+  last_hid_serv_requests_ = NULL;
+
+  if (old_last_hid_serv_requests != NULL) {
+    strmap_free(old_last_hid_serv_requests, _tor_free);
+  }
+}
+
 /** Determine the responsible hidden service directories for <b>desc_id</b>
  * and fetch the descriptor belonging to that ID from one of them. Only
  * send a request to hidden service directories that we did not try within
diff --git a/src/or/rendclient.h b/src/or/rendclient.h
index 6910c1a..2bfc850 100644
--- a/src/or/rendclient.h
+++ b/src/or/rendclient.h
@@ -19,6 +19,7 @@ int rend_client_introduction_acked(origin_circuit_t *circ,
                                    size_t request_len);
 void rend_client_refetch_v2_renddesc(const rend_data_t *rend_query);
 void rend_client_cancel_descriptor_fetches(void);
+void rend_client_purge_last_hid_serv_requests(void);
 int rend_client_remove_intro_point(extend_info_t *failed_intro,
                                    const rend_data_t *rend_query);
 int rend_client_rendezvous_acked(origin_circuit_t *circ,



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