** 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.

1 files changed, 22 insertions, 16 deletions

diff --git a/trackerlogic.h b/trackerlogic.h
index 4052fa4..5ae644b 100644
--- a/trackerlogic.h
+++ b/trackerlogic.h
@@ -108,22 +108,29 @@ struct ot_peerlist {
 
 struct ot_workstruct {
   /* Thread specific, static */
-  char   *inbuf;
-#define G_INBUF_SIZE    8192
-  char   *outbuf;
-#define G_OUTBUF_SIZE   8192
-#ifdef _DEBUG_HTTPERROR
-  char   *debugbuf;
-#define G_DEBUGBUF_SIZE 8192
+  char    *inbuf;
+#define   G_INBUF_SIZE    8192
+  char    *outbuf;
+#define   G_OUTBUF_SIZE   8192
+#ifdef    _DEBUG_HTTPERROR
+  char    *debugbuf;
+#define   G_DEBUGBUF_SIZE 8192
 #endif
 
+  /* The peer currently in the working */
+  ot_peer  peer;
+
+  /* Pointers into the request buffer */
+  ot_hash *hash;
+  char    *peer_id;
+
   /* HTTP specific, non static */
-  int     keep_alive;
-  char   *request;
-  ssize_t request_size;
-  ssize_t header_size;
-  char   *reply;
-  ssize_t reply_size;
+  int      keep_alive;
+  char    *request;
+  ssize_t  request_size;
+  ssize_t  header_size;
+  char    *reply;
+  ssize_t  reply_size;
 };
 
 /*
@@ -150,9 +157,8 @@ void exerr( char * message );
 
 /* add_peer_to_torrent does only release the torrent bucket if from_sync is set,
    otherwise it is released in return_peers_for_torrent */
-#define add_peer_to_torrent(hash,peer,proto) add_peer_to_torrent_and_return_peers(hash,peer,proto,0,NULL)
-size_t  add_peer_to_torrent_and_return_peers( ot_hash hash, ot_peer *peer, PROTO_FLAG proto, size_t amount, char * reply );
-size_t  remove_peer_from_torrent( ot_hash hash, ot_peer *peer, char *reply, PROTO_FLAG proto );
+size_t  add_peer_to_torrent_and_return_peers( PROTO_FLAG proto, struct ot_workstruct *ws, size_t amount );
+size_t  remove_peer_from_torrent( PROTO_FLAG proto, struct ot_workstruct *ws );
 size_t  return_tcp_scrape_for_torrent( ot_hash *hash, int amount, char *reply );
 size_t  return_udp_scrape_for_torrent( ot_hash hash, char *reply );
 void    add_torrent_from_saved_state( ot_hash hash, ot_time base, size_t down_count );