diff options
Diffstat (limited to 'src/feature/stats')
-rw-r--r-- | src/feature/stats/geoip.c | 14 | ||||
-rw-r--r-- | src/feature/stats/geoip.h | 2 | ||||
-rw-r--r-- | src/feature/stats/rephist.c | 30 |
3 files changed, 23 insertions, 23 deletions
diff --git a/src/feature/stats/geoip.c b/src/feature/stats/geoip.c index 3e6f20ea3f..d891bd80e2 100644 --- a/src/feature/stats/geoip.c +++ b/src/feature/stats/geoip.c @@ -28,15 +28,15 @@ */ #define GEOIP_PRIVATE -#include "or/or.h" +#include "core/or/or.h" #include "ht.h" #include "lib/container/buffers.h" -#include "or/config.h" -#include "or/control.h" -#include "or/dnsserv.h" -#include "or/dos.h" -#include "or/geoip.h" -#include "or/routerlist.h" +#include "app/config/config.h" +#include "feature/control/control.h" +#include "feature/client/dnsserv.h" +#include "core/or/dos.h" +#include "feature/stats/geoip.h" +#include "feature/nodelist/routerlist.h" #include "lib/container/order.h" #include "lib/time/tvdiff.h" diff --git a/src/feature/stats/geoip.h b/src/feature/stats/geoip.h index fd19b7560a..a2175c01e5 100644 --- a/src/feature/stats/geoip.h +++ b/src/feature/stats/geoip.h @@ -13,7 +13,7 @@ #define TOR_GEOIP_H #include "lib/testsupport/testsupport.h" -#include "or/dos.h" +#include "core/or/dos.h" /** Indicates an action that we might be noting geoip statistics on. * Note that if we're noticing CONNECT, we're a bridge, and if we're noticing diff --git a/src/feature/stats/rephist.c b/src/feature/stats/rephist.c index 6607c25964..6bb680c5dc 100644 --- a/src/feature/stats/rephist.c +++ b/src/feature/stats/rephist.c @@ -74,24 +74,24 @@ * (The "rephist" name originally stood for "reputation and history". ) **/ -#include "or/or.h" -#include "or/circuitlist.h" -#include "or/circuituse.h" -#include "or/config.h" +#include "core/or/or.h" +#include "core/or/circuitlist.h" +#include "core/or/circuituse.h" +#include "app/config/config.h" #include "lib/crypt_ops/crypto_rand.h" -#include "or/networkstatus.h" -#include "or/nodelist.h" -#include "or/rephist.h" -#include "or/router.h" -#include "or/routerlist.h" +#include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "feature/stats/rephist.h" +#include "feature/relay/router.h" +#include "feature/nodelist/routerlist.h" #include "ht.h" -#include "or/channelpadding.h" -#include "or/connection_or.h" -#include "or/statefile.h" +#include "core/or/channelpadding.h" +#include "core/or/connection_or.h" +#include "app/config/statefile.h" -#include "or/networkstatus_st.h" -#include "or/or_circuit_st.h" -#include "or/or_state_st.h" +#include "feature/nodelist/networkstatus_st.h" +#include "core/or/or_circuit_st.h" +#include "app/config/or_state_st.h" #include "lib/container/bloomfilt.h" #include "lib/container/order.h" |