summaryrefslogtreecommitdiff
path: root/src/or/control.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2012-11-02 14:22:21 -0400
committerNick Mathewson <nickm@torproject.org>2012-11-02 14:22:21 -0400
commit1bfda600c338cd8f7d6b9acc7613b5567e6ee03f (patch)
treec975c6ff132d9aa2b7431a82c51b041722b55f3a /src/or/control.c
parent07656d70ed3bd71fa1eec229c823187864494e9c (diff)
downloadtor-1bfda600c338cd8f7d6b9acc7613b5567e6ee03f.tar.gz
tor-1bfda600c338cd8f7d6b9acc7613b5567e6ee03f.zip
Add a TOR_SOCKET_T_FORMAT construction for logging sockets.
We need this since win64 has a 64-bit SOCKET type. Based on a patch from yayooo for 7260, forward-ported to 0.2.4.
Diffstat (limited to 'src/or/control.c')
-rw-r--r--src/or/control.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/or/control.c b/src/or/control.c
index ad2f2788f4..ff29b90294 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -1220,7 +1220,8 @@ handle_control_authenticate(control_connection_t *conn, uint32_t len,
connection_mark_for_close(TO_CONN(conn));
return 0;
ok:
- log_info(LD_CONTROL, "Authenticated control connection (%d)", conn->base_.s);
+ log_info(LD_CONTROL, "Authenticated control connection ("TOR_SOCKET_T_FORMAT
+ ")", conn->base_.s);
send_control_done(conn);
conn->base_.state = CONTROL_CONN_STATE_OPEN;
tor_free(password);