diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-11-13 15:33:46 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-11-15 11:17:22 -0500 |
| commit | 2c15b6538123047c258987b00475fa658ca14878 (patch) | |
| tree | 6a01a36619cd1df7228b9a50e20a15087d3e014e /src/feature | |
| parent | ccbb36048f5167b9d5011b7c8b0d2c346ce567e8 (diff) | |
| download | tor-2c15b6538123047c258987b00475fa658ca14878.tar.gz tor-2c15b6538123047c258987b00475fa658ca14878.zip | |
Make the NET_PARTICIPANT role dependent on user activity
This patch implements all of 28337, except for the part where we
turn off the role if we've been idle for a long time.
Diffstat (limited to 'src/feature')
| -rw-r--r-- | src/feature/client/dnsserv.c | 4 | ||||
| -rw-r--r-- | src/feature/control/control.c | 2 |
2 files changed, 6 insertions, 0 deletions
diff --git a/src/feature/client/dnsserv.c b/src/feature/client/dnsserv.c index ea4951f915..e5abe5c6aa 100644 --- a/src/feature/client/dnsserv.c +++ b/src/feature/client/dnsserv.c @@ -28,6 +28,7 @@ #include "core/or/connection_edge.h" #include "feature/control/control.h" #include "core/mainloop/mainloop.h" +#include "core/mainloop/netstatus.h" #include "core/or/policies.h" #include "feature/control/control_connection_st.h" @@ -213,6 +214,9 @@ dnsserv_launch_request(const char *name, int reverse, edge_connection_t *conn; char *q_name; + /* Launching a request for a user counts as user activity. */ + note_user_activity(approx_time()); + /* Make a new dummy AP connection, and attach the request to it. */ entry_conn = entry_connection_new(CONN_TYPE_AP, AF_INET); entry_conn->entry_cfg.dns_request = 1; diff --git a/src/feature/control/control.c b/src/feature/control/control.c index a5b6ab3bf5..1344d66a3d 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -1681,6 +1681,8 @@ static const struct signal_t signal_table[] = { { SIGNEWNYM, "NEWNYM" }, { SIGCLEARDNSCACHE, "CLEARDNSCACHE"}, { SIGHEARTBEAT, "HEARTBEAT"}, + { SIGACTIVE, "ACTIVE" }, + { SIGDORMANT, "DORMANT" }, { 0, NULL }, }; |