[tor-commits] [tor/release-0.2.2] Avoid running DNS self-tests if we're operating as a bridge

[arma at torproject.org]

commit 6d027a3823843030fc24d7224da3ca976f121b01
Author: warms0x <warms0x at riseup.net>
Date:   Fri Oct 7 07:04:29 2011 +0000

    Avoid running DNS self-tests if we're operating as a bridge
---
 changes/bug4201 |    5 +++++
 src/or/main.c   |    2 +-
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/changes/bug4201 b/changes/bug4201
new file mode 100644
index 0000000..6f7d715
--- /dev/null
+++ b/changes/bug4201
@@ -0,0 +1,5 @@
+  o Minor bugfixes:
+    - Bridges now skip DNS self-tests, to act a little more stealthily.
+      Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced
+      bridges. Patch by "warms0x".
+
diff --git a/src/or/main.c b/src/or/main.c
index 289d805..95acea4 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1241,7 +1241,7 @@ run_scheduled_events(time_t now)
 
   /** 9. and if we're a server, check whether our DNS is telling stories to
    * us. */
-  if (is_server && time_to_check_for_correct_dns < now) {
+  if (public_server_mode(options) && time_to_check_for_correct_dns < now) {
     if (!time_to_check_for_correct_dns) {
       time_to_check_for_correct_dns = now + 60 + crypto_rand_int(120);
     } else {