[tor-commits] [tor/master] callbacks: Add a DirServer role

[nickm at torproject.org]

commit 868e348570911c52534132bc245a8fea07b42934
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Apr 25 14:21:19 2018 -0400

    callbacks: Add a DirServer role
    
    The clean_consdiffmgr() callback is only for relays acting as a directory
    server, not all relays.
    
    This commit adds a role for only directory server and sets the
    clean_consdiffmgr() callback to use it.
    
    Signed-off-by: David Goulet <dgoulet at torproject.org>
---
 src/or/main.c     | 7 ++++++-
 src/or/periodic.h | 1 +
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/or/main.c b/src/or/main.c
index 37eacd2c1..5e9dfd6c5 100644
--- a/src/or/main.c
+++ b/src/or/main.c
@@ -1381,7 +1381,6 @@ STATIC periodic_event_item_t periodic_events[] = {
   CALLBACK(check_ed_keys, PERIODIC_EVENT_ROLE_ROUTER),
   CALLBACK(check_for_reachability_bw, PERIODIC_EVENT_ROLE_ROUTER),
   CALLBACK(check_onion_keys_expiry_time, PERIODIC_EVENT_ROLE_ROUTER),
-  CALLBACK(clean_consdiffmgr, PERIODIC_EVENT_ROLE_ROUTER),
   CALLBACK(expire_old_ciruits_serverside, PERIODIC_EVENT_ROLE_ROUTER),
   CALLBACK(retry_dns, PERIODIC_EVENT_ROLE_ROUTER),
   CALLBACK(rotate_onion_key, PERIODIC_EVENT_ROLE_ROUTER),
@@ -1409,6 +1408,10 @@ STATIC periodic_event_item_t periodic_events[] = {
 
   /* Bridge Authority only. */
   CALLBACK(write_bridge_ns, PERIODIC_EVENT_ROLE_BRIDGEAUTH),
+
+  /* Directory server only. */
+  CALLBACK(clean_consdiffmgr, PERIODIC_EVENT_ROLE_DIRSERVER),
+
   END_OF_PERIODIC_EVENTS
 };
 #undef CALLBACK
@@ -1465,6 +1468,7 @@ get_my_roles(const or_options_t *options)
   int is_bridgeauth = authdir_mode_bridge(options);
   int is_hidden_service = !!hs_service_get_num_services() ||
                           !!rend_num_services();
+  int is_dirserver = dir_server_mode(options);
 
   if (is_bridge) roles |= PERIODIC_EVENT_ROLE_BRIDGE;
   if (is_client) roles |= PERIODIC_EVENT_ROLE_CLIENT;
@@ -1472,6 +1476,7 @@ get_my_roles(const or_options_t *options)
   if (is_dirauth) roles |= PERIODIC_EVENT_ROLE_DIRAUTH;
   if (is_bridgeauth) roles |= PERIODIC_EVENT_ROLE_BRIDGEAUTH;
   if (is_hidden_service) roles |= PERIODIC_EVENT_ROLE_HS_SERVICE;
+  if (is_dirserver) roles |= PERIODIC_EVENT_ROLE_DIRSERVER;
 
   return roles;
 }
diff --git a/src/or/periodic.h b/src/or/periodic.h
index dde27db5a..cc0ab86bd 100644
--- a/src/or/periodic.h
+++ b/src/or/periodic.h
@@ -14,6 +14,7 @@
 #define PERIODIC_EVENT_ROLE_DIRAUTH     (1U << 3)
 #define PERIODIC_EVENT_ROLE_BRIDGEAUTH  (1U << 4)
 #define PERIODIC_EVENT_ROLE_HS_SERVICE  (1U << 5)
+#define PERIODIC_EVENT_ROLE_DIRSERVER   (1U << 6)
 
 /* Helper macro to make it a bit less annoying to defined groups of roles that
  * are often used. */