mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 14:51:11 +01:00
Code Issues Projects Releases Wiki Activity

While I'm at it, refactor control.c a little so that the dead code no longer exists.

Browse source 
svn:r17810
This commit is contained in:
Nick Mathewson 2008-12-29 14:21:25 +00:00
parent 272b007268
commit a42e82b0de
1 changed files with 9 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/or/control.c
View file

@ -770,12 +770,9 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body,
} }
tor_free(config); tor_free(config);
if ((opt_err=options_trial_assign(lines, use_defaults, opt_err = options_trial_assign(lines, use_defaults, clear_first, &errstring);
clear_first, &errstring)) != SETOPT_OK) { {
const char *msg; const char *msg;
log_warn(LD_CONTROL,
"Controller gave us config lines that didn't validate: %s",
errstring);
switch (opt_err) { switch (opt_err) {
case SETOPT_ERR_MISC: case SETOPT_ERR_MISC:
msg = "552 Unrecognized option"; msg = "552 Unrecognized option";
@ -791,20 +788,18 @@ control_setconf_helper(control_connection_t *conn, uint32_t len, char *body,
msg = "553 Unable to set option"; msg = "553 Unable to set option";
break; break;
case SETOPT_OK: case SETOPT_OK:
/* (It's okay if we can never get to this point.) */ config_free_lines(lines);
/* coverity[dead_error_line] */ send_control_done(conn);
msg = "551 Internal error"; return 0;
tor_fragile_assert();
break;
} }
log_warn(LD_CONTROL,
"Controller gave us config lines that didn't validate: %s",
errstring);
connection_printf_to_buf(conn, "%s: %s\r\n", msg, errstring); connection_printf_to_buf(conn, "%s: %s\r\n", msg, errstring);
config_free_lines(lines); config_free_lines(lines);
tor_free(errstring); tor_free(errstring);
return 0; return 0;
} }
config_free_lines(lines);
send_control_done(conn);
return 0;
} }
/** Called when we receive a SETCONF message: parse the body and try /** Called when we receive a SETCONF message: parse the body and try
@ -1214,13 +1209,8 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
err: err:
tor_free(password); tor_free(password);
if (!errstr) {
/* (It's okay if we can never get to this point.) */
/* coverity[dead_error_line] */
errstr = "Unknown reason.";
}
connection_printf_to_buf(conn, "515 Authentication failed: %s\r\n", connection_printf_to_buf(conn, "515 Authentication failed: %s\r\n",
errstr); errstr ? errstr : "Unknown reason.");
connection_mark_for_close(TO_CONN(conn)); connection_mark_for_close(TO_CONN(conn));
return 0; return 0;
ok: ok: