From: Nick Mathewson <nickm@torproject.org>
Date: Wed, 14 Nov 2018 20:05:05 +0000 (-0500)
Subject: Make sure that we are always a net participant when being a server
X-Git-Tag: tor-0.4.0.1-alpha~119^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=53ccdb6945f0d4a9b27a9939211a3c9125ca4427;p=thirdparty%2Ftor.git

Make sure that we are always a net participant when being a server

Otherwise, if we're dormant, and we set ORPort, nothing makes us become
non-dormant.
---

diff --git a/src/core/mainloop/mainloop.c b/src/core/mainloop/mainloop.c
index 9f45f3c869..2d12e26485 100644
--- a/src/core/mainloop/mainloop.c
+++ b/src/core/mainloop/mainloop.c
@@ -1515,7 +1515,8 @@ get_my_roles(const or_options_t *options)
                   options->ControlPort_set ||
                   options->OwningControllerFD != UINT64_MAX;
 
-  int is_net_participant = is_participating_on_network();
+  int is_net_participant = is_participating_on_network() ||
+    is_relay || is_hidden_service;
 
   if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE;
   if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT;