[tor-commits] [tor/master] Report SIGNAL event to controllers when acting on delayed NEWNYM

[nickm at torproject.org]

commit 8a69cc04683c7e3cfe45150591a47ee7933dce05
Author: Robert Ransom <rransom.8774 at gmail.com>
Date:   Sun Jun 5 05:43:27 2011 -0700

    Report SIGNAL event to controllers when acting on delayed NEWNYM
    
    Fixes bug 3349.
---
 changes/bug3349 |    9 +++++++++
 src/or/main.c   |    3 ++-
 2 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/changes/bug3349 b/changes/bug3349
new file mode 100644
index 0000000..fe5836a
--- /dev/null
+++ b/changes/bug3349
@@ -0,0 +1,9 @@
+  o Minor bugfixes:
+    - Report a SIGNAL event to controllers when acting on a delayed
+      SIGNAL NEWNYM command.  Previously, we would report a SIGNAL
+      event to the controller if we acted on a SIGNAL NEWNYM command
+      immediately, and otherwise not report a SIGNAL event for the
+      command at all.  Bugfix on 0.2.3.1-alpha; fixes bug 3349.
+
+
+
diff --git a/src/or/main.c b/src/or/main.c
index bb56be7..28a98ac 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1030,6 +1030,8 @@ signewnym_impl(time_t now)
   rend_client_purge_state();
   time_of_last_signewnym = now;
   signewnym_is_pending = 0;
+
+  control_event_signal(SIGNEWNYM);
 }
 
 /** Perform regular maintenance tasks.  This function gets run once per
@@ -1887,7 +1889,6 @@ process_signal(uintptr_t sig)
             (int)(MAX_SIGNEWNYM_RATE+time_of_last_signewnym-now));
       } else {
         signewnym_impl(now);
-        control_event_signal(sig);
       }
       break;
     }