diff options
author | Neel Chauhan <neel@neelc.org> | 2017-09-09 17:12:37 -0400 |
---|---|---|
committer | Nick Mathewson <nickm@torproject.org> | 2017-09-12 09:52:07 -0400 |
commit | 42b5e3cbb76eb4a7e0dcca8945217351c3ef1bb4 (patch) | |
tree | d6eccf8ffc2afbf98a68791dff1389c861b2e6a7 | |
parent | 4ace1b96ac2050e2d7c237af6fbf880f38be76bb (diff) | |
download | tor-42b5e3cbb76eb4a7e0dcca8945217351c3ef1bb4.tar.gz tor-42b5e3cbb76eb4a7e0dcca8945217351c3ef1bb4.zip |
Remove networkstatus_nickname_is_unnamed()
-rw-r--r-- | src/or/networkstatus.c | 10 | ||||
-rw-r--r-- | src/or/networkstatus.h | 1 | ||||
-rw-r--r-- | src/or/nodelist.c | 8 |
3 files changed, 0 insertions, 19 deletions
diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 76e8fe792a..014f0f1141 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -804,16 +804,6 @@ networkstatus_get_router_digest_by_nickname(const char *nickname) return strmap_get_lc(named_server_map, nickname); } -/** Return true iff <b>nickname</b> is disallowed from being the nickname - * of any server. */ -int -networkstatus_nickname_is_unnamed(const char *nickname) -{ - if (!unnamed_server_map) - return 0; - return strmap_get_lc(unnamed_server_map, nickname) != NULL; -} - /** How frequently do directory authorities re-download fresh networkstatus * documents? */ #define AUTHORITY_NS_CACHE_INTERVAL (10*60) diff --git a/src/or/networkstatus.h b/src/or/networkstatus.h index 145be37d12..34643667a1 100644 --- a/src/or/networkstatus.h +++ b/src/or/networkstatus.h @@ -63,7 +63,6 @@ MOCK_DECL(routerstatus_t *, router_get_mutable_consensus_status_by_descriptor_digest, (networkstatus_t *consensus, const char *digest)); const char *networkstatus_get_router_digest_by_nickname(const char *nickname); -int networkstatus_nickname_is_unnamed(const char *nickname); int we_want_to_fetch_flavor(const or_options_t *options, int flavor); int we_want_to_fetch_unknown_auth_certs(const or_options_t *options); void networkstatus_consensus_download_failed(int status_code, diff --git a/src/or/nodelist.c b/src/or/nodelist.c index 00b8fb144f..394c3ae736 100644 --- a/src/or/nodelist.c +++ b/src/or/nodelist.c @@ -859,14 +859,6 @@ node_get_by_nickname,(const char *nickname, unsigned flags)) return node_get_by_id(named_id); } - /* Is it marked as owned-by-someone-else? */ - if (networkstatus_nickname_is_unnamed(nickname)) { - log_info(LD_GENERAL, "The name %s is listed as Unnamed: there is some " - "router that holds it, but not one listed in the current " - "consensus.", escaped(nickname)); - return NULL; - } - /* Okay, so the name is not canonical for anybody. */ { smartlist_t *matches = smartlist_new(); |