[Mldonkey-commits] Changes to mldonkey/src/networks/donkey/donkeyProtoKademlia.ml

[mldonkey-commits]

Index: mldonkey/src/networks/donkey/donkeyProtoKademlia.ml
diff -u mldonkey/src/networks/donkey/donkeyProtoKademlia.ml:1.11 
mldonkey/src/networks/donkey/donkeyProtoKademlia.ml:1.12
--- mldonkey/src/networks/donkey/donkeyProtoKademlia.ml:1.11    Tue Sep  6 
11:24:59 2005
+++ mldonkey/src/networks/donkey/donkeyProtoKademlia.ml Wed Oct 19 21:06:08 2005
@@ -35,6 +35,13 @@
 
 module P = struct
 
+    let lprintf_nl () =
+      lprintf "%s[Kademlia] "
+      (log_time ()) ; lprintf_nl2
+
+    let lprintf_n () =
+      lprintf "[Kademlia] " ; lprintf
+
     let names_of_tag =
       [
         "\248", Field_UNKNOWN "buddyhash"; (* 0xF8 *)
@@ -253,7 +260,7 @@
                       peer_kind := kind)
               | _ ->
                 if !verbose_unknown_messages then
-                  lprintf_nl "[Kademlia] Unused source tag [%s]"
+                  lprintf_nl () "Unused source tag [%s]"
                     (escaped_string_of_field tag)
           ) r_tags;
           {
@@ -394,7 +401,7 @@
           magic <> kademlia_packed_header_code) then
         begin
           if !CommonOptions.verbose_unknown_messages then begin
-              lprintf_nl "Received unknown UDP packet";
+              lprintf_nl () "Received unknown UDP packet";
               dump pbuf;
             end;
           raise Not_found
@@ -431,10 +438,8 @@
 
         if !verbose_overnet then
           begin
-            lprintf_nl "[Kademlia] Sending UDP to %s:%d type %s (opcode 0x%02X 
len %d)"
-              (Ip.to_string ip) port (message_to_string msg) (get_uint8 s 1)
-            (String.length s);
-(*dump s; lprint_newline ();*)
+            lprintf_nl () "Sending UDP to %s:%d (opcode 0x%02X len %d) type %s"
+              (Ip.to_string ip) port (get_uint8 s 1) (String.length s) 
(message_to_string msg);
           end;
         (*
         let len = String.length s in
@@ -447,7 +452,7 @@
         UdpSocket.write sock ping s ip port
       with
       | MessageNotImplemented -> ()
-      | e -> lprintf_nl "[Kademlia] Exception %s in udp_send" 
(Printexc2.to_string e)
+      | e -> lprintf_nl () "Exception %s in udp_send" (Printexc2.to_string e)
 
     let udp_handler f sock event =
       match event with
@@ -467,7 +472,7 @@
               with e ->
                 if !verbose_unknown_messages then
                 begin
-                  lprintf_nl "[Kademlia] Error %s in udp_handler, dump of 
packet:"
+                  lprintf_nl () "Error %s in udp_handler, dump of packet:"
                     (Printexc2.to_string e);
                   dump p.UdpSocket.udp_content;
                   lprint_newline ()