commit e1cf10ceb7b742b5028ff4f5cfbf2b2e67572c06 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 24 08:53:54 2020 -0500

Move voting_schedule.[ch] to src/feature/dirauth/ --- src/feature/dirauth/dirauth_config.c | 2 +- src/feature/dirauth/dirvote.c | 2 +- src/feature/dirauth/include.am | 6 ++++-- src/feature/dirauth/shared_random.c | 2 +- src/feature/dirauth/shared_random_state.c | 2 +- src/feature/{dircommon => dirauth}/voting_schedule.c | 2 +- src/feature/{dircommon => dirauth}/voting_schedule.h | 0 src/feature/dircommon/include.am | 6 ++---- src/feature/hs/hs_ob.c | 2 +- src/feature/hs/hs_ob.h | 2 +- src/feature/hs_common/shared_random_client.c | 2 +- src/feature/nodelist/networkstatus.c | 2 +- src/test/test_dir.c | 2 +- src/test/test_dir_common.c | 2 +- src/test/test_dir_handle_get.c | 2 +- src/test/test_hs_common.c | 2 +- src/test/test_hs_service.c | 2 +- src/test/test_shared_random.c | 2 +- src/test/test_voting_schedule.c | 2 +- 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/src/feature/dirauth/dirauth_config.c b/src/feature/dirauth/dirauth_config.c index ca16dc842..6ee8a4a30 100644 --- 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 90e82a4ee..8f3e6eb18 100644 --- 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 2ef629ae3..e26f120d4 100644 --- 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 48e2147ea..134a516ee 100644 --- 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 1792d540c..a61a1cd84 100644 --- 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 389f7f6b5..712addfa7 100644 --- 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 f0f0323d1..87850ce18 100644 --- 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 c18a78901..f135ecd3f 100644 --- 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 d5b5504be..d6e6e73a8 100644 --- 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 a46666ab5..0881bf833 100644 --- 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 cc4b8e1c3..d7864fa38 100644 --- 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 3b2ba64d2..a24128662 100644 --- 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 4533ad5c0..f2b4e8724 100644 --- 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 cf310ebfe..143aded3f 100644 --- 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 20f88b637..d32f2ea30 100644 --- 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 1767648bb..8f4f3d614 100644 --- 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 f2accb237..e849fbcab 100644 --- 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 54d1815a7..843965568 100644 --- 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"