Browse Source

r11759@Kushana: nickm | 2006-12-29 15:21:14 -0500
Actually, handle_getinfo_helper supports 552 results just fine: just leave *answer unset.


svn:r9217

Nick Mathewson 19 years ago
parent
commit
7ee99ba342
2 changed files with 3 additions and 5 deletions
  1. 2 0
      ChangeLog
  2. 1 5
      src/or/routerlist.c

+ 2 - 0
ChangeLog

@@ -143,6 +143,8 @@ Changes in version 0.1.2.5-xxxx - 200?-??-??
       reported by Mike Perry.)
       reported by Mike Perry.)
     - Do not report bizarre values for results of accounting GETINFOs
     - Do not report bizarre values for results of accounting GETINFOs
       when the last second's write or read exceeds the alloted bandwidth.
       when the last second's write or read exceeds the alloted bandwidth.
+    - Report "unrecognized key" rather than an empty string when the
+      controller tries to fetch a networkstatus that doesn't exist.
 
 
 
 
 Changes in version 0.1.2.4-alpha - 2006-12-03
 Changes in version 0.1.2.4-alpha - 2006-12-03

+ 1 - 5
src/or/routerlist.c

@@ -1031,7 +1031,7 @@ router_choose_random_node(const char *preferred,
       smartlist_subtract(sl,excludedsmartlist);
       smartlist_subtract(sl,excludedsmartlist);
     routerlist_sl_remove_unreliable_routers(sl, need_uptime,
     routerlist_sl_remove_unreliable_routers(sl, need_uptime,
                                             need_capacity, need_guard);
                                             need_capacity, need_guard);
-    if (need_capacity) /* XXXX012 Is this documented in path spec. -NM */
+    if (need_capacity)
       choice = routerlist_sl_choose_by_bandwidth(sl, weight_for_exit);
       choice = routerlist_sl_choose_by_bandwidth(sl, weight_for_exit);
     else
     else
       choice = smartlist_choose(sl);
       choice = smartlist_choose(sl);
@@ -4208,10 +4208,6 @@ getinfo_helper_networkstatus(control_connection_t *conn,
 
 
   if (status) {
   if (status) {
     *answer = networkstatus_getinfo_helper_single(&status->status);
     *answer = networkstatus_getinfo_helper_single(&status->status);
-  } else {
-    *answer = tor_strdup("");
-    /* XXXX012 this should return a 552, not a 250; but handle_getinfo_helper()
-     * isn't set up to handle that. That should be fixed too. :) -RD */
   }
   }
   return 0;
   return 0;
 }
 }