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

Merge branch 'maint-0.2.8'

Browse Source
This commit is contained in:
Nick Mathewson 2016-05-11 12:36:55 -04:00
commit 71267bef4c
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug18761 Normal file
View File

@ -0,0 +1,3 @@
o Minor feature (logging):
- When rejecting a misformed INTRODUCE2 cell, only log at PROTOCOL_WARN
severity. Closes ticket 18761.

15
src/or/rendservice.c
View File

@ -1441,6 +1441,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit,
int status = 0, result; int status = 0, result;
const or_options_t *options = get_options(); const or_options_t *options = get_options();
char *err_msg = NULL; char *err_msg = NULL;
int err_msg_severity = LOG_WARN;
const char *stage_descr = NULL; const char *stage_descr = NULL;
int reason = END_CIRC_REASON_TORPROTOCOL; int reason = END_CIRC_REASON_TORPROTOCOL;
/* Service/circuit/key stuff we can learn before parsing */ /* Service/circuit/key stuff we can learn before parsing */
@ -1592,8 +1593,10 @@ rend_service_receive_introduction(origin_circuit_t *circuit,
/* Find the rendezvous point */ /* Find the rendezvous point */
rp = find_rp_for_intro(parsed_req, &err_msg); rp = find_rp_for_intro(parsed_req, &err_msg);
if (!rp) if (!rp) {
err_msg_severity = LOG_PROTOCOL_WARN;
goto log_error; goto log_error;
}
/* Check if we'd refuse to talk to this router */ /* Check if we'd refuse to talk to this router */
if (options->StrictNodes && if (options->StrictNodes &&
@ -1731,7 +1734,7 @@ rend_service_receive_introduction(origin_circuit_t *circuit,
} }
} }
log_warn(LD_REND, "%s on circ %u", err_msg, log_fn(err_msg_severity, LD_REND, "%s on circ %u", err_msg,
(unsigned)circuit->base_.n_circ_id); (unsigned)circuit->base_.n_circ_id);
err: err:
status = -1; status = -1;
@ -1793,7 +1796,7 @@ find_rp_for_intro(const rend_intro_cell_t *intro,
if (!rp) { if (!rp) {
if (err_msg_out) { if (err_msg_out) {
tor_asprintf(&err_msg, tor_asprintf(&err_msg,
"Could build extend_info_t for router %s named " "Couldn't build extend_info_t for router %s named "
"in INTRODUCE2 cell", "in INTRODUCE2 cell",
escaped_safe_str_client(rp_nickname)); escaped_safe_str_client(rp_nickname));
} }
@ -1829,8 +1832,10 @@ find_rp_for_intro(const rend_intro_cell_t *intro,
goto done; goto done;
err: err:
if (err_msg_out) *err_msg_out = err_msg; if (err_msg_out)
else tor_free(err_msg); *err_msg_out = err_msg;
else
tor_free(err_msg);
done: done:
return rp; return rp;