[or-cvs] r9217: Actually, handle_getinfo_helper supports 552 results just fi (in tor/trunk: . src/or)

[nickm at seul.org]

Author: nickm
Date: 2006-12-29 15:49:47 -0500 (Fri, 29 Dec 2006)
New Revision: 9217

Modified:
   tor/trunk/
   tor/trunk/ChangeLog
   tor/trunk/src/or/routerlist.c
Log:
 r11759 at Kushana:  nickm | 2006-12-29 15:21:14 -0500
 Actually, handle_getinfo_helper supports 552 results just fine: just leave *answer unset.



Property changes on: tor/trunk
___________________________________________________________________
 svk:merge ticket from /tor/trunk [r11759] on c95137ef-5f19-0410-b913-86e773d04f59

Modified: tor/trunk/ChangeLog
===================================================================
--- tor/trunk/ChangeLog	2006-12-29 17:10:29 UTC (rev 9216)
+++ tor/trunk/ChangeLog	2006-12-29 20:49:47 UTC (rev 9217)
@@ -143,6 +143,8 @@
       reported by Mike Perry.)
     - Do not report bizarre values for results of accounting GETINFOs
       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

Modified: tor/trunk/src/or/routerlist.c
===================================================================
--- tor/trunk/src/or/routerlist.c	2006-12-29 17:10:29 UTC (rev 9216)
+++ tor/trunk/src/or/routerlist.c	2006-12-29 20:49:47 UTC (rev 9217)
@@ -1031,7 +1031,7 @@
       smartlist_subtract(sl,excludedsmartlist);
     routerlist_sl_remove_unreliable_routers(sl, need_uptime,
                                             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);
     else
       choice = smartlist_choose(sl);
@@ -4208,10 +4208,6 @@
 
   if (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;
 }