diff options
Diffstat (limited to 'src/feature/client')
-rw-r--r-- | src/feature/client/addressmap.c | 22 | ||||
-rw-r--r-- | src/feature/client/bridges.c | 36 | ||||
-rw-r--r-- | src/feature/client/circpathbias.c | 34 | ||||
-rw-r--r-- | src/feature/client/dnsserv.c | 26 | ||||
-rw-r--r-- | src/feature/client/entrynodes.c | 56 | ||||
-rw-r--r-- | src/feature/client/transports.c | 22 |
6 files changed, 98 insertions, 98 deletions
diff --git a/src/feature/client/addressmap.c b/src/feature/client/addressmap.c index ba78a5f908..e62d82b7f3 100644 --- a/src/feature/client/addressmap.c +++ b/src/feature/client/addressmap.c @@ -17,17 +17,17 @@ #include "lib/crypt_ops/crypto_rand.h" -#include "or/or.h" -#include "or/addressmap.h" -#include "or/circuituse.h" -#include "or/config.h" -#include "or/connection_edge.h" -#include "or/control.h" -#include "or/dns.h" -#include "or/nodelist.h" -#include "or/routerset.h" - -#include "or/entry_connection_st.h" +#include "core/or/or.h" +#include "feature/client/addressmap.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" +#include "core/or/connection_edge.h" +#include "feature/control/control.h" +#include "feature/relay/dns.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerset.h" + +#include "core/or/entry_connection_st.h" /** A client-side struct to remember requests to rewrite addresses * to new addresses. These structs are stored in the hash table diff --git a/src/feature/client/bridges.c b/src/feature/client/bridges.c index ca0a13f2a0..4bffe16036 100644 --- a/src/feature/client/bridges.c +++ b/src/feature/client/bridges.c @@ -13,24 +13,24 @@ #define TOR_BRIDGES_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/circuitbuild.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/directory.h" -#include "or/entrynodes.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerset.h" -#include "or/transports.h" - -#include "or/extend_info_st.h" -#include "or/node_st.h" -#include "or/routerinfo_st.h" -#include "or/routerstatus_st.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "core/or/circuitbuild.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "feature/dircache/directory.h" +#include "feature/client/entrynodes.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerset.h" +#include "feature/client/transports.h" + +#include "core/or/extend_info_st.h" +#include "feature/nodelist/node_st.h" +#include "feature/nodelist/routerinfo_st.h" +#include "feature/nodelist/routerstatus_st.h" /** Information about a configured bridge. Currently this just matches the * ones in the torrc file, but one day we may be able to learn about new diff --git a/src/feature/client/circpathbias.c b/src/feature/client/circpathbias.c index 32b3212d3f..1ee29c639d 100644 --- a/src/feature/client/circpathbias.c +++ b/src/feature/client/circpathbias.c @@ -21,27 +21,27 @@ * each guard, and stored persistently in the state file. */ -#include "or/or.h" -#include "or/channel.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/circuitstats.h" -#include "or/connection_edge.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/or/channel.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 "core/or/connection_edge.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/entrynodes.h" -#include "or/networkstatus.h" -#include "or/relay.h" +#include "feature/client/entrynodes.h" +#include "feature/nodelist/networkstatus.h" +#include "core/or/relay.h" #include "lib/math/fp.h" #include "lib/math/laplace.h" -#include "or/cell_st.h" -#include "or/cpath_build_state_st.h" -#include "or/crypt_path_st.h" -#include "or/extend_info_st.h" -#include "or/origin_circuit_st.h" +#include "core/or/cell_st.h" +#include "core/or/cpath_build_state_st.h" +#include "core/or/crypt_path_st.h" +#include "core/or/extend_info_st.h" +#include "core/or/origin_circuit_st.h" static void pathbias_count_successful_close(origin_circuit_t *circ); static void pathbias_count_collapse(origin_circuit_t *circ); diff --git a/src/feature/client/dnsserv.c b/src/feature/client/dnsserv.c index 6e75254239..31cc3eff79 100644 --- a/src/feature/client/dnsserv.c +++ b/src/feature/client/dnsserv.c @@ -21,19 +21,19 @@ * DNS client. **/ -#include "or/or.h" -#include "or/dnsserv.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/connection_edge.h" -#include "or/control.h" -#include "or/main.h" -#include "or/policies.h" - -#include "or/control_connection_st.h" -#include "or/entry_connection_st.h" -#include "or/listener_connection_st.h" -#include "or/socks_request_st.h" +#include "core/or/or.h" +#include "feature/client/dnsserv.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/connection_edge.h" +#include "feature/control/control.h" +#include "core/mainloop/main.h" +#include "core/or/policies.h" + +#include "feature/control/control_connection_st.h" +#include "core/or/entry_connection_st.h" +#include "core/or/listener_connection_st.h" +#include "core/or/socks_request_st.h" #include "lib/evloop/compat_libevent.h" #include <event2/dns.h> diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index ba9c30f8b3..664be8ce11 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -112,38 +112,38 @@ #define ENTRYNODES_PRIVATE -#include "or/or.h" -#include "or/channel.h" -#include "or/bridges.h" -#include "or/circpathbias.h" -#include "or/circuitbuild.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/circuitstats.h" -#include "or/config.h" -#include "or/confparse.h" -#include "or/connection.h" -#include "or/control.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/confparse.h" +#include "core/mainloop/connection.h" +#include "feature/control/control.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/directory.h" -#include "or/entrynodes.h" -#include "or/main.h" -#include "or/microdesc.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/policies.h" -#include "or/router.h" -#include "or/routerlist.h" -#include "or/routerparse.h" -#include "or/routerset.h" -#include "or/transports.h" -#include "or/statefile.h" +#include "feature/dircache/directory.h" +#include "feature/client/entrynodes.h" +#include "core/mainloop/main.h" +#include "feature/nodelist/microdesc.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "core/or/policies.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" +#include "feature/nodelist/routerparse.h" +#include "feature/nodelist/routerset.h" +#include "feature/client/transports.h" +#include "app/config/statefile.h" #include "lib/math/fp.h" #include "lib/encoding/confline.h" -#include "or/node_st.h" -#include "or/origin_circuit_st.h" -#include "or/or_state_st.h" +#include "feature/nodelist/node_st.h" +#include "core/or/origin_circuit_st.h" +#include "app/config/or_state_st.h" #include "lib/crypt_ops/digestset.h" diff --git a/src/feature/client/transports.c b/src/feature/client/transports.c index 1d3cb7b951..85d4d2e080 100644 --- a/src/feature/client/transports.c +++ b/src/feature/client/transports.c @@ -90,17 +90,17 @@ **/ #define PT_PRIVATE -#include "or/or.h" -#include "or/bridges.h" -#include "or/config.h" -#include "or/connection.h" -#include "or/circuitbuild.h" -#include "or/transports.h" -#include "or/router.h" -#include "or/statefile.h" -#include "or/connection_or.h" -#include "or/ext_orport.h" -#include "or/control.h" +#include "core/or/or.h" +#include "feature/client/bridges.h" +#include "app/config/config.h" +#include "core/mainloop/connection.h" +#include "core/or/circuitbuild.h" +#include "feature/client/transports.h" +#include "feature/relay/router.h" +#include "app/config/statefile.h" +#include "core/or/connection_or.h" +#include "feature/relay/ext_orport.h" +#include "feature/control/control.h" #include "lib/process/env.h" #include "lib/process/subprocess.h" |