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

simplify getconf by using reply lines

Browse Source 
In handle_control_getconf(), use the new control reply line
abstraction to simplify output generation.  Previously, this function
explicitly checked for whether it should generate a MidReplyLine or an
EndReplyLine.  control_write_reply_lines() now abstracts this check.

Part of #30984.
This commit is contained in:
Taylor Yu 2019-07-03 23:48:17 -05:00
parent 1a68a18093
commit c744d23c8d
1 changed files with 9 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/feature/control/control_cmd.c
View File

@ -289,26 +289,23 @@ handle_control_getconf(control_connection_t *conn,
const smartlist_t *questions = args->args; const smartlist_t *questions = args->args;
smartlist_t *answers = smartlist_new(); smartlist_t *answers = smartlist_new();
smartlist_t *unrecognized = smartlist_new(); smartlist_t *unrecognized = smartlist_new();
char *msg = NULL;
size_t msg_len;
const or_options_t *options = get_options(); const or_options_t *options = get_options();
int i, len;
SMARTLIST_FOREACH_BEGIN(questions, const char *, q) { SMARTLIST_FOREACH_BEGIN(questions, const char *, q) {
if (!option_is_recognized(q)) { if (!option_is_recognized(q)) {
smartlist_add(unrecognized, (char*) q); control_reply_add_printf(unrecognized, 552,
"Unrecognized configuration key \"%s\"", q);
} else { } else {
config_line_t *answer = option_get_assignment(options,q); config_line_t *answer = option_get_assignment(options,q);
if (!answer) { if (!answer) {
const char *name = option_get_canonical_name(q); const char *name = option_get_canonical_name(q);
smartlist_add_asprintf(answers, "250-%s\r\n", name); control_reply_add_1kv(answers, 250, KV_OMIT_VALS, name, "");
} }
while (answer) { while (answer) {
config_line_t *next; config_line_t *next;
smartlist_add_asprintf(answers, "250-%s=%s\r\n", control_reply_add_1kv(answers, 250, KV_RAW, answer->key,
answer->key, answer->value); answer->value);
next = answer->next; next = answer->next;
tor_free(answer->key); tor_free(answer->key);
tor_free(answer->value); tor_free(answer->value);
@ -318,20 +315,10 @@ handle_control_getconf(control_connection_t *conn,
} }
} SMARTLIST_FOREACH_END(q); } SMARTLIST_FOREACH_END(q);
if ((len = smartlist_len(unrecognized))) { if (smartlist_len(unrecognized)) {
for (i=0; i < len-1; ++i) control_write_reply_lines(conn, unrecognized);
control_printf_midreply(conn, 552, } else if (smartlist_len(answers)) {
"Unrecognized configuration key \"%s\"", control_write_reply_lines(conn, answers);
(char*)smartlist_get(unrecognized, i));
control_printf_endreply(conn, 552,
"Unrecognized configuration key \"%s\"",
(char*)smartlist_get(unrecognized, len-1));
} else if ((len = smartlist_len(answers))) {
char *tmp = smartlist_get(answers, len-1);
tor_assert(strlen(tmp)>4);
tmp[3] = ' ';
msg = smartlist_join_strings(answers, "", 0, &msg_len);
connection_buf_add(msg, msg_len, TO_CONN(conn));
} else { } else {
send_control_done(conn); send_control_done(conn);
} }
@ -340,8 +327,6 @@ handle_control_getconf(control_connection_t *conn,
smartlist_free(answers); smartlist_free(answers);
smartlist_free(unrecognized); smartlist_free(unrecognized);
tor_free(msg);
return 0; return 0;
} }