|
@@ -76,7 +76,6 @@
|
|
|
#include "feature/control/control_events.h"
|
|
|
#include "feature/dirauth/authmode.h"
|
|
|
#include "feature/dirauth/reachability.h"
|
|
|
-#include "feature/dirauth/voteflags.h"
|
|
|
#include "feature/dircache/consdiffmgr.h"
|
|
|
#include "feature/dircache/dirserv.h"
|
|
|
#include "feature/dircommon/directory.h"
|
|
@@ -88,7 +87,6 @@
|
|
|
#include "feature/nodelist/networkstatus.h"
|
|
|
#include "feature/nodelist/nodelist.h"
|
|
|
#include "feature/nodelist/routerlist.h"
|
|
|
-#include "feature/nodelist/routerlist_st.h"
|
|
|
#include "feature/relay/dns.h"
|
|
|
#include "feature/relay/routerkeys.h"
|
|
|
#include "feature/relay/routermode.h"
|
|
@@ -1377,7 +1375,6 @@ CALLBACK(rotate_onion_key);
|
|
|
CALLBACK(rotate_x509_certificate);
|
|
|
CALLBACK(save_stability);
|
|
|
CALLBACK(save_state);
|
|
|
-CALLBACK(set_bridge_running);
|
|
|
CALLBACK(write_bridge_ns);
|
|
|
CALLBACK(write_stats_file);
|
|
|
CALLBACK(control_per_second_events);
|
|
@@ -1456,7 +1453,6 @@ STATIC periodic_event_item_t periodic_events[] = {
|
|
|
|
|
|
/* Bridge Authority only. */
|
|
|
CALLBACK(write_bridge_ns, BRIDGEAUTH, 0),
|
|
|
- CALLBACK(set_bridge_running, BRIDGEAUTH, 0),
|
|
|
|
|
|
/* Directory server only. */
|
|
|
CALLBACK(clean_consdiffmgr, DIRSERVER, 0),
|
|
@@ -2587,22 +2583,6 @@ write_bridge_ns_callback(time_t now, const or_options_t *options)
|
|
|
return PERIODIC_EVENT_NO_UPDATE;
|
|
|
}
|
|
|
|
|
|
-/**
|
|
|
- * Periodic callback: if we're the bridge authority, set the running flag on
|
|
|
- * bridges if they're reachable
|
|
|
- */
|
|
|
-static int
|
|
|
-set_bridge_running_callback(time_t now, const or_options_t *options)
|
|
|
-{
|
|
|
- if (authdir_mode_bridge(options)) {
|
|
|
- dirserv_set_bridges_running(now);
|
|
|
-
|
|
|
-#define SET_BRIDGES_RUNNING_INTERVAL (5*60)
|
|
|
- return SET_BRIDGES_RUNNING_INTERVAL;
|
|
|
- }
|
|
|
- return PERIODIC_EVENT_NO_UPDATE;
|
|
|
-}
|
|
|
-
|
|
|
static int heartbeat_callback_first_time = 1;
|
|
|
|
|
|
/**
|