- tor-commits - lists.torproject.org

[tor/release-0.2.2] fold in more changes files
by arma＠torproject.org 04 Apr '11

04 Apr '11

commit c8136bc9b636ca65949a940bbdf83c1e0306d1a0 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Apr 4 03:38:42 2011 -0400 fold in more changes files --- ChangeLog | 52 +++++++++++++++++++++++++++++++++++---- changes/bug2683a | 3 -- changes/bug2696 | 5 ---- changes/bug2698 | 6 ---- changes/bug2756 | 11 -------- changes/bug2757 | 6 ---- changes/cbt_hi_res | 7 ----- changes/cbt_parallel_intro | 4 --- changes/doxygen | 6 ---- changes/log-typo-2011-03-15-01 | 3 -- changes/zlib_aint_openssl | 3 -- 11 files changed, 46 insertions(+), 60 deletions(-) diff --git a/ChangeLog b/ChangeLog index c920dc4..8d47e3d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -Changes in version 0.2.2.24-alpha - 2011-0?-?? +Changes in version 0.2.2.24-alpha - 2011-04-0? o Major bugfixes: - Directory authorities now use data collected from their own uptime observations when choosing whether to assign the HSDir flag @@ -28,16 +28,56 @@ Changes in version 0.2.2.24-alpha - 2011-0?-?? like Vidalia, in which case the controller would never get a REACHABILITY_SUCCEEDED status event. Bugfix on 0.1.2.6-alpha; fixes bug 1172. - - When a relay has failed several reachability tests, directory - authorities are more accurate at recording when it became - unreachable, so we can in turn provide more accuracy at assigning - Stable, Guard, HSDir, etc flags. Bugfix on 0.2.0.6-alpha. Resolves - bug 2716. + - Make directory authorities more accurate at recording when + relays that have failed several reachability tests became + unreachable, so we can provide more accuracy at assigning Stable, + Guard, HSDir, etc flags. Bugfix on 0.2.0.6-alpha. Resolves bug 2716. + - Fix an issue that prevented static linking of libevent on + some platforms (notably Linux). Fixes bug 2698; bugfix on + versions 0.2.1.23/0.2.2.8-alpha (the versions introducing + the --with-static-libevent configure option). + - We now ask the other side of a stream (the client or the exit) + for more data on that stream when the amount of queued data on + that stream dips low enough. Previously, we wouldn't ask the + other side for more data until either it sent us more data (which + it wasn't supposed to do if it had exhausted its window!) or we + had completely flushed all our queued data. This flow control fix + should improve throughput. Fixes bug 2756; bugfix on the earliest + released versions of Tor (svn commit r152). + - Avoid a double-mark-for-free warning when failing to attach a + transparent proxy connection. (We thought we had fixed this in + 0.2.2.23-alpha, but it turns out our fix was checking the wrong + connection.) Fixes bug 2757; bugfix on 0.1.2.1-alpha (the original + bug) and 0.2.2.23-alpha (the incorrect fix). + - When warning about missing zlib development packages during compile, + give the correct package names. Bugfix on 0.2.0.1-alpha. + + o Minor features: + - Directory authorities now log the source of a rejected POSTed v3 + networkstatus vote. + - Make compilation with clang possible when using + --enable-gcc-warnings by removing two warning optionss that clang + hasn't implemented yet and by fixing a few warnings. Implements + ticket 2696. + - When expiring circuits, use microsecond timers rather than + one-second timers. This can avoid an unpleasant situation where a + circuit is launched near the end of one second and expired right + near the beginning of the next, and prevent fluctuations in circuit + timeout values. + - Use computed circuit-build timeouts to decide when to launch + parallel introduction circuits for hidden services. (Previously, + we would retry after 15 seconds.) o Packaging fixes: - Create the /var/run/tor directory on startup on OpenSUSE if it is not already created. Patch from Andreas Stieger. Fixes bug 2573. + o Documentation changes: + - Modernize the doxygen configuration file slightly. Fixes bug 2707. + - Resolve all doxygen warnings except those for missing documentation. + Fixes bug 2705. + - Add doxygen documentation for more functions, fields, and types. + Changes in version 0.2.2.23-alpha - 2011-03-08 Tor 0.2.2.23-alpha lets relays record their bandwidth history so when diff --git a/changes/bug2683a b/changes/bug2683a deleted file mode 100644 index 2fe308b..0000000 --- a/changes/bug2683a +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features - - Log the source of a rejected POSTed v3 networkstatus vote. - diff --git a/changes/bug2696 b/changes/bug2696 deleted file mode 100644 index 6ea41d4..0000000 --- a/changes/bug2696 +++ /dev/null @@ -1,5 +0,0 @@ - o Minor features: - - Make compilation with clang possible when using - --enable-gcc-warnings by removing two warnings that clang hasn't - implemented yet and by fixing a few warnings. Implements ticket - 2696. diff --git a/changes/bug2698 b/changes/bug2698 deleted file mode 100644 index d995788..0000000 --- a/changes/bug2698 +++ /dev/null @@ -1,6 +0,0 @@ - o Minor bugfixes: - - Fix an issue that prevented static linking of libevent on - some platforms (notably Linux). Fixes bug 2698, bugfix on - versions 0.2.1.23/0.2.2.8-alpha (the versions introducing - the --with-static-libevent configure option). - diff --git a/changes/bug2756 b/changes/bug2756 deleted file mode 100644 index 0cad515..0000000 --- a/changes/bug2756 +++ /dev/null @@ -1,11 +0,0 @@ - o Minor bugfixes (spec conformance, performance): - - We now ask the other side of a stream (the client or the exit) - for more data on that stream when the amount of queued data on - that stream dips low enough. Previously, we wouldn't ask the - other side for more data until either it sent us more data - (which it wasn't supposed to do if it had exhausted its - window!) or until we had completely flushed all our queued - data. Fixing this should improve throughput. Fixes bug 2756; - bugfix on the earliest released versions of Tor (svn commit - r152). - diff --git a/changes/bug2757 b/changes/bug2757 deleted file mode 100644 index f947afa..0000000 --- a/changes/bug2757 +++ /dev/null @@ -1,6 +0,0 @@ - - Minor bugfixes - o Avoid a double-mark-for-free warning when failing to attach a - transparent proxy connection. (We thought we had fixed this in - 0.2.2.23-alpha, but it turns out our fix was checking the wrong - connection.) Fixes bug 2757; bugfix on 0.1.2.1-alpha (the original - bug) and 0.2.2.23-alpha (the incorrect fix). diff --git a/changes/cbt_hi_res b/changes/cbt_hi_res deleted file mode 100644 index c0df118..0000000 --- a/changes/cbt_hi_res +++ /dev/null @@ -1,7 +0,0 @@ - o Minor features - - When expiring circuits, use microsecond timers rather than one-second - timers. This can avoid an unpleasant situation where a circuit is - launched near the end of one second and expired right near the - beginning of the next, and prevent fluctuations in circuit timeout - values. - diff --git a/changes/cbt_parallel_intro b/changes/cbt_parallel_intro deleted file mode 100644 index 44e377f..0000000 --- a/changes/cbt_parallel_intro +++ /dev/null @@ -1,4 +0,0 @@ - o Minor features - - Use computed circuit-build timeouts to decide when to launch - parallel introdution circuits. (Previously, we would retry - after 15 seconds.) diff --git a/changes/doxygen b/changes/doxygen deleted file mode 100644 index 5e5fcd1..0000000 --- a/changes/doxygen +++ /dev/null @@ -1,6 +0,0 @@ - o Documentation changes - - Modernize the doxygen configuration file slightly. Fixes bug 2707. - - Resolve all doxygen warnings except those for missing documentation. - Fixes bug 2705. - - Add doxygen documentation for more functions, fields, and types. - diff --git a/changes/log-typo-2011-03-15-01 b/changes/log-typo-2011-03-15-01 deleted file mode 100644 index 3830df3..0000000 --- a/changes/log-typo-2011-03-15-01 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes - - Fix a minor typo in a log message. Bugfix on 0.2.2.6-alpha. - diff --git a/changes/zlib_aint_openssl b/changes/zlib_aint_openssl deleted file mode 100644 index dd8e10a..0000000 --- a/changes/zlib_aint_openssl +++ /dev/null @@ -1,3 +0,0 @@ - o Minor bugfixes - - When warning about missing zlib development packages, give the - correct package names. Bugfix on 0.2.0.1-alpha.

1 0

r24553: {arm} Fixing crashing issue from unknown relay nicknames (caught b (arm/trunk/src/interface/connections)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 19:44:18 +0000 (Sun, 03 Apr 2011) New Revision: 24553 Modified: arm/trunk/src/interface/connections/connEntry.py Log: Fixing crashing issue from unknown relay nicknames (caught by krkhan) Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-03 18:38:40 UTC (rev 24552) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-03 19:44:18 UTC (rev 24553) @@ -134,7 +134,10 @@ if myFingerprint != "UNKNOWN": conn = torTools.getConn() - return conn.getRelayNickname(myFingerprint) + myNickname = conn.getRelayNickname(myFingerprint) + + if myNickname: return myNickname + else: return "UNKNOWN" else: return "UNKNOWN" class ConnectionEntry(entries.ConnectionPanelEntry):

1 0

r24552: {arm} Minor issue spotted while running pylint over new additions. (arm/trunk/src/util)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 18:38:40 +0000 (Sun, 03 Apr 2011) New Revision: 24552 Modified: arm/trunk/src/util/enum.py Log: Minor issue spotted while running pylint over new additions. Modified: arm/trunk/src/util/enum.py =================================================================== --- arm/trunk/src/util/enum.py 2011-04-03 18:32:14 UTC (rev 24551) +++ arm/trunk/src/util/enum.py 2011-04-03 18:38:40 UTC (rev 24552) @@ -110,6 +110,7 @@ """ def __init__(self, **args): + Enum.__init__(self) self.__dict__.update(args) self.orderedValues = sorted(args.values())

1 0

r24551: {arm} Updating content listings with new modules. (in arm/trunk: . src/interface/connections)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 18:32:14 +0000 (Sun, 03 Apr 2011) New Revision: 24551 Modified: arm/trunk/README arm/trunk/src/interface/connections/__init__.py Log: Updating content listings with new modules. Modified: arm/trunk/README =================================================================== --- arm/trunk/README 2011-04-03 18:03:25 UTC (rev 24550) +++ arm/trunk/README 2011-04-03 18:32:14 UTC (rev 24551) @@ -140,6 +140,13 @@ uninstall - removal script interface/ + connections/ + __init__.py + connPanel.py - (page 2) lists the active tor connections + circEntry.py - circuit entries in the connection panel + connEntry.py - individual connections to or from the system + entries.py - common parent for connPanel display entries + graphing/ __init__.py graphPanel.py - (page 1) presents graphs for data instances @@ -154,7 +161,7 @@ logPanel.py - (page 1) displays tor, arm, and torctl events fileDescriptorPopup.py - (popup) displays file descriptors used by tor - connPanel.py - (page 2) displays information on tor connections + connPanel.py - (page 2) deprecated counterpart for connections/* descriptorPopup.py - (popup) displays connection descriptor data configPanel.py - (page 3) editor panel for the tor configuration @@ -164,6 +171,7 @@ __init__.py conf.py - loading and persistence for user configuration connections.py - service providing periodic connection lookups + enum.py - enumerations for ordered collections hostnames.py - service providing nonblocking reverse dns lookups log.py - aggregator for application events panel.py - wrapper for safely working with curses subwindows Modified: arm/trunk/src/interface/connections/__init__.py =================================================================== --- arm/trunk/src/interface/connections/__init__.py 2011-04-03 18:03:25 UTC (rev 24550) +++ arm/trunk/src/interface/connections/__init__.py 2011-04-03 18:32:14 UTC (rev 24551) @@ -2,5 +2,5 @@ Panels, popups, and handlers comprising the arm user interface. """ -__all__ = ["connEntry", "connPanel", "entries"] +__all__ = ["circEntry", "connEntry", "connPanel", "entries"]

1 0

r24550: {arm} Fixing comment typos and spelling mistakes. (in arm/trunk/src: interface/connections util)
by Damian Johnson 03 Apr '11

03 Apr '11

Author: atagar Date: 2011-04-03 18:03:25 +0000 (Sun, 03 Apr 2011) New Revision: 24550 Modified: arm/trunk/src/interface/connections/circEntry.py arm/trunk/src/interface/connections/connEntry.py arm/trunk/src/interface/connections/entries.py arm/trunk/src/util/connections.py arm/trunk/src/util/enum.py Log: Fixing comment typos and spelling mistakes. Modified: arm/trunk/src/interface/connections/circEntry.py =================================================================== --- arm/trunk/src/interface/connections/circEntry.py 2011-04-03 15:05:14 UTC (rev 24549) +++ arm/trunk/src/interface/connections/circEntry.py 2011-04-03 18:03:25 UTC (rev 24550) @@ -62,7 +62,7 @@ def update(self, status, path): """ Our status and path can change over time if the circuit is still in the - process of being built. Updates these attributs of our relay. + process of being built. Updates these attributes of our relay. Arguments: status - new status of the circuit @@ -140,7 +140,7 @@ class CircLine(connEntry.ConnectionLine): """ - An inidividual hop in a circuit. This overwrites the displayed listing, but + An individual hop in a circuit. This overwrites the displayed listing, but otherwise makes use of the ConnectionLine attributes (for the detail display, caching, etc). """ Modified: arm/trunk/src/interface/connections/connEntry.py =================================================================== --- arm/trunk/src/interface/connections/connEntry.py 2011-04-03 15:05:14 UTC (rev 24549) +++ arm/trunk/src/interface/connections/connEntry.py 2011-04-03 18:03:25 UTC (rev 24550) @@ -355,7 +355,7 @@ """ # This is used to scrub private information from the interface. Relaying - # etiquette (and wiretaping laws) say these are bad things to look at so + # etiquette (and wiretapping laws) say these are bad things to look at so # DON'T CHANGE THIS UNLESS YOU HAVE A DAMN GOOD REASON! myType = self.getType() @@ -384,7 +384,7 @@ def getType(self): """ Provides our best guess at the current type of the connection. This - depends on consensus results, our current client circuts, etc. Results + depends on consensus results, our current client circuits, etc. Results are cached until this entry's display is reset. """ @@ -588,7 +588,7 @@ # Showing the fingerprint (which has the width of 42) has priority over # an expanded address field. Hence check if we either have space for - # both or wouldn't be showing the fingerprint reguardless. + # both or wouldn't be showing the fingerprint regardless. isExpandedAddrVisible = width > usedSpace + 28 if isExpandedAddrVisible and CONFIG["features.connection.showColumn.fingerprint"]: @@ -667,7 +667,7 @@ def _getDetailContent(self, width): """ - Provides a list with detailed information for this connectoin. + Provides a list with detailed information for this connection. Arguments: width - max length of lines @@ -679,7 +679,7 @@ # Remaining data concerns the consensus results, with three possible cases: # - if there's a single match then display its details - # - if there's multiple potenial relays then list all of the combinations + # - if there's multiple potential relays then list all of the combinations # of ORPorts / Fingerprints # - if no consensus data is available then say so (probably a client or # exit connection) @@ -714,7 +714,7 @@ flags = nsLines[1][2:] # The network status exit policy doesn't exist for older tor versions. - # If unavailble we'll need the full exit policy which is on the + # If unavailable we'll need the full exit policy which is on the # descriptor (if that's available). exitPolicy = "unknown" @@ -764,7 +764,7 @@ if allMatches: # multiple matches - lines[2] = "Muliple matches, possible fingerprints are:" + lines[2] = "Multiple matches, possible fingerprints are:" for i in range(len(allMatches)): isLastLine = i == 3 @@ -846,8 +846,8 @@ dstHostname = self.foreign.getHostname() if dstHostname: - # determines the full space availabe, taking into account the ", " - # dividers if there's multipe pieces of extra data + # determines the full space available, taking into account the ", " + # dividers if there's multiple pieces of extra data maxHostnameSpace = spaceAvailable - 2 * len(extraInfo) dstHostname = uiTools.cropStr(dstHostname, maxHostnameSpace) Modified: arm/trunk/src/interface/connections/entries.py =================================================================== --- arm/trunk/src/interface/connections/entries.py 2011-04-03 15:05:14 UTC (rev 24549) +++ arm/trunk/src/interface/connections/entries.py 2011-04-03 18:03:25 UTC (rev 24550) @@ -156,7 +156,7 @@ def getDescriptor(self, width): """ - Provides a list of DrawEntry instances with descriptor informatoin for + Provides a list of DrawEntry instances with descriptor information for this connection. Arguments: Modified: arm/trunk/src/util/connections.py =================================================================== --- arm/trunk/src/util/connections.py 2011-04-03 15:05:14 UTC (rev 24549) +++ arm/trunk/src/util/connections.py 2011-04-03 18:03:25 UTC (rev 24550) @@ -664,7 +664,7 @@ if not lsofResults and self.failureCount != -1: # lsof query failed and we aren't yet sure if it's possible to - # successfuly get results on this platform + # successfully get results on this platform self.failureCount += 1 self.isResolving = False return @@ -699,7 +699,7 @@ results[portMatch].append(newEntry) else: results[portMatch] = [newEntry] - # making the lsof call generated an extranious sh entry for our own connection + # making the lsof call generated an extraneous sh entry for our own connection if ourConnection: for ourPort in ourConnection: if ourPort in results: Modified: arm/trunk/src/util/enum.py =================================================================== --- arm/trunk/src/util/enum.py 2011-04-03 15:05:14 UTC (rev 24549) +++ arm/trunk/src/util/enum.py 2011-04-03 18:03:25 UTC (rev 24550) @@ -40,7 +40,7 @@ class Enum: """ - Basic enumaration. + Basic enumeration. """ def __init__(self, *args):

1 0

r24549: {website} new phone number that works globally without getting charged (website/trunk/press/en)
by Andrew Lewman 03 Apr '11

03 Apr '11

Author: phobos Date: 2011-04-03 15:05:14 +0000 (Sun, 03 Apr 2011) New Revision: 24549 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: new phone number that works globally without getting charged a billion dollars per minute around the world. 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-03 06:36:26 UTC (rev 24548) +++ website/trunk/press/en/2008-12-19-roadmap-press-release.wml 2011-04-03 15:05:14 UTC (rev 24549) @@ -82,7 +82,7 @@ of The Tor Project, Inc. Contact: Andrew Lewman - Tel: +1-781-424-9877 + Tel: +1-406-356-6475 Email: execdir(a)torproject.org <a href="https://www.torproject.org/">Website: Tor Project</a> </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-03 06:36:26 UTC (rev 24548) +++ website/trunk/press/en/2009-03-12-performance-roadmap-press-release.wml 2011-04-03 15:05:14 UTC (rev 24549) @@ -65,7 +65,7 @@ of The Tor Project, Inc. Contact: Andrew Lewman - Tel: +1-781-424-9877 + Tel: +1-406-356-6475 Email: execdir(a)torproject.org <a href="https://www.torproject.org/">Website: Tor Project</a> </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-03 06:36:26 UTC (rev 24548) +++ website/trunk/press/en/2010-03-25-tor-store-press-release.wml 2011-04-03 15:05:14 UTC (rev 24549) @@ -82,7 +82,7 @@ of The Tor Project, Inc. Contact: Andrew Lewman - Tel: +1-781-424-9877 + Tel: +1-406-356-6475 Email: execdir(a)torproject.org <a href="https://www.torproject.org/">Website: Tor Project</a> </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-03 06:36:26 UTC (rev 24548) +++ website/trunk/press/en/2010-09-16-ten-things-circumvention-tools.wml 2011-04-03 15:05:14 UTC (rev 24549) @@ -64,7 +64,7 @@ of The Tor Project, Inc. Contact: Andrew Lewman -Tel: +1-781-424-9877 +Tel: +1-406-356-6475 Email: execdir(a)torproject.org <a href="https://www.torproject.org/">Website: Tor Project</a> <div align=center>###</div> Modified: website/trunk/press/en/info.wmi =================================================================== --- website/trunk/press/en/info.wmi 2011-04-03 06:36:26 UTC (rev 24548) +++ website/trunk/press/en/info.wmi 2011-04-03 15:05:14 UTC (rev 24549) @@ -9,7 +9,7 @@ Andrew Lewman Executive Director execdir(a)torproject.org - +1-781-424-9877 + +1-406-356-6475 </div>

1 0

[metrics-web/master] GetTor bundle names are now longer than 32 chars.
by karsten＠torproject.org 03 Apr '11

03 Apr '11

commit b9438593c83521c691d711453ceae71d7d9423a0 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 3 14:42:44 2011 +0200 GetTor bundle names are now longer than 32 chars. --- db/tordir.sql | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/db/tordir.sql b/db/tordir.sql index 11e49dc..c47d19a 100644 --- a/db/tordir.sql +++ b/db/tordir.sql @@ -719,7 +719,7 @@ CREATE TABLE torperf_stats ( -- Packages requested from GetTor CREATE TABLE gettor_stats ( "date" DATE NOT NULL, - bundle CHARACTER VARYING(32) NOT NULL, + bundle CHARACTER VARYING(64) NOT NULL, downloads INTEGER NOT NULL, CONSTRAINT gettor_stats_pkey PRIMARY KEY("date", bundle) );

1 0

[metrics-db/master] Minor fix that only affects the logs.
by karsten＠torproject.org 03 Apr '11

03 Apr '11

commit 215aac6d30a7c62ef6d1ec1c6c3ef655865db784 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 3 13:23:21 2011 +0200 Minor fix that only affects the logs. Wait with putting the current consensus on the missing list until we start downloading descriptors. We might have learned it before when parsing a local descriptor directory. --- .../ernie/db/RelayDescriptorDownloader.java | 17 ++++++++--------- 1 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java index 190d1ae..835d821 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java +++ b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java @@ -275,14 +275,6 @@ public class RelayDescriptorDownloader { } } - /* Put the current consensus on the missing list, unless we already - * have it. */ - String consensusKey = "consensus," + this.currentValidAfter; - if (!this.missingDescriptors.containsKey(consensusKey)) { - this.missingDescriptors.put(consensusKey, "NA"); - this.newMissingConsensuses++; - } - /* Read list of directory authorities and when we last downloaded all * server and extra-info descriptors from them. */ this.lastDownloadedAllDescriptors = new HashMap<String, String>(); @@ -453,6 +445,14 @@ public class RelayDescriptorDownloader { */ public void downloadDescriptors() { + /* Put the current consensus on the missing list, unless we already + * have it. */ + String consensusKey = "consensus," + this.currentValidAfter; + if (!this.missingDescriptors.containsKey(consensusKey)) { + this.missingDescriptors.put(consensusKey, "NA"); + this.newMissingConsensuses++; + } + /* Download descriptors from authorities which are in random order, so * that we distribute the load somewhat fairly over time. */ for (String authority : authorities) { @@ -469,7 +469,6 @@ public class RelayDescriptorDownloader { /* Start with downloading the current consensus, unless we already * have it. */ if (downloadCurrentConsensus) { - String consensusKey = "consensus," + this.currentValidAfter; if (this.missingDescriptors.containsKey(consensusKey) && this.missingDescriptors.get(consensusKey).equals("NA")) { this.requestedConsensuses++;

1 0

[metrics-db/master] Limit download of all descriptors to 2 authorities.
by karsten＠torproject.org 03 Apr '11

03 Apr '11

commit 1ff4ce519f26fbdfd5cb3428ad7251e580764666 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 3 14:26:08 2011 +0200 Limit download of all descriptors to 2 authorities. --- .../ernie/db/RelayDescriptorDownloader.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java index 835d821..4b5d729 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java +++ b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java @@ -313,8 +313,8 @@ public class RelayDescriptorDownloader { } } - /* Make a list of directory authorities that we want to download all - * server and extra-info descriptors from. */ + /* Make a list of at most two directory authorities that we want to + * download all server and extra-info descriptors from. */ this.downloadAllDescriptorsFromAuthorities = new HashSet<String>(); for (String authority : this.authorities) { if (!this.lastDownloadedAllDescriptors.containsKey(authority) || @@ -322,6 +322,9 @@ public class RelayDescriptorDownloader { this.downloadAllDescriptorsCutOff) < 0) { this.downloadAllDescriptorsFromAuthorities.add(authority); } + if (this.downloadAllDescriptorsFromAuthorities.size() >= 2) { + break; + } } /* Prepare statistics on this execution. */ @@ -508,9 +511,6 @@ public class RelayDescriptorDownloader { /* Download all server or extra-info descriptors from this * authority if we haven't done so for 24 hours and if we're * configured to do so. */ - /* TODO Distribute downloads of all descriptors over the day for - * different authorities. Maybe limit the number of these - * downloads to 1 or 2 per execution. */ if (this.downloadAllDescriptorsFromAuthorities.contains( authority) && ((type.equals("server") && this.downloadAllServerDescriptors) ||

1 0

[metrics-db/master] Disable compression when downloading extra-info descriptors.
by karsten＠torproject.org 03 Apr '11

03 Apr '11

commit 7fe22d2bbbba84a5f59bbf496858832b2fe761b1 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Sun Apr 3 13:05:54 2011 +0200 Disable compression when downloading extra-info descriptors. --- .../ernie/db/RelayDescriptorDownloader.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java index ebbf761..190d1ae 100644 --- a/src/org/torproject/ernie/db/RelayDescriptorDownloader.java +++ b/src/org/torproject/ernie/db/RelayDescriptorDownloader.java @@ -623,7 +623,8 @@ public class RelayDescriptorDownloader { huc.connect(); int response = huc.getResponseCode(); if (response == 200) { - BufferedInputStream in = downloadCompressed + BufferedInputStream in = this.downloadCompressed && + !resource.startsWith("/tor/extra/") ? new BufferedInputStream(new InflaterInputStream( huc.getInputStream())) : new BufferedInputStream(huc.getInputStream());

1 0