|
|
@@ -13,12 +13,8 @@
|
|
|
#include "core/mainloop/connection.h"
|
|
|
#include "core/mainloop/mainloop.h"
|
|
|
#include "core/mainloop/netstatus.h"
|
|
|
-#include "core/or/circuitbuild.h"
|
|
|
-#include "core/or/circuitlist.h"
|
|
|
-#include "core/or/circuituse.h"
|
|
|
#include "core/or/policies.h"
|
|
|
#include "core/or/protover.h"
|
|
|
-#include "core/or/relay.h"
|
|
|
#include "feature/client/transports.h"
|
|
|
#include "feature/control/control.h"
|
|
|
#include "feature/dirauth/process_descs.h"
|
|
|
@@ -34,7 +30,6 @@
|
|
|
#include "feature/nodelist/nodelist.h"
|
|
|
#include "feature/nodelist/routerlist.h"
|
|
|
#include "feature/nodelist/routerparse.h"
|
|
|
-#include "feature/nodelist/routerset.h"
|
|
|
#include "feature/nodelist/torcert.h"
|
|
|
#include "feature/relay/dns.h"
|
|
|
#include "feature/relay/router.h"
|
|
|
@@ -43,7 +38,7 @@
|
|
|
#include "feature/relay/selftest.h"
|
|
|
#include "feature/stats/geoip.h"
|
|
|
#include "feature/stats/rephist.h"
|
|
|
-#include "lib/crypt_ops/crypto_curve25519.h"
|
|
|
+#include "lib/crypt_ops/crypto_ed25519.h"
|
|
|
#include "lib/crypt_ops/crypto_format.h"
|
|
|
#include "lib/crypt_ops/crypto_init.h"
|
|
|
#include "lib/crypt_ops/crypto_rand.h"
|
|
|
@@ -54,17 +49,15 @@
|
|
|
|
|
|
#include "feature/dirauth/authmode.h"
|
|
|
|
|
|
-#include "feature/nodelist/authority_cert_st.h"
|
|
|
-#include "core/or/crypt_path_st.h"
|
|
|
-#include "feature/dircommon/dir_connection_st.h"
|
|
|
+#include "app/config/or_state_st.h"
|
|
|
+#include "core/or/port_cfg_st.h"
|
|
|
#include "feature/dirclient/dir_server_st.h"
|
|
|
-#include "core/or/extend_info_st.h"
|
|
|
+#include "feature/dircommon/dir_connection_st.h"
|
|
|
+#include "feature/nodelist/authority_cert_st.h"
|
|
|
#include "feature/nodelist/extrainfo_st.h"
|
|
|
#include "feature/nodelist/node_st.h"
|
|
|
-#include "core/or/origin_circuit_st.h"
|
|
|
-#include "app/config/or_state_st.h"
|
|
|
-#include "core/or/port_cfg_st.h"
|
|
|
#include "feature/nodelist/routerinfo_st.h"
|
|
|
+#include "feature/nodelist/routerstatus_st.h"
|
|
|
|
|
|
/**
|
|
|
* \file router.c
|
Nick Mathewson