sorted bencoded order

2 files changed, 13 insertions, 6 deletions

diff --git a/opentracker.c b/opentracker.c
index 1bd8514..f592fd5 100644
--- a/opentracker.c
+++ b/opentracker.c
@@ -19,7 +19,8 @@
 #include "trackerlogic.h"
 #include "scan_urlencoded_query.h"
 
-static unsigned int overall_connections = 0;
+static unsigned int ot_overall_connections = 0;
+static time_t ot_start_time;
 
 static void carp(const char* routine) {
   buffer_puts(buffer_2,routine);
@@ -282,10 +283,14 @@ e500:
       }
       break;
     case 11:
-      if( byte_diff(data,11,",mrtg_scrape"))
+      if( byte_diff(data,11,"mrtg_scrape"))
         goto e404;
       reply = malloc( 128 );
-      reply_size = sprintf( reply, "%d\n%d\nUp: 23 years.\nPertuned by german engineers.", overall_connections, overall_connections );
+      { 
+        unsigned long seconds_elapsed = time( NULL ) - ot_start_time;
+        reply_size = sprintf( reply, "%d\n%d\nUp: %ld seconds (%ld hours)\nPertuned by german engineers, currently handling %li connections per second.",
+        ot_overall_connections, ot_overall_connections, seconds_elapsed, seconds_elapsed / 3600, ot_overall_connections / seconds_elapsed ? seconds_elapsed : 1 );
+      }
       break;
     default: /* neither *scrape nor announce */
 e404:
@@ -322,6 +327,8 @@ int main()
     unsigned long ip;
     uint16 port;
 
+    ot_start_time = time( NULL );
+
     if (socket_bind4_reuse(s,NULL,6969)==-1)
         panic("socket_bind4_reuse");
 
@@ -359,7 +366,7 @@ int main()
                             byte_zero(h,sizeof(struct http_data));
                             h->ip=ip;
                             io_setcookie(n,h);
-                            ++overall_connections;
+                            ++ot_overall_connections;
                         } else
                             io_close(n);
                     } else
diff --git a/trackerlogic.c b/trackerlogic.c
index b9f14f0..e9b9b2e 100644
--- a/trackerlogic.c
+++ b/trackerlogic.c
@@ -203,7 +203,7 @@ size_t return_peers_for_torrent( ot_torrent *torrent, unsigned long amount, char
   }
   if( peer_count < amount ) amount = peer_count;
 
-  r += FORMAT_FORMAT_STRING( r, "d5:peers%li:",6*amount );
+  r += FORMAT_FORMAT_STRING( r, "d8:completei%lie10:incompletei%lie8:intervali60e5:peers%li:", seed_count, peer_count-seed_count, 6*amount );
   for( index = 0; index < amount; ++index ) {
     double step = 1.8*((double)( peer_count - wert - 1 ))/((double)( amount - index ));
     int off = random() % (int)floor( step );
@@ -222,7 +222,7 @@ size_t return_peers_for_torrent( ot_torrent *torrent, unsigned long amount, char
     MEMMOVE( r, ((ot_peer*)torrent->peer_list->peers[pool_index].data) + pool_offset, 6 );
     r += 6;
   }
-  r += FORMAT_FORMAT_STRING( r, "8:completei%lie10:incompletei%lie8:intervali60ee", seed_count, peer_count-seed_count );
+  *r++ = 'e';
 
   return r - reply;
 }