mirrors/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2025-02-24 22:58:50 +01:00
Code Issues Projects Releases Wiki Activity

Revise things that had included router.h before

Browse source 
Make them only include the headers that they needed, and sort their
headers while we're at it.
This commit is contained in:
Nick Mathewson 2018-09-25 17:57:58 -04:00
parent 3ff58e47d2
commit 4f0bc0c8f5
34 changed files with 523 additions and 495 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

83
src/app/config/config.c
View file

@ -60,62 +60,65 @@
#define CONFIG_PRIVATE #define CONFIG_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/bridges.h" #include "app/config/config.h"
#include "feature/client/addressmap.h" #include "app/config/confparse.h"
#include "app/config/statefile.h"
#include "app/main/main.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/cpuworker.h"
#include "core/mainloop/mainloop.h"
#include "core/mainloop/netstatus.h"
#include "core/or/channel.h" #include "core/or/channel.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuitmux.h" #include "core/or/circuitmux.h"
#include "core/or/circuitmux_ewma.h" #include "core/or/circuitmux_ewma.h"
#include "core/or/circuitstats.h" #include "core/or/circuitstats.h"
#include "lib/compress/compress.h"
#include "app/config/config.h"
#include "lib/encoding/confline.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/connection_or.h" #include "core/or/connection_or.h"
#include "feature/dircache/consdiffmgr.h" #include "core/or/dos.h"
#include "core/or/policies.h"
#include "core/or/relay.h"
#include "core/or/scheduler.h"
#include "feature/client/addressmap.h"
#include "feature/client/bridges.h"
#include "feature/client/entrynodes.h"
#include "feature/client/transports.h"
#include "feature/control/control.h" #include "feature/control/control.h"
#include "app/config/confparse.h" #include "feature/dirauth/bwauth.h"
#include "core/mainloop/cpuworker.h" #include "feature/dirauth/guardfraction.h"
#include "feature/dircache/consdiffmgr.h"
#include "feature/dircache/dirserv.h"
#include "feature/dircommon/voting_schedule.h"
#include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_config.h"
#include "feature/nodelist/dirlist.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerset.h"
#include "feature/relay/dns.h"
#include "feature/relay/ext_orport.h"
#include "feature/relay/routermode.h"
#include "feature/rend/rendclient.h"
#include "feature/rend/rendservice.h"
#include "feature/stats/geoip.h"
#include "feature/stats/rephist.h"
#include "lib/compress/compress.h"
#include "lib/crypt_ops/crypto_init.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "lib/crypt_ops/crypto_init.h" #include "lib/encoding/confline.h"
#include "lib/log/git_revision.h"
#include "lib/net/resolve.h"
#include "lib/sandbox/sandbox.h"
#ifdef ENABLE_NSS #ifdef ENABLE_NSS
#include "lib/crypt_ops/crypto_nss_mgt.h" #include "lib/crypt_ops/crypto_nss_mgt.h"
#else #else
#include "lib/crypt_ops/crypto_openssl_mgt.h" #include "lib/crypt_ops/crypto_openssl_mgt.h"
#endif #endif
#include "feature/dirauth/bwauth.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirauth/guardfraction.h"
#include "feature/relay/dns.h"
#include "core/or/dos.h"
#include "feature/client/entrynodes.h"
#include "lib/log/git_revision.h"
#include "feature/stats/geoip.h"
#include "feature/hibernate/hibernate.h"
#include "app/main/main.h"
#include "core/mainloop/mainloop.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/policies.h"
#include "core/or/relay.h"
#include "feature/rend/rendclient.h"
#include "feature/rend/rendservice.h"
#include "feature/hs/hs_config.h"
#include "feature/stats/rephist.h"
#include "feature/relay/router.h"
#include "feature/relay/routermode.h"
#include "lib/sandbox/sandbox.h"
#include "feature/nodelist/dirlist.h"
#include "feature/nodelist/routerset.h"
#include "core/or/scheduler.h"
#include "app/config/statefile.h"
#include "feature/client/transports.h"
#include "feature/relay/ext_orport.h"
#include "feature/dircommon/voting_schedule.h"
#include "lib/net/resolve.h"
#ifdef _WIN32 #ifdef _WIN32
#include <shlobj.h> #include <shlobj.h>
#endif #endif

85
src/app/main/main.c
View file

@ -11,63 +11,64 @@
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/addressmap.h" #include "app/config/config.h"
#include "lib/err/backtrace.h" #include "app/config/statefile.h"
#include "feature/client/bridges.h" #include "app/main/main.h"
#include "lib/container/buffers.h" #include "app/main/ntmain.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/cpuworker.h"
#include "core/mainloop/mainloop.h"
#include "core/mainloop/netstatus.h"
#include "core/or/channel.h" #include "core/or/channel.h"
#include "core/or/channeltls.h"
#include "core/or/channelpadding.h" #include "core/or/channelpadding.h"
#include "core/or/channeltls.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuitmux_ewma.h" #include "core/or/circuitmux_ewma.h"
#include "core/or/command.h" #include "core/or/command.h"
#include "lib/compress/compress.h"
#include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/connection_or.h" #include "core/or/connection_or.h"
#include "feature/dircache/consdiffmgr.h"
#include "feature/control/control.h"
#include "core/mainloop/cpuworker.h"
#include "lib/crypt_ops/crypto_s2k.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirauth/bwauth.h"
#include "feature/dirauth/process_descs.h"
#include "feature/relay/dns.h"
#include "feature/relay/routermode.h"
#include "feature/client/entrynodes.h"
#include "feature/stats/geoip.h"
#include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_cache.h"
#include "feature/dirauth/keypin.h"
#include "app/main/main.h"
#include "core/mainloop/mainloop.h"
#include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "app/main/ntmain.h"
#include "feature/relay/onion_queue.h"
#include "core/or/policies.h" #include "core/or/policies.h"
#include "core/or/protover.h" #include "core/or/protover.h"
#include "feature/client/transports.h"
#include "core/or/relay.h" #include "core/or/relay.h"
#include "feature/rend/rendcache.h"
#include "feature/rend/rendclient.h"
#include "feature/rend/rendservice.h"
#include "feature/stats/rephist.h"
#include "feature/relay/router.h"
#include "feature/relay/routerkeys.h"
#include "feature/nodelist/authcert.h"
#include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h"
#include "core/or/scheduler.h" #include "core/or/scheduler.h"
#include "app/config/statefile.h"
#include "core/or/status.h" #include "core/or/status.h"
#include "feature/api/tor_api.h" #include "feature/api/tor_api.h"
#include "feature/api/tor_api_internal.h" #include "feature/api/tor_api_internal.h"
#include "lib/process/waitpid.h" #include "feature/client/addressmap.h"
#include "feature/client/bridges.h"
#include "feature/client/entrynodes.h"
#include "feature/client/transports.h"
#include "feature/control/control.h"
#include "feature/dirauth/bwauth.h"
#include "feature/dirauth/keypin.h"
#include "feature/dirauth/process_descs.h"
#include "feature/dircache/consdiffmgr.h"
#include "feature/dircache/dirserv.h"
#include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_cache.h"
#include "feature/nodelist/authcert.h"
#include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h"
#include "feature/relay/dns.h"
#include "feature/relay/ext_orport.h" #include "feature/relay/ext_orport.h"
#include "feature/relay/onion_queue.h"
#include "feature/relay/routerkeys.h"
#include "feature/relay/routermode.h"
#include "feature/rend/rendcache.h"
#include "feature/rend/rendclient.h"
#include "feature/rend/rendservice.h"
#include "feature/stats/geoip.h"
#include "feature/stats/rephist.h"
#include "lib/compress/compress.h"
#include "lib/container/buffers.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_s2k.h"
#include "lib/err/backtrace.h"
#include "lib/process/waitpid.h"
#include "lib/meminfo/meminfo.h" #include "lib/meminfo/meminfo.h"
#include "lib/osinfo/uname.h" #include "lib/osinfo/uname.h"
#include "lib/sandbox/sandbox.h" #include "lib/sandbox/sandbox.h"

48
src/core/mainloop/connection.c
View file

@ -59,51 +59,53 @@
#include "feature/client/bridges.h" #include "feature/client/bridges.h"
#include "lib/container/buffers.h" #include "lib/container/buffers.h"
#include "lib/tls/buffers_tls.h" #include "lib/tls/buffers_tls.h"
#include "lib/err/backtrace.h"
/* /*
* Define this so we get channel internal functions, since we're implementing * Define this so we get channel internal functions, since we're implementing
* part of a subclass (channel_tls_t). * part of a subclass (channel_tls_t).
*/ */
#define TOR_CHANNEL_INTERNAL_ #define TOR_CHANNEL_INTERNAL_
#define CONNECTION_PRIVATE #define CONNECTION_PRIVATE
#include "lib/err/backtrace.h" #include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/mainloop/netstatus.h"
#include "core/or/channel.h" #include "core/or/channel.h"
#include "core/or/channeltls.h" #include "core/or/channeltls.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/connection_or.h" #include "core/or/connection_or.h"
#include "feature/control/control.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/dirauth/authmode.h"
#include "feature/dircommon/directory.h"
#include "feature/dircache/dirserv.h"
#include "feature/relay/dns.h"
#include "feature/relay/routermode.h"
#include "feature/client/dnsserv.h"
#include "core/or/dos.h" #include "core/or/dos.h"
#include "core/or/policies.h"
#include "core/or/reasons.h"
#include "core/or/relay.h"
#include "core/proto/proto_http.h"
#include "core/proto/proto_socks.h"
#include "feature/client/dnsserv.h"
#include "feature/client/entrynodes.h" #include "feature/client/entrynodes.h"
#include "feature/relay/ext_orport.h" #include "feature/client/transports.h"
#include "feature/stats/geoip.h" #include "feature/control/control.h"
#include "core/mainloop/mainloop.h" #include "feature/dirauth/authmode.h"
#include "feature/dircache/dirserv.h"
#include "feature/dircommon/directory.h"
#include "feature/hibernate/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_common.h" #include "feature/hs/hs_common.h"
#include "feature/hs/hs_ident.h" #include "feature/hs/hs_ident.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "core/proto/proto_http.h" #include "feature/nodelist/routerlist.h"
#include "core/proto/proto_socks.h" #include "feature/nodelist/routerparse.h"
#include "core/or/policies.h" #include "feature/relay/dns.h"
#include "core/or/reasons.h" #include "feature/relay/ext_orport.h"
#include "core/or/relay.h" #include "feature/relay/routermode.h"
#include "feature/rend/rendclient.h" #include "feature/rend/rendclient.h"
#include "feature/rend/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "feature/stats/geoip.h"
#include "feature/stats/rephist.h" #include "feature/stats/rephist.h"
#include "feature/relay/router.h" #include "lib/crypt_ops/crypto_util.h"
#include "feature/nodelist/routerlist.h"
#include "feature/client/transports.h"
#include "feature/nodelist/routerparse.h"
#include "lib/sandbox/sandbox.h" #include "lib/sandbox/sandbox.h"
#include "lib/net/buffers_net.h" #include "lib/net/buffers_net.h"
#include "lib/tls/tortls.h" #include "lib/tls/tortls.h"

59
src/core/mainloop/mainloop.c
View file

@ -49,55 +49,56 @@
#define MAINLOOP_PRIVATE #define MAINLOOP_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/addressmap.h" #include "app/config/config.h"
#include "lib/err/backtrace.h" #include "app/config/statefile.h"
#include "feature/client/bridges.h" #include "app/main/ntmain.h"
#include "lib/container/buffers.h" #include "core/mainloop/connection.h"
#include "lib/tls/buffers_tls.h" #include "core/mainloop/cpuworker.h"
#include "core/mainloop/mainloop.h"
#include "core/mainloop/netstatus.h"
#include "core/mainloop/periodic.h"
#include "core/or/channel.h" #include "core/or/channel.h"
#include "core/or/channeltls.h"
#include "core/or/channelpadding.h" #include "core/or/channelpadding.h"
#include "core/or/channeltls.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/connection_or.h" #include "core/or/connection_or.h"
#include "feature/dircache/consdiffmgr.h" #include "core/or/dos.h"
#include "core/or/status.h"
#include "feature/client/addressmap.h"
#include "feature/client/bridges.h"
#include "feature/client/dnsserv.h"
#include "feature/client/entrynodes.h"
#include "feature/client/transports.h"
#include "feature/control/control.h" #include "feature/control/control.h"
#include "core/mainloop/cpuworker.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "feature/dircommon/directory.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirauth/authmode.h" #include "feature/dirauth/authmode.h"
#include "feature/dirauth/reachability.h" #include "feature/dirauth/reachability.h"
#include "feature/relay/dns.h" #include "feature/dircache/consdiffmgr.h"
#include "feature/client/dnsserv.h" #include "feature/dircache/dirserv.h"
#include "core/or/dos.h" #include "feature/dircommon/directory.h"
#include "feature/client/entrynodes.h"
#include "feature/stats/geoip.h"
#include "feature/hibernate/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "feature/hs/hs_client.h" #include "feature/hs/hs_client.h"
#include "feature/hs/hs_service.h" #include "feature/hs/hs_service.h"
#include "core/mainloop/mainloop.h"
#include "feature/nodelist/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "app/main/ntmain.h" #include "feature/nodelist/routerlist.h"
#include "core/mainloop/periodic.h" #include "feature/relay/dns.h"
#include "feature/client/transports.h" #include "feature/relay/routerkeys.h"
#include "feature/relay/routermode.h"
#include "feature/relay/selftest.h"
#include "feature/rend/rendcache.h" #include "feature/rend/rendcache.h"
#include "feature/rend/rendservice.h" #include "feature/rend/rendservice.h"
#include "feature/stats/geoip.h"
#include "feature/stats/rephist.h" #include "feature/stats/rephist.h"
#include "feature/relay/router.h" #include "lib/container/buffers.h"
#include "feature/relay/routermode.h" #include "lib/crypt_ops/crypto_rand.h"
#include "feature/relay/routerkeys.h" #include "lib/err/backtrace.h"
#include "feature/relay/selftest.h" #include "lib/tls/buffers_tls.h"
#include "feature/nodelist/routerlist.h"
#include "app/config/statefile.h"
#include "core/or/status.h"
#include "lib/net/buffers_net.h" #include "lib/net/buffers_net.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"

51
src/core/or/circuitbuild.c
View file

@ -28,46 +28,47 @@
#define CIRCUITBUILD_PRIVATE #define CIRCUITBUILD_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/bridges.h" #include "app/config/config.h"
#include "app/config/confparse.h"
#include "core/crypto/hs_ntor.h"
#include "core/crypto/onion_crypto.h"
#include "core/crypto/onion_fast.h"
#include "core/crypto/onion_tap.h"
#include "core/crypto/relay_crypto.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/or/channel.h" #include "core/or/channel.h"
#include "feature/client/circpathbias.h"
#define CIRCUITBUILD_PRIVATE
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuitstats.h" #include "core/or/circuitstats.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "core/or/command.h" #include "core/or/command.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/connection_or.h" #include "core/or/connection_or.h"
#include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "feature/dircommon/directory.h"
#include "feature/client/entrynodes.h"
#include "core/crypto/hs_ntor.h"
#include "core/mainloop/mainloop.h"
#include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/onion.h" #include "core/or/onion.h"
#include "core/crypto/onion_crypto.h"
#include "core/crypto/onion_tap.h"
#include "core/crypto/onion_fast.h"
#include "core/or/policies.h" #include "core/or/policies.h"
#include "core/or/relay.h" #include "core/or/relay.h"
#include "core/crypto/relay_crypto.h" #include "feature/client/bridges.h"
#include "feature/rend/rendcommon.h" #include "feature/client/circpathbias.h"
#include "feature/stats/rephist.h" #include "feature/client/entrynodes.h"
#include "feature/relay/router.h" #include "feature/client/transports.h"
#include "feature/relay/routermode.h" #include "feature/control/control.h"
#include "feature/relay/selftest.h" #include "feature/dircommon/directory.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/node_select.h" #include "feature/nodelist/node_select.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"
#include "feature/client/transports.h" #include "feature/relay/router.h"
#include "feature/relay/routermode.h"
#include "feature/relay/selftest.h"
#include "feature/rend/rendcommon.h"
#include "feature/stats/rephist.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "core/or/cell_st.h" #include "core/or/cell_st.h"
#include "core/or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"

28
src/core/or/circuituse.c
View file

@ -28,36 +28,36 @@
**/ **/
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/addressmap.h" #include "app/config/config.h"
#include "feature/client/bridges.h" #include "core/mainloop/connection.h"
#include "core/or/channel.h" #include "core/or/channel.h"
#include "feature/client/circpathbias.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuitstats.h" #include "core/or/circuitstats.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/policies.h"
#include "feature/client/addressmap.h"
#include "feature/client/bridges.h"
#include "feature/client/circpathbias.h"
#include "feature/client/entrynodes.h"
#include "feature/control/control.h" #include "feature/control/control.h"
#include "feature/dircommon/directory.h" #include "feature/dircommon/directory.h"
#include "feature/client/entrynodes.h"
#include "feature/hs/hs_common.h"
#include "feature/hs/hs_client.h"
#include "feature/hs/hs_circuit.h" #include "feature/hs/hs_circuit.h"
#include "feature/hs/hs_client.h"
#include "feature/hs/hs_common.h"
#include "feature/hs/hs_ident.h" #include "feature/hs/hs_ident.h"
#include "feature/hs/hs_stats.h" #include "feature/hs/hs_stats.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/describe.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "core/or/policies.h" #include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerlist.h"
#include "feature/relay/routermode.h"
#include "feature/relay/selftest.h"
#include "feature/rend/rendclient.h" #include "feature/rend/rendclient.h"
#include "feature/rend/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "feature/rend/rendservice.h" #include "feature/rend/rendservice.h"
#include "feature/stats/rephist.h" #include "feature/stats/rephist.h"
#include "feature/relay/router.h"
#include "feature/relay/routermode.h"
#include "feature/relay/selftest.h"
#include "feature/nodelist/routerlist.h"
#include "lib/math/fp.h" #include "lib/math/fp.h"
#include "lib/time/tvdiff.h" #include "lib/time/tvdiff.h"

22
src/core/or/command.c
View file

@ -37,26 +37,26 @@
* called when channels are created in circuitbuild.c * called when channels are created in circuitbuild.c
*/ */
#include "core/or/or.h" #include "core/or/or.h"
#include "app/config/config.h"
#include "core/crypto/onion_crypto.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/cpuworker.h"
#include "core/or/channel.h" #include "core/or/channel.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/command.h" #include "core/or/command.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_or.h" #include "core/or/connection_or.h"
#include "app/config/config.h"
#include "feature/control/control.h"
#include "core/mainloop/cpuworker.h"
#include "lib/crypt_ops/crypto_util.h"
#include "core/or/dos.h" #include "core/or/dos.h"
#include "feature/hibernate/hibernate.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/onion.h" #include "core/or/onion.h"
#include "core/crypto/onion_crypto.h"
#include "feature/stats/rephist.h"
#include "core/or/relay.h" #include "core/or/relay.h"
#include "feature/relay/router.h" #include "feature/control/control.h"
#include "feature/relay/routermode.h" #include "feature/hibernate/hibernate.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/relay/routermode.h"
#include "feature/stats/rephist.h"
#include "lib/crypt_ops/crypto_util.h"
#include "core/or/cell_st.h" #include "core/or/cell_st.h"
#include "core/or/or_circuit_st.h" #include "core/or/or_circuit_st.h"

55
src/core/or/connection_edge.c
View file

@ -59,44 +59,45 @@
#include "lib/err/backtrace.h" #include "lib/err/backtrace.h"
#include "feature/client/addressmap.h"
#include "lib/container/buffers.h"
#include "core/or/channel.h"
#include "feature/client/circpathbias.h"
#include "core/or/circuitlist.h"
#include "core/or/circuituse.h"
#include "app/config/config.h" #include "app/config/config.h"
#include "core/mainloop/connection.h" #include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/or/channel.h"
#include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h"
#include "core/or/circuituse.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/connection_or.h" #include "core/or/connection_or.h"
#include "feature/control/control.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/relay/dns.h"
#include "feature/client/dnsserv.h"
#include "feature/dircommon/directory.h"
#include "feature/dircache/dirserv.h"
#include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_common.h"
#include "feature/hs/hs_cache.h"
#include "feature/hs/hs_client.h"
#include "feature/hs/hs_circuit.h"
#include "core/mainloop/mainloop.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/policies.h" #include "core/or/policies.h"
#include "core/proto/proto_http.h"
#include "core/proto/proto_socks.h"
#include "core/or/reasons.h" #include "core/or/reasons.h"
#include "core/or/relay.h" #include "core/or/relay.h"
#include "core/proto/proto_http.h"
#include "core/proto/proto_socks.h"
#include "feature/client/addressmap.h"
#include "feature/client/circpathbias.h"
#include "feature/client/dnsserv.h"
#include "feature/control/control.h"
#include "feature/dircache/dirserv.h"
#include "feature/dircommon/directory.h"
#include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_cache.h"
#include "feature/hs/hs_circuit.h"
#include "feature/hs/hs_client.h"
#include "feature/hs/hs_common.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerset.h"
#include "feature/relay/dns.h"
#include "feature/relay/router.h"
#include "feature/relay/routermode.h"
#include "feature/rend/rendclient.h" #include "feature/rend/rendclient.h"
#include "feature/rend/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "feature/rend/rendservice.h" #include "feature/rend/rendservice.h"
#include "feature/stats/rephist.h" #include "feature/stats/rephist.h"
#include "feature/relay/router.h" #include "lib/container/buffers.h"
#include "feature/relay/routermode.h" #include "lib/crypt_ops/crypto_util.h"
#include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerset.h"
#include "core/or/circuitbuild.h"
#include "core/or/cell_st.h" #include "core/or/cell_st.h"
#include "core/or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"

2
src/core/or/relay.c
View file

@ -77,7 +77,7 @@
#include "core/crypto/relay_crypto.h" #include "core/crypto/relay_crypto.h"
#include "feature/rend/rendcache.h" #include "feature/rend/rendcache.h"
#include "feature/rend/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "feature/relay/router.h" #include "feature/nodelist/describe.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "core/or/scheduler.h" #include "core/or/scheduler.h"

18
src/feature/client/bridges.c
View file

@ -14,22 +14,22 @@
#define TOR_BRIDGES_PRIVATE #define TOR_BRIDGES_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/bridges.h"
#include "core/or/circuitbuild.h"
#include "app/config/config.h" #include "app/config/config.h"
#include "core/mainloop/connection.h" #include "core/mainloop/connection.h"
#include "feature/dircommon/directory.h" #include "core/or/circuitbuild.h"
#include "core/or/policies.h"
#include "feature/client/bridges.h"
#include "feature/client/entrynodes.h"
#include "feature/client/transports.h"
#include "feature/dirclient/dirclient.h" #include "feature/dirclient/dirclient.h"
#include "feature/dirclient/dlstatus.h" #include "feature/dirclient/dlstatus.h"
#include "feature/client/entrynodes.h" #include "feature/dircommon/directory.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/describe.h"
#include "core/or/policies.h"
#include "feature/relay/router.h"
#include "feature/nodelist/dirlist.h" #include "feature/nodelist/dirlist.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerinfo.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"
#include "feature/client/transports.h"
#include "core/or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "feature/nodelist/node_st.h" #include "feature/nodelist/node_st.h"

39
src/feature/client/entrynodes.c
View file

@ -113,40 +113,41 @@
#define ENTRYNODES_PRIVATE #define ENTRYNODES_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "core/or/channel.h"
#include "feature/client/bridges.h"
#include "feature/client/circpathbias.h"
#include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h"
#include "core/or/circuituse.h"
#include "core/or/circuitstats.h"
#include "app/config/config.h" #include "app/config/config.h"
#include "app/config/confparse.h" #include "app/config/confparse.h"
#include "app/config/statefile.h"
#include "core/mainloop/connection.h" #include "core/mainloop/connection.h"
#include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "feature/dircommon/directory.h"
#include "feature/client/entrynodes.h"
#include "core/mainloop/mainloop.h" #include "core/mainloop/mainloop.h"
#include "core/or/channel.h"
#include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h"
#include "core/or/circuitstats.h"
#include "core/or/circuituse.h"
#include "core/or/policies.h"
#include "feature/client/bridges.h"
#include "feature/client/circpathbias.h"
#include "feature/client/entrynodes.h"
#include "feature/client/transports.h"
#include "feature/control/control.h"
#include "feature/dircommon/directory.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nickname.h"
#include "core/or/policies.h"
#include "feature/relay/router.h"
#include "feature/nodelist/node_select.h" #include "feature/nodelist/node_select.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"
#include "feature/client/transports.h" #include "feature/relay/router.h"
#include "app/config/statefile.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/math/fp.h" #include "lib/crypt_ops/digestset.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "lib/math/fp.h"
#include "feature/nodelist/node_st.h" #include "feature/nodelist/node_st.h"
#include "core/or/origin_circuit_st.h" #include "core/or/origin_circuit_st.h"
#include "app/config/or_state_st.h" #include "app/config/or_state_st.h"
#include "lib/crypt_ops/digestset.h"
/** A list of existing guard selection contexts. */ /** A list of existing guard selection contexts. */
static smartlist_t *guard_contexts = NULL; static smartlist_t *guard_contexts = NULL;
/** The currently enabled guard selection context. */ /** The currently enabled guard selection context. */

63
src/feature/control/control.c
View file

@ -36,9 +36,11 @@
#define CONTROL_PRIVATE #define CONTROL_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/addressmap.h" #include "app/config/config.h"
#include "feature/client/bridges.h" #include "app/config/confparse.h"
#include "lib/container/buffers.h" #include "app/main/main.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/or/channel.h" #include "core/or/channel.h"
#include "core/or/channeltls.h" #include "core/or/channeltls.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
@ -46,49 +48,48 @@
#include "core/or/circuitstats.h" #include "core/or/circuitstats.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "core/or/command.h" #include "core/or/command.h"
#include "lib/evloop/compat_libevent.h"
#include "app/config/config.h"
#include "app/config/confparse.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/connection_or.h" #include "core/or/connection_or.h"
#include "feature/control/control.h" #include "core/or/policies.h"
#include "feature/control/fmt_serverstatus.h" #include "core/or/reasons.h"
#include "lib/crypt_ops/crypto_rand.h" #include "core/proto/proto_control0.h"
#include "lib/crypt_ops/crypto_util.h" #include "core/proto/proto_http.h"
#include "feature/dircommon/directory.h" #include "feature/client/addressmap.h"
#include "feature/dirclient/dirclient.h" #include "feature/client/bridges.h"
#include "feature/dirclient/dlstatus.h"
#include "feature/dircache/dirserv.h"
#include "feature/client/dnsserv.h" #include "feature/client/dnsserv.h"
#include "feature/client/entrynodes.h" #include "feature/client/entrynodes.h"
#include "feature/stats/geoip.h" #include "feature/control/control.h"
#include "feature/control/fmt_serverstatus.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirclient/dirclient.h"
#include "feature/dirclient/dlstatus.h"
#include "feature/dircommon/directory.h"
#include "feature/hibernate/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "feature/hs/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "feature/hs/hs_common.h" #include "feature/hs/hs_common.h"
#include "feature/hs/hs_control.h" #include "feature/hs/hs_control.h"
#include "app/main/main.h" #include "feature/hs_common/shared_random_client.h"
#include "core/mainloop/mainloop.h" #include "feature/nodelist/authcert.h"
#include "feature/nodelist/dirlist.h"
#include "feature/nodelist/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "core/or/policies.h" #include "feature/nodelist/routerinfo.h"
#include "core/proto/proto_control0.h" #include "feature/nodelist/routerlist.h"
#include "core/proto/proto_http.h" #include "feature/nodelist/routerparse.h"
#include "core/or/reasons.h"
#include "feature/rend/rendclient.h"
#include "feature/rend/rendcommon.h"
#include "feature/rend/rendservice.h"
#include "feature/stats/rephist.h"
#include "feature/relay/router.h" #include "feature/relay/router.h"
#include "feature/relay/routermode.h" #include "feature/relay/routermode.h"
#include "feature/relay/selftest.h" #include "feature/relay/selftest.h"
#include "feature/nodelist/authcert.h" #include "feature/rend/rendclient.h"
#include "feature/nodelist/dirlist.h" #include "feature/rend/rendcommon.h"
#include "feature/nodelist/routerlist.h" #include "feature/rend/rendservice.h"
#include "feature/nodelist/routerparse.h" #include "feature/stats/geoip.h"
#include "feature/hs_common/shared_random_client.h" #include "feature/stats/rephist.h"
#include "lib/container/buffers.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "lib/evloop/compat_libevent.h"
#include "feature/dircache/cached_dir_st.h" #include "feature/dircache/cached_dir_st.h"
#include "feature/control/control_connection_st.h" #include "feature/control/control_connection_st.h"

2
src/feature/control/fmt_serverstatus.c
View file

@ -10,7 +10,7 @@
#include "feature/dirauth/authmode.h" #include "feature/dirauth/authmode.h"
#include "feature/dirauth/voteflags.h"// XXXX remove #include "feature/dirauth/voteflags.h"// XXXX remove
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "feature/relay/router.h" #include "feature/nodelist/routerinfo.h"
#include "feature/nodelist/node_st.h" #include "feature/nodelist/node_st.h"
#include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"

2
src/feature/dirauth/process_descs.c
View file

@ -21,8 +21,10 @@
#include "feature/dirauth/reachability.h" #include "feature/dirauth/reachability.h"
#include "feature/dirclient/dlstatus.h" #include "feature/dirclient/dlstatus.h"
#include "feature/dircommon/directory.h" #include "feature/dircommon/directory.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerinfo.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "feature/nodelist/torcert.h" #include "feature/nodelist/torcert.h"

3
src/feature/dirauth/reachability.c
View file

@ -17,10 +17,11 @@
#include "core/or/channeltls.h" #include "core/or/channeltls.h"
#include "core/or/command.h" #include "core/or/command.h"
#include "feature/dirauth/authmode.h" #include "feature/dirauth/authmode.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerinfo.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/torcert.h" #include "feature/nodelist/torcert.h"
#include "feature/relay/router.h"
#include "feature/stats/rephist.h" #include "feature/stats/rephist.h"
#include "feature/nodelist/node_st.h" #include "feature/nodelist/node_st.h"

4
src/feature/dirclient/dirclient.c
View file

@ -15,8 +15,8 @@
#include "feature/client/bridges.h" #include "feature/client/bridges.h"
#include "feature/client/entrynodes.h" #include "feature/client/entrynodes.h"
#include "feature/control/control.h" #include "feature/control/control.h"
#include "feature/dirauth/dirvote.h"
#include "feature/dirauth/authmode.h" #include "feature/dirauth/authmode.h"
#include "feature/dirauth/dirvote.h"
#include "feature/dirauth/shared_random.h" #include "feature/dirauth/shared_random.h"
#include "feature/dircache/dirserv.h" #include "feature/dircache/dirserv.h"
#include "feature/dirclient/dirclient.h" #include "feature/dirclient/dirclient.h"
@ -28,11 +28,13 @@
#include "feature/hs/hs_client.h" #include "feature/hs/hs_client.h"
#include "feature/hs/hs_control.h" #include "feature/hs/hs_control.h"
#include "feature/nodelist/authcert.h" #include "feature/nodelist/authcert.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/dirlist.h" #include "feature/nodelist/dirlist.h"
#include "feature/nodelist/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/node_select.h" #include "feature/nodelist/node_select.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerinfo.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"
#include "feature/relay/routermode.h" #include "feature/relay/routermode.h"

29
src/feature/hs/hs_circuit.c
View file

@ -8,27 +8,26 @@
#define HS_CIRCUIT_PRIVATE #define HS_CIRCUIT_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/circpathbias.h" #include "app/config/config.h"
#include "core/crypto/hs_ntor.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "app/config/config.h" #include "core/or/policies.h"
#include "core/or/relay.h"
#include "feature/client/circpathbias.h"
#include "feature/hs/hs_cell.h"
#include "feature/hs/hs_circuit.h"
#include "feature/hs/hs_circuitmap.h"
#include "feature/hs/hs_ident.h"
#include "feature/hs/hs_service.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/nodelist.h"
#include "feature/rend/rendservice.h"
#include "feature/stats/rephist.h"
#include "lib/crypt_ops/crypto_dh.h" #include "lib/crypt_ops/crypto_dh.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h" #include "lib/crypt_ops/crypto_util.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/policies.h"
#include "core/or/relay.h"
#include "feature/rend/rendservice.h"
#include "feature/stats/rephist.h"
#include "feature/relay/router.h"
#include "feature/hs/hs_cell.h"
#include "feature/hs/hs_circuitmap.h"
#include "feature/hs/hs_ident.h"
#include "core/crypto/hs_ntor.h"
#include "feature/hs/hs_service.h"
#include "feature/hs/hs_circuit.h"
/* Trunnel. */ /* Trunnel. */
#include "trunnel/ed25519_cert.h" #include "trunnel/ed25519_cert.h"

22
src/feature/hs/hs_client.c
View file

@ -9,18 +9,17 @@
#define HS_CLIENT_PRIVATE #define HS_CLIENT_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/circpathbias.h" #include "app/config/config.h"
#include "core/crypto/hs_ntor.h"
#include "core/mainloop/connection.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "lib/crypt_ops/crypto_format.h" #include "core/or/reasons.h"
#include "lib/crypt_ops/crypto_rand.h" #include "feature/client/circpathbias.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/dircommon/directory.h"
#include "feature/dirclient/dirclient.h" #include "feature/dirclient/dirclient.h"
#include "feature/dircommon/directory.h"
#include "feature/hs/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "feature/hs/hs_cell.h" #include "feature/hs/hs_cell.h"
#include "feature/hs/hs_circuit.h" #include "feature/hs/hs_circuit.h"
@ -29,13 +28,14 @@
#include "feature/hs/hs_control.h" #include "feature/hs/hs_control.h"
#include "feature/hs/hs_descriptor.h" #include "feature/hs/hs_descriptor.h"
#include "feature/hs/hs_ident.h" #include "feature/hs/hs_ident.h"
#include "core/crypto/hs_ntor.h" #include "feature/nodelist/describe.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "core/or/reasons.h"
#include "feature/rend/rendclient.h"
#include "feature/relay/router.h"
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"
#include "feature/rend/rendclient.h"
#include "lib/crypt_ops/crypto_format.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "core/or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"
#include "feature/dircommon/dir_connection_st.h" #include "feature/dircommon/dir_connection_st.h"

22
src/feature/hs/hs_common.c
View file

@ -15,23 +15,23 @@
#include "app/config/config.h" #include "app/config/config.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "lib/crypt_ops/crypto_rand.h" #include "core/or/policies.h"
#include "lib/crypt_ops/crypto_util.h" #include "feature/dirauth/shared_random_state.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "feature/hs/hs_cache.h" #include "feature/hs/hs_cache.h"
#include "feature/hs/hs_common.h" #include "feature/hs/hs_circuitmap.h"
#include "feature/hs/hs_client.h" #include "feature/hs/hs_client.h"
#include "feature/hs/hs_common.h"
#include "feature/hs/hs_ident.h" #include "feature/hs/hs_ident.h"
#include "feature/hs/hs_service.h" #include "feature/hs/hs_service.h"
#include "feature/hs/hs_circuitmap.h" #include "feature/hs_common/shared_random_client.h"
#include "core/or/policies.h" #include "feature/nodelist/describe.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerset.h"
#include "feature/rend/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "feature/rend/rendservice.h" #include "feature/rend/rendservice.h"
#include "feature/nodelist/routerset.h" #include "lib/crypt_ops/crypto_rand.h"
#include "feature/relay/router.h" #include "lib/crypt_ops/crypto_util.h"
#include "feature/hs_common/shared_random_client.h"
#include "feature/dirauth/shared_random_state.h"
#include "core/or/edge_connection_st.h" #include "core/or/edge_connection_st.h"
#include "feature/nodelist/networkstatus_st.h" #include "feature/nodelist/networkstatus_st.h"

36
src/feature/hs/hs_service.c
View file

@ -9,29 +9,29 @@
#define HS_SERVICE_PRIVATE #define HS_SERVICE_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/circpathbias.h" #include "app/config/config.h"
#include "app/config/statefile.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "app/config/config.h" #include "core/or/relay.h"
#include "core/mainloop/connection.h" #include "feature/client/circpathbias.h"
#include "lib/crypt_ops/crypto_rand.h" #include "feature/dirclient/dirclient.h"
#include "lib/crypt_ops/crypto_util.h" #include "feature/dircommon/directory.h"
#include "feature/hs_common/shared_random_client.h"
#include "feature/keymgt/loadkey.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/node_select.h"
#include "feature/nodelist/nodelist.h"
#include "feature/rend/rendservice.h"
#include "lib/crypt_ops/crypto_ope.h" #include "lib/crypt_ops/crypto_ope.h"
#include "lib/crypt_ops/crypto_rand.h" #include "lib/crypt_ops/crypto_rand.h"
#include "feature/dircommon/directory.h" #include "lib/crypt_ops/crypto_rand.h"
#include "feature/dirclient/dirclient.h" #include "lib/crypt_ops/crypto_util.h"
#include "core/mainloop/mainloop.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/relay.h"
#include "feature/rend/rendservice.h"
#include "feature/relay/router.h"
#include "feature/keymgt/loadkey.h"
//#include "feature/relay/routerkeys.h"
#include "feature/nodelist/node_select.h"
#include "feature/hs_common/shared_random_client.h"
#include "app/config/statefile.h"
#include "feature/hs/hs_circuit.h" #include "feature/hs/hs_circuit.h"
#include "feature/hs/hs_common.h" #include "feature/hs/hs_common.h"

2
src/feature/nodelist/describe.c
View file

@ -11,7 +11,7 @@
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/nodelist/describe.h" #include "feature/nodelist/describe.h"
#include "feature/relay/router.h" #include "feature/nodelist/routerinfo.h"
#include "core/or/extend_info_st.h" #include "core/or/extend_info_st.h"
#include "feature/nodelist/node_st.h" #include "feature/nodelist/node_st.h"

50
src/feature/nodelist/networkstatus.c
View file

@ -38,45 +38,47 @@
#define NETWORKSTATUS_PRIVATE #define NETWORKSTATUS_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/bridges.h" #include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/mainloop/netstatus.h"
#include "core/or/channel.h" #include "core/or/channel.h"
#include "core/or/channelpadding.h"
#include "core/or/circuitmux.h" #include "core/or/circuitmux.h"
#include "core/or/circuitmux_ewma.h" #include "core/or/circuitmux_ewma.h"
#include "core/or/circuitstats.h" #include "core/or/circuitstats.h"
#include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/connection_or.h" #include "core/or/connection_or.h"
#include "feature/dircache/consdiffmgr.h"
#include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/dircommon/directory.h"
#include "feature/dirclient/dirclient.h"
#include "feature/dirclient/dlstatus.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirauth/reachability.h"
#include "core/or/dos.h" #include "core/or/dos.h"
#include "feature/client/entrynodes.h"
#include "feature/hibernate/hibernate.h"
#include "core/mainloop/mainloop.h"
#include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/protover.h" #include "core/or/protover.h"
#include "core/or/relay.h" #include "core/or/relay.h"
#include "feature/relay/routermode.h" #include "core/or/scheduler.h"
#include "feature/client/bridges.h"
#include "feature/client/entrynodes.h"
#include "feature/client/transports.h"
#include "feature/control/control.h"
#include "feature/dirauth/reachability.h"
#include "feature/dircache/consdiffmgr.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirclient/dirclient.h"
#include "feature/dirclient/dlstatus.h"
#include "feature/dircommon/directory.h"
#include "feature/dircommon/voting_schedule.h"
#include "feature/hibernate/hibernate.h"
#include "feature/nodelist/authcert.h" #include "feature/nodelist/authcert.h"
#include "feature/nodelist/dirlist.h" #include "feature/nodelist/dirlist.h"
#include "feature/nodelist/fmt_routerstatus.h"
#include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/node_select.h" #include "feature/nodelist/node_select.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerinfo.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "core/or/scheduler.h"
#include "feature/client/transports.h"
#include "feature/nodelist/torcert.h" #include "feature/nodelist/torcert.h"
#include "core/or/channelpadding.h" #include "feature/relay/routermode.h"
#include "feature/dircommon/voting_schedule.h" #include "lib/crypt_ops/crypto_rand.h"
#include "feature/nodelist/fmt_routerstatus.h" #include "lib/crypt_ops/crypto_util.h"
#include "feature/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"
#include "feature/dirauth/authmode.h" #include "feature/dirauth/authmode.h"

3
src/feature/nodelist/node_select.c
View file

@ -18,8 +18,9 @@
#include "core/or/policies.h" #include "core/or/policies.h"
#include "core/or/reasons.h" #include "core/or/reasons.h"
#include "feature/client/entrynodes.h" #include "feature/client/entrynodes.h"
#include "feature/dircommon/directory.h"
#include "feature/dirclient/dirclient.h" #include "feature/dirclient/dirclient.h"
#include "feature/dircommon/directory.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/dirlist.h" #include "feature/nodelist/dirlist.h"
#include "feature/nodelist/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"

31
src/feature/nodelist/nodelist.c
View file

@ -41,31 +41,32 @@
#define NODELIST_PRIVATE #define NODELIST_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "lib/net/address.h"
#include "core/or/address_set.h"
#include "feature/client/bridges.h"
#include "app/config/config.h" #include "app/config/config.h"
#include "feature/control/control.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirauth/process_descs.h"
#include "feature/client/entrynodes.h"
#include "feature/stats/geoip.h"
#include "feature/hs/hs_common.h"
#include "feature/hs/hs_client.h"
#include "core/mainloop/mainloop.h" #include "core/mainloop/mainloop.h"
#include "feature/nodelist/microdesc.h" #include "core/mainloop/netstatus.h"
#include "feature/nodelist/networkstatus.h" #include "core/or/address_set.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/policies.h" #include "core/or/policies.h"
#include "core/or/protover.h" #include "core/or/protover.h"
#include "feature/rend/rendservice.h" #include "feature/client/bridges.h"
#include "feature/relay/router.h" #include "feature/client/entrynodes.h"
#include "feature/control/control.h"
#include "feature/dirauth/process_descs.h"
#include "feature/dircache/dirserv.h"
#include "feature/hs/hs_client.h"
#include "feature/hs/hs_common.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/dirlist.h" #include "feature/nodelist/dirlist.h"
#include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/node_select.h" #include "feature/nodelist/node_select.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"
#include "feature/nodelist/torcert.h" #include "feature/nodelist/torcert.h"
#include "feature/rend/rendservice.h"
#include "feature/stats/geoip.h"
#include "lib/net/address.h"
#include <string.h> #include <string.h>

14
src/feature/nodelist/routerlist.c
View file

@ -69,18 +69,20 @@
#include "feature/client/bridges.h" #include "feature/client/bridges.h"
#include "feature/control/control.h" #include "feature/control/control.h"
#include "feature/dirauth/authmode.h" #include "feature/dirauth/authmode.h"
#include "feature/dircommon/directory.h"
#include "feature/dirclient/dirclient.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirclient/dlstatus.h"
#include "feature/dirauth/reachability.h"
#include "feature/dirauth/process_descs.h" #include "feature/dirauth/process_descs.h"
#include "feature/dirauth/reachability.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirclient/dirclient.h"
#include "feature/dirclient/dlstatus.h"
#include "feature/dircommon/directory.h"
#include "feature/nodelist/authcert.h" #include "feature/nodelist/authcert.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/dirlist.h" #include "feature/nodelist/dirlist.h"
#include "feature/nodelist/microdesc.h" #include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/node_select.h" #include "feature/nodelist/node_select.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerinfo.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"

37
src/feature/nodelist/routerparse.c
View file

@ -56,29 +56,32 @@
#define ROUTERPARSE_PRIVATE #define ROUTERPARSE_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "core/or/circuitstats.h"
#include "app/config/config.h" #include "app/config/config.h"
#include "lib/crypt_ops/crypto_format.h" #include "core/or/circuitstats.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/dirauth/shared_random.h"
#include "feature/client/entrynodes.h"
#include "lib/memarea/memarea.h"
#include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/parsecommon.h"
#include "core/or/policies.h" #include "core/or/policies.h"
#include "core/or/protover.h" #include "core/or/protover.h"
#include "feature/rend/rendcommon.h" #include "feature/client/entrynodes.h"
#include "feature/stats/rephist.h" #include "feature/dirauth/shared_random.h"
#include "feature/relay/router.h" #include "feature/dircommon/voting_schedule.h"
#include "feature/relay/routerkeys.h" #include "feature/hs_common/shared_random_client.h"
#include "feature/nodelist/authcert.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/microdesc.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/parsecommon.h"
#include "feature/nodelist/routerinfo.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "feature/nodelist/authcert.h"
#include "lib/sandbox/sandbox.h"
#include "feature/hs_common/shared_random_client.h"
#include "feature/nodelist/torcert.h" #include "feature/nodelist/torcert.h"
#include "feature/dircommon/voting_schedule.h" #include "feature/relay/router.h"
#include "feature/relay/routerkeys.h"
#include "feature/rend/rendcommon.h"
#include "feature/stats/rephist.h"
#include "lib/crypt_ops/crypto_format.h"
#include "lib/crypt_ops/crypto_util.h"
#include "lib/memarea/memarea.h"
#include "lib/sandbox/sandbox.h"
#include "feature/dirauth/dirvote.h" #include "feature/dirauth/dirvote.h"

8
src/feature/nodelist/routerset.c
View file

@ -28,13 +28,13 @@ n * Copyright (c) 2001-2004, Roger Dingledine.
#define ROUTERSET_PRIVATE #define ROUTERSET_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/bridges.h"
#include "feature/stats/geoip.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/policies.h" #include "core/or/policies.h"
#include "feature/relay/router.h" #include "feature/client/bridges.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"
#include "feature/stats/geoip.h"
#include "core/or/addr_policy_st.h" #include "core/or/addr_policy_st.h"
#include "core/or/extend_info_st.h" #include "core/or/extend_info_st.h"

18
src/feature/relay/dns.c
View file

@ -50,26 +50,28 @@
#define DNS_PRIVATE #define DNS_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "core/or/circuitlist.h"
#include "core/or/circuituse.h"
#include "app/config/config.h" #include "app/config/config.h"
#include "core/mainloop/connection.h" #include "core/mainloop/connection.h"
#include "core/or/connection_edge.h"
#include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "feature/relay/dns.h"
#include "core/mainloop/mainloop.h" #include "core/mainloop/mainloop.h"
#include "core/mainloop/netstatus.h"
#include "core/or/circuitlist.h"
#include "core/or/circuituse.h"
#include "core/or/connection_edge.h"
#include "core/or/policies.h" #include "core/or/policies.h"
#include "core/or/relay.h" #include "core/or/relay.h"
#include "feature/control/control.h"
#include "feature/relay/dns.h"
#include "feature/relay/router.h" #include "feature/relay/router.h"
#include "feature/relay/routermode.h" #include "feature/relay/routermode.h"
#include "ht.h" #include "lib/crypt_ops/crypto_rand.h"
#include "lib/sandbox/sandbox.h"
#include "lib/evloop/compat_libevent.h" #include "lib/evloop/compat_libevent.h"
#include "lib/sandbox/sandbox.h"
#include "core/or/edge_connection_st.h" #include "core/or/edge_connection_st.h"
#include "core/or/or_circuit_st.h" #include "core/or/or_circuit_st.h"
#include "ht.h"
#ifdef HAVE_SYS_STAT_H #ifdef HAVE_SYS_STAT_H
#include <sys/stat.h> #include <sys/stat.h>
#endif #endif

65
src/feature/relay/router.c
View file

@ -7,43 +7,50 @@
#define ROUTER_PRIVATE #define ROUTER_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "app/config/config.h"
#include "app/config/statefile.h"
#include "app/main/main.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/mainloop/netstatus.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "feature/control/control.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "lib/crypt_ops/crypto_curve25519.h"
#include "feature/dircommon/directory.h"
#include "feature/dirclient/dirclient.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirauth/process_descs.h"
#include "feature/relay/dns.h"
#include "feature/stats/geoip.h"
#include "feature/hibernate/hibernate.h"
#include "app/main/main.h"
#include "core/mainloop/mainloop.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h"
#include "core/or/policies.h" #include "core/or/policies.h"
#include "core/or/protover.h" #include "core/or/protover.h"
#include "core/or/relay.h" #include "core/or/relay.h"
#include "feature/client/transports.h"
#include "feature/control/control.h"
#include "feature/dirauth/process_descs.h"
#include "feature/dircache/dirserv.h"
#include "feature/dirclient/dirclient.h"
#include "feature/dircommon/directory.h"
#include "feature/hibernate/hibernate.h"
#include "feature/keymgt/loadkey.h" #include "feature/keymgt/loadkey.h"
#include "feature/stats/rephist.h" #include "feature/nodelist/authcert.h"
#include "feature/nodelist/dirlist.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/nodelist.h"
#include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h"
#include "feature/nodelist/routerset.h"
#include "feature/nodelist/torcert.h"
#include "feature/relay/dns.h"
#include "feature/relay/router.h" #include "feature/relay/router.h"
#include "feature/relay/routerkeys.h" #include "feature/relay/routerkeys.h"
#include "feature/relay/routermode.h" #include "feature/relay/routermode.h"
#include "feature/relay/selftest.h" #include "feature/relay/selftest.h"
#include "feature/nodelist/authcert.h" #include "feature/stats/geoip.h"
#include "feature/nodelist/dirlist.h" #include "feature/stats/rephist.h"
#include "feature/nodelist/routerlist.h" #include "lib/crypt_ops/crypto_curve25519.h"
#include "feature/nodelist/routerparse.h" #include "lib/crypt_ops/crypto_format.h"
#include "app/config/statefile.h" #include "lib/crypt_ops/crypto_init.h"
#include "feature/nodelist/torcert.h" #include "lib/crypt_ops/crypto_rand.h"
#include "feature/client/transports.h" #include "lib/crypt_ops/crypto_util.h"
#include "feature/nodelist/routerset.h" #include "lib/encoding/confline.h"
#include "lib/osinfo/uname.h"
#include "lib/tls/tortls.h"
#include "feature/dirauth/authmode.h" #include "feature/dirauth/authmode.h"
@ -59,12 +66,6 @@
#include "core/or/port_cfg_st.h" #include "core/or/port_cfg_st.h"
#include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "lib/osinfo/uname.h"
#include "lib/tls/tortls.h"
#include "lib/encoding/confline.h"
#include "lib/crypt_ops/crypto_format.h"
#include "lib/crypt_ops/crypto_init.h"
/** /**
* \file router.c * \file router.c
* \brief Miscellaneous relay functionality, including RSA key maintenance, * \brief Miscellaneous relay functionality, including RSA key maintenance,

4
src/feature/relay/router.h
View file

@ -13,10 +13,6 @@
#define TOR_ROUTER_H #define TOR_ROUTER_H
#include "lib/testsupport/testsupport.h" #include "lib/testsupport/testsupport.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/routerinfo.h"
#include "core/mainloop/netstatus.h"
struct curve25519_keypair_t; struct curve25519_keypair_t;
struct ed25519_keypair_t; struct ed25519_keypair_t;

2
src/feature/relay/selftest.c
View file

@ -19,6 +19,7 @@
#include "app/config/config.h" #include "app/config/config.h"
#include "core/mainloop/connection.h" #include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h" #include "core/mainloop/mainloop.h"
#include "core/mainloop/netstatus.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
@ -29,6 +30,7 @@
#include "feature/dirclient/dirclient.h" #include "feature/dirclient/dirclient.h"
#include "feature/dircommon/directory.h" #include "feature/dircommon/directory.h"
#include "feature/nodelist/authority_cert_st.h" #include "feature/nodelist/authority_cert_st.h"
#include "feature/nodelist/routerinfo.h"
#include "feature/nodelist/routerinfo_st.h" #include "feature/nodelist/routerinfo_st.h"
#include "feature/nodelist/routerlist.h" // but... #include "feature/nodelist/routerlist.h" // but...
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"

24
src/feature/rend/rendclient.c
View file

@ -8,32 +8,32 @@
**/ **/
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/circpathbias.h" #include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/mainloop/mainloop.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "app/config/config.h"
#include "core/mainloop/connection.h"
#include "core/or/connection_edge.h" #include "core/or/connection_edge.h"
#include "core/or/relay.h"
#include "feature/client/circpathbias.h"
#include "feature/control/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_dh.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/dircommon/directory.h"
#include "feature/dirclient/dirclient.h" #include "feature/dirclient/dirclient.h"
#include "feature/dircommon/directory.h"
#include "feature/hs/hs_circuit.h" #include "feature/hs/hs_circuit.h"
#include "feature/hs/hs_client.h" #include "feature/hs/hs_client.h"
#include "feature/hs/hs_common.h" #include "feature/hs/hs_common.h"
#include "core/mainloop/mainloop.h" #include "feature/nodelist/describe.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "core/or/relay.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerset.h"
#include "feature/rend/rendclient.h" #include "feature/rend/rendclient.h"
#include "feature/rend/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "feature/stats/rephist.h" #include "feature/stats/rephist.h"
#include "feature/relay/router.h" #include "lib/crypt_ops/crypto_dh.h"
#include "feature/nodelist/routerlist.h" #include "lib/crypt_ops/crypto_rand.h"
#include "feature/nodelist/routerset.h" #include "lib/crypt_ops/crypto_util.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "core/or/cpath_build_state_st.h" #include "core/or/cpath_build_state_st.h"

32
src/feature/rend/rendservice.c
View file

@ -10,34 +10,36 @@
#define RENDSERVICE_PRIVATE #define RENDSERVICE_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/circpathbias.h"
#include "app/config/config.h"
#include "core/mainloop/mainloop.h"
#include "core/or/circuitbuild.h" #include "core/or/circuitbuild.h"
#include "core/or/circuitlist.h" #include "core/or/circuitlist.h"
#include "core/or/circuituse.h" #include "core/or/circuituse.h"
#include "app/config/config.h" #include "core/or/policies.h"
#include "core/or/relay.h"
#include "feature/client/circpathbias.h"
#include "feature/control/control.h" #include "feature/control/control.h"
#include "lib/crypt_ops/crypto_dh.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/crypt_ops/crypto_util.h"
#include "feature/dircommon/directory.h"
#include "feature/dirclient/dirclient.h" #include "feature/dirclient/dirclient.h"
#include "feature/dircommon/directory.h"
#include "feature/hs/hs_common.h" #include "feature/hs/hs_common.h"
#include "feature/hs/hs_config.h" #include "feature/hs/hs_config.h"
#include "core/mainloop/mainloop.h" #include "feature/hs_common/replaycache.h"
#include "feature/keymgt/loadkey.h"
#include "feature/nodelist/describe.h"
#include "feature/nodelist/networkstatus.h" #include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/node_select.h"
#include "feature/nodelist/nodelist.h" #include "feature/nodelist/nodelist.h"
#include "core/or/policies.h" #include "feature/nodelist/routerparse.h"
#include "feature/nodelist/routerset.h"
#include "feature/rend/rendclient.h" #include "feature/rend/rendclient.h"
#include "feature/rend/rendcommon.h" #include "feature/rend/rendcommon.h"
#include "feature/rend/rendservice.h" #include "feature/rend/rendservice.h"
#include "feature/relay/router.h"
#include "feature/keymgt/loadkey.h"
#include "core/or/relay.h"
#include "feature/stats/rephist.h" #include "feature/stats/rephist.h"
#include "feature/hs_common/replaycache.h" #include "lib/crypt_ops/crypto_dh.h"
#include "feature/nodelist/node_select.h" #include "lib/crypt_ops/crypto_rand.h"
#include "feature/nodelist/routerparse.h" #include "lib/crypt_ops/crypto_util.h"
#include "feature/nodelist/routerset.h"
#include "lib/encoding/confline.h" #include "lib/encoding/confline.h"
#include "lib/net/resolve.h" #include "lib/net/resolve.h"

55
src/test/test_dir.c
View file

@ -24,48 +24,49 @@
#define VOTEFLAGS_PRIVATE #define VOTEFLAGS_PRIVATE
#include "core/or/or.h" #include "core/or/or.h"
#include "feature/client/bridges.h"
#include "core/mainloop/connection.h"
#include "app/config/confparse.h"
#include "app/config/config.h" #include "app/config/config.h"
#include "app/config/confparse.h"
#include "core/mainloop/connection.h"
#include "core/or/relay.h"
#include "feature/client/bridges.h"
#include "feature/client/entrynodes.h"
#include "feature/control/control.h" #include "feature/control/control.h"
#include "lib/encoding/confline.h"
#include "lib/crypt_ops/crypto_ed25519.h"
#include "lib/crypt_ops/crypto_format.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "feature/dircommon/directory.h"
#include "feature/dirclient/dirclient.h"
#include "feature/dirclient/dlstatus.h"
#include "feature/dirauth/bwauth.h" #include "feature/dirauth/bwauth.h"
#include "feature/dirauth/dirvote.h"
#include "feature/dirauth/process_descs.h"
#include "feature/dirauth/recommend_pkg.h"
#include "feature/dirauth/shared_random_state.h"
#include "feature/dirauth/voteflags.h"
#include "feature/dircache/dircache.h" #include "feature/dircache/dircache.h"
#include "feature/dircache/dirserv.h" #include "feature/dircache/dirserv.h"
#include "feature/dirauth/process_descs.h" #include "feature/dirclient/dirclient.h"
#include "feature/dirauth/dirvote.h" #include "feature/dirclient/dlstatus.h"
#include "feature/dirauth/recommend_pkg.h" #include "feature/dircommon/directory.h"
#include "feature/dirauth/voteflags.h"
#include "feature/client/entrynodes.h"
#include "feature/dircommon/fp_pair.h" #include "feature/dircommon/fp_pair.h"
#include "feature/dircommon/voting_schedule.h"
#include "feature/hibernate/hibernate.h" #include "feature/hibernate/hibernate.h"
#include "lib/memarea/memarea.h"
#include "lib/osinfo/uname.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/relay/router.h"
#include "feature/relay/routerkeys.h"
#include "feature/relay/routermode.h"
#include "feature/nodelist/authcert.h" #include "feature/nodelist/authcert.h"
#include "feature/nodelist/dirlist.h" #include "feature/nodelist/dirlist.h"
#include "feature/nodelist/networkstatus.h"
#include "feature/nodelist/nickname.h"
#include "feature/nodelist/node_select.h" #include "feature/nodelist/node_select.h"
#include "feature/nodelist/routerlist.h" #include "feature/nodelist/routerlist.h"
#include "feature/nodelist/routerparse.h" #include "feature/nodelist/routerparse.h"
#include "feature/nodelist/routerset.h" #include "feature/nodelist/routerset.h"
#include "feature/dirauth/shared_random_state.h" #include "feature/nodelist/torcert.h"
#include "feature/relay/router.h"
#include "feature/relay/routerkeys.h"
#include "feature/relay/routermode.h"
#include "lib/compress/compress.h"
#include "lib/crypt_ops/crypto_ed25519.h"
#include "lib/crypt_ops/crypto_format.h"
#include "lib/crypt_ops/crypto_rand.h"
#include "lib/encoding/confline.h"
#include "lib/memarea/memarea.h"
#include "lib/osinfo/uname.h"
#include "test/log_test_helpers.h"
#include "test/test.h" #include "test/test.h"
#include "test/test_dir_common.h" #include "test/test_dir_common.h"
#include "feature/nodelist/torcert.h"
#include "core/or/relay.h"
#include "test/log_test_helpers.h"
#include "feature/dircommon/voting_schedule.h"
#include "lib/compress/compress.h"
#include "core/or/addr_policy_st.h" #include "core/or/addr_policy_st.h"
#include "feature/nodelist/authority_cert_st.h" #include "feature/nodelist/authority_cert_st.h"