From 7ee99ba342bea0e232df3f624939688bce084809 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 29 Dec 2006 20:49:47 +0000 Subject: [PATCH] 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 --- ChangeLog | 2 ++ src/or/routerlist.c | 6 +----- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 773aa8bfec..4d3ab05657 100644 --- a/ChangeLog +++ b/ChangeLog @@ -143,6 +143,8 @@ Changes in version 0.1.2.5-xxxx - 200?-??-?? 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 diff --git a/src/or/routerlist.c b/src/or/routerlist.c index fe462e3ec4..92ae7da9e9 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1031,7 +1031,7 @@ router_choose_random_node(const char *preferred, 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 @@ getinfo_helper_networkstatus(control_connection_t *conn, 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; }