diff options
| author | Nick Mathewson <nickm@torproject.org> | 2018-09-27 09:35:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2018-09-27 09:36:52 -0400 |
| commit | f403af22076b0092807822ddc9890acdbd62f578 (patch) | |
| tree | e8b21036bd9148d765609d9f998baf4350f373c6 /src/core/or/channel.c | |
| parent | 79208ee852b84c94b32db1b13a2ba802cae360f7 (diff) | |
| download | tor-f403af22076b0092807822ddc9890acdbd62f578.tar.gz tor-f403af22076b0092807822ddc9890acdbd62f578.zip | |
Split geoip from geoip-related stats.
This commit just moves the code to two separate files. The geoip
code still has a few needless dependencies on core/* and features/*.
Diffstat (limited to 'src/core/or/channel.c')
| -rw-r--r-- | src/core/or/channel.c | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/src/core/or/channel.c b/src/core/or/channel.c index e9011520ae..fe3785d52e 100644 --- a/src/core/or/channel.c +++ b/src/core/or/channel.c @@ -58,28 +58,29 @@ #define CHANNEL_PRIVATE_ #include "core/or/or.h" +#include "app/config/config.h" +#include "core/mainloop/mainloop.h" #include "core/or/channel.h" -#include "core/or/channeltls.h" #include "core/or/channelpadding.h" +#include "core/or/channeltls.h" #include "core/or/circuitbuild.h" #include "core/or/circuitlist.h" +#include "core/or/circuitmux.h" #include "core/or/circuitstats.h" -#include "app/config/config.h" #include "core/or/connection_or.h" /* For var_cell_free() */ -#include "core/or/circuitmux.h" -#include "feature/client/entrynodes.h" -#include "feature/stats/geoip.h" -#include "core/mainloop/mainloop.h" -#include "feature/nodelist/nodelist.h" +#include "core/or/dos.h" #include "core/or/relay.h" -#include "feature/stats/rephist.h" -#include "feature/relay/router.h" -#include "feature/nodelist/routerlist.h" #include "core/or/scheduler.h" -#include "lib/time/compat_time.h" +#include "feature/client/entrynodes.h" #include "feature/nodelist/networkstatus.h" +#include "feature/nodelist/nodelist.h" +#include "feature/nodelist/routerlist.h" +#include "feature/relay/router.h" #include "feature/rend/rendservice.h" +#include "feature/stats/geoip_stats.h" +#include "feature/stats/rephist.h" #include "lib/evloop/timers.h" +#include "lib/time/compat_time.h" #include "core/or/cell_queue_st.h" |