When not an exit node, don't test for DNS hijacking.

Back in 5e762e6a5c, non-exit servers
stopped launching DNS requests for users.  So there's no need for them
to see if their DNS answers are hijacked.

Patch from Matt Pagan.  I think this is a 965 fix.
This commit is contained in:
Nick Mathewson 2014-02-21 18:04:48 +00:00
parent 6eba3584b1
commit 1753975ece
2 changed files with 11 additions and 3 deletions

6
changes/bug965 Normal file
View File

@ -0,0 +1,6 @@
o Minor bugfixes:
- Non-exit servers no longer launch mock DNS requests to check for
DNS hijacking. This has been unnecessary since 0.2.1.7-alpha,
when non-exit servers stopped servicing DNS requests. Fixes bug
965; bugfix on 0.2.1.7-alpha. Patch from Matt Pagan.

View File

@ -1551,10 +1551,12 @@ run_scheduled_events(time_t now)
channel_run_cleanup();
channel_listener_run_cleanup();
/** 9. and if we're a server, check whether our DNS is telling stories to
* us. */
/** 9. and if we're an exit node, check whether our DNS is telling stories
* to us. */
if (!net_is_disabled() &&
public_server_mode(options) && time_to_check_for_correct_dns < now) {
public_server_mode(options) &&
time_to_check_for_correct_dns < now &&
! router_my_exit_policy_is_reject_star()) {
if (!time_to_check_for_correct_dns) {
time_to_check_for_correct_dns = now + 60 + crypto_rand_int(120);
} else {