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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/11/14 16:35:53

Modified files:
        distrib        : ChangeLog 
        src/networks/donkey: donkeyClient.ml donkeyOvernet.ml 

Log message:
        patch #5553

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1092&r2=1.1093
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyClient.ml?cvsroot=mldonkey&r1=1.106&r2=1.107
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/donkey/donkeyOvernet.ml?cvsroot=mldonkey&r1=1.73&r2=1.74

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1092
retrieving revision 1.1093
diff -u -b -r1.1092 -r1.1093
--- distrib/ChangeLog   14 Nov 2006 13:52:39 -0000      1.1092
+++ distrib/ChangeLog   14 Nov 2006 16:35:52 -0000      1.1093
@@ -15,6 +15,10 @@
 =========
 
 2006/11/14
+5553: EDK/OV/KAD: small updates (bogeyman)
+- EDK: log unknown client tags with verbosity mct
+- OV/KAD: ignore OvernetPeerNotFound and log number of peers every
+  60 secs when logging
 5551: web_infos: Fix mtime detection, old files were not updated
 5550: debug_fileinfo: Print [a|c|m]time values
 5530: GD: Improve graph output (skeeve, Schlumpf)

Index: src/networks/donkey/donkeyClient.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyClient.ml,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -b -r1.106 -r1.107
--- src/networks/donkey/donkeyClient.ml 12 Nov 2006 12:36:14 -0000      1.106
+++ src/networks/donkey/donkeyClient.ml 14 Nov 2006 16:35:52 -0000      1.107
@@ -695,8 +695,9 @@
       | Field_UNKNOWN "mod_version" ->
           let s = to_lowercase (string_of_tag_value tag.tag_value) in 
           parse_mod_version s c
-      | _ -> ()
-
+      | _ -> 
+          if !verbose_msg_clienttags then
+            lprintf_nl "Unknown Emule tag: [%s] (update_client_from_tags)" 
(escaped_string_of_field tag)
   ) tags
     
 let update_emule_proto_from_tags c tags =
@@ -743,8 +744,8 @@
            Some _ -> ()
          | _ ->  if s <> "" then c.client_osinfo <- Some s)
       | _ -> 
-          if !verbose_msg_clients then
-            lprintf_nl "Unknown Emule tag: [%s]" (escaped_string_of_field tag)
+          if !verbose_msg_clienttags then
+            lprintf_nl "Unknown Emule tag: [%s] 
(update_emule_proto_from_tags)" (escaped_string_of_field tag)
   ) tags
 
 let fight_disguised_mods c =

Index: src/networks/donkey/donkeyOvernet.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/donkey/donkeyOvernet.ml,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -b -r1.73 -r1.74
--- src/networks/donkey/donkeyOvernet.ml        5 Nov 2006 14:13:51 -0000       
1.73
+++ src/networks/donkey/donkeyOvernet.ml        14 Nov 2006 16:35:53 -0000      
1.74
@@ -1249,18 +1249,18 @@
  (* send the answer *)   
    | OvernetGetMyIP other_port ->   
        if !verbose_overnet && debug_client other_ip then   
-         lprintf_nl "GET MY IP (port=%d)\n" other_port;   
+         lprintf_nl "GET MY IP (port=%d)" other_port;   
  (* FIXME : should be able to flush the UDP buffer*)   
        udp_send sender (OvernetGetMyIPResult other_ip);   
        udp_send sender OvernetGetMyIPDone   
     
    | OvernetGetMyIPResult(ip) ->   
        if !verbose_overnet && debug_client other_ip then   
-         lprintf_nl "GET MY IP RESULT (%s)\n" (Ip.to_string ip)   
+         lprintf_nl "GET MY IP RESULT (%s)" (Ip.to_string ip)   
     
    | OvernetGetMyIPDone ->   
        if !verbose_overnet && debug_client other_ip then   
-         lprintf_nl "GET MY IP DONE\n"   
+         lprintf_nl "GET MY IP DONE"   
   
   | OvernetPeerNotFound peer ->
       begin
@@ -1268,6 +1268,7 @@
           lprintf_nl "Peer NOT FOUND %s (%s:%d) kind: %d (msg 33)"
             (Md4.to_string peer.peer_md4) (Ip.to_string peer.peer_ip)
         peer.peer_port peer.peer_kind;
+(* We ignore OvernetPeerNotFound, the original client sends this message very 
often (even if the peer is alive)
         let dp = { dummy_peer with peer_port = peer.peer_port ; peer_ip = 
peer.peer_ip } in
         if KnownPeers.mem known_peers dp
         then begin
@@ -1294,6 +1295,7 @@
             done;
           with Exit -> ();
         end;
+*)
       end
 
    | OvernetUnknown21 peer ->
@@ -1526,6 +1528,17 @@
 
           (* FIXE: Dump latencies to logfile *)
           if !verbose_overnet then ignore (UdpSocket.get_latencies (ref true));
+
+          if !verbose_overnet then begin
+            lprintf_nl "%d peers (prebucket: %d peers)" !connected_peers 
!pre_connected_peers;
+            for i = 0 to !n_used_buckets do
+              if (Fifo.length buckets.(i)) <> 0 || (Fifo.length 
prebuckets.(i)) <> 0 then
+              lprintf_nl "bucket[%d] : %d peers (prebucket %d)"
+                i (Fifo.length buckets.(i)) (Fifo.length prebuckets.(i));
+            done;
+            lprintf_nl "unknown_peers: %d" (LimitedList.length unknown_peers);
+            lprintf_nl "boot_peers: %d" (LimitedList.length !!boot_peers);
+          end;
       );
 
 (* every 15min for light operations *)