tor

commit 9431d3507490cc85a32969f7eb81808b08966677
parent 996f24fcd31be197b8cfc9cb5dddd2b04a4cf3a2
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue,  6 Nov 2018 07:42:55 -0500

Merge branch 'bug28348_034' into bug28348_035

Diffstat:
A
changes/bug28348_034
 | 
5
+++++
M
src/core/mainloop/mainloop.c
 | 
6
++++--

2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/changes/bug28348_034 b/changes/bug28348_034
@@ -0,0 +1,5 @@
+  o Major bugfixes (embedding, main loop):
+    - When DisableNetwork becomes set, actually disable periodic events that
+      are already enabled. (Previously, we would refrain from enabling new
+      ones, but we would leave the old ones turned on.)
+      Fixes bug 28348; bugfix on 0.3.4.1-alpha.
diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
@@ -1598,15 +1598,17 @@ rescan_periodic_events(const or_options_t *options)
   for (int i = 0; periodic_events[i].name; ++i) {
     periodic_event_item_t *item = &periodic_events[i];
 
+    int enable = !!(item->roles & roles);
+
     /* Handle the event flags. */
     if (net_is_disabled() &&
         (item->flags & PERIODIC_EVENT_FLAG_NEED_NET)) {
-      continue;
+      enable = 0;
     }
 
     /* Enable the event if needed. It is safe to enable an event that was
      * already enabled. Same goes for disabling it. */
-    if (item->roles & roles) {
+    if (enable) {
       log_debug(LD_GENERAL, "Launching periodic event %s", item->name);
       periodic_event_enable(item);
     } else {