1 files changed, 62 insertions, 66 deletions

diff --git a/ot_stats.c b/ot_stats.c
index fa456c3..afc972a 100644
--- a/ot_stats.c
+++ b/ot_stats.c
@@ -4,13 +4,11 @@
  $id$ */
 
 /* System */
-#include <arpa/inet.h>
 #include <inttypes.h>
 #include <pthread.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <sys/mman.h>
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <unistd.h>
@@ -19,7 +17,6 @@
 #endif
 
 /* Libowfat */
-#include "byte.h"
 #include "io.h"
 #include "ip4.h"
 #include "ip6.h"
@@ -38,7 +35,7 @@
 #endif
 
 /* Forward declaration */
-static void stats_make(int *iovec_entries, struct iovec **iovector, ot_tasktype mode);
+static void stats_make(size_t *iovec_entries, struct iovec **iovector, ot_tasktype mode);
 #define OT_STATS_TMPSIZE 8192
 
 /* Clumsy counters... to be rethought */
@@ -113,7 +110,7 @@ static int stat_increase_network_count(stats_network_node **pnode, int depth, ui
 }
 
 static int stats_shift_down_network_count(stats_network_node **node, int depth, int shift) {
-  int i, rest = 0;
+  size_t i, rest = 0;
 
   if (!*node)
     return 0;
@@ -134,8 +131,7 @@ static int stats_shift_down_network_count(stats_network_node **node, int depth,
 
 static size_t stats_get_highscore_networks(stats_network_node *node, int depth, ot_ip6 node_value, size_t *scores, ot_ip6 *networks, int network_count,
                                            int limit) {
-  size_t score = 0;
-  int    i;
+  size_t i, score = 0;
 
   if (!node)
     return 0;
@@ -191,11 +187,11 @@ static size_t stats_get_highscore_networks(stats_network_node *node, int depth,
   return score;
 }
 
-static size_t stats_return_busy_networks(char *reply, stats_network_node *tree, int amount, int limit) {
+static size_t stats_return_busy_networks(char *reply, stats_network_node *tree, size_t amount, int limit) {
   ot_ip6 networks[amount];
   ot_ip6 node_value;
   size_t scores[amount];
-  int    i;
+  size_t i;
   char  *r = reply;
 
   memset(scores, 0, sizeof(scores));
@@ -205,14 +201,14 @@ static size_t stats_return_busy_networks(char *reply, stats_network_node *tree,
   stats_get_highscore_networks(tree, 0, node_value, scores, networks, amount, limit);
 
   r += sprintf(r, "Networks, limit /%d:\n", limit + STATS_NETWORK_NODE_BITWIDTH);
-  for (i = amount - 1; i >= 0; --i) {
-    if (scores[i]) {
-      r += sprintf(r, "%08zd: ", scores[i]);
+  for (i = amount; i > 0; --i) {
+    if (scores[i - 1]) {
+      r += sprintf(r, "%08zd: ", scores[i - 1]);
       // #ifdef WANT_V6
-      r += fmt_ip6c(r, networks[i]);
+      r += fmt_ip6c(r, networks[i - 1]);
 #if 0
     // XXX
-      r += fmt_ip4( r, networks[i]);
+      r += fmt_ip4( r, networks[i - 1]);
 #endif
       *r++ = '\n';
     }
@@ -225,8 +221,7 @@ static size_t stats_return_busy_networks(char *reply, stats_network_node *tree,
 static size_t stats_slash24s_txt(char *reply, size_t amount) {
   stats_network_node *slash24s_network_counters_root = NULL;
   char  *r = reply;
-  int    bucket;
-  size_t i, peer_size = OT_PEER_SIZE4;
+  size_t i, bucket, peer_size = OT_PEER_SIZE4;
 
   for (bucket = 0; bucket < OT_BUCKET_COUNT; ++bucket) {
     ot_vector *torrents_list = mutex_bucket_lock(bucket);
@@ -317,55 +312,64 @@ typedef struct {
   ot_hash hash;
 } ot_record;
 
+static inline void stats_insert_into_highscore(size_t val, ot_record* list, size_t amount, ot_hash* hash) {
+  size_t i;
+  for (i = 0; (i < amount) && (list[i].val > val); ++i)
+     {}
+  /* if we score better than a record in the list, we need to make room in the high
+     score array by moving lower scoring entries up */
+  if (i < amount) {
+    memmove(list + i + 1, list + i, (amount - i - 1) * sizeof(ot_record));
+
+    memcpy(&list[i].hash, hash, sizeof(ot_hash));
+    list[i].val = val;
+  }
+}
+
+
 /* Fetches stats from tracker */
-size_t stats_top_txt(char *reply, int amount) {
-  size_t    j;
-  ot_record top100s[100], top100c[100];
+size_t stats_top_txt(char *reply, size_t amount) {
+  size_t    j, idx, bucket;
+  ot_record top100s[100], top100c[100], top100l[100];
   char     *r = reply, hex_out[42];
-  int       idx, bucket;
 
   if (amount > 100)
     amount = 100;
 
-  byte_zero(top100s, sizeof(top100s));
-  byte_zero(top100c, sizeof(top100c));
+  memset(top100s, 0, sizeof(top100s));
+  memset(top100c, 0, sizeof(top100c));
+  memset(top100l, 0, sizeof(top100l));
 
+  /* Iterate over complete torrent list */
   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;
-      while ((idx >= 0) && (peer_count > top100c[idx].val))
-        --idx;
-      if (idx++ != amount - 1) {
-        memmove(top100c + idx + 1, top100c + idx, (amount - 1 - idx) * sizeof(ot_record));
-        memcpy(&top100c[idx].hash, &torrent->hash, sizeof(ot_hash));
-        top100c[idx].val = peer_count;
-      }
-      idx = amount - 1;
-      while ((idx >= 0) && (seed_count > top100s[idx].val))
-        --idx;
-      if (idx++ != amount - 1) {
-        memmove(top100s + idx + 1, top100s + idx, (amount - 1 - idx) * sizeof(ot_record));
-        memcpy(&top100s[idx].hash, &torrent->hash, sizeof(ot_hash));
-        top100s[idx].val = seed_count;
-      }
+      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;
+
+      stats_insert_into_highscore(peer_count,  top100c, amount, &torrent->hash);
+      stats_insert_into_highscore(seed_count,  top100s, amount, &torrent->hash);
+      stats_insert_into_highscore(leech_count, top100l, amount, &torrent->hash);
     }
     mutex_bucket_unlock(bucket, 0);
     if (!g_opentracker_running)
       return 0;
   }
 
-  r += sprintf(r, "Top %d torrents by peers:\n", amount);
+  r += sprintf(r, "Top %zd torrents by peers:\n", amount);
   for (idx = 0; idx < amount; ++idx)
     if (top100c[idx].val)
       r += sprintf(r, "\t%zd\t%s\n", top100c[idx].val, to_hex(hex_out, top100c[idx].hash));
-  r += sprintf(r, "Top %d torrents by seeds:\n", amount);
+  r += sprintf(r, "Top %zd torrents by seeds:\n", 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 %zd 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;
 }
@@ -463,7 +467,7 @@ static size_t             stats_return_numwants(char *reply) {
 #endif
 
 #ifdef WANT_FULLLOG_NETWORKS
-static void stats_return_fulllog(int *iovec_entries, struct iovec **iovector, char *r) {
+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;
 
@@ -476,9 +480,9 @@ static void stats_return_fulllog(int *iovec_entries, struct iovec **iovector, ch
         return;
       re = r + 32 * OT_STATS_TMPSIZE;
     }
-    r    += sprintf(r, "%08ld: ", loglist->time);
-    r    += fmt_ip6c(r, loglist->ip);
-    *r++  = '\n';
+    r      += sprintf(r, "%08ld: ", loglist->time);
+    r      += fmt_ip6c(r, loglist->ip);
+    *r++    = '\n';
     memcpy(r, loglist->data, loglist->size);
     r      += loglist->size;
     *r++    = '\n';
@@ -518,10 +522,8 @@ static size_t stats_return_everything(char *reply) {
   r += sprintf(r, "  <completed>\n    <count>%llu</count>\n  </completed>\n", ot_overall_completed);
   r += sprintf(r, "  <connections>\n");
   r += sprintf(r, "    <tcp>\n      <accept>%llu</accept>\n      <announce>%llu</announce>\n      <scrape>%llu</scrape>\n    </tcp>\n",
-               ot_overall_tcp_connections, ot_overall_tcp_successfulannounces, ot_overall_tcp_successfulscrapes);
-  r += sprintf(
-      r,
-      "    <udp>\n      <overall>%llu</overall>\n      <connect>%llu</connect>\n      <announce>%llu</announce>\n      <scrape>%llu</scrape>\n      <missmatch>%llu</missmatch>\n    </udp>\n",
+      ot_overall_tcp_connections, ot_overall_tcp_successfulannounces, ot_overall_tcp_successfulscrapes);
+  r += sprintf(r, "    <udp>\n      <overall>%llu</overall>\n      <connect>%llu</connect>\n      <announce>%llu</announce>\n      <scrape>%llu</scrape>\n      <missmatch>%llu</missmatch>\n    </udp>\n",
       ot_overall_udp_connections, ot_overall_udp_connects, ot_overall_udp_successfulannounces, ot_overall_udp_successfulscrapes,
       ot_overall_udp_connectionidmissmatches);
   r += sprintf(r, "    <livesync>\n      <count>%llu</count>\n    </livesync>\n", ot_overall_sync_count);
@@ -541,14 +543,10 @@ static size_t stats_return_everything(char *reply) {
   return r - reply;
 }
 
-extern const char *g_version_opentracker_c, *g_version_accesslist_c, *g_version_clean_c, *g_version_fullscrape_c, *g_version_http_c, *g_version_iovec_c,
-    *g_version_mutex_c, *g_version_stats_c, *g_version_udp_c, *g_version_vector_c, *g_version_scan_urlencoded_query_c, *g_version_trackerlogic_c,
-    *g_version_livesync_c, *g_version_rijndael_c;
-
 size_t stats_return_tracker_version(char *reply) {
-  return sprintf(reply, "%s%s%s%s%s%s%s%s%s%s%s%s%s%s", g_version_opentracker_c, g_version_accesslist_c, g_version_clean_c, g_version_fullscrape_c,
-                 g_version_http_c, g_version_iovec_c, g_version_mutex_c, g_version_stats_c, g_version_udp_c, g_version_vector_c,
-                 g_version_scan_urlencoded_query_c, g_version_trackerlogic_c, g_version_livesync_c, g_version_rijndael_c);
+#define QUOTE(name) #name
+#define SQUOTE(name) QUOTE(name)
+  return sprintf(reply, "https://erdgeist.org/gitweb/opentracker/commit/?id=" SQUOTE(GIT_VERSION) "\n");
 }
 
 size_t return_stats_for_tracker(char *reply, int mode, int format) {
@@ -583,7 +581,7 @@ size_t return_stats_for_tracker(char *reply, int mode, int format) {
   }
 }
 
-static void stats_make(int *iovec_entries, struct iovec **iovector, ot_tasktype mode) {
+static void stats_make(size_t *iovec_entries, struct iovec **iovector, ot_tasktype mode) {
   char *r;
 
   *iovec_entries = 0;
@@ -740,7 +738,7 @@ void stats_issue_event(ot_status_event event, PROTO_FLAG proto, uintptr_t event_
   }
 }
 
-void stats_cleanup() {
+void stats_cleanup(void) {
 #ifdef WANT_SPOT_WOODPECKER
   pthread_mutex_lock(&g_woodpeckers_mutex);
   stats_shift_down_network_count(&stats_woodpeckers_tree, 0, 1);
@@ -749,7 +747,7 @@ void stats_cleanup() {
 }
 
 static void *stats_worker(void *args) {
-  int           iovec_entries;
+  size_t        iovec_entries;
   struct iovec *iovector;
 
   (void)args;
@@ -767,13 +765,11 @@ static void *stats_worker(void *args) {
 void stats_deliver(int64 sock, int tasktype) { mutex_workqueue_pushtask(sock, tasktype); }
 
 static pthread_t thread_id;
-void stats_init() {
+void stats_init(void) {
   ot_start_time = g_now_seconds;
   pthread_create(&thread_id, NULL, stats_worker, NULL);
 }
 
-void stats_deinit() {
+void stats_deinit(void) {
     pthread_cancel(thread_id);
 }
-
-const char *g_version_stats_c = "$Source$: $Revision$\n";