Commit c8f2a6d2 authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Extract the non-stats part of geoip into a new src/lib/geoip.

parent fa32574b

.gitignore

+2 −0
Original line number Diff line number Diff line
@@ -173,6 +173,8 @@ uptime-*.json 
/src/lib/libtor-fdio-testing.a

/src/lib/libtor-fs.a

/src/lib/libtor-fs-testing.a

/src/lib/libtor-geoip.a

/src/lib/libtor-geoip-testing.a

/src/lib/libtor-intmath.a

/src/lib/libtor-intmath-testing.a

/src/lib/libtor-lock.a

Makefile.am

+2 −0
Original line number Diff line number Diff line
@@ -40,6 +40,7 @@ endif 


# "Common" libraries used to link tor's utility code.

TOR_UTIL_LIBS = \

        src/lib/libtor-geoip.a \

	src/lib/libtor-process.a \

	src/lib/libtor-time.a \

	src/lib/libtor-fs.a \
@@ -68,6 +69,7 @@ TOR_UTIL_LIBS = \ 
# and tests)

if UNITTESTS_ENABLED

TOR_UTIL_TESTING_LIBS = \

        src/lib/libtor-geoip-testing.a \

	src/lib/libtor-process-testing.a \

	src/lib/libtor-time-testing.a \

	src/lib/libtor-fs-testing.a \

src/app/config/config.c

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

#include "feature/rend/rendclient.h"

#include "feature/rend/rendservice.h"

#include "feature/stats/geoip.h"

#include "lib/geoip/geoip.h"

#include "feature/stats/geoip_stats.h"

#include "feature/stats/predict_ports.h"

#include "feature/stats/rephist.h"

src/app/main/main.c

+1 −1
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ 
#include "feature/rend/rendcache.h"

#include "feature/rend/rendclient.h"

#include "feature/rend/rendservice.h"

#include "feature/stats/geoip.h"

#include "lib/geoip/geoip.h"

#include "feature/stats/geoip_stats.h"

#include "feature/stats/predict_ports.h"

#include "feature/stats/rephist.h"

src/core/include.am

+0 −2
Original line number Diff line number Diff line
@@ -117,7 +117,6 @@ LIBTOR_APP_A_SOURCES = \ 
	src/feature/rend/rendcommon.c		\

	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
@@ -350,7 +349,6 @@ noinst_HEADERS += \ 
	src/feature/rend/rendcommon.h			\

	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