mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-20 10:12:15 +01:00
Code Issues Projects Releases Wiki Activity

Log the origin address of controller connections

Browse Source 
Resolves 9698; patch from "sigpipe".
This commit is contained in:
Nick Mathewson 2013-10-25 11:52:02 -04:00
parent 338bcad9e4
commit 4b8282e50c
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
changes/bug9698 Normal file
View File

@ -0,0 +1,3 @@
o Minor features:
- When receiving a new controller connection, log the origin address.
Resolves ticket 9698; patch from "sigpipe".

7
src/or/connection.c
View File

@ -334,7 +334,6 @@ control_connection_new(int socket_family)
tor_malloc_zero(sizeof(control_connection_t)); tor_malloc_zero(sizeof(control_connection_t));
connection_init(time(NULL), connection_init(time(NULL),
TO_CONN(control_conn), CONN_TYPE_CONTROL, socket_family); TO_CONN(control_conn), CONN_TYPE_CONTROL, socket_family);
log_notice(LD_CONTROL, "New control connection opened.");
return control_conn; return control_conn;
} }
@ -1377,11 +1376,17 @@ connection_handle_listener_read(connection_t *conn, int new_type)
TO_ENTRY_CONN(newconn)->socks_request->socks_prefer_no_auth = TO_ENTRY_CONN(newconn)->socks_request->socks_prefer_no_auth =
TO_LISTENER_CONN(conn)->socks_prefer_no_auth; TO_LISTENER_CONN(conn)->socks_prefer_no_auth;
} }
if (new_type == CONN_TYPE_CONTROL) {
log_notice(LD_CONTROL, "New control connection opened from %s.",
fmt_and_decorate_addr(&addr));
}
} else if (conn->socket_family == AF_UNIX) { } else if (conn->socket_family == AF_UNIX) {
/* For now only control ports can be Unix domain sockets /* For now only control ports can be Unix domain sockets
* and listeners at the same time */ * and listeners at the same time */
tor_assert(conn->type == CONN_TYPE_CONTROL_LISTENER); tor_assert(conn->type == CONN_TYPE_CONTROL_LISTENER);
tor_assert(new_type == CONN_TYPE_CONTROL);
log_notice(LD_CONTROL, "New control connection opened.");
newconn = connection_new(new_type, conn->socket_family); newconn = connection_new(new_type, conn->socket_family);
newconn->s = news; newconn->s = news;