- tor-commits - lists.torproject.org

[metrics-db/master] Download votes when v3-status-votes file is truncated.
by karsten＠torproject.org 15 Jun '11

15 Jun '11

commit ff73f5b6820e6ec6f5156bc265a7c6d413c01719 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 14 21:47:36 2011 +0200 Download votes when v3-status-votes file is truncated. In the past, we sometimes had problems rsync'ing the v3-status-votes file from gabelmoo and were left with a truncated file. When parsing this file we successfully parsed the complete votes and failed parsing the last, truncated vote. But we however marked this vote as downloaded and made no further attempts to download it from the directory authorities. The fix is to only mark a vote as downloaded if it contains a valid directory footer. --- .../torproject/ernie/db/RelayDescriptorParser.java | 20 ++++++++++++-------- 1 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/org/torproject/ernie/db/RelayDescriptorParser.java b/src/org/torproject/ernie/db/RelayDescriptorParser.java index 089b743..3fdd3d8 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorParser.java +++ b/src/org/torproject/ernie/db/RelayDescriptorParser.java @@ -140,11 +140,7 @@ public class RelayDescriptorParser { this.aw.storeConsensus(data, validAfter); } } else { - if (this.rdd != null) { - this.rdd.haveParsedVote(validAfterTime, fingerprint, - serverDescriptors); - } - if (this.aw != null) { + if (this.aw != null || this.rdd != null) { String ascii = new String(data, "US-ASCII"); String startToken = "network-status-version "; String sigToken = "directory-signature "; @@ -155,11 +151,19 @@ public class RelayDescriptorParser { byte[] forDigest = new byte[sig - start]; System.arraycopy(data, start, forDigest, 0, sig - start); String digest = DigestUtils.shaHex(forDigest).toUpperCase(); - this.aw.storeVote(data, validAfter, dirSource, digest); + if (this.aw != null) { + this.aw.storeVote(data, validAfter, dirSource, digest); + } + if (this.rdd != null) { + this.rdd.haveParsedVote(validAfterTime, fingerprint, + serverDescriptors); + } } if (certificateString != null) { - this.aw.storeCertificate(certificateString.getBytes(), - dirSource, dirKeyPublished); + if (this.aw != null) { + this.aw.storeCertificate(certificateString.getBytes(), + dirSource, dirKeyPublished); + } } } }

1 0

[metrics-web/master] Improve display of links on data page.
by karsten＠torproject.org 15 Jun '11

15 Jun '11

commit d50f6d5c90053fc59971c6097bea951cbd8e6b17 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Tue Jun 14 20:19:36 2011 +0200 Improve display of links on data page. Improvements consist of reordering tarballs in descending order and displaying the correct date of Torperf experiment data files. --- .../torproject/ernie/web/ResearchDataServlet.java | 25 +++++++++++-------- 1 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/org/torproject/ernie/web/ResearchDataServlet.java b/src/org/torproject/ernie/web/ResearchDataServlet.java index b863920..cd39ee6 100644 --- a/src/org/torproject/ernie/web/ResearchDataServlet.java +++ b/src/org/torproject/ernie/web/ResearchDataServlet.java @@ -67,19 +67,21 @@ public class ResearchDataServlet extends HttpServlet { * displaying the files in tables and map values being 2-element * arrays containing the file url and optional signature file. */ SortedMap<Date, Map<String, String[]>> relayDescriptors = - new TreeMap<Date, Map<String, String[]>>(); + new TreeMap<Date, Map<String, String[]>>( + java.util.Collections.reverseOrder()); String[] certs = new String[2]; SortedMap<Date, String[]> bridgeDescriptors = - new TreeMap<Date, String[]>(); + new TreeMap<Date, String[]>(java.util.Collections.reverseOrder()); SortedMap<String, Map<String, String[]>> relayStatistics = new TreeMap<String, Map<String, String[]>>(); SortedMap<String, Map<String, String[]>> torperfData = new TreeMap<String, Map<String, String[]>>(); - SortedMap<Date, String[]> exitLists = new TreeMap<Date, String[]>(); + SortedMap<Date, String[]> exitLists = + new TreeMap<Date, String[]>(java.util.Collections.reverseOrder()); SortedMap<Date, String[]> torperfExperiments = new TreeMap<Date, String[]>(); SortedMap<Date, String[]> bridgePoolAssignments = - new TreeMap<Date, String[]>(); + new TreeMap<Date, String[]>(java.util.Collections.reverseOrder()); /* Prepare rewriting Torperf sources. */ Map<String, String> torperfSources = new HashMap<String, String>(); @@ -91,6 +93,7 @@ public class ResearchDataServlet extends HttpServlet { /* Go through the file list, decide for each file what metrics data * type it is, and put it in the appropriate map. */ SimpleDateFormat monthFormat = new SimpleDateFormat("yyyy-MM"); + SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd"); List<String> torperfFilesizes = Arrays.asList("50kb,1mb,5mb". split(",")); for (String url : dataFileUrls) { @@ -204,19 +207,19 @@ public class ResearchDataServlet extends HttpServlet { /* URL contains Torperf experiment tarball. */ } else if (filename.startsWith("torperf-experiment-20")) { - String yearMonth = filename.substring(filename.indexOf("20")); - yearMonth = yearMonth.substring(0, 7); - Date month = null; + String dateString = filename.substring(filename.indexOf("20")); + dateString = dateString.substring(0, 10); + Date date = null; try { - month = monthFormat.parse(yearMonth); + date = dateFormat.parse(dateString); } catch (ParseException e) { /* Ignore this URL. */ continue; } - if (!torperfExperiments.containsKey(month)) { - torperfExperiments.put(month, new String[2]); + if (!torperfExperiments.containsKey(date)) { + torperfExperiments.put(date, new String[2]); } - torperfExperiments.get(month)[0] = url; + torperfExperiments.get(date)[0] = url; /* URL contains exit list. */ } else if (filename.startsWith("exit-list-20")) {

1 0

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

15 Jun '11

commit 875a551409c81fced826336a73cafa36396a43f8 Merge: 19febed a25c0a5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 13:46:46 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug3369 | 4 ++++ changes/bug3393 | 5 +++++ src/or/dnsserv.c | 4 ++-- 3 files changed, 11 insertions(+), 2 deletions(-)

1 0

[tor/master] client-side DNS proxy server: reply NOTIMPL to unsupported queries
by nickm＠torproject.org 15 Jun '11

15 Jun '11

commit 910472c5146ad3e436f1b5238570a2802662319b Author: intrigeri <intrigeri(a)boum.org> Date: Sun Jun 12 11:57:31 2011 +0200 client-side DNS proxy server: reply NOTIMPL to unsupported queries Fix for bug 3369. --- src/or/dnsserv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 009ab5f..f2c473d 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -95,8 +95,8 @@ evdns_server_callback(struct evdns_server_request *req, void *_data) } if (!q) { log_info(LD_APP, "None of the questions we got were ones we're willing " - "to support. Sending NODATA."); - evdns_server_request_respond(req, DNS_ERR_NONE); + "to support. Sending NOTIMPL."); + evdns_server_request_respond(req, DNS_ERR_NOTIMPL); return; } if (q->type != EVDNS_TYPE_A) {

1 0

[tor/master] changelog entry for bug3369
by nickm＠torproject.org 15 Jun '11

15 Jun '11

commit e470f6a8866105c9f6b113aa8eafec5ee202c992 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 13 13:42:00 2011 -0400 changelog entry for bug3369 --- changes/bug3369 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug3369 b/changes/bug3369 new file mode 100644 index 0000000..9c0d0e6 --- /dev/null +++ b/changes/bug3369 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When asked about a DNS record type we don't support via a + client DNSPort, reply with NOTIMPL rather than an empty + reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha.

1 0

[tor/master] Merge remote-tracking branch 'public/bug3369' into maint-0.2.2
by nickm＠torproject.org 15 Jun '11

15 Jun '11

commit a25c0a5bf81768c4d4f6fe377cea48f47333a8c8 Merge: e70e836 e470f6a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 13:46:10 2011 -0400 Merge remote-tracking branch 'public/bug3369' into maint-0.2.2 changes/bug3369 | 4 ++++ src/or/dnsserv.c | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-)

1 0

[tor/master] Add changes file for bug3393
by nickm＠torproject.org 15 Jun '11

15 Jun '11

commit e70e8367c9bb3ff04645454e9dfe694ac6762dc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 13:45:12 2011 -0400 Add changes file for bug3393 --- changes/bug3393 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug3393 b/changes/bug3393 new file mode 100644 index 0000000..677bcb7 --- /dev/null +++ b/changes/bug3393 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a bug when using ControlSocketsGroupWritable with User. The + directory's group would be checked against the current group, not + the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix + on Tor 0.2.2.26-beta. \ No newline at end of file

1 0

[tor/maint-0.2.2] client-side DNS proxy server: reply NOTIMPL to unsupported queries
by nickm＠torproject.org 15 Jun '11

15 Jun '11

commit 910472c5146ad3e436f1b5238570a2802662319b Author: intrigeri <intrigeri(a)boum.org> Date: Sun Jun 12 11:57:31 2011 +0200 client-side DNS proxy server: reply NOTIMPL to unsupported queries Fix for bug 3369. --- src/or/dnsserv.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/or/dnsserv.c b/src/or/dnsserv.c index 009ab5f..f2c473d 100644 --- a/src/or/dnsserv.c +++ b/src/or/dnsserv.c @@ -95,8 +95,8 @@ evdns_server_callback(struct evdns_server_request *req, void *_data) } if (!q) { log_info(LD_APP, "None of the questions we got were ones we're willing " - "to support. Sending NODATA."); - evdns_server_request_respond(req, DNS_ERR_NONE); + "to support. Sending NOTIMPL."); + evdns_server_request_respond(req, DNS_ERR_NOTIMPL); return; } if (q->type != EVDNS_TYPE_A) {

1 0

[tor/maint-0.2.2] changelog entry for bug3369
by nickm＠torproject.org 15 Jun '11

15 Jun '11

commit e470f6a8866105c9f6b113aa8eafec5ee202c992 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 13 13:42:00 2011 -0400 changelog entry for bug3369 --- changes/bug3369 | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/changes/bug3369 b/changes/bug3369 new file mode 100644 index 0000000..9c0d0e6 --- /dev/null +++ b/changes/bug3369 @@ -0,0 +1,4 @@ + o Minor bugfixes: + - When asked about a DNS record type we don't support via a + client DNSPort, reply with NOTIMPL rather than an empty + reply. Patch by intrigeri. Fixes bug 3369; bugfix on 2.0.1-alpha.

1 0

[tor/maint-0.2.2] Add changes file for bug3393
by nickm＠torproject.org 15 Jun '11

15 Jun '11

commit e70e8367c9bb3ff04645454e9dfe694ac6762dc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Jun 14 13:45:12 2011 -0400 Add changes file for bug3393 --- changes/bug3393 | 5 +++++ 1 files changed, 5 insertions(+), 0 deletions(-) diff --git a/changes/bug3393 b/changes/bug3393 new file mode 100644 index 0000000..677bcb7 --- /dev/null +++ b/changes/bug3393 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Fix a bug when using ControlSocketsGroupWritable with User. The + directory's group would be checked against the current group, not + the configured group. Patch by Jérémy Bobbio. Fixes bug3393; bugfix + on Tor 0.2.2.26-beta. \ No newline at end of file

1 0