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

[tor/release-0.2.2] Fix bug 4530; check return val of tor_addr_lookup correctly
by arma＠torproject.org 08 Dec '11

08 Dec '11

commit b7015603fa014c91056fa46cb012976a9e166cd3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 15:37:24 2011 -0500 Fix bug 4530; check return val of tor_addr_lookup correctly Fix on 0.2.1.5-alpha; reported by troll_un --- changes/bug4530 | 6 ++++++ src/common/address.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/changes/bug4530 b/changes/bug4530 new file mode 100644 index 0000000..7cd4726 --- /dev/null +++ b/changes/bug4530 @@ -0,0 +1,6 @@ + o Minor bugfixes: + + - Correctly detect and handle transient lookup failures from + tor_addr_lookup. Fixes bug 4530; bugfix on 0.2.1.5-alpha. + Reported by "troll_un". + diff --git a/src/common/address.c b/src/common/address.c index 46ccb1f..17bdea9 100644 --- a/src/common/address.c +++ b/src/common/address.c @@ -1034,7 +1034,7 @@ tor_addr_port_parse(const char *s, tor_addr_t *addr_out, uint16_t *port_out) ++port; } - if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) < 0) + if (tor_addr_lookup(tmp, AF_UNSPEC, &addr) != 0) goto err; tor_free(tmp);

1 0

[tor/release-0.2.2] tor_accept_socket() should take tor_addr_t for listener arg
by arma＠torproject.org 08 Dec '11

08 Dec '11

commit 2b5a0356047e7622c66e434cd8ac4a7689d4cc28 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 2 16:09:16 2011 -0500 tor_accept_socket() should take tor_addr_t for listener arg Fixes bug 4535; bugfix on 0.2.2.28-beta; found by "troll_un" --- changes/bug4535 | 3 +++ src/common/compat.c | 2 +- src/common/compat.h | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changes/bug4535 b/changes/bug4535 new file mode 100644 index 0000000..57ced29 --- /dev/null +++ b/changes/bug4535 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Use tor_socket_t type for listener argument to accept(). Fixes bug + 4535; bugfix on 0.2.2.28-beta. Found by "troll_un". diff --git a/src/common/compat.c b/src/common/compat.c index 266fc61..a4e5074 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -934,7 +934,7 @@ tor_open_socket(int domain, int type, int protocol) /** As socket(), but counts the number of open sockets. */ tor_socket_t -tor_accept_socket(int sockfd, struct sockaddr *addr, socklen_t *len) +tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len) { tor_socket_t s = accept(sockfd, addr, len); if (SOCKET_OK(s)) { diff --git a/src/common/compat.h b/src/common/compat.h index 011b9c8..3e1b5b8 100644 --- a/src/common/compat.h +++ b/src/common/compat.h @@ -404,7 +404,7 @@ typedef int socklen_t; int tor_close_socket(tor_socket_t s); tor_socket_t tor_open_socket(int domain, int type, int protocol); -tor_socket_t tor_accept_socket(int sockfd, struct sockaddr *addr, +tor_socket_t tor_accept_socket(tor_socket_t sockfd, struct sockaddr *addr, socklen_t *len); int get_n_open_sockets(void);

1 0

[tor/master] bump to 0.2.3.9-alpha-dev
by arma＠torproject.org 08 Dec '11

08 Dec '11

commit 7a76994d62a6ab1f1a3f9c7e96a097d0dbd4bc05 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Dec 8 16:25:36 2011 -0500 bump to 0.2.3.9-alpha-dev --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index 598998e..84eaca6 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.9-alpha) +AM_INIT_AUTOMAKE(tor, 0.2.3.9-alpha-dev) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index eacd3d3..4c3d9c5 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.9-alpha" +!define VERSION "0.2.3.9-alpha-dev" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index d616c16..e51b638 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -234,7 +234,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.9-alpha" +#define VERSION "0.2.3.9-alpha-dev"

1 0

r25247: {website} 0.2.3.9-alpha tarball is up (website/trunk/include)
by Roger Dingledine 08 Dec '11

08 Dec '11

Author: arma Date: 2011-12-08 21:15:23 +0000 (Thu, 08 Dec 2011) New Revision: 25247 Modified: website/trunk/include/versions.wmi Log: 0.2.3.9-alpha tarball is up Modified: website/trunk/include/versions.wmi =================================================================== --- website/trunk/include/versions.wmi 2011-12-08 03:49:37 UTC (rev 25246) +++ website/trunk/include/versions.wmi 2011-12-08 21:15:23 UTC (rev 25247) @@ -1,5 +1,5 @@ <define-tag version-stable whitespace=delete>0.2.2.34</define-tag> -<define-tag version-alpha whitespace=delete>0.2.3.8-alpha</define-tag> +<define-tag version-alpha whitespace=delete>0.2.3.9-alpha</define-tag> <define-tag version-win32-stable whitespace=delete>0.2.2.34</define-tag> <define-tag version-win32-alpha whitespace=delete>0.2.3.8-alpha</define-tag>

1 0

[tor-cloud/master] Fixed link to us-west-2 image, solves #4675
by runa＠torproject.org 08 Dec '11

08 Dec '11

commit ca909ab2604715b63cba174d3870beeaf5c4869e Author: Runa A. Sandvik <runa.sandvik(a)gmail.com> Date: Thu Dec 8 20:58:08 2011 +0000 Fixed link to us-west-2 image, solves #4675 --- html/index.html | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/html/index.html b/html/index.html index 5d7e2cb..3f53e08 100644 --- a/html/index.html +++ b/html/index.html @@ -138,7 +138,7 @@ <ul class="region-nav"> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-east-1#launchAmi=ami-8939…" target="_blank">us-east-1 Virginia</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-012e…" target="_blank">us-west-1 N. California</a></li> - <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-1#launchAmi=ami-94f1…" target="_blank">us-west-2 Oregon</a></li> + <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=us-west-2#launchAmi=ami-94f1…" target="_blank">us-west-2 Oregon</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=eu-west-1#launchAmi=ami-65b3…" target="_blank">eu-west-1 Ireland</a></li> <li><a class="region" href="https://console.aws.amazon.com/ec2/home?region=ap-northeast-1#launchAmi=ami…" target="_blank">ap-northeast-1 Tokyo</a></li>

1 0

[tor/master] give 0.2.3.9-alpha a blurb
by arma＠torproject.org 08 Dec '11

08 Dec '11

commit e44205ee6c3816b8b1f31e62809a8ca053afb033 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Dec 8 15:52:36 2011 -0500 give 0.2.3.9-alpha a blurb --- ChangeLog | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/ChangeLog b/ChangeLog index ca690ea..e0182af 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,11 @@ Changes in version 0.2.3.9-alpha - 2011-12-08 + Tor 0.2.3.9-alpha introduces initial IPv6 support for bridges, adds + a "DisableNetwork" security feature that bundles can use to avoid + touching the network until bridges are configured, moves forward on + the pluggable transport design, fixes a flaw in the hidden service + design that unnecessarily prevented clients with wrong clocks from + reaching hidden services, and fixes a wide variety of other issues. + o Major features: - Clients can now connect to private bridges over IPv6. Bridges still need at least one IPv4 address in order to connect to

1 0

[doctor/master] Fix two silly bugs.
by karsten＠torproject.org 08 Dec '11

08 Dec '11

commit 19352583b36036713f4951ab829b60d7733888f8 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 8 13:33:40 2011 +0100 Fix two silly bugs. --- src/org/torproject/doctor/Download.java | 1 + src/org/torproject/doctor/Downloader.java | 2 +- 2 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/doctor/Download.java b/src/org/torproject/doctor/Download.java index 1d53cd5..5c84277 100644 --- a/src/org/torproject/doctor/Download.java +++ b/src/org/torproject/doctor/Download.java @@ -37,6 +37,7 @@ public class Download { public Download(String authority, String url, String responseString, long requestStartMillis, long fetchTime) { this.authority = authority; + this.url = url; this.responseString = responseString; this.requestStartMillis = requestStartMillis; this.fetchTime = fetchTime; diff --git a/src/org/torproject/doctor/Downloader.java b/src/org/torproject/doctor/Downloader.java index db44b8b..a2e6db5 100755 --- a/src/org/torproject/doctor/Downloader.java +++ b/src/org/torproject/doctor/Downloader.java @@ -230,7 +230,7 @@ public class Downloader { String fullUrl = "http://" + authority + resource; Map<String, String> urls = new HashMap<String, String>(); urls.put(fullUrl, authority); - this.downloadedVotes = this.downloadFromAuthority(urls); + this.downloadedVotes.addAll(this.downloadFromAuthority(urls)); } } }

1 0

[doctor/master] Remember fetch times when requesting consensuses.
by karsten＠torproject.org 08 Dec '11

08 Dec '11

commit 98b595e62dc63053360dc2a99504b36779e1f253 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 8 11:32:32 2011 +0100 Remember fetch times when requesting consensuses. --- src/org/torproject/doctor/Download.java | 38 +++++++++++++++ src/org/torproject/doctor/Downloader.java | 73 +++++++++++++++-------------- src/org/torproject/doctor/Main.java | 4 +- src/org/torproject/doctor/Parser.java | 23 ++++++---- src/org/torproject/doctor/Status.java | 9 ++++ 5 files changed, 101 insertions(+), 46 deletions(-) diff --git a/src/org/torproject/doctor/Download.java b/src/org/torproject/doctor/Download.java new file mode 100644 index 0000000..35c24f9 --- /dev/null +++ b/src/org/torproject/doctor/Download.java @@ -0,0 +1,38 @@ +/* Copyright 2011 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.doctor; + +public class Download { + + /* Nickname of the authority from which this download was made. */ + private String authority; + public String getAuthority() { + return this.authority; + } + + /* Request URL. */ + private String url; + public String getUrl() { + return this.url; + } + + /* Unparsed response string. */ + private String responseString; + public String getResponseString() { + return this.responseString; + } + + /* Fetch time in millis. */ + private long fetchTime; + public long getFetchTime() { + return this.fetchTime; + } + + public Download(String authority, String url, String responseString, + long fetchTime) { + this.authority = authority; + this.responseString = responseString; + this.fetchTime = fetchTime; + } +} + diff --git a/src/org/torproject/doctor/Downloader.java b/src/org/torproject/doctor/Downloader.java index 3125062..c929a96 100755 --- a/src/org/torproject/doctor/Downloader.java +++ b/src/org/torproject/doctor/Downloader.java @@ -37,8 +37,8 @@ public class Downloader { } /* Download the most recent consensus from all authorities. */ - private SortedMap<String, String> downloadedConsensuses = - new TreeMap<String, String>(); + private List<Download> downloadedConsensuses = + new ArrayList<Download>(); private void downloadConsensus() { Map<String, String> urls = new HashMap<String, String>(); for (Map.Entry<String, String> e : this.authorities.entrySet()) { @@ -46,19 +46,10 @@ public class Downloader { String address = e.getValue(); String resource = "/tor/status-vote/current/consensus.z"; String fullUrl = "http://" + address + resource; - urls.put(nickname, fullUrl); - } - Map<String, String> responses = - this.downloadFromAuthority(new HashSet<String>(urls.values())); - for (Map.Entry<String, String> e : urls.entrySet()) { - String nickname = e.getKey(); - String url = e.getValue(); - if (responses.containsKey(url)) { - String response = responses.get(url); - this.downloadedConsensuses.put(nickname, response); - } + urls.put(fullUrl, nickname); } - if (responses.isEmpty()) { + this.downloadedConsensuses = this.downloadFromAuthority(urls); + if (this.downloadedConsensuses.isEmpty()) { System.err.println("Could not download consensus from any of the " + "directory authorities. Ignoring."); } @@ -68,14 +59,18 @@ public class Downloader { * interrupted after a timeout. */ private static class DownloadRunnable implements Runnable { Thread mainThread; + String nickname; String url; String response; boolean finished = false; - public DownloadRunnable(String url) { + long requestStart = 0L, requestEnd = 0L; + public DownloadRunnable(String nickname, String url) { this.mainThread = Thread.currentThread(); + this.nickname = nickname; this.url = url; } public void run() { + this.requestStart = System.currentTimeMillis(); try { URL u = new URL(this.url); HttpURLConnection huc = (HttpURLConnection) u.openConnection(); @@ -105,16 +100,28 @@ public class Downloader { /* Can't do much except leaving this.response at null. */ } this.finished = true; + this.requestEnd = System.currentTimeMillis(); + } + public Download getDownload() { + Download result = null; + if (this.response != null) { + result = new Download(this.nickname, this.url, this.response, + this.requestEnd - this.requestStart); + } + return result; } } /* Download one or more consensuses or votes from one or more directory * authorities using a timeout of 60 seconds. */ - private Map<String, String> downloadFromAuthority(Set<String> urls) { + private List<Download> downloadFromAuthority(Map<String, String> urls) { Set<DownloadRunnable> downloadRunnables = new HashSet<DownloadRunnable>(); - for (String url : urls) { - DownloadRunnable downloadRunnable = new DownloadRunnable(url); + for (Map.Entry<String, String> e : urls.entrySet()) { + String url = e.getKey(); + String nickname = e.getValue(); + DownloadRunnable downloadRunnable = new DownloadRunnable(nickname, + url); downloadRunnables.add(downloadRunnable); new Thread(downloadRunnable).start(); } @@ -137,12 +144,11 @@ public class Downloader { break; } } - Map<String, String> responses = new HashMap<String, String>(); + List<Download> responses = new ArrayList<Download>(); for (DownloadRunnable downloadRunnable : downloadRunnables) { - String url = downloadRunnable.url; - String response = downloadRunnable.response; - if (response != null) { - responses.put(url, response); + Download download = downloadRunnable.getDownload(); + if (download != null) { + responses.add(download); } downloadRunnable.finished = true; } @@ -160,8 +166,8 @@ public class Downloader { * authorities publishing the corresponding votes. */ private SortedSet<String> fingerprints = new TreeSet<String>(); private void parseConsensusToFindReferencedVotes() { - for (String downloadedConsensus : - this.downloadedConsensuses.values()) { + for (Download download : this.downloadedConsensuses) { + String downloadedConsensus = download.getResponseString(); try { BufferedReader br = new BufferedReader(new StringReader( downloadedConsensus)); @@ -208,7 +214,7 @@ public class Downloader { /* Download the votes published by directory authorities listed in the * consensus. */ - private List<String> downloadedVotes = new ArrayList<String>(); + private List<Download> downloadedVotes = new ArrayList<Download>(); private void downloadReferencedVotes() { for (String fingerprint : this.fingerprints) { String downloadedVote = null; @@ -222,26 +228,21 @@ public class Downloader { String resource = "/tor/status-vote/current/" + fingerprint + ".z"; String fullUrl = "http://" + authority + resource; - Set<String> urls = new HashSet<String>(); - urls.add(fullUrl); - Map<String, String> downloadedVotes = - this.downloadFromAuthority(urls); - if (downloadedVotes.containsKey(fullUrl)) { - downloadedVote = downloadedVotes.get(fullUrl); - this.downloadedVotes.add(downloadedVote); - } + Map<String, String> urls = new HashMap<String, String>(); + urls.put(fullUrl, authority); + this.downloadedVotes = this.downloadFromAuthority(urls); } } } /* Return the previously downloaded (unparsed) consensus string by * authority nickname. */ - public SortedMap<String, String> getConsensusStrings() { + public List<Download> getConsensuses() { return this.downloadedConsensuses; } /* Return the previously downloaded (unparsed) vote strings. */ - public List<String> getVoteStrings() { + public List<Download> getVotes() { return this.downloadedVotes; } } diff --git a/src/org/torproject/doctor/Main.java b/src/org/torproject/doctor/Main.java index 47f3f0b..ec160e9 100755 --- a/src/org/torproject/doctor/Main.java +++ b/src/org/torproject/doctor/Main.java @@ -19,11 +19,13 @@ public class Main { * authorities. */ Downloader downloader = new Downloader(); downloader.downloadFromAuthorities(); + List<Download> downloadedConsensuses = downloader.getConsensuses(); + List<Download> downloadedVotes = downloader.getVotes(); /* Parse consensus and votes. */ Parser parser = new Parser(); SortedMap<String, Status> parsedDownloadedConsensuses = parser.parse( - downloader.getConsensusStrings(), downloader.getVoteStrings()); + downloadedConsensuses, downloadedVotes); /* Check consensus and votes for possible problems. */ Checker checker = new Checker(); diff --git a/src/org/torproject/doctor/Parser.java b/src/org/torproject/doctor/Parser.java index 36abd78..9a91033 100755 --- a/src/org/torproject/doctor/Parser.java +++ b/src/org/torproject/doctor/Parser.java @@ -13,22 +13,26 @@ public class Parser { /* Parse and return a consensus and corresponding votes, or null if * something goes wrong. */ public SortedMap<String, Status> parse( - SortedMap<String, String> consensusStrings, - List<String> voteStrings) { + List<Download> downloadedConsensuses, + List<Download> downloadedVotes) { SortedSet<Status> parsedVotes = new TreeSet<Status>(); - for (String voteString : voteStrings) { - Status parsedVote = this.parseConsensusOrVote(voteString, false); + for (Download downloadedVote : downloadedVotes) { + String voteString = downloadedVote.getResponseString(); + long fetchTime = downloadedVote.getFetchTime(); + Status parsedVote = this.parseConsensusOrVote(voteString, fetchTime, + false); if (parsedVote != null) { parsedVotes.add(parsedVote); } } SortedMap<String, Status> parsedConsensuses = new TreeMap<String, Status>(); - for (Map.Entry<String, String> e : consensusStrings.entrySet()) { - String nickname = e.getKey(); - String consensusString = e.getValue(); + for (Download downloadedConsensus : downloadedConsensuses) { + String nickname = downloadedConsensus.getAuthority(); + String consensusString = downloadedConsensus.getResponseString(); + long fetchTime = downloadedConsensus.getFetchTime(); Status parsedConsensus = this.parseConsensusOrVote(consensusString, - true); + fetchTime, true); if (parsedConsensus != null) { for (Status parsedVote : parsedVotes) { if (parsedConsensus.getValidAfterMillis() == @@ -50,13 +54,14 @@ public class Parser { } /* Parse a consensus or vote string into a Status instance. */ - private Status parseConsensusOrVote(String statusString, + private Status parseConsensusOrVote(String statusString, long fetchTime, boolean isConsensus) { if (statusString == null) { return null; } Status status = new Status(); status.setUnparsedString(statusString); + status.setFetchTime(fetchTime); try { BufferedReader br = new BufferedReader(new StringReader( statusString)); diff --git a/src/org/torproject/doctor/Status.java b/src/org/torproject/doctor/Status.java index 40a7225..0573ae2 100755 --- a/src/org/torproject/doctor/Status.java +++ b/src/org/torproject/doctor/Status.java @@ -29,6 +29,15 @@ public class Status implements Comparable<Status> { return this.unparsedString; } + /* Fetch time in millis. */ + private long fetchTime; + public void setFetchTime(long fetchTime) { + this.fetchTime = fetchTime; + } + public long getFetchTime() { + return this.fetchTime; + } + /* Votes published at the same time as this consensus; votes don't * reference any statuses. */ private SortedSet<Status> votes = new TreeSet<Status>();

1 0

[doctor/master] Include download statistics in the website report.
by karsten＠torproject.org 08 Dec '11

08 Dec '11

commit 812c1ab54f4eb99b2518d505274c5d79a4165d84 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Dec 8 12:55:38 2011 +0100 Include download statistics in the website report. --- src/org/torproject/doctor/Download.java | 9 ++- src/org/torproject/doctor/DownloadStatistics.java | 91 ++++++++++++++++++++ src/org/torproject/doctor/Downloader.java | 2 +- src/org/torproject/doctor/Main.java | 7 ++ .../torproject/doctor/MetricsWebsiteReport.java | 62 +++++++++++++ src/org/torproject/doctor/Report.java | 4 + src/org/torproject/doctor/StatusFileReport.java | 5 + 7 files changed, 178 insertions(+), 2 deletions(-) diff --git a/src/org/torproject/doctor/Download.java b/src/org/torproject/doctor/Download.java index 35c24f9..1d53cd5 100644 --- a/src/org/torproject/doctor/Download.java +++ b/src/org/torproject/doctor/Download.java @@ -22,6 +22,12 @@ public class Download { return this.responseString; } + /* Request start timestamp. */ + private long requestStartMillis; + public long getRequestStartMillis() { + return this.requestStartMillis; + } + /* Fetch time in millis. */ private long fetchTime; public long getFetchTime() { @@ -29,9 +35,10 @@ public class Download { } public Download(String authority, String url, String responseString, - long fetchTime) { + long requestStartMillis, long fetchTime) { this.authority = authority; this.responseString = responseString; + this.requestStartMillis = requestStartMillis; this.fetchTime = fetchTime; } } diff --git a/src/org/torproject/doctor/DownloadStatistics.java b/src/org/torproject/doctor/DownloadStatistics.java new file mode 100644 index 0000000..9eeffde --- /dev/null +++ b/src/org/torproject/doctor/DownloadStatistics.java @@ -0,0 +1,91 @@ +/* Copyright 2011 The Tor Project + * See LICENSE for licensing information */ +package org.torproject.doctor; + +import java.io.*; +import java.util.*; + +public class DownloadStatistics { + public void memorizeFetchTimes(List<Download> downloadedConsensuses) { + try { + BufferedWriter bw = new BufferedWriter(new FileWriter( + this.statisticsFile, true)); + for (Download downloadedConsensus : downloadedConsensuses) { + String authority = downloadedConsensus.getAuthority(); + long requestStartMillis = + downloadedConsensus.getRequestStartMillis(); + long fetchTimeMillis = downloadedConsensus.getFetchTime(); + String line = authority + "," + + String.valueOf(requestStartMillis) + "," + + String.valueOf(fetchTimeMillis); + bw.write(line + "\n"); + } + bw.close(); + } catch (IOException e) { + System.err.println("Could not write " + + this.statisticsFile.getAbsolutePath() + ". Ignoring."); + } + } + private SortedMap<String, List<Long>> downloadData = + new TreeMap<String, List<Long>>(); + private int maxDownloadsPerAuthority = 0; + private File statisticsFile = new File("download-stats.csv"); + public void prepareStatistics() { + if (this.statisticsFile.exists()) { + long cutOffMillis = System.currentTimeMillis() + - (7L * 24L * 60L * 60L * 1000L); + try { + BufferedReader br = new BufferedReader(new FileReader( + this.statisticsFile)); + String line; + while ((line = br.readLine()) != null) { + String[] parts = line.split(","); + long requestStartMillis = Long.parseLong(parts[1]); + if (requestStartMillis < cutOffMillis) { + continue; + } + String authority = parts[0]; + if (!this.downloadData.containsKey(authority)) { + this.downloadData.put(authority, new ArrayList<Long>()); + } + long fetchTimeMillis = Long.parseLong(parts[2]); + this.downloadData.get(authority).add(fetchTimeMillis); + } + br.close(); + } catch (IOException e) { + System.err.println("Could not read " + + this.statisticsFile.getAbsolutePath() + ". Ignoring."); + } + for (Map.Entry<String, List<Long>> e : + this.downloadData.entrySet()) { + Collections.sort(e.getValue()); + int downloads = e.getValue().size(); + if (downloads > this.maxDownloadsPerAuthority) { + this.maxDownloadsPerAuthority = downloads; + } + } + } + } + public SortedSet<String> getKnownAuthorities() { + return new TreeSet<String>(this.downloadData.keySet()); + } + public String getPercentile(String authority, int percentile) { + if (percentile < 0 || percentile > 100 || + !this.downloadData.containsKey(authority)) { + return "NA"; + } else { + List<Long> fetchTimes = this.downloadData.get(authority); + int index = (percentile * (fetchTimes.size() - 1)) / 100; + return String.valueOf(fetchTimes.get(index)); + } + } + public String getNAs(String authority) { + if (!this.downloadData.containsKey(authority)) { + return "NA"; + } else { + return String.valueOf(this.maxDownloadsPerAuthority + - this.downloadData.get(authority).size()); + } + } +} + diff --git a/src/org/torproject/doctor/Downloader.java b/src/org/torproject/doctor/Downloader.java index c929a96..db44b8b 100755 --- a/src/org/torproject/doctor/Downloader.java +++ b/src/org/torproject/doctor/Downloader.java @@ -106,7 +106,7 @@ public class Downloader { Download result = null; if (this.response != null) { result = new Download(this.nickname, this.url, this.response, - this.requestEnd - this.requestStart); + this.requestStart, this.requestEnd - this.requestStart); } return result; } diff --git a/src/org/torproject/doctor/Main.java b/src/org/torproject/doctor/Main.java index ec160e9..0de6298 100755 --- a/src/org/torproject/doctor/Main.java +++ b/src/org/torproject/doctor/Main.java @@ -22,6 +22,12 @@ public class Main { List<Download> downloadedConsensuses = downloader.getConsensuses(); List<Download> downloadedVotes = downloader.getVotes(); + /* Write fetch times for requesting consensuses to disk and prepare + * statistics about fetch times in the last 7 days. */ + DownloadStatistics fetchStatistics = new DownloadStatistics(); + fetchStatistics.memorizeFetchTimes(downloadedConsensuses); + fetchStatistics.prepareStatistics(); + /* Parse consensus and votes. */ Parser parser = new Parser(); SortedMap<String, Status> parsedDownloadedConsensuses = parser.parse( @@ -37,6 +43,7 @@ public class Main { for (Report report : reports) { report.processWarnings(warnings); report.processDownloadedConsensuses(parsedDownloadedConsensuses); + report.includeFetchStatistics(fetchStatistics); report.writeReport(); } diff --git a/src/org/torproject/doctor/MetricsWebsiteReport.java b/src/org/torproject/doctor/MetricsWebsiteReport.java index b03f652..9ae897a 100755 --- a/src/org/torproject/doctor/MetricsWebsiteReport.java +++ b/src/org/torproject/doctor/MetricsWebsiteReport.java @@ -51,6 +51,14 @@ public class MetricsWebsiteReport implements Report { } } + /* Store the DownloadStatistics reference to request download statistics + * when writing the report. */ + private DownloadStatistics statistics; + public void includeFetchStatistics( + DownloadStatistics statistics) { + this.statistics = statistics; + } + /* Writer to write all HTML output to. */ private BufferedWriter bw; @@ -71,6 +79,7 @@ public class MetricsWebsiteReport implements Report { writeAuthorityKeys(); writeBandwidthScannerStatus(); writeAuthorityVersions(); + writeDownloadStatistics(); writeRelayFlagsTable(); writeRelayFlagsSummary(); writePageFooter(); @@ -569,6 +578,59 @@ public class MetricsWebsiteReport implements Report { } } + + /* Write some download statistics. */ + private void writeDownloadStatistics() throws IOException { + SortedSet<String> knownAuthorities = + this.statistics.getKnownAuthorities(); + if (knownAuthorities.isEmpty()) { + return; + } + this.bw.write(" \n" + + " <a name=\"downloadstats\">\n" + + " <h3><a href=\"#downloadstats\" class=\"anchor\">" + + "Consensus download statistics</a></h3>\n" + + " \n" + + " The following table contains statistics on " + + "consensus download times in milliseconds over the last 7 " + + "days:\n" + + " <table border=\"0\" cellpadding=\"4\" " + + "cellspacing=\"0\" summary=\"\">\n" + + " <colgroup>\n" + + " <col width=\"160\">\n" + + " <col width=\"100\">\n" + + " <col width=\"100\">\n" + + " <col width=\"100\">\n" + + " <col width=\"100\">\n" + + " <col width=\"100\">\n" + + " <col width=\"100\">\n" + + " </colgroup>\n" + + " <tr><td>Authority</td>" + + "<td>Minimum</td>" + + "<td>1st Quartile</td>" + + "<td>Median</td>" + + "<td>3rd Quartile</td>" + + "<td>Maximum</td>" + + "<td>Timeouts</td></tr>\n"); + for (String authority : knownAuthorities) { + this.bw.write(" <tr>\n" + + " <td>" + authority + "</td>\n" + + " <td>" + + this.statistics.getPercentile(authority, 0) + "</td>" + + " <td>" + + this.statistics.getPercentile(authority, 25) + "</td>" + + " <td>" + + this.statistics.getPercentile(authority, 50) + "</td>" + + " <td>" + + this.statistics.getPercentile(authority, 75) + "</td>" + + " <td>" + + this.statistics.getPercentile(authority, 100) + "</td>" + + " <td>" + + this.statistics.getNAs(authority) + "</td></tr>\n"); + } + this.bw.write(" </table>\n"); + } + /* Write the (huge) table containing relay flags contained in votes and * the consensus for each relay. */ private void writeRelayFlagsTable() throws IOException { diff --git a/src/org/torproject/doctor/Report.java b/src/org/torproject/doctor/Report.java index 04e2bc1..2e508bc 100755 --- a/src/org/torproject/doctor/Report.java +++ b/src/org/torproject/doctor/Report.java @@ -17,6 +17,10 @@ public interface Report { public abstract void processWarnings( SortedMap<Warning, String> warnings); + /* Include download statistics. */ + public abstract void includeFetchStatistics( + DownloadStatistics statistics); + /* Finish writing report. */ public abstract void writeReport(); } diff --git a/src/org/torproject/doctor/StatusFileReport.java b/src/org/torproject/doctor/StatusFileReport.java index 9583132..1fe3b87 100755 --- a/src/org/torproject/doctor/StatusFileReport.java +++ b/src/org/torproject/doctor/StatusFileReport.java @@ -33,6 +33,11 @@ public class StatusFileReport implements Report { this.warnings = warnings; } + /* Ignore download statistics for this report. */ + public void includeFetchStatistics(DownloadStatistics statistics) { + /* Do nothing. */ + } + /* Check consensuses and votes for irregularities and write output to * stdout. */ public void writeReport() {

1 0

[tor/master] bump to 0.2.3.9-alpha
by arma＠torproject.org 08 Dec '11

08 Dec '11

commit d65f6ceee16bd91c71e221f84dde420c80d1053e Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Dec 8 04:53:12 2011 -0500 bump to 0.2.3.9-alpha --- configure.in | 2 +- contrib/tor-mingw.nsi.in | 2 +- src/win32/orconfig.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.in b/configure.in index ef05d7b..598998e 100644 --- a/configure.in +++ b/configure.in @@ -4,7 +4,7 @@ dnl Copyright (c) 2007-2008, The Tor Project, Inc. dnl See LICENSE for licensing information AC_INIT -AM_INIT_AUTOMAKE(tor, 0.2.3.8-alpha-dev) +AM_INIT_AUTOMAKE(tor, 0.2.3.9-alpha) AM_CONFIG_HEADER(orconfig.h) AC_CANONICAL_HOST diff --git a/contrib/tor-mingw.nsi.in b/contrib/tor-mingw.nsi.in index 8ea9f32..eacd3d3 100644 --- a/contrib/tor-mingw.nsi.in +++ b/contrib/tor-mingw.nsi.in @@ -8,7 +8,7 @@ !include "LogicLib.nsh" !include "FileFunc.nsh" !insertmacro GetParameters -!define VERSION "0.2.3.8-alpha-dev" +!define VERSION "0.2.3.9-alpha" !define INSTALLER "tor-${VERSION}-win32.exe" !define WEBSITE "https://www.torproject.org/" !define LICENSE "LICENSE" diff --git a/src/win32/orconfig.h b/src/win32/orconfig.h index 34d7c75..d616c16 100644 --- a/src/win32/orconfig.h +++ b/src/win32/orconfig.h @@ -234,7 +234,7 @@ #define USING_TWOS_COMPLEMENT /* Version number of package */ -#define VERSION "0.2.3.8-alpha-dev" +#define VERSION "0.2.3.9-alpha"

1 0