aboutsummaryrefslogtreecommitdiff
path: root/src/or/dirserv.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2004-10-13 01:13:37 +0000
committerNick Mathewson <nickm@torproject.org>2004-10-13 01:13:37 +0000
commit9c49947163815cb5abb9f94a520e0323719ca0c5 (patch)
tree400212bc3733ac70b9357dcec4f1fa41833d17d1 /src/or/dirserv.c
parentfe54bd00b9ebe8c5533a8241f11c29245d5ddf2b (diff)
downloadtor-9c49947163815cb5abb9f94a520e0323719ca0c5.tar
tor-9c49947163815cb5abb9f94a520e0323719ca0c5.tar.gz
Check fingerprint list before generating running-routers lists; also add as-yet-uncalled function to update an OR connection nickname on the fly
svn:r2458
Diffstat (limited to 'src/or/dirserv.c')
-rw-r--r--src/or/dirserv.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index 7b34d645a..5f0e1d084 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -474,12 +474,13 @@ list_running_servers(char **nicknames_out)
get_connection_array(&connection_array, &n_conns);
for (i = 0; i<n_conns; ++i) {
- char *name;
+ char *name, *cp;
conn = connection_array[i];
if (conn->type != CONN_TYPE_OR || !conn->nickname)
continue; /* only list ORs. */
- if (router_nickname_is_approved(conn->nickname, conn->identity_digest)) {
- name = tor_strdup(conn->nickname);
+ cp = dirserv_get_nickname_by_digest(conn->identity_digest);
+ if (cp) {
+ name = tor_strdup(cp);
} else {
name = tor_malloc(HEX_DIGEST_LEN+2);
*name = '$';