1 files changed, 93 insertions, 53 deletions

diff --git a/ot_stats.c b/ot_stats.c
index d38355a..a2eb084 100644
--- a/ot_stats.c
+++ b/ot_stats.c
@@ -4,7 +4,6 @@
  $id$ */
 
 /* System */
-#include <inttypes.h>
 #include <pthread.h>
 #include <stdatomic.h>
 #include <stdio.h>
@@ -19,6 +18,7 @@
 
 /* Opentracker */
 #include "ot_accesslist.h"
+#include "ot_event.h"
 #include "ot_hex.h"
 #include "ot_iovec.h"
 #include "ot_ip.h"
@@ -117,10 +117,6 @@ union stats_network_node {
   stats_network_node *children[STATS_NETWORK_NODE_COUNT];
 };
 
-#ifdef WANT_LOG_NETWORKS
-static stats_network_node *stats_network_counters_root;
-#endif
-
 static int stat_increase_network_count(stats_network_node **pnode, int depth, uintptr_t ip) {
   int                 foo = __LDR(ip, depth);
   stats_network_node *node;
@@ -504,36 +500,6 @@ static void             stats_return_numwants(char **reply, const char *reply_en
 }
 #endif
 
-#ifdef WANT_FULLLOG_NETWORKS
-static void stats_return_fulllog(size_t *iovec_entries, struct iovec **iovector, char *r) {
-  ot_log *loglist  = g_logchain_first, *llnext;
-  char   *re       = r + OT_STATS_TMPSIZE;
-
-  g_logchain_first = g_logchain_last = 0;
-
-  while (loglist) {
-    if (r + (loglist->size + 64) >= re) {
-      r = iovec_next_chunk(iovec_entries, iovector, r, 32 * OT_STATS_TMPSIZE);
-      if (!r)
-        return;
-      re = r + 32 * OT_STATS_TMPSIZE;
-    }
-    char ip_readable[64];
-
-    ip_readable[ip_format(ip_readable, loglist->ip)] = 0;
-    fmt_append(&r, re, "%08ld: %s\n", loglist->time, ip_readable);
-    fmt_bytes(&r, re, loglist->data, loglist->size);
-    fmt_append(&r, re, "\n*\n\n");
-
-    llnext = loglist->next;
-    free(loglist->data);
-    free(loglist);
-    loglist = llnext;
-  }
-  iovec_trim_last(iovec_entries, iovector, r);
-}
-#endif
-
 static void stats_return_everything(char **reply, const char *reply_end) {
   unsigned long long total[OT_COUNTER_COUNT];
 
@@ -546,10 +512,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, "  <version>\n");
-  stats_return_tracker_version(reply, reply_end);
-  fmt_append(reply, reply_end, "  </version>\n");
   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());
@@ -580,10 +542,99 @@ static void stats_return_everything(char **reply, const char *reply_end) {
   fmt_append(reply, reply_end, "</stats>");
 }
 
+/* The names as the Makefile spells them, so that what a binary reports maps
+   straight back onto the FEATURES lines it was built from */
+static const char *const build_features[] = {
+#ifdef WANT_V4_ONLY
+    "WANT_V4_ONLY",
+#endif
+#ifdef WANT_ACCESSLIST_BLACK
+    "WANT_ACCESSLIST_BLACK",
+#endif
+#ifdef WANT_ACCESSLIST_WHITE
+    "WANT_ACCESSLIST_WHITE",
+#endif
+#ifdef WANT_DYNAMIC_ACCESSLIST
+    "WANT_DYNAMIC_ACCESSLIST",
+#endif
+#ifdef WANT_SYNC_LIVE
+    "WANT_SYNC_LIVE",
+#endif
+#ifdef WANT_IP_FROM_QUERY_STRING
+    "WANT_IP_FROM_QUERY_STRING",
+#endif
+#ifdef WANT_IP_FROM_PROXY
+    "WANT_IP_FROM_PROXY",
+#endif
+#ifdef WANT_COMPRESSION_GZIP
+    "WANT_COMPRESSION_GZIP",
+#endif
+#ifdef WANT_COMPRESSION_GZIP_ALWAYS
+    "WANT_COMPRESSION_GZIP_ALWAYS",
+#endif
+#ifdef WANT_COMPRESSION_ZSTD
+    "WANT_COMPRESSION_ZSTD",
+#endif
+#ifdef WANT_COMPRESSION_ZSTD_ALWAYS
+    "WANT_COMPRESSION_ZSTD_ALWAYS",
+#endif
+#ifdef WANT_FULLSCRAPE
+    "WANT_FULLSCRAPE",
+#endif
+#ifdef WANT_MODEST_FULLSCRAPES
+    "WANT_MODEST_FULLSCRAPES",
+#endif
+#ifdef WANT_KEEPALIVE
+    "WANT_KEEPALIVE",
+#endif
+#ifdef WANT_RESTRICT_STATS
+    "WANT_RESTRICT_STATS",
+#endif
+#ifdef WANT_LOG_NUMWANT
+    "WANT_LOG_NUMWANT",
+#endif
+#ifdef WANT_SPOT_WOODPECKER
+    "WANT_SPOT_WOODPECKER",
+#endif
+#ifdef WANT_SYSLOGS
+    "WANT_SYSLOGS",
+#endif
+#ifdef WANT_DEV_RANDOM
+    "WANT_DEV_RANDOM",
+#endif
+#ifdef WANT_INSECURE_RANDOM_FALLBACK
+    "WANT_INSECURE_RANDOM_FALLBACK",
+#endif
+#ifdef _DEBUG
+    "_DEBUG",
+#endif
+#ifdef _DEBUG_HTTPERROR
+    "_DEBUG_HTTPERROR",
+#endif
+#ifdef _DEBUG_RANDOMTORRENTS
+    "_DEBUG_RANDOMTORRENTS",
+#endif
+    NULL};
+
+void stats_return_tracker_features(char **reply, const char *reply_end) {
+  size_t i;
+
+  fmt_append(reply, reply_end, "events: %s\n", event_mechanism());
+  fmt_append(reply, reply_end, "features:");
+  for (i = 0; build_features[i]; ++i)
+    fmt_append(reply, reply_end, " %s", build_features[i]);
+  if (!build_features[0])
+    fmt_append(reply, reply_end, " none");
+  fmt_append(reply, reply_end, "\n");
+}
+
 void stats_return_tracker_version(char **reply, const char *reply_end) {
-#define QUOTE(name) #name
-#define SQUOTE(name) QUOTE(name)
-  fmt_append(reply, reply_end, "https://erdgeist.org/gitweb/opentracker/commit/?id=" SQUOTE(GIT_VERSION) "\n");
+  fmt_append(reply, reply_end, "opentracker %s", OT_VERSION);
+  if (*GIT_VERSION && strcmp(GIT_VERSION, OT_TAG))
+    fmt_append(reply, reply_end, " (%s)", GIT_VERSION);
+  fmt_append(reply, reply_end, "\n");
+  if (*OT_TAG)
+    fmt_append(reply, reply_end, "https://erdgeist.org/gitweb/opentracker/tag/?h=%s\n", OT_TAG);
 }
 
 void return_stats_for_tracker(char **reply, const char *reply_end, int mode, int format) {
@@ -610,9 +661,6 @@ void return_stats_for_tracker(char **reply, const char *reply_end, int mode, int
   case TASK_STATS_HTTPERRORS:
     stats_httperrors_txt(reply, reply_end);
     break;
-  case TASK_STATS_VERSION:
-    stats_return_tracker_version(reply, reply_end);
-    break;
   case TASK_STATS_RENEW:
     stats_return_renew_bucket(reply, reply_end);
     break;
@@ -671,11 +719,6 @@ static void stats_make(size_t *iovec_entries, struct iovec **iovector, ot_taskty
     stats_return_woodpeckers(&r, r_end, 128);
     break;
 #endif
-#ifdef WANT_FULLLOG_NETWORKS
-  case TASK_STATS_FULLLOG:
-    stats_return_fulllog(iovec_entries, iovector, r);
-    return;
-#endif
   default:
     iovec_free(iovec_entries, iovector);
     return;
@@ -693,9 +736,6 @@ void stats_issue_event(struct ot_workstruct *ws, ot_status_event event, PROTO_FL
       COUNT(OT_COUNTER_TCP_CONNECTIONS, 1);
     else
       COUNT(OT_COUNTER_UDP_CONNECTIONS, 1);
-#ifdef WANT_LOG_NETWORKS
-    stat_increase_network_count(&stats_network_counters_root, 0, event_data);
-#endif
     break;
   case EVENT_ANNOUNCE:
     if (proto == FLAG_TCP)