1 files changed, 57 insertions, 16 deletions

diff --git a/Makefile b/Makefile
index 6f9a82b..2587b62 100644
--- a/Makefile
+++ b/Makefile
@@ -18,15 +18,24 @@ LIBOWFAT_LIBRARY=$(PREFIX)/libowfat
 BINDIR?=$(PREFIX)/bin
 STRIP?=strip
 
-#FEATURES+=-DWAND_V4_ONLY
+#FEATURES+=-DWANT_V4_ONLY
 #FEATURES+=-DWANT_ACCESSLIST_BLACK
 #FEATURES+=-DWANT_ACCESSLIST_WHITE
 #FEATURES+=-DWANT_DYNAMIC_ACCESSLIST
 
 #FEATURES+=-DWANT_SYNC_LIVE
 #FEATURES+=-DWANT_IP_FROM_QUERY_STRING
-FEATURES+=-DWANT_COMPRESSION_GZIP
-FEATURES+=-DWANT_COMPRESSION_GZIP_ALWAYS
+
+# If you want gzip support to be compiled in, uncomment the next include.
+# You can further modify the behaviour by setting DWANT_COMPRESSION_GZIP_ALWAYS
+# in Makefile.gzip
+include Makefile.gzip
+
+# If you want zstd support to be compiled in, uncomment the next include.
+# You can further modify the behaviour by setting DWANT_COMPRESSION_ZSTD_ALWAYS
+# in Makefile.zstd
+#include Makefile.zstd
+
 #FEATURES+=-DWANT_LOG_NETWORKS
 #FEATURES+=-DWANT_RESTRICT_STATS
 #FEATURES+=-DWANT_IP_FROM_PROXY
@@ -42,37 +51,42 @@ FEATURES+=-DWANT_FULLSCRAPE
 # full scrape transfer, if you rely on an older versions, enable this flag
 #FEATURES+=-DWANT_NO_AUTO_FREE
 
-# Is enabled on BSD systems by default in trackerlogic.h
-# on Linux systems you will need -lbds
-#FEATURES+=-DWANT_ARC4RANDOM
+# opentracker takes its randomness from arc4random, which is part of libc on
+# the BSDs, on macOS and on glibc 2.36 and newer. On an older glibc or on musl
+# it comes from libbsd instead, so uncomment the next include to link it.
+#LDFLAGS+=-lbsd
 
 #FEATURES+=-D_DEBUG_HTTPERROR
 #FEATURES+=-D_DEBUG_RANDOMTORRENTS
 
+GIT_VERSION=`sh -c 'command -v git >/dev/null && test -d .git && git rev-parse HEAD || echo _git_or_commit_not_found_'`
+
 OPTS_debug=-D_DEBUG -g -ggdb # -pg -fprofile-arcs -ftest-coverage
 OPTS_production=-O3
 
-CFLAGS+=-I$(LIBOWFAT_HEADERS) -Wall -pipe -pthread -Wextra #-ansi -pedantic
-LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -pthread -lz
-#LDFLAGS+=-lbsd
+CFLAGS+=-I$(LIBOWFAT_HEADERS) -DGIT_VERSION=$(GIT_VERSION) -Wall -pipe -pthread -Wextra #-ansi -pedantic
+LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -pthread
 
 BINARY =opentracker
-HEADERS=trackerlogic.h scan_urlencoded_query.h ot_mutex.h ot_stats.h ot_vector.h ot_clean.h ot_udp.h ot_iovec.h ot_fullscrape.h ot_accesslist.h ot_http.h ot_livesync.h ot_rijndael.h
-SOURCES=opentracker.c trackerlogic.c scan_urlencoded_query.c ot_mutex.c ot_stats.c ot_vector.c ot_clean.c ot_udp.c ot_iovec.c ot_fullscrape.c ot_accesslist.c ot_http.c ot_livesync.c ot_rijndael.c
-SOURCES_proxy=proxy.c ot_vector.c ot_mutex.c
+HEADERS=trackerlogic.h scan_urlencoded_query.h ot_buf.h ot_hex.h ot_ip.h ot_scan.h ot_socket.h ot_mutex.h ot_random.h ot_stats.h ot_vector.h ot_clean.h ot_udp.h ot_iovec.h ot_fullscrape.h ot_accesslist.h ot_http.h ot_livesync.h ot_rijndael.h
+SOURCES=opentracker.c trackerlogic.c scan_urlencoded_query.c ot_buf.c ot_hex.c ot_ip.c ot_scan.c ot_socket.c ot_mutex.c ot_random.c ot_stats.c ot_vector.c ot_clean.c ot_udp.c ot_iovec.c ot_fullscrape.c ot_accesslist.c ot_http.c ot_livesync.c ot_rijndael.c
+SOURCES_proxy=proxy.c ot_vector.c ot_mutex.c ot_random.c ot_scan.c ot_ip.c ot_socket.c
 
 OBJECTS = $(SOURCES:%.c=%.o)
 OBJECTS_debug = $(SOURCES:%.c=%.debug.o)
-OBJECTS_proxy = $(SOURCES_proxy:%.c=%.o)
-OBJECTS_proxy_debug = $(SOURCES_proxy:%.c=%.debug.o)
+OBJECTS_proxy = $(SOURCES_proxy:%.c=%.proxy.o)
+OBJECTS_proxy_debug = $(SOURCES_proxy:%.c=%.proxy.debug.o)
 
-.SUFFIXES: .debug.o .o .c
+.SUFFIXES: .proxy.debug.o .proxy.o .debug.o .o .c
 
 all: $(BINARY) $(BINARY).debug
 
 CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
 CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
 
+CFLAGS_proxy = $(CFLAGS_production) -DWANT_SYNC_LIVE
+CFLAGS_proxy_debug = $(CFLAGS_debug) -DWANT_SYNC_LIVE
+
 $(BINARY): $(OBJECTS) $(HEADERS)
         $(CC) -o $@ $(OBJECTS) $(LDFLAGS)
         $(STRIP) $@
@@ -83,14 +97,41 @@ proxy: $(OBJECTS_proxy) $(HEADERS)
 proxy.debug: $(OBJECTS_proxy_debug) $(HEADERS)
         $(CC) -o $@ $(OBJECTS_proxy_debug) $(LDFLAGS)
 
+.c.proxy.debug.o : $(HEADERS)
+        $(CC) -c -o $@ $(CFLAGS_proxy_debug) $(<:.proxy.debug.o=.c)
+
+.c.proxy.o : $(HEADERS)
+        $(CC) -c -o $@ $(CFLAGS_proxy) $(<:.proxy.o=.c)
+
 .c.debug.o : $(HEADERS)
         $(CC) -c -o $@ $(CFLAGS_debug) $(<:.debug.o=.c)
 
 .c.o : $(HEADERS)
         $(CC) -c -o $@ $(CFLAGS_production) $<
 
+# Unit tests. The modules under test are compiled straight into the test
+# binary, so a test may reach a static function by including the source if it
+# has to. tests/stubs.c supplies the few symbols those modules reference but
+# the tests never reach.
+TESTBIN=tests/runner
+TEST_SOURCES=tests/runner.c tests/test.c tests/stubs.c tests/t_scan_urlencoded_query.c tests/t_iovec.c tests/t_vector.c tests/t_random.c tests/t_hex.c tests/t_accesslist.c tests/t_scan.c tests/t_buf.c tests/t_ip.c tests/t_socket.c
+TEST_UNITS=scan_urlencoded_query.c ot_buf.c ot_ip.c ot_socket.c ot_iovec.c ot_vector.c ot_random.c ot_hex.c ot_scan.c ot_accesslist.c
+TEST_HEADERS=tests/test.h $(HEADERS)
+# Tests reach code that sits behind feature flags, so the units under test are
+# built with those features enabled. A test binary is not a production binary.
+FEATURES_test=$(FEATURES) -DWANT_ACCESSLIST_BLACK -DWANT_SYNC_LIVE
+CFLAGS_test = $(CFLAGS) -I. -g -O1 $(FEATURES_test)
+
+$(TESTBIN): $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS)
+        $(CC) -o $@ $(CFLAGS_test) $(TEST_SOURCES) $(TEST_UNITS)
+
+check: $(TESTBIN)
+        ./$(TESTBIN)
+
+.PHONY: all check clean install
+
 clean:
-        rm -rf opentracker opentracker.debug *.o *~
+        rm -rf opentracker opentracker.debug proxy proxy.debug $(TESTBIN) *.o *~
 
 install:
         install -m 755 opentracker $(DESTDIR)$(BINDIR)