summaryrefslogtreecommitdiff
path: root/src/feature
diff options
context:
space:
mode:
Diffstat (limited to 'src/feature')
-rw-r--r--src/feature/relay/router.c18
-rw-r--r--src/feature/relay/router.h4
2 files changed, 1 insertions, 21 deletions
diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c
index b3cfb6d8dd..05e3fb3b23 100644
--- a/src/feature/relay/router.c
+++ b/src/feature/relay/router.c
@@ -1311,24 +1311,6 @@ router_should_advertise_begindir(const or_options_t *options,
supports_tunnelled_dir_requests);
}
-/** Return true iff our network is in some sense disabled or shutting down:
- * either we're hibernating, entering hibernation, or the network is turned
- * off with DisableNetwork. */
-int
-net_is_disabled(void)
-{
- return get_options()->DisableNetwork || we_are_hibernating();
-}
-
-/** Return true iff our network is in some sense "completely disabled" either
- * we're fully hibernating or the network is turned off with
- * DisableNetwork. */
-int
-net_is_completely_disabled(void)
-{
- return get_options()->DisableNetwork || we_are_fully_hibernating();
-}
-
/** Return true iff the combination of options in <b>options</b> and parameters
* in the consensus mean that we don't want to allow exits from circuits
* we got from addresses not known to be servers. */
diff --git a/src/feature/relay/router.h b/src/feature/relay/router.h
index 90cc5abaf6..a9c7ac3fd5 100644
--- a/src/feature/relay/router.h
+++ b/src/feature/relay/router.h
@@ -16,6 +16,7 @@
#include "feature/nodelist/describe.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/routerinfo.h"
+#include "core/mainloop/netstatus.h"
struct curve25519_keypair_t;
struct ed25519_keypair_t;
@@ -59,9 +60,6 @@ int router_initialize_tls_context(void);
int init_keys(void);
int init_keys_client(void);
-int net_is_disabled(void);
-int net_is_completely_disabled(void);
-
uint16_t router_get_active_listener_port_by_type_af(int listener_type,
sa_family_t family);
uint16_t router_get_advertised_or_port(const or_options_t *options);