nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 13:13:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

dns: Do not trigger overload general on DNS timeout

Browse Source 
This was missed in #40527 when the DNS timeout overload general signal
was removed.

Closes #40564

Signed-off-by: David Goulet <dgoulet@torproject.org>
This commit is contained in:
David Goulet 2022-02-14 13:20:53 -05:00
parent 52d1c1fd31
commit ea48ddc955
2 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/ticket40564 Normal file
View File

@ -0,0 +1,4 @@
o Major bugfixes (relay, overload):
- Do not trigger a general overload on DNS timeout. Even after fixing
40527, some code remained that triggered the overload. Fixes bug 40564;
bugfix on 0.4.7.1-alpha.

10
src/feature/relay/dns.c
View File

@ -1539,16 +1539,6 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses,
tor_addr_make_unspec(&addr); tor_addr_make_unspec(&addr);
/* Note down any DNS errors to the statistics module */
if (result == DNS_ERR_TIMEOUT) {
/* libevent timed out while resolving a name. However, because libevent
* handles retries and timeouts internally, this means that all attempts of
* libevent timed out. If we wanted to get more granular information about
* individual libevent attempts, we would have to implement our own DNS
* timeout/retry logic */
rep_hist_note_overload(OVERLOAD_GENERAL);
}
/* Keep track of whether IPv6 is working */ /* Keep track of whether IPv6 is working */
if (type == DNS_IPv6_AAAA) { if (type == DNS_IPv6_AAAA) {
if (result == DNS_ERR_TIMEOUT) { if (result == DNS_ERR_TIMEOUT) {