summaryrefslogtreecommitdiff
path: root/src/or/connection_or.c
diff options
context:
space:
mode:
authorSebastian Hahn <sebastian@torproject.org>2014-09-04 23:16:51 +0200
committerNick Mathewson <nickm@torproject.org>2014-09-09 11:50:21 -0400
commit607724c696a6e1bb10c8a955dac38f0ea947ce34 (patch)
tree126d7b64ea14a844b110c5e4b0ee9a0c848aaaa4 /src/or/connection_or.c
parent835672166255fd090a2fb92ccf48ec0cfd8779b7 (diff)
downloadtor-607724c696a6e1bb10c8a955dac38f0ea947ce34.tar.gz
tor-607724c696a6e1bb10c8a955dac38f0ea947ce34.zip
Remove support for naming directory authorities
This implements the meat of #12899. This commit should simply remove the parts of Tor dirauths used to check whether a relay was supposed to be named or not, it doesn't yet convert to a new mechanism for reject/invalid/baddir/badexiting relays.
Diffstat (limited to 'src/or/connection_or.c')
-rw-r--r--src/or/connection_or.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/src/or/connection_or.c b/src/or/connection_or.c
index 16f87349fc..5057348ed0 100644
--- a/src/or/connection_or.c
+++ b/src/or/connection_or.c
@@ -908,18 +908,11 @@ connection_or_init_conn_from_address(or_connection_t *conn,
tor_free(conn->base_.address);
conn->base_.address = tor_dup_addr(&node_ap.addr);
} else {
- const char *n;
- /* If we're an authoritative directory server, we may know a
- * nickname for this router. */
- n = dirserv_get_nickname_by_digest(id_digest);
- if (n) {
- conn->nickname = tor_strdup(n);
- } else {
- conn->nickname = tor_malloc(HEX_DIGEST_LEN+2);
- conn->nickname[0] = '$';
- base16_encode(conn->nickname+1, HEX_DIGEST_LEN+1,
- conn->identity_digest, DIGEST_LEN);
- }
+ conn->nickname = tor_malloc(HEX_DIGEST_LEN+2);
+ conn->nickname[0] = '$';
+ base16_encode(conn->nickname+1, HEX_DIGEST_LEN+1,
+ conn->identity_digest, DIGEST_LEN);
+
tor_free(conn->base_.address);
conn->base_.address = tor_dup_addr(addr);
}