January 2018 - tor-commits - lists.torproject.org

[tor/master] Stop invoking undefined behaviour by using tor_free() on an unaligned pointer
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit 54899b404cbde5a24984e4865eed112f303398f6 Author: teor <teor2345(a)gmail.com> Date: Sun Dec 24 22:36:52 2017 +1100 Stop invoking undefined behaviour by using tor_free() on an unaligned pointer ... in get_interface_addresses_ioctl(). This pointer alignment issue exists on x86_64 macOS, but is unlikely to exist elsewhere. (i386 macOS only requires 4-byte alignment, and other OSs have 8-byte ints.) Fixes bug 24733; not in any released version … [View More]

1 0

[tor/master] Merge branch 'bug24733_squashed_2'
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit c8c258a4333815e195097a59801397dd7a169828 Merge: ca1d1c382 519fa1a3e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 10 12:57:23 2018 -0500 Merge branch 'bug24733_squashed_2' changes/bug24733 | 6 ++++++ src/common/address.c | 14 +++++++++++++- src/common/util.h | 5 +++++ 3 files changed, 24 insertions(+), 1 deletion(-)

1 0

[tor/master] Extract the raw_free() of ifc_buf into a new function.
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit f71bbd20a40de78fc1e7d722ba591578f137abec Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 10 09:51:45 2018 -0500 Extract the raw_free() of ifc_buf into a new function. Explain the problem more correctly. --- src/common/address.c | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/src/common/address.c b/src/common/address.c index ea14e6392..d96ec514b 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -… [View More]

1 0

[tor/master] Document the alignment limitation of tor_free()
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit 519fa1a3e6943f858b5dc1dee461053af1c187cd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 10 09:55:01 2018 -0500 Document the alignment limitation of tor_free() --- src/common/util.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/common/util.h b/src/common/util.h index 8dc64ce9f..2ee0ea28c 100644 --- a/src/common/util.h +++ b/src/common/util.h @@ -79,6 +79,11 @@ extern int dmalloc_free(const char *file, const int line, void *pnt, * * This is a … [View More]

1 0

[tor/master] Add some values to OOM log msg #24501
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit ac9eebd63637d39b2a55d9a40c748a197fd47f93 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Wed Dec 20 18:31:30 2017 +0100 Add some values to OOM log msg #24501 Exposing cell_queues_get_total_allocation(), buf_get_total_allocation(), tor_compress_get_total_allocation(), tor_compress_get_total_allocation() when hit MaxMemInQueues threshold. Fixes #24501 Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)… [View More]gmail.com> --- changes/ticket24501 | 3 +++ src/or/circuitlist.c | 12 +++++++++--- src/or/relay.c | 2 +- src/or/relay.h | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --git a/changes/ticket24501 b/changes/ticket24501 new file mode 100644 index 000000000..4a87462e9 --- /dev/null +++ b/changes/ticket24501 @@ -0,0 +1,3 @@ + o Minor features (logging): + - Make the log more quantitative when we hit MaxMemInQueues threshold + exposing some values. Closes ticket 24501. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index d442887c9..c1b5c1a95 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -2329,9 +2329,15 @@ circuits_handle_oom(size_t current_allocation) int n_circuits_killed=0; int n_dirconns_killed=0; uint32_t now_ms; - log_notice(LD_GENERAL, "We're low on memory. Killing circuits with " - "over-long queues. (This behavior is controlled by " - "MaxMemInQueues.)"); + log_notice(LD_GENERAL, "We're low on memory (cell queues total alloc: %zu," + " buffer total alloc: %zu, tor compress total alloc: %zu," + " rendezvous cache total alloc: %zu). Killing circuits with" + " over-long queues. (This behavior is controlled by" + " MaxMemInQueues.)", + cell_queues_get_total_allocation(), + buf_get_total_allocation(), + tor_compress_get_total_allocation(), + rend_cache_get_total_allocation()); { size_t mem_target = (size_t)(get_options()->MaxMemInQueues * diff --git a/src/or/relay.c b/src/or/relay.c index 09f70793d..952622b6b 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -2530,7 +2530,7 @@ packed_cell_mem_cost(void) } /* DOCDOC */ -STATIC size_t +size_t cell_queues_get_total_allocation(void) { return total_cells_allocated * packed_cell_mem_cost(); diff --git a/src/or/relay.h b/src/or/relay.h index 2412dcb23..479ce5496 100644 --- a/src/or/relay.h +++ b/src/or/relay.h @@ -17,6 +17,7 @@ extern uint64_t stats_n_relay_cells_delivered; int circuit_receive_relay_cell(cell_t *cell, circuit_t *circ, cell_direction_t cell_direction); +size_t cell_queues_get_total_allocation(void); void relay_header_pack(uint8_t *dest, const relay_header_t *src); void relay_header_unpack(relay_header_t *dest, const uint8_t *src); @@ -102,7 +103,6 @@ STATIC int connection_edge_process_resolved_cell(edge_connection_t *conn, const relay_header_t *rh); STATIC packed_cell_t *packed_cell_new(void); STATIC packed_cell_t *cell_queue_pop(cell_queue_t *queue); -STATIC size_t cell_queues_get_total_allocation(void); STATIC int cell_queues_check_size(void); #endif /* defined(RELAY_PRIVATE) */ [View Less]

1 0

[tor/master] Merge remote-tracking branch 'ffmancera/github/bug24501'
by nickm＠torproject.org 10 Jan '18

10 Jan '18

commit ca1d1c382ceb0201bf8761f2b45a0e6f8e83b9be Merge: d8c0c62c7 ac9eebd63 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 10 12:46:39 2018 -0500 Merge remote-tracking branch 'ffmancera/github/bug24501' changes/ticket24501 | 3 +++ src/or/circuitlist.c | 12 +++++++++--- src/or/relay.c | 2 +- src/or/relay.h | 2 +- 4 files changed, 14 insertions(+), 5 deletions(-) diff --cc src/or/circuitlist.c index f074025a3,c1b5c1a95..661438d8f --- a/src/or/… [View More]

1 0

[metrics-web/master] Update news.json to version 215 of doc/MetricsTimeline.
by karsten＠torproject.org 10 Jan '18

10 Jan '18

commit ab11b5848ea47d5cb0c5c65c47922f7fb431cf4f Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Wed Jan 10 17:29:19 2018 +0100 Update news.json to version 215 of doc/MetricsTimeline. As part of this update, support "ongoing" events introduced in version 215. --- src/main/java/org/torproject/metrics/web/News.java | 9 + src/main/resources/web/json/news.json | 498 +++++++++------------ 2 files changed, 210 insertions(+), 297 deletions(-) diff -… [View More]

1 0

[metrics-web/master] Adapt format on News page from related events.
by karsten＠torproject.org 10 Jan '18

10 Jan '18

commit 494a2637df6f70fcc13919f7ac91bbc29f371911 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 21 17:10:44 2017 +0100 Adapt format on News page from related events. --- .../org/torproject/metrics/web/NewsServlet.java | 67 +--------------------- src/main/resources/web/jsps/news.jsp | 17 +++++- 2 files changed, 16 insertions(+), 68 deletions(-) diff --git a/src/main/java/org/torproject/metrics/web/NewsServlet.java b/src/main/java/org/torproject/… [View More]metrics/web/NewsServlet.java index 7840a40..15717bd 100644 --- a/src/main/java/org/torproject/metrics/web/NewsServlet.java +++ b/src/main/java/org/torproject/metrics/web/NewsServlet.java @@ -82,77 +82,14 @@ public class NewsServlet extends AnyServlet { .getStart()) > 0); /* Sort news into categories. */ - Map<String[], List<String[]>> newsByCategory = new LinkedHashMap<>(); + Map<String[], List<String>> newsByCategory = new LinkedHashMap<>(); for (String[] category : cutOffDates.values()) { newsByCategory.put(category, new ArrayList<>()); } for (News news : this.sortedNews) { - StringBuilder sb = new StringBuilder(); - sb.append("<h3 class=\"media-heading\">").append(news.getStart()); - if (news.getEnd() != null) { - sb.append(" to ").append(news.getEnd()); - } - if (news.getPlaces() != null) { - boolean appendUnknownCountry = false; - for (String place : news.getPlaces()) { - if (this.countries.containsKey(place)) { - sb.append(" <span class=\"label label-warning\">") - .append(this.countries.get(place)).append("</span>"); - } else { - appendUnknownCountry = true; - } - } - if (appendUnknownCountry) { - sb.append(" <span class=\"label label-warning\">" - + "Unknown country</span>"); - } - } - if (news.getProtocols() != null) { - for (String protocol : news.getProtocols()) { - switch (protocol) { - case "relay": - sb.append(" <span class=\"label label-success\">" - + "Relays</span>"); - break; - case "bridge": - sb.append(" <span class=\"label label-primary\">" - + "Bridges</span>"); - break; - case "<OR>": - sb.append(" <span class=\"label label-info\">" - + "<OR></span>"); - break; - default: - sb.append(" <span class=\"label label-info\">").append(protocol) - .append("</span>"); - break; - } - } - } - if (news.isUnknown()) { - sb.append(" <span class=\"label label-default\">" - + "Unknown</span>"); - } - sb.append("</h3><p>").append(news.getDescription()).append("</p>"); - if (news.getLinks() != null && news.getLinks().length > 0) { - int written = 0; - sb.append("<p class=\"links\">"); - for (String link : news.getLinks()) { - if (written++ > 0) { - sb.append(" "); - } - if (link.startsWith("https://metrics.torproject.org/")) { - sb.append(link); - } else { - sb.append(link.replaceFirst(">", " target=\"_blank\">")); - } - } - sb.append("</p>"); - } - String[] formattedNews = new String[] { sb.toString() }; for (Map.Entry<String, String[]> category : cutOffDates.entrySet()) { if (news.getStart().compareTo(category.getKey()) >= 0) { - newsByCategory.get(category.getValue()).add(formattedNews); + newsByCategory.get(category.getValue()).add(news.formatAsTableRow()); break; } } diff --git a/src/main/resources/web/jsps/news.jsp b/src/main/resources/web/jsps/news.jsp index 68f1689..499eade 100644 --- a/src/main/resources/web/jsps/news.jsp +++ b/src/main/resources/web/jsps/news.jsp @@ -20,9 +20,20 @@ <c:forEach var="category" items="${news}" varStatus="status"> <div class="container"> <h2>${category.key[0]} <a href="#${category.key[1]}" name="${category.key[1]}" class="anchor">#</a></h2> - <c:forEach var="entry" items="${category.value}"> - <p>${entry[0]}<br></p> - </c:forEach> + <table class="table events"> + <thead> + <tr> + <th class="dates">Dates</th> + <th class="tags">Places/Protocols</th> + <th class="description">Description and Links</th> + </tr> + </thead> + <tbody> + <c:forEach var="entry" items="${category.value}"> + ${entry} + </c:forEach> + </tbody> + </table> </div> </c:forEach> [View Less]

1 0

[translation/torbutton-torbuttondtd] Update translations for torbutton-torbuttondtd
by translation＠torproject.org 10 Jan '18

10 Jan '18

commit c2d9ad599f62078642bd61f80ceb33daa3389735 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 10 15:17:49 2018 +0000 Update translations for torbutton-torbuttondtd --- sq/torbutton.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq/torbutton.dtd b/sq/torbutton.dtd index 62ee3df6f..4f043464f 100644 --- a/sq/torbutton.dtd +++ b/sq/torbutton.dtd @@ -41,7 +41,7 @@ <!ENTITY torbutton.prefs.sec_safest_label "Safest"> <!… [View More]

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 10 Jan '18

10 Jan '18

commit 3f0c2825817e809c6dbbe89050fd419b5d6fd170 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 10 15:17:08 2018 +0000 Update translations for tails-misc --- sq.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sq.po b/sq.po index bd3f9d778..11975eb89 100644 --- a/sq.po +++ b/sq.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-… [View More]

1 0