Commit f403af22 authored by Nick Mathewson's avatar Nick Mathewson 🦀
Browse files

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/*.
parent 79208ee8

src/app/config/config.c

+1 −0
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ 
#include "feature/rend/rendclient.h"

#include "feature/rend/rendservice.h"

#include "feature/stats/geoip.h"

#include "feature/stats/geoip_stats.h"

#include "feature/stats/predict_ports.h"

#include "feature/stats/rephist.h"

#include "lib/compress/compress.h"

src/app/main/main.c

+3 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 
#include "core/or/command.h"

#include "core/or/connection_edge.h"

#include "core/or/connection_or.h"

#include "core/or/dos.h"

#include "core/or/policies.h"

#include "core/or/protover.h"

#include "core/or/relay.h"
@@ -61,6 +62,7 @@ 
#include "feature/rend/rendclient.h"

#include "feature/rend/rendservice.h"

#include "feature/stats/geoip.h"

#include "feature/stats/geoip_stats.h"

#include "feature/stats/predict_ports.h"

#include "feature/stats/rephist.h"

#include "lib/compress/compress.h"
@@ -755,6 +757,7 @@ tor_free_all(int postfork) 
    evdns_shutdown(1);

  }

  geoip_free_all();

  geoip_stats_free_all();

  dirvote_free_all();

  routerlist_free_all();

  networkstatus_free_all();

src/core/include.am

+4 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ LIBTOR_APP_A_SOURCES = \ 
	src/feature/client/transports.c		\

	src/feature/control/control.c		\

	src/feature/control/fmt_serverstatus.c  \

	src/feature/control/getinfo_geoip.c	\

	src/feature/dirauth/keypin.c		\

	src/feature/dircache/conscache.c	\

	src/feature/dircache/consdiffmgr.c	\
@@ -117,6 +118,7 @@ LIBTOR_APP_A_SOURCES = \ 
	src/feature/rend/rendmid.c		\

	src/feature/rend/rendservice.c		\

	src/feature/stats/geoip.c		\

	src/feature/stats/geoip_stats.c		\

	src/feature/stats/rephist.c		\

	src/feature/stats/predict_ports.c
@@ -254,6 +256,7 @@ noinst_HEADERS += \ 
	src/feature/control/control.h			\

	src/feature/control/control_connection_st.h	\

	src/feature/control/fmt_serverstatus.h		\

	src/feature/control/getinfo_geoip.h		\

	src/feature/dirauth/authmode.h			\

	src/feature/dirauth/bwauth.h			\

	src/feature/dirauth/dircollate.h		\
@@ -348,6 +351,7 @@ noinst_HEADERS += \ 
	src/feature/rend/rendmid.h			\

	src/feature/rend/rendservice.h			\

	src/feature/stats/geoip.h			\

	src/feature/stats/geoip_stats.h			\

	src/feature/stats/rephist.h			\

	src/feature/stats/predict_ports.h

src/core/mainloop/mainloop.c

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ 
#include "feature/relay/selftest.h"

#include "feature/rend/rendcache.h"

#include "feature/rend/rendservice.h"

#include "feature/stats/geoip.h"

#include "feature/stats/geoip_stats.h"

#include "feature/stats/predict_ports.h"

#include "feature/stats/rephist.h"

#include "lib/container/buffers.h"

src/core/or/channel.c

+12 −11
Original line number Diff line number Diff line
@@ -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"