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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/19 22:08:12

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyMain.ml donkeyServers.ml 
                             donkeyServers.mli 

Log message:
        patch #5109

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.836&tr2=1.837&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyMain.ml.diff?tr1=1.48&tr2=1.49&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyServers.ml.diff?tr1=1.54&tr2=1.55&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyServers.mli.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.836 mldonkey/distrib/ChangeLog:1.837
--- mldonkey/distrib/ChangeLog:1.836    Fri May 19 19:04:15 2006
+++ mldonkey/distrib/ChangeLog  Fri May 19 22:08:12 2006
@@ -15,6 +15,9 @@
 =========
 
 2006/05/19
+5109: New option: pause_new_downloads
+- Set to true all new downloads will be paused automatically.
+- This option is automatically set to false on core start.
 5107: Configure: Check for MAGIC_ERROR in magic.h
 5106: BT: only send stop once on exit and then wait for success (Amorphous)
 5105: BT: Avoid starting torrent which has the same name
Index: mldonkey/src/networks/donkey/donkeyMain.ml
diff -u mldonkey/src/networks/donkey/donkeyMain.ml:1.48 
mldonkey/src/networks/donkey/donkeyMain.ml:1.49
--- mldonkey/src/networks/donkey/donkeyMain.ml:1.48     Sat Apr  8 01:27:29 2006
+++ mldonkey/src/networks/donkey/donkeyMain.ml  Fri May 19 22:08:12 2006
@@ -89,6 +89,7 @@
 let min_timer timer =
   DonkeySources.clean_sources (); (* Moved here from fivemin_timer. *)
   DonkeyServers.update_master_servers ();
+  DonkeyServers.check_for_preferred_servers ();
  (try
       DonkeyServers.query_locations_timer ();
     with _ -> ());
Index: mldonkey/src/networks/donkey/donkeyServers.ml
diff -u mldonkey/src/networks/donkey/donkeyServers.ml:1.54 
mldonkey/src/networks/donkey/donkeyServers.ml:1.55
--- mldonkey/src/networks/donkey/donkeyServers.ml:1.54  Wed Mar 29 15:41:33 2006
+++ mldonkey/src/networks/donkey/donkeyServers.ml       Fri May 19 22:08:12 2006
@@ -871,6 +871,16 @@
       lprintf_nl () "master servers: %d connected %d masters - re-computing 
completed"
         !nconnected_servers !nmasters
 
+let check_for_preferred_servers () =
+  let found_preferred = ref false in
+  Hashtbl.iter (fun _ s -> if s.server_preferred then found_preferred := true) 
servers_by_key;
+  if not !found_preferred && !!connect_only_preferred_server then
+    begin
+      connect_only_preferred_server =:= false;
+      let message = "Set connect_only_preferred_server to false because no 
preferred server was found" in
+      lprintf_nl () "%s" message;
+      startup_message := !startup_message ^ message
+    end
 
 open LittleEndian
 
Index: mldonkey/src/networks/donkey/donkeyServers.mli
diff -u mldonkey/src/networks/donkey/donkeyServers.mli:1.4 
mldonkey/src/networks/donkey/donkeyServers.mli:1.5
--- mldonkey/src/networks/donkey/donkeyServers.mli:1.4  Mon Aug  8 16:47:31 2005
+++ mldonkey/src/networks/donkey/donkeyServers.mli      Fri May 19 22:08:12 2006
@@ -30,3 +30,4 @@
 val query_locations_timer : unit -> unit
 val add_query_location : DonkeyTypes.file -> DonkeyTypes.server -> unit
 val udp_query_sources : unit -> unit
+val check_for_preferred_servers : unit -> unit