7 files changed, 49 insertions, 22 deletions

diff --git a/Makefile b/Makefile
index e5ca6e4..706b742 100644
--- a/Makefile
+++ b/Makefile
@@ -18,19 +18,23 @@ 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
 
-#FEATURES+=-DWANT_COMPRESSION_ZSTD
-#FEATURES+=-DWANT_COMPRESSION_ZSTD_ALWAYS
-#LDFLAGS+=-lzstd
+# 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
@@ -48,8 +52,8 @@ FEATURES+=-DWANT_FULLSCRAPE
 #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
+# on Linux systems the include Makefile adds -lbsd
+#include Makefile.arc4random
 
 #FEATURES+=-D_DEBUG_HTTPERROR
 #FEATURES+=-D_DEBUG_RANDOMTORRENTS
@@ -60,8 +64,7 @@ OPTS_debug=-D_DEBUG -g -ggdb # -pg -fprofile-arcs -ftest-coverage
 OPTS_production=-O3
 
 CFLAGS+=-I$(LIBOWFAT_HEADERS) -DGIT_VERSION=$(GIT_VERSION) -Wall -pipe -pthread -Wextra #-ansi -pedantic
-LDFLAGS+=-L$(LIBOWFAT_LIBRARY) -lowfat -pthread -lz
-#LDFLAGS+=-lbsd
+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
diff --git a/Makefile.arc4random b/Makefile.arc4random
new file mode 100644
index 0000000..1488408
--- /dev/null
+++ b/Makefile.arc4random
@@ -0,0 +1,3 @@
+FEATURES+=-DWANT_ARC4RANDOM
+LDFLAGS+=-lbsd
+
diff --git a/Makefile.gzip b/Makefile.gzip
new file mode 100644
index 0000000..70d6d62
--- /dev/null
+++ b/Makefile.gzip
@@ -0,0 +1,4 @@
+FEATURES+=-DWANT_COMPRESSION_GZIP
+#FEATURES+=-DWANT_COMPRESSION_GZIP_ALWAYS
+
+LDFLAGS+=-lz
diff --git a/Makefile.zstd b/Makefile.zstd
new file mode 100644
index 0000000..2bb56be
--- /dev/null
+++ b/Makefile.zstd
@@ -0,0 +1,3 @@
+FEATURES+=-DWANT_COMPRESSION_ZSTD
+#FEATURES+=-DWANT_COMPRESSION_ZSTD_ALWAYS
+LDFLAGS+=-lzstd
diff --git a/man4/opentracker.conf.4 b/man4/opentracker.conf.4
index 4b68121..b4f5f51 100644
--- a/man4/opentracker.conf.4
+++ b/man4/opentracker.conf.4
@@ -17,13 +17,13 @@ The following options are available:
 
 .Bl -tag -width ".It access.proxy" -compact
 .It listen.tcp_udp Ar address
-Specifies the address opentracker will listen on for both TCP and UDP connections. If not specified, opentracker listens on 0.0.0.0:6969 by default.
+Specifies an address opentracker will listen on for both TCP and UDP connections. If none are specified, opentracker listens on 0.0.0.0:6969 by default. Can be added more than once.
 
 .It listen.tcp Ar address
-Specifies the address opentracker will listen on for TCP connections.
+Specifies the address opentracker will listen on for TCP connections. Can be added more than once.
 
 .It listen.udp Ar address
-Specifies the address opentracker will listen on for UDP connections.
+Specifies the address opentracker will listen on for UDP connections. Can be added more than once.
 
 .It listen.udp.workers Ar threads
 Specifies how many threads will be spawned to handle UDP connections. Defaults to 4.
@@ -47,13 +47,13 @@ Specifies the IP address or network in CIDR notation allowed to fetch stats from
 Specifies the path to the stats location. You can configure opentracker to appear anywhere on your tracker. Defaults to /stats.
 
 .It access.proxy Ar ip_address_or_network
-Specifies the IP address or network of the reverse proxies. Opentracker will take the X-Forwarded-For address instead of the source IP address.
+Specifies the IP address or network of the reverse proxies. Opentracker will take the X-Forwarded-For address instead of the source IP address. Can be added more than once.
 
 .It livesync.cluster.listen Ar ip_address:port
 Specifies the IP address and port opentracker will listen on for incoming live sync packets to keep a cluster of opentrackers synchronized.
 
 .It livesync.cluster.node_ip Ar ip_address
-Specifies the trusted IP address for sync between trackers running in a cluster.
+Specifies one trusted IP address for sync between trackers running in a cluster. Can be added more than once.
 
 .It batchsync.cluster.admin_ip Ar ip_address
 Specifies the admin IP address for old-style (HTTP-based) asynchronous tracker syncing.
diff --git a/ot_http.c b/ot_http.c
index af3f210..5c622e2 100644
--- a/ot_http.c
+++ b/ot_http.c
@@ -4,9 +4,9 @@
    $id$ */
 
 /* System */
+#define _GNU_SOURCE
 #include <arpa/inet.h>
 #include <pthread.h>
-#define _GNU_SOURCE
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
diff --git a/ot_stats.c b/ot_stats.c
index 158884f..b2eaec9 100644
--- a/ot_stats.c
+++ b/ot_stats.c
@@ -320,7 +320,7 @@ typedef struct {
 /* Fetches stats from tracker */
 size_t stats_top_txt(char *reply, int amount) {
   size_t    j;
-  ot_record top100s[100], top100c[100];
+  ot_record top100s[100], top100c[100], top100l[100];
   char     *r = reply, hex_out[42];
   int       idx, bucket;
 
@@ -329,14 +329,16 @@ size_t stats_top_txt(char *reply, int amount) {
 
   byte_zero(top100s, sizeof(top100s));
   byte_zero(top100c, sizeof(top100c));
+  byte_zero(top100l, sizeof(top100l));
 
   for (bucket = 0; bucket < OT_BUCKET_COUNT; ++bucket) {
-    ot_vector *torrents_list = mutex_bucket_lock(bucket);
+    ot_vector *torrents_list  = mutex_bucket_lock(bucket);
     for (j = 0; j < torrents_list->size; ++j) {
-      ot_torrent *torrent    = (ot_torrent *)(torrents_list->data) + j;
-      size_t      peer_count = torrent->peer_list6->peer_count + torrent->peer_list4->peer_count;
-      size_t      seed_count = torrent->peer_list6->seed_count + torrent->peer_list4->seed_count;
-      idx                    = amount - 1;
+      ot_torrent *torrent     = (ot_torrent *)(torrents_list->data) + j;
+      size_t      peer_count  = torrent->peer_list6->peer_count + torrent->peer_list4->peer_count;
+      size_t      seed_count  = torrent->peer_list6->seed_count + torrent->peer_list4->seed_count;
+      size_t      leech_count = peer_count - seed_count;
+      idx                     = amount - 1;
       while ((idx >= 0) && (peer_count > top100c[idx].val))
         --idx;
       if (idx++ != amount - 1) {
@@ -352,6 +354,14 @@ size_t stats_top_txt(char *reply, int amount) {
         memcpy(&top100s[idx].hash, &torrent->hash, sizeof(ot_hash));
         top100s[idx].val = seed_count;
       }
+      idx = amount - 1;
+      while ((idx >= 0) && (leech_count > top100l[idx].val))
+        --idx;
+      if (idx++ != amount - 1) {
+        memmove(top100l + idx + 1, top100l + idx, (amount - 1 - idx) * sizeof(ot_record));
+        memcpy(&top100l[idx].hash, &torrent->hash, sizeof(ot_hash));
+        top100l[idx].val = leech_count;
+      }
     }
     mutex_bucket_unlock(bucket, 0);
     if (!g_opentracker_running)
@@ -366,6 +376,10 @@ size_t stats_top_txt(char *reply, int amount) {
   for (idx = 0; idx < amount; ++idx)
     if (top100s[idx].val)
       r += sprintf(r, "\t%zd\t%s\n", top100s[idx].val, to_hex(hex_out, top100s[idx].hash));
+  r += sprintf(r, "Top %d torrents by leechers:\n", amount);
+  for (idx = 0; idx < amount; ++idx)
+    if (top100l[idx].val)
+      r += sprintf(r, "\t%zd\t%s\n", top100l[idx].val, to_hex(hex_out, top100l[idx].hash));
 
   return r - reply;
 }