nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-24 20:33:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Use the new circ-description function for GETINFO circuit-status

Browse Source
This commit is contained in:
Robert Ransom 2011-06-23 14:59:06 -07:00
parent b7c765b1b1
commit c818f1f25d
1 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/or/control.c
View File

@ -1849,30 +1849,29 @@ getinfo_helper_events(control_connection_t *control_conn,
circuit_t *circ; circuit_t *circ;
smartlist_t *status = smartlist_create(); smartlist_t *status = smartlist_create();
for (circ = _circuit_get_global_list(); circ; circ = circ->next) { for (circ = _circuit_get_global_list(); circ; circ = circ->next) {
char *s, *path; char *s, *circdesc;
size_t slen; size_t slen;
const char *state; const char *state;
const char *purpose;
if (! CIRCUIT_IS_ORIGIN(circ) || circ->marked_for_close) if (! CIRCUIT_IS_ORIGIN(circ) || circ->marked_for_close)
continue; continue;
path = circuit_list_path_for_controller(TO_ORIGIN_CIRCUIT(circ));
if (circ->state == CIRCUIT_STATE_OPEN) if (circ->state == CIRCUIT_STATE_OPEN)
state = "BUILT"; state = "BUILT";
else if (strlen(path)) else if (TO_ORIGIN_CIRCUIT(circ)->cpath)
state = "EXTENDED"; state = "EXTENDED";
else else
state = "LAUNCHED"; state = "LAUNCHED";
purpose = circuit_purpose_to_controller_string(circ->purpose); circdesc = circuit_describe_status_for_controller(
slen = strlen(path)+strlen(state)+strlen(purpose)+30; TO_ORIGIN_CIRCUIT(circ));
slen = strlen(circdesc)+strlen(state)+30;
s = tor_malloc(slen+1); s = tor_malloc(slen+1);
tor_snprintf(s, slen, "%lu %s%s%s PURPOSE=%s", tor_snprintf(s, slen, "%lu %s%s%s",
(unsigned long)TO_ORIGIN_CIRCUIT(circ)->global_identifier, (unsigned long)TO_ORIGIN_CIRCUIT(circ)->global_identifier,
state, *path ? " " : "", path, purpose); state, *circdesc ? " " : "", circdesc);
smartlist_add(status, s); smartlist_add(status, s);
tor_free(path); tor_free(circdesc);
} }
*answer = smartlist_join_strings(status, "\r\n", 0, NULL); *answer = smartlist_join_strings(status, "\r\n", 0, NULL);
SMARTLIST_FOREACH(status, char *, cp, tor_free(cp)); SMARTLIST_FOREACH(status, char *, cp, tor_free(cp));