diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-25 17:57:58 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-25 17:57:58 -0400 |
| commit | 4f0bc0c8f56f4179482c21bf3122b67ee2fe26d1 (patch) | |
| tree | 9f3063311db1e31e5e457f2854ff03cbcee74623 /src/feature/control | |
| parent | 3ff58e47d211d8649202c093f00934011effed1b (diff) | |
| download | tor-4f0bc0c8f56f4179482c21bf3122b67ee2fe26d1.tar.gz tor-4f0bc0c8f56f4179482c21bf3122b67ee2fe26d1.zip | |
Revise things that had included router.h before
Make them only include the headers that they needed, and sort their
headers while we're at it.
Diffstat (limited to 'src/feature/control')
| -rw-r--r-- | src/feature/control/control.c | 57 | ||||
| -rw-r--r-- | src/feature/control/fmt_serverstatus.c | 2 |
2 files changed, 30 insertions, 29 deletions
diff --git a/src/feature/control/control.c b/src/feature/control/control.c index 43ec0bd8b2..d8d08f2c86 100644 --- a/src/feature/control/control.c +++ b/src/feature/control/control.c @@ -36,9 +36,11 @@ #define CONTROL_PRIVATE #include "core/or/or.h" -#include "feature/client/addressmap.h" -#include "feature/client/bridges.h" -#include "lib/container/buffers.h" +#include "app/config/config.h" +#include "app/config/confparse.h" +#include "app/main/main.h" +#include "core/mainloop/connection.h" +#include "core/mainloop/mainloop.h" #include "core/or/channel.h" #include "core/or/channeltls.h" #include "core/or/circuitbuild.h" @@ -46,49 +48,48 @@ #include "core/or/circuitstats.h" #include "core/or/circuituse.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_or.h" +#include "core/or/policies.h" +#include "core/or/reasons.h" +#include "core/proto/proto_control0.h" +#include "core/proto/proto_http.h" +#include "feature/client/addressmap.h" +#include "feature/client/bridges.h" +#include "feature/client/dnsserv.h" +#include "feature/client/entrynodes.h" #include "feature/control/control.h" #include "feature/control/fmt_serverstatus.h" -#include "lib/crypt_ops/crypto_rand.h" -#include "lib/crypt_ops/crypto_util.h" -#include "feature/dircommon/directory.h" +#include "feature/dircache/dirserv.h" #include "feature/dirclient/dirclient.h" #include "feature/dirclient/dlstatus.h" -#include "feature/dircache/dirserv.h" -#include "feature/client/dnsserv.h" -#include "feature/client/entrynodes.h" -#include "feature/stats/geoip.h" +#include "feature/dircommon/directory.h" #include "feature/hibernate/hibernate.h" #include "feature/hs/hs_cache.h" #include "feature/hs/hs_common.h" #include "feature/hs/hs_control.h" -#include "app/main/main.h" -#include "core/mainloop/mainloop.h" +#include "feature/hs_common/shared_random_client.h" +#include "feature/nodelist/authcert.h" +#include "feature/nodelist/dirlist.h" #include "feature/nodelist/microdesc.h" #include "feature/nodelist/networkstatus.h" #include "feature/nodelist/nodelist.h" -#include "core/or/policies.h" -#include "core/proto/proto_control0.h" -#include "core/proto/proto_http.h" -#include "core/or/reasons.h" +#include "feature/nodelist/routerinfo.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/relay/router.h" +#include "feature/relay/routermode.h" +#include "feature/relay/selftest.h" #include "feature/rend/rendclient.h" #include "feature/rend/rendcommon.h" #include "feature/rend/rendservice.h" +#include "feature/stats/geoip.h" #include "feature/stats/rephist.h" -#include "feature/relay/router.h" -#include "feature/relay/routermode.h" -#include "feature/relay/selftest.h" -#include "feature/nodelist/authcert.h" -#include "feature/nodelist/dirlist.h" -#include "feature/nodelist/routerlist.h" -#include "feature/nodelist/routerparse.h" -#include "feature/hs_common/shared_random_client.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/evloop/compat_libevent.h" #include "feature/dircache/cached_dir_st.h" #include "feature/control/control_connection_st.h" diff --git a/src/feature/control/fmt_serverstatus.c b/src/feature/control/fmt_serverstatus.c index ed9f14ab38..eef85d356c 100644 --- a/src/feature/control/fmt_serverstatus.c +++ b/src/feature/control/fmt_serverstatus.c @@ -10,7 +10,7 @@ #include "feature/dirauth/authmode.h" #include "feature/dirauth/voteflags.h"// XXXX remove #include "feature/nodelist/nodelist.h" -#include "feature/relay/router.h" +#include "feature/nodelist/routerinfo.h" #include "feature/nodelist/node_st.h" #include "feature/nodelist/routerinfo_st.h" |