- tor-commits - lists.torproject.org

[tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2
by arma＠torproject.org 25 Apr '11

25 Apr '11

commit a0514ba531e78bc464ab57e58a443e4d21783718 Merge: 3f7f96d e985835 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Apr 21 13:40:00 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2 changes/bug2933 | 4 ++++ src/or/eventdns.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

[tor/release-0.2.2] Merge branch 'maint-0.2.2' into release-0.2.2
by arma＠torproject.org 25 Apr '11

25 Apr '11

commit d6b5caa40413ad697b54e959873bd0947f71bd61 Merge: caa44c9 a0514ba Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 25 18:42:01 2011 -0400 Merge branch 'maint-0.2.2' into release-0.2.2 changes/bug2933 | 4 ++++ src/or/eventdns.c | 2 +- 2 files changed, 5 insertions(+), 1 deletions(-)

1 0

r24667: {website} but back the business phone number as it appears global voip (website/trunk/press/en)
by Andrew Lewman 25 Apr '11

25 Apr '11

Author: phobos Date: 2011-04-25 15:35:23 +0000 (Mon, 25 Apr 2011) New Revision: 24667 Modified: website/trunk/press/en/2008-12-19-roadmap-press-release.wml website/trunk/press/en/2009-03-12-performance-roadmap-press-release.wml website/trunk/press/en/2010-03-25-tor-store-press-release.wml website/trunk/press/en/2010-09-16-ten-things-circumvention-tools.wml website/trunk/press/en/info.wmi Log: but back the business phone number as it appears global voip isn't so global when you actually leave the US borders. Modified: website/trunk/press/en/2008-12-19-roadmap-press-release.wml =================================================================== --- website/trunk/press/en/2008-12-19-roadmap-press-release.wml 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/2008-12-19-roadmap-press-release.wml 2011-04-25 15:35:23 UTC (rev 24667) @@ -82,7 +82,7 @@ of The Tor Project, Inc.</p> <p>Contact: Andrew Lewman</p> - <p>Tel: +1-406-356-6475</p> + <p>Tel: +1-781-352-0568</p> <p>Email: execdir(a)torproject.org</p> <p><a href="https://www.torproject.org/">Website: Tor Project</a></p> </div> Modified: website/trunk/press/en/2009-03-12-performance-roadmap-press-release.wml =================================================================== --- website/trunk/press/en/2009-03-12-performance-roadmap-press-release.wml 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/2009-03-12-performance-roadmap-press-release.wml 2011-04-25 15:35:23 UTC (rev 24667) @@ -65,7 +65,7 @@ of The Tor Project, Inc.</p> <p>Contact: Andrew Lewman</p> - <p>Tel: +1-406-356-6475</p> + <p>Tel: +1-781-352-0568</p> <p>Email: execdir(a)torproject.org</p> <p><a href="https://www.torproject.org/">Website: Tor Project</a></p> </div> Modified: website/trunk/press/en/2010-03-25-tor-store-press-release.wml =================================================================== --- website/trunk/press/en/2010-03-25-tor-store-press-release.wml 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/2010-03-25-tor-store-press-release.wml 2011-04-25 15:35:23 UTC (rev 24667) @@ -82,7 +82,7 @@ of The Tor Project, Inc.</p> <p>Contact: Andrew Lewman</p> - <p>Tel: +1-406-356-6475</p> + <p>Tel: +1-781-352-0568</p> <p>Email: execdir(a)torproject.org</p> <p><a href="https://www.torproject.org/">Website: Tor Project</a></p> </div> Modified: website/trunk/press/en/2010-09-16-ten-things-circumvention-tools.wml =================================================================== --- website/trunk/press/en/2010-09-16-ten-things-circumvention-tools.wml 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/2010-09-16-ten-things-circumvention-tools.wml 2011-04-25 15:35:23 UTC (rev 24667) @@ -64,7 +64,7 @@ of The Tor Project, Inc.</p> <p>Contact: Andrew Lewman</p> -<p>Tel: +1-406-356-6475</p> +<p>Tel: +1-781-352-0568</p> <p>Email: execdir(a)torproject.org</p> <p><a href="https://www.torproject.org/">Website: Tor Project</a></p> <div align=center>###</div> Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/press/en/info.wmi 2011-04-23 13:38:55 UTC (rev 24666) +++ website/trunk/press/en/info.wmi 2011-04-25 15:35:23 UTC (rev 24667) @@ -9,7 +9,7 @@ <b>Andrew Lewman</b><br> Executive Director<br> execdir(a)torproject.org<br> - +1-406-356-6475<br> + +1-781-352-0568<br> </p> </div>

1 0

[arm/master] fix: Workaround for autogenerated Nickname config
by atagar＠torproject.org 24 Apr '11

24 Apr '11

commit 9b653e81ba24b154510e8fc39222de5c96478bc2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Apr 24 12:21:34 2011 -0700 fix: Workaround for autogenerated Nickname config As discussed in ticket 2362 (https://trac.torproject.org/projects/tor/ticket/2362) the "GETINFO config-text" results provide an autogenerated Nickname field if running as a relay and one wasn't provided. --- src/util/torConfig.py | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/util/torConfig.py b/src/util/torConfig.py index 2e70f5a..030a169 100644 --- a/src/util/torConfig.py +++ b/src/util/torConfig.py @@ -3,6 +3,7 @@ Helper functions for working with tor's configuration file. """ import os +import socket import threading from util import enum, log, sysTools, torTools, uiTools @@ -367,13 +368,16 @@ def getCustomOptions(includeValue = False): configLines = list(set(configLines)) # The "GETINFO config-text" query only provides options that differ - # from Tor's defaults with the exception of its Log entry which, even - # if undefined, returns "Log notice stdout" as per: + # from Tor's defaults with the exception of its Log and Nickname entries + # which, even if undefined, returns "Log notice stdout" as per: # https://trac.torproject.org/projects/tor/ticket/2362 try: configLines.remove("Log notice stdout") except ValueError: pass + try: configLines.remove("Nickname %s" % socket.gethostname()) + except ValueError: pass + if includeValue: return configLines else: return [line[:line.find(" ")] for line in configLines]

1 0

[metrics-web/master] Show default start and end dates for graphs.
by karsten＠torproject.org 24 Apr '11

24 Apr '11

commit adc0de62d3d406eb46968f40fc9647818866be5e Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 24 16:05:05 2011 +0200 Show default start and end dates for graphs. --- .../ernie/web/GraphsSubpagesServlet.java | 12 ++++++++ web/WEB-INF/network.jsp | 28 ++++++++++---------- web/WEB-INF/packages.jsp | 4 +- web/WEB-INF/performance.jsp | 12 ++++---- web/WEB-INF/users.jsp | 9 +++--- 5 files changed, 39 insertions(+), 26 deletions(-) diff --git a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java index 2de2eac..f8dfba4 100644 --- a/src/org/torproject/ernie/web/GraphsSubpagesServlet.java +++ b/src/org/torproject/ernie/web/GraphsSubpagesServlet.java @@ -3,6 +3,7 @@ package org.torproject.ernie.web; import javax.servlet.*; import javax.servlet.http.*; import java.io.*; +import java.text.*; import java.util.*; public class GraphsSubpagesServlet extends HttpServlet { @@ -77,6 +78,17 @@ public class GraphsSubpagesServlet extends HttpServlet { /* Pass list of known countries in case we want to display them. */ request.setAttribute("countries", this.knownCountries); + /* Pass the default start and end dates. */ + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); + dateFormat.setTimeZone(TimeZone.getTimeZone("UTC")); + Date defaultEndDate = new Date(); + Date defaultStartDate = new Date(defaultEndDate.getTime() + - 90L * 24L * 60L * 60L * 1000L); + request.setAttribute("default_start_date", + dateFormat.format(defaultStartDate)); + request.setAttribute("default_end_date", + dateFormat.format(defaultEndDate)); + /* Forward the request to the JSP that does all the hard work. */ request.getRequestDispatcher(jsp).forward(request, response); } diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index 28a7c34..a1a5efe 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -27,10 +27,10 @@ bridges in the network.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${networksize_start[0]}"> + value="<c:choose><c:when test="${fn:length(networksize_start) == 0}">${default_start_date}</c:when><c:otherwise>${networksize_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${networksize_end[0]}"> + value="<c:choose><c:when test="${fn:length(networksize_end) == 0}">${default_end_date}</c:when><c:otherwise>${networksize_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${networksize_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> @@ -58,10 +58,10 @@ country.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${relaycountries_start[0]}"> + value="<c:choose><c:when test="${fn:length(relaycountries_start) == 0}">${default_start_date}</c:when><c:otherwise>${relaycountries_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${relaycountries_end[0]}"> + value="<c:choose><c:when test="${fn:length(relaycountries_end) == 0}">${default_end_date}</c:when><c:otherwise>${relaycountries_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <select name="country"> <option value="all"<c:if test="${relaycountries_country[0] eq 'all'}"> selected</c:if>>All relays</option> @@ -97,10 +97,10 @@ average number of relays with these flags assigned.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${relayflags_start[0]}"> + value="<c:choose><c:when test="${fn:length(relayflags_start) == 0}">${default_start_date}</c:when><c:otherwise>${relayflags_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${relayflags_end[0]}"> + value="<c:choose><c:when test="${fn:length(relayflags_end) == 0}">${default_end_date}</c:when><c:otherwise>${relayflags_end[0]}</c:otherwise></c:choose>"> </p><p> <label>Relay flags: </label> <input type="checkbox" name="flag" value="Running"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Running')}"> checked</c:if>> Running @@ -140,10 +140,10 @@ version.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${versions_start[0]}"> + value="<c:choose><c:when test="${fn:length(versions_start) == 0}">${default_start_date}</c:when><c:otherwise>${versions_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${versions_end[0]}"> + value="<c:choose><c:when test="${fn:length(versions_end) == 0}">${default_end_date}</c:when><c:otherwise>${versions_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${versions_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> @@ -174,10 +174,10 @@ platform.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${platforms_start[0]}"> + value="<c:choose><c:when test="${fn:length(platforms_start) == 0}">${default_start_date}</c:when><c:otherwise>${platforms_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${platforms_end[0]}"> + value="<c:choose><c:when test="${fn:length(platforms_end) == 0}">${default_end_date}</c:when><c:otherwise>${platforms_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${platforms_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> @@ -209,10 +209,10 @@ in the network.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${bandwidth_start[0]}"> + value="<c:choose><c:when test="${fn:length(bandwidth_start) == 0}">${default_start_date}</c:when><c:otherwise>${bandwidth_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${bandwidth_end[0]}"> + value="<c:choose><c:when test="${fn:length(bandwidth_end) == 0}">${default_end_date}</c:when><c:otherwise>${bandwidth_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${bandwidth_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> @@ -243,10 +243,10 @@ the number of written and read dir bytes by all relays.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${dirbytes_start[0]}"> + value="<c:choose><c:when test="${fn:length(dirbytes_start) == 0}">${default_start_date}</c:when><c:otherwise>${dirbytes_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${dirbytes_end[0]}"> + value="<c:choose><c:when test="${fn:length(dirbytes_end) == 0}">${default_end_date}</c:when><c:otherwise>${dirbytes_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${dirbytes_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> diff --git a/web/WEB-INF/packages.jsp b/web/WEB-INF/packages.jsp index b4ecb5f..9a19aca 100644 --- a/web/WEB-INF/packages.jsp +++ b/web/WEB-INF/packages.jsp @@ -28,10 +28,10 @@ graph shows the number of packages requested from GetTor per day.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${gettor_start[0]}"> + value="<c:choose><c:when test="${fn:length(gettor_start) == 0}">${default_start_date}</c:when><c:otherwise>${gettor_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${gettor_end[0]}"> + value="<c:choose><c:when test="${fn:length(gettor_end) == 0}">${default_end_date}</c:when><c:otherwise>${gettor_end[0]}</c:otherwise></c:choose>"> </p><p> Packages: <input type="radio" name="bundle" value="all" <c:if test="${fn:length(gettor_bundle) == 0 or gettor_bundle[0] eq 'all'}"> checked</c:if>> Total packages diff --git a/web/WEB-INF/performance.jsp b/web/WEB-INF/performance.jsp index 939beec..095bda2 100644 --- a/web/WEB-INF/performance.jsp +++ b/web/WEB-INF/performance.jsp @@ -29,10 +29,10 @@ quartile of request times.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${torperf_start[0]}"> + value="<c:choose><c:when test="${fn:length(torperf_start) == 0}">${default_start_date}</c:when><c:otherwise>${torperf_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${torperf_end[0]}"> + value="<c:choose><c:when test="${fn:length(torperf_end) == 0}">${default_end_date}</c:when><c:otherwise>${torperf_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <input type="radio" name="source" value="all"<c:if test="${fn:length(torperf_source) == 0 or torperf_source[0] eq 'all'}"> checked</c:if>> all @@ -75,10 +75,10 @@ than 50 KiB (1 MiB, 5 MiB).</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${torperf_failures_start[0]}"> + value="<c:choose><c:when test="${fn:length(torperf_failures_start) == 0}">${default_start_date}</c:when><c:otherwise>${torperf_failures_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${torperf_failures_end[0]}"> + value="<c:choose><c:when test="${fn:length(torperf_failures_end) == 0}">${default_end_date}</c:when><c:otherwise>${torperf_failures_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <input type="radio" name="source" value="all"<c:if test="${fn:length(torperf_failures_source) == 0 or torperf_failures_source[0] eq 'all'}"> checked</c:if>> all @@ -126,10 +126,10 @@ classifying connections, read and write counters are reset for the next <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${connbidirect_start[0]}"> + value="<c:choose><c:when test="${fn:length(connbidirect_start) == 0}">${default_start_date}</c:when><c:otherwise>${connbidirect_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${connbidirect_end[0]}"> + value="<c:choose><c:when test="${fn:length(connbidirect_end) == 0}">${default_end_date}</c:when><c:otherwise>${connbidirect_end[0]}</c:otherwise></c:choose>"> </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${connbidirect_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> diff --git a/web/WEB-INF/users.jsp b/web/WEB-INF/users.jsp index 7ea45a5..60be8ab 100644 --- a/web/WEB-INF/users.jsp +++ b/web/WEB-INF/users.jsp @@ -1,4 +1,5 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> @@ -30,10 +31,10 @@ based on the requests seen by a few dozen directory mirrors.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${direct_users_start[0]}"> + value="<c:choose><c:when test="${fn:length(direct_users_start) == 0}">${default_start_date}</c:when><c:otherwise>${direct_users_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${direct_users_end[0]}"> + value="<c:choose><c:when test="${fn:length(direct_users_end) == 0}">${default_end_date}</c:when><c:otherwise>${direct_users_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <select name="country"> <option value="all"<c:if test="${direct_users_country[0] eq 'all'}"> selected</c:if>>All users</option> @@ -74,10 +75,10 @@ by a few hundred bridges.</p> <p> <label>Start date (yyyy-mm-dd):</label> <input type="text" name="start" size="10" - value="${bridge_users_start[0]}"> + value="<c:choose><c:when test="${fn:length(bridge_users_start) == 0}">${default_start_date}</c:when><c:otherwise>${bridge_users_start[0]}</c:otherwise></c:choose>"> <label>End date (yyyy-mm-dd):</label> <input type="text" name="end" size="10" - value="${bridge_users_end[0]}"> + value="<c:choose><c:when test="${fn:length(bridge_users_end) == 0}">${default_end_date}</c:when><c:otherwise>${bridge_users_end[0]}</c:otherwise></c:choose>"> </p><p> Source: <select name="country"> <option value="all"<c:if test="${bridge_users_country[0] eq 'all'}"> selected</c:if>>All users</option>

1 0

[metrics-web/master] Remember checked statuses of check boxes and radio buttons.
by karsten＠torproject.org 24 Apr '11

24 Apr '11

commit f88f0fe407f983f340e1e8a0fe46613ad8997a85 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 24 15:14:28 2011 +0200 Remember checked statuses of check boxes and radio buttons. --- web/WEB-INF/network.jsp | 15 ++++++++------- web/WEB-INF/packages.jsp | 9 +++++---- web/WEB-INF/performance.jsp | 29 +++++++++++++++-------------- 3 files changed, 28 insertions(+), 25 deletions(-) diff --git a/web/WEB-INF/network.jsp b/web/WEB-INF/network.jsp index bba1d4b..28a7c34 100644 --- a/web/WEB-INF/network.jsp +++ b/web/WEB-INF/network.jsp @@ -1,4 +1,5 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> @@ -102,15 +103,15 @@ average number of relays with these flags assigned.</p> value="${relayflags_end[0]}"> </p><p> <label>Relay flags: </label> - <input type="checkbox" name="flag" value="Running"> Running - <input type="checkbox" name="flag" value="Exit"> Exit - <input type="checkbox" name="flag" value="Fast"> Fast - <input type="checkbox" name="flag" value="Guard"> Guard - <input type="checkbox" name="flag" value="Stable"> Stable + <input type="checkbox" name="flag" value="Running"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Running')}"> checked</c:if>> Running + <input type="checkbox" name="flag" value="Exit"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Exit')}"> checked</c:if>> Exit + <input type="checkbox" name="flag" value="Fast"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Fast')}"> checked</c:if>> Fast + <input type="checkbox" name="flag" value="Guard"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Guard')}"> checked</c:if>> Guard + <input type="checkbox" name="flag" value="Stable"<c:if test="${fn:length(relayflags_flag) == 0 or fn:contains(fn:join(relayflags_flag, ','), 'Stable')}"> checked</c:if>> Stable </p><p> Granularity: - <input type="radio" name="granularity" value="day"> 1 day - <input type="radio" name="granularity" value="hour"> 1 hour + <input type="radio" name="granularity" value="day" <c:if test="${fn:length(relayflags_granularity) == 0 or relayflags_granularity[0] eq 'day'}"> checked</c:if>> 1 day + <input type="radio" name="granularity" value="hour" <c:if test="${relayflags_granularity[0] eq 'hour'}"> checked</c:if>> 1 hour </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${relayflags_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> diff --git a/web/WEB-INF/packages.jsp b/web/WEB-INF/packages.jsp index bd8f756..b4ecb5f 100644 --- a/web/WEB-INF/packages.jsp +++ b/web/WEB-INF/packages.jsp @@ -1,4 +1,5 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> @@ -33,10 +34,10 @@ graph shows the number of packages requested from GetTor per day.</p> value="${gettor_end[0]}"> </p><p> Packages: - <input type="radio" name="bundle" value="all"> Total packages - <input type="radio" name="bundle" value="en"> TBB (en) - <input type="radio" name="bundle" value="zh_CN"> TBB (zh_CN) - <input type="radio" name="bundle" value="fa"> TBB (fa) + <input type="radio" name="bundle" value="all" <c:if test="${fn:length(gettor_bundle) == 0 or gettor_bundle[0] eq 'all'}"> checked</c:if>> Total packages + <input type="radio" name="bundle" value="en" <c:if test="${gettor_bundle[0] eq 'en'}"> checked</c:if>> TBB (en) + <input type="radio" name="bundle" value="zh_CN" <c:if test="${gettor_bundle[0] eq 'zh_CN'}"> checked</c:if>> TBB (zh_CN) + <input type="radio" name="bundle" value="fa" <c:if test="${gettor_bundle[0] eq 'fa'}"> checked</c:if>> TBB (fa) </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${gettor_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> diff --git a/web/WEB-INF/performance.jsp b/web/WEB-INF/performance.jsp index 6793a08..939beec 100644 --- a/web/WEB-INF/performance.jsp +++ b/web/WEB-INF/performance.jsp @@ -1,4 +1,5 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> @@ -34,15 +35,15 @@ quartile of request times.</p> value="${torperf_end[0]}"> </p><p> Source: - <input type="radio" name="source" value="all"> all - <input type="radio" name="source" value="torperf"> torperf - <input type="radio" name="source" value="moria"> moria - <input type="radio" name="source" value="siv"> siv + <input type="radio" name="source" value="all"<c:if test="${fn:length(torperf_source) == 0 or torperf_source[0] eq 'all'}"> checked</c:if>> all + <input type="radio" name="source" value="torperf"<c:if test="${torperf_source[0] eq 'torperf'}"> checked</c:if>> torperf + <input type="radio" name="source" value="moria"<c:if test="${torperf_source[0] eq 'moria'}"> checked</c:if>> moria + <input type="radio" name="source" value="siv"<c:if test="${torperf_source[0] eq 'siv'}"> checked</c:if>> siv </p><p> <label>File size: </label> - <input type="radio" name="filesize" value="50kb"> 50 KiB - <input type="radio" name="filesize" value="1mb"> 1 MiB - <input type="radio" name="filesize" value="5mb"> 5 MiB + <input type="radio" name="filesize" value="50kb"<c:if test="${fn:length(torperf_filesize) == 0 or torperf_filesize[0] eq '50kb'}"> checked</c:if>> 50 KiB + <input type="radio" name="filesize" value="1mb"<c:if test="${torperf_filesize[0] eq '1mb'}"> checked</c:if>> 1 MiB + <input type="radio" name="filesize" value="5mb"<c:if test="${torperf_filesize[0] eq '5mb'}"> checked</c:if>> 5 MiB </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${torperf_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option> @@ -80,15 +81,15 @@ than 50 KiB (1 MiB, 5 MiB).</p> value="${torperf_failures_end[0]}"> </p><p> Source: - <input type="radio" name="source" value="all"> all - <input type="radio" name="source" value="torperf"> torperf - <input type="radio" name="source" value="moria"> moria - <input type="radio" name="source" value="siv"> siv + <input type="radio" name="source" value="all"<c:if test="${fn:length(torperf_failures_source) == 0 or torperf_failures_source[0] eq 'all'}"> checked</c:if>> all + <input type="radio" name="source" value="torperf"<c:if test="${torperf_failures_source[0] eq 'torperf'}"> checked</c:if>> torperf + <input type="radio" name="source" value="moria"<c:if test="${torperf_failures_source[0] eq 'moria'}"> checked</c:if>> moria + <input type="radio" name="source" value="siv"<c:if test="${torperf_failures_source[0] eq 'siv'}"> checked</c:if>> siv </p><p> <label>File size: </label> - <input type="radio" name="filesize" value="50kb"> 50 KiB - <input type="radio" name="filesize" value="1mb"> 1 MiB - <input type="radio" name="filesize" value="5mb"> 5 MiB + <input type="radio" name="filesize" value="50kb"<c:if test="${fn:length(torperf_failures_filesize) == 0 or torperf_failures_filesize[0] eq '50kb'}"> checked</c:if>> 50 KiB + <input type="radio" name="filesize" value="1mb"<c:if test="${torperf_failures_filesize[0] eq '1mb'}"> checked</c:if>> 1 MiB + <input type="radio" name="filesize" value="5mb"<c:if test="${torperf_failures_filesize[0] eq '5mb'}"> checked</c:if>> 5 MiB </p><p> Resolution: <select name="dpi"> <option value="72"<c:if test="${torperf_failures_dpi[0] eq '72'}"> selected</c:if>>Screen - 576x360</option>

1 0

[arm/master] fix: Capitalizing unused cfg option log message
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 9ba121e859d8c551be08e340728004fa48ec1c4d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Apr 22 19:05:40 2011 -0700 fix: Capitalizing unused cfg option log message --- src/interface/controller.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/interface/controller.py b/src/interface/controller.py index 558c107..b88152f 100644 --- a/src/interface/controller.py +++ b/src/interface/controller.py @@ -649,7 +649,7 @@ def drawTorMonitor(stdscr, startTime, loggedEvents, isBlindMode): # provides notice about any unused config keys for key in config.getUnusedKeys(): - log.log(CONFIG["log.configEntryUndefined"], "unused configuration entry: %s" % key) + log.log(CONFIG["log.configEntryUndefined"], "Unused configuration entry: %s" % key) lastPerformanceLog = 0 # ensures we don't do performance logging too frequently redrawStartTime = time.time()

1 0

[arm/master] Triggering deb-build logic when in "release_deb"
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8b8568eda8145f6c2ab4295a7924a63a7617ff39 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:38:03 2011 -0700 Triggering deb-build logic when in "release_deb" The deb-prep.sh script makes a release_deb directory in which the build takes place. Triggering off of tor-arm is insufficient to catch all of the calls to setup.py while making a deb, causing it to error from TorCtl being missing. --- setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/setup.py b/setup.py index 39497aa..9777da1 100644 --- a/setup.py +++ b/setup.py @@ -11,7 +11,7 @@ from distutils.core import setup isDebInstall = False for arg in sys.argv: - if "tor-arm" in arg: + if "tor-arm" in arg or "release_deb" in arg: isDebInstall = True break

1 0

[arm/master] Initializing bandwidth totals from Tor when able
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 301085e92801173d884e8a1282539282331244d8 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Apr 23 20:24:55 2011 -0700 Initializing bandwidth totals from Tor when able Ticket 2345 (https://trac.torproject.org/projects/tor/ticket/2345) introduced GETINFO options for the total read and written bandwidth values. If these are available then they're used to populate the total values in arm. --- src/interface/graphing/bandwidthStats.py | 19 +++++++++++++++++++ src/settings.cfg | 4 ++++ 2 files changed, 23 insertions(+), 0 deletions(-) diff --git a/src/interface/graphing/bandwidthStats.py b/src/interface/graphing/bandwidthStats.py index 1955465..3f34e3c 100644 --- a/src/interface/graphing/bandwidthStats.py +++ b/src/interface/graphing/bandwidthStats.py @@ -55,6 +55,25 @@ class BandwidthStats(graphPanel.GraphStats): self._titleStats, self.isAccounting = [], False self.resetListener(conn, torTools.State.INIT) # initializes values conn.addStatusListener(self.resetListener) + + # Initialized the bandwidth totals to the values reported by Tor. This + # uses a controller options introduced in ticket 2345: + # https://trac.torproject.org/projects/tor/ticket/2345 + # + # further updates are still handled via BW events to avoid unnecessary + # GETINFO requests. This needs to update the pause buffer too because + # instances start paused, causing the primary value to be clobbered once + # just after initalization. + + readTotal = conn.getInfo("traffic/read") + if readTotal and readTotal.isdigit(): + self.primaryTotal = int(readTotal) / 1024 # Bytes -> KB + self._pauseBuffer.primaryTotal = int(readTotal) / 1024 + + writeTotal = conn.getInfo("traffic/written") + if writeTotal and writeTotal.isdigit(): + self.secondaryTotal = int(writeTotal) / 1024 # Bytes -> KB + self._pauseBuffer.secondaryTotal = int(writeTotal) / 1024 def resetListener(self, conn, eventType): # updates title parameters and accounting status if they changed diff --git a/src/settings.cfg b/src/settings.cfg index 0e0e395..1ee63a1 100644 --- a/src/settings.cfg +++ b/src/settings.cfg @@ -273,6 +273,8 @@ config.summary.TestingEstimatedDescriptorPropagationTime delay before clients at # [ARM_DEBUG] recreating panel 'graph' with the dimensions of 14/124 # [ARM_DEBUG] redrawing the log panel with the corrected content height (estimat was off by 4) # [ARM_DEBUG] GETINFO accounting/bytes-left (runtime: 0.0006) +# [ARM_DEBUG] GETINFO traffic/read (runtime: 0.0004) +# [ARM_DEBUG] GETINFO traffic/written (runtime: 0.0002) # [ARM_DEBUG] GETCONF MyFamily (runtime: 0.0007) # [ARM_DEBUG] Unable to query process resource usage from ps, waiting 6.25 seconds (unrecognized output from ps: ...) @@ -311,6 +313,8 @@ msg.ARM_DEBUG GETINFO accounting/bytes msg.ARM_DEBUG GETINFO accounting/bytes-left msg.ARM_DEBUG GETINFO accounting/interval-end msg.ARM_DEBUG GETINFO accounting/hibernating +msg.ARM_DEBUG GETINFO traffic/read +msg.ARM_DEBUG GETINFO traffic/written msg.ARM_DEBUG GETCONF msg.ARM_DEBUG Unable to query process resource usage from ps

1 0

[arm/master] Merge release commit '8b8568e'
by sebastian＠torproject.org 24 Apr '11

24 Apr '11

commit 8b4d9f13e50f6a420b1000c70de25bf244db393a Merge: 6534807 8b8568e Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Apr 21 09:42:15 2011 -0700 Merge release commit '8b8568e' Conflicts: src/version.py setup.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)

1 0