mirror/tor
0
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-09-20 12:22:14 +02:00
Code

Merge remote-tracking branch 'tor-github/pr/627'

Browse Source
This commit is contained in:
Nick Mathewson 2019-01-09 15:46:14 -05:00
commit 2f0e187191
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/ticket28757 Normal file
View File

@ -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.

9
src/feature/control/control.c
View File

@ -3089,11 +3089,6 @@ getinfo_helper_events(control_connection_t *control_conn,
case VS_UNKNOWN: *answer = tor_strdup("unknown"); break; case VS_UNKNOWN: *answer = tor_strdup("unknown"); break;
default: tor_fragile_assert(); 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")) { } else if (!strcmp(question, "status/clients-seen")) {
char *bridge_stats = geoip_get_bridge_stats_controller(time(NULL)); char *bridge_stats = geoip_get_bridge_stats_controller(time(NULL));
@ -3386,10 +3381,6 @@ static const getinfo_item_t getinfo_items[] = {
"A fresh relay/ei descriptor pair for Tor's current state. Not stored."), "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/recommended", "List of currently recommended versions."),
DOC("status/version/current", "Status of the current version."), 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("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/read", misc,"Bytes read since the process was started."),
ITEM("traffic/written", misc, ITEM("traffic/written", misc,