From d42bf5a0310b8df4babff645ee91c37e9f994bfe Mon Sep 17 00:00:00 2001
From: erdgeist <>
Date: Thu, 22 Apr 2010 22:08:42 +0000
Subject: ** struct ot_workstruct gets ritcher (and will become even ritcher
 soon). This is where we encapsulate all per-request data from peer to hash to
 peer_id, so that it is available everywhere without passing hundreds of
 pointers down the stack. Most functions that do work down the stack now
 accept an ot_workstruct and some flags. So it can end up in the
 stats/event-handler where it will be the default parameter in the future.

** peer_id is now being copied by default and moved to ot_workstruct
So it is available in stats and subsequent functions.

** sync scrape madness is gone
SYNC_SCRAPE was intended to sync tracker state that would normally be lost on restarts i.e.
downloaded counts per torrent. The way was to push it in the tracker cloud after finding all
neighbouring trackers.
This is madness. It never was tested and can be done per tracker by fetching
stats/mode=statedump from time to time and starting opentracker with the -l option later.

** livesync thread has its own ot_workstruct now
So it can behave like ot_udp and ot_http against trackerlogic.c and get rid of the first half
of the embarrassing global variables. The sending half will be fixed soon [tm].

** stats can log completed events
The author recognizes the needs of original content distributors to keep track of the amount
of times a work has been downloaded. While not feasible and used on openbittorrent and other
open and anonymous tracker installations, a tracker user can now choose to send those events
to syslog.
---
 ot_stats.c | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

(limited to 'ot_stats.c')

diff --git a/ot_stats.c b/ot_stats.c
index 43ab8fd..b6469f9 100644
--- a/ot_stats.c
+++ b/ot_stats.c
@@ -642,8 +642,9 @@ void stats_issue_event( ot_status_event event, PROTO_FLAG proto, uintptr_t event
     case EVENT_COMPLETED:
 #ifdef WANT_SYSLOGS
       if( event_data) {
+        struct ot_workstruct *ws = (struct ot_workstruct *)event_data;
         char timestring[64];
-        char hex_out[42];
+        char hash_hex[42], peerid_hex[42], ip_readable[64];
         struct tm time_now;
         time_t ttt;
 
@@ -651,8 +652,19 @@ void stats_issue_event( ot_status_event event, PROTO_FLAG proto, uintptr_t event
         localtime_r( &ttt, &time_now );
         strftime( timestring, sizeof( timestring ), "%FT%T%z", &time_now );
 
-        to_hex( hex_out, (uint8_t*)event_data );
-        syslog( LOG_INFO, "time=%s event=completed info_hash=%s", timestring, hex_out );
+        to_hex( hash_hex, *ws->hash );
+        if( ws->peer_id )
+          to_hex( peerid_hex, (uint8_t*)ws->peer_id );
+        else {
+          *peerid_hex=0;
+        }
+
+#ifdef WANT_V6
+        ip_readable[ fmt_ip6c( ip_readable, (char*)&ws->peer ) ] = 0;
+#else
+        ip_readable[ fmt_ip4( ip_readable, (char*)&ws->peer ) ] = 0;
+#endif
+        syslog( LOG_INFO, "time=%s event=completed info_hash=%s peer_id=%s ip=%s", timestring, hash_hex, peerid_hex, ip_readable );
       }
 #endif
       ot_overall_completed++;
-- 
cgit v1.2.3