July 2018 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'split_or_directory'
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 8b0920bb6f0d52402026d38dcc8405c0ff263dbb Merge: 4eac5c6ce 50963f36d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 18:13:06 2018 -0400 Merge branch 'split_or_directory' .gitignore | 19 +- Doxyfile.in | 1156 ++++++++++---------- Makefile.am | 14 +- configure.ac | 2 +- contrib/include.am | 1 - contrib/win32build/package_nsis-mingw.sh | 95 -- doc/HACKING/HelpfulTools.md | 6 +- doc/HACKING/Module.md | 26 +- doc/HACKING/Tracing.md | 2 +- scripts/maint/checkOptionDocs.pl.in | 2 +- scripts/maint/fallback.whitelist | 3 +- scripts/maint/updateFallbackDirs.py | 8 +- scripts/test/coverage | 2 +- src/{or => app/config}/auth_dirs.inc | 0 src/{or => app/config}/config.c | 90 +- src/{or => app/config}/config.h | 2 +- src/{or => app/config}/confparse.c | 6 +- src/{or => app/config}/confparse.h | 0 src/{or => app/config}/fallback_dirs.inc | 0 src/{or => app/config}/or_options_st.h | 0 src/{or => app/config}/or_state_st.h | 0 src/{or => app/config}/statefile.c | 26 +- src/{or => app/config}/statefile.h | 0 src/app/include.am | 38 + src/{or => app/main}/ntmain.c | 8 +- src/{or => app/main}/ntmain.h | 0 src/{or => app/main}/tor_main.c | 0 src/{or => core/crypto}/hs_ntor.c | 4 +- src/{or => core/crypto}/hs_ntor.h | 2 +- src/{or => core/crypto}/onion.c | 34 +- src/{or => core/crypto}/onion.h | 0 src/{or => core/crypto}/onion_fast.c | 4 +- src/{or => core/crypto}/onion_fast.h | 0 src/{or => core/crypto}/onion_ntor.c | 2 +- src/{or => core/crypto}/onion_ntor.h | 0 src/{or => core/crypto}/onion_tap.c | 8 +- src/{or => core/crypto}/onion_tap.h | 0 src/{or => core/crypto}/relay_crypto.c | 18 +- src/{or => core/crypto}/relay_crypto.h | 0 src/core/include.am | 326 ++++++ src/{or => core/mainloop}/connection.c | 90 +- src/{or => core/mainloop}/connection.h | 0 src/{or => core/mainloop}/cpuworker.c | 24 +- src/{or => core/mainloop}/cpuworker.h | 0 src/{or => core/mainloop}/main.c | 136 +-- src/{or => core/mainloop}/main.h | 2 +- src/{or => core/mainloop}/periodic.c | 8 +- src/{or => core/mainloop}/periodic.h | 0 src/{ => core}/or/addr_policy_st.h | 0 src/{ => core}/or/address_set.c | 2 +- src/{ => core}/or/address_set.h | 0 src/{ => core}/or/cell_queue_st.h | 0 src/{ => core}/or/cell_st.h | 0 src/{ => core}/or/channel.c | 44 +- src/{ => core}/or/channel.h | 4 +- src/{ => core}/or/channelpadding.c | 28 +- src/{ => core}/or/channelpadding.h | 0 src/{ => core}/or/channeltls.c | 56 +- src/{ => core}/or/channeltls.h | 4 +- src/{ => core}/or/circuit_st.h | 4 +- src/{ => core}/or/circuitbuild.c | 92 +- src/{ => core}/or/circuitbuild.h | 0 src/{ => core}/or/circuitlist.c | 76 +- src/{ => core}/or/circuitlist.h | 2 +- src/{ => core}/or/circuitmux.c | 18 +- src/{ => core}/or/circuitmux.h | 2 +- src/{ => core}/or/circuitmux_ewma.c | 10 +- src/{ => core}/or/circuitmux_ewma.h | 4 +- src/{ => core}/or/circuitstats.c | 34 +- src/{ => core}/or/circuitstats.h | 0 src/{ => core}/or/circuituse.c | 72 +- src/{ => core}/or/circuituse.h | 0 src/{ => core}/or/command.c | 46 +- src/{ => core}/or/command.h | 2 +- src/{ => core}/or/connection_edge.c | 92 +- src/{ => core}/or/connection_edge.h | 0 src/{ => core}/or/connection_or.c | 78 +- src/{ => core}/or/connection_or.h | 0 src/{ => core}/or/connection_st.h | 0 src/{ => core}/or/cpath_build_state_st.h | 0 src/{ => core}/or/crypt_path_reference_st.h | 0 src/{ => core}/or/crypt_path_st.h | 2 +- src/{ => core}/or/destroy_cell_queue_st.h | 0 src/{ => core}/or/dos.c | 26 +- src/{ => core}/or/dos.h | 0 src/{ => core}/or/edge_connection_st.h | 4 +- src/{ => core}/or/entry_connection_st.h | 2 +- src/{ => core}/or/entry_port_cfg_st.h | 2 +- src/{ => core}/or/extend_info_st.h | 0 src/{ => core}/or/git_revision.c | 5 +- src/{ => core}/or/git_revision.h | 0 src/{ => core}/or/listener_connection_st.h | 2 +- src/{ => core}/or/or.h | 2 +- src/{ => core}/or/or_circuit_st.h | 6 +- src/{ => core}/or/or_connection_st.h | 2 +- src/{ => core}/or/or_handshake_certs_st.h | 0 src/{ => core}/or/or_handshake_state_st.h | 0 src/{ => core}/or/origin_circuit_st.h | 4 +- src/{ => core}/or/policies.c | 36 +- src/{ => core}/or/policies.h | 0 src/{ => core}/or/port_cfg_st.h | 4 +- src/{ => core}/or/protover.c | 6 +- src/{ => core}/or/protover.h | 0 src/{ => core}/or/reasons.c | 8 +- src/{ => core}/or/reasons.h | 0 src/{ => core}/or/relay.c | 84 +- src/{ => core}/or/relay.h | 0 src/{ => core}/or/relay_crypto_st.h | 0 src/{ => core}/or/scheduler.c | 12 +- src/{ => core}/or/scheduler.h | 4 +- src/{ => core}/or/scheduler_kist.c | 16 +- src/{ => core}/or/scheduler_vanilla.c | 8 +- src/{ => core}/or/server_port_cfg_st.h | 0 src/{ => core}/or/socks_request_st.h | 0 src/{ => core}/or/status.c | 38 +- src/{ => core}/or/status.h | 0 src/{ => core}/or/tor_version_st.h | 0 src/{ => core}/or/var_cell_st.h | 0 src/{or => core/proto}/proto_cell.c | 8 +- src/{or => core/proto}/proto_cell.h | 0 src/{or => core/proto}/proto_control0.c | 4 +- src/{or => core/proto}/proto_control0.h | 0 src/{or => core/proto}/proto_ext_or.c | 6 +- src/{or => core/proto}/proto_ext_or.h | 0 src/{or => core/proto}/proto_http.c | 4 +- src/{or => core/proto}/proto_http.h | 0 src/{or => core/proto}/proto_socks.c | 18 +- src/{or => core/proto}/proto_socks.h | 0 src/{or => core/proto}/protover_rust.c | 4 +- src/{or => feature/api}/tor_api.c | 4 +- src/{or => feature/api}/tor_api.h | 0 src/{or => feature/api}/tor_api_internal.h | 0 src/{or => feature/client}/addressmap.c | 22 +- src/{or => feature/client}/addressmap.h | 0 src/{or => feature/client}/bridges.c | 36 +- src/{or => feature/client}/bridges.h | 0 src/{or => feature/client}/circpathbias.c | 34 +- src/{or => feature/client}/circpathbias.h | 0 src/{or => feature/client}/dnsserv.c | 26 +- src/{or => feature/client}/dnsserv.h | 0 src/{or => feature/client}/entrynodes.c | 56 +- src/{or => feature/client}/entrynodes.h | 0 src/{or => feature/client}/transports.c | 22 +- src/{or => feature/client}/transports.h | 0 src/{or => feature/control}/control.c | 116 +- src/{or => feature/control}/control.h | 0 .../control}/control_connection_st.h | 4 +- src/{or => feature}/dirauth/dircollate.c | 8 +- src/{or => feature}/dirauth/dircollate.h | 2 +- src/{or => feature}/dirauth/dirvote.c | 76 +- src/{or => feature}/dirauth/dirvote.h | 0 src/{or => feature/dirauth}/keypin.c | 2 +- src/{or => feature/dirauth}/keypin.h | 0 src/{or => feature}/dirauth/mode.h | 2 +- .../dirauth}/ns_detached_signatures_st.h | 0 src/{or => feature}/dirauth/shared_random.c | 34 +- src/{or => feature}/dirauth/shared_random.h | 2 +- src/{or => feature}/dirauth/shared_random_state.c | 22 +- src/{or => feature}/dirauth/shared_random_state.h | 2 +- .../dirauth}/vote_microdesc_hash_st.h | 0 src/{or => feature/dircache}/cached_dir_st.h | 0 src/{or => feature/dircache}/conscache.c | 6 +- src/{or => feature/dircache}/conscache.h | 0 src/{or => feature/dircache}/consdiffmgr.c | 20 +- src/{or => feature/dircache}/consdiffmgr.h | 0 src/{or => feature/dircache}/directory.c | 92 +- src/{or => feature/dircache}/directory.h | 2 +- src/{or => feature/dircache}/dirserv.c | 80 +- src/{or => feature/dircache}/dirserv.h | 0 src/{or => feature/dirclient}/dir_server_st.h | 4 +- src/{or => feature/dirclient}/download_status_st.h | 0 src/{or => feature/dircommon}/consdiff.c | 6 +- src/{or => feature/dircommon}/consdiff.h | 2 +- src/{or => feature/dircommon}/dir_connection_st.h | 2 +- src/{or => feature/dircommon}/fp_pair.c | 4 +- src/{or => feature/dircommon}/fp_pair.h | 0 src/{or => feature/dircommon}/vote_timing_st.h | 0 src/{or => feature/dircommon}/voting_schedule.c | 10 +- src/{or => feature/dircommon}/voting_schedule.h | 2 +- src/{or => feature/hibernate}/hibernate.c | 28 +- src/{or => feature/hibernate}/hibernate.h | 0 src/{or => feature/hs}/hs_cache.c | 20 +- src/{or => feature/hs}/hs_cache.h | 8 +- src/{or => feature/hs}/hs_cell.c | 14 +- src/{or => feature/hs}/hs_cell.h | 4 +- src/{or => feature/hs}/hs_circuit.c | 46 +- src/{or => feature/hs}/hs_circuit.h | 4 +- src/{or => feature/hs}/hs_circuitmap.c | 12 +- src/{or => feature/hs}/hs_circuitmap.h | 0 src/{or => feature/hs}/hs_client.c | 60 +- src/{or => feature/hs}/hs_client.h | 4 +- src/{or => feature/hs}/hs_common.c | 48 +- src/{or => feature/hs}/hs_common.h | 2 +- src/{or => feature/hs}/hs_config.c | 10 +- src/{or => feature/hs}/hs_config.h | 2 +- src/{or => feature/hs}/hs_control.c | 20 +- src/{or => feature/hs}/hs_control.h | 2 +- src/{or => feature/hs}/hs_descriptor.c | 18 +- src/{or => feature/hs}/hs_descriptor.h | 4 +- src/{or => feature/hs}/hs_ident.c | 2 +- src/{or => feature/hs}/hs_ident.h | 2 +- src/{or => feature/hs}/hs_intropoint.c | 24 +- src/{or => feature/hs}/hs_intropoint.h | 2 +- src/{or => feature/hs}/hs_service.c | 74 +- src/{or => feature/hs}/hs_service.h | 10 +- src/{or => feature/hs}/hs_stats.c | 6 +- src/{or => feature/hs}/hs_stats.h | 0 src/{or => feature/hs}/hsdir_index_st.h | 0 src/{or => feature/hs_common}/replaycache.c | 4 +- src/{or => feature/hs_common}/replaycache.h | 0 .../hs_common}/shared_random_client.c | 10 +- .../hs_common}/shared_random_client.h | 2 +- src/{or => feature/nodelist}/authority_cert_st.h | 2 +- src/{or => feature/nodelist}/desc_store_st.h | 0 .../nodelist}/document_signature_st.h | 0 src/{or => feature/nodelist}/extrainfo_st.h | 2 +- src/{or => feature/nodelist}/microdesc.c | 36 +- src/{or => feature/nodelist}/microdesc.h | 0 src/{or => feature/nodelist}/microdesc_st.h | 0 src/{or => feature/nodelist}/networkstatus.c | 96 +- src/{or => feature/nodelist}/networkstatus.h | 0 .../nodelist}/networkstatus_sr_info_st.h | 0 src/{or => feature/nodelist}/networkstatus_st.h | 2 +- .../nodelist}/networkstatus_voter_info_st.h | 0 src/{or => feature/nodelist}/node_st.h | 2 +- src/{or => feature/nodelist}/nodelist.c | 60 +- src/{or => feature/nodelist}/nodelist.h | 0 src/{or => feature/nodelist}/parsecommon.c | 2 +- src/{or => feature/nodelist}/parsecommon.h | 0 src/{or => feature/nodelist}/routerinfo_st.h | 2 +- src/{or => feature/nodelist}/routerlist.c | 80 +- src/{or => feature/nodelist}/routerlist.h | 0 src/{or => feature/nodelist}/routerlist_st.h | 2 +- src/{or => feature/nodelist}/routerparse.c | 80 +- src/{or => feature/nodelist}/routerparse.h | 0 src/{or => feature/nodelist}/routerset.c | 28 +- src/{or => feature/nodelist}/routerset.h | 0 src/{or => feature/nodelist}/routerstatus_st.h | 2 +- .../nodelist}/signed_descriptor_st.h | 2 +- src/{or => feature/nodelist}/torcert.c | 8 +- src/{or => feature/nodelist}/torcert.h | 0 .../nodelist}/vote_routerstatus_st.h | 2 +- src/{or => feature/relay}/dns.c | 28 +- src/{or => feature/relay}/dns.h | 2 +- src/{or => feature/relay}/dns_structs.h | 0 src/{or => feature/relay}/ext_orport.c | 18 +- src/{or => feature/relay}/ext_orport.h | 0 src/{or => feature/relay}/router.c | 82 +- src/{or => feature/relay}/router.h | 0 src/{or => feature/relay}/routerkeys.c | 10 +- src/{or => feature/relay}/routerkeys.h | 0 .../rend}/rend_authorized_client_st.h | 0 .../rend}/rend_encoded_v2_service_descriptor_st.h | 0 src/{or => feature/rend}/rend_intro_point_st.h | 0 .../rend}/rend_service_descriptor_st.h | 0 src/{or => feature/rend}/rendcache.c | 18 +- src/{or => feature/rend}/rendcache.h | 4 +- src/{or => feature/rend}/rendclient.c | 64 +- src/{or => feature/rend}/rendclient.h | 2 +- src/{or => feature/rend}/rendcommon.c | 58 +- src/{or => feature/rend}/rendcommon.h | 0 src/{or => feature/rend}/rendmid.c | 26 +- src/{or => feature/rend}/rendmid.h | 0 src/{or => feature/rend}/rendservice.c | 72 +- src/{or => feature/rend}/rendservice.h | 4 +- src/{or => feature/stats}/geoip.c | 14 +- src/{or => feature/stats}/geoip.h | 2 +- src/{or => feature/stats}/rephist.c | 30 +- src/{or => feature/stats}/rephist.h | 0 src/include.am | 5 +- src/or/Makefile.nmake | 79 -- src/or/include.am | 370 ------- src/rust/external/external.rs | 2 +- src/rust/protover/ffi.rs | 4 +- src/rust/protover/protover.rs | 12 +- src/rust/tor_log/tor_log.rs | 2 +- src/test/bench.c | 18 +- src/test/fuzz/fuzz_consensus.c | 8 +- src/test/fuzz/fuzz_descriptor.c | 8 +- src/test/fuzz/fuzz_diff.c | 4 +- src/test/fuzz/fuzz_diff_apply.c | 4 +- src/test/fuzz/fuzz_extrainfo.c | 8 +- src/test/fuzz/fuzz_hsdescv2.c | 6 +- src/test/fuzz/fuzz_hsdescv3.c | 6 +- src/test/fuzz/fuzz_http.c | 10 +- src/test/fuzz/fuzz_http_connect.c | 14 +- src/test/fuzz/fuzz_iptsv2.c | 8 +- src/test/fuzz/fuzz_microdesc.c | 6 +- src/test/fuzz/fuzz_vrs.c | 12 +- src/test/fuzz/fuzzing_common.c | 4 +- src/test/hs_test_helpers.c | 6 +- src/test/hs_test_helpers.h | 2 +- src/test/log_test_helpers.h | 2 +- src/test/rend_test_helpers.c | 10 +- src/test/rend_test_helpers.h | 2 +- src/test/test-network.sh | 4 +- src/test/test.c | 44 +- src/test/test_accounting.c | 10 +- src/test/test_addr.c | 4 +- src/test/test_address.c | 2 +- src/test/test_address_set.c | 24 +- src/test/test_bridges.c | 11 +- src/test/test_bt_cl.c | 2 +- src/test/test_buffers.c | 6 +- src/test/test_bwmgt.c | 2 +- src/test/test_cell_formats.c | 28 +- src/test/test_cell_queue.c | 14 +- src/test/test_channel.c | 30 +- src/test/test_channelpadding.c | 26 +- src/test/test_channeltls.c | 16 +- src/test/test_checkdir.c | 4 +- src/test/test_circuitbuild.c | 10 +- src/test/test_circuitlist.c | 16 +- src/test/test_circuitmux.c | 14 +- src/test/test_circuitstats.c | 24 +- src/test/test_circuituse.c | 18 +- src/test/test_compat_libevent.c | 2 +- src/test/test_config.c | 68 +- src/test/test_connection.c | 34 +- src/test/test_conscache.c | 6 +- src/test/test_consdiff.c | 4 +- src/test/test_consdiffmgr.c | 18 +- src/test/test_containers.c | 4 +- src/test/test_controller.c | 26 +- src/test/test_controller_events.c | 16 +- src/test/test_crypto.c | 2 +- src/test/test_crypto_slow.c | 2 +- src/test/test_dir.c | 70 +- src/test/test_dir_common.c | 22 +- src/test/test_dir_common.h | 6 +- src/test/test_dir_handle_get.c | 52 +- src/test/test_dns.c | 14 +- src/test/test_dos.c | 26 +- src/test/test_entryconn.c | 22 +- src/test/test_entrynodes.c | 52 +- src/test/test_extorport.c | 16 +- src/test/test_geoip.c | 6 +- src/test/test_guardfraction.c | 20 +- src/test/test_helpers.c | 28 +- src/test/test_helpers.h | 2 +- src/test/test_hs.c | 28 +- src/test/test_hs_cache.c | 16 +- src/test/test_hs_cell.c | 6 +- src/test/test_hs_client.c | 52 +- src/test/test_hs_common.c | 42 +- src/test/test_hs_config.c | 10 +- src/test/test_hs_control.c | 18 +- src/test/test_hs_descriptor.c | 6 +- src/test/test_hs_intropoint.c | 22 +- src/test/test_hs_ntor.c | 2 +- src/test/test_hs_ntor_cl.c | 6 +- src/test/test_hs_service.c | 64 +- src/test/test_introduce.c | 4 +- src/test/test_keypin.c | 4 +- src/test/test_link_handshake.c | 28 +- src/test/test_logging.c | 4 +- src/test/test_mainloop.c | 4 +- src/test/test_microdesc.c | 26 +- src/test/test_nodelist.c | 20 +- src/test/test_ntor_cl.c | 4 +- src/test/test_oom.c | 18 +- src/test/test_oos.c | 16 +- src/test/test_options.c | 14 +- src/test/test_periodic_event.c | 12 +- src/test/test_policy.c | 20 +- src/test/test_procmon.c | 2 +- src/test/test_proto_http.c | 4 +- src/test/test_proto_misc.c | 14 +- src/test/test_protover.c | 6 +- src/test/test_pt.c | 16 +- src/test/test_relay.c | 14 +- src/test/test_relaycell.c | 26 +- src/test/test_relaycrypt.c | 16 +- src/test/test_rendcache.c | 24 +- src/test/test_replay.c | 4 +- src/test/test_router.c | 13 +- src/test/test_routerkeys.c | 10 +- src/test/test_routerlist.c | 50 +- src/test/test_routerset.c | 24 +- src/test/test_scheduler.c | 14 +- src/test/test_shared_random.c | 32 +- src/test/test_slow.c | 2 +- src/test/test_socks.c | 10 +- src/test/test_status.c | 28 +- src/test/test_storagedir.c | 2 +- src/test/test_switch_id.c | 2 +- src/test/test_threads.c | 2 +- src/test/test_tortls.c | 6 +- src/test/test_util.c | 8 +- src/test/test_util_format.c | 2 +- src/test/test_util_process.c | 2 +- src/test/test_voting_schedule.c | 4 +- src/test/test_workqueue.c | 4 +- src/test/test_zero_length_keys.sh | 6 +- src/test/testing_common.c | 12 +- src/test/testing_rsakeys.c | 2 +- src/tools/include.am | 4 +- src/tools/tor_runner.c | 4 +- 398 files changed, 3606 insertions(+), 3783 deletions(-)

1 0

[tor/master] Remove ancient unused script that used the old src/or location
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit ce84200542f48a92e8b56a8d032401ecd153e90c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 16:05:53 2018 -0400 Remove ancient unused script that used the old src/or location --- contrib/include.am | 1 - contrib/win32build/package_nsis-mingw.sh | 95 -------------------------------- 2 files changed, 96 deletions(-) diff --git a/contrib/include.am b/contrib/include.am index 5d5f21649..a23e82d6d 100644 --- a/contrib/include.am +++ b/contrib/include.am @@ -10,7 +10,6 @@ EXTRA_DIST+= \ contrib/operator-tools/linux-tor-prio.sh \ contrib/operator-tools/tor-exit-notice.html \ contrib/or-tools/exitlist \ - contrib/win32build/package_nsis-mingw.sh \ contrib/win32build/tor-mingw.nsi.in \ contrib/win32build/tor.ico \ contrib/win32build/tor.nsi.in diff --git a/contrib/win32build/package_nsis-mingw.sh b/contrib/win32build/package_nsis-mingw.sh deleted file mode 100644 index cae862b91..000000000 --- a/contrib/win32build/package_nsis-mingw.sh +++ /dev/null @@ -1,95 +0,0 @@ -#!/bin/sh -# -# =============================================================================== -# package_nsis-ming.sh is distributed under this license: - -# Copyright (c) 2006-2007 Andrew Lewman -# Copyright (c) 2008 The Tor Project, Inc. - -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are -# met: - -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. - -# * Redistributions in binary form must reproduce the above -# copyright notice, this list of conditions and the following disclaimer -# in the documentation and/or other materials provided with the -# distribution. - -# * Neither the names of the copyright owners nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. - -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# =============================================================================== - -# Script to package a Tor installer on win32. This script assumes that -# you have already built Tor, that you are running msys/mingw, and that -# you know what you are doing. - -# Start in the tor source directory after you've compiled tor.exe -# This means start as ./contrib/win32build/package_nsis-mingw.sh - -rm -rf win_tmp -mkdir win_tmp -mkdir win_tmp/bin -mkdir win_tmp/contrib -mkdir win_tmp/doc -mkdir win_tmp/doc/spec -mkdir win_tmp/doc/design-paper -mkdir win_tmp/doc/contrib -mkdir win_tmp/src -mkdir win_tmp/src/config -mkdir win_tmp/tmp - -cp src/or/tor.exe win_tmp/bin/ -cp src/tools/tor-resolve.exe win_tmp/bin/ -cp contrib/win32build/tor.ico win_tmp/bin/ -cp src/config/geoip win_tmp/bin/ -strip win_tmp/bin/*.exe - -# There is no man2html in mingw. -# Maybe we should add this into make dist instead. -# One has to do this manually and cp it do the tor-source/doc dir -#man2html doc/tor.1.in > win_tmp/tmp/tor-reference.html -#man2html doc/tor-resolve.1 > win_tmp/tmp/tor-resolve.html - -clean_newlines() { - perl -pe 's/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg;' $1 >$2 -} - -clean_localstatedir() { - perl -pe 's/^\n$/\r\n/mg; s/([^\r])\n$/\1\r\n/mg; s{\@LOCALSTATEDIR\@/(lib|log)/tor/}{C:\\Documents and Settings\\Application Data\\Tor\\}' $1 >$2 -} - -for fn in address-spec.txt bridges-spec.txt control-spec.txt dir-spec.txt path-spec.txt rend-spec.txt socks-extensions.txt tor-spec.txt version-spec.txt; do - clean_newlines doc/spec/$fn win_tmp/doc/spec/$fn -done - -for fn in HACKING tor-gencert.html tor.html torify.html tor-resolve.html; do - clean_newlines doc/$fn win_tmp/doc/$fn -done - -for fn in README ChangeLog LICENSE; do - clean_newlines $fn win_tmp/$fn -done - -clean_localstatedir src/config/torrc.sample.in win_tmp/src/config/torrc.sample - -cp contrib/win32build/tor-mingw.nsi.in win_tmp/contrib/ - -cd win_tmp -makensis.exe contrib/tor-mingw.nsi.in -

1 0

[tor/master] Start splitting src/or
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 81cb0afb2b0163d95a435583041dce1064eec65c Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 16:04:32 2018 -0400 Start splitting src/or This is a very gentle commit that just lays the groundwork in the build system: it puts the include files to build libtor-app.a into src/core, and to build the tor executable into src/app. The executable is now "src/app/tor". --- .gitignore | 19 ++++++------ Makefile.am | 8 ++--- doc/HACKING/HelpfulTools.md | 6 ++-- scripts/maint/checkOptionDocs.pl.in | 2 +- src/app/include.am | 38 +++++++++++++++++++++++ src/{or => app}/ntmain.c | 2 +- src/{or => app}/ntmain.h | 0 src/{or => app}/tor_main.c | 0 src/{or => core}/include.am | 60 +++++++------------------------------ src/include.am | 5 +++- src/or/main.c | 2 +- src/test/test_zero_length_keys.sh | 6 ++-- 12 files changed, 74 insertions(+), 74 deletions(-) diff --git a/.gitignore b/.gitignore index 711974450..80c039a68 100644 --- a/.gitignore +++ b/.gitignore @@ -206,16 +206,15 @@ uptime-*.json /src/lib/libtor-wallclock.a /src/lib/libtor-wallclock-testing.a -# /src/or/ -/src/or/Makefile -/src/or/Makefile.in -/src/or/tor -/src/or/tor.exe -/src/or/tor-cov -/src/or/tor-cov.exe -/src/or/libtor-app.a -/src/or/libtor-app-testing.a -/src/or/libtor.lib +# /src/tor +/src/core/libtor-app.a +/src/core/libtor-app-testing.a + +# /src/app +/src/app/tor +/src/app/tor.exe +/src/app/tor-cov +/src/app/tor-cov.exe # /src/rust /src/rust/.cargo/config diff --git a/Makefile.am b/Makefile.am index b2da55cda..e7c46f3cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,9 +25,9 @@ AM_CFLAGS=@TOR_SYSTEMD_CFLAGS@ @CFLAGS_BUGTRAP@ @TOR_LZMA_CFLAGS@ @TOR_ZSTD_CFLA SHELL=@SHELL@ if COVERAGE_ENABLED -TESTING_TOR_BINARY=$(top_builddir)/src/or/tor-cov$(EXEEXT) +TESTING_TOR_BINARY=$(top_builddir)/src/app/tor-cov$(EXEEXT) else -TESTING_TOR_BINARY=$(top_builddir)/src/or/tor$(EXEEXT) +TESTING_TOR_BINARY=$(top_builddir)/src/app/tor$(EXEEXT) endif if USE_RUST @@ -108,7 +108,7 @@ TOR_CRYPTO_TESTING_LIBS = \ # All static libraries used to link tor. TOR_INTERNAL_LIBS = \ - src/or/libtor-app.a \ + src/core/libtor-app.a \ src/lib/libtor-compress.a \ src/lib/libtor-evloop.a \ $(TOR_CRYPTO_LIBS) \ @@ -119,7 +119,7 @@ TOR_INTERNAL_LIBS = \ # Variants of the above for linking the testing variant of tor (for coverage # and tests) TOR_INTERNAL_TESTING_LIBS = \ - src/or/libtor-app-testing.a \ + src/core/libtor-app-testing.a \ src/lib/libtor-compress-testing.a \ src/lib/libtor-evloop-testing.a \ $(TOR_CRYPTO_TESTING_LIBS) \ diff --git a/doc/HACKING/HelpfulTools.md b/doc/HACKING/HelpfulTools.md index eb068a91f..13d1c4b0d 100644 --- a/doc/HACKING/HelpfulTools.md +++ b/doc/HACKING/HelpfulTools.md @@ -28,7 +28,7 @@ Jenkins Valgrind -------- - valgrind --leak-check=yes --error-limit=no --show-reachable=yes src/or/tor + valgrind --leak-check=yes --error-limit=no --show-reachable=yes src/app/tor (Note that if you get a zillion openssl warnings, you will also need to pass `--undef-value-errors=no` to valgrind, or rebuild your openssl @@ -232,10 +232,10 @@ Beforehand, install google-perftools. Now you can run Tor with profiling enabled, and use the pprof utility to look at performance! See the gperftools manual for more info, but basically: -2. Run `env CPUPROFILE=/tmp/profile src/or/tor -f <path/torrc>`. The profile file +2. Run `env CPUPROFILE=/tmp/profile src/app/tor -f <path/torrc>`. The profile file is not written to until Tor finishes execuction. -3. Run `pprof src/or/tor /tm/profile` to start the REPL. +3. Run `pprof src/app/tor /tm/profile` to start the REPL. Generating and analyzing a callgraph ------------------------------------ diff --git a/scripts/maint/checkOptionDocs.pl.in b/scripts/maint/checkOptionDocs.pl.in index 1f53adf09..6533c762c 100644 --- a/scripts/maint/checkOptionDocs.pl.in +++ b/scripts/maint/checkOptionDocs.pl.in @@ -7,7 +7,7 @@ my %torrcSampleOptions = (); my %manPageOptions = (); # Load the canonical list as actually accepted by Tor. -open(F, "@abs_top_builddir@/src/or/tor --list-torrc-options |") or die; +open(F, "@abs_top_builddir@/src/app/tor --list-torrc-options |") or die; while (<F>) { next if m!\[notice\] Tor v0\.!; if (m!^([A-Za-z0-9_]+)!) { diff --git a/src/app/include.am b/src/app/include.am new file mode 100644 index 000000000..bbbffb3e5 --- /dev/null +++ b/src/app/include.am @@ -0,0 +1,38 @@ + +bin_PROGRAMS+= src/app/tor + +if COVERAGE_ENABLED +noinst_PROGRAMS+= src/app/tor-cov +endif + +noinst_HEADERS += \ + src/app/ntmain.h + +src_app_tor_SOURCES = src/app/tor_main.c +if BUILD_NT_SERVICES +src_app_tor_SOURCES += src/app/ntmain.c +endif + +# -L flags need to go in LDFLAGS. -l flags need to go in LDADD. +# This seems to matter nowhere but on windows, but I assure you that it +# matters a lot there, and is quite hard to debug if you forget to do it. + +src_app_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ +src_app_tor_LDADD = $(TOR_INTERNAL_LIBS) \ + $(rust_ldadd) \ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ + @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ + @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ + +if COVERAGE_ENABLED +src_app_tor_cov_SOURCES = $(src_app_tor_SOURCES) +src_app_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) +src_app_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) +src_app_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ +src_app_tor_cov_LDADD = $(TOR_INTERNAL_TESTING_LIBS) \ + @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ + @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ \ + @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ + @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ +endif diff --git a/src/or/ntmain.c b/src/app/ntmain.c similarity index 99% rename from src/or/ntmain.c rename to src/app/ntmain.c index f6b57753d..63d82f686 100644 --- a/src/or/ntmain.c +++ b/src/app/ntmain.c @@ -22,7 +22,7 @@ #include "or/or.h" #include "or/config.h" #include "or/main.h" -#include "or/ntmain.h" +#include "app/ntmain.h" #include "lib/log/win32err.h" #include "lib/fs/winlib.h" #include "lib/evloop/compat_libevent.h" diff --git a/src/or/ntmain.h b/src/app/ntmain.h similarity index 100% rename from src/or/ntmain.h rename to src/app/ntmain.h diff --git a/src/or/tor_main.c b/src/app/tor_main.c similarity index 100% rename from src/or/tor_main.c rename to src/app/tor_main.c diff --git a/src/or/include.am b/src/core/include.am similarity index 82% rename from src/or/include.am rename to src/core/include.am index ad7ee69bf..d6162196f 100644 --- a/src/or/include.am +++ b/src/core/include.am @@ -1,22 +1,11 @@ -bin_PROGRAMS+= src/or/tor + noinst_LIBRARIES += \ - src/or/libtor-app.a + src/core/libtor-app.a if UNITTESTS_ENABLED noinst_LIBRARIES += \ - src/or/libtor-app-testing.a -endif -if COVERAGE_ENABLED -noinst_PROGRAMS+= src/or/tor-cov -endif - -if BUILD_NT_SERVICES -tor_platform_source=src/or/ntmain.c -else -tor_platform_source= + src/core/libtor-app-testing.a endif -EXTRA_DIST+= src/or/ntmain.c src/or/Makefile.nmake - LIBTOR_APP_A_SOURCES = \ src/or/addressmap.c \ src/or/address_set.c \ @@ -110,8 +99,7 @@ LIBTOR_APP_A_SOURCES = \ src/or/torcert.c \ src/or/tor_api.c \ src/or/voting_schedule.c \ - src/or/onion_ntor.c \ - $(tor_platform_source) + src/or/onion_ntor.c # # Modules are conditionnally compiled in tor starting here. We add the C files @@ -131,53 +119,26 @@ if BUILD_MODULE_DIRAUTH LIBTOR_APP_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) endif -src_or_libtor_app_a_SOURCES = $(LIBTOR_APP_A_SOURCES) +src_core_libtor_app_a_SOURCES = $(LIBTOR_APP_A_SOURCES) if UNITTESTS_ENABLED # Add the sources of the modules that are needed for tests to work here. LIBTOR_APP_TESTING_A_SOURCES += $(MODULE_DIRAUTH_SOURCES) -src_or_libtor_app_testing_a_SOURCES = $(LIBTOR_APP_TESTING_A_SOURCES) +src_core_libtor_app_testing_a_SOURCES = $(LIBTOR_APP_TESTING_A_SOURCES) else -src_or_libtor_app_testing_a_SOURCES = +src_core_libtor_app_testing_a_SOURCES = endif -src_or_tor_SOURCES = src/or/tor_main.c - src/or/git_revision.$(OBJEXT) \ - src/or/src_or_libtor_app_testing_a-git_revision.$(OBJEXT): micro-revision.i + src/or/src_core_libtor_app_testing_a-git_revision.$(OBJEXT): micro-revision.i AM_CPPFLAGS += -DSHARE_DATADIR="\"$(datadir)\"" \ -DLOCALSTATEDIR="\"$(localstatedir)\"" \ -DBINDIR="\"$(bindir)\"" -src_or_libtor_app_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) -src_or_libtor_app_testing_a_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) - -# -L flags need to go in LDFLAGS. -l flags need to go in LDADD. -# This seems to matter nowhere but on windows, but I assure you that it -# matters a lot there, and is quite hard to debug if you forget to do it. - - -src_or_tor_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ -src_or_tor_LDADD = $(TOR_INTERNAL_LIBS) \ - $(rust_ldadd) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ @TOR_LIB_USERENV@ \ - @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ - @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ - -if COVERAGE_ENABLED -src_or_tor_cov_SOURCES = src/or/tor_main.c -src_or_tor_cov_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS) -src_or_tor_cov_CFLAGS = $(AM_CFLAGS) $(TEST_CFLAGS) -src_or_tor_cov_LDFLAGS = @TOR_LDFLAGS_zlib@ @TOR_LDFLAGS_openssl@ @TOR_LDFLAGS_libevent@ -src_or_tor_cov_LDADD = $(TOR_INTERNAL_TESTING_LIBS) \ - @TOR_ZLIB_LIBS@ @TOR_LIB_MATH@ @TOR_LIBEVENT_LIBS@ @TOR_OPENSSL_LIBS@ \ - @TOR_LIB_WS32@ @TOR_LIB_IPHLPAPI@ @TOR_LIB_GDI@ \ - @CURVE25519_LIBS@ @TOR_SYSTEMD_LIBS@ \ - @TOR_LZMA_LIBS@ @TOR_ZSTD_LIBS@ -endif +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 \ @@ -267,7 +228,6 @@ ORHEADERS = \ src/or/nodelist.h \ src/or/node_st.h \ src/or/ns_detached_signatures_st.h \ - src/or/ntmain.h \ src/or/onion.h \ src/or/onion_fast.h \ src/or/onion_ntor.h \ diff --git a/src/include.am b/src/include.am index 950f9cc0f..b5cca7e30 100644 --- a/src/include.am +++ b/src/include.am @@ -33,7 +33,10 @@ include src/lib/tls/include.am include src/lib/trace/include.am include src/lib/wallclock/include.am include src/trunnel/include.am -include src/or/include.am + +include src/core/include.am +include src/app/include.am + include src/rust/include.am include src/test/include.am include src/tools/include.am diff --git a/src/or/main.c b/src/or/main.c index 7e3eb2b59..2a57aa587 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -88,7 +88,7 @@ #include "or/microdesc.h" #include "or/networkstatus.h" #include "or/nodelist.h" -#include "or/ntmain.h" +#include "app/ntmain.h" #include "or/onion.h" #include "or/periodic.h" #include "or/policies.h" diff --git a/src/test/test_zero_length_keys.sh b/src/test/test_zero_length_keys.sh index f85edb68d..84ca513b0 100755 --- a/src/test/test_zero_length_keys.sh +++ b/src/test/test_zero_length_keys.sh @@ -3,8 +3,8 @@ exitcode=0 -"${SHELL:-sh}" "${abs_top_srcdir:-.}/src/test/zero_length_keys.sh" "${builddir:-.}/src/or/tor" -z || exitcode=1 -"${SHELL:-sh}" "${abs_top_srcdir:-.}/src/test/zero_length_keys.sh" "${builddir:-.}/src/or/tor" -d || exitcode=1 -"${SHELL:-sh}" "${abs_top_srcdir:-.}/src/test/zero_length_keys.sh" "${builddir:-.}/src/or/tor" -e || exitcode=1 +"${SHELL:-sh}" "${abs_top_srcdir:-.}/src/test/zero_length_keys.sh" "${builddir:-.}/src/app/tor" -z || exitcode=1 +"${SHELL:-sh}" "${abs_top_srcdir:-.}/src/test/zero_length_keys.sh" "${builddir:-.}/src/app/tor" -d || exitcode=1 +"${SHELL:-sh}" "${abs_top_srcdir:-.}/src/test/zero_length_keys.sh" "${builddir:-.}/src/app/tor" -e || exitcode=1 exit ${exitcode}

1 0

[tor/master] Move literally everything out of src/or
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 63b4ea22af8e8314dd718f02046de5f4b91edf9d Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 16:31:38 2018 -0400 Move literally everything out of src/or This commit won't build yet -- it just puts everything in a slightly more logical place. The reasoning here is that "src/core" will hold the stuff that every (or nearly every) tor instance will need in order to do onion routing. Other features (including some necessary ones) will live in "src/feature". The "src/app" directory will hold the stuff needed to have Tor be an application you can actually run. This commit DOES NOT refactor the former contents of src/or into a logical set of acyclic libraries, or change any code at all. That will have to come in the future. We will continue to move things around and split them in the future, but I hope this lays a reasonable groundwork for doing so. --- src/{or => app/config}/auth_dirs.inc | 0 src/{or => app/config}/config.c | 0 src/{or => app/config}/config.h | 0 src/{or => app/config}/confparse.c | 0 src/{or => app/config}/confparse.h | 0 src/{or => app/config}/fallback_dirs.inc | 0 src/{or => app/config}/or_options_st.h | 0 src/{or => app/config}/or_state_st.h | 0 src/{or => app/config}/statefile.c | 0 src/{or => app/config}/statefile.h | 0 src/app/include.am | 6 +- src/app/{ => main}/ntmain.c | 0 src/app/{ => main}/ntmain.h | 0 src/app/{ => main}/tor_main.c | 0 src/{or => core/crypto}/hs_ntor.c | 0 src/{or => core/crypto}/hs_ntor.h | 0 src/{or => core/crypto}/onion.c | 0 src/{or => core/crypto}/onion.h | 0 src/{or => core/crypto}/onion_fast.c | 0 src/{or => core/crypto}/onion_fast.h | 0 src/{or => core/crypto}/onion_ntor.c | 0 src/{or => core/crypto}/onion_ntor.h | 0 src/{or => core/crypto}/onion_tap.c | 0 src/{or => core/crypto}/onion_tap.h | 0 src/{or => core/crypto}/relay_crypto.c | 0 src/{or => core/crypto}/relay_crypto.h | 0 src/{or => core/mainloop}/connection.c | 0 src/{or => core/mainloop}/connection.h | 0 src/{or => core/mainloop}/cpuworker.c | 0 src/{or => core/mainloop}/cpuworker.h | 0 src/{or => core/mainloop}/main.c | 0 src/{or => core/mainloop}/main.h | 0 src/{or => core/mainloop}/periodic.c | 0 src/{or => core/mainloop}/periodic.h | 0 src/{ => core}/or/addr_policy_st.h | 0 src/{ => core}/or/address_set.c | 0 src/{ => core}/or/address_set.h | 0 src/{ => core}/or/cell_queue_st.h | 0 src/{ => core}/or/cell_st.h | 0 src/{ => core}/or/channel.c | 0 src/{ => core}/or/channel.h | 0 src/{ => core}/or/channelpadding.c | 0 src/{ => core}/or/channelpadding.h | 0 src/{ => core}/or/channeltls.c | 0 src/{ => core}/or/channeltls.h | 0 src/{ => core}/or/circuit_st.h | 0 src/{ => core}/or/circuitbuild.c | 0 src/{ => core}/or/circuitbuild.h | 0 src/{ => core}/or/circuitlist.c | 0 src/{ => core}/or/circuitlist.h | 0 src/{ => core}/or/circuitmux.c | 0 src/{ => core}/or/circuitmux.h | 0 src/{ => core}/or/circuitmux_ewma.c | 0 src/{ => core}/or/circuitmux_ewma.h | 0 src/{ => core}/or/circuitstats.c | 0 src/{ => core}/or/circuitstats.h | 0 src/{ => core}/or/circuituse.c | 0 src/{ => core}/or/circuituse.h | 0 src/{ => core}/or/command.c | 0 src/{ => core}/or/command.h | 0 src/{ => core}/or/connection_edge.c | 0 src/{ => core}/or/connection_edge.h | 0 src/{ => core}/or/connection_or.c | 0 src/{ => core}/or/connection_or.h | 0 src/{ => core}/or/connection_st.h | 0 src/{ => core}/or/cpath_build_state_st.h | 0 src/{ => core}/or/crypt_path_reference_st.h | 0 src/{ => core}/or/crypt_path_st.h | 0 src/{ => core}/or/destroy_cell_queue_st.h | 0 src/{ => core}/or/dos.c | 0 src/{ => core}/or/dos.h | 0 src/{ => core}/or/edge_connection_st.h | 0 src/{ => core}/or/entry_connection_st.h | 0 src/{ => core}/or/entry_port_cfg_st.h | 0 src/{ => core}/or/extend_info_st.h | 0 src/{ => core}/or/git_revision.c | 0 src/{ => core}/or/git_revision.h | 0 src/{ => core}/or/listener_connection_st.h | 0 src/{ => core}/or/or.h | 0 src/{ => core}/or/or_circuit_st.h | 0 src/{ => core}/or/or_connection_st.h | 0 src/{ => core}/or/or_handshake_certs_st.h | 0 src/{ => core}/or/or_handshake_state_st.h | 0 src/{ => core}/or/origin_circuit_st.h | 0 src/{ => core}/or/policies.c | 0 src/{ => core}/or/policies.h | 0 src/{ => core}/or/port_cfg_st.h | 0 src/{ => core}/or/reasons.c | 0 src/{ => core}/or/reasons.h | 0 src/{ => core}/or/relay.c | 0 src/{ => core}/or/relay.h | 0 src/{ => core}/or/relay_crypto_st.h | 0 src/{ => core}/or/scheduler.c | 0 src/{ => core}/or/scheduler.h | 0 src/{ => core}/or/scheduler_kist.c | 0 src/{ => core}/or/scheduler_vanilla.c | 0 src/{ => core}/or/server_port_cfg_st.h | 0 src/{ => core}/or/socks_request_st.h | 0 src/{ => core}/or/status.c | 0 src/{ => core}/or/status.h | 0 src/{ => core}/or/tor_version_st.h | 0 src/{ => core}/or/var_cell_st.h | 0 src/{or => core/proto}/proto_cell.c | 0 src/{or => core/proto}/proto_cell.h | 0 src/{or => core/proto}/proto_control0.c | 0 src/{or => core/proto}/proto_control0.h | 0 src/{or => core/proto}/proto_ext_or.c | 0 src/{or => core/proto}/proto_ext_or.h | 0 src/{or => core/proto}/proto_http.c | 0 src/{or => core/proto}/proto_http.h | 0 src/{or => core/proto}/proto_socks.c | 0 src/{or => core/proto}/proto_socks.h | 0 src/{or => core/proto}/protover.c | 0 src/{or => core/proto}/protover.h | 0 src/{or => core/proto}/protover_rust.c | 0 src/{or => feature/api}/tor_api.c | 0 src/{or => feature/api}/tor_api.h | 0 src/{or => feature/api}/tor_api_internal.h | 0 src/{or => feature/client}/addressmap.c | 0 src/{or => feature/client}/addressmap.h | 0 src/{or => feature/client}/bridges.c | 0 src/{or => feature/client}/bridges.h | 0 src/{or => feature/client}/circpathbias.c | 0 src/{or => feature/client}/circpathbias.h | 0 src/{or => feature/client}/dnsserv.c | 0 src/{or => feature/client}/dnsserv.h | 0 src/{or => feature/client}/entrynodes.c | 0 src/{or => feature/client}/entrynodes.h | 0 src/{or => feature/client}/transports.c | 0 src/{or => feature/client}/transports.h | 0 src/{or => feature/control}/control.c | 0 src/{or => feature/control}/control.h | 0 .../control}/control_connection_st.h | 0 src/{or => feature}/dirauth/dircollate.c | 0 src/{or => feature}/dirauth/dircollate.h | 0 src/{or => feature}/dirauth/dirvote.c | 0 src/{or => feature}/dirauth/dirvote.h | 0 src/{or => feature/dirauth}/keypin.c | 0 src/{or => feature/dirauth}/keypin.h | 0 src/{or => feature}/dirauth/mode.h | 0 .../dirauth}/ns_detached_signatures_st.h | 0 src/{or => feature}/dirauth/shared_random.c | 0 src/{or => feature}/dirauth/shared_random.h | 0 src/{or => feature}/dirauth/shared_random_state.c | 0 src/{or => feature}/dirauth/shared_random_state.h | 0 .../dirauth}/vote_microdesc_hash_st.h | 0 src/{or => feature/dircache}/cached_dir_st.h | 0 src/{or => feature/dircache}/conscache.c | 0 src/{or => feature/dircache}/conscache.h | 0 src/{or => feature/dircache}/consdiffmgr.c | 0 src/{or => feature/dircache}/consdiffmgr.h | 0 src/{or => feature/dircache}/directory.c | 0 src/{or => feature/dircache}/directory.h | 0 src/{or => feature/dircache}/dirserv.c | 0 src/{or => feature/dircache}/dirserv.h | 0 src/{or => feature/dirclient}/dir_server_st.h | 0 src/{or => feature/dirclient}/download_status_st.h | 0 src/{or => feature/dircommon}/consdiff.c | 0 src/{or => feature/dircommon}/consdiff.h | 0 src/{or => feature/dircommon}/dir_connection_st.h | 0 src/{or => feature/dircommon}/fp_pair.c | 0 src/{or => feature/dircommon}/fp_pair.h | 0 src/{or => feature/dircommon}/vote_timing_st.h | 0 src/{or => feature/dircommon}/voting_schedule.c | 0 src/{or => feature/dircommon}/voting_schedule.h | 0 src/{or => feature/hibernate}/hibernate.c | 0 src/{or => feature/hibernate}/hibernate.h | 0 src/{or => feature/hs}/hs_cache.c | 0 src/{or => feature/hs}/hs_cache.h | 0 src/{or => feature/hs}/hs_cell.c | 0 src/{or => feature/hs}/hs_cell.h | 0 src/{or => feature/hs}/hs_circuit.c | 0 src/{or => feature/hs}/hs_circuit.h | 0 src/{or => feature/hs}/hs_circuitmap.c | 0 src/{or => feature/hs}/hs_circuitmap.h | 0 src/{or => feature/hs}/hs_client.c | 0 src/{or => feature/hs}/hs_client.h | 0 src/{or => feature/hs}/hs_common.c | 0 src/{or => feature/hs}/hs_common.h | 0 src/{or => feature/hs}/hs_config.c | 0 src/{or => feature/hs}/hs_config.h | 0 src/{or => feature/hs}/hs_control.c | 0 src/{or => feature/hs}/hs_control.h | 0 src/{or => feature/hs}/hs_descriptor.c | 0 src/{or => feature/hs}/hs_descriptor.h | 0 src/{or => feature/hs}/hs_ident.c | 0 src/{or => feature/hs}/hs_ident.h | 0 src/{or => feature/hs}/hs_intropoint.c | 0 src/{or => feature/hs}/hs_intropoint.h | 0 src/{or => feature/hs}/hs_service.c | 0 src/{or => feature/hs}/hs_service.h | 0 src/{or => feature/hs}/hs_stats.c | 0 src/{or => feature/hs}/hs_stats.h | 0 src/{or => feature/hs}/hsdir_index_st.h | 0 src/{or => feature/hs_common}/replaycache.c | 0 src/{or => feature/hs_common}/replaycache.h | 0 .../hs_common}/shared_random_client.c | 0 .../hs_common}/shared_random_client.h | 0 src/{or => feature/nodelist}/authority_cert_st.h | 0 src/{or => feature/nodelist}/desc_store_st.h | 0 .../nodelist}/document_signature_st.h | 0 src/{or => feature/nodelist}/extrainfo_st.h | 0 src/{or => feature/nodelist}/microdesc.c | 0 src/{or => feature/nodelist}/microdesc.h | 0 src/{or => feature/nodelist}/microdesc_st.h | 0 src/{or => feature/nodelist}/networkstatus.c | 0 src/{or => feature/nodelist}/networkstatus.h | 0 .../nodelist}/networkstatus_sr_info_st.h | 0 src/{or => feature/nodelist}/networkstatus_st.h | 0 .../nodelist}/networkstatus_voter_info_st.h | 0 src/{or => feature/nodelist}/node_st.h | 0 src/{or => feature/nodelist}/nodelist.c | 0 src/{or => feature/nodelist}/nodelist.h | 0 src/{or => feature/nodelist}/parsecommon.c | 0 src/{or => feature/nodelist}/parsecommon.h | 0 src/{or => feature/nodelist}/routerinfo_st.h | 0 src/{or => feature/nodelist}/routerlist.c | 0 src/{or => feature/nodelist}/routerlist.h | 0 src/{or => feature/nodelist}/routerlist_st.h | 0 src/{or => feature/nodelist}/routerparse.c | 0 src/{or => feature/nodelist}/routerparse.h | 0 src/{or => feature/nodelist}/routerset.c | 0 src/{or => feature/nodelist}/routerset.h | 0 src/{or => feature/nodelist}/routerstatus_st.h | 0 .../nodelist}/signed_descriptor_st.h | 0 src/{or => feature/nodelist}/torcert.c | 0 src/{or => feature/nodelist}/torcert.h | 0 .../nodelist}/vote_routerstatus_st.h | 0 src/{or => feature/relay}/dns.c | 0 src/{or => feature/relay}/dns.h | 0 src/{or => feature/relay}/dns_structs.h | 0 src/{or => feature/relay}/ext_orport.c | 0 src/{or => feature/relay}/ext_orport.h | 0 src/{or => feature/relay}/router.c | 0 src/{or => feature/relay}/router.h | 0 src/{or => feature/relay}/routerkeys.c | 0 src/{or => feature/relay}/routerkeys.h | 0 .../rend}/rend_authorized_client_st.h | 0 .../rend}/rend_encoded_v2_service_descriptor_st.h | 0 src/{or => feature/rend}/rend_intro_point_st.h | 0 .../rend}/rend_service_descriptor_st.h | 0 src/{or => feature/rend}/rendcache.c | 0 src/{or => feature/rend}/rendcache.h | 0 src/{or => feature/rend}/rendclient.c | 0 src/{or => feature/rend}/rendclient.h | 0 src/{or => feature/rend}/rendcommon.c | 0 src/{or => feature/rend}/rendcommon.h | 0 src/{or => feature/rend}/rendmid.c | 0 src/{or => feature/rend}/rendmid.h | 0 src/{or => feature/rend}/rendservice.c | 0 src/{or => feature/rend}/rendservice.h | 0 src/{or => feature/stats}/geoip.c | 0 src/{or => feature/stats}/geoip.h | 0 src/{or => feature/stats}/rephist.c | 0 src/{or => feature/stats}/rephist.h | 0 src/or/Makefile.nmake | 79 ---------------------- 256 files changed, 3 insertions(+), 82 deletions(-) diff --git a/src/or/auth_dirs.inc b/src/app/config/auth_dirs.inc similarity index 100% rename from src/or/auth_dirs.inc rename to src/app/config/auth_dirs.inc diff --git a/src/or/config.c b/src/app/config/config.c similarity index 100% rename from src/or/config.c rename to src/app/config/config.c diff --git a/src/or/config.h b/src/app/config/config.h similarity index 100% rename from src/or/config.h rename to src/app/config/config.h diff --git a/src/or/confparse.c b/src/app/config/confparse.c similarity index 100% rename from src/or/confparse.c rename to src/app/config/confparse.c diff --git a/src/or/confparse.h b/src/app/config/confparse.h similarity index 100% rename from src/or/confparse.h rename to src/app/config/confparse.h diff --git a/src/or/fallback_dirs.inc b/src/app/config/fallback_dirs.inc similarity index 100% rename from src/or/fallback_dirs.inc rename to src/app/config/fallback_dirs.inc diff --git a/src/or/or_options_st.h b/src/app/config/or_options_st.h similarity index 100% rename from src/or/or_options_st.h rename to src/app/config/or_options_st.h diff --git a/src/or/or_state_st.h b/src/app/config/or_state_st.h similarity index 100% rename from src/or/or_state_st.h rename to src/app/config/or_state_st.h diff --git a/src/or/statefile.c b/src/app/config/statefile.c similarity index 100% rename from src/or/statefile.c rename to src/app/config/statefile.c diff --git a/src/or/statefile.h b/src/app/config/statefile.h similarity index 100% rename from src/or/statefile.h rename to src/app/config/statefile.h diff --git a/src/app/include.am b/src/app/include.am index bbbffb3e5..8e86bbeeb 100644 --- a/src/app/include.am +++ b/src/app/include.am @@ -6,11 +6,11 @@ noinst_PROGRAMS+= src/app/tor-cov endif noinst_HEADERS += \ - src/app/ntmain.h + src/app/main/ntmain.h -src_app_tor_SOURCES = src/app/tor_main.c +src_app_tor_SOURCES = src/app/main/tor_main.c if BUILD_NT_SERVICES -src_app_tor_SOURCES += src/app/ntmain.c +src_app_tor_SOURCES += src/app/main/ntmain.c endif # -L flags need to go in LDFLAGS. -l flags need to go in LDADD. diff --git a/src/app/ntmain.c b/src/app/main/ntmain.c similarity index 100% rename from src/app/ntmain.c rename to src/app/main/ntmain.c diff --git a/src/app/ntmain.h b/src/app/main/ntmain.h similarity index 100% rename from src/app/ntmain.h rename to src/app/main/ntmain.h diff --git a/src/app/tor_main.c b/src/app/main/tor_main.c similarity index 100% rename from src/app/tor_main.c rename to src/app/main/tor_main.c diff --git a/src/or/hs_ntor.c b/src/core/crypto/hs_ntor.c similarity index 100% rename from src/or/hs_ntor.c rename to src/core/crypto/hs_ntor.c diff --git a/src/or/hs_ntor.h b/src/core/crypto/hs_ntor.h similarity index 100% rename from src/or/hs_ntor.h rename to src/core/crypto/hs_ntor.h diff --git a/src/or/onion.c b/src/core/crypto/onion.c similarity index 100% rename from src/or/onion.c rename to src/core/crypto/onion.c diff --git a/src/or/onion.h b/src/core/crypto/onion.h similarity index 100% rename from src/or/onion.h rename to src/core/crypto/onion.h diff --git a/src/or/onion_fast.c b/src/core/crypto/onion_fast.c similarity index 100% rename from src/or/onion_fast.c rename to src/core/crypto/onion_fast.c diff --git a/src/or/onion_fast.h b/src/core/crypto/onion_fast.h similarity index 100% rename from src/or/onion_fast.h rename to src/core/crypto/onion_fast.h diff --git a/src/or/onion_ntor.c b/src/core/crypto/onion_ntor.c similarity index 100% rename from src/or/onion_ntor.c rename to src/core/crypto/onion_ntor.c diff --git a/src/or/onion_ntor.h b/src/core/crypto/onion_ntor.h similarity index 100% rename from src/or/onion_ntor.h rename to src/core/crypto/onion_ntor.h diff --git a/src/or/onion_tap.c b/src/core/crypto/onion_tap.c similarity index 100% rename from src/or/onion_tap.c rename to src/core/crypto/onion_tap.c diff --git a/src/or/onion_tap.h b/src/core/crypto/onion_tap.h similarity index 100% rename from src/or/onion_tap.h rename to src/core/crypto/onion_tap.h diff --git a/src/or/relay_crypto.c b/src/core/crypto/relay_crypto.c similarity index 100% rename from src/or/relay_crypto.c rename to src/core/crypto/relay_crypto.c diff --git a/src/or/relay_crypto.h b/src/core/crypto/relay_crypto.h similarity index 100% rename from src/or/relay_crypto.h rename to src/core/crypto/relay_crypto.h diff --git a/src/or/connection.c b/src/core/mainloop/connection.c similarity index 100% rename from src/or/connection.c rename to src/core/mainloop/connection.c diff --git a/src/or/connection.h b/src/core/mainloop/connection.h similarity index 100% rename from src/or/connection.h rename to src/core/mainloop/connection.h diff --git a/src/or/cpuworker.c b/src/core/mainloop/cpuworker.c similarity index 100% rename from src/or/cpuworker.c rename to src/core/mainloop/cpuworker.c diff --git a/src/or/cpuworker.h b/src/core/mainloop/cpuworker.h similarity index 100% rename from src/or/cpuworker.h rename to src/core/mainloop/cpuworker.h diff --git a/src/or/main.c b/src/core/mainloop/main.c similarity index 100% rename from src/or/main.c rename to src/core/mainloop/main.c diff --git a/src/or/main.h b/src/core/mainloop/main.h similarity index 100% rename from src/or/main.h rename to src/core/mainloop/main.h diff --git a/src/or/periodic.c b/src/core/mainloop/periodic.c similarity index 100% rename from src/or/periodic.c rename to src/core/mainloop/periodic.c diff --git a/src/or/periodic.h b/src/core/mainloop/periodic.h similarity index 100% rename from src/or/periodic.h rename to src/core/mainloop/periodic.h diff --git a/src/or/addr_policy_st.h b/src/core/or/addr_policy_st.h similarity index 100% rename from src/or/addr_policy_st.h rename to src/core/or/addr_policy_st.h diff --git a/src/or/address_set.c b/src/core/or/address_set.c similarity index 100% rename from src/or/address_set.c rename to src/core/or/address_set.c diff --git a/src/or/address_set.h b/src/core/or/address_set.h similarity index 100% rename from src/or/address_set.h rename to src/core/or/address_set.h diff --git a/src/or/cell_queue_st.h b/src/core/or/cell_queue_st.h similarity index 100% rename from src/or/cell_queue_st.h rename to src/core/or/cell_queue_st.h diff --git a/src/or/cell_st.h b/src/core/or/cell_st.h similarity index 100% rename from src/or/cell_st.h rename to src/core/or/cell_st.h diff --git a/src/or/channel.c b/src/core/or/channel.c similarity index 100% rename from src/or/channel.c rename to src/core/or/channel.c diff --git a/src/or/channel.h b/src/core/or/channel.h similarity index 100% rename from src/or/channel.h rename to src/core/or/channel.h diff --git a/src/or/channelpadding.c b/src/core/or/channelpadding.c similarity index 100% rename from src/or/channelpadding.c rename to src/core/or/channelpadding.c diff --git a/src/or/channelpadding.h b/src/core/or/channelpadding.h similarity index 100% rename from src/or/channelpadding.h rename to src/core/or/channelpadding.h diff --git a/src/or/channeltls.c b/src/core/or/channeltls.c similarity index 100% rename from src/or/channeltls.c rename to src/core/or/channeltls.c diff --git a/src/or/channeltls.h b/src/core/or/channeltls.h similarity index 100% rename from src/or/channeltls.h rename to src/core/or/channeltls.h diff --git a/src/or/circuit_st.h b/src/core/or/circuit_st.h similarity index 100% rename from src/or/circuit_st.h rename to src/core/or/circuit_st.h diff --git a/src/or/circuitbuild.c b/src/core/or/circuitbuild.c similarity index 100% rename from src/or/circuitbuild.c rename to src/core/or/circuitbuild.c diff --git a/src/or/circuitbuild.h b/src/core/or/circuitbuild.h similarity index 100% rename from src/or/circuitbuild.h rename to src/core/or/circuitbuild.h diff --git a/src/or/circuitlist.c b/src/core/or/circuitlist.c similarity index 100% rename from src/or/circuitlist.c rename to src/core/or/circuitlist.c diff --git a/src/or/circuitlist.h b/src/core/or/circuitlist.h similarity index 100% rename from src/or/circuitlist.h rename to src/core/or/circuitlist.h diff --git a/src/or/circuitmux.c b/src/core/or/circuitmux.c similarity index 100% rename from src/or/circuitmux.c rename to src/core/or/circuitmux.c diff --git a/src/or/circuitmux.h b/src/core/or/circuitmux.h similarity index 100% rename from src/or/circuitmux.h rename to src/core/or/circuitmux.h diff --git a/src/or/circuitmux_ewma.c b/src/core/or/circuitmux_ewma.c similarity index 100% rename from src/or/circuitmux_ewma.c rename to src/core/or/circuitmux_ewma.c diff --git a/src/or/circuitmux_ewma.h b/src/core/or/circuitmux_ewma.h similarity index 100% rename from src/or/circuitmux_ewma.h rename to src/core/or/circuitmux_ewma.h diff --git a/src/or/circuitstats.c b/src/core/or/circuitstats.c similarity index 100% rename from src/or/circuitstats.c rename to src/core/or/circuitstats.c diff --git a/src/or/circuitstats.h b/src/core/or/circuitstats.h similarity index 100% rename from src/or/circuitstats.h rename to src/core/or/circuitstats.h diff --git a/src/or/circuituse.c b/src/core/or/circuituse.c similarity index 100% rename from src/or/circuituse.c rename to src/core/or/circuituse.c diff --git a/src/or/circuituse.h b/src/core/or/circuituse.h similarity index 100% rename from src/or/circuituse.h rename to src/core/or/circuituse.h diff --git a/src/or/command.c b/src/core/or/command.c similarity index 100% rename from src/or/command.c rename to src/core/or/command.c diff --git a/src/or/command.h b/src/core/or/command.h similarity index 100% rename from src/or/command.h rename to src/core/or/command.h diff --git a/src/or/connection_edge.c b/src/core/or/connection_edge.c similarity index 100% rename from src/or/connection_edge.c rename to src/core/or/connection_edge.c diff --git a/src/or/connection_edge.h b/src/core/or/connection_edge.h similarity index 100% rename from src/or/connection_edge.h rename to src/core/or/connection_edge.h diff --git a/src/or/connection_or.c b/src/core/or/connection_or.c similarity index 100% rename from src/or/connection_or.c rename to src/core/or/connection_or.c diff --git a/src/or/connection_or.h b/src/core/or/connection_or.h similarity index 100% rename from src/or/connection_or.h rename to src/core/or/connection_or.h diff --git a/src/or/connection_st.h b/src/core/or/connection_st.h similarity index 100% rename from src/or/connection_st.h rename to src/core/or/connection_st.h diff --git a/src/or/cpath_build_state_st.h b/src/core/or/cpath_build_state_st.h similarity index 100% rename from src/or/cpath_build_state_st.h rename to src/core/or/cpath_build_state_st.h diff --git a/src/or/crypt_path_reference_st.h b/src/core/or/crypt_path_reference_st.h similarity index 100% rename from src/or/crypt_path_reference_st.h rename to src/core/or/crypt_path_reference_st.h diff --git a/src/or/crypt_path_st.h b/src/core/or/crypt_path_st.h similarity index 100% rename from src/or/crypt_path_st.h rename to src/core/or/crypt_path_st.h diff --git a/src/or/destroy_cell_queue_st.h b/src/core/or/destroy_cell_queue_st.h similarity index 100% rename from src/or/destroy_cell_queue_st.h rename to src/core/or/destroy_cell_queue_st.h diff --git a/src/or/dos.c b/src/core/or/dos.c similarity index 100% rename from src/or/dos.c rename to src/core/or/dos.c diff --git a/src/or/dos.h b/src/core/or/dos.h similarity index 100% rename from src/or/dos.h rename to src/core/or/dos.h diff --git a/src/or/edge_connection_st.h b/src/core/or/edge_connection_st.h similarity index 100% rename from src/or/edge_connection_st.h rename to src/core/or/edge_connection_st.h diff --git a/src/or/entry_connection_st.h b/src/core/or/entry_connection_st.h similarity index 100% rename from src/or/entry_connection_st.h rename to src/core/or/entry_connection_st.h diff --git a/src/or/entry_port_cfg_st.h b/src/core/or/entry_port_cfg_st.h similarity index 100% rename from src/or/entry_port_cfg_st.h rename to src/core/or/entry_port_cfg_st.h diff --git a/src/or/extend_info_st.h b/src/core/or/extend_info_st.h similarity index 100% rename from src/or/extend_info_st.h rename to src/core/or/extend_info_st.h diff --git a/src/or/git_revision.c b/src/core/or/git_revision.c similarity index 100% rename from src/or/git_revision.c rename to src/core/or/git_revision.c diff --git a/src/or/git_revision.h b/src/core/or/git_revision.h similarity index 100% rename from src/or/git_revision.h rename to src/core/or/git_revision.h diff --git a/src/or/listener_connection_st.h b/src/core/or/listener_connection_st.h similarity index 100% rename from src/or/listener_connection_st.h rename to src/core/or/listener_connection_st.h diff --git a/src/or/or.h b/src/core/or/or.h similarity index 100% rename from src/or/or.h rename to src/core/or/or.h diff --git a/src/or/or_circuit_st.h b/src/core/or/or_circuit_st.h similarity index 100% rename from src/or/or_circuit_st.h rename to src/core/or/or_circuit_st.h diff --git a/src/or/or_connection_st.h b/src/core/or/or_connection_st.h similarity index 100% rename from src/or/or_connection_st.h rename to src/core/or/or_connection_st.h diff --git a/src/or/or_handshake_certs_st.h b/src/core/or/or_handshake_certs_st.h similarity index 100% rename from src/or/or_handshake_certs_st.h rename to src/core/or/or_handshake_certs_st.h diff --git a/src/or/or_handshake_state_st.h b/src/core/or/or_handshake_state_st.h similarity index 100% rename from src/or/or_handshake_state_st.h rename to src/core/or/or_handshake_state_st.h diff --git a/src/or/origin_circuit_st.h b/src/core/or/origin_circuit_st.h similarity index 100% rename from src/or/origin_circuit_st.h rename to src/core/or/origin_circuit_st.h diff --git a/src/or/policies.c b/src/core/or/policies.c similarity index 100% rename from src/or/policies.c rename to src/core/or/policies.c diff --git a/src/or/policies.h b/src/core/or/policies.h similarity index 100% rename from src/or/policies.h rename to src/core/or/policies.h diff --git a/src/or/port_cfg_st.h b/src/core/or/port_cfg_st.h similarity index 100% rename from src/or/port_cfg_st.h rename to src/core/or/port_cfg_st.h diff --git a/src/or/reasons.c b/src/core/or/reasons.c similarity index 100% rename from src/or/reasons.c rename to src/core/or/reasons.c diff --git a/src/or/reasons.h b/src/core/or/reasons.h similarity index 100% rename from src/or/reasons.h rename to src/core/or/reasons.h diff --git a/src/or/relay.c b/src/core/or/relay.c similarity index 100% rename from src/or/relay.c rename to src/core/or/relay.c diff --git a/src/or/relay.h b/src/core/or/relay.h similarity index 100% rename from src/or/relay.h rename to src/core/or/relay.h diff --git a/src/or/relay_crypto_st.h b/src/core/or/relay_crypto_st.h similarity index 100% rename from src/or/relay_crypto_st.h rename to src/core/or/relay_crypto_st.h diff --git a/src/or/scheduler.c b/src/core/or/scheduler.c similarity index 100% rename from src/or/scheduler.c rename to src/core/or/scheduler.c diff --git a/src/or/scheduler.h b/src/core/or/scheduler.h similarity index 100% rename from src/or/scheduler.h rename to src/core/or/scheduler.h diff --git a/src/or/scheduler_kist.c b/src/core/or/scheduler_kist.c similarity index 100% rename from src/or/scheduler_kist.c rename to src/core/or/scheduler_kist.c diff --git a/src/or/scheduler_vanilla.c b/src/core/or/scheduler_vanilla.c similarity index 100% rename from src/or/scheduler_vanilla.c rename to src/core/or/scheduler_vanilla.c diff --git a/src/or/server_port_cfg_st.h b/src/core/or/server_port_cfg_st.h similarity index 100% rename from src/or/server_port_cfg_st.h rename to src/core/or/server_port_cfg_st.h diff --git a/src/or/socks_request_st.h b/src/core/or/socks_request_st.h similarity index 100% rename from src/or/socks_request_st.h rename to src/core/or/socks_request_st.h diff --git a/src/or/status.c b/src/core/or/status.c similarity index 100% rename from src/or/status.c rename to src/core/or/status.c diff --git a/src/or/status.h b/src/core/or/status.h similarity index 100% rename from src/or/status.h rename to src/core/or/status.h diff --git a/src/or/tor_version_st.h b/src/core/or/tor_version_st.h similarity index 100% rename from src/or/tor_version_st.h rename to src/core/or/tor_version_st.h diff --git a/src/or/var_cell_st.h b/src/core/or/var_cell_st.h similarity index 100% rename from src/or/var_cell_st.h rename to src/core/or/var_cell_st.h diff --git a/src/or/proto_cell.c b/src/core/proto/proto_cell.c similarity index 100% rename from src/or/proto_cell.c rename to src/core/proto/proto_cell.c diff --git a/src/or/proto_cell.h b/src/core/proto/proto_cell.h similarity index 100% rename from src/or/proto_cell.h rename to src/core/proto/proto_cell.h diff --git a/src/or/proto_control0.c b/src/core/proto/proto_control0.c similarity index 100% rename from src/or/proto_control0.c rename to src/core/proto/proto_control0.c diff --git a/src/or/proto_control0.h b/src/core/proto/proto_control0.h similarity index 100% rename from src/or/proto_control0.h rename to src/core/proto/proto_control0.h diff --git a/src/or/proto_ext_or.c b/src/core/proto/proto_ext_or.c similarity index 100% rename from src/or/proto_ext_or.c rename to src/core/proto/proto_ext_or.c diff --git a/src/or/proto_ext_or.h b/src/core/proto/proto_ext_or.h similarity index 100% rename from src/or/proto_ext_or.h rename to src/core/proto/proto_ext_or.h diff --git a/src/or/proto_http.c b/src/core/proto/proto_http.c similarity index 100% rename from src/or/proto_http.c rename to src/core/proto/proto_http.c diff --git a/src/or/proto_http.h b/src/core/proto/proto_http.h similarity index 100% rename from src/or/proto_http.h rename to src/core/proto/proto_http.h diff --git a/src/or/proto_socks.c b/src/core/proto/proto_socks.c similarity index 100% rename from src/or/proto_socks.c rename to src/core/proto/proto_socks.c diff --git a/src/or/proto_socks.h b/src/core/proto/proto_socks.h similarity index 100% rename from src/or/proto_socks.h rename to src/core/proto/proto_socks.h diff --git a/src/or/protover.c b/src/core/proto/protover.c similarity index 100% rename from src/or/protover.c rename to src/core/proto/protover.c diff --git a/src/or/protover.h b/src/core/proto/protover.h similarity index 100% rename from src/or/protover.h rename to src/core/proto/protover.h diff --git a/src/or/protover_rust.c b/src/core/proto/protover_rust.c similarity index 100% rename from src/or/protover_rust.c rename to src/core/proto/protover_rust.c diff --git a/src/or/tor_api.c b/src/feature/api/tor_api.c similarity index 100% rename from src/or/tor_api.c rename to src/feature/api/tor_api.c diff --git a/src/or/tor_api.h b/src/feature/api/tor_api.h similarity index 100% rename from src/or/tor_api.h rename to src/feature/api/tor_api.h diff --git a/src/or/tor_api_internal.h b/src/feature/api/tor_api_internal.h similarity index 100% rename from src/or/tor_api_internal.h rename to src/feature/api/tor_api_internal.h diff --git a/src/or/addressmap.c b/src/feature/client/addressmap.c similarity index 100% rename from src/or/addressmap.c rename to src/feature/client/addressmap.c diff --git a/src/or/addressmap.h b/src/feature/client/addressmap.h similarity index 100% rename from src/or/addressmap.h rename to src/feature/client/addressmap.h diff --git a/src/or/bridges.c b/src/feature/client/bridges.c similarity index 100% rename from src/or/bridges.c rename to src/feature/client/bridges.c diff --git a/src/or/bridges.h b/src/feature/client/bridges.h similarity index 100% rename from src/or/bridges.h rename to src/feature/client/bridges.h diff --git a/src/or/circpathbias.c b/src/feature/client/circpathbias.c similarity index 100% rename from src/or/circpathbias.c rename to src/feature/client/circpathbias.c diff --git a/src/or/circpathbias.h b/src/feature/client/circpathbias.h similarity index 100% rename from src/or/circpathbias.h rename to src/feature/client/circpathbias.h diff --git a/src/or/dnsserv.c b/src/feature/client/dnsserv.c similarity index 100% rename from src/or/dnsserv.c rename to src/feature/client/dnsserv.c diff --git a/src/or/dnsserv.h b/src/feature/client/dnsserv.h similarity index 100% rename from src/or/dnsserv.h rename to src/feature/client/dnsserv.h diff --git a/src/or/entrynodes.c b/src/feature/client/entrynodes.c similarity index 100% rename from src/or/entrynodes.c rename to src/feature/client/entrynodes.c diff --git a/src/or/entrynodes.h b/src/feature/client/entrynodes.h similarity index 100% rename from src/or/entrynodes.h rename to src/feature/client/entrynodes.h diff --git a/src/or/transports.c b/src/feature/client/transports.c similarity index 100% rename from src/or/transports.c rename to src/feature/client/transports.c diff --git a/src/or/transports.h b/src/feature/client/transports.h similarity index 100% rename from src/or/transports.h rename to src/feature/client/transports.h diff --git a/src/or/control.c b/src/feature/control/control.c similarity index 100% rename from src/or/control.c rename to src/feature/control/control.c diff --git a/src/or/control.h b/src/feature/control/control.h similarity index 100% rename from src/or/control.h rename to src/feature/control/control.h diff --git a/src/or/control_connection_st.h b/src/feature/control/control_connection_st.h similarity index 100% rename from src/or/control_connection_st.h rename to src/feature/control/control_connection_st.h diff --git a/src/or/dirauth/dircollate.c b/src/feature/dirauth/dircollate.c similarity index 100% rename from src/or/dirauth/dircollate.c rename to src/feature/dirauth/dircollate.c diff --git a/src/or/dirauth/dircollate.h b/src/feature/dirauth/dircollate.h similarity index 100% rename from src/or/dirauth/dircollate.h rename to src/feature/dirauth/dircollate.h diff --git a/src/or/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c similarity index 100% rename from src/or/dirauth/dirvote.c rename to src/feature/dirauth/dirvote.c diff --git a/src/or/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h similarity index 100% rename from src/or/dirauth/dirvote.h rename to src/feature/dirauth/dirvote.h diff --git a/src/or/keypin.c b/src/feature/dirauth/keypin.c similarity index 100% rename from src/or/keypin.c rename to src/feature/dirauth/keypin.c diff --git a/src/or/keypin.h b/src/feature/dirauth/keypin.h similarity index 100% rename from src/or/keypin.h rename to src/feature/dirauth/keypin.h diff --git a/src/or/dirauth/mode.h b/src/feature/dirauth/mode.h similarity index 100% rename from src/or/dirauth/mode.h rename to src/feature/dirauth/mode.h diff --git a/src/or/ns_detached_signatures_st.h b/src/feature/dirauth/ns_detached_signatures_st.h similarity index 100% rename from src/or/ns_detached_signatures_st.h rename to src/feature/dirauth/ns_detached_signatures_st.h diff --git a/src/or/dirauth/shared_random.c b/src/feature/dirauth/shared_random.c similarity index 100% rename from src/or/dirauth/shared_random.c rename to src/feature/dirauth/shared_random.c diff --git a/src/or/dirauth/shared_random.h b/src/feature/dirauth/shared_random.h similarity index 100% rename from src/or/dirauth/shared_random.h rename to src/feature/dirauth/shared_random.h diff --git a/src/or/dirauth/shared_random_state.c b/src/feature/dirauth/shared_random_state.c similarity index 100% rename from src/or/dirauth/shared_random_state.c rename to src/feature/dirauth/shared_random_state.c diff --git a/src/or/dirauth/shared_random_state.h b/src/feature/dirauth/shared_random_state.h similarity index 100% rename from src/or/dirauth/shared_random_state.h rename to src/feature/dirauth/shared_random_state.h diff --git a/src/or/vote_microdesc_hash_st.h b/src/feature/dirauth/vote_microdesc_hash_st.h similarity index 100% rename from src/or/vote_microdesc_hash_st.h rename to src/feature/dirauth/vote_microdesc_hash_st.h diff --git a/src/or/cached_dir_st.h b/src/feature/dircache/cached_dir_st.h similarity index 100% rename from src/or/cached_dir_st.h rename to src/feature/dircache/cached_dir_st.h diff --git a/src/or/conscache.c b/src/feature/dircache/conscache.c similarity index 100% rename from src/or/conscache.c rename to src/feature/dircache/conscache.c diff --git a/src/or/conscache.h b/src/feature/dircache/conscache.h similarity index 100% rename from src/or/conscache.h rename to src/feature/dircache/conscache.h diff --git a/src/or/consdiffmgr.c b/src/feature/dircache/consdiffmgr.c similarity index 100% rename from src/or/consdiffmgr.c rename to src/feature/dircache/consdiffmgr.c diff --git a/src/or/consdiffmgr.h b/src/feature/dircache/consdiffmgr.h similarity index 100% rename from src/or/consdiffmgr.h rename to src/feature/dircache/consdiffmgr.h diff --git a/src/or/directory.c b/src/feature/dircache/directory.c similarity index 100% rename from src/or/directory.c rename to src/feature/dircache/directory.c diff --git a/src/or/directory.h b/src/feature/dircache/directory.h similarity index 100% rename from src/or/directory.h rename to src/feature/dircache/directory.h diff --git a/src/or/dirserv.c b/src/feature/dircache/dirserv.c similarity index 100% rename from src/or/dirserv.c rename to src/feature/dircache/dirserv.c diff --git a/src/or/dirserv.h b/src/feature/dircache/dirserv.h similarity index 100% rename from src/or/dirserv.h rename to src/feature/dircache/dirserv.h diff --git a/src/or/dir_server_st.h b/src/feature/dirclient/dir_server_st.h similarity index 100% rename from src/or/dir_server_st.h rename to src/feature/dirclient/dir_server_st.h diff --git a/src/or/download_status_st.h b/src/feature/dirclient/download_status_st.h similarity index 100% rename from src/or/download_status_st.h rename to src/feature/dirclient/download_status_st.h diff --git a/src/or/consdiff.c b/src/feature/dircommon/consdiff.c similarity index 100% rename from src/or/consdiff.c rename to src/feature/dircommon/consdiff.c diff --git a/src/or/consdiff.h b/src/feature/dircommon/consdiff.h similarity index 100% rename from src/or/consdiff.h rename to src/feature/dircommon/consdiff.h diff --git a/src/or/dir_connection_st.h b/src/feature/dircommon/dir_connection_st.h similarity index 100% rename from src/or/dir_connection_st.h rename to src/feature/dircommon/dir_connection_st.h diff --git a/src/or/fp_pair.c b/src/feature/dircommon/fp_pair.c similarity index 100% rename from src/or/fp_pair.c rename to src/feature/dircommon/fp_pair.c diff --git a/src/or/fp_pair.h b/src/feature/dircommon/fp_pair.h similarity index 100% rename from src/or/fp_pair.h rename to src/feature/dircommon/fp_pair.h diff --git a/src/or/vote_timing_st.h b/src/feature/dircommon/vote_timing_st.h similarity index 100% rename from src/or/vote_timing_st.h rename to src/feature/dircommon/vote_timing_st.h diff --git a/src/or/voting_schedule.c b/src/feature/dircommon/voting_schedule.c similarity index 100% rename from src/or/voting_schedule.c rename to src/feature/dircommon/voting_schedule.c diff --git a/src/or/voting_schedule.h b/src/feature/dircommon/voting_schedule.h similarity index 100% rename from src/or/voting_schedule.h rename to src/feature/dircommon/voting_schedule.h diff --git a/src/or/hibernate.c b/src/feature/hibernate/hibernate.c similarity index 100% rename from src/or/hibernate.c rename to src/feature/hibernate/hibernate.c diff --git a/src/or/hibernate.h b/src/feature/hibernate/hibernate.h similarity index 100% rename from src/or/hibernate.h rename to src/feature/hibernate/hibernate.h diff --git a/src/or/hs_cache.c b/src/feature/hs/hs_cache.c similarity index 100% rename from src/or/hs_cache.c rename to src/feature/hs/hs_cache.c diff --git a/src/or/hs_cache.h b/src/feature/hs/hs_cache.h similarity index 100% rename from src/or/hs_cache.h rename to src/feature/hs/hs_cache.h diff --git a/src/or/hs_cell.c b/src/feature/hs/hs_cell.c similarity index 100% rename from src/or/hs_cell.c rename to src/feature/hs/hs_cell.c diff --git a/src/or/hs_cell.h b/src/feature/hs/hs_cell.h similarity index 100% rename from src/or/hs_cell.h rename to src/feature/hs/hs_cell.h diff --git a/src/or/hs_circuit.c b/src/feature/hs/hs_circuit.c similarity index 100% rename from src/or/hs_circuit.c rename to src/feature/hs/hs_circuit.c diff --git a/src/or/hs_circuit.h b/src/feature/hs/hs_circuit.h similarity index 100% rename from src/or/hs_circuit.h rename to src/feature/hs/hs_circuit.h diff --git a/src/or/hs_circuitmap.c b/src/feature/hs/hs_circuitmap.c similarity index 100% rename from src/or/hs_circuitmap.c rename to src/feature/hs/hs_circuitmap.c diff --git a/src/or/hs_circuitmap.h b/src/feature/hs/hs_circuitmap.h similarity index 100% rename from src/or/hs_circuitmap.h rename to src/feature/hs/hs_circuitmap.h diff --git a/src/or/hs_client.c b/src/feature/hs/hs_client.c similarity index 100% rename from src/or/hs_client.c rename to src/feature/hs/hs_client.c diff --git a/src/or/hs_client.h b/src/feature/hs/hs_client.h similarity index 100% rename from src/or/hs_client.h rename to src/feature/hs/hs_client.h diff --git a/src/or/hs_common.c b/src/feature/hs/hs_common.c similarity index 100% rename from src/or/hs_common.c rename to src/feature/hs/hs_common.c diff --git a/src/or/hs_common.h b/src/feature/hs/hs_common.h similarity index 100% rename from src/or/hs_common.h rename to src/feature/hs/hs_common.h diff --git a/src/or/hs_config.c b/src/feature/hs/hs_config.c similarity index 100% rename from src/or/hs_config.c rename to src/feature/hs/hs_config.c diff --git a/src/or/hs_config.h b/src/feature/hs/hs_config.h similarity index 100% rename from src/or/hs_config.h rename to src/feature/hs/hs_config.h diff --git a/src/or/hs_control.c b/src/feature/hs/hs_control.c similarity index 100% rename from src/or/hs_control.c rename to src/feature/hs/hs_control.c diff --git a/src/or/hs_control.h b/src/feature/hs/hs_control.h similarity index 100% rename from src/or/hs_control.h rename to src/feature/hs/hs_control.h diff --git a/src/or/hs_descriptor.c b/src/feature/hs/hs_descriptor.c similarity index 100% rename from src/or/hs_descriptor.c rename to src/feature/hs/hs_descriptor.c diff --git a/src/or/hs_descriptor.h b/src/feature/hs/hs_descriptor.h similarity index 100% rename from src/or/hs_descriptor.h rename to src/feature/hs/hs_descriptor.h diff --git a/src/or/hs_ident.c b/src/feature/hs/hs_ident.c similarity index 100% rename from src/or/hs_ident.c rename to src/feature/hs/hs_ident.c diff --git a/src/or/hs_ident.h b/src/feature/hs/hs_ident.h similarity index 100% rename from src/or/hs_ident.h rename to src/feature/hs/hs_ident.h diff --git a/src/or/hs_intropoint.c b/src/feature/hs/hs_intropoint.c similarity index 100% rename from src/or/hs_intropoint.c rename to src/feature/hs/hs_intropoint.c diff --git a/src/or/hs_intropoint.h b/src/feature/hs/hs_intropoint.h similarity index 100% rename from src/or/hs_intropoint.h rename to src/feature/hs/hs_intropoint.h diff --git a/src/or/hs_service.c b/src/feature/hs/hs_service.c similarity index 100% rename from src/or/hs_service.c rename to src/feature/hs/hs_service.c diff --git a/src/or/hs_service.h b/src/feature/hs/hs_service.h similarity index 100% rename from src/or/hs_service.h rename to src/feature/hs/hs_service.h diff --git a/src/or/hs_stats.c b/src/feature/hs/hs_stats.c similarity index 100% rename from src/or/hs_stats.c rename to src/feature/hs/hs_stats.c diff --git a/src/or/hs_stats.h b/src/feature/hs/hs_stats.h similarity index 100% rename from src/or/hs_stats.h rename to src/feature/hs/hs_stats.h diff --git a/src/or/hsdir_index_st.h b/src/feature/hs/hsdir_index_st.h similarity index 100% rename from src/or/hsdir_index_st.h rename to src/feature/hs/hsdir_index_st.h diff --git a/src/or/replaycache.c b/src/feature/hs_common/replaycache.c similarity index 100% rename from src/or/replaycache.c rename to src/feature/hs_common/replaycache.c diff --git a/src/or/replaycache.h b/src/feature/hs_common/replaycache.h similarity index 100% rename from src/or/replaycache.h rename to src/feature/hs_common/replaycache.h diff --git a/src/or/shared_random_client.c b/src/feature/hs_common/shared_random_client.c similarity index 100% rename from src/or/shared_random_client.c rename to src/feature/hs_common/shared_random_client.c diff --git a/src/or/shared_random_client.h b/src/feature/hs_common/shared_random_client.h similarity index 100% rename from src/or/shared_random_client.h rename to src/feature/hs_common/shared_random_client.h diff --git a/src/or/authority_cert_st.h b/src/feature/nodelist/authority_cert_st.h similarity index 100% rename from src/or/authority_cert_st.h rename to src/feature/nodelist/authority_cert_st.h diff --git a/src/or/desc_store_st.h b/src/feature/nodelist/desc_store_st.h similarity index 100% rename from src/or/desc_store_st.h rename to src/feature/nodelist/desc_store_st.h diff --git a/src/or/document_signature_st.h b/src/feature/nodelist/document_signature_st.h similarity index 100% rename from src/or/document_signature_st.h rename to src/feature/nodelist/document_signature_st.h diff --git a/src/or/extrainfo_st.h b/src/feature/nodelist/extrainfo_st.h similarity index 100% rename from src/or/extrainfo_st.h rename to src/feature/nodelist/extrainfo_st.h diff --git a/src/or/microdesc.c b/src/feature/nodelist/microdesc.c similarity index 100% rename from src/or/microdesc.c rename to src/feature/nodelist/microdesc.c diff --git a/src/or/microdesc.h b/src/feature/nodelist/microdesc.h similarity index 100% rename from src/or/microdesc.h rename to src/feature/nodelist/microdesc.h diff --git a/src/or/microdesc_st.h b/src/feature/nodelist/microdesc_st.h similarity index 100% rename from src/or/microdesc_st.h rename to src/feature/nodelist/microdesc_st.h diff --git a/src/or/networkstatus.c b/src/feature/nodelist/networkstatus.c similarity index 100% rename from src/or/networkstatus.c rename to src/feature/nodelist/networkstatus.c diff --git a/src/or/networkstatus.h b/src/feature/nodelist/networkstatus.h similarity index 100% rename from src/or/networkstatus.h rename to src/feature/nodelist/networkstatus.h diff --git a/src/or/networkstatus_sr_info_st.h b/src/feature/nodelist/networkstatus_sr_info_st.h similarity index 100% rename from src/or/networkstatus_sr_info_st.h rename to src/feature/nodelist/networkstatus_sr_info_st.h diff --git a/src/or/networkstatus_st.h b/src/feature/nodelist/networkstatus_st.h similarity index 100% rename from src/or/networkstatus_st.h rename to src/feature/nodelist/networkstatus_st.h diff --git a/src/or/networkstatus_voter_info_st.h b/src/feature/nodelist/networkstatus_voter_info_st.h similarity index 100% rename from src/or/networkstatus_voter_info_st.h rename to src/feature/nodelist/networkstatus_voter_info_st.h diff --git a/src/or/node_st.h b/src/feature/nodelist/node_st.h similarity index 100% rename from src/or/node_st.h rename to src/feature/nodelist/node_st.h diff --git a/src/or/nodelist.c b/src/feature/nodelist/nodelist.c similarity index 100% rename from src/or/nodelist.c rename to src/feature/nodelist/nodelist.c diff --git a/src/or/nodelist.h b/src/feature/nodelist/nodelist.h similarity index 100% rename from src/or/nodelist.h rename to src/feature/nodelist/nodelist.h diff --git a/src/or/parsecommon.c b/src/feature/nodelist/parsecommon.c similarity index 100% rename from src/or/parsecommon.c rename to src/feature/nodelist/parsecommon.c diff --git a/src/or/parsecommon.h b/src/feature/nodelist/parsecommon.h similarity index 100% rename from src/or/parsecommon.h rename to src/feature/nodelist/parsecommon.h diff --git a/src/or/routerinfo_st.h b/src/feature/nodelist/routerinfo_st.h similarity index 100% rename from src/or/routerinfo_st.h rename to src/feature/nodelist/routerinfo_st.h diff --git a/src/or/routerlist.c b/src/feature/nodelist/routerlist.c similarity index 100% rename from src/or/routerlist.c rename to src/feature/nodelist/routerlist.c diff --git a/src/or/routerlist.h b/src/feature/nodelist/routerlist.h similarity index 100% rename from src/or/routerlist.h rename to src/feature/nodelist/routerlist.h diff --git a/src/or/routerlist_st.h b/src/feature/nodelist/routerlist_st.h similarity index 100% rename from src/or/routerlist_st.h rename to src/feature/nodelist/routerlist_st.h diff --git a/src/or/routerparse.c b/src/feature/nodelist/routerparse.c similarity index 100% rename from src/or/routerparse.c rename to src/feature/nodelist/routerparse.c diff --git a/src/or/routerparse.h b/src/feature/nodelist/routerparse.h similarity index 100% rename from src/or/routerparse.h rename to src/feature/nodelist/routerparse.h diff --git a/src/or/routerset.c b/src/feature/nodelist/routerset.c similarity index 100% rename from src/or/routerset.c rename to src/feature/nodelist/routerset.c diff --git a/src/or/routerset.h b/src/feature/nodelist/routerset.h similarity index 100% rename from src/or/routerset.h rename to src/feature/nodelist/routerset.h diff --git a/src/or/routerstatus_st.h b/src/feature/nodelist/routerstatus_st.h similarity index 100% rename from src/or/routerstatus_st.h rename to src/feature/nodelist/routerstatus_st.h diff --git a/src/or/signed_descriptor_st.h b/src/feature/nodelist/signed_descriptor_st.h similarity index 100% rename from src/or/signed_descriptor_st.h rename to src/feature/nodelist/signed_descriptor_st.h diff --git a/src/or/torcert.c b/src/feature/nodelist/torcert.c similarity index 100% rename from src/or/torcert.c rename to src/feature/nodelist/torcert.c diff --git a/src/or/torcert.h b/src/feature/nodelist/torcert.h similarity index 100% rename from src/or/torcert.h rename to src/feature/nodelist/torcert.h diff --git a/src/or/vote_routerstatus_st.h b/src/feature/nodelist/vote_routerstatus_st.h similarity index 100% rename from src/or/vote_routerstatus_st.h rename to src/feature/nodelist/vote_routerstatus_st.h diff --git a/src/or/dns.c b/src/feature/relay/dns.c similarity index 100% rename from src/or/dns.c rename to src/feature/relay/dns.c diff --git a/src/or/dns.h b/src/feature/relay/dns.h similarity index 100% rename from src/or/dns.h rename to src/feature/relay/dns.h diff --git a/src/or/dns_structs.h b/src/feature/relay/dns_structs.h similarity index 100% rename from src/or/dns_structs.h rename to src/feature/relay/dns_structs.h diff --git a/src/or/ext_orport.c b/src/feature/relay/ext_orport.c similarity index 100% rename from src/or/ext_orport.c rename to src/feature/relay/ext_orport.c diff --git a/src/or/ext_orport.h b/src/feature/relay/ext_orport.h similarity index 100% rename from src/or/ext_orport.h rename to src/feature/relay/ext_orport.h diff --git a/src/or/router.c b/src/feature/relay/router.c similarity index 100% rename from src/or/router.c rename to src/feature/relay/router.c diff --git a/src/or/router.h b/src/feature/relay/router.h similarity index 100% rename from src/or/router.h rename to src/feature/relay/router.h diff --git a/src/or/routerkeys.c b/src/feature/relay/routerkeys.c similarity index 100% rename from src/or/routerkeys.c rename to src/feature/relay/routerkeys.c diff --git a/src/or/routerkeys.h b/src/feature/relay/routerkeys.h similarity index 100% rename from src/or/routerkeys.h rename to src/feature/relay/routerkeys.h diff --git a/src/or/rend_authorized_client_st.h b/src/feature/rend/rend_authorized_client_st.h similarity index 100% rename from src/or/rend_authorized_client_st.h rename to src/feature/rend/rend_authorized_client_st.h diff --git a/src/or/rend_encoded_v2_service_descriptor_st.h b/src/feature/rend/rend_encoded_v2_service_descriptor_st.h similarity index 100% rename from src/or/rend_encoded_v2_service_descriptor_st.h rename to src/feature/rend/rend_encoded_v2_service_descriptor_st.h diff --git a/src/or/rend_intro_point_st.h b/src/feature/rend/rend_intro_point_st.h similarity index 100% rename from src/or/rend_intro_point_st.h rename to src/feature/rend/rend_intro_point_st.h diff --git a/src/or/rend_service_descriptor_st.h b/src/feature/rend/rend_service_descriptor_st.h similarity index 100% rename from src/or/rend_service_descriptor_st.h rename to src/feature/rend/rend_service_descriptor_st.h diff --git a/src/or/rendcache.c b/src/feature/rend/rendcache.c similarity index 100% rename from src/or/rendcache.c rename to src/feature/rend/rendcache.c diff --git a/src/or/rendcache.h b/src/feature/rend/rendcache.h similarity index 100% rename from src/or/rendcache.h rename to src/feature/rend/rendcache.h diff --git a/src/or/rendclient.c b/src/feature/rend/rendclient.c similarity index 100% rename from src/or/rendclient.c rename to src/feature/rend/rendclient.c diff --git a/src/or/rendclient.h b/src/feature/rend/rendclient.h similarity index 100% rename from src/or/rendclient.h rename to src/feature/rend/rendclient.h diff --git a/src/or/rendcommon.c b/src/feature/rend/rendcommon.c similarity index 100% rename from src/or/rendcommon.c rename to src/feature/rend/rendcommon.c diff --git a/src/or/rendcommon.h b/src/feature/rend/rendcommon.h similarity index 100% rename from src/or/rendcommon.h rename to src/feature/rend/rendcommon.h diff --git a/src/or/rendmid.c b/src/feature/rend/rendmid.c similarity index 100% rename from src/or/rendmid.c rename to src/feature/rend/rendmid.c diff --git a/src/or/rendmid.h b/src/feature/rend/rendmid.h similarity index 100% rename from src/or/rendmid.h rename to src/feature/rend/rendmid.h diff --git a/src/or/rendservice.c b/src/feature/rend/rendservice.c similarity index 100% rename from src/or/rendservice.c rename to src/feature/rend/rendservice.c diff --git a/src/or/rendservice.h b/src/feature/rend/rendservice.h similarity index 100% rename from src/or/rendservice.h rename to src/feature/rend/rendservice.h diff --git a/src/or/geoip.c b/src/feature/stats/geoip.c similarity index 100% rename from src/or/geoip.c rename to src/feature/stats/geoip.c diff --git a/src/or/geoip.h b/src/feature/stats/geoip.h similarity index 100% rename from src/or/geoip.h rename to src/feature/stats/geoip.h diff --git a/src/or/rephist.c b/src/feature/stats/rephist.c similarity index 100% rename from src/or/rephist.c rename to src/feature/stats/rephist.c diff --git a/src/or/rephist.h b/src/feature/stats/rephist.h similarity index 100% rename from src/or/rephist.h rename to src/feature/stats/rephist.h diff --git a/src/or/Makefile.nmake b/src/or/Makefile.nmake deleted file mode 100644 index 429ae6785..000000000 --- a/src/or/Makefile.nmake +++ /dev/null @@ -1,79 +0,0 @@ -all: tor.exe - -CFLAGS = /O2 /MT /I ..\win32 /I ..\..\..\build-alpha\include /I ..\common \ - /I ..\ext - -LIBS = ..\..\..\build-alpha\lib\libevent.lib \ - ..\..\..\build-alpha\lib\libcrypto.lib \ - ..\..\..\build-alpha\lib\libssl.lib \ - ..\..\..\build-alpha\lib\libz.lib \ - ws2_32.lib advapi32.lib shell32.lib \ - crypt32.lib gdi32.lib user32.lib - -LIBTOR_OBJECTS = \ - addressmap.obj \ - buffers.obj \ - channel.obj \ - channelpadding.obj \ - channeltls.obj \ - circpathbias.obj \ - circuitbuild.obj \ - circuitlist.obj \ - circuitmux.obj \ - circuitmux_ewma.obj \ - circuitstats.obj \ - circuituse.obj \ - command.obj \ - config.obj \ - config_codedigest.obj \ - confparse.obj \ - connection.obj \ - connection_edge.obj \ - connection_or.obj \ - control.obj \ - cpuworker.obj \ - directory.obj \ - dirserv.obj \ - dirvote.obj \ - dns.obj \ - dnsserv.obj \ - ext_orport.obj \ - fp_pair.obj \ - entrynodes.obj \ - geoip.obj \ - hibernate.obj \ - main.obj \ - microdesc.obj \ - networkstatus.obj \ - nodelist.obj \ - ntmain.obj \ - onion.obj \ - onion_fast.obj \ - onion_ntor.obj \ - onion_tap.obj \ - policies.obj \ - reasons.obj \ - relay.obj \ - rendclient.obj \ - rendcommon.obj \ - rendmid.obj \ - rendservice.obj \ - rephist.obj \ - replaycache.obj \ - router.obj \ - routerlist.obj \ - routerparse.obj \ - routerset.obj \ - scheduler.obj \ - statefile.obj \ - status.obj \ - transports.obj - -libtor.lib: $(LIBTOR_OBJECTS) - lib $(LIBTOR_OBJECTS) /out:$@ - -tor.exe: libtor.lib tor_main.obj - $(CC) $(CFLAGS) $(LIBS) libtor.lib ..\common\*.lib ..\ext\*.lib tor_main.obj /Fe$@ - -clean: - del $(LIBTOR_OBJECTS) tor_main.obj *.lib tor.exe

1 0

[tor/master] And tell build.rs to stop looking in src/common
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 4eac5c6ce6f19829bf1aed46e8d3d72fa3ae1a74 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 17:15:24 2018 -0400 And tell build.rs to stop looking in src/common --- src/rust/build.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/rust/build.rs b/src/rust/build.rs index eb281b6ea..2cf85b404 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -139,7 +139,6 @@ pub fn main() { cfg.from_cflags("TOR_LDFLAGS_libevent"); cfg.link_relpath("src/lib"); - cfg.link_relpath("src/common"); cfg.link_relpath("src/ext/keccak-tiny"); cfg.link_relpath("src/ext/ed25519/ref10"); cfg.link_relpath("src/ext/ed25519/donna");

1 0

[tor/master] Fix build.rs to handle removed common.
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit c73bb9937d3fa0512d8f8ce50c847999b84d183f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 17:14:55 2018 -0400 Fix build.rs to handle removed common. --- src/rust/build.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/rust/build.rs b/src/rust/build.rs index 4e401f527..eb281b6ea 100644 --- a/src/rust/build.rs +++ b/src/rust/build.rs @@ -150,7 +150,6 @@ pub fn main() { // tor uses. We must be careful with factoring and dependencies // moving forward! cfg.component("tor-crypt-ops-testing"); - cfg.component("or-testing"); cfg.component("tor-sandbox"); cfg.component("tor-encoding-testing"); cfg.component("tor-net"); @@ -165,7 +164,6 @@ pub fn main() { cfg.component("tor-malloc"); cfg.component("tor-wallclock"); cfg.component("tor-err-testing"); - cfg.component("or-event-testing"); cfg.component("tor-intmath-testing"); cfg.component("tor-ctime-testing"); cfg.component("curve25519_donna");

1 0

[tor/master] Fix up .may_includes for evloop.
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 753b797ca4041c74c073c11b550c11b3f85fe74b Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 15:50:20 2018 -0400 Fix up .may_includes for evloop. --- src/common/.may_include | 8 -------- src/lib/evloop/.may_include | 1 + 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/src/common/.may_include b/src/common/.may_include deleted file mode 100644 index a01a9db0b..000000000 --- a/src/common/.may_include +++ /dev/null @@ -1,8 +0,0 @@ -orconfig.h -common/*.h -lib/*/*.h - -# XXXX These all belong somewhere else -siphash.h -src/ext/timeouts/timeout.c -tor_queue.h diff --git a/src/lib/evloop/.may_include b/src/lib/evloop/.may_include index 205f41b38..30af50891 100644 --- a/src/lib/evloop/.may_include +++ b/src/lib/evloop/.may_include @@ -13,3 +13,4 @@ lib/thread/*.h lib/time/*.h src/ext/timeouts/timeout.c +tor_queue.h \ No newline at end of file

1 0

[tor/master] Add a missing include.
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 1dd5b5f44134ab80045835da1eeb62d007455ccd Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 15:44:33 2018 -0400 Add a missing include. --- src/test/test_crypto_openssl.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c index 1d31ad027..b1a5613ea 100644 --- a/src/test/test_crypto_openssl.c +++ b/src/test/test_crypto_openssl.c @@ -10,6 +10,7 @@ #include "lib/crypt_ops/compat_openssl.h" #include "lib/crypt_ops/crypto_rand.h" #include "lib/encoding/binascii.h" +#include "lib/malloc/util_malloc.h" #include "test/test.h" #include <openssl/evp.h>

1 0

[tor/master] Move openbsd-malloc responsibility to lib/malloc
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 947de40d198d83e561320afe5d0146f43dc9192a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 15:07:08 2018 -0400 Move openbsd-malloc responsibility to lib/malloc (Note that this is not believed to work, but we may as well have it in the right place till we remove it) --- src/common/include.am | 6 ------ src/lib/malloc/include.am | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index 0a58a39ae..8a2d2e114 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -11,12 +11,6 @@ endif EXTRA_DIST += src/common/Makefile.nmake -if USE_OPENBSD_MALLOC -libor_extra_source=src/ext/OpenBSD_malloc_Linux.c -else -libor_extra_source= -endif - LIBOR_A_SRC = \ src/common/token_bucket.c \ src/common/workqueue.c \ diff --git a/src/lib/malloc/include.am b/src/lib/malloc/include.am index b4c5cae54..50de9cb73 100644 --- a/src/lib/malloc/include.am +++ b/src/lib/malloc/include.am @@ -8,6 +8,10 @@ endif src_lib_libtor_malloc_a_SOURCES = \ src/lib/malloc/util_malloc.c +if USE_OPENBSD_MALLOC +src_lib_libtor_malloc_a_SOURCES += src/ext/OpenBSD_malloc_Linux.c +endif + src_lib_libtor_malloc_testing_a_SOURCES = \ $(src_lib_libtor_malloc_a_SOURCES) src_lib_libtor_malloc_testing_a_CPPFLAGS = $(AM_CPPFLAGS) $(TEST_CPPFLAGS)

1 0

[tor/master] Remove util.h
by nickm＠torproject.org 05 Jul '18

05 Jul '18

commit 459382986102dd1bd84bca24a0fddfe04efefd76 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jul 5 15:04:18 2018 -0400 Remove util.h Inline its contents (which were all includes) into or.h, and some of its contents into other places that didn't include or.h at all. --- src/common/include.am | 1 - src/common/util.h | 52 ------------------------------------------ src/or/config.c | 1 - src/or/dirauth/shared_random.c | 1 - src/or/ext_orport.c | 1 - src/or/hs_cell.c | 1 - src/or/keypin.c | 25 ++++++++++++++++---- src/or/onion_ntor.c | 11 +++++---- src/or/or.h | 38 ++++++++++++++++++++++++++++-- src/or/shared_random_client.c | 1 - src/or/torcert.c | 1 - src/or/transports.c | 1 - src/test/fuzz/fuzz_hsdescv3.c | 1 - src/test/test-memwipe.c | 9 ++++---- src/test/test-timers.c | 7 +++--- src/test/test_bridges.c | 1 - src/test/test_bt_cl.c | 1 - src/test/test_checkdir.c | 1 - src/test/test_config.c | 1 - src/test/test_crypto.c | 1 - src/test/test_crypto_openssl.c | 5 ++-- src/test/test_entrynodes.c | 1 - src/test/test_guardfraction.c | 1 - src/test/test_handles.c | 5 ++-- src/test/test_hs_common.c | 1 - src/test/test_hs_ntor_cl.c | 1 - src/test/test_keypin.c | 1 - src/test/test_ntor_cl.c | 1 - src/test/test_pt.c | 1 - src/test/test_routerkeys.c | 1 - src/test/test_util_slow.c | 8 +++++-- 31 files changed, 83 insertions(+), 99 deletions(-) diff --git a/src/common/include.am b/src/common/include.am index de4ecbaee..0a58a39ae 100644 --- a/src/common/include.am +++ b/src/common/include.am @@ -52,7 +52,6 @@ COMMONHEADERS = \ src/common/procmon.h \ src/common/timers.h \ src/common/token_bucket.h \ - src/common/util.h \ src/common/workqueue.h noinst_HEADERS+= $(COMMONHEADERS) diff --git a/src/common/util.h b/src/common/util.h deleted file mode 100644 index 55eec2b8c..000000000 --- a/src/common/util.h +++ /dev/null @@ -1,52 +0,0 @@ -/* Copyright (c) 2003-2004, Roger Dingledine - * Copyright (c) 2004-2006, Roger Dingledine, Nick Mathewson. - * Copyright (c) 2007-2018, The Tor Project, Inc. */ -/* See LICENSE for licensing information */ - -/** - * \file util.h - * \brief Headers for util.c - **/ - -#ifndef TOR_UTIL_H -#define TOR_UTIL_H - -#include "orconfig.h" -#include "lib/arch/bytes.h" -#include "lib/cc/compat_compiler.h" -#include "lib/cc/torint.h" -#include "lib/ctime/di_ops.h" -#include "lib/encoding/cstring.h" -#include "lib/encoding/time_fmt.h" -#include "lib/err/torerr.h" -#include "lib/fs/dir.h" -#include "lib/fs/files.h" -#include "lib/fs/mmap.h" -#include "lib/fs/path.h" -#include "lib/fs/userdb.h" -#include "lib/intmath/addsub.h" -#include "lib/intmath/bits.h" -#include "lib/intmath/cmp.h" -#include "lib/intmath/logic.h" -#include "lib/intmath/muldiv.h" -#include "lib/log/escape.h" -#include "lib/log/ratelim.h" -#include "lib/log/util_bug.h" -#include "lib/malloc/util_malloc.h" -#include "lib/net/ipv4.h" -#include "lib/net/ipv6.h" -#include "lib/net/resolve.h" -#include "lib/net/socket.h" -#include "lib/string/compat_ctype.h" -#include "lib/string/compat_string.h" -#include "lib/string/parse_int.h" -#include "lib/string/printf.h" -#include "lib/string/scanf.h" -#include "lib/string/util_string.h" -#include "lib/testsupport/testsupport.h" -#include "lib/thread/threads.h" -#include "lib/time/compat_time.h" -#include "lib/wallclock/approx_time.h" -#include "lib/wallclock/timeval.h" - -#endif /* !defined(TOR_UTIL_H) */ diff --git a/src/or/config.c b/src/or/config.c index 13002dd96..6dc2ad1d5 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -99,7 +99,6 @@ #include "or/rephist.h" #include "or/router.h" #include "lib/sandbox/sandbox.h" -#include "common/util.h" #include "or/routerlist.h" #include "or/routerset.h" #include "or/scheduler.h" diff --git a/src/or/dirauth/shared_random.c b/src/or/dirauth/shared_random.c index 8b53c1e74..d12269012 100644 --- a/src/or/dirauth/shared_random.c +++ b/src/or/dirauth/shared_random.c @@ -99,7 +99,6 @@ #include "or/routerlist.h" #include "or/shared_random_client.h" #include "or/dirauth/shared_random_state.h" -#include "common/util.h" #include "or/voting_schedule.h" #include "or/dirauth/dirvote.h" diff --git a/src/or/ext_orport.c b/src/or/ext_orport.c index 701dc4528..7342a66e0 100644 --- a/src/or/ext_orport.c +++ b/src/or/ext_orport.c @@ -27,7 +27,6 @@ #include "or/ext_orport.h" #include "or/main.h" #include "or/proto_ext_or.h" -#include "common/util.h" #include "or/or_connection_st.h" diff --git a/src/or/hs_cell.c b/src/or/hs_cell.c index b50c87dfa..f8b76c513 100644 --- a/src/or/hs_cell.c +++ b/src/or/hs_cell.c @@ -11,7 +11,6 @@ #include "lib/crypt_ops/crypto_util.h" #include "or/rendservice.h" #include "or/replaycache.h" -#include "common/util.h" #include "or/hs_cell.h" #include "or/hs_ntor.h" diff --git a/src/or/keypin.c b/src/or/keypin.c index 34cf64f5c..a2f3654b8 100644 --- a/src/or/keypin.c +++ b/src/or/keypin.c @@ -11,17 +11,28 @@ #define KEYPIN_PRIVATE #include "orconfig.h" + +#include "lib/cc/torint.h" #include "lib/crypt_ops/crypto_digest.h" #include "lib/crypt_ops/crypto_format.h" +#include "lib/crypt_ops/crypto_format.h" +#include "lib/ctime/di_ops.h" #include "lib/ctime/di_ops.h" +#include "lib/encoding/binascii.h" +#include "lib/encoding/time_fmt.h" +#include "lib/fdio/fdio.h" +#include "lib/fs/files.h" +#include "lib/fs/mmap.h" +#include "lib/log/torlog.h" +#include "lib/log/util_bug.h" +#include "lib/string/compat_ctype.h" +#include "lib/string/printf.h" +#include "lib/wallclock/approx_time.h" + #include "ht.h" #include "or/keypin.h" + #include "siphash.h" -#include "lib/cc/torint.h" -#include "lib/log/torlog.h" -#include "lib/fdio/fdio.h" -#include "common/util.h" -#include "lib/encoding/binascii.h" #ifdef HAVE_UNISTD_H #include <unistd.h> @@ -34,6 +45,10 @@ #include <io.h> #endif +#include <errno.h> +#include <string.h> +#include <stdlib.h> + /** * @file keypin.c * @brief Key-pinning for RSA and Ed25519 identity keys at directory diff --git a/src/or/onion_ntor.c b/src/or/onion_ntor.c index 34b111202..59c923cb9 100644 --- a/src/or/onion_ntor.c +++ b/src/or/onion_ntor.c @@ -21,14 +21,17 @@ #include "orconfig.h" #define ONION_NTOR_PRIVATE + #include "lib/crypt_ops/crypto.h" -#include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_digest.h" +#include "lib/crypt_ops/crypto_hkdf.h" #include "lib/crypt_ops/crypto_util.h" -#include "or/onion_ntor.h" -#include "lib/log/torlog.h" #include "lib/ctime/di_ops.h" -#include "common/util.h" +#include "lib/log/torlog.h" +#include "lib/log/util_bug.h" +#include "or/onion_ntor.h" + +#include <string.h> /** Free storage held in an ntor handshake state. */ void diff --git a/src/or/or.h b/src/or/or.h index b0340ed1a..826e81e46 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -22,14 +22,48 @@ #include <time.h> #endif -#include "common/util.h" - +#include "lib/arch/bytes.h" +#include "lib/cc/compat_compiler.h" +#include "lib/cc/torint.h" #include "lib/container/map.h" #include "lib/container/smartlist.h" #include "lib/crypt_ops/crypto.h" +#include "lib/ctime/di_ops.h" #include "lib/defs/dh_sizes.h" #include "lib/encoding/binascii.h" +#include "lib/encoding/cstring.h" +#include "lib/encoding/time_fmt.h" +#include "lib/err/torerr.h" +#include "lib/fs/dir.h" +#include "lib/fs/files.h" +#include "lib/fs/mmap.h" +#include "lib/fs/path.h" +#include "lib/fs/userdb.h" +#include "lib/intmath/addsub.h" +#include "lib/intmath/bits.h" +#include "lib/intmath/cmp.h" +#include "lib/intmath/logic.h" +#include "lib/intmath/muldiv.h" +#include "lib/log/escape.h" +#include "lib/log/ratelim.h" +#include "lib/log/util_bug.h" +#include "lib/malloc/util_malloc.h" #include "lib/net/address.h" +#include "lib/net/ipv4.h" +#include "lib/net/ipv6.h" +#include "lib/net/resolve.h" +#include "lib/net/socket.h" +#include "lib/string/compat_ctype.h" +#include "lib/string/compat_string.h" +#include "lib/string/parse_int.h" +#include "lib/string/printf.h" +#include "lib/string/scanf.h" +#include "lib/string/util_string.h" +#include "lib/testsupport/testsupport.h" +#include "lib/thread/threads.h" +#include "lib/time/compat_time.h" +#include "lib/wallclock/approx_time.h" +#include "lib/wallclock/timeval.h" #include "ht.h" diff --git a/src/or/shared_random_client.c b/src/or/shared_random_client.c index 9a6c0f664..42a5b42f6 100644 --- a/src/or/shared_random_client.c +++ b/src/or/shared_random_client.c @@ -14,7 +14,6 @@ #include "or/config.h" #include "or/voting_schedule.h" #include "or/networkstatus.h" -#include "common/util.h" #include "lib/encoding/binascii.h" #include "or/networkstatus_st.h" diff --git a/src/or/torcert.c b/src/or/torcert.c index 269fa66ce..39c6605c6 100644 --- a/src/or/torcert.c +++ b/src/or/torcert.c @@ -31,7 +31,6 @@ #include "or/torcert.h" #include "trunnel/ed25519_cert.h" #include "lib/log/torlog.h" -#include "common/util.h" #include "trunnel/link_handshake.h" #include "lib/tls/tortls.h" diff --git a/src/or/transports.c b/src/or/transports.c index ff51ff00e..1d3cb7b95 100644 --- a/src/or/transports.c +++ b/src/or/transports.c @@ -96,7 +96,6 @@ #include "or/connection.h" #include "or/circuitbuild.h" #include "or/transports.h" -#include "common/util.h" #include "or/router.h" #include "or/statefile.h" #include "or/connection_or.h" diff --git a/src/test/fuzz/fuzz_hsdescv3.c b/src/test/fuzz/fuzz_hsdescv3.c index ada9fa6c2..de574ac26 100644 --- a/src/test/fuzz/fuzz_hsdescv3.c +++ b/src/test/fuzz/fuzz_hsdescv3.c @@ -9,7 +9,6 @@ #include "lib/crypt_ops/crypto_ed25519.h" #include "or/hs_descriptor.h" #include "or/routerparse.h" -#include "common/util.h" #include "test/fuzz/fuzzing.h" diff --git a/src/test/test-memwipe.c b/src/test/test-memwipe.c index 552cbbc55..8a4610e90 100644 --- a/src/test/test-memwipe.c +++ b/src/test/test-memwipe.c @@ -2,14 +2,16 @@ /* See LICENSE for licensing information */ #include "orconfig.h" +#include "lib/crypt_ops/crypto_util.h" + +#include "lib/intmath/cmp.h" +#include "lib/malloc/util_malloc.h" + #include <string.h> #include <stdio.h> #include <sys/types.h> #include <stdlib.h> -#include "lib/crypt_ops/crypto_util.h" -#include "common/util.h" - static unsigned fill_a_buffer_memset(void) __attribute__((noinline)); static unsigned fill_a_buffer_memwipe(void) __attribute__((noinline)); static unsigned fill_a_buffer_nothing(void) __attribute__((noinline)); @@ -214,4 +216,3 @@ main(int argc, char **argv) return 0; } } - diff --git a/src/test/test-timers.c b/src/test/test-timers.c index aed150bda..a2365a2e3 100644 --- a/src/test/test-timers.c +++ b/src/test/test-timers.c @@ -8,9 +8,11 @@ #include <string.h> #include "common/compat_libevent.h" -#include "lib/crypt_ops/crypto_rand.h" #include "common/timers.h" -#include "common/util.h" +#include "lib/crypt_ops/crypto_rand.h" +#include "lib/log/util_bug.h" +#include "lib/time/compat_time.h" +#include "lib/wallclock/timeval.h" #define N_TIMERS 1000 #define MAX_DURATION 30 @@ -138,4 +140,3 @@ main(int argc, char **argv) timers_shutdown(); return ret; } - diff --git a/src/test/test_bridges.c b/src/test/test_bridges.c index 98e85cd6d..685027c0e 100644 --- a/src/test/test_bridges.c +++ b/src/test/test_bridges.c @@ -16,7 +16,6 @@ #include "or/bridges.h" #include "or/config.h" #include "or/transports.h" -#include "common/util.h" /* Test suite stuff */ #include "test/test.h" diff --git a/src/test/test_bt_cl.c b/src/test/test_bt_cl.c index 8a8221f19..3f7b0a203 100644 --- a/src/test/test_bt_cl.c +++ b/src/test/test_bt_cl.c @@ -8,7 +8,6 @@ /* To prevent 'assert' from going away. */ #undef TOR_COVERAGE #include "or/or.h" -#include "common/util.h" #include "lib/err/backtrace.h" #include "lib/log/torlog.h" diff --git a/src/test/test_checkdir.c b/src/test/test_checkdir.c index 09688cf0a..a80c6ebd3 100644 --- a/src/test/test_checkdir.c +++ b/src/test/test_checkdir.c @@ -12,7 +12,6 @@ #include "or/config.h" #include "test/test.h" -#include "common/util.h" #ifdef HAVE_SYS_STAT_H #include <sys/stat.h> diff --git a/src/test/test_config.c b/src/test/test_config.c index fb0564593..c7623d0c8 100644 --- a/src/test/test_config.c +++ b/src/test/test_config.c @@ -19,7 +19,6 @@ #include "or/connection.h" #include "or/connection_edge.h" #include "test/test.h" -#include "common/util.h" #include "or/connection_or.h" #include "or/control.h" #include "or/cpuworker.h" diff --git a/src/test/test_crypto.c b/src/test/test_crypto.c index 341dbc9a4..2e38dfc27 100644 --- a/src/test/test_crypto.c +++ b/src/test/test_crypto.c @@ -9,7 +9,6 @@ #include "or/or.h" #include "test/test.h" #include "lib/crypt_ops/aes.h" -#include "common/util.h" #include "siphash.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_dh.h" diff --git a/src/test/test_crypto_openssl.c b/src/test/test_crypto_openssl.c index d443ba6fd..1d31ad027 100644 --- a/src/test/test_crypto_openssl.c +++ b/src/test/test_crypto_openssl.c @@ -7,14 +7,14 @@ #define CRYPTO_RAND_PRIVATE +#include "lib/crypt_ops/compat_openssl.h" #include "lib/crypt_ops/crypto_rand.h" -#include "common/util.h" #include "lib/encoding/binascii.h" #include "test/test.h" #include <openssl/evp.h> #include <openssl/rand.h> -#include "lib/crypt_ops/compat_openssl.h" +#include <string.h> /* Test for rectifying openssl RAND engine. */ static void @@ -103,4 +103,3 @@ struct testcase_t crypto_openssl_tests[] = { TT_FORK, NULL, NULL }, END_OF_TESTCASES }; - diff --git a/src/test/test_entrynodes.c b/src/test/test_entrynodes.c index 262e2fa68..9c35cdaaf 100644 --- a/src/test/test_entrynodes.c +++ b/src/test/test_entrynodes.c @@ -28,7 +28,6 @@ #include "or/routerparse.h" #include "or/routerset.h" #include "or/statefile.h" -#include "common/util.h" #include "or/cpath_build_state_st.h" #include "or/crypt_path_st.h" diff --git a/src/test/test_guardfraction.c b/src/test/test_guardfraction.c index b7737cafa..3c293e378 100644 --- a/src/test/test_guardfraction.c +++ b/src/test/test_guardfraction.c @@ -10,7 +10,6 @@ #include "or/config.h" #include "or/dirserv.h" #include "or/entrynodes.h" -#include "common/util.h" #include "or/routerparse.h" #include "or/networkstatus.h" diff --git a/src/test/test_handles.c b/src/test/test_handles.c index 26c68aa8a..2910d7e18 100644 --- a/src/test/test_handles.c +++ b/src/test/test_handles.c @@ -4,8 +4,10 @@ #include "orconfig.h" #include "test/test.h" -#include "common/util.h" #include "lib/container/handles.h" +#include "lib/log/util_bug.h" + +#include <stdio.h> typedef struct demo_t { HANDLE_ENTRY(demo, demo_t); @@ -94,4 +96,3 @@ struct testcase_t handle_tests[] = { HANDLE_TEST(basic, 0), END_OF_TESTCASES }; - diff --git a/src/test/test_hs_common.c b/src/test/test_hs_common.c index 28c6316bd..4c39570e3 100644 --- a/src/test/test_hs_common.c +++ b/src/test/test_hs_common.c @@ -31,7 +31,6 @@ #include "or/statefile.h" #include "or/circuitlist.h" #include "or/dirauth/shared_random.h" -#include "common/util.h" #include "or/voting_schedule.h" #include "or/microdesc_st.h" diff --git a/src/test/test_hs_ntor_cl.c b/src/test/test_hs_ntor_cl.c index 6bf11560b..8643897db 100644 --- a/src/test/test_hs_ntor_cl.c +++ b/src/test/test_hs_ntor_cl.c @@ -14,7 +14,6 @@ #define ONION_NTOR_PRIVATE #include "or/or.h" -#include "common/util.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "lib/crypt_ops/crypto_ed25519.h" diff --git a/src/test/test_keypin.c b/src/test/test_keypin.c index e7e7e6296..e7897a847 100644 --- a/src/test/test_keypin.c +++ b/src/test/test_keypin.c @@ -5,7 +5,6 @@ #define KEYPIN_PRIVATE #include "or/or.h" #include "or/keypin.h" -#include "common/util.h" #include "test/test.h" diff --git a/src/test/test_ntor_cl.c b/src/test/test_ntor_cl.c index 75d5ccc12..5711a9116 100644 --- a/src/test/test_ntor_cl.c +++ b/src/test/test_ntor_cl.c @@ -7,7 +7,6 @@ #define ONION_NTOR_PRIVATE #include "or/or.h" -#include "common/util.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_curve25519.h" #include "or/onion_ntor.h" diff --git a/src/test/test_pt.c b/src/test/test_pt.c index e685ab50d..189cb2584 100644 --- a/src/test/test_pt.c +++ b/src/test/test_pt.c @@ -15,7 +15,6 @@ #include "or/control.h" #include "or/transports.h" #include "or/circuitbuild.h" -#include "common/util.h" #include "or/statefile.h" #include "test/test.h" #include "lib/process/subprocess.h" diff --git a/src/test/test_routerkeys.c b/src/test/test_routerkeys.c index 8c2be30a8..2a761ad6e 100644 --- a/src/test/test_routerkeys.c +++ b/src/test/test_routerkeys.c @@ -9,7 +9,6 @@ #include "or/config.h" #include "or/router.h" #include "or/routerkeys.h" -#include "common/util.h" #include "lib/crypt_ops/crypto.h" #include "lib/crypt_ops/crypto_format.h" #include "or/torcert.h" diff --git a/src/test/test_util_slow.c b/src/test/test_util_slow.c index aeb0d422c..5021e89df 100644 --- a/src/test/test_util_slow.c +++ b/src/test/test_util_slow.c @@ -6,13 +6,17 @@ #include "orconfig.h" #define UTIL_PRIVATE #define SUBPROCESS_PRIVATE -#include "common/util.h" -#include "lib/process/waitpid.h" #include "lib/crypt_ops/crypto.h" #include "lib/log/torlog.h" #include "lib/process/subprocess.h" +#include "lib/process/waitpid.h" +#include "lib/string/printf.h" +#include "lib/time/compat_time.h" #include "test/test.h" +#include <errno.h> +#include <string.h> + #ifndef BUILDDIR #define BUILDDIR "." #endif

1 0