commit 5f51c2de8bf27c1c5eba8c27d32273284d41a3d7 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jul 5 16:52:12 2018 -0400 Fix our build system to know the new locations of the src/or stuff --- Makefile.am | 6 +- src/core/include.am | 526 ++++++++++++++++++++++++------------------------- src/test/test_config.c | 2 +- src/tools/include.am | 4 +- 4 files changed, 268 insertions(+), 270 deletions(-) diff --git a/Makefile.am b/Makefile.am index e7c46f3cc..c74b0e30a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -302,10 +302,10 @@ coverage-html-full: all check-spaces: if USE_PERL $(PERL) $(top_srcdir)/scripts/maint/checkSpace.pl -C \ - $(top_srcdir)/src/common/*.[ch] \ $(top_srcdir)/src/lib/*/*.[ch] \ - $(top_srcdir)/src/or/*.[ch] \ - $(top_srcdir)/src/or/*/*.[ch] \ + $(top_srcdir)/src/core/*/*.[ch] \ + $(top_srcdir)/src/feature/*/*.[ch] \ + $(top_srcdir)/src/app/*/*.[ch] \ $(top_srcdir)/src/test/*.[ch] \ $(top_srcdir)/src/test/*/*.[ch] \ $(top_srcdir)/src/tools/*.[ch] diff --git a/src/core/include.am b/src/core/include.am index d6162196f..111a1e013 100644 --- a/src/core/include.am +++ b/src/core/include.am @@ -6,100 +6,100 @@ noinst_LIBRARIES += \ src/core/libtor-app-testing.a endif -LIBTOR_APP_A_SOURCES = \ - src/or/addressmap.c \ - src/or/address_set.c \ - src/or/bridges.c \ - src/or/channel.c \ - src/or/channelpadding.c \ - src/or/channeltls.c \ - src/or/circpathbias.c \ - src/or/circuitbuild.c \ - src/or/circuitlist.c \ - src/or/circuitmux.c \ - src/or/circuitmux_ewma.c \ - src/or/circuitstats.c \ - src/or/circuituse.c \ - src/or/command.c \ - src/or/config.c \ - src/or/confparse.c \ - src/or/connection.c \ - src/or/connection_edge.c \ - src/or/connection_or.c \ - src/or/conscache.c \ - src/or/consdiff.c \ - src/or/consdiffmgr.c \ - src/or/control.c \ - src/or/cpuworker.c \ - src/or/directory.c \ - src/or/dirserv.c \ - src/or/dns.c \ - src/or/dnsserv.c \ - src/or/dos.c \ - src/or/fp_pair.c \ - src/or/geoip.c \ - src/or/entrynodes.c \ - src/or/ext_orport.c \ - src/or/git_revision.c \ - src/or/hibernate.c \ - src/or/hs_cache.c \ - src/or/hs_cell.c \ - src/or/hs_circuit.c \ - src/or/hs_circuitmap.c \ - src/or/hs_client.c \ - src/or/hs_common.c \ - src/or/hs_config.c \ - src/or/hs_control.c \ - src/or/hs_descriptor.c \ - src/or/hs_ident.c \ - src/or/hs_intropoint.c \ - src/or/hs_ntor.c \ - src/or/hs_service.c \ - src/or/hs_stats.c \ - src/or/keypin.c \ - src/or/main.c \ - src/or/microdesc.c \ - src/or/networkstatus.c \ - src/or/nodelist.c \ - src/or/onion.c \ - src/or/onion_fast.c \ - src/or/onion_tap.c \ - src/or/transports.c \ - src/or/parsecommon.c \ - src/or/periodic.c \ - src/or/protover.c \ - src/or/protover_rust.c \ - src/or/proto_cell.c \ - src/or/proto_control0.c \ - src/or/proto_ext_or.c \ - src/or/proto_http.c \ - src/or/proto_socks.c \ - src/or/policies.c \ - src/or/reasons.c \ - src/or/relay.c \ - src/or/relay_crypto.c \ - src/or/rendcache.c \ - src/or/rendclient.c \ - src/or/rendcommon.c \ - src/or/rendmid.c \ - src/or/rendservice.c \ - src/or/rephist.c \ - src/or/replaycache.c \ - src/or/router.c \ - src/or/routerkeys.c \ - src/or/routerlist.c \ - src/or/routerparse.c \ - src/or/routerset.c \ - src/or/scheduler.c \ - src/or/scheduler_kist.c \ - src/or/scheduler_vanilla.c \ - src/or/shared_random_client.c \ - src/or/statefile.c \ - src/or/status.c \ - src/or/torcert.c \ - src/or/tor_api.c \ - src/or/voting_schedule.c \ - src/or/onion_ntor.c +LIBTOR_APP_A_SOURCES = \ + src/app/config/config.c \ + src/app/config/confparse.c \ + src/app/config/statefile.c \ + src/core/proto/proto_socks.c \ + src/core/proto/protover_rust.c \ + src/core/proto/protover.c \ + src/core/proto/proto_ext_or.c \ + src/core/proto/proto_cell.c \ + src/core/proto/proto_http.c \ + src/core/proto/proto_control0.c \ + src/core/mainloop/cpuworker.c \ + src/core/mainloop/main.c \ + src/core/mainloop/periodic.c \ + src/core/mainloop/connection.c \ + src/core/crypto/onion.c \ + src/core/crypto/onion_ntor.c \ + src/core/crypto/relay_crypto.c \ + src/core/crypto/onion_fast.c \ + src/core/crypto/hs_ntor.c \ + src/core/crypto/onion_tap.c \ + src/core/or/scheduler_kist.c \ + src/core/or/circuitbuild.c \ + src/core/or/reasons.c \ + src/core/or/circuitstats.c \ + src/core/or/circuituse.c \ + src/core/or/scheduler.c \ + src/core/or/circuitmux_ewma.c \ + src/core/or/channelpadding.c \ + src/core/or/git_revision.c \ + src/core/or/circuitlist.c \ + src/core/or/circuitmux.c \ + src/core/or/policies.c \ + src/core/or/channeltls.c \ + src/core/or/relay.c \ + src/core/or/scheduler_vanilla.c \ + src/core/or/connection_edge.c \ + src/core/or/dos.c \ + src/core/or/address_set.c \ + src/core/or/command.c \ + src/core/or/channel.c \ + src/core/or/connection_or.c \ + src/core/or/status.c \ + src/feature/dircommon/consdiff.c \ + src/feature/dircommon/fp_pair.c \ + src/feature/dircommon/voting_schedule.c \ + src/feature/stats/geoip.c \ + src/feature/stats/rephist.c \ + src/feature/hibernate/hibernate.c \ + src/feature/hs_common/shared_random_client.c \ + src/feature/hs_common/replaycache.c \ + src/feature/client/circpathbias.c \ + src/feature/client/bridges.c \ + src/feature/client/entrynodes.c \ + src/feature/client/transports.c \ + src/feature/client/addressmap.c \ + src/feature/client/dnsserv.c \ + src/feature/api/tor_api.c \ + src/feature/nodelist/microdesc.c \ + src/feature/nodelist/routerparse.c \ + src/feature/nodelist/networkstatus.c \ + src/feature/nodelist/nodelist.c \ + src/feature/nodelist/routerset.c \ + src/feature/nodelist/torcert.c \ + src/feature/nodelist/routerlist.c \ + src/feature/nodelist/parsecommon.c \ + src/feature/hs/hs_circuitmap.c \ + src/feature/hs/hs_cell.c \ + src/feature/hs/hs_cache.c \ + src/feature/hs/hs_common.c \ + src/feature/hs/hs_control.c \ + src/feature/hs/hs_client.c \ + src/feature/hs/hs_intropoint.c \ + src/feature/hs/hs_ident.c \ + src/feature/hs/hs_config.c \ + src/feature/hs/hs_service.c \ + src/feature/hs/hs_stats.c \ + src/feature/hs/hs_descriptor.c \ + src/feature/hs/hs_circuit.c \ + src/feature/dirauth/keypin.c \ + src/feature/relay/ext_orport.c \ + src/feature/relay/router.c \ + src/feature/relay/dns.c \ + src/feature/relay/routerkeys.c \ + src/feature/control/control.c \ + src/feature/rend/rendcommon.c \ + src/feature/rend/rendmid.c \ + src/feature/rend/rendservice.c \ + src/feature/rend/rendcache.c \ + src/feature/rend/rendclient.c \ + src/feature/dircache/directory.c \ + src/feature/dircache/conscache.c \ + src/feature/dircache/consdiffmgr.c \ + src/feature/dircache/dirserv.c # # Modules are conditionnally compiled in tor starting here. We add the C files @@ -110,11 +110,12 @@ LIBTOR_APP_A_SOURCES = \ LIBTOR_APP_TESTING_A_SOURCES = $(LIBTOR_APP_A_SOURCES) # The Directory Authority module. -MODULE_DIRAUTH_SOURCES = \ - src/or/dirauth/dircollate.c \ - src/or/dirauth/dirvote.c \ - src/or/dirauth/shared_random.c \ - src/or/dirauth/shared_random_state.c +MODULE_DIRAUTH_SOURCES = \ + src/feature/dirauth/dircollate.c \ + src/feature/dirauth/dirvote.c \ + src/feature/dirauth/shared_random.c \ + src/feature/dirauth/shared_random_state.c + if BUILD_MODULE_DIRAUTH LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) endif @@ -130,8 +131,9 @@ else src_core_libtor_app_testing_a_SOURCES = endif -src/or/git_revision.$(OBJEXT) \ - src/or/src_core_libtor_app_testing_a-git_revision.$(OBJEXT): micro-revision.i +src/core/or/git_revision.$(OBJEXT) \ + src/core/or/src_core_libtor_app_testing_a-git_revision.$(OBJEXT): \ + micro-revision.i AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ @@ -140,172 +142,166 @@ AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ src_core_libtor_app_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) src_core_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -ORHEADERS = \ - src/or/addressmap.h \ - src/or/address_set.h \ - src/or/addr_policy_st.h \ - src/or/authority_cert_st.h \ - src/or/auth_dirs.inc \ - src/or/bridges.h \ - src/or/cell_st.h \ - src/or/cell_queue_st.h \ - src/or/channel.h \ - src/or/channelpadding.h \ - src/or/channeltls.h \ - src/or/circpathbias.h \ - src/or/circuitbuild.h \ - src/or/circuitlist.h \ - src/or/circuitmux.h \ - src/or/circuitmux_ewma.h \ - src/or/circuitstats.h \ - src/or/circuituse.h \ - src/or/circuit_st.h \ - src/or/cached_dir_st.h \ - src/or/command.h \ - src/or/config.h \ - src/or/confparse.h \ - src/or/connection.h \ - src/or/connection_st.h \ - src/or/connection_edge.h \ - src/or/connection_or.h \ - src/or/conscache.h \ - src/or/consdiff.h \ - src/or/consdiffmgr.h \ - src/or/control_connection_st.h \ - src/or/control.h \ - src/or/cpath_build_state_st.h \ - src/or/crypt_path_st.h \ - src/or/crypt_path_reference_st.h \ - src/or/cpuworker.h \ - src/or/desc_store_st.h \ - src/or/destroy_cell_queue_st.h \ - src/or/directory.h \ - src/or/dirserv.h \ - src/or/dir_connection_st.h \ - src/or/dir_server_st.h \ - src/or/document_signature_st.h \ - src/or/download_status_st.h \ - src/or/dns.h \ - src/or/dns_structs.h \ - src/or/dnsserv.h \ - src/or/dos.h \ - src/or/edge_connection_st.h \ - src/or/entry_connection_st.h \ - src/or/entry_port_cfg_st.h \ - src/or/ext_orport.h \ - src/or/extend_info_st.h \ - src/or/extrainfo_st.h \ - src/or/fallback_dirs.inc \ - src/or/fp_pair.h \ - src/or/geoip.h \ - src/or/entrynodes.h \ - src/or/git_revision.h \ - src/or/hibernate.h \ - src/or/hs_cache.h \ - src/or/hs_cell.h \ - src/or/hs_circuit.h \ - src/or/hs_circuitmap.h \ - src/or/hs_client.h \ - src/or/hs_common.h \ - src/or/hs_config.h \ - src/or/hs_control.h \ - src/or/hs_descriptor.h \ - src/or/hs_ident.h \ - src/or/hs_intropoint.h \ - src/or/hs_ntor.h \ - src/or/hs_stats.h \ - src/or/hs_service.h \ - src/or/hsdir_index_st.h \ - src/or/keypin.h \ - src/or/listener_connection_st.h \ - src/or/main.h \ - src/or/microdesc.h \ - src/or/microdesc_st.h \ - src/or/networkstatus.h \ - src/or/networkstatus_st.h \ - src/or/networkstatus_sr_info_st.h \ - src/or/networkstatus_voter_info_st.h \ - src/or/nodelist.h \ - src/or/node_st.h \ - src/or/ns_detached_signatures_st.h \ - src/or/onion.h \ - src/or/onion_fast.h \ - src/or/onion_ntor.h \ - src/or/onion_tap.h \ - src/or/or.h \ - src/or/or_circuit_st.h \ - src/or/or_connection_st.h \ - src/or/or_handshake_certs_st.h \ - src/or/or_handshake_state_st.h \ - src/or/or_options_st.h \ - src/or/or_state_st.h \ - src/or/origin_circuit_st.h \ - src/or/transports.h \ - src/or/parsecommon.h \ - src/or/periodic.h \ - src/or/port_cfg_st.h \ - src/or/policies.h \ - src/or/protover.h \ - src/or/proto_cell.h \ - src/or/proto_control0.h \ - src/or/proto_ext_or.h \ - src/or/proto_http.h \ - src/or/proto_socks.h \ - src/or/reasons.h \ - src/or/relay.h \ - src/or/relay_crypto.h \ - src/or/relay_crypto_st.h \ - src/or/rendcache.h \ - src/or/rendclient.h \ - src/or/rendcommon.h \ - src/or/rendmid.h \ - src/or/rendservice.h \ - src/or/rend_authorized_client_st.h \ - src/or/rend_encoded_v2_service_descriptor_st.h \ - src/or/rend_intro_point_st.h \ - src/or/rend_service_descriptor_st.h \ - src/or/rephist.h \ - src/or/replaycache.h \ - src/or/router.h \ - src/or/routerinfo_st.h \ - src/or/routerkeys.h \ - src/or/routerlist.h \ - src/or/routerlist_st.h \ - src/or/routerkeys.h \ - src/or/routerset.h \ - src/or/routerparse.h \ - src/or/routerstatus_st.h \ - src/or/scheduler.h \ - src/or/server_port_cfg_st.h \ - src/or/shared_random_client.h \ - src/or/signed_descriptor_st.h \ - src/or/socks_request_st.h \ - src/or/statefile.h \ - src/or/status.h \ - src/or/torcert.h \ - src/or/tor_api_internal.h \ - src/or/tor_version_st.h \ - src/or/var_cell_st.h \ - src/or/vote_microdesc_hash_st.h \ - src/or/vote_routerstatus_st.h \ - src/or/vote_timing_st.h \ - src/or/voting_schedule.h - -# We add the headers of the modules even though they are disabled so we can -# properly compiled the entry points stub. +noinst_HEADERS += \ + src/app/config/config.h \ + src/app/config/statefile.h \ + src/app/config/or_options_st.h \ + src/app/config/or_state_st.h \ + src/app/config/confparse.h \ + src/app/main/ntmain.h \ + src/core/proto/protover.h \ + src/core/proto/proto_ext_or.h \ + src/core/proto/proto_http.h \ + src/core/proto/proto_cell.h \ + src/core/proto/proto_socks.h \ + src/core/proto/proto_control0.h \ + src/core/mainloop/cpuworker.h \ + src/core/mainloop/connection.h \ + src/core/mainloop/periodic.h \ + src/core/mainloop/main.h \ + src/core/crypto/onion_ntor.h \ + src/core/crypto/onion_tap.h \ + src/core/crypto/onion.h \ + src/core/crypto/hs_ntor.h \ + src/core/crypto/onion_fast.h \ + src/core/crypto/relay_crypto.h \ + src/core/or/edge_connection_st.h \ + src/core/or/connection_edge.h \ + src/core/or/cpath_build_state_st.h \ + src/core/or/circuitstats.h \ + src/core/or/connection_or.h \ + src/core/or/or.h \ + src/core/or/command.h \ + src/core/or/server_port_cfg_st.h \ + src/core/or/port_cfg_st.h \ + src/core/or/scheduler.h \ + src/core/or/connection_st.h \ + src/core/or/address_set.h \ + src/core/or/circuitmux.h \ + src/core/or/circuitlist.h \ + src/core/or/crypt_path_reference_st.h \ + src/core/or/crypt_path_st.h \ + src/core/or/circuitbuild.h \ + src/core/or/circuit_st.h \ + src/core/or/var_cell_st.h \ + src/core/or/entry_connection_st.h \ + src/core/or/cell_st.h \ + src/core/or/socks_request_st.h \ + src/core/or/or_handshake_certs_st.h \ + src/core/or/dos.h \ + src/core/or/or_connection_st.h \ + src/core/or/channel.h \ + src/core/or/or_circuit_st.h \ + src/core/or/entry_port_cfg_st.h \ + src/core/or/channelpadding.h \ + src/core/or/relay_crypto_st.h \ + src/core/or/cell_queue_st.h \ + src/core/or/circuituse.h \ + src/core/or/channeltls.h \ + src/core/or/or_handshake_state_st.h \ + src/core/or/addr_policy_st.h \ + src/core/or/status.h \ + src/core/or/relay.h \ + src/core/or/circuitmux_ewma.h \ + src/core/or/policies.h \ + src/core/or/reasons.h \ + src/core/or/listener_connection_st.h \ + src/core/or/origin_circuit_st.h \ + src/core/or/destroy_cell_queue_st.h \ + src/core/or/tor_version_st.h \ + src/core/or/git_revision.h \ + src/core/or/extend_info_st.h \ + src/feature/dircommon/consdiff.h \ + src/feature/dircommon/voting_schedule.h \ + src/feature/dircommon/dir_connection_st.h \ + src/feature/dircommon/fp_pair.h \ + src/feature/dircommon/vote_timing_st.h \ + src/feature/stats/rephist.h \ + src/feature/stats/geoip.h \ + src/feature/hibernate/hibernate.h \ + src/feature/hs_common/shared_random_client.h \ + src/feature/hs_common/replaycache.h \ + src/feature/dirclient/dir_server_st.h \ + src/feature/dirclient/download_status_st.h \ + src/feature/client/transports.h \ + src/feature/client/circpathbias.h \ + src/feature/client/entrynodes.h \ + src/feature/client/addressmap.h \ + src/feature/client/bridges.h \ + src/feature/client/dnsserv.h \ + src/feature/api/tor_api_internal.h \ + src/feature/nodelist/routerparse.h \ + src/feature/nodelist/routerlist.h \ + src/feature/nodelist/signed_descriptor_st.h \ + src/feature/nodelist/routerstatus_st.h \ + src/feature/nodelist/torcert.h \ + src/feature/nodelist/parsecommon.h \ + src/feature/nodelist/networkstatus_sr_info_st.h \ + src/feature/nodelist/microdesc_st.h \ + src/feature/nodelist/nodelist.h \ + src/feature/nodelist/microdesc.h \ + src/feature/nodelist/node_st.h \ + src/feature/nodelist/desc_store_st.h \ + src/feature/nodelist/routerlist_st.h \ + src/feature/nodelist/routerinfo_st.h \ + src/feature/nodelist/document_signature_st.h \ + src/feature/nodelist/vote_routerstatus_st.h \ + src/feature/nodelist/extrainfo_st.h \ + src/feature/nodelist/networkstatus_voter_info_st.h \ + src/feature/nodelist/networkstatus_st.h \ + src/feature/nodelist/authority_cert_st.h \ + src/feature/nodelist/routerset.h \ + src/feature/nodelist/networkstatus.h \ + src/feature/hs/hs_cell.h \ + src/feature/hs/hs_cache.h \ + src/feature/hs/hs_client.h \ + src/feature/hs/hs_intropoint.h \ + src/feature/hs/hs_config.h \ + src/feature/hs/hs_ident.h \ + src/feature/hs/hs_stats.h \ + src/feature/hs/hs_circuitmap.h \ + src/feature/hs/hs_descriptor.h \ + src/feature/hs/hs_service.h \ + src/feature/hs/hs_circuit.h \ + src/feature/hs/hs_control.h \ + src/feature/hs/hsdir_index_st.h \ + src/feature/hs/hs_common.h \ + src/feature/dirauth/mode.h \ + src/feature/dirauth/ns_detached_signatures_st.h \ + src/feature/dirauth/shared_random_state.h \ + src/feature/dirauth/shared_random.h \ + src/feature/dirauth/vote_microdesc_hash_st.h \ + src/feature/dirauth/keypin.h \ + src/feature/dirauth/dircollate.h \ + src/feature/dirauth/dirvote.h \ + src/feature/relay/dns_structs.h \ + src/feature/relay/dns.h \ + src/feature/relay/ext_orport.h \ + src/feature/relay/router.h \ + src/feature/relay/routerkeys.h \ + src/feature/control/control_connection_st.h \ + src/feature/control/control.h \ + src/feature/rend/rendcommon.h \ + src/feature/rend/rendservice.h \ + src/feature/rend/rendcache.h \ + src/feature/rend/rendmid.h \ + src/feature/rend/rend_intro_point_st.h \ + src/feature/rend/rend_authorized_client_st.h \ + src/feature/rend/rend_encoded_v2_service_descriptor_st.h \ + src/feature/rend/rend_service_descriptor_st.h \ + src/feature/rend/rendclient.h \ + src/feature/dircache/conscache.h \ + src/feature/dircache/cached_dir_st.h \ + src/feature/dircache/dirserv.h \ + src/feature/dircache/directory.h \ + src/feature/dircache/consdiffmgr.h -# The Directory Authority module headers. -ORHEADERS += \ - src/or/dirauth/dircollate.h \ - src/or/dirauth/dirvote.h \ - src/or/dirauth/mode.h \ - src/or/dirauth/shared_random.h \ - src/or/dirauth/shared_random_state.h +noinst_HEADERS += \ + src/app/config/auth_dirs.inc \ + src/app/config/fallback_dirs.inc # This may someday want to be an installed file? -noinst_HEADERS += src/or/tor_api.h - -noinst_HEADERS += $(ORHEADERS) micro-revision.i +noinst_HEADERS += src/feature/api/tor_api.h micro-revision.i: FORCE $(AM_V_at)rm -f micro-revision.tmp; \ @@ -325,6 +321,6 @@ micro-revision.i: FORCE rm -f micro-revision.tmp; \ true -CLEANFILES+= micro-revision.i src/or/micro-revision.i micro-revision.tmp +CLEANFILES+= micro-revision.i micro-revision.tmp FORCE: diff --git a/src/test/test_config.c b/src/test/test_config.c index f7d3a6fbb..596ae0448 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -3739,7 +3739,7 @@ static void test_config_default_fallback_dirs(void *arg) { const char *fallback[] = { -#include "../or/fallback_dirs.inc" +#include "app/config/fallback_dirs.inc" NULL }; diff --git a/src/tools/include.am b/src/tools/include.am index 900154f96..8a2ecb23c 100644 --- a/src/tools/include.am +++ b/src/tools/include.am @@ -43,5 +43,7 @@ endif if BUILD_LIBTORRUNNER noinst_LIBRARIES += src/tools/libtorrunner.a -src_tools_libtorrunner_a_SOURCES = src/tools/tor_runner.c src/or/tor_api.c +src_tools_libtorrunner_a_SOURCES = \ + src/tools/tor_runner.c \ + src/feature/api/tor_api.c endif