1 files changed, 5 insertions, 47 deletions

diff --git a/src/or/dirserv.c b/src/or/dirserv.c
index a64a01bb8..acce30964 100644
--- a/src/or/dirserv.c
+++ b/src/or/dirserv.c
@@ -834,46 +834,6 @@ directory_remove_invalid(void)
   routerlist_assert_ok(rl);
 }
 
-/** Write a list of unregistered descriptors into a newly allocated
- * string and return it. Used by dirserv operators to keep track of
- * fast nodes that haven't registered.
- */
-int
-getinfo_helper_dirserv_unregistered(control_connection_t *control_conn,
-                                    const char *question, char **answer_out)
-{
-  smartlist_t *answerlist;
-  char buf[1024];
-  char *answer;
-  int min_bw = atoi(question);
-  routerlist_t *rl = router_get_routerlist();
-
-  (void) control_conn;
-
-  if (strcmpstart(question, "unregistered-servers-"))
-    return 0;
-  question += strlen("unregistered-servers-");
-
-  answerlist = smartlist_create();
-  SMARTLIST_FOREACH(rl->routers, routerinfo_t *, ent, {
-    uint32_t r = dirserv_router_get_status(ent, NULL);
-    if (router_get_advertised_bandwidth(ent) >= (size_t)min_bw &&
-        !(r & FP_NAMED)) {
-      /* then log this one */
-      tor_snprintf(buf, sizeof(buf),
-                   "%s: BW %d on '%s'.",
-                   ent->nickname, router_get_advertised_bandwidth(ent),
-                   ent->platform ? ent->platform : "");
-      smartlist_add(answerlist, tor_strdup(buf));
-    }
-  });
-  answer = smartlist_join_strings(answerlist, "\r\n", 0, NULL);
-  SMARTLIST_FOREACH(answerlist, char *, cp, tor_free(cp));
-  smartlist_free(answerlist);
-  *answer_out = answer;
-  return 0;
-}
-
 /** Mark the directory as <b>dirty</b> -- when we're next asked for a
  * directory, we will rebuild it instead of reusing the most recently
  * generated one.
@@ -964,7 +924,6 @@ dirserv_set_router_is_running(routerinfo_t *router, time_t now)
  * *<b>router_status_out</b>.  Return 0 on success, -1 on failure.
  *
  * If for_controller is true, include the routers with very old descriptors.
- * If for_controller is &gt;1, use the verbose nickname format.
  */
 int
 list_server_status_v1(smartlist_t *routers, char **router_status_out,
@@ -984,23 +943,22 @@ list_server_status_v1(smartlist_t *routers, char **router_status_out,
 
   rs_entries = smartlist_create();
 
-  SMARTLIST_FOREACH(routers, routerinfo_t *, ri,
-  {
+  SMARTLIST_FOREACH_BEGIN(routers, routerinfo_t *, ri) {
     if (authdir) {
       /* Update router status in routerinfo_t. */
       dirserv_set_router_is_running(ri, now);
     }
-    if (for_controller == 1 || ri->cache_info.published_on >= cutoff)
-      smartlist_add(rs_entries, list_single_server_status(ri, ri->is_running));
-    else if (for_controller > 2) {
+    if (for_controller) {
       char name_buf[MAX_VERBOSE_NICKNAME_LEN+2];
       char *cp = name_buf;
       if (!ri->is_running)
         *cp++ = '!';
       router_get_verbose_nickname(cp, ri);
       smartlist_add(rs_entries, tor_strdup(name_buf));
+    } else if (ri->cache_info.published_on >= cutoff) {
+      smartlist_add(rs_entries, list_single_server_status(ri, ri->is_running));
     }
-  });
+  } SMARTLIST_FOREACH_END(ri);
 
   *router_status_out = smartlist_join_strings(rs_entries, " ", 0, NULL);