mirror of
https://gitlab.torproject.org/tpo/core/tor.git
synced 2024-12-06 19:41:15 +01:00
Refactor the safe_str_*() API to make more sense.
The new rule is: safe_str_X() means "this string is a piece of X information; make it safe to log." safe_str() on its own means "this string is a piece of who-knows-what; make it safe to log".
This commit is contained in:
+3
-3
@@ -405,7 +405,7 @@ command_process_relay_cell(cell_t *cell, or_connection_t *conn)
|
||||
log_fn(LOG_PROTOCOL_WARN, LD_OR,
|
||||
"Received too many RELAY_EARLY cells on circ %d from %s:%d."
|
||||
" Closing circuit.",
|
||||
cell->circ_id, safe_str_relay(conn->_base.address),
|
||||
cell->circ_id, safe_str(conn->_base.address),
|
||||
conn->_base.port);
|
||||
circuit_mark_for_close(circ, END_CIRC_REASON_TORPROTOCOL);
|
||||
return;
|
||||
@@ -515,7 +515,7 @@ command_process_versions_cell(var_cell_t *cell, or_connection_t *conn)
|
||||
|
||||
log_info(LD_OR, "Negotiated version %d with %s:%d; sending NETINFO.",
|
||||
highest_supported_version,
|
||||
safe_str(conn->_base.address),
|
||||
safe_str_client(conn->_base.address),
|
||||
conn->_base.port);
|
||||
tor_assert(conn->link_proto >= 2);
|
||||
|
||||
@@ -629,7 +629,7 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn)
|
||||
else
|
||||
log_info(LD_OR, "Got good NETINFO cell from %s:%d; OR connection is now "
|
||||
"open, using protocol version %d",
|
||||
safe_str(conn->_base.address),
|
||||
safe_str_client(conn->_base.address),
|
||||
conn->_base.port, (int)conn->link_proto);
|
||||
assert_connection_ok(TO_CONN(conn),time(NULL));
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user