[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/bittorr...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/07/15 18:22:05

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTInteractive.ml bTMain.ml 

Log message:
        patch #7233

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1437&r2=1.1438
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.155&r2=1.156
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTMain.ml?cvsroot=mldonkey&r1=1.30&r2=1.31

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1437
retrieving revision 1.1438
diff -u -b -r1.1437 -r1.1438
--- distrib/ChangeLog   26 May 2010 17:40:28 -0000      1.1437
+++ distrib/ChangeLog   15 Jul 2010 18:22:05 -0000      1.1438
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2010/07/15
+7233: BT: Announce shared files when share_scan_interval = 0 (ygrek)
+
 2010/05/26
 7206: MinGW: Fix diskinfo on large partitions
 

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -b -r1.155 -r1.156
--- src/networks/bittorrent/bTInteractive.ml    24 May 2010 18:08:17 -0000      
1.155
+++ src/networks/bittorrent/bTInteractive.ml    15 Jul 2010 18:22:05 -0000      
1.156
@@ -823,6 +823,10 @@
         end
   ) shared_files_copy
 
+(** talk_to_tracker maintains timers and will connect to trackers only when 
allowed by rules *)
+let announce_shared_files () =
+  List.iter (fun file -> if file_state file = FileShared then 
BTClients.talk_to_tracker file false) !current_files
+
 let scan_new_torrents_directory () =
   let filenames = Unix2.list_directory new_torrents_directory in
   List.iter (fun file ->

Index: src/networks/bittorrent/bTMain.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTMain.ml,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- src/networks/bittorrent/bTMain.ml   4 Apr 2010 09:16:28 -0000       1.30
+++ src/networks/bittorrent/bTMain.ml   15 Jul 2010 18:22:05 -0000      1.31
@@ -84,6 +84,7 @@
     add_session_timer enabler !!import_new_torrents_interval (fun _ ->
         BTInteractive.scan_new_torrents_directory ();
     );
+    add_session_timer enabler 60. (fun _ -> 
BTInteractive.announce_shared_files (); );
     add_timer 5. (fun _ -> BTInteractive.scan_new_torrents_directory ());
     add_timer 10. BTInteractive.share_files;
     add_session_timer enabler 600. BTInteractive.retry_all_ft;