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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       10/10/23 18:20:31

Modified files:
        distrib        : ChangeLog 
        src/networks/direct_connect: dcServers.ml 

Log message:
        patch #7353

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1484&r2=1.1485
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcServers.ml?cvsroot=mldonkey&r1=1.21&r2=1.22

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1484
retrieving revision 1.1485
diff -u -b -r1.1484 -r1.1485
--- distrib/ChangeLog   23 Oct 2010 18:19:58 -0000      1.1484
+++ distrib/ChangeLog   23 Oct 2010 18:20:30 -0000      1.1485
@@ -15,6 +15,7 @@
 =========
 
 2010/10/23
+7353: DC: silence "ADC not supported" message (ygrek)
 7352: net: do not log ordinary network errors (ygrek)
 7351: DC: fix download of large files (integer overflow) (ygrek)
 7350: cleanup accesstest temp files (ygrek)

Index: src/networks/direct_connect/dcServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcServers.ml,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- src/networks/direct_connect/dcServers.ml    18 Jul 2010 10:59:20 -0000      
1.21
+++ src/networks/direct_connect/dcServers.ml    23 Oct 2010 18:20:31 -0000      
1.22
@@ -582,12 +582,14 @@
   with
     _ -> None
 
+exception ADC_not_supported
+
 let parse_address s =
   let s = match ssplit (String.lowercase s) "://" with
   | Some ("dchub",s) -> s
   | None -> s
-  | Some (("adc"|"adcs"),_) -> failwith "ADC not supported"
-  | Some (proto,_) -> failwith (Printf.sprintf "Unsupported protocol %S" proto)
+  | Some (("adc"|"adcs"),_) -> raise ADC_not_supported
+  | Some (proto,_) -> failwith (Printf.sprintf "Unsupported protocol in %S" s)
   in
   try Scanf.sscanf s "%s@:%u" (fun s n -> s,n) with _ -> s,411
 
@@ -606,13 +608,17 @@
     }
   in
   let l = xml_select ["hublist";"hubs";"hub"] [x] in
+  let adc = ref 0 in
   let add_hub acc x = 
-    try make_hub x :: acc
-    with exn -> lprintf_nl "Skipping hublist entry : %s" (Printexc2.to_string 
exn); acc
+    try 
+      make_hub x :: acc
+    with 
+    | ADC_not_supported -> incr adc; acc
+    | exn -> lprintf_nl "Skipping hublist entry : %s" (Printexc2.to_string 
exn); acc
   in
   let l' = List.fold_left add_hub [] l in
   if !verbose_msg_servers then
-    lprintf_nl "Found %u valid (of %u total) servers in hublist" (List.length 
l') (List.length l);
+    lprintf_nl "Servers in hublist : %u total, %u valid, %u adc" (List.length 
l) (List.length l') !adc;
   l'
 
 (* Connect to all autoconnect servers once *)