diff options
| author | Roger Dingledine <arma@torproject.org> | 2011-05-20 03:03:46 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2011-05-20 03:03:46 -0400 |
| commit | 0a4649e6576cacc07c215c481fd1c500cd563a3b (patch) | |
| tree | cc16d185370864236316f3ce9d8db4bc702a3217 /src/or/dns.c | |
| parent | eecf8835fd8758a3f7a0837ff6c71d9e65d2dd5d (diff) | |
| parent | b8ffb00cf1ddf4ff1b64335f8677d600a948fffc (diff) | |
| download | tor-0a4649e6576cacc07c215c481fd1c500cd563a3b.tar.gz tor-0a4649e6576cacc07c215c481fd1c500cd563a3b.zip | |
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/dns.c')
| -rw-r--r-- | src/or/dns.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/or/dns.c b/src/or/dns.c index c8e1012524..a7fad3d690 100644 --- a/src/or/dns.c +++ b/src/or/dns.c @@ -1295,14 +1295,17 @@ configure_nameservers(int force) nameservers_configured = 1; if (nameserver_config_failed) { nameserver_config_failed = 0; - mark_my_descriptor_dirty(); + /* XXX the three calls to republish the descriptor might be producing + * descriptors that are only cosmetically different, especially on + * non-exit relays! -RD */ + mark_my_descriptor_dirty("dns resolvers back"); } return 0; err: nameservers_configured = 0; if (! nameserver_config_failed) { nameserver_config_failed = 1; - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("dns resolvers failed"); } return -1; } @@ -1522,7 +1525,7 @@ add_wildcarded_test_address(const char *address) "broken.", address, n); if (!dns_is_completely_invalid) { dns_is_completely_invalid = 1; - mark_my_descriptor_dirty(); + mark_my_descriptor_dirty("dns hijacking confirmed"); } if (!dns_wildcarded_test_address_notice_given) control_event_server_status(LOG_WARN, "DNS_USELESS"); |