Move voting_schedule.[ch] to src/feature/dirauth/

diff --git a/src/feature/dirauth/dirauth_config.c b/src/feature/dirauth/dirauth_config.c
index ca16dc84248215484aa58fd364e606f80e82e655..6ee8a4a3067cae164bffc93373b40dc189759252 100644 (file)
--- a/src/feature/dirauth/dirauth_config.c
+++ b/src/feature/dirauth/dirauth_config.c
@@ -21,7 +21,7 @@
 #include "core/or/or.h"
 #include "app/config/config.h"
 
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 #include "feature/stats/rephist.h"
 
 #include "feature/dirauth/authmode.h"

diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c
index 90e82a4ee8e547632e862b658ec249406f44d15b..8f3e6eb182372b90f9deb47a695a6a9ae2087306 100644 (file)
--- a/src/feature/dirauth/dirvote.c
+++ b/src/feature/dirauth/dirvote.c
@@ -36,7 +36,7 @@
 #include "feature/stats/rephist.h"
 #include "feature/client/entrynodes.h" /* needed for guardfraction methods */
 #include "feature/nodelist/torcert.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 
 #include "feature/dirauth/dirvote.h"
 #include "feature/dirauth/authmode.h"

diff --git a/src/feature/dirauth/include.am b/src/feature/dirauth/include.am
index 2ef629ae35be3ae1c124bc027af03ad9b22d88e2..e26f120d4e4004d1e3abd5d5c542a06c3138ada9 100644 (file)
--- a/src/feature/dirauth/include.am
+++ b/src/feature/dirauth/include.am
@@ -19,7 +19,8 @@ MODULE_DIRAUTH_SOURCES =                                      \
        src/feature/dirauth/recommend_pkg.c                     \
        src/feature/dirauth/shared_random.c                     \
        src/feature/dirauth/shared_random_state.c               \
-       src/feature/dirauth/voteflags.c
+       src/feature/dirauth/voteflags.c                         \
+       src/feature/dirauth/voting_schedule.c
 
 # ADD_C_FILE: INSERT HEADERS HERE.
 noinst_HEADERS +=                                      \
@@ -43,7 +44,8 @@ noinst_HEADERS +=                                     \
        src/feature/dirauth/shared_random.h             \
        src/feature/dirauth/shared_random_state.h       \
        src/feature/dirauth/vote_microdesc_hash_st.h    \
-       src/feature/dirauth/voteflags.h
+       src/feature/dirauth/voteflags.h                 \
+       src/feature/dirauth/voting_schedule.h
 
 if BUILD_MODULE_DIRAUTH
 LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES)

diff --git a/src/feature/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c
index 48e2147ea6fb47071e8e211b1d4acdf2854ebd2b..134a516eefcd0146e0a5d853e528d5720850bab7 100644 (file)
--- a/src/feature/dirauth/shared_random.c
+++ b/src/feature/dirauth/shared_random.c
@@ -99,7 +99,7 @@
 #include "feature/nodelist/dirlist.h"
 #include "feature/hs_common/shared_random_client.h"
 #include "feature/dirauth/shared_random_state.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 
 #include "feature/dirauth/dirvote.h"
 #include "feature/dirauth/authmode.h"

diff --git a/src/feature/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c
index 1792d540c6373d1d92cf3f8541d83ac8ffff6aee..a61a1cd8417ff18672cf22fa6cfbc576ac960940 100644 (file)
--- a/src/feature/dirauth/shared_random_state.c
+++ b/src/feature/dirauth/shared_random_state.c
@@ -20,7 +20,7 @@
 #include "feature/dirauth/shared_random.h"
 #include "feature/hs_common/shared_random_client.h"
 #include "feature/dirauth/shared_random_state.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 #include "lib/encoding/confline.h"
 #include "lib/version/torversion.h"
 

diff --git a/src/feature/dircommon/voting_schedule.c b/src/feature/dirauth/voting_schedule.c
similarity index 99%
rename from src/feature/dircommon/voting_schedule.c
rename to src/feature/dirauth/voting_schedule.c
index 389f7f6b5d196cd846bbe8143fdd257a6fed7a5d..712addfa75444d10c84e0456868f4bacdaf19945 100644 (file)
--- a/src/feature/dircommon/voting_schedule.c
+++ b/src/feature/dirauth/voting_schedule.c
@@ -8,7 +8,7 @@
  *        tor. The full feature is built as part of the dirauth module.
  **/
 
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 
 #include "core/or/or.h"
 #include "app/config/config.h"

diff --git a/src/feature/dircommon/voting_schedule.h b/src/feature/dirauth/voting_schedule.h
similarity index 100%
rename from src/feature/dircommon/voting_schedule.h
rename to src/feature/dirauth/voting_schedule.h

diff --git a/src/feature/dircommon/include.am b/src/feature/dircommon/include.am
index f0f0323d12696bdb089ca2feb10d1843b81b4aee..87850ce183bac9e6758644272a12d8114effb1a8 100644 (file)
--- a/src/feature/dircommon/include.am
+++ b/src/feature/dircommon/include.am
@@ -3,8 +3,7 @@
 LIBTOR_APP_A_SOURCES +=                                \
        src/feature/dircommon/consdiff.c        \
        src/feature/dircommon/directory.c       \
-       src/feature/dircommon/fp_pair.c         \
-       src/feature/dircommon/voting_schedule.c
+       src/feature/dircommon/fp_pair.c
 
 # ADD_C_FILE: INSERT HEADERS HERE.
 noinst_HEADERS +=                                      \
@@ -12,5 +11,4 @@ noinst_HEADERS +=                                     \
        src/feature/dircommon/dir_connection_st.h       \
        src/feature/dircommon/directory.h               \
        src/feature/dircommon/fp_pair.h                 \
-       src/feature/dircommon/vote_timing_st.h          \
-       src/feature/dircommon/voting_schedule.h
+       src/feature/dircommon/vote_timing_st.h

diff --git a/src/feature/hs/hs_ob.c b/src/feature/hs/hs_ob.c
index c18a78901344fd90ce60768ad1ae4b8ea2892c8b..f135ecd3f4342a82e6bdba22bc7623ccb3f5a68c 100644 (file)
--- a/src/feature/hs/hs_ob.c
+++ b/src/feature/hs/hs_ob.c
@@ -16,7 +16,7 @@
 #include "lib/confmgt/confmgt.h"
 #include "lib/encoding/confline.h"
 
-#include "hs_ob.h"
+#include "feature/hs/hs_ob.h"
 
 /* Options config magic number. */
 #define OB_OPTIONS_MAGIC 0x631DE7EA

diff --git a/src/feature/hs/hs_ob.h b/src/feature/hs/hs_ob.h
index d5b5504be750f76308218cf358a33af88672a18c..d6e6e73a844e9f6689daccce65a39fc8c180ab34 100644 (file)
--- a/src/feature/hs/hs_ob.h
+++ b/src/feature/hs/hs_ob.h
@@ -9,7 +9,7 @@
 #ifndef TOR_HS_OB_H
 #define TOR_HS_OB_H
 
-#include "hs_service.h"
+#include "feature/hs/hs_service.h"
 
 bool hs_ob_service_is_instance(const hs_service_t *service);
 

diff --git a/src/feature/hs_common/shared_random_client.c b/src/feature/hs_common/shared_random_client.c
index a46666ab50731692cf5fffd9a67bc25eb5af7382..0881bf8330bd20781c07b374dfe5354ec96f795d 100644 (file)
--- a/src/feature/hs_common/shared_random_client.c
+++ b/src/feature/hs_common/shared_random_client.c
@@ -11,7 +11,7 @@
 #include "feature/hs_common/shared_random_client.h"
 
 #include "app/config/config.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 #include "feature/nodelist/networkstatus.h"
 #include "lib/encoding/binascii.h"
 

diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c
index cc4b8e1c3441417a9ab891e20c711d33e9c8c5a3..d7864fa38a1c6453eaf3b3b91ae67201f8d16a97 100644 (file)
--- a/src/feature/nodelist/networkstatus.c
+++ b/src/feature/nodelist/networkstatus.c
@@ -66,7 +66,7 @@
 #include "feature/dirclient/dirclient_modes.h"
 #include "feature/dirclient/dlstatus.h"
 #include "feature/dircommon/directory.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 #include "feature/dirparse/ns_parse.h"
 #include "feature/hibernate/hibernate.h"
 #include "feature/hs/hs_dos.h"

diff --git a/src/test/test_dir.c b/src/test/test_dir.c
index 3b2ba64d2c5d4cc4f1c31531a4cb7d6b555acef5..a2412866231cb9c2b239886bd45d62b2aff8beb7 100644 (file)
--- a/src/test/test_dir.c
+++ b/src/test/test_dir.c
@@ -47,7 +47,7 @@
 #include "feature/dirclient/dlstatus.h"
 #include "feature/dircommon/directory.h"
 #include "feature/dircommon/fp_pair.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 #include "feature/hibernate/hibernate.h"
 #include "feature/nodelist/authcert.h"
 #include "feature/nodelist/dirlist.h"

diff --git a/src/test/test_dir_common.c b/src/test/test_dir_common.c
index 4533ad5c039509ecd9b12f3564b314b1e406b13a..f2b4e8724b8bea58a188a5dfb3cdd057a39c4dcc 100644 (file)
--- a/src/test/test_dir_common.c
+++ b/src/test/test_dir_common.c
@@ -13,7 +13,7 @@
 #include "feature/dirparse/authcert_parse.h"
 #include "feature/dirparse/ns_parse.h"
 #include "test/test_dir_common.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 
 #include "feature/nodelist/authority_cert_st.h"
 #include "feature/nodelist/networkstatus_st.h"

diff --git a/src/test/test_dir_handle_get.c b/src/test/test_dir_handle_get.c
index cf310ebfe0674acb619406d56bd83759d8178e3b..143aded3fc21fb988b14e75fe8662c84f2360ed7 100644 (file)
--- a/src/test/test_dir_handle_get.c
+++ b/src/test/test_dir_handle_get.c
@@ -38,7 +38,7 @@
 #include "feature/dircache/dirserv.h"
 #include "feature/dirauth/dirvote.h"
 #include "test/log_test_helpers.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 
 #include "feature/dircommon/dir_connection_st.h"
 #include "feature/dirclient/dir_server_st.h"

diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c
index 20f88b637b4fc11d8ebb9b1f2d1d44daf635f272..d32f2ea309309d244c256bdcef4024fc9a019ecd 100644 (file)
--- a/src/test/test_hs_common.c
+++ b/src/test/test_hs_common.c
@@ -32,7 +32,7 @@
 #include "app/config/statefile.h"
 #include "core/or/circuitlist.h"
 #include "feature/dirauth/shared_random.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 
 #include "feature/nodelist/microdesc_st.h"
 #include "feature/nodelist/networkstatus_st.h"

diff --git a/src/test/test_hs_service.c b/src/test/test_hs_service.c
index 1767648bbeefb480380662fdfd522bc56502f764..8f4f3d614f25f49d1382cd743cfcbc46d33d1404 100644 (file)
--- a/src/test/test_hs_service.c
+++ b/src/test/test_hs_service.c
@@ -44,7 +44,7 @@
 #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/dirauth/voting_schedule.h"
 #include "feature/hs/hs_circuit.h"
 #include "feature/hs/hs_circuitmap.h"
 #include "feature/hs/hs_client.h"

diff --git a/src/test/test_shared_random.c b/src/test/test_shared_random.c
index f2accb23762e0235d02fc84b16f8db0c3285650d..e849fbcabf64ae11ee7e7cec65fc8194c5753c3a 100644 (file)
--- a/src/test/test_shared_random.c
+++ b/src/test/test_shared_random.c
@@ -21,7 +21,7 @@
 #include "feature/nodelist/dirlist.h"
 #include "feature/dirparse/authcert_parse.h"
 #include "feature/hs_common/shared_random_client.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 
 #include "feature/dirclient/dir_server_st.h"
 #include "feature/nodelist/networkstatus_st.h"

diff --git a/src/test/test_voting_schedule.c b/src/test/test_voting_schedule.c
index 54d1815a7730b543d45a1b79691c672dcb0e91d4..843965568dd40929cf92387b6a2ccf841c9a1b67 100644 (file)
--- a/src/test/test_voting_schedule.c
+++ b/src/test/test_voting_schedule.c
@@ -4,7 +4,7 @@
 #include "orconfig.h"
 
 #include "core/or/or.h"
-#include "feature/dircommon/voting_schedule.h"
+#include "feature/dirauth/voting_schedule.h"
 
 #include "test/test.h"