October 2011 - tor-commits - lists.torproject.org

[metrics-tasks/master] Add a graph for task 4142.
by karsten＠torproject.org 04 Oct '11

04 Oct '11

commit 16f6c8bf1c8acc4a9f190f34d1ae72acdf796b24 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 4 17:50:50 2011 +0200 Add a graph for task 4142. --- task-4142/.gitignore | 6 ++++++ task-4142/Eval.java | 38 ++++++++++++++++++++++++++++++++++++++ task-4142/README | 5 +++++ task-4142/delay.R | 16 ++++++++++++++++ 4 files changed, 65 insertions(+), 0 deletions(-) diff --git a/task-4142/.gitignore b/task-4142/.gitignore new file mode 100644 index 0000000..0ec473e --- /dev/null +++ b/task-4142/.gitignore @@ -0,0 +1,6 @@ +*.class +*.pdf +delay +*.csv +*.png + diff --git a/task-4142/Eval.java b/task-4142/Eval.java new file mode 100644 index 0000000..ee021d0 --- /dev/null +++ b/task-4142/Eval.java @@ -0,0 +1,38 @@ +import java.io.*; +import java.util.*; +public class Eval { + public static void main(String[] args) throws Exception { + BufferedReader br = new BufferedReader(new FileReader("delay")); + String line, fingerprint = null, published = null; + Map<String, String> firstPublished = new HashMap<String, String>(); + while ((line = br.readLine()) != null) { + if (line.startsWith("extra-info ")) { + fingerprint = line.split(" ")[2]; + published = null; + } else if (line.startsWith("published ")) { + published = line.substring("published ".length()); + } else if (line.startsWith("dirreq-stats-end ")) { + String[] parts = line.split(" "); + String dirreqStatsEnd = parts[1] + " " + parts[2]; + String key = fingerprint + " " + dirreqStatsEnd; + if (!firstPublished.containsKey(key) || + firstPublished.get(key).compareTo(published) > 0) { + firstPublished.put(key, published); + } + } + } + br.close(); + BufferedWriter bw = new BufferedWriter(new FileWriter("delay.csv")); + bw.write("fingerprint,dirreqstatsend,published\n"); + for (Map.Entry<String, String> e : firstPublished.entrySet()) { + String[] parts = e.getKey().split(" "); + fingerprint = parts[0]; + String dirreqStatsEnd = parts[1] + " " + parts[2]; + published = e.getValue(); + bw.write(fingerprint + "," + dirreqStatsEnd + "," + published + + "\n"); + } + bw.close(); + } +} + diff --git a/task-4142/README b/task-4142/README new file mode 100644 index 0000000..5a25128 --- /dev/null +++ b/task-4142/README @@ -0,0 +1,5 @@ +$ grep -Rl "dirreq-stats-end" * | xargs -I{} grep -E \ + "published|dirreq-stats-end|^extra-info" {} > ../delay +$ javac Eval.java && java Eval +$ R --slave -f delay.R + diff --git a/task-4142/delay.R b/task-4142/delay.R new file mode 100644 index 0000000..5568e61 --- /dev/null +++ b/task-4142/delay.R @@ -0,0 +1,16 @@ +library(ggplot2) +d <- read.csv("delay.csv") +d <- data.frame(published = d$published, + dirreqstatsend = d$dirreqstatsend, + delay = as.POSIXlt(d$published) - as.POSIXlt(d$dirreqstatsend)) +m <- mean(as.numeric(d$delay)) / (60 * 60) +ggplot(d, aes(x = as.numeric(delay) / (60 * 60))) + +geom_histogram(binwidth = 1, fill = "purple2", + colour = alpha("white", 0.5)) + +scale_x_continuous(name = paste("\nDelay between finishing a", + "dirreq-stats interval and first publishing its results", + "(red line = mean value)"), minor_breaks = 1) + +scale_y_continuous(name = "Number of finished dirreq-stats intervals\n") + +geom_vline(xintercept = m, colour = "red", size = 1.5) + +ggsave("delay.png", width = 8, height = 5, dpi = 100) +

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 04 Oct '11

04 Oct '11

commit c7f8860e7089effd1a7370c75dcc26963d0109a4 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Oct 4 14:15:29 2011 +0000 Update translations for bridgedb --- ar/bridgedb.po | 1 + cs/bridgedb.po | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) diff --git a/ar/bridgedb.po b/ar/bridgedb.po index b06f5d7..bc892c3 100644 --- a/ar/bridgedb.po +++ b/ar/bridgedb.po @@ -2,6 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # +# Translators: # allamiro <allamiro(a)gmail.com>, 2011. # mohammad Alhargan <malham1(a)gmail.com>, 2011. msgid "" diff --git a/cs/bridgedb.po b/cs/bridgedb.po index 31073be..2cef7f2 100644 --- a/cs/bridgedb.po +++ b/cs/bridgedb.po @@ -2,6 +2,7 @@ # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER # This file is distributed under the same license as the PACKAGE package. # +# Translators: # Elisa <valhalla(a)gishpuppy.com>, 2011. msgid "" msgstr ""

1 0

[metrics-web/master] Don't consider relay-search queries for just a date as valid.
by karsten＠torproject.org 04 Oct '11

04 Oct '11

commit 6bcd7afa6395202c410384a1fa16400e86ca68e6 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 4 10:22:35 2011 +0200 Don't consider relay-search queries for just a date as valid. --- .../torproject/ernie/web/RelaySearchServlet.java | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/torproject/ernie/web/RelaySearchServlet.java b/src/org/torproject/ernie/web/RelaySearchServlet.java index 6e056f5..1791017 100644 --- a/src/org/torproject/ernie/web/RelaySearchServlet.java +++ b/src/org/torproject/ernie/web/RelaySearchServlet.java @@ -151,6 +151,7 @@ public class RelaySearchServlet extends HttpServlet { sb.append("."); } searchIPAddress = sb.toString().substring(1); + validQuery = true; } /* If the search term contains hyphens, it must be a month or a @@ -181,6 +182,7 @@ public class RelaySearchServlet extends HttpServlet { else if (searchTerm.length() >= 8 && searchTerm.length() <= 19 && hexPattern.matcher(searchTerm).matches()) { searchFingerprintOrNickname.add(searchTerm); + validQuery = true; } /* If the search term contains between 20 and 40 hex characters, @@ -192,6 +194,7 @@ public class RelaySearchServlet extends HttpServlet { break; } searchFingerprint = searchTerm; + validQuery = true; } /* If the search term contains up to 19 alphanumerical characters, @@ -203,6 +206,7 @@ public class RelaySearchServlet extends HttpServlet { break; } searchNickname = searchTerm; + validQuery = true; } /* We didn't recognize this search term. */ @@ -210,10 +214,6 @@ public class RelaySearchServlet extends HttpServlet { validQuery = false; break; } - - /* We recognized at least one search term, so that the query is - * potentially valid. */ - validQuery = true; } }

1 0

[metrics-web/master] Create stats/ directory in ExoneraTor db importer.
by karsten＠torproject.org 04 Oct '11

04 Oct '11

commit 2a2b195de0b80f057cafe10477bbb84e531c8340 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Oct 4 10:10:01 2011 +0200 Create stats/ directory in ExoneraTor db importer. --- .../ernie/cron/ExoneraTorDatabaseImporter.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java index 95d894b..c89097a 100755 --- a/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java +++ b/src/org/torproject/ernie/cron/ExoneraTorDatabaseImporter.java @@ -494,6 +494,7 @@ public class ExoneraTorDatabaseImporter { /* Write parse history from memory to disk for the next execution. */ private static void writeImportHistoryToDisk() { File parseHistoryFile = new File("stats/exonerator-import-history"); + parseHistoryFile.getParentFile().mkdirs(); try { BufferedWriter bw = new BufferedWriter(new FileWriter( parseHistoryFile));

1 0

[tor/master] Looks like Windows version 6.2 will be Windows 8
by nickm＠torproject.org 03 Oct '11

03 Oct '11

commit 103c861dfead6640a4bef6e85f740f7c635c7343 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Oct 1 14:44:39 2011 +0200 Looks like Windows version 6.2 will be Windows 8 Thanks to funkstar for the report --- changes/windows_8 | 5 +++++ src/common/compat.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/windows_8 b/changes/windows_8 new file mode 100644 index 0000000..405e4fa --- /dev/null +++ b/changes/windows_8 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - The next version of Windows will be called Windows 8, and it has a major + version of 6, minor version of 2. Correctly identify that version instead + of calling it "Very recent version". Fixes bug 4153; reported by funkstar. + diff --git a/src/common/compat.c b/src/common/compat.c index 80b4907..266fc61 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1806,6 +1806,7 @@ get_uname(void) static struct { unsigned major; unsigned minor; const char *version; } win_version_table[] = { + { 6, 2, "Windows 8" }, { 6, 1, "Windows 7" }, { 6, 0, "Windows Vista" }, { 5, 2, "Windows Server 2003" }, @@ -1862,7 +1863,7 @@ get_uname(void) plat, extra); } else { if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>1)) + (info.dwMajorVersion==6 && info.dwMinorVersion>2)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d] %s", (int)info.dwMajorVersion,(int)info.dwMinorVersion,

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 03 Oct '11

03 Oct '11

commit 2725a88d5e3ec362a4f866f53c26ca20f943eb49 Merge: 05f672c 103c861 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 3 15:19:00 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/windows_8 | 5 +++++ src/common/compat.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] Looks like Windows version 6.2 will be Windows 8
by nickm＠torproject.org 03 Oct '11

03 Oct '11

commit 103c861dfead6640a4bef6e85f740f7c635c7343 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Sat Oct 1 14:44:39 2011 +0200 Looks like Windows version 6.2 will be Windows 8 Thanks to funkstar for the report --- changes/windows_8 | 5 +++++ src/common/compat.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/windows_8 b/changes/windows_8 new file mode 100644 index 0000000..405e4fa --- /dev/null +++ b/changes/windows_8 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - The next version of Windows will be called Windows 8, and it has a major + version of 6, minor version of 2. Correctly identify that version instead + of calling it "Very recent version". Fixes bug 4153; reported by funkstar. + diff --git a/src/common/compat.c b/src/common/compat.c index 80b4907..266fc61 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1806,6 +1806,7 @@ get_uname(void) static struct { unsigned major; unsigned minor; const char *version; } win_version_table[] = { + { 6, 2, "Windows 8" }, { 6, 1, "Windows 7" }, { 6, 0, "Windows Vista" }, { 5, 2, "Windows Server 2003" }, @@ -1862,7 +1863,7 @@ get_uname(void) plat, extra); } else { if (info.dwMajorVersion > 6 || - (info.dwMajorVersion==6 && info.dwMinorVersion>1)) + (info.dwMajorVersion==6 && info.dwMinorVersion>2)) tor_snprintf(uname_result, sizeof(uname_result), "Very recent version of Windows [major=%d,minor=%d] %s", (int)info.dwMajorVersion,(int)info.dwMinorVersion,

1 0

[tor/master] Fix compilation of 3335 and 3825 fixes
by nickm＠torproject.org 03 Oct '11

03 Oct '11

commit 05f672c8c21ceb4c47731fb3d8f777bf95583b3b Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 3 15:13:38 2011 -0400 Fix compilation of 3335 and 3825 fixes In master, they ran into problems with the edge_conn/entry_conn split. --- src/or/circuituse.c | 5 +++-- src/or/connection_edge.c | 8 +++++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/or/circuituse.c b/src/or/circuituse.c index 26bc451..9b96218 100644 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@ -1589,11 +1589,12 @@ link_apconn_to_circ(entry_connection_t *apconn, origin_circuit_t *circ, /* assert_connection_ok(conn, time(NULL)); */ circ->p_streams = ENTRY_TO_EDGE_CONN(apconn); - if (connection_edge_is_rendezvous_stream(apconn)) { + if (connection_edge_is_rendezvous_stream(ENTRY_TO_EDGE_CONN(apconn))) { /* We are attaching a stream to a rendezvous circuit. That means * that an attempt to connect to a hidden service just * succeeded. Tell rendclient.c. */ - rend_client_note_connection_attempt_ended(apconn->rend_data->onion_address); + rend_client_note_connection_attempt_ended( + ENTRY_TO_EDGE_CONN(apconn)->rend_data->onion_address); } if (cpath) { /* we were given one; use it */ diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3393104..40426a9 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -68,6 +68,7 @@ _connection_mark_unattached_ap(entry_connection_t *conn, int endreason, int line, const char *file) { connection_t *base_conn = ENTRY_TO_CONN(conn); + edge_connection_t *edge_conn = ENTRY_TO_EDGE_CONN(conn); tor_assert(base_conn->type == CONN_TYPE_AP); ENTRY_TO_EDGE_CONN(conn)->edge_has_sent_end = 1; /* no circ yet */ @@ -78,9 +79,10 @@ _connection_mark_unattached_ap(entry_connection_t *conn, int endreason, * XXX023 This condition doesn't limit to only streams failing * without ever being attached. That sloppiness should be harmless, * but we should fix it someday anyway. */ - if ((conn->on_circuit != NULL || conn->edge_has_sent_end) && - connection_edge_is_rendezvous_stream(conn)) { - rend_client_note_connection_attempt_ended(conn->rend_data->onion_address); + if ((edge_conn->on_circuit != NULL || edge_conn->edge_has_sent_end) && + connection_edge_is_rendezvous_stream(edge_conn)) { + rend_client_note_connection_attempt_ended( + edge_conn->rend_data->onion_address); } if (base_conn->marked_for_close) {

1 0

[tor/master] Merge remote-tracking branch 'rransom-tor/bug3335-v2'
by nickm＠torproject.org 03 Oct '11

03 Oct '11

commit 4aa4bce474e6fb3e52c0aecb48f3e5024576e693 Merge: a7f93b5 c5226bf Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Oct 3 15:06:07 2011 -0400 Merge remote-tracking branch 'rransom-tor/bug3335-v2' Conflicts: src/or/connection_edge.c src/or/rendclient.c changes/bug1297b | 8 ++ changes/bug3335 | 11 +++ changes/bug3825a | 8 ++ src/or/circuitlist.c | 33 +++++++-- src/or/circuituse.c | 7 ++ src/or/connection_edge.c | 12 +++ src/or/or.h | 17 +++++ src/or/rendclient.c | 177 ++++++++++++++++++++++++++++++++++++++-------- src/or/rendclient.h | 13 +++- 9 files changed, 247 insertions(+), 39 deletions(-) diff --cc src/or/circuituse.c index f7f080d,f2fd6fe..26bc451 --- a/src/or/circuituse.c +++ b/src/or/circuituse.c @@@ -1583,16 -1458,23 +1583,23 @@@ link_apconn_to_circ(entry_connection_t log_debug(LD_APP|LD_CIRC, "attaching new conn to circ. n_circ_id %d.", circ->_base.n_circ_id); /* reset it, so we can measure circ timeouts */ - apconn->_base.timestamp_lastread = time(NULL); - apconn->next_stream = circ->p_streams; - apconn->on_circuit = TO_CIRCUIT(circ); + ENTRY_TO_CONN(apconn)->timestamp_lastread = time(NULL); + ENTRY_TO_EDGE_CONN(apconn)->next_stream = circ->p_streams; + ENTRY_TO_EDGE_CONN(apconn)->on_circuit = TO_CIRCUIT(circ); /* assert_connection_ok(conn, time(NULL)); */ - circ->p_streams = apconn; + circ->p_streams = ENTRY_TO_EDGE_CONN(apconn); + if (connection_edge_is_rendezvous_stream(apconn)) { + /* We are attaching a stream to a rendezvous circuit. That means + * that an attempt to connect to a hidden service just + * succeeded. Tell rendclient.c. */ + rend_client_note_connection_attempt_ended(apconn->rend_data->onion_address); + } + if (cpath) { /* we were given one; use it */ tor_assert(cpath_is_on_circuit(circ, cpath)); - apconn->cpath_layer = cpath; - } else { /* use the last hop in the circuit */ + } else { + /* use the last hop in the circuit */ tor_assert(circ->cpath); tor_assert(circ->cpath->prev); tor_assert(circ->cpath->prev->state == CPATH_STATE_OPEN); diff --cc src/or/connection_edge.c index f59f44c,0c5ebde..3393104 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@@ -64,16 -62,27 +64,28 @@@ static int connection_ap_supports_optim * has_sent_end to 1, and mark the conn. */ void -_connection_mark_unattached_ap(edge_connection_t *conn, int endreason, +_connection_mark_unattached_ap(entry_connection_t *conn, int endreason, int line, const char *file) { - tor_assert(conn->_base.type == CONN_TYPE_AP); - conn->edge_has_sent_end = 1; /* no circ yet */ + connection_t *base_conn = ENTRY_TO_CONN(conn); + tor_assert(base_conn->type == CONN_TYPE_AP); + ENTRY_TO_EDGE_CONN(conn)->edge_has_sent_end = 1; /* no circ yet */ + /* If this is a rendezvous stream and it is failing without ever + * being attached to a circuit, assume that an attempt to connect to + * the destination hidden service has just ended. + * + * XXX023 This condition doesn't limit to only streams failing + * without ever being attached. That sloppiness should be harmless, + * but we should fix it someday anyway. */ + if ((conn->on_circuit != NULL || conn->edge_has_sent_end) && + connection_edge_is_rendezvous_stream(conn)) { + rend_client_note_connection_attempt_ended(conn->rend_data->onion_address); + } + - if (conn->_base.marked_for_close) { + if (base_conn->marked_for_close) { /* This call will warn as appropriate. */ - _connection_mark_for_close(TO_CONN(conn), line, file); + _connection_mark_for_close(base_conn, line, file); return; } diff --cc src/or/rendclient.c index 6fe9ba2,e66b242..47fda23 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@@ -505,16 -541,13 +546,17 @@@ directory_get_from_hs_dir(const char *d /* Only select those hidden service directories to which we did not send * a request recently and for which we have a router descriptor here. */ - directory_clean_last_hid_serv_requests(); /* Clean request history first. */ + + /* Clean request history first. */ + directory_clean_last_hid_serv_requests(now); SMARTLIST_FOREACH(responsible_dirs, routerstatus_t *, dir, { - time_t last = lookup_last_hid_serv_request(dir, desc_id_base32, 0, 0); - if (lookup_last_hid_serv_request(dir, desc_id_base32, rend_query, 0, 0) + - REND_HID_SERV_DIR_REQUERY_PERIOD >= now || - !router_get_by_digest(dir->identity_digest)) ++ time_t last = lookup_last_hid_serv_request( ++ dir, desc_id_base32, rend_query, 0, 0); + const node_t *node = node_get_by_id(dir->identity_digest); + if (last + REND_HID_SERV_DIR_REQUERY_PERIOD >= now || + !node || !node_has_descriptor(node)) - SMARTLIST_DEL_CURRENT(responsible_dirs, dir); + SMARTLIST_DEL_CURRENT(responsible_dirs, dir); }); hs_dir = smartlist_choose(responsible_dirs); @@@ -867,10 -940,36 +951,36 @@@ rend_client_desc_trynow(const char *que "unavailable (try again later).", safe_str_client(query)); connection_mark_unattached_ap(conn, END_STREAM_REASON_RESOLVEFAILED); + rend_client_note_connection_attempt_ended(query); } - } SMARTLIST_FOREACH_END(_conn); + } SMARTLIST_FOREACH_END(base_conn); } + /** Clear temporary state used only during an attempt to connect to + * the hidden service named <b>onion_address</b>. Called when a + * connection attempt has ended; may be called occasionally at other + * times, and should be reasonably harmless. */ + void + rend_client_note_connection_attempt_ended(const char *onion_address) + { + rend_cache_entry_t *cache_entry = NULL; + rend_cache_lookup_entry(onion_address, -1, &cache_entry); + + log_info(LD_REND, "Connection attempt for %s has ended; " + "cleaning up temporary state.", + safe_str_client(onion_address)); + + /* Clear the timed_out flag on all remaining intro points for this HS. */ + if (cache_entry != NULL) { + SMARTLIST_FOREACH(cache_entry->parsed->intro_nodes, + rend_intro_point_t *, ip, + ip->timed_out = 0; ); + } + + /* Remove the HS's entries in last_hid_serv_requests. */ + purge_hid_serv_from_last_hid_serv_requests(onion_address); + } + /** Return a newly allocated extend_info_t* for a randomly chosen introduction * point for the named hidden service. Return NULL if all introduction points * have been tried and failed.

1 0

[tor/master] Remove an HS's last_hid_serv_requests entries when a conn. attempt ends
by nickm＠torproject.org 03 Oct '11

03 Oct '11

commit c5226bfe1c26d2cbcc789c1074d8d925e7c7fea1 Author: Robert Ransom <rransom.8774(a)gmail.com> Date: Tue Sep 20 04:26:09 2011 -0700 Remove an HS's last_hid_serv_requests entries when a conn. attempt ends --- changes/bug3335 | 11 +++++++++++ src/or/rendclient.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 41 insertions(+), 0 deletions(-) diff --git a/changes/bug3335 b/changes/bug3335 new file mode 100644 index 0000000..7e1e898 --- /dev/null +++ b/changes/bug3335 @@ -0,0 +1,11 @@ + o Major bugfixes: + + - When an attempt to connect to a hidden service ends, consider + refetching its hidden service descriptors from each of the HSDir + relays responsible for them immediately. Previously, we would + not consider refetching the service's descriptors from each + HSDir for 15 minutes after the last fetch; this behaviour was + inconvenient if the hidden service was not running during the + first attempt, for example. Bugfix on 0.2.0.18-alpha; fixes bug + 3335. + diff --git a/src/or/rendclient.c b/src/or/rendclient.c index 9088b92..e66b242 100644 --- a/src/or/rendclient.c +++ b/src/or/rendclient.c @@ -469,6 +469,33 @@ directory_clean_last_hid_serv_requests(void) } } +/** Remove all requests related to the hidden service named + * <b>onion_address</b> from the history of times of requests to + * hidden service directories. */ +static void +purge_hid_serv_from_last_hid_serv_requests(const char *onion_address) +{ + strmap_iter_t *iter; + strmap_t *last_hid_serv_requests = get_last_hid_serv_requests(); + /* XXX023 tor_assert(strlen(onion_address) == REND_SERVICE_ID_LEN_BASE32); */ + for (iter = strmap_iter_init(last_hid_serv_requests); + !strmap_iter_done(iter); ) { + const char *key; + void *val; + strmap_iter_get(iter, &key, &val); + /* XXX023 tor_assert(strlen(key) == LAST_HID_SERV_REQUEST_KEY_LEN); */ + if (tor_memeq(key + LAST_HID_SERV_REQUEST_KEY_LEN - + REND_SERVICE_ID_LEN_BASE32, + onion_address, + REND_SERVICE_ID_LEN_BASE32)) { + iter = strmap_iter_next_rmv(last_hid_serv_requests, iter); + tor_free(val); + } else { + iter = strmap_iter_next(last_hid_serv_requests, iter); + } + } +} + /** 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 @@ -938,6 +965,9 @@ rend_client_note_connection_attempt_ended(const char *onion_address) rend_intro_point_t *, ip, ip->timed_out = 0; ); } + + /* Remove the HS's entries in last_hid_serv_requests. */ + purge_hid_serv_from_last_hid_serv_requests(onion_address); } /** Return a newly allocated extend_info_t* for a randomly chosen introduction

1 0