diff options
| author | David Goulet <dgoulet@torproject.org> | 2022-03-15 15:16:30 -0400 |
|---|---|---|
| committer | David Goulet <dgoulet@torproject.org> | 2022-03-15 15:16:30 -0400 |
| commit | 17a8b3c735f2d1a685c322d9f127350aa5f74667 (patch) | |
| tree | 710799f3188dcb8538f7b24d1056184629fe2e81 | |
| parent | cf93d352095d252baf4cba07e51cb9a84ef8d9de (diff) | |
| parent | 1760a12f8373d10a348ae5eb5bb4ad69406a34c3 (diff) | |
| download | tor-17a8b3c735f2d1a685c322d9f127350aa5f74667.tar.gz tor-17a8b3c735f2d1a685c322d9f127350aa5f74667.zip | |
Merge branch 'tor-gitlab/mr/547'
| -rw-r--r-- | changes/ticket40577 | 3 | ||||
| -rw-r--r-- | src/feature/client/dnsserv.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/changes/ticket40577 b/changes/ticket40577 new file mode 100644 index 0000000000..305076942a --- /dev/null +++ b/changes/ticket40577 @@ -0,0 +1,3 @@ + o Minor bugfixes (DNSPort, dormant mode): + - A request on the DNSPort now wakes up a dormant tor. Fixes bug 40577; + bugfix on 0.3.5.1-alpha. diff --git a/src/feature/client/dnsserv.c b/src/feature/client/dnsserv.c index 67ab20eded..f0bb0af100 100644 --- a/src/feature/client/dnsserv.c +++ b/src/feature/client/dnsserv.c @@ -65,6 +65,9 @@ evdns_server_callback(struct evdns_server_request *req, void *data_) log_info(LD_APP, "Got a new DNS request!"); + /* Receiving a request on the DNSPort counts as user activity. */ + note_user_activity(approx_time()); + req->flags |= 0x80; /* set RA */ /* First, check whether the requesting address matches our SOCKSPolicy. */ |