diff options
| -rw-r--r-- | src/or/connection_edge.c | 3 | ||||
| -rw-r--r-- | src/or/connection_or.c | 4 | ||||
| -rw-r--r-- | src/or/dns.c | 4 | ||||
| -rw-r--r-- | src/or/main.c | 3 |
4 files changed, 8 insertions, 6 deletions
diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 3f33665e1..95088c7c1 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -319,7 +319,8 @@ connection_edge_end(edge_connection_t *conn, uint8_t reason) connection_edge_send_command(conn, RELAY_COMMAND_END, payload, payload_len); } else { - log_debug(LD_EDGE,"No circ to send end on conn (fd "TOR_SOCKET_T_FORMAT").", + log_debug(LD_EDGE,"No circ to send end on conn " + "(fd "TOR_SOCKET_T_FORMAT").", conn->base_.s); } diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 0a3ea7c34..7ac4d1ee9 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -880,8 +880,8 @@ connection_or_group_set_badness(or_connection_t *head, int force) * and this one is open but not canonical. Mark it bad. */ log_info(LD_OR, "Marking OR conn to %s:%d as unsuitable for new circuits: " - "(fd "TOR_SOCKET_T_FORMAT", %d secs old). It is not canonical, and we have " - "another connection to that OR that is.", + "(fd "TOR_SOCKET_T_FORMAT", %d secs old). It is not " + "canonical, and we have another connection to that OR that is.", or_conn->base_.address, or_conn->base_.port, or_conn->base_.s, (int)(now - or_conn->base_.timestamp_created)); connection_or_mark_bad_for_new_circs(or_conn); diff --git a/src/or/dns.c b/src/or/dns.c index e279fbc3b..c81948a60 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1114,8 +1114,8 @@ connection_dns_remove(edge_connection_t *conn) if (pend->conn == conn) { resolve->pending_connections = pend->next; tor_free(pend); - log_debug(LD_EXIT, "First connection (fd "TOR_SOCKET_T_FORMAT") no longer waiting " - "for resolve of %s", + log_debug(LD_EXIT, "First connection (fd "TOR_SOCKET_T_FORMAT") no " + "longer waiting for resolve of %s", conn->base_.s, escaped_safe_str(conn->base_.address)); return; diff --git a/src/or/main.c b/src/or/main.c index 9972e5957..abb1e34fc 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -813,7 +813,8 @@ conn_close_if_marked(int i) } #endif - log_debug(LD_NET,"Cleaning up connection (fd "TOR_SOCKET_T_FORMAT").",conn->s); + log_debug(LD_NET,"Cleaning up connection (fd "TOR_SOCKET_T_FORMAT").", + conn->s); /* If the connection we are about to close was trying to connect to a proxy server and failed, the client won't be able to use that |