Browse Source

Ignore SIGNAL NEWNYM on relay-only Tor instances

Robert Ransom 13 years ago
parent
commit
ddd1b7be2d
2 changed files with 9 additions and 0 deletions
  1. 2 0
      changes/forget-rend-descs-on-newnym
  2. 7 0
      src/or/main.c

+ 2 - 0
changes/forget-rend-descs-on-newnym

@@ -5,6 +5,8 @@
   o Minor bugfixes:
     - Don't allow v0 hidden service authorities to act as clients.
       Required by fix for bug 3000.
+    - Ignore SIGNAL NEWNYM commands on relay-only Tor instances.
+      Required by fix for bug 3000.
   o Code simplifications and refactoring:
     - Allow rend_client_send_introduction to fail without closing the
       AP connection permanently.

+ 7 - 0
src/or/main.c

@@ -842,6 +842,13 @@ run_connection_housekeeping(int i, time_t now)
 static void
 signewnym_impl(time_t now)
 {
+  or_options_t *options = get_options();
+  if (!proxy_mode(options)) {
+    log_info(LD_CONTROL, "Ignoring SIGNAL NEWNYM because client functionality "
+             "is disabled.");
+    return;
+  }
+
   circuit_expire_all_dirty_circs();
   addressmap_clear_transient();
   rend_cache_purge();