commit dbf1725a135405cfa3e4aea9d66e0d62fed1f360 Author: rl1987 rl1987@sdf.lonestar.org Date: Thu Jan 3 10:36:38 2019 +0200
Completely remove 'GETINFO status/version/num-{concurring,versioning}' --- changes/ticket28757 | 5 +++++ src/feature/control/control.c | 9 --------- 2 files changed, 5 insertions(+), 9 deletions(-)
diff --git a/changes/ticket28757 b/changes/ticket28757 new file mode 100644 index 000000000..62c6d099f --- /dev/null +++ b/changes/ticket28757 @@ -0,0 +1,5 @@ + o Removed features: + - Stop responding to 'GETINFO status/version/num-concurring' and + 'GETINFO status/version/num-versioning' control port commands, as those + were deprecated back in 0.2.0.30. Also stop listing them in output of + 'GETINFO info/names'. Resolves ticket 28757. diff --git a/src/feature/control/control.c b/src/feature/control/control.c index da62c9498..f10d5eb84 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -3069,11 +3069,6 @@ getinfo_helper_events(control_connection_t *control_conn, case VS_UNKNOWN: *answer = tor_strdup("unknown"); break; default: tor_fragile_assert(); } - } else if (!strcmp(question, "status/version/num-versioning") || - !strcmp(question, "status/version/num-concurring")) { - tor_asprintf(answer, "%d", get_n_authorities(V3_DIRINFO)); - log_warn(LD_GENERAL, "%s is deprecated; it no longer gives useful " - "information", question); } } else if (!strcmp(question, "status/clients-seen")) { char *bridge_stats = geoip_get_bridge_stats_controller(time(NULL)); @@ -3366,10 +3361,6 @@ static const getinfo_item_t getinfo_items[] = { "A fresh relay/ei descriptor pair for Tor's current state. Not stored."), DOC("status/version/recommended", "List of currently recommended versions."), DOC("status/version/current", "Status of the current version."), - DOC("status/version/num-versioning", "Number of versioning authorities."), - DOC("status/version/num-concurring", - "Number of versioning authorities agreeing on the status of the " - "current version"), ITEM("address", misc, "IP address of this Tor host, if we can guess it."), ITEM("traffic/read", misc,"Bytes read since the process was started."), ITEM("traffic/written", misc,