- tor-commits - lists.torproject.org

[tor/maint-0.2.3] Fix memory leak in dirvote_create_microdescriptor
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit a9eed33111173d9f7c7fbff74ab1573c4c12e634 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 14 03:06:47 2012 -0400 Fix memory leak in dirvote_create_microdescriptor Found by George, who gets a cookie. --- src/or/dirvote.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index dc1ba7e..a7fea0a 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3515,7 +3515,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri) char *key = NULL, *summary = NULL, *family = NULL; size_t keylen; smartlist_t *chunks = smartlist_new(); - char *output; + char *output = NULL; if (crypto_pk_write_public_key_to_string(ri->onion_pkey, &key, &keylen)<0) goto done; @@ -3547,6 +3547,7 @@ dirvote_create_microdescriptor(const routerinfo_t *ri) } done: + tor_free(output); tor_free(key); tor_free(summary); tor_free(family);

1 0

[tor/maint-0.2.3] Update description of what we did to upper limit on md size
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit a4fbfa81b3fb732687efcefce851e2cd089ea6c1 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 14 03:10:14 2012 -0400 Update description of what we did to upper limit on md size Spotted by asn --- changes/bug6404 | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/changes/bug6404 b/changes/bug6404 index 7708148..948f00b 100644 --- a/changes/bug6404 +++ b/changes/bug6404 @@ -1,7 +1,7 @@ o Minor bugfixes: - - Increase the maximum length of microdescriptor we are willing to - generate from 1K to 2K. Occasionally this is needed for routers + - Remove the maximum length of microdescriptor we are willing to + generate. Occasionally this is needed for routers with complex policies or family declarations. Partial fix for bug 6404; fix on 0.2.2.6-alpha.

1 0

[tor/maint-0.2.3] Merge remote-tracking branch 'public/bug6404' into maint-0.2.3
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit 991a8acba2e2148a576465c3e07e9f6ce4864ea1 Merge: 88859b2 a4fbfa8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:35:40 2012 -0400 Merge remote-tracking branch 'public/bug6404' into maint-0.2.3 changes/bug6404 | 16 ++++++++++++++++ src/or/dirvote.c | 48 ++++++++++++++++++++++++++++++------------------ src/or/microdesc.c | 7 +------ src/or/routerparse.c | 5 +++++ 4 files changed, 52 insertions(+), 24 deletions(-)

1 0

[tor/master] Make authorities not set Running unless all advertised OR ports are reachable.
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit b1c4b3ad0e1212763dde1447a74c80aaa1557045 Author: Linus Nordberg <linus(a)torproject.org> Date: Fri Aug 17 12:53:25 2012 +0200 Make authorities not set Running unless all advertised OR ports are reachable. Resolves #6621. --- src/or/dirserv.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index d12ed8a..b43f63b 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -980,6 +980,7 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now) unreachable. */ int answer; + const or_options_t *options = get_options(); node_t *node = node_get_mutable_by_id(router->cache_info.identity_digest); tor_assert(node); @@ -992,13 +993,23 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now) /* A hibernating router is down unless we (somehow) had contact with it * since it declared itself to be hibernating. */ answer = 0; - } else if (get_options()->AssumeReachable) { + } else if (options->AssumeReachable) { /* If AssumeReachable, everybody is up unless they say they are down! */ answer = 1; } else { - /* Otherwise, a router counts as up if we found it reachable in the last - REACHABLE_TIMEOUT seconds. */ - answer = (now < node->last_reachable + REACHABLE_TIMEOUT); + /* Otherwise, a router counts as up if we found all announced OR + ports reachable in the last REACHABLE_TIMEOUT seconds. + + XXX prop186 For now there's always one IPv4 and at most one + IPv6 OR port. + + If we're not on IPv6, don't consider reachability of potential + IPv6 OR port since that'd kill all dual stack relays until a + majority of the dir auths have IPv6 connectivity. */ + answer = (now < node->last_reachable + REACHABLE_TIMEOUT && + (options->AuthDirHasIPv6Connectivity == 0 || + tor_addr_is_null(&router->ipv6_addr) || + now < node->last_reachable6 + REACHABLE_TIMEOUT)); } if (!answer && running_long_enough_to_decide_unreachable()) { @@ -1008,6 +1019,8 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now) REACHABILITY_TEST_CYCLE_PERIOD seconds, then the router has probably been down since at least that time after we last successfully reached it. + + XXX ipv6 */ time_t when = now; if (node->last_reachable &&

1 0

[tor/master] Merge remote-tracking branch 'linus/bug6621'
by nickm＠torproject.org 21 Aug '12

21 Aug '12

commit d517233e71139e60a1050ca86586f4cf3857b792 Merge: 661bd3f b1c4b3a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 21 10:21:53 2012 -0400 Merge remote-tracking branch 'linus/bug6621' src/or/dirserv.c | 21 +++++++++++++++++---- 1 files changed, 17 insertions(+), 4 deletions(-)

1 0

[metrics-db/master] Update .gitignore and build.xml to match what's on yatei.
by karsten＠torproject.org 21 Aug '12

21 Aug '12

commit 592fe79cc9c520daa0a9c8cbcf8239d6400d73b0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 15:31:19 2012 +0200 Update .gitignore and build.xml to match what's on yatei. --- .gitignore | 65 ++++++++++++++--------------------------------------------- build.xml | 4 +- 2 files changed, 18 insertions(+), 51 deletions(-) diff --git a/.gitignore b/.gitignore index 51ae9b7..68b9815 100644 --- a/.gitignore +++ b/.gitignore @@ -1,54 +1,21 @@ -# .jar files -lib/*.jar - -# Input directories for descriptors to parse -archives/ -bridges/ - -# compiled Java class files -classes/ - -# generated R input files -stats/ - -# generated graphs -website/graphs/bridge-users/*.png -website/graphs/descriptors/*.png -website/graphs/direct-users/*.png -website/graphs/exit/*.png -website/graphs/networksize/*.png -website/graphs/new-users/*.png -website/graphs/torperf/*.png - -# generated CSV files -website/csv/*.csv - -# papers and tech reports, not included in Git -website/papers/*.pdf - -# logfiles -log.* - -# Eclipse files .classpath .project - -# Auxiliary LaTeX files -doc/*.aux -doc/*.log - -# Generated websites -website/consensus-health*.html - -# Temporary directory for generating web archive -dist/ - -# Possibly modified config file +assignments +bridge-directories +cacheddesc/ +classes/ config - -# Torperf files -torperf/ - -# Files provided via rsync +data/ +directory-archive/ +doc/manual.aux +doc/manual.log +exitlist/ +lib/ +log.* rsync/ +sanitized-assignments/ +sanitized-bridges/ +stats/ +tarballs/ +torperf/ diff --git a/build.xml b/build.xml index 07d1488..ce3e337 100644 --- a/build.xml +++ b/build.xml @@ -7,7 +7,7 @@ <path id="classpath"> <pathelement path="${classes}"/> <pathelement location="lib/commons-codec-1.4.jar"/> - <pathelement location="lib/commons-compress-1.0.jar"/> + <pathelement location="lib/commons-compress-1.3.jar"/> <pathelement location="lib/junit-4.8.2.jar"/> <pathelement location="lib/descriptor.jar"/> </path> @@ -26,7 +26,7 @@ </target> <target name="run" depends="compile"> <java fork="true" - maxmemory="1024m" + maxmemory="2048m" classname="org.torproject.ernie.db.Main"> <classpath refid="classpath"/> </java>

1 0

[metrics-db/master] Remove html log file handler.
by karsten＠torproject.org 21 Aug '12

21 Aug '12

commit 0f6a01e9cea34170ab8bc997b665de2779845728 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 15:23:30 2012 +0200 Remove html log file handler. --- .../torproject/ernie/db/LoggingConfiguration.java | 159 -------------------- 1 files changed, 0 insertions(+), 159 deletions(-) diff --git a/src/org/torproject/ernie/db/LoggingConfiguration.java b/src/org/torproject/ernie/db/LoggingConfiguration.java index 644a462..b83ef53 100644 --- a/src/org/torproject/ernie/db/LoggingConfiguration.java +++ b/src/org/torproject/ernie/db/LoggingConfiguration.java @@ -89,164 +89,5 @@ public class LoggingConfiguration { logger.log(Level.WARNING, "Could not write to log file. Logging to " + "file is disabled.", e); } - - /* Create log handler that writes messages on INFO or higher to a - * local HTML file for display on the website. */ - Handler wh = new Handler() { - private StringBuilder infos = new StringBuilder(); - private StringBuilder warnings = new StringBuilder(); - public void close() { - if (this.infos == null || this.warnings == null) { - return; - } - try { - BufferedWriter bw = new BufferedWriter( - new FileWriter("website/log.html")); - bw.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0 " - + "Transitional//EN\">\n" - + "<html>\n" - + " <head>\n" - + " <title>Tor Metrics Portal: Last execution " - + "logs</title>\n" - + " <meta http-equiv=Content-Type content=\"text/html; " - + "charset=iso-8859-1\">\n" - + " <link href=\"/css/stylesheet-ltr.css\" type=text/css " - + "rel=stylesheet>\n" - + " <link href=\"/images/favicon.ico\"" - + " type=image/x-icon rel=\"shortcut icon\">\n" - + " </head>\n" - + " <body>\n" - + " <div class=\"center\">\n" - + " <table class=\"banner\" border=\"0\" " - + "cellpadding=\"0\" cellspacing=\"0\" summary=\"\">\n" - + " <tr>\n" - + " <td class=\"banner-left\"><a " - + "href=\"/index.html\"><img src=\"/images/top-left.png\" " - + "alt=\"Click to go to home page\" width=\"193\" " - + "height=\"79\"></a></td>\n" - + " <td class=\"banner-middle\">\n" - + " <a href=\"/\">Home</a>\n" - + " <a href=\"graphs.html\">Graphs</a>\n" - + " <a href=\"research.html\">Research</a>\n" - + " <a href=\"status.html\">Status</a>\n" - + " <br/>\n" - + " <font size=\"2\">\n" - + " <a href=\"exonerator.html\">ExoneraTor</a>\n" - + " <a href=\"relay-search.html\">Relay Search</a>\n" - + " <a href=\"consensus-health.html\">Consensus Health</a>\n" - + " <a class=\"current\">Last Log</a>\n" - + " </font>\n" - + " </td>\n" - + " <td class=\"banner-right\"></td>\n" - + " </tr>\n" - + " </table>\n" - + " <div class=\"main-column\">\n" - + " <h2>Tor Metrics Portal: Last execution " - + "logs</h2>\n" - + " <br/>\n" - + " <p>This page shows the warnings and info logs " - + "of the last program execution. All timestamps are in " - + "UTC.</p>\n" - + " <br/>\n" - + " <h3>Warnings</h3>\n" - + " <br/>\n" - + " <p><i>Warning messages indicate that a " - + "potential problem has occurred that requires the " - + "operator to look after the otherwise unattended " - + "setup.</i></p>\n" - + " <br/>\n" - + " <table border=\"0\" cellpadding=\"4\" " - + "cellspacing=\"0\" summary=\"\">\n" - + " <colgroup>\n" - + " <col width=\"160\">\n" - + " <col width=\"640\">\n" - + " </colgroup>\n"); - if (this.warnings.length() < 1) { - bw.write(" <tr><td>(No messages.)</td><td/></tr>\n"); - } else { - bw.write(warnings.toString()); - } - bw.write(" </table>\n" - + " <br/>\n" - + " <br/>\n" - + " <h3>Infos</h3>\n" - + " <br/>\n" - + " <p><i>Info messages are meant to help the " - + "operator in making sure that operation works as " - + "expected.</i></p>\n" - + " <br/>\n" - + " <table border=\"0\" cellpadding=\"4\" " - + "cellspacing=\"0\" summary=\"\">\n" - + " <colgroup>\n" - + " <col width=\"160\">\n" - + " <col width=\"640\">\n" - + " </colgroup>\n"); - if (this.infos.length() < 1) { - bw.write(" <tr><td>(No messages.)</td><td/></tr>\n"); - } else { - bw.write(this.infos.toString()); - } - bw.write(" </table>\n" - + " </div>\n" - + " </div>\n" - + " <div class=\"bottom\" id=\"bottom\">\n" - - - + " <p>This material is supported in part by the " - + "National Science Foundation under Grant No. " - + "CNS-0959138. Any opinions, finding, and conclusions " - + "or recommendations expressed in this material are " - + "those of the author(s) and do not necessarily reflect " - + "the views of the National Science Foundation.</p>\n" - + " <p>\"Tor\" and the \"Onion Logo\" are <a " - + "href=\"https://www.torproject.org/trademark-faq.html" - + ".en\">" - + "registered trademarks</a> of The Tor Project, " - + "Inc.</p>\n" - + " <p>Data on this site is freely available under a " - + "<a href=\"http://creativecommons.org/publicdomain/" - + "zero/1.0/\">CC0 no copyright declaration</a>: To the " - + "extent possible under law, the Tor Project has waived " - + "all copyright and related or neighboring rights in " - + "the data. Graphs are licensed under a <a " - + "href=\"http://creativecommons.org/licenses/by/3.0/" - + "us/\">Creative Commons Attribution 3.0 United States " - + "License</a>.</p>\n" - + " </div>\n" - + " </body>\n" - + "</html>"); - bw.close(); - this.infos = null; - this.warnings = null; - } catch (IOException e) { - } - } - public void flush() { - } - public void publish(LogRecord record) { - if (this.infos == null || this.warnings == null) { - return; - } - String logMessage = " <tr>\n" - + " <td>" - + dateTimeFormat.format(new Date(record.getMillis())) - + "</td>\n" - + " <td>" - + record.getMessage().replaceAll("\n", "<br/>") - + "</td>\n" - + " </tr>\n"; - if (record.getLevel().equals(Level.FINE) || - record.getLevel().equals(Level.FINER) || - record.getLevel().equals(Level.FINEST)) { - /* Ignore messages on FINE, FINER, and FINEST. */ - } else if (record.getLevel().equals(Level.INFO)) { - this.infos.append(logMessage); - } else { - this.warnings.append(logMessage); - } - } - }; - wh.setLevel(Level.INFO); - Logger.getLogger("").addHandler(wh); } }

1 0

[metrics-tasks/master] Ignore files generated by #6498 script.
by karsten＠torproject.org 21 Aug '12

21 Aug '12

commit 2176393977a1f5d8f9cebf2cb676c2198d4024fa Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 14:17:00 2012 +0200 Ignore files generated by #6498 script. --- task-6498/.gitignore | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/task-6498/.gitignore b/task-6498/.gitignore index 707150a..bce212d 100644 --- a/task-6498/.gitignore +++ b/task-6498/.gitignore @@ -3,7 +3,8 @@ lib/ bin/ in/ -results.csv +parsed-consensuses +task-6498-results.csv Rplots.pdf *.png

1 0

[metrics-web/master] And make it comile again.
by karsten＠torproject.org 21 Aug '12

21 Aug '12

commit c7fc544c91914700675f19ed8d070e131f6409f9 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 13:55:13 2012 +0200 And make it comile again. --- .../torproject/ernie/web/ResearchDataServlet.java | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/src/org/torproject/ernie/web/ResearchDataServlet.java b/src/org/torproject/ernie/web/ResearchDataServlet.java index 23688b2..8eaab66 100644 --- a/src/org/torproject/ernie/web/ResearchDataServlet.java +++ b/src/org/torproject/ernie/web/ResearchDataServlet.java @@ -39,6 +39,7 @@ public class ResearchDataServlet extends HttpServlet { /* Read local directory with files served by the local Apache HTTP * server and add the URLs to the list. */ + List<String> dataFileUrls = new ArrayList<String>(); String localDataDir = getServletConfig().getInitParameter( "localDataDir"); if (localDataDir != null) {

1 0

[metrics-web/master] Remove logic for listing tarballs from other servers on data.html.
by karsten＠torproject.org 21 Aug '12

21 Aug '12

commit da6857f3a7ca9282f395b6ca06295ac1c8237901 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Aug 21 13:52:06 2012 +0200 Remove logic for listing tarballs from other servers on data.html. We're not using this code since March 2011. --- etc/web.xml | 6 ----- .../torproject/ernie/web/ResearchDataServlet.java | 24 -------------------- 2 files changed, 0 insertions(+), 30 deletions(-) diff --git a/etc/web.xml b/etc/web.xml index 1425d2b..0931a71 100644 --- a/etc/web.xml +++ b/etc/web.xml @@ -72,12 +72,6 @@ org.torproject.ernie.web.ResearchDataServlet </servlet-class> <init-param> - <param-name>remoteDataFiles</param-name> - <param-value> - /srv/metrics.torproject.org/web/remote-files-for-data-page - </param-value> - </init-param> - <init-param> <param-name>localDataDir</param-name> <param-value> /srv/metrics.torproject.org/db/data/ diff --git a/src/org/torproject/ernie/web/ResearchDataServlet.java b/src/org/torproject/ernie/web/ResearchDataServlet.java index 8adb06c..23688b2 100644 --- a/src/org/torproject/ernie/web/ResearchDataServlet.java +++ b/src/org/torproject/ernie/web/ResearchDataServlet.java @@ -37,30 +37,6 @@ public class ResearchDataServlet extends HttpServlet { public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { - /* Read file with URLs of metrics data files on other servers. */ - List<String> dataFileUrls = new ArrayList<String>(); - String remoteDataFiles = getServletConfig().getInitParameter( - "remoteDataFiles"); - if (remoteDataFiles != null) { - try { - File remoteDataFilesFile = new File(remoteDataFiles); - if (remoteDataFilesFile.exists() && - !remoteDataFilesFile.isDirectory()) { - BufferedReader br = new BufferedReader(new FileReader( - remoteDataFilesFile)); - String line = null; - while ((line = br.readLine()) != null) { - if (!line.startsWith("#")) { - dataFileUrls.add(line); - } - } - br.close(); - } - } catch (SecurityException e) { - /* We're not permitted to read the file with URLs. Ignore. */ - } - } - /* Read local directory with files served by the local Apache HTTP * server and add the URLs to the list. */ String localDataDir = getServletConfig().getInitParameter(

1 0