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

[mldonkey-commits]

Index: mldonkey/src/networks/donkey/donkeyProtoOvernet.ml
diff -u mldonkey/src/networks/donkey/donkeyProtoOvernet.ml:1.19 
mldonkey/src/networks/donkey/donkeyProtoOvernet.ml:1.20
--- mldonkey/src/networks/donkey/donkeyProtoOvernet.ml:1.19     Tue Sep  6 
11:24:59 2005
+++ mldonkey/src/networks/donkey/donkeyProtoOvernet.ml  Wed Oct 19 21:06:08 2005
@@ -32,7 +32,14 @@
 
 module Proto = struct
 
-    let names_of_tag = file_common_tags
+     let lprintf_nl () =
+      lprintf "%s[Overnet] "
+      (log_time ()) ; lprintf_nl2
+
+    let lprintf_n () =
+      lprintf "[Overnet] " ; lprintf
+
+   let names_of_tag = file_common_tags
 
     let buf_peer buf p =
       buf_md4 buf p.peer_md4;
@@ -182,14 +189,14 @@
             Field_UNKNOWN "loc" ->
               for_string_tag tag (fun bcp ->
                   if !verbose_overnet then
-                  lprintf_nl "loc tag : [%s]" bcp;
+                  lprintf_nl () "loc tag : [%s]" bcp;
                   if String2.starts_with bcp "bcp://" then
                     let bcp2 = String.sub bcp 6 (String.length bcp - 6)
                     in
                     match String2.split_simplify bcp2 ':' with
                     | [_;ip;port] ->
                         if !verbose_overnet then
-                          lprintf_nl "[Overnet] Received BCP type 2 %s"
+                          lprintf_nl () "Received BCP type 2 %s"
                             bcp;
 
 (* FIXME: A firewalled peer...
@@ -202,14 +209,14 @@
                         peer_tcpport := int_of_string port;
                     | _ ->
                        if !verbose_overnet then
-                          lprintf_nl "[Overnet] Ill formed bcp: [%s]" bcp;
+                          lprintf_nl () "Ill formed bcp: [%s]" bcp;
                   else
                    if !verbose_overnet then
-                      lprintf "[Overnet] Ill formed bcp: [%s]" bcp;
+                      lprintf_nl () "Ill formed bcp: [%s]" bcp;
               )
           | _ ->
             if !verbose_unknown_messages then
-              lprintf_nl "[Overnet] Unused source tag [%s]"
+              lprintf_nl () "Unused source tag [%s]"
                 (escaped_string_of_field tag)
       ) r_tags;
       {
@@ -307,7 +314,7 @@
         | 21 ->
 (* idem as 33, but IP seem to be a low ID *)
             if !verbose_overnet then begin
-                lprintf_nl "Received code %d message.\nDump:" opcode;
+                lprintf_nl () "Received code %d message. Dump:" opcode;
                 dump s;
                 lprint_newline ();
               end;
@@ -315,42 +322,42 @@
             OvernetUnknown21 peer
         | 24 ->
             if !verbose_overnet then
-              lprintf_nl "RCVD: OVERNET FIREWALL CONNECTION (24)";
+              lprintf_nl () "RCVD: OVERNET FIREWALL CONNECTION (24)";
             let md4 = get_md4 s 0 in
             let port = get_int16 s 16 in
             OvernetFirewallConnection(md4,port)
         | 25 ->
             if !verbose_overnet then
-              lprintf_nl "RCVD: OVERNET FIREWALL CONNECTION ACK (25)";
+              lprintf_nl () "RCVD: OVERNET FIREWALL CONNECTION ACK (25)";
             let md4 = get_md4 s 0 in
             OvernetFirewallConnectionACK(md4)
         | 26 ->
             if !verbose_overnet then
-              lprintf_nl "RCVD: OVERNET FIREWALL CONNECTION NACK (26)";
+              lprintf_nl () "RCVD: OVERNET FIREWALL CONNECTION NACK (26)";
             let md4 = get_md4 s 0 in
             OvernetFirewallConnectionNACK(md4)
         | 27 ->
             if !verbose_overnet then
-              lprintf_nl "RCVD: GETMYIP MESSAGE (27)";
+              lprintf_nl () "RCVD: GETMYIP MESSAGE (27)";
             OvernetGetMyIP (get_int16 s 0)
         | 28 ->
             if !verbose_overnet then
-              lprintf_nl "RCVD: GETMYIPRESULT MESSAGE (28)";
+              lprintf_nl () "RCVD: GETMYIPRESULT MESSAGE (28)";
             let ip = get_ip s 0 in
             OvernetGetMyIPResult (ip)
         | 29 ->
             if !verbose_overnet then
-              lprintf_nl "RCVD: GETMYIPDONE MESSAGE (29)";
+              lprintf_nl () "RCVD: GETMYIPDONE MESSAGE (29)";
             OvernetGetMyIPDone
         | 33 ->
             if !verbose_overnet then
-              lprintf_nl "RCVD: PEER NOT FOUND (33)";
+              lprintf_nl () "RCVD: PEER NOT FOUND (33)";
             let peer, _ = get_peer s 0 in
             OvernetPeerNotFound peer
         | _ ->
             if !verbose_unknown_messages then
               begin
-                lprintf_nl "[Overnet] unknown opcode %d" opcode;
+                lprintf_nl () "unknown opcode %d" opcode;
                 dump s;
                 lprint_newline ();
               end;
@@ -358,7 +365,7 @@
       with e ->
           if !verbose_hidden_errors then
             begin
-              lprintf_nl "Error %s while parsing opcode %d" 
(Printexc2.to_string e) opcode;
+              lprintf_nl () "Error %s while parsing opcode %d" 
(Printexc2.to_string e) opcode;
               dump s;
               lprint_newline ();
             end;
@@ -375,7 +382,7 @@
                   int_of_char pbuf.[0] <> 227 then
                   begin
                     if !verbose_unknown_messages then begin
-                        lprintf_nl "[Overnet] Received unknown UDP packet";
+                        lprintf_nl () "Received unknown UDP packet";
                         dump pbuf;
                       end
                   end
@@ -393,7 +400,7 @@
                   end
               with e ->
                 if !verbose_unknown_messages then begin
-                  lprintf_nl "[Overnet] 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 ()
@@ -417,15 +424,13 @@
         let s = Buffer.contents udp_buf in
         if !verbose_overnet then
           begin
-            lprintf_nl "Sending UDP to %s:%d (0x%02X)"
-              (Ip.to_string ip) port (get_uint8 s 1);
-            lprintf_nl "  %s"  (message_to_string msg)
-(*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
         UdpSocket.write sock ping s ip port
       with e ->
-          lprintf_nl "Exception %s in udp_send" (Printexc2.to_string e)
+          lprintf_nl () "Exception %s in udp_send" (Printexc2.to_string e)
 
     let udp_send sock ip port ping msg =
       match msg with
@@ -497,7 +502,7 @@
             assert (port = !!overnet_port)
         | _ -> failwith "Bad socket address"
       with e ->
-          lprintf_nl "Could not assign TCP port %d for Overnet\n" 
!!overnet_port;
+          lprintf_nl "[Overnet] Could not assign TCP port %d for Overnet" 
!!overnet_port;
           tcp_sock := None
 
     let disable () =