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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/05 22:02:37

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTClients.ml bTGlobals.ml 

Log message:
        patch #5064

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.803&tr2=1.804&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTClients.ml.diff?tr1=1.67&tr2=1.68&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml.diff?tr1=1.55&tr2=1.56&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.803 mldonkey/distrib/ChangeLog:1.804
--- mldonkey/distrib/ChangeLog:1.803    Fri May  5 22:00:16 2006
+++ mldonkey/distrib/ChangeLog  Fri May  5 22:02:37 2006
@@ -15,6 +15,7 @@
 =========
 
 2006/05/06
+5064: BT: only try to connect to http trackers (pango)
 5040: Overnet: Open TCP port only when network is active
 
 2006/04/14
Index: mldonkey/src/networks/bittorrent/bTClients.ml
diff -u mldonkey/src/networks/bittorrent/bTClients.ml:1.67 
mldonkey/src/networks/bittorrent/bTClients.ml:1.68
--- mldonkey/src/networks/bittorrent/bTClients.ml:1.67  Sun Apr  9 00:27:03 2006
+++ mldonkey/src/networks/bittorrent/bTClients.ml       Fri May  5 22:02:37 2006
@@ -145,7 +145,7 @@
       (* if there is no tracker left, do something ? *)
       if !verbose_msg_servers then
        lprintf_nl () "No trackers left, reenabling all of them...";
-      List.iter (fun t -> t.tracker_enabled <- true) file.file_trackers;
+      List.iter (fun t -> t.tracker_enabled <- can_handle_tracker t) 
file.file_trackers;
       file.file_trackers
     end in
 
Index: mldonkey/src/networks/bittorrent/bTGlobals.ml
diff -u mldonkey/src/networks/bittorrent/bTGlobals.ml:1.55 
mldonkey/src/networks/bittorrent/bTGlobals.ml:1.56
--- mldonkey/src/networks/bittorrent/bTGlobals.ml:1.55  Sun Apr  9 00:27:03 2006
+++ mldonkey/src/networks/bittorrent/bTGlobals.ml       Fri May  5 22:02:37 2006
@@ -185,6 +185,9 @@
         file_temp);
   file_fd
 
+let can_handle_tracker t =
+  String2.check_prefix (String.lowercase t.tracker_url) "http://";
+
 let rec set_trackers file file_trackers =
   match file_trackers with
     | [] -> ()
@@ -192,7 +195,7 @@
        if not (List.exists (fun tracker -> 
                               tracker.tracker_url = url
                            ) file.file_trackers) then 
-         file.file_trackers <- {
+         let t = {
             tracker_url = url;
             tracker_interval = 600;
             tracker_min_interval = 600;
@@ -206,7 +209,9 @@
             tracker_id = "";
             tracker_key = "";
            tracker_enabled = true
-          } :: file.file_trackers;
+          } in
+         t.tracker_enabled <- can_handle_tracker t;
+         file.file_trackers <-  t :: file.file_trackers;
        set_trackers file q
 
 let new_file file_id t torrent_diskname file_temp file_state =