diff options
| author | George Kadianakis <desnacked@riseup.net> | 2021-03-17 18:23:18 +0200 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2021-03-17 18:23:18 +0200 |
| commit | 29f07a4e9d2e7cd061e696f673c42e00885ec231 (patch) | |
| tree | 5db514a485f8b35a32fa1ed05a974e970fd37b7e /src/feature/relay/dns.c | |
| parent | 15a95df376f8b8e27072db8d36f28b7054d13cef (diff) | |
| parent | 7740a8b5d4de649e3ba2a0578f789140725974b6 (diff) | |
| download | tor-29f07a4e9d2e7cd061e696f673c42e00885ec231.tar.gz tor-29f07a4e9d2e7cd061e696f673c42e00885ec231.zip | |
Merge branch 'mr/334'
Diffstat (limited to 'src/feature/relay/dns.c')
| -rw-r--r-- | src/feature/relay/dns.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/feature/relay/dns.c b/src/feature/relay/dns.c index 62dfbe3184..22f929808e 100644 --- a/src/feature/relay/dns.c +++ b/src/feature/relay/dns.c @@ -63,6 +63,7 @@ #include "feature/relay/dns.h" #include "feature/relay/router.h" #include "feature/relay/routermode.h" +#include "feature/stats/rephist.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/evloop/compat_libevent.h" #include "lib/sandbox/sandbox.h" @@ -1547,6 +1548,16 @@ evdns_callback(int result, char type, int count, int ttl, void *addresses, 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 */ if (type == DNS_IPv6_AAAA) { if (result == DNS_ERR_TIMEOUT) { |