|
@@ -21,7 +21,6 @@
|
|
|
#define STATEFILE_PRIVATE
|
|
|
#define TOR_CHANNEL_INTERNAL_
|
|
|
#define HS_CLIENT_PRIVATE
|
|
|
-#define ROUTERPARSE_PRIVATE
|
|
|
|
|
|
#include "test/test.h"
|
|
|
#include "test/test_helpers.h"
|
|
@@ -31,33 +30,33 @@
|
|
|
|
|
|
#include "core/or/or.h"
|
|
|
#include "app/config/config.h"
|
|
|
+#include "app/config/statefile.h"
|
|
|
+#include "core/crypto/hs_ntor.h"
|
|
|
+#include "core/mainloop/connection.h"
|
|
|
+#include "core/mainloop/mainloop.h"
|
|
|
#include "core/or/circuitbuild.h"
|
|
|
#include "core/or/circuitlist.h"
|
|
|
#include "core/or/circuituse.h"
|
|
|
-#include "core/mainloop/connection.h"
|
|
|
#include "core/or/connection_edge.h"
|
|
|
#include "core/or/edge_connection_st.h"
|
|
|
-#include "lib/crypt_ops/crypto_rand.h"
|
|
|
-#include "lib/fs/dir.h"
|
|
|
-#include "feature/dirauth/dirvote.h"
|
|
|
-#include "feature/nodelist/networkstatus.h"
|
|
|
-#include "feature/nodelist/nodelist.h"
|
|
|
#include "core/or/relay.h"
|
|
|
-#include "feature/dirparse/routerparse.h"
|
|
|
+#include "core/or/versions.h"
|
|
|
+#include "feature/dirauth/dirvote.h"
|
|
|
+#include "feature/dirauth/shared_random_state.h"
|
|
|
+#include "feature/dircommon/voting_schedule.h"
|
|
|
+#include "feature/hs/hs_circuit.h"
|
|
|
+#include "feature/hs/hs_circuitmap.h"
|
|
|
+#include "feature/hs/hs_client.h"
|
|
|
#include "feature/hs/hs_common.h"
|
|
|
#include "feature/hs/hs_config.h"
|
|
|
#include "feature/hs/hs_ident.h"
|
|
|
#include "feature/hs/hs_intropoint.h"
|
|
|
-#include "core/crypto/hs_ntor.h"
|
|
|
-#include "feature/hs/hs_circuit.h"
|
|
|
-#include "feature/hs/hs_circuitmap.h"
|
|
|
#include "feature/hs/hs_service.h"
|
|
|
-#include "feature/hs/hs_client.h"
|
|
|
-#include "core/mainloop/mainloop.h"
|
|
|
+#include "feature/nodelist/networkstatus.h"
|
|
|
+#include "feature/nodelist/nodelist.h"
|
|
|
#include "feature/rend/rendservice.h"
|
|
|
-#include "app/config/statefile.h"
|
|
|
-#include "feature/dirauth/shared_random_state.h"
|
|
|
-#include "feature/dircommon/voting_schedule.h"
|
|
|
+#include "lib/crypt_ops/crypto_rand.h"
|
|
|
+#include "lib/fs/dir.h"
|
|
|
|
|
|
#include "core/or/cpath_build_state_st.h"
|
|
|
#include "core/or/crypt_path_st.h"
|