diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-08-22 18:47:57 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-08-22 18:47:57 -0400 |
| commit | d7a3e336ee505bcbeb30117d91067810ad096130 (patch) | |
| tree | 49197c7181ff70a6dd6c0e8dd88fb72eb77c2629 /src/or/circuitbuild.c | |
| parent | 40887b4d2ec2e1865df8f381aa1387ba4ee10eba (diff) | |
| download | tor-d7a3e336ee505bcbeb30117d91067810ad096130.tar.gz tor-d7a3e336ee505bcbeb30117d91067810ad096130.zip | |
Remove some support for nickname-based hexdigests
We once used $X=N to mean "A relay with RSA ID digest X with the
Named flag and the nickname N." But authorities no longer assign
the Named flag.
Diffstat (limited to 'src/or/circuitbuild.c')
| -rw-r--r-- | src/or/circuitbuild.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/or/circuitbuild.c b/src/or/circuitbuild.c index 257edab50b..fa55cae545 100644 --- a/src/or/circuitbuild.c +++ b/src/or/circuitbuild.c @@ -289,14 +289,9 @@ circuit_list_path_impl(origin_circuit_t *circ, int verbose, int verbose_names) base16_encode(elt+1, HEX_DIGEST_LEN+1, id, DIGEST_LEN); } } else { /* ! verbose_names */ - node = node_get_by_id(id); - if (node && node_is_named(node)) { - elt = tor_strdup(node_get_nickname(node)); - } else { - elt = tor_malloc(HEX_DIGEST_LEN+2); - elt[0] = '$'; - base16_encode(elt+1, HEX_DIGEST_LEN+1, id, DIGEST_LEN); - } + elt = tor_malloc(HEX_DIGEST_LEN+2); + elt[0] = '$'; + base16_encode(elt+1, HEX_DIGEST_LEN+1, id, DIGEST_LEN); } tor_assert(elt); if (verbose) { |