90 files changed, 352 insertions, 417 deletions

diff --git a/DESIGN b/DESIGN
index ff37706..f058fe0 100644
--- a/DESIGN
+++ b/DESIGN
@@ -16,7 +16,7 @@ A connection carries one request and closes. Keep-alive works and is rarely
 asked for.
 
 Statistics are approximate on purpose. Counters are per thread and summed
-when read, so a /stats read can under-report once. Nothing drifts.
+when read, so a /stats read can under-report once.
 
 
 Decisions
@@ -60,9 +60,44 @@ connections, the filter serves more requests than no filter, not fewer, so it
 is not the denial of service vector that FreeBSD-SA-02:26 once described.
 
 
+The torrent table is split into 2^OT_BUCKET_COUNT_BITS buckets, 1024 by
+default, set from the Makefile. Inserting a torrent opens a slot in a sorted
+vector, so the bytes moved grow with the bucket's occupancy. Insert cost per
+torrent, Linux:
+
+                2^10     2^12     2^14     2^16
+  200k        466 ns            439 ns
+  1M          834 ns   579 ns   529 ns
+  4M         2348 ns  1163 ns   770 ns   674 ns
+
+Re-announcing an existing torrent moves by under ten per cent over the same
+range, so the cost is paid while the torrent population is built and not in
+steady state. Below a few hundred thousand torrents there is nothing to win.
+2^14 captures most of the gain for two per cent more resident memory.
+
+The cleaner's wake rate does not follow the bucket count. A cap of ten wakes
+a second sets the sleep, and a wake cleans as many buckets as it must to
+finish a sweep in OT_CLEAN_INTERVAL_MINUTES. At the default bucket count that
+is one bucket every 117 ms.
+
+
 Paths not taken
 ---------------
 
+A keyed hash for the bucket index. Info hashes are SHA-1 output and already
+uniform, so it changes no distribution. It would buy resistance to deliberate
+bucket flooding and cost the ordering a full scrape depends on: buckets are
+ordered by hash prefix and sorted within, so walking them emits the sorted
+dictionary bencode wants, with no sort and no copy.
+
+Cache line padding for the per-bucket locks and vector headers. The
+contention it was meant to remove is not there. On glibc, where a 48-byte
+mutex straddles a line, padding gains 3 to 8 per cent, but gains as much at
+one thread where no false sharing can exist, and scaling from one to eight
+threads is identical either way. On FreeBSD, where eight 8-byte mutexes share
+a line and the risk should be highest, padding is 15 per cent slower at one
+thread and neutral to 6 per cent slower at four and eight.
+
 accf_http, the HTTP-aware accept filter. It duplicates a parser the tracker
 has anyway, puts more kernel code in the path, and holds a connection that
 sends "GET /" and stops, which accf_data hands straight over.
@@ -79,8 +114,6 @@ A directory for object files. bmake has no pattern rules and the Makefile
 builds under FreeBSD's make today. Building each binary in one invocation
 clears the objects out of the tree without giving that up.
 
-A src/ directory. 52 files sharing an ot_ prefix are a module list rather
-than clutter, and build output was most of what made the tree look crowded.
 
 
 Platform differences that cost us code
diff --git a/Makefile b/Makefile
index a665890..d2e0c2d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,6 @@
-# $Id$
-
-PREFIX?=..
+PREFIX?=/usr/local
 BINDIR?=$(PREFIX)/bin
+MANDIR?=$(PREFIX)/share/man
 STRIP?=strip
 
 #FEATURES+=-DWANT_V4_ONLY
@@ -12,16 +11,6 @@ STRIP?=strip
 #FEATURES+=-DWANT_SYNC_LIVE
 #FEATURES+=-DWANT_IP_FROM_QUERY_STRING
 
-# 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_RESTRICT_STATS
 #FEATURES+=-DWANT_IP_FROM_PROXY
 #FEATURES+=-DWANT_LOG_NUMWANT
@@ -31,155 +20,71 @@ include Makefile.gzip
 #FEATURES+=-DWANT_DEV_RANDOM
 FEATURES+=-DWANT_FULLSCRAPE
 
-# 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
+# Buckets the torrent table is split into, as a power of two, 8 to 16. More
+# buckets make inserting a new torrent cheaper and cost memory, which is worth
+# it for a tracker carrying millions of torrents and not for one carrying
+# thousands. DESIGN has the measurements.
+FEATURES+=-DOT_BUCKET_COUNT_BITS=10
 
 #FEATURES+=-D_DEBUG_HTTPERROR
 #FEATURES+=-D_DEBUG_RANDOMTORRENTS
 
-VERSION=1.0.0
-TARBALL_VERSION=test -r .tarball-version && read v < .tarball-version && echo "$$v"
-HAVE_GIT=command -v git >/dev/null && test -d .git
-GIT_VERSION=`sh -c '$(TARBALL_VERSION) || { $(HAVE_GIT) && git describe --tags --match "v*" --always --dirty 2>/dev/null; }'`
-OT_TAG=`sh -c '$(TARBALL_VERSION) || { $(HAVE_GIT) && git describe --tags --match "v*" --exact-match 2>/dev/null; }'`
+# Compression support, off unless included. Each file carries a second switch
+# to compress even where the client did not ask.
+include Mk/gzip.mk
+#include Mk/zstd.mk
 
-OPTS_debug=-D_DEBUG -g -ggdb # -pg -fprofile-arcs -ftest-coverage
-OPTS_production=-O3
+# arc4random 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.
+#OT_LDLIBS+=-lbsd
 
-CFLAGS+=-DOT_VERSION=\"$(VERSION)\" -DGIT_VERSION=\"$(GIT_VERSION)\" -DOT_TAG=\"$(OT_TAG)\" -Wall -pipe -pthread -Wextra -Wwrite-strings #-ansi -pedantic
-LDFLAGS+=-pthread
+CFLAGS?=-O3
 
-# Record feature flags as a dep to allow rebuild when they change
-BUILDSTAMP=.buildstamp
-BUILDDEPS=Makefile $(BUILDSTAMP)
+OT_CFLAGS+=-Wall -Wextra -Wwrite-strings -pipe -pthread
+OT_LDFLAGS+=-pthread
 
-$(BUILDSTAMP): FORCE
-        @echo "$(CFLAGS) $(FEATURES) $(LDFLAGS)" | cmp -s - $@ 2>/dev/null || echo "$(CFLAGS) $(FEATURES) $(LDFLAGS)" > $@
+OPTS_debug=-D_DEBUG -g -ggdb
 
-FORCE:
+COMPILE=$(CPPFLAGS) $(OT_CFLAGS) $(FEATURES)
+LINK=$(LDFLAGS) $(OT_LDFLAGS) $(LDLIBS) $(OT_LDLIBS)
 
-BINARY =opentracker
-HEADERS=trackerlogic.h ot_urlencoded.h ot_batch.h ot_buf.h ot_event.h ot_fdstate.h ot_fmt.h ot_hex.h ot_ip.h ot_config.h ot_scan.h ot_socket.h ot_tcp.h ot_worker.h ot_workqueue.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 ot_urlencoded.c ot_batch.c ot_buf.c ot_event.c ot_fdstate.c ot_fmt.c ot_hex.c ot_ip.c ot_config.c ot_scan.c ot_socket.c ot_tcp.c ot_worker.c ot_workqueue.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
+BINARY=opentracker
+HEADERS=src/trackerlogic.h src/ot_urlencoded.h src/ot_batch.h src/ot_buf.h src/ot_event.h src/ot_fdstate.h src/ot_fmt.h src/ot_hex.h src/ot_ip.h src/ot_config.h src/ot_scan.h src/ot_socket.h src/ot_tcp.h src/ot_worker.h src/ot_workqueue.h src/ot_mutex.h src/ot_random.h src/ot_stats.h src/ot_vector.h src/ot_clean.h src/ot_udp.h src/ot_iovec.h src/ot_fullscrape.h src/ot_accesslist.h src/ot_http.h src/ot_livesync.h src/ot_rijndael.h
+SOURCES=src/opentracker.c src/trackerlogic.c src/ot_urlencoded.c src/ot_batch.c src/ot_buf.c src/ot_event.c src/ot_fdstate.c src/ot_fmt.c src/ot_hex.c src/ot_ip.c src/ot_config.c src/ot_scan.c src/ot_socket.c src/ot_tcp.c src/ot_worker.c src/ot_workqueue.c src/ot_mutex.c src/ot_random.c src/ot_stats.c src/ot_vector.c src/ot_clean.c src/ot_udp.c src/ot_iovec.c src/ot_fullscrape.c src/ot_accesslist.c src/ot_http.c src/ot_livesync.c src/ot_rijndael.c
+BINARIES=$(BINARY) $(BINARY).debug
 
-all: $(BINARY) $(BINARY).debug
+# Everything is built in one go from sources, so there are no object files to
+# carry a flag change over into the next build. The stamp holds the flags the
+# last build used, which covers FEATURES passed in the environment and a moved
+# HEAD. It is only written when they differ.
+BUILDSTAMP=.buildstamp
+BUILDDEPS=Makefile $(BUILDSTAMP)
 
-CFLAGS_production = $(CFLAGS) $(OPTS_production) $(FEATURES)
-CFLAGS_debug = $(CFLAGS) $(OPTS_debug) $(FEATURES)
+all: $(BINARY) $(BINARY).debug
 
 $(BINARY): $(SOURCES) $(HEADERS) $(BUILDDEPS)
-        $(CC) -o $@ $(CFLAGS_production) $(SOURCES) $(LDFLAGS)
+        $(CC) -o $@ $(CFLAGS) $(COMPILE) $(SOURCES) $(LINK)
         $(STRIP) $@
-$(BINARY).debug: $(SOURCES) $(HEADERS) $(BUILDDEPS)
-        $(CC) -o $@ $(CFLAGS_debug) $(SOURCES) $(LDFLAGS)
-
-# The proxy is out of service
-#
-# SOURCES_proxy=proxy.c ot_batch.c ot_fdstate.c ot_vector.c ot_mutex.c ot_random.c ot_scan.c ot_ip.c ot_socket.c
-# CFLAGS_proxy = $(CFLAGS_production) -DWANT_SYNC_LIVE
-# CFLAGS_proxy_debug = $(CFLAGS_debug) -DWANT_SYNC_LIVE
-#
-# proxy: $(SOURCES_proxy) $(HEADERS) $(BUILDDEPS)
-#       $(CC) -o $@ $(CFLAGS_proxy) $(SOURCES_proxy) $(LDFLAGS)
-# proxy.debug: $(SOURCES_proxy) $(HEADERS) $(BUILDDEPS)
-#       $(CC) -o $@ $(CFLAGS_proxy_debug) $(SOURCES_proxy) $(LDFLAGS)
-
-# 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_urlencoded.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 tests/t_mutex.c tests/t_trackerlogic.c tests/t_workqueue.c tests/t_batch.c tests/t_fdstate.c tests/t_event.c tests/t_fmt.c
-TEST_UNITS=ot_urlencoded.c ot_fmt.c ot_event.c ot_batch.c ot_fdstate.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 ot_mutex.c ot_workqueue.c trackerlogic.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) $(BUILDDEPS)
-        $(CC) -o $@ $(CFLAGS_test) $(TEST_SOURCES) $(TEST_UNITS)
-
-check: $(TESTBIN) $(BINARY)
-        ./$(TESTBIN)
 
-$(TESTBIN).poll: $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS) $(BUILDDEPS)
-        $(CC) -o $@ $(CFLAGS_test) -DOT_EVENT_FORCE_POLL $(TEST_SOURCES) $(TEST_UNITS)
-
-check-poll: $(TESTBIN).poll
-        ./$(TESTBIN).poll ot_event
-
-# The same unit tests under the sanitizers. Use clang over $(CC) because the
-# two toolchains do not check the same things
-# Override CC_sanitize to use another compiler.
-CC_sanitize?=clang
-CFLAGS_sanitize=$(CFLAGS_test) -fsanitize=address,undefined -fno-omit-frame-pointer
-LDFLAGS_sanitize=$(LDFLAGS) -fsanitize=address,undefined
-
-$(TESTBIN).sanitize: $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS) $(BUILDDEPS)
-        $(CC_sanitize) -o $@ $(CFLAGS_sanitize) $(TEST_SOURCES) $(TEST_UNITS) $(LDFLAGS_sanitize)
-
-check-sanitize: $(TESTBIN).sanitize
-        ./$(TESTBIN).sanitize
-
-# Black box tests: these drive the real binary over the wire, so they cover
-# the event loop and the parsers working together, which the unit tests
-# cannot reach. Built with the sanitizers on, so the tracker reports its own
-# memory errors and the harness turns those into failures.
-PYTHON?=python3
-# The client timeout is cut right down so that tests can reach the expiry
-# sweep. tests/integration/test_expiry.py mirrors these two numbers.
-FEATURES_integration=$(FEATURES) -DWANT_IP_FROM_QUERY_STRING -DWANT_ACCESSLIST_BLACK -DWANT_DYNAMIC_ACCESSLIST -DWANT_KEEPALIVE -DOT_CLIENT_TIMEOUT=5 -DOT_CLIENT_TIMEOUT_CHECKINTERVAL=1
-CFLAGS_integration=$(CFLAGS) $(OPTS_debug) $(FEATURES_integration) -fsanitize=address,undefined -fno-omit-frame-pointer
-LDFLAGS_integration=$(LDFLAGS) -fsanitize=address,undefined
-
-opentracker.integration: $(SOURCES) $(HEADERS) $(BUILDDEPS)
-        $(CC) -o $@ $(CFLAGS_integration) $(SOURCES) $(LDFLAGS_integration)
-
-check-integration: opentracker.integration
-        OPENTRACKER=./opentracker.integration $(PYTHON) -m unittest discover -s tests/integration
-
-# The same black box tests against a ThreadSanitizer build
-CFLAGS_tsan=$(CFLAGS) $(OPTS_debug) $(FEATURES_integration) -fsanitize=thread -fno-omit-frame-pointer
-LDFLAGS_tsan=$(LDFLAGS) -fsanitize=thread
-
-opentracker.tsan: $(SOURCES) $(HEADERS) $(BUILDDEPS)
-        $(CC) -o $@ $(CFLAGS_tsan) $(SOURCES) $(LDFLAGS_tsan)
-
-check-tsan: opentracker.tsan
-        OPENTRACKER=./opentracker.tsan $(PYTHON) -m unittest discover -s tests/integration
-
-# Everything, cheapest first, so a quick failure comes back quickly.
-check-all:
-        $(MAKE) check
-        $(MAKE) check-poll
-        $(MAKE) check-sanitize
-        $(MAKE) check-integration
-        $(MAKE) check-tsan
-
-.PHONY: all FORCE dist check check-poll check-sanitize check-integration check-tsan check-all clean install
+$(BINARY).debug: $(SOURCES) $(HEADERS) $(BUILDDEPS)
+        $(CC) -o $@ $(OPTS_debug) $(COMPILE) $(SOURCES) $(LINK)
 
-BINARIES=opentracker opentracker.debug opentracker.integration opentracker.tsan $(TESTBIN) $(TESTBIN).sanitize $(TESTBIN).poll
+$(BUILDSTAMP): FORCE
+        @echo "$(CFLAGS) $(COMPILE) $(LINK)" | cmp -s - $@ 2>/dev/null || echo "$(CFLAGS) $(COMPILE) $(LINK)" > $@
 
 clean:
-        rm -rf $(BINARIES) $(BINARIES:=.dSYM) $(BUILDSTAMP) *.o *~
+        rm -rf $(BINARIES) $(BINARIES:=.dSYM) $(BUILDSTAMP) *.o *~ src/*.o src/*~
 
-install:
-        install -m 755 opentracker $(DESTDIR)$(BINDIR)
+install: $(BINARY)
+        install -d $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1 $(DESTDIR)$(MANDIR)/man5
+        install -m 755 $(BINARY) $(DESTDIR)$(BINDIR)
+        install -m 644 man1/opentracker.1 $(DESTDIR)$(MANDIR)/man1
+        install -m 644 man5/opentracker.conf.5 $(DESTDIR)$(MANDIR)/man5
+
+FORCE:
 
-# Roll a release: tag it v<something>, then make dist. The commit is written
-# into the tarball, so a build from it reports the same version this checkout
-# would, without a git to ask. The tarball is HEAD by construction, so the
-# working tree it was rolled from does not enter into the version.
-DISTNAME=opentracker-$(VERSION)
+.PHONY: all clean install FORCE
 
-dist:
-        @test "`git describe --tags --match 'v*' --exact-match 2>/dev/null`" = "v$(VERSION)" || \
-                { echo "HEAD must carry the tag v$(VERSION). Tag the release, or correct VERSION."; exit 1; }
-        rm -rf $(DISTNAME) $(DISTNAME).tar.gz
-        git archive --format=tar --prefix=$(DISTNAME)/ HEAD | tar -xf -
-        git describe --tags --match "v*" --always > $(DISTNAME)/.tarball-version
-        tar -czf $(DISTNAME).tar.gz $(DISTNAME)
-        rm -rf $(DISTNAME)
+include Mk/tests.mk
+include Mk/release.mk
+include Mk/proxy.mk
diff --git a/Makefile.gzip b/Mk/gzip.mk
index 70d6d62..3ae53b3 100644
--- a/Makefile.gzip
+++ b/Mk/gzip.mk
@@ -1,4 +1,4 @@
 FEATURES+=-DWANT_COMPRESSION_GZIP
 #FEATURES+=-DWANT_COMPRESSION_GZIP_ALWAYS
 
-LDFLAGS+=-lz
+OT_LDLIBS+=-lz
diff --git a/Mk/proxy.mk b/Mk/proxy.mk
new file mode 100644
index 0000000..64d18dc
--- /dev/null
+++ b/Mk/proxy.mk
@@ -0,0 +1,25 @@
+# The proxy relays sync traffic between trackers and between multicast domains
+# that cannot reach each other. It does not build; see the note at the top of
+# proxy.c. Scheduled for v1.1.0, when these rules come back.
+#
+# LIBOWFAT_HEADERS=$(PREFIX)/libowfat
+# LIBOWFAT_LIBRARY=$(PREFIX)/libowfat
+# CFLAGS_libowfat=-I$(LIBOWFAT_HEADERS)
+# LDFLAGS_libowfat=-L$(LIBOWFAT_LIBRARY) -lowfat
+#
+# SOURCES_proxy=src/proxy.c src/ot_batch.c src/ot_fdstate.c src/ot_vector.c src/ot_mutex.c src/ot_random.c src/ot_scan.c src/ot_ip.c src/ot_socket.c
+# CFLAGS_proxy=$(CFLAGS_production) $(CFLAGS_libowfat) -DWANT_SYNC_LIVE
+# CFLAGS_proxy_debug=$(CFLAGS_debug) $(CFLAGS_libowfat) -DWANT_SYNC_LIVE
+#
+# BINARIES+=proxy proxy.debug
+#
+# proxy: $(SOURCES_proxy) $(HEADERS) $(BUILDDEPS)
+#       $(CC) -o $@ $(CFLAGS_proxy) $(SOURCES_proxy) $(LDFLAGS) $(LDFLAGS_libowfat)
+# proxy.debug: $(SOURCES_proxy) $(HEADERS) $(BUILDDEPS)
+#       $(CC) -o $@ $(CFLAGS_proxy_debug) $(SOURCES_proxy) $(LDFLAGS) $(LDFLAGS_libowfat)
+
+proxy proxy.debug:
+        @echo "$@ is out of service until v1.1.0, see the note at the top of proxy.c"
+        @false
+
+.PHONY: proxy proxy.debug
diff --git a/Mk/release.mk b/Mk/release.mk
new file mode 100644
index 0000000..5c4afe9
--- /dev/null
+++ b/Mk/release.mk
@@ -0,0 +1,27 @@
+# .tarball-version is what dist wrote into the tarball
+# In a checkout it is absent and git answers instead. A release is always
+# tagged, so in a tarball both of these are that tag, and the gitweb link
+# is to it. Between releases there is no tag and the version is the commit.
+VERSION=1.0.0
+
+TARBALL_VERSION=test -r .tarball-version && read v < .tarball-version && echo "$$v"
+HAVE_GIT=command -v git >/dev/null && test -d .git
+GIT_VERSION=`sh -c '$(TARBALL_VERSION) || { $(HAVE_GIT) && git describe --tags --match "v*" --always --dirty 2>/dev/null; }'`
+OT_TAG=`sh -c '$(TARBALL_VERSION) || { $(HAVE_GIT) && git describe --tags --match "v*" --exact-match 2>/dev/null; }'`
+
+OT_CFLAGS+=-DOT_VERSION=\"$(VERSION)\" -DGIT_VERSION=\"$(GIT_VERSION)\" -DOT_TAG=\"$(OT_TAG)\"
+
+# Roll a release: tag it v$(VERSION), then make dist. The tarball is HEAD by
+# construction, so the working tree it was rolled from does not enter into it.
+DISTNAME=opentracker-$(VERSION)
+
+dist:
+        @test "`git describe --tags --match 'v*' --exact-match 2>/dev/null`" = "v$(VERSION)" || \
+                { echo "HEAD must carry the tag v$(VERSION). Tag the release, or correct VERSION."; exit 1; }
+        rm -rf $(DISTNAME) $(DISTNAME).tar.gz
+        git archive --format=tar --prefix=$(DISTNAME)/ HEAD | tar -xf -
+        git describe --tags --match "v*" --always > $(DISTNAME)/.tarball-version
+        tar -czf $(DISTNAME).tar.gz $(DISTNAME)
+        rm -rf $(DISTNAME)
+
+.PHONY: dist
diff --git a/Mk/tests.mk b/Mk/tests.mk
new file mode 100644
index 0000000..46f308b
--- /dev/null
+++ b/Mk/tests.mk
@@ -0,0 +1,72 @@
+BUILDDEPS+=Mk/tests.mk
+
+# The modules under test are compiled straight into the test binary, so a test
+# may reach a static function by including the source. 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_urlencoded.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 tests/t_mutex.c tests/t_trackerlogic.c tests/t_workqueue.c tests/t_batch.c tests/t_fdstate.c tests/t_event.c tests/t_fmt.c
+TEST_UNITS=src/ot_urlencoded.c src/ot_fmt.c src/ot_event.c src/ot_batch.c src/ot_fdstate.c src/ot_buf.c src/ot_ip.c src/ot_socket.c src/ot_iovec.c src/ot_vector.c src/ot_random.c src/ot_hex.c src/ot_scan.c src/ot_accesslist.c src/ot_mutex.c src/ot_workqueue.c src/trackerlogic.c
+TEST_HEADERS=tests/test.h $(HEADERS)
+
+# A test binary is not a production binary, so it is built with the features
+# the tests need to reach.
+FEATURES_test=$(FEATURES) -DWANT_ACCESSLIST_BLACK -DWANT_SYNC_LIVE
+CFLAGS_test=-Isrc -g -O1 $(CPPFLAGS) $(OT_CFLAGS) $(FEATURES_test)
+
+# clang over $(CC) because the two toolchains do not check the same things.
+CC_sanitize?=clang
+CFLAGS_sanitize=$(CFLAGS_test) -fsanitize=address,undefined -fno-omit-frame-pointer
+LDFLAGS_sanitize=$(LINK) -fsanitize=address,undefined
+
+# Black box tests drive the real binary over the wire, so they cover the event
+# loop and the parsers working together. The client timeout is cut right down
+# so a test can reach the expiry sweep; tests/integration/test_expiry.py
+# mirrors these two numbers.
+PYTHON?=python3
+FEATURES_integration=$(FEATURES) -DWANT_IP_FROM_QUERY_STRING -DWANT_ACCESSLIST_BLACK -DWANT_DYNAMIC_ACCESSLIST -DWANT_KEEPALIVE -DOT_CLIENT_TIMEOUT=5 -DOT_CLIENT_TIMEOUT_CHECKINTERVAL=1
+CFLAGS_integration=$(OPTS_debug) $(CPPFLAGS) $(OT_CFLAGS) $(FEATURES_integration) -fsanitize=address,undefined -fno-omit-frame-pointer
+LDFLAGS_integration=$(LINK) -fsanitize=address,undefined
+CFLAGS_tsan=$(OPTS_debug) $(CPPFLAGS) $(OT_CFLAGS) $(FEATURES_integration) -fsanitize=thread -fno-omit-frame-pointer
+LDFLAGS_tsan=$(LINK) -fsanitize=thread
+
+BINARIES+=$(TESTBIN) $(TESTBIN).poll $(TESTBIN).sanitize opentracker.integration opentracker.tsan
+
+$(TESTBIN): $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS) $(BUILDDEPS)
+        $(CC) -o $@ $(CFLAGS_test) $(TEST_SOURCES) $(TEST_UNITS)
+
+$(TESTBIN).poll: $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS) $(BUILDDEPS)
+        $(CC) -o $@ $(CFLAGS_test) -DOT_EVENT_FORCE_POLL $(TEST_SOURCES) $(TEST_UNITS)
+
+$(TESTBIN).sanitize: $(TEST_SOURCES) $(TEST_UNITS) $(TEST_HEADERS) $(BUILDDEPS)
+        $(CC_sanitize) -o $@ $(CFLAGS_sanitize) $(TEST_SOURCES) $(TEST_UNITS) $(LDFLAGS_sanitize)
+
+opentracker.integration: $(SOURCES) $(HEADERS) $(BUILDDEPS)
+        $(CC) -o $@ $(CFLAGS_integration) $(SOURCES) $(LDFLAGS_integration)
+
+opentracker.tsan: $(SOURCES) $(HEADERS) $(BUILDDEPS)
+        $(CC) -o $@ $(CFLAGS_tsan) $(SOURCES) $(LDFLAGS_tsan)
+
+check: $(TESTBIN) $(BINARY)
+        ./$(TESTBIN)
+
+check-poll: $(TESTBIN).poll
+        ./$(TESTBIN).poll ot_event
+
+check-sanitize: $(TESTBIN).sanitize
+        ./$(TESTBIN).sanitize
+
+check-integration: opentracker.integration
+        OPENTRACKER=./opentracker.integration $(PYTHON) -m unittest discover -s tests/integration
+
+check-tsan: opentracker.tsan
+        OPENTRACKER=./opentracker.tsan $(PYTHON) -m unittest discover -s tests/integration
+
+# Cheapest first, so a quick failure comes back quickly.
+check-all:
+        $(MAKE) check
+        $(MAKE) check-poll
+        $(MAKE) check-sanitize
+        $(MAKE) check-integration
+        $(MAKE) check-tsan
+
+.PHONY: check check-poll check-sanitize check-integration check-tsan check-all
diff --git a/Makefile.zstd b/Mk/zstd.mk
index 2bb56be..8c1fc40 100644
--- a/Makefile.zstd
+++ b/Mk/zstd.mk
@@ -1,3 +1,3 @@
 FEATURES+=-DWANT_COMPRESSION_ZSTD
 #FEATURES+=-DWANT_COMPRESSION_ZSTD_ALWAYS
-LDFLAGS+=-lzstd
+OT_LDLIBS+=-lzstd
diff --git a/README_v6 b/README_v6
deleted file mode 100644
index 7fac79a..0000000
--- a/README_v6
+++ /dev/null
@@ -1 +0,0 @@
-IPv6 is implemented in opentracker now. You can chose whether your tracker runs in v4 or v6 mode in Makefile. YMMV.
diff --git a/man1/opentracker.1 b/man1/opentracker.1
index 489a54c..897584f 100644
--- a/man1/opentracker.1
+++ b/man1/opentracker.1
@@ -26,7 +26,7 @@ interfaces. The recommended way to configure opentracker is by providing a
 config file using the
 .Op Fl f Ar config
 option. See
-.Xr opentracker.conf 4
+.Xr opentracker.conf 5
 for details.
 .Pp
 .Sh OPTIONS
@@ -35,7 +35,7 @@ The following options are available:
 .It Fl f Ar config
 Parse a config file with a list of options. Consecutive command options
 will override options from the config file. See
-.Xr opentracker.conf 4
+.Xr opentracker.conf 5
 for details.
 .It Fl i Ar ip-select
 Select an ip address that will be used with the next
@@ -113,7 +113,7 @@ The
 config file.
 .El
 .Sh SEE ALSO
-.Xr opentracker.conf 4
+.Xr opentracker.conf 5
 .Pp
 opentracker documentation
 .Lk https://erdgeist.org/arts/software/opentracker
diff --git a/man4/opentracker.conf.4 b/man5/opentracker.conf.5
index 239ab88..67e624f 100644
--- a/man4/opentracker.conf.4
+++ b/man5/opentracker.conf.5
@@ -1,5 +1,5 @@
 .Dd 2026-10-28
-.Dt opentracker.conf 4
+.Dt opentracker.conf 5
 .Os Unix
 .Sh NAME
 .Nm opentracker.conf
diff --git a/ot_clean.h b/ot_clean.h
deleted file mode 100644
index 1484d82..0000000
--- a/ot_clean.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
-
-#ifndef OT_CLEAN_H__
-#define OT_CLEAN_H__
-
-#include "trackerlogic.h"
-
-/* The amount of time a clean cycle should take */
-#define OT_CLEAN_INTERVAL_MINUTES 2
-
-/* So after each bucket wait 1 / OT_BUCKET_COUNT intervals */
-#define OT_CLEAN_SLEEP            (((OT_CLEAN_INTERVAL_MINUTES) * 60 * 1000000) / (OT_BUCKET_COUNT))
-
-void clean_init(void);
-void clean_deinit(void);
-int  clean_single_torrent(ot_torrent *torrent);
-
-#endif
diff --git a/opentracker.c b/src/opentracker.c
index 644e99c..14b817e 100644
--- a/opentracker.c
+++ b/src/opentracker.c
@@ -1,8 +1,6 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
    It is considered beerware. Prost. Skol. Cheers or whatever.
-   Some of the stuff below is stolen from Fefes example libowfat httpd.
-
-   $Id$ */
+   Some of the stuff below is stolen from Fefes example libowfat httpd. */
 
 /* System */
 #include <ctype.h>
diff --git a/ot_accesslist.c b/src/ot_accesslist.c
index 945ddcf..86f9a7d 100644
--- a/ot_accesslist.c
+++ b/src/ot_accesslist.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <pthread.h>
diff --git a/ot_accesslist.h b/src/ot_accesslist.h
index ca0e126..68c88dc 100644
--- a/ot_accesslist.h
+++ b/src/ot_accesslist.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_ACCESSLIST_H__
 #define OT_ACCESSLIST_H__
diff --git a/ot_batch.c b/src/ot_batch.c
index 84eb4a8..e4dda0b 100644
--- a/ot_batch.c
+++ b/src/ot_batch.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <errno.h>
diff --git a/ot_batch.h b/src/ot_batch.h
index c855671..910bea7 100644
--- a/ot_batch.h
+++ b/src/ot_batch.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_BATCH_H__
 #define OT_BATCH_H__
diff --git a/ot_buf.c b/src/ot_buf.c
index eb00edf..ecd3f8d 100644
--- a/ot_buf.c
+++ b/src/ot_buf.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdlib.h>
diff --git a/ot_buf.h b/src/ot_buf.h
index 219a069..7fb944e 100644
--- a/ot_buf.h
+++ b/src/ot_buf.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_BUF_H__
 #define OT_BUF_H__
diff --git a/ot_clean.c b/src/ot_clean.c
index 77ea239..f181e83 100644
--- a/ot_clean.c
+++ b/src/ot_clean.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <errno.h>
@@ -127,26 +125,34 @@ static void clean_sleep(void) {
   pthread_mutex_unlock(&g_clean_mutex);
 }
 
-/* Clean up all peers in current bucket, remove timedout pools and
- torrents */
+/* Clean up all peers in one bucket, remove timedout pools and torrents */
+static void clean_bucket(size_t bucket) {
+  ot_vector *torrents_list = mutex_bucket_lock((int)bucket);
+  size_t     toffs;
+  int        delta_torrentcount = 0;
+
+  for (toffs = 0; toffs < torrents_list->size; ++toffs) {
+    ot_torrent *torrent = ((ot_torrent *)(torrents_list->data)) + toffs;
+    if (clean_single_torrent(torrent)) {
+      vector_remove_torrent(torrents_list, torrent);
+      --delta_torrentcount;
+      --toffs;
+    }
+  }
+  mutex_bucket_unlock((int)bucket, delta_torrentcount);
+}
+
 static void *clean_worker(void *args) {
   (void)args;
   while (1) {
     size_t bucket = OT_BUCKET_COUNT;
-    while (bucket--) {
-      ot_vector *torrents_list = mutex_bucket_lock(bucket);
-      size_t     toffs;
-      int        delta_torrentcount = 0;
+    while (bucket) {
+      size_t todo = bucket < OT_CLEAN_BUCKETS_PER_WAKE ? bucket : OT_CLEAN_BUCKETS_PER_WAKE;
+
+      /* One bucket is locked at a time, however many a wake gets through */
+      while (todo--)
+        clean_bucket(--bucket);
 
-      for (toffs = 0; toffs < torrents_list->size; ++toffs) {
-        ot_torrent *torrent = ((ot_torrent *)(torrents_list->data)) + toffs;
-        if (clean_single_torrent(torrent)) {
-          vector_remove_torrent(torrents_list, torrent);
-          --delta_torrentcount;
-          --toffs;
-        }
-      }
-      mutex_bucket_unlock(bucket, delta_torrentcount);
       if (!g_opentracker_running)
         return NULL;
       clean_sleep();
diff --git a/src/ot_clean.h b/src/ot_clean.h
new file mode 100644
index 0000000..0592791
--- /dev/null
+++ b/src/ot_clean.h
@@ -0,0 +1,28 @@
+/* This software was written by Dirk Engling <erdgeist@erdgeist.org>
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
+
+#ifndef OT_CLEAN_H__
+#define OT_CLEAN_H__
+
+#include "trackerlogic.h"
+
+/* The amount of time a clean cycle should take */
+#define OT_CLEAN_INTERVAL_MINUTES 2
+
+/* How often the cleaner may wake. A full sweep takes OT_CLEAN_INTERVAL_MINUTES.
+   The clean operations per wake is goverend by OT_BUCKET_COUNT_BITS,
+   set by the Makefile.
+   At the default of 1024 buckets this works out at one bucket every
+   117 ms. */
+#define OT_CLEAN_MAX_WAKES_PER_SECOND 10
+
+#define OT_CLEAN_WAKE_BUDGET      ((OT_CLEAN_INTERVAL_MINUTES) * 60 * (OT_CLEAN_MAX_WAKES_PER_SECOND))
+#define OT_CLEAN_BUCKETS_PER_WAKE (((OT_BUCKET_COUNT) + (OT_CLEAN_WAKE_BUDGET) - 1) / (OT_CLEAN_WAKE_BUDGET))
+#define OT_CLEAN_WAKES            ((OT_BUCKET_COUNT) / (OT_CLEAN_BUCKETS_PER_WAKE))
+#define OT_CLEAN_SLEEP            (((OT_CLEAN_INTERVAL_MINUTES) * 60 * 1000000) / (OT_CLEAN_WAKES))
+
+void clean_init(void);
+void clean_deinit(void);
+int  clean_single_torrent(ot_torrent *torrent);
+
+#endif
diff --git a/ot_config.c b/src/ot_config.c
index 5da6642..95136b5 100644
--- a/ot_config.c
+++ b/src/ot_config.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <ctype.h>
diff --git a/ot_config.h b/src/ot_config.h
index 059573a..79187ee 100644
--- a/ot_config.h
+++ b/src/ot_config.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_CONFIG_H__
 #define OT_CONFIG_H__
diff --git a/ot_event.c b/src/ot_event.c
index 61cc07b..6062f70 100644
--- a/ot_event.c
+++ b/src/ot_event.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <errno.h>
diff --git a/ot_event.h b/src/ot_event.h
index efdefff..cb84ca8 100644
--- a/ot_event.h
+++ b/src/ot_event.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_EVENT_H__
 #define OT_EVENT_H__
diff --git a/ot_fdstate.c b/src/ot_fdstate.c
index 09daf50..8e4bd89 100644
--- a/ot_fdstate.c
+++ b/src/ot_fdstate.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdatomic.h>
diff --git a/ot_fdstate.h b/src/ot_fdstate.h
index 93890d1..60fe070 100644
--- a/ot_fdstate.h
+++ b/src/ot_fdstate.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_FDSTATE_H__
 #define OT_FDSTATE_H__
diff --git a/ot_fmt.c b/src/ot_fmt.c
index 9cab25f..362c9b5 100644
--- a/ot_fmt.c
+++ b/src/ot_fmt.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdarg.h>
diff --git a/ot_fmt.h b/src/ot_fmt.h
index 851b2d8..214cbc4 100644
--- a/ot_fmt.h
+++ b/src/ot_fmt.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_FMT_H__
 #define OT_FMT_H__
diff --git a/ot_fullscrape.c b/src/ot_fullscrape.c
index ae29308..9afad92 100644
--- a/ot_fullscrape.c
+++ b/src/ot_fullscrape.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifdef WANT_FULLSCRAPE
 
diff --git a/ot_fullscrape.h b/src/ot_fullscrape.h
index b759a27..8d11cd3 100644
--- a/ot_fullscrape.h
+++ b/src/ot_fullscrape.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_FULLSCRAPE_H__
 #define OT_FULLSCRAPE_H__
diff --git a/ot_hex.c b/src/ot_hex.c
index 2bf69c4..b537094 100644
--- a/ot_hex.c
+++ b/src/ot_hex.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdint.h>
diff --git a/ot_hex.h b/src/ot_hex.h
index 28eddf5..ddbbb44 100644
--- a/ot_hex.h
+++ b/src/ot_hex.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_HEX_H__
 #define OT_HEX_H__
diff --git a/ot_http.c b/src/ot_http.c
index b243ff6..96b8f4e 100644
--- a/ot_http.c
+++ b/src/ot_http.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #define _GNU_SOURCE
diff --git a/ot_http.h b/src/ot_http.h
index 9cacd21..fb56c64 100644
--- a/ot_http.h
+++ b/src/ot_http.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_HTTP_H__
 #define OT_HTTP_H__
diff --git a/ot_iovec.c b/src/ot_iovec.c
index 7e5903f..328f160 100644
--- a/ot_iovec.c
+++ b/src/ot_iovec.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdlib.h>
diff --git a/ot_iovec.h b/src/ot_iovec.h
index 6f5a1d6..4a8abbb 100644
--- a/ot_iovec.h
+++ b/src/ot_iovec.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_IOVEC_H__
 #define OT_IOVEC_H__
diff --git a/ot_ip.c b/src/ot_ip.c
index e694883..9c76290 100644
--- a/ot_ip.c
+++ b/src/ot_ip.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdint.h>
diff --git a/ot_ip.h b/src/ot_ip.h
index 344bd45..533403e 100644
--- a/ot_ip.h
+++ b/src/ot_ip.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_IP_H__
 #define OT_IP_H__
diff --git a/ot_livesync.c b/src/ot_livesync.c
index 4a0ede1..083fe1a 100644
--- a/ot_livesync.c
+++ b/src/ot_livesync.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
- It is considered beerware. Prost. Skol. Cheers or whatever.
-
- $id$ */
+ It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <arpa/inet.h>
diff --git a/ot_livesync.h b/src/ot_livesync.h
index 4725023..4bd3af0 100644
--- a/ot_livesync.h
+++ b/src/ot_livesync.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
- It is considered beerware. Prost. Skol. Cheers or whatever.
-
- $id$ */
+ It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_LIVESYNC_H__
 #define OT_LIVESYNC_H__
diff --git a/ot_mutex.c b/src/ot_mutex.c
index 9b3fd24..884b74c 100644
--- a/ot_mutex.c
+++ b/src/ot_mutex.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <arpa/inet.h>
diff --git a/ot_mutex.h b/src/ot_mutex.h
index c1218d7..d7ded92 100644
--- a/ot_mutex.h
+++ b/src/ot_mutex.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_MUTEX_H__
 #define OT_MUTEX_H__
diff --git a/ot_random.c b/src/ot_random.c
index 3fae876..43f91bb 100644
--- a/ot_random.c
+++ b/src/ot_random.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdint.h>
diff --git a/ot_random.h b/src/ot_random.h
index 5200dbc..c2d0387 100644
--- a/ot_random.h
+++ b/src/ot_random.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_RANDOM_H__
 #define OT_RANDOM_H__
diff --git a/ot_rijndael.c b/src/ot_rijndael.c
index 3f36bde..3f36bde 100644
--- a/ot_rijndael.c
+++ b/src/ot_rijndael.c
diff --git a/ot_rijndael.h b/src/ot_rijndael.h
index 54725dc..1235215 100644
--- a/ot_rijndael.h
+++ b/src/ot_rijndael.h
@@ -5,9 +5,7 @@
 
      http://www.cs.ucdavis.edu/~rogaway/ocb/ocb-ref/rijndael-alg-fst.c
 
-   and modified to work with 128 bits (this is 10 rounds) only.
-
-   $id$ */
+   and modified to work with 128 bits (this is 10 rounds) only. */
 
 #ifndef OT_RIJNDAEL_H__
 #define OT_RIJNDAEL_H__
diff --git a/ot_scan.c b/src/ot_scan.c
index c4b951a..3b8e87c 100644
--- a/ot_scan.c
+++ b/src/ot_scan.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <errno.h>
diff --git a/ot_scan.h b/src/ot_scan.h
index ca3bbbd..a79ec13 100644
--- a/ot_scan.h
+++ b/src/ot_scan.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_SCAN_H__
 #define OT_SCAN_H__
diff --git a/ot_socket.c b/src/ot_socket.c
index 48ffc27..79bb01a 100644
--- a/ot_socket.c
+++ b/src/ot_socket.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #define _GNU_SOURCE /* accept4 on glibc */
diff --git a/ot_socket.h b/src/ot_socket.h
index 5bbffe1..5c1d840 100644
--- a/ot_socket.h
+++ b/src/ot_socket.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_SOCKET_H__
 #define OT_SOCKET_H__
diff --git a/ot_stats.c b/src/ot_stats.c
index 8771f0c..2d6335b 100644
--- a/ot_stats.c
+++ b/src/ot_stats.c
@@ -1,10 +1,7 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
- It is considered beerware. Prost. Skol. Cheers or whatever.
-
- $id$ */
+ It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
-#include <inttypes.h>
 #include <pthread.h>
 #include <stdatomic.h>
 #include <stdio.h>
@@ -513,7 +510,6 @@ static void stats_return_everything(char **reply, const char *reply_end) {
 
   fmt_append(reply, reply_end, "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n");
   fmt_append(reply, reply_end, "<stats>\n");
-  fmt_append(reply, reply_end, "  <tracker_id>%" PRIu32 "</tracker_id>\n", g_tracker_id);
   fmt_append(reply, reply_end, "  <uptime>%llu</uptime>\n", (unsigned long long)(time(NULL) - ot_start_time));
   fmt_append(reply, reply_end, "  <torrents>\n");
   fmt_append(reply, reply_end, "    <count_mutex>%zd</count_mutex>\n", mutex_get_torrent_count());
diff --git a/ot_stats.h b/src/ot_stats.h
index f9a9d87..45a547e 100644
--- a/ot_stats.h
+++ b/src/ot_stats.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_STATS_H__
 #define OT_STATS_H__
diff --git a/ot_tcp.c b/src/ot_tcp.c
index 4a5008b..1351b92 100644
--- a/ot_tcp.c
+++ b/src/ot_tcp.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <errno.h>
diff --git a/ot_tcp.h b/src/ot_tcp.h
index 55a172c..afed142 100644
--- a/ot_tcp.h
+++ b/src/ot_tcp.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_TCP_H__
 #define OT_TCP_H__
diff --git a/ot_udp.c b/src/ot_udp.c
index 309cbdb..644b71d 100644
--- a/ot_udp.c
+++ b/src/ot_udp.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <arpa/inet.h>
diff --git a/ot_udp.h b/src/ot_udp.h
index 1cd363a..2710744 100644
--- a/ot_udp.h
+++ b/src/ot_udp.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_UDP_H__
 #define OT_UDP_H__
diff --git a/ot_urlencoded.c b/src/ot_urlencoded.c
index 17f12a4..4109bb5 100644
--- a/ot_urlencoded.c
+++ b/src/ot_urlencoded.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* Opentracker */
 #include "ot_urlencoded.h"
diff --git a/ot_urlencoded.h b/src/ot_urlencoded.h
index b6f1208..9882468 100644
--- a/ot_urlencoded.h
+++ b/src/ot_urlencoded.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef SCAN_URLENCODED_QUERY_H__
 #define SCAN_URLENCODED_QUERY_H__
diff --git a/ot_vector.c b/src/ot_vector.c
index 8310634..ab0566c 100644
--- a/ot_vector.c
+++ b/src/ot_vector.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stddef.h>
diff --git a/ot_vector.h b/src/ot_vector.h
index d553956..8a5ba86 100644
--- a/ot_vector.h
+++ b/src/ot_vector.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_VECTOR_H__
 #define OT_VECTOR_H__
diff --git a/ot_worker.c b/src/ot_worker.c
index 97eaeb2..432d272 100644
--- a/ot_worker.c
+++ b/src/ot_worker.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <pthread.h>
diff --git a/ot_worker.h b/src/ot_worker.h
index ea4f379..4954773 100644
--- a/ot_worker.h
+++ b/src/ot_worker.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_WORKER_H__
 #define OT_WORKER_H__
diff --git a/ot_workqueue.c b/src/ot_workqueue.c
index aac366c..56a7cd2 100644
--- a/ot_workqueue.c
+++ b/src/ot_workqueue.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <pthread.h>
diff --git a/ot_workqueue.h b/src/ot_workqueue.h
index 4acd6fd..82ae29b 100644
--- a/ot_workqueue.h
+++ b/src/ot_workqueue.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_WORKQUEUE_H__
 #define OT_WORKQUEUE_H__
diff --git a/proxy.c b/src/proxy.c
index f6e90a3..8589db5 100644
--- a/proxy.c
+++ b/src/proxy.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $Id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* This relays sync traffic between trackers, and between multicast domains
    that have no route to each other, so that no tracker has to reach out to
diff --git a/trackerlogic.c b/src/trackerlogic.c
index b0b7f4e..9565090 100644
--- a/trackerlogic.c
+++ b/src/trackerlogic.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <arpa/inet.h>
diff --git a/trackerlogic.h b/src/trackerlogic.h
index 39afece..7292d36 100644
--- a/trackerlogic.h
+++ b/src/trackerlogic.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_TRACKERLOGIC_H__
 #define OT_TRACKERLOGIC_H__
@@ -64,7 +62,12 @@ typedef struct {
 
 /* We maintain a list of 1024 pointers to sorted list of ot_torrent structs
  Sort key is, of course, its hash */
+/* Set from the Makefile, 8 to 16. More buckets means shorter vectors and a
+   cheaper insert, which only pays for a tracker carrying millions of
+   torrents; see DESIGN. */
+#ifndef OT_BUCKET_COUNT_BITS
 #define OT_BUCKET_COUNT_BITS          10
+#endif
 
 #define OT_BUCKET_COUNT               (1 << OT_BUCKET_COUNT_BITS)
 #define OT_BUCKET_COUNT_SHIFT         (32 - OT_BUCKET_COUNT_BITS)
diff --git a/tests/integration/test_stats.py b/tests/integration/test_stats.py
index 74f6d47..088d8a1 100644
--- a/tests/integration/test_stats.py
+++ b/tests/integration/test_stats.py
@@ -66,6 +66,12 @@ class StatsShape(TrackerTestCase):
     def test_everything_does_not_name_the_build(self):
         self.assertNotIn(b"opentracker 1", self.tracker.stats("everything"))
 
+    def test_everything_does_not_name_the_tracker_id(self):
+        """The id a tracker recognises its own live sync packets by. Knowing
+        it is of no use to a client and of some use to whoever would like a
+        tracker to discard what it is told."""
+        self.assertNotIn(b"tracker_id", self.tracker.stats("everything"))
+
 
 class StatsCount(TrackerTestCase):
     def test_the_torrent_count_follows_the_torrents(self):
diff --git a/tests/runner.c b/tests/runner.c
index 97c6d51..ae2565b 100644
--- a/tests/runner.c
+++ b/tests/runner.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdio.h>
diff --git a/tests/stubs.c b/tests/stubs.c
index 5999e2d..f7ac679 100644
--- a/tests/stubs.c
+++ b/tests/stubs.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* Stubs for symbols the modules under test reference but never reach along
    the paths the tests exercise. If a test ever does reach one, the missing
diff --git a/sync_daemon.pl b/tests/sync_daemon.pl
index 9e4bdb9..9e4bdb9 100644
--- a/sync_daemon.pl
+++ b/tests/sync_daemon.pl
diff --git a/tests/t_accesslist.c b/tests/t_accesslist.c
index 9925acd..14321f4 100644
--- a/tests/t_accesslist.c
+++ b/tests/t_accesslist.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdlib.h>
diff --git a/tests/t_batch.c b/tests/t_batch.c
index 02743f1..5a7ac1e 100644
--- a/tests/t_batch.c
+++ b/tests/t_batch.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <fcntl.h>
diff --git a/tests/t_buf.c b/tests/t_buf.c
index dcfb0bb..39c44f1 100644
--- a/tests/t_buf.c
+++ b/tests/t_buf.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdint.h>
diff --git a/tests/t_event.c b/tests/t_event.c
index 1908dc9..5c45089 100644
--- a/tests/t_event.c
+++ b/tests/t_event.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <fcntl.h>
diff --git a/tests/t_fdstate.c b/tests/t_fdstate.c
index 421f076..c806dbe 100644
--- a/tests/t_fdstate.c
+++ b/tests/t_fdstate.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <pthread.h>
diff --git a/tests/t_fmt.c b/tests/t_fmt.c
index bc23ed5..f94102d 100644
--- a/tests/t_fmt.c
+++ b/tests/t_fmt.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <string.h>
diff --git a/tests/t_hex.c b/tests/t_hex.c
index a761737..84aeba2 100644
--- a/tests/t_hex.c
+++ b/tests/t_hex.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdint.h>
diff --git a/tests/t_iovec.c b/tests/t_iovec.c
index 2553141..1e8206d 100644
--- a/tests/t_iovec.c
+++ b/tests/t_iovec.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdlib.h>
diff --git a/tests/t_ip.c b/tests/t_ip.c
index 8d71679..218d3ff 100644
--- a/tests/t_ip.c
+++ b/tests/t_ip.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdint.h>
diff --git a/tests/t_mutex.c b/tests/t_mutex.c
index 7c1463b..c0c41cc 100644
--- a/tests/t_mutex.c
+++ b/tests/t_mutex.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <pthread.h>
@@ -26,7 +24,7 @@ static void hash_for_bucket(ot_hash hash, int bucket) {
 }
 
 static void case_a_hash_names_its_bucket(void) {
-  static const int buckets[] = {0, 1, 2, 17, 511, 512, OT_BUCKET_COUNT - 1};
+  static const int buckets[] = {0, 1, 2, 17, OT_BUCKET_COUNT / 2 - 1, OT_BUCKET_COUNT / 2, OT_BUCKET_COUNT - 1};
   size_t           i;
 
   test_case("a hash is served by the bucket its leading bits name");
diff --git a/tests/t_random.c b/tests/t_random.c
index 67dedf6..b070c3f 100644
--- a/tests/t_random.c
+++ b/tests/t_random.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdint.h>
diff --git a/tests/t_scan.c b/tests/t_scan.c
index aab4413..05c4a67 100644
--- a/tests/t_scan.c
+++ b/tests/t_scan.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdint.h>
diff --git a/tests/t_socket.c b/tests/t_socket.c
index 20a0c0a..8e917a3 100644
--- a/tests/t_socket.c
+++ b/tests/t_socket.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <errno.h>
diff --git a/tests/t_trackerlogic.c b/tests/t_trackerlogic.c
index d3d8755..f64977f 100644
--- a/tests/t_trackerlogic.c
+++ b/tests/t_trackerlogic.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <arpa/inet.h>
diff --git a/tests/t_urlencoded.c b/tests/t_urlencoded.c
index 6e0ee31..3b3e6c2 100644
--- a/tests/t_urlencoded.c
+++ b/tests/t_urlencoded.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <string.h>
diff --git a/tests/t_vector.c b/tests/t_vector.c
index 6e048e1..f0a9bf7 100644
--- a/tests/t_vector.c
+++ b/tests/t_vector.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdint.h>
diff --git a/tests/t_workqueue.c b/tests/t_workqueue.c
index 13e0b2e..c454e5b 100644
--- a/tests/t_workqueue.c
+++ b/tests/t_workqueue.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdlib.h>
diff --git a/tests/test.c b/tests/test.c
index 4686369..33f77bd 100644
--- a/tests/test.c
+++ b/tests/test.c
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 /* System */
 #include <stdarg.h>
diff --git a/tests/test.h b/tests/test.h
index d7296cc..82ec178 100644
--- a/tests/test.h
+++ b/tests/test.h
@@ -1,7 +1,5 @@
 /* This software was written by Dirk Engling <erdgeist@erdgeist.org>
-   It is considered beerware. Prost. Skol. Cheers or whatever.
-
-   $id$ */
+   It is considered beerware. Prost. Skol. Cheers or whatever. */
 
 #ifndef OT_TEST_H__
 #define OT_TEST_H__