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

dir: Remove connection_dir_is_anonymous() logging

Browse Source 
First, remove the HSDir mention which should not be in that generic function.
Second, move them to debug() level since they are possible error case.

Part of #31958

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2019-10-24 11:23:31 -04:00
parent 09468cc58b
commit 985717675c
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/feature/dircommon/directory.c
View File

@ -212,7 +212,8 @@ connection_dir_is_anonymous(const dir_connection_t *dir_conn)
* be closed or marked for close. */ * be closed or marked for close. */
if (linked_conn == NULL || linked_conn->magic != EDGE_CONNECTION_MAGIC || if (linked_conn == NULL || linked_conn->magic != EDGE_CONNECTION_MAGIC ||
conn->linked_conn_is_closed || conn->linked_conn->marked_for_close) { conn->linked_conn_is_closed || conn->linked_conn->marked_for_close) {
log_info(LD_DIR, "Rejected HSDir request: not linked to edge"); log_debug(LD_DIR, "Directory connection is not anonymous: "
"not linked to edge");
return false; return false;
} }
@ -221,7 +222,8 @@ connection_dir_is_anonymous(const dir_connection_t *dir_conn)
/* Can't be a circuit we initiated and without a circuit, no channel. */ /* Can't be a circuit we initiated and without a circuit, no channel. */
if (circ == NULL || CIRCUIT_IS_ORIGIN(circ)) { if (circ == NULL || CIRCUIT_IS_ORIGIN(circ)) {
log_info(LD_DIR, "Rejected HSDir request: not on OR circuit"); log_debug(LD_DIR, "Directory connection is not anonymous: "
"not on OR circuit");
return false; return false;
} }
@ -230,6 +232,8 @@ connection_dir_is_anonymous(const dir_connection_t *dir_conn)
* not continue so return that it is not anonymous since we can not know for * not continue so return that it is not anonymous since we can not know for
* sure if it is. */ * sure if it is. */
if (circ->marked_for_close) { if (circ->marked_for_close) {
log_debug(LD_DIR, "Directory connection is not anonymous: "
"circuit marked for close");
return false; return false;
} }
@ -237,7 +241,8 @@ connection_dir_is_anonymous(const dir_connection_t *dir_conn)
* BUG() because if the circuit is not mark for close, we ought to have a * BUG() because if the circuit is not mark for close, we ought to have a
* p_chan else we have a code flow issue. */ * p_chan else we have a code flow issue. */
if (BUG(CONST_TO_OR_CIRCUIT(circ)->p_chan == NULL)) { if (BUG(CONST_TO_OR_CIRCUIT(circ)->p_chan == NULL)) {
log_info(LD_DIR, "Rejected HSDir request: no p_chan"); log_debug(LD_DIR, "Directory connection is not anonymous: "
"no p_chan on circuit");
return false; return false;
} }