tor-commits October 2013

tor-commits@lists.torproject.org

17 participants
1284 discussions

[stem/master] Fixing python 2.6 compatability issue with lru_cache
by atagar＠torproject.org 13 Oct '13

13 Oct '13

commit c10eef255f0948bcc3cd86eab4221e2b335615eb Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 17:13:56 2013 -0700 Fixing python 2.6 compatability issue with lru_cache The recepie is using set syntax only available in python 2.7 and above... Traceback (most recent call last): File "./run_tests.py", line 18, in <module> import stem.prereq File "/home/atagar/Desktop/stem/stem/__init__.py", line 420, in <module> import stem.util.enum File "/home/atagar/Desktop/stem/stem/util/enum.py", line 43, in <module> import stem.util.str_tools File "/home/atagar/Desktop/stem/stem/util/str_tools.py", line 21, in <module> import stem.prereq File "/home/atagar/Desktop/stem/stem/prereq.py", line 29, in <module> from stem.util.lru_cache import lru_cache File "/home/atagar/Desktop/stem/stem/util/lru_cache.py", line 37 fasttypes = {int, str, frozenset, type(None)}, ^ SyntaxError: invalid syntax --- stem/util/lru_cache.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/util/lru_cache.py b/stem/util/lru_cache.py index a0b8f1b..f1e427c 100644 --- a/stem/util/lru_cache.py +++ b/stem/util/lru_cache.py @@ -34,7 +34,7 @@ class _HashedSeq(list): def _make_key(args, kwds, typed, kwd_mark = (object(),), - fasttypes = {int, str, frozenset, type(None)}, + fasttypes = set([int, str, frozenset, type(None)]), sorted=sorted, tuple=tuple, type=type, len=len): 'Make a cache key from optionally typed positional and keyword arguments' key = args

1 0

[atlas/master] Merge branch 'issue-9911-hsdir-typo'.
by phw＠torproject.org 13 Oct '13

13 Oct '13

commit 8fb8c239827affa5d53ca4861ae9a61076476ae0 Merge: 543abfa cd53480 Author: Philipp Winter <phw(a)torproject.org> Date: Sun Oct 13 02:10:56 2013 +0200 Merge branch 'issue-9911-hsdir-typo'. js/models/relay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)

1 0

[atlas/master] Fix 'HSir' typo to 'HSDir', See #9911
by phw＠torproject.org 13 Oct '13

13 Oct '13

commit cd53480bc038142fb9f7cc1e5f20951cfb4c2b25 Author: Justin Bull <me(a)justinbull.ca> Date: Sun Oct 6 13:51:43 2013 -0400 Fix 'HSir' typo to 'HSDir', See #9911 --- js/models/relay.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/js/models/relay.js b/js/models/relay.js index 3730d79..3995355 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -26,7 +26,7 @@ define([ if (flag == "Guard") { output.push([flag,"share_"+size[0]]); } - if (flag == "HSir") { + if (flag == "HSDir") { output.push([flag,"book_alt_"+size[0]]); } if (flag == "Named") {

1 0

[atlas/master] Display country name and flag on detail view
by phw＠torproject.org 13 Oct '13

13 Oct '13

commit 543abfaf4ce00d05210c02e429af5903acd2d743 Author: Justin Bull <me(a)justinbull.ca> Date: Sun Oct 6 14:19:44 2013 -0400 Display country name and flag on detail view --- templates/details/main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/main.html b/templates/details/main.html index 1ee614f..9e7ec1b 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -76,7 +76,7 @@ </dd> <dt><span class="tip" data-content="Country as found in a GeoIP database by resolving the relay's first onion-routing address." data-original-title="Country">Country</span></dt> - <dd><%= relay.get('country') %></dd> + <dd><img class="inline country" title="<%= relay.get('countryname') %>" src="img/cc/<%= relay.get('country') %>.png"/> <%= relay.get('countryname') %></dd> <dt><span class="tip" data-content="Autonomous System Number" data-original-title="AS Number">AS Number</span></dt> <dd><%= _.escape(relay.get('as_no')) %></dd>

1 0

[stem/master] Replacing manual caching with @lru_cache
by atagar＠torproject.org 12 Oct '13

12 Oct '13

commit 242569af36ebb1f30a5d2629254b55320cfd5298 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Oct 12 13:11:11 2013 -0700 Replacing manual caching with @lru_cache Replacing instances where we do... def get_stuff(): if self._stuff is None: self._stuff = ... calculated stuff... return self._stuff ... with a @lru_cache(). --- stem/control.py | 2 +- stem/descriptor/extrainfo_descriptor.py | 19 +++--- stem/descriptor/microdescriptor.py | 27 ++++---- stem/descriptor/server_descriptor.py | 107 +++++++++++++++---------------- stem/prereq.py | 67 +++++++++---------- stem/response/getinfo.py | 2 +- stem/util/proc.py | 84 +++++++++++------------- stem/version.py | 1 + 8 files changed, 150 insertions(+), 159 deletions(-) diff --git a/stem/control.py b/stem/control.py index 64eecc4..16f8892 100644 --- a/stem/control.py +++ b/stem/control.py @@ -802,7 +802,7 @@ class Controller(BaseController): try: response = self.msg("GETINFO %s" % " ".join(params)) stem.response.convert("GETINFO", response) - response.assert_matches(params) + response._assert_matches(params) # usually we want unicode values under python 3.x diff --git a/stem/descriptor/extrainfo_descriptor.py b/stem/descriptor/extrainfo_descriptor.py index 7bfbd5a..0d50f75 100644 --- a/stem/descriptor/extrainfo_descriptor.py +++ b/stem/descriptor/extrainfo_descriptor.py @@ -82,6 +82,12 @@ from stem.descriptor import ( _get_descriptor_components, ) +try: + # added in python 3.2 + from collections import lru_cache +except ImportError: + from stem.util.lru_cache import lru_cache + # known statuses for dirreq-v2-resp and dirreq-v3-resp... DirResponse = stem.util.enum.Enum( ("OK", "ok"), @@ -856,18 +862,15 @@ class RelayExtraInfoDescriptor(ExtraInfoDescriptor): def __init__(self, raw_contents, validate = True): self.signature = None - self._digest = None super(RelayExtraInfoDescriptor, self).__init__(raw_contents, validate) + @lru_cache() def digest(self): - if self._digest is None: - # our digest is calculated from everything except our signature - raw_content, ending = str(self), "\nrouter-signature\n" - raw_content = raw_content[:raw_content.find(ending) + len(ending)] - self._digest = hashlib.sha1(stem.util.str_tools._to_bytes(raw_content)).hexdigest().upper() - - return self._digest + # our digest is calculated from everything except our signature + raw_content, ending = str(self), "\nrouter-signature\n" + raw_content = raw_content[:raw_content.find(ending) + len(ending)] + return hashlib.sha1(stem.util.str_tools._to_bytes(raw_content)).hexdigest().upper() def _parse(self, entries, validate): entries = dict(entries) # shallow copy since we're destructive diff --git a/stem/descriptor/microdescriptor.py b/stem/descriptor/microdescriptor.py index afcd777..c48419a 100644 --- a/stem/descriptor/microdescriptor.py +++ b/stem/descriptor/microdescriptor.py @@ -75,6 +75,12 @@ from stem.descriptor import ( _read_until_keywords, ) +try: + # added in python 3.2 + from collections import lru_cache +except ImportError: + from stem.util.lru_cache import lru_cache + REQUIRED_FIELDS = ( "onion-key", ) @@ -178,7 +184,6 @@ class Microdescriptor(Descriptor): self._unrecognized_lines = [] self._annotation_lines = annotations if annotations else [] - self._annotation_dict = None # cached breakdown of key/value mappings entries = _get_descriptor_components(raw_contents, validate) self._parse(entries, validate) @@ -189,6 +194,7 @@ class Microdescriptor(Descriptor): def get_unrecognized_lines(self): return list(self._unrecognized_lines) + @lru_cache() def get_annotations(self): """ Provides content that appeared prior to the descriptor. If this comes from @@ -201,19 +207,16 @@ class Microdescriptor(Descriptor): :returns: **dict** with the key/value pairs in our annotations """ - if self._annotation_dict is None: - annotation_dict = {} - - for line in self._annotation_lines: - if b" " in line: - key, value = line.split(b" ", 1) - annotation_dict[key] = value - else: - annotation_dict[line] = None + annotation_dict = {} - self._annotation_dict = annotation_dict + for line in self._annotation_lines: + if b" " in line: + key, value = line.split(b" ", 1) + annotation_dict[key] = value + else: + annotation_dict[line] = None - return self._annotation_dict + return annotation_dict def get_annotation_lines(self): """ diff --git a/stem/descriptor/server_descriptor.py b/stem/descriptor/server_descriptor.py index 8d11801..51b382f 100644 --- a/stem/descriptor/server_descriptor.py +++ b/stem/descriptor/server_descriptor.py @@ -52,6 +52,12 @@ from stem.descriptor import ( _read_until_keywords, ) +try: + # added in python 3.2 + from collections import lru_cache +except ImportError: + from stem.util.lru_cache import lru_cache + # relay descriptors must have exactly one of the following REQUIRED_FIELDS = ( "router", @@ -273,7 +279,6 @@ class ServerDescriptor(Descriptor): self._unrecognized_lines = [] self._annotation_lines = annotations if annotations else [] - self._annotation_dict = None # cached breakdown of key/value mappings # A descriptor contains a series of 'keyword lines' which are simply a # keyword followed by an optional value. Lines can also be followed by a @@ -308,6 +313,7 @@ class ServerDescriptor(Descriptor): def get_unrecognized_lines(self): return list(self._unrecognized_lines) + @lru_cache() def get_annotations(self): """ Provides content that appeared prior to the descriptor. If this comes from @@ -321,19 +327,16 @@ class ServerDescriptor(Descriptor): :returns: **dict** with the key/value pairs in our annotations """ - if self._annotation_dict is None: - annotation_dict = {} - - for line in self._annotation_lines: - if b" " in line: - key, value = line.split(b" ", 1) - annotation_dict[key] = value - else: - annotation_dict[line] = None + annotation_dict = {} - self._annotation_dict = annotation_dict + for line in self._annotation_lines: + if b" " in line: + key, value = line.split(b" ", 1) + annotation_dict[key] = value + else: + annotation_dict[line] = None - return self._annotation_dict + return annotation_dict def get_annotation_lines(self): """ @@ -654,7 +657,6 @@ class RelayDescriptor(ServerDescriptor): self.ntor_onion_key = None self.signing_key = None self.signature = None - self._digest = None super(RelayDescriptor, self).__init__(raw_contents, validate, annotations) @@ -662,6 +664,7 @@ class RelayDescriptor(ServerDescriptor): if validate: self._validate_content() + @lru_cache() def digest(self): """ Provides the digest of our descriptor's content. @@ -671,25 +674,22 @@ class RelayDescriptor(ServerDescriptor): :raises: ValueError if the digest canot be calculated """ - if self._digest is None: - # Digest is calculated from everything in the - # descriptor except the router-signature. - - raw_descriptor = self.get_bytes() - start_token = b"router " - sig_token = b"\nrouter-signature\n" - start = raw_descriptor.find(start_token) - sig_start = raw_descriptor.find(sig_token) - end = sig_start + len(sig_token) - - if start >= 0 and sig_start > 0 and end > start: - for_digest = raw_descriptor[start:end] - digest_hash = hashlib.sha1(stem.util.str_tools._to_bytes(for_digest)) - self._digest = stem.util.str_tools._to_unicode(digest_hash.hexdigest().upper()) - else: - raise ValueError("unable to calculate digest for descriptor") + # Digest is calculated from everything in the + # descriptor except the router-signature. - return self._digest + raw_descriptor = self.get_bytes() + start_token = b"router " + sig_token = b"\nrouter-signature\n" + start = raw_descriptor.find(start_token) + sig_start = raw_descriptor.find(sig_token) + end = sig_start + len(sig_token) + + if start >= 0 and sig_start > 0 and end > start: + for_digest = raw_descriptor[start:end] + digest_hash = hashlib.sha1(stem.util.str_tools._to_bytes(for_digest)) + return stem.util.str_tools._to_unicode(digest_hash.hexdigest().upper()) + else: + raise ValueError("unable to calculate digest for descriptor") def _validate_content(self): """ @@ -852,7 +852,6 @@ class BridgeDescriptor(ServerDescriptor): def __init__(self, raw_contents, validate = True, annotations = None): self._digest = None - self._scrubbing_issues = None super(BridgeDescriptor, self).__init__(raw_contents, validate, annotations) @@ -889,6 +888,7 @@ class BridgeDescriptor(ServerDescriptor): return self.get_scrubbing_issues() == [] + @lru_cache() def get_scrubbing_issues(self): """ Provides issues with our scrubbing. @@ -897,34 +897,31 @@ class BridgeDescriptor(ServerDescriptor): scrubbing, this list is empty if we're properly scrubbed """ - if self._scrubbing_issues is None: - issues = [] - - if not self.address.startswith("10."): - issues.append("Router line's address should be scrubbed to be '10.x.x.x': %s" % self.address) + issues = [] - if self.contact and self.contact != "somebody": - issues.append("Contact line should be scrubbed to be 'somebody', but instead had '%s'" % self.contact) + if not self.address.startswith("10."): + issues.append("Router line's address should be scrubbed to be '10.x.x.x': %s" % self.address) - for address, _, is_ipv6 in self.or_addresses: - if not is_ipv6 and not address.startswith("10."): - issues.append("or-address line's address should be scrubbed to be '10.x.x.x': %s" % address) - elif is_ipv6 and not address.startswith("fd9f:2e19:3bcf::"): - # TODO: this check isn't quite right because we aren't checking that - # the next grouping of hex digits contains 1-2 digits - issues.append("or-address line's address should be scrubbed to be 'fd9f:2e19:3bcf::xx:xxxx': %s" % address) + if self.contact and self.contact != "somebody": + issues.append("Contact line should be scrubbed to be 'somebody', but instead had '%s'" % self.contact) - for line in self.get_unrecognized_lines(): - if line.startswith("onion-key "): - issues.append("Bridge descriptors should have their onion-key scrubbed: %s" % line) - elif line.startswith("signing-key "): - issues.append("Bridge descriptors should have their signing-key scrubbed: %s" % line) - elif line.startswith("router-signature "): - issues.append("Bridge descriptors should have their signature scrubbed: %s" % line) + for address, _, is_ipv6 in self.or_addresses: + if not is_ipv6 and not address.startswith("10."): + issues.append("or-address line's address should be scrubbed to be '10.x.x.x': %s" % address) + elif is_ipv6 and not address.startswith("fd9f:2e19:3bcf::"): + # TODO: this check isn't quite right because we aren't checking that + # the next grouping of hex digits contains 1-2 digits + issues.append("or-address line's address should be scrubbed to be 'fd9f:2e19:3bcf::xx:xxxx': %s" % address) - self._scrubbing_issues = issues + for line in self.get_unrecognized_lines(): + if line.startswith("onion-key "): + issues.append("Bridge descriptors should have their onion-key scrubbed: %s" % line) + elif line.startswith("signing-key "): + issues.append("Bridge descriptors should have their signing-key scrubbed: %s" % line) + elif line.startswith("router-signature "): + issues.append("Bridge descriptors should have their signature scrubbed: %s" % line) - return self._scrubbing_issues + return issues def _required_fields(self): # bridge required fields are the same as a relay descriptor, minus items diff --git a/stem/prereq.py b/stem/prereq.py index 097847f..d088480 100644 --- a/stem/prereq.py +++ b/stem/prereq.py @@ -22,8 +22,13 @@ Checks for stem dependencies. We require python 2.6 or greater (including the import inspect import sys -IS_CRYPTO_AVAILABLE = None -IS_MOCK_AVAILABLE = None +try: + # added in python 3.2 + from collections import lru_cache +except ImportError: + from stem.util.lru_cache import lru_cache + +CRYPTO_UNAVAILABLE = "Unable to import the pycrypto module. Because of this we'll be unable to verify descriptor signature integrity. You can get pycrypto from: https://www.dlitz.net/software/pycrypto/" def check_requirements(): @@ -62,33 +67,28 @@ def is_python_3(): return sys.version_info[0] == 3 +@lru_cache() def is_crypto_available(): """ - Checks if the pycrypto functions we use are available. + Checks if the pycrypto functions we use are available. This is used for + verifying relay descriptor signatures. :returns: **True** if we can use pycrypto and **False** otherwise """ - global IS_CRYPTO_AVAILABLE - - if IS_CRYPTO_AVAILABLE is None: - from stem.util import log - - try: - from Crypto.PublicKey import RSA - from Crypto.Util import asn1 - from Crypto.Util.number import long_to_bytes - IS_CRYPTO_AVAILABLE = True - except ImportError: - IS_CRYPTO_AVAILABLE = False + from stem.util import log - # the code that verifies relay descriptor signatures uses the python-crypto library - msg = "Unable to import the pycrypto module. Because of this we'll be unable to verify descriptor signature integrity. You can get pycrypto from: https://www.dlitz.net/software/pycrypto/" - log.log_once("stem.prereq.is_crypto_available", log.INFO, msg) - - return IS_CRYPTO_AVAILABLE + try: + from Crypto.PublicKey import RSA + from Crypto.Util import asn1 + from Crypto.Util.number import long_to_bytes + return True + except ImportError: + log.log_once("stem.prereq.is_crypto_available", log.INFO, CRYPTO_UNAVAILABLE) + return False +@lru_cache() def is_mock_available(): """ Checks if the mock module is available. @@ -96,24 +96,19 @@ def is_mock_available(): :returns: **True** if the mock module is available and **False** otherwise """ - global IS_MOCK_AVAILABLE - - if IS_MOCK_AVAILABLE is None: - try: - import mock - - # check for mock's patch.dict() which was introduced in version 0.7.0 + try: + import mock - if not hasattr(mock.patch, 'dict'): - raise ImportError() + # check for mock's patch.dict() which was introduced in version 0.7.0 - # check for mock's new_callable argument for patch() which was introduced in version 0.8.0 + if not hasattr(mock.patch, 'dict'): + raise ImportError() - if not 'new_callable' in inspect.getargspec(mock.patch).args: - raise ImportError() + # check for mock's new_callable argument for patch() which was introduced in version 0.8.0 - IS_MOCK_AVAILABLE = True - except ImportError: - IS_MOCK_AVAILABLE = False + if not 'new_callable' in inspect.getargspec(mock.patch).args: + raise ImportError() - return IS_MOCK_AVAILABLE + return True + except ImportError: + return False diff --git a/stem/response/getinfo.py b/stem/response/getinfo.py index 48c14dd..c613ded 100644 --- a/stem/response/getinfo.py +++ b/stem/response/getinfo.py @@ -59,7 +59,7 @@ class GetInfoResponse(stem.response.ControlMessage): self.entries[key] = value - def assert_matches(self, params): + def _assert_matches(self, params): """ Checks if we match a given set of parameters, and raise a ProtocolError if not. diff --git a/stem/util/proc.py b/stem/util/proc.py index 401c319..fbff14c 100644 --- a/stem/util/proc.py +++ b/stem/util/proc.py @@ -53,15 +53,17 @@ import stem.util.enum from stem.util import log -# cached system values -IS_PROC_AVAILABLE, SYS_START_TIME, SYS_PHYSICAL_MEMORY = None, None, None -CLOCK_TICKS = None +try: + # added in python 3.2 + from collections import lru_cache +except ImportError: + from stem.util.lru_cache import lru_cache # os.sysconf is only defined on unix try: CLOCK_TICKS = os.sysconf(os.sysconf_names["SC_CLK_TCK"]) except AttributeError: - pass + CLOCK_TICKS = None Stat = stem.util.enum.Enum( ("COMMAND", "command"), ("CPU_UTIME", "utime"), @@ -69,6 +71,7 @@ Stat = stem.util.enum.Enum( ) +@lru_cache() def is_available(): """ Checks if proc information is available on this platform. @@ -76,26 +79,20 @@ def is_available(): :returns: **True** if proc contents exist on this platform, **False** otherwise """ - global IS_PROC_AVAILABLE - - if IS_PROC_AVAILABLE is None: - if platform.system() != "Linux": - IS_PROC_AVAILABLE = False - else: - # list of process independent proc paths we use - proc_paths = ("/proc/stat", "/proc/meminfo", "/proc/net/tcp", "/proc/net/udp") - proc_paths_exist = True - - for path in proc_paths: - if not os.path.exists(path): - proc_paths_exist = False - break + if platform.system() != "Linux": + return False + else: + # list of process independent proc paths we use + proc_paths = ("/proc/stat", "/proc/meminfo", "/proc/net/tcp", "/proc/net/udp") - IS_PROC_AVAILABLE = proc_paths_exist + for path in proc_paths: + if not os.path.exists(path): + return False - return IS_PROC_AVAILABLE + return True +@lru_cache() def get_system_start_time(): """ Provides the unix time (seconds since epoch) when the system started. @@ -105,22 +102,20 @@ def get_system_start_time(): :raises: **IOError** if it can't be determined """ - global SYS_START_TIME - if not SYS_START_TIME: - start_time, parameter = time.time(), "system start time" - btime_line = _get_line("/proc/stat", "btime", parameter) - - try: - SYS_START_TIME = float(btime_line.strip().split()[1]) - _log_runtime(parameter, "/proc/stat[btime]", start_time) - except: - exc = IOError("unable to parse the /proc/stat btime entry: %s" % btime_line) - _log_failure(parameter, exc) - raise exc + start_time, parameter = time.time(), "system start time" + btime_line = _get_line("/proc/stat", "btime", parameter) - return SYS_START_TIME + try: + result = float(btime_line.strip().split()[1]) + _log_runtime(parameter, "/proc/stat[btime]", start_time) + return result + except: + exc = IOError("unable to parse the /proc/stat btime entry: %s" % btime_line) + _log_failure(parameter, exc) + raise exc +@lru_cache() def get_physical_memory(): """ Provides the total physical memory on the system in bytes. @@ -130,20 +125,17 @@ def get_physical_memory(): :raises: **IOError** if it can't be determined """ - global SYS_PHYSICAL_MEMORY - if not SYS_PHYSICAL_MEMORY: - start_time, parameter = time.time(), "system physical memory" - mem_total_line = _get_line("/proc/meminfo", "MemTotal:", parameter) + start_time, parameter = time.time(), "system physical memory" + mem_total_line = _get_line("/proc/meminfo", "MemTotal:", parameter) - try: - SYS_PHYSICAL_MEMORY = int(mem_total_line.split()[1]) * 1024 - _log_runtime(parameter, "/proc/meminfo[MemTotal]", start_time) - except: - exc = IOError("unable to parse the /proc/meminfo MemTotal entry: %s" % mem_total_line) - _log_failure(parameter, exc) - raise exc - - return SYS_PHYSICAL_MEMORY + try: + result = int(mem_total_line.split()[1]) * 1024 + _log_runtime(parameter, "/proc/meminfo[MemTotal]", start_time) + return result + except: + exc = IOError("unable to parse the /proc/meminfo MemTotal entry: %s" % mem_total_line) + _log_failure(parameter, exc) + raise exc def get_cwd(pid): diff --git a/stem/version.py b/stem/version.py index 68faa36..bf41898 100644 --- a/stem/version.py +++ b/stem/version.py @@ -247,6 +247,7 @@ class Version(object): return self._compare(other, lambda s, o: s >= o) + @lru_cache() def __hash__(self): my_hash = 0

1 0

[atlas/master] Add two missing "<dl>" HTML tags.
by phw＠torproject.org 12 Oct '13

12 Oct '13

commit 3db77a4a8e8dedb611970901421dfc8243093c06 Author: Philipp Winter <phw(a)torproject.org> Date: Sat Oct 12 19:49:42 2013 +0200 Add two missing "<dl>" HTML tags. --- templates/details/main.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/templates/details/main.html b/templates/details/main.html index 1fc243a..1ee614f 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -104,6 +104,7 @@ </div> <div class="span4"> <h3>Current Status</h3> + <dl> <% if (relay.get('running') === false) { %> <dt><span class="tip" data-content="The time since this relay was last seen online." data-original-title="Downtime">Downtime</span></dt> @@ -116,6 +117,7 @@ <dt><span class="tip" data-content="Whether this relay is listed in the current Tor directory or not." data-original-title="Running">Running</span></dt> <dd><%= relay.get('running') %></dd> + </dl> </div> </div>

1 0

[atlas/master] Display a relay's downtime when it's offline.
by phw＠torproject.org 12 Oct '13

12 Oct '13

commit efbfb130ed25ddfee3f52b549d610257999da71d Author: Philipp Winter <phw(a)torproject.org> Date: Thu Oct 10 00:50:22 2013 +0200 Display a relay's downtime when it's offline. Thanks to "rndm" for the patch. --- js/models/relay.js | 2 ++ templates/details/main.html | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/js/models/relay.js b/js/models/relay.js index 3730d79..06608dc 100644 --- a/js/models/relay.js +++ b/js/models/relay.js @@ -155,6 +155,8 @@ define([ //console.log(relay.uptime.hrfull); relay.uptime = relay.last_restarted ? relay.uptime.millisecs : null; relay.last_restarted = relay.last_restarted ? relay.last_restarted : null; + relay.last_seen = relay.last_seen ? relay.last_seen : null; + relay.downtime = relay.last_seen ? model.parsedate(relay.last_seen).hrfull : null; relay.as_no = relay.as_number ? relay.as_number : null; relay.as_name = relay.as_name ? relay.as_name : null; model.set({badexit: false}); diff --git a/templates/details/main.html b/templates/details/main.html index 722504d..76f83d2 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -98,8 +98,13 @@ <div class="span4"> <h3>Status</h3> - <dt><span class="tip" data-content="Time since when this relay is online." data-original-title="Uptime">Uptime</span></dt> + <% if (relay.get('running') === false) { %> + <dt><span class="tip" data-content="The time since this relay was last seen online." data-original-title="Downtime">Downtime</span></dt> + <dd><%= relay.get('downtime') %></dd> + <% } else {%> + <dt><span class="tip" data-content="The time since this relay is online." data-original-title="Uptime">Uptime</span></dt> <dd><%= relay.get('uptime_hrfull') %></dd> + <% } %> <dt><span class="tip" data-content="Whether this relay is listed in the current Tor directory or not." data-original-title="Running">Running</span></dt> <dd><%= relay.get('running') %></dd>

1 0

[atlas/master] Display additional info if a relay is offline.
by phw＠torproject.org 12 Oct '13

12 Oct '13

commit e71e98f8c8841d7dd88ff2aa217f077d33f2ee81 Author: Philipp Winter <phw(a)torproject.org> Date: Thu Oct 10 00:58:34 2013 +0200 Display additional info if a relay is offline. If a relay is offline, write 'Last Known Properties' instead of merely 'Properties' and display an additional field called 'Last Seen'. That should cause less confusion. --- templates/details/main.html | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/templates/details/main.html b/templates/details/main.html index 542e5a2..1fc243a 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -55,8 +55,15 @@ </div> <div class="span4"> + <% if (relay.get('running') === true) { %> <h3>Properties</h3> <dl> + <% } else { %> + <h3>Last Known Properties</h3> + <dl> + <dt><span class="tip" data-content="Timestamp when the relay was last seen in the consensus." data-original-title="Last seen">Last Seen</span></dt> + <dd><%= relay.get('last_seen') %></dd> + <% } %> <dt><span class="tip" data-content="20-byte unique identifier of the relay." data-original-title="Fingerprint">Fingerprint</span></dt> <dd><%= relay.get('fingerprint') %></dd>

1 0

[atlas/master] Rename 'Status' to 'Current Status'.
by phw＠torproject.org 12 Oct '13

12 Oct '13

commit b3e4d40f3073fff21e18142a360e8bb8cba6f832 Author: Philipp Winter <phw(a)torproject.org> Date: Thu Oct 10 00:53:21 2013 +0200 Rename 'Status' to 'Current Status'. That should cause less confusion for users. --- templates/details/main.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/main.html b/templates/details/main.html index 76f83d2..542e5a2 100644 --- a/templates/details/main.html +++ b/templates/details/main.html @@ -96,7 +96,7 @@ </dl> </div> <div class="span4"> - <h3>Status</h3> + <h3>Current Status</h3> <% if (relay.get('running') === false) { %> <dt><span class="tip" data-content="The time since this relay was last seen online." data-original-title="Downtime">Downtime</span></dt>

1 0

[tor/master] be willing to bootstrap from all three of our directory guards
by arma＠torproject.org 12 Oct '13

12 Oct '13

commit 8f9fb63cdb188e27e39cf063c6a9e94df66cf239 Author: Roger Dingledine <arma(a)torproject.org> Date: Thu Oct 10 20:09:16 2013 -0400 be willing to bootstrap from all three of our directory guards Also fix a bug where if the guard we choose first doesn't answer, we would try the second guard, but once we connected to the second guard we would abandon it and retry the first one, slowing down bootstrapping. The fix in both cases is to treat all our initially chosen guards as acceptable to use. Fixes bug 9946. --- changes/bug9946 | 11 +++++++++++ src/or/entrynodes.c | 22 +++++++++++++++++----- 2 files changed, 28 insertions(+), 5 deletions(-) diff --git a/changes/bug9946 b/changes/bug9946 new file mode 100644 index 0000000..5d1c888 --- /dev/null +++ b/changes/bug9946 @@ -0,0 +1,11 @@ + o Minor bugfixes: + - If the guard we choose first doesn't answer, we would try the + second guard, but once we connected to the second guard we would + abandon it and retry the first one, slowing down bootstrapping. + The fix is to treat all our initially chosen guards as acceptable + to use. Fixes bug 9946; bugfix on 0.1.1.11-alpha. + + o Major bugfixes: + - Stop trying to fetch all our directory information from our first + guard. Discovered while fixing bug 9946; bugfix on 0.2.4.8-alpha. + diff --git a/src/or/entrynodes.c b/src/or/entrynodes.c index f1af75a..2aa063c 100644 --- a/src/or/entrynodes.c +++ b/src/or/entrynodes.c @@ -345,7 +345,7 @@ control_event_guard_deferred(void) * Else, put the one we pick at the end of the list. */ static const node_t * add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, - int for_directory) + int for_discovery, int for_directory) { const node_t *node; entry_guard_t *entry; @@ -404,6 +404,18 @@ add_an_entry_guard(const node_t *chosen, int reset_status, int prepend, * this guard. For details, see the Jan 2010 or-dev thread. */ entry->chosen_on_date = time(NULL) - crypto_rand_int(3600*24*30); entry->chosen_by_version = tor_strdup(VERSION); + + /* Are we picking this guard because all of our current guards are + * down so we need another one (for_discovery is 1), or because we + * decided we need more variety in our guard list (for_discovery is 0)? + * + * Currently we hack this behavior into place by setting "made_contact" + * for guards of the latter variety, so we'll be willing to use any of + * them right off the bat. + */ + if (!for_discovery) + entry->made_contact = 1; + ((node_t*)node)->using_as_guard = 1; if (prepend) smartlist_insert(entry_guards, 0, entry); @@ -437,7 +449,7 @@ pick_entry_guards(const or_options_t *options, int for_directory) tor_assert(entry_guards); while (num_live_entry_guards(for_directory) < num_needed) { - if (!add_an_entry_guard(NULL, 0, 0, for_directory)) + if (!add_an_entry_guard(NULL, 0, 0, 0, for_directory)) break; changed = 1; } @@ -870,7 +882,7 @@ entry_guards_set_from_config(const or_options_t *options) /* Next, the rest of EntryNodes */ SMARTLIST_FOREACH_BEGIN(entry_nodes, const node_t *, node) { - add_an_entry_guard(node, 0, 0, 0); + add_an_entry_guard(node, 0, 0, 1, 0); if (smartlist_len(entry_guards) > options->NumEntryGuards * 10) break; } SMARTLIST_FOREACH_END(node); @@ -1054,7 +1066,7 @@ choose_random_entry_impl(cpath_build_state_t *state, int for_directory, /* XXX if guard doesn't imply fast and stable, then we need * to tell add_an_entry_guard below what we want, or it might * be a long time til we get it. -RD */ - node = add_an_entry_guard(NULL, 0, 0, for_directory); + node = add_an_entry_guard(NULL, 0, 0, 1, for_directory); if (node) { entry_guards_changed(); /* XXX we start over here in case the new node we added shares @@ -2095,7 +2107,7 @@ learned_bridge_descriptor(routerinfo_t *ri, int from_cache) node = node_get_mutable_by_id(ri->cache_info.identity_digest); tor_assert(node); rewrite_node_address_for_bridge(bridge, node); - add_an_entry_guard(node, 1, 1, 0); + add_an_entry_guard(node, 1, 1, 0, 0); log_notice(LD_DIR, "new bridge descriptor '%s' (%s): %s", ri->nickname, from_cache ? "cached" : "fresh", router_describe(ri));

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits October 2013