[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.15 
mldonkey/src/networks/donkey/donkeyProtoOvernet.ml:1.16
--- mldonkey/src/networks/donkey/donkeyProtoOvernet.ml:1.15     Tue Jun 28 
23:17:07 2005
+++ mldonkey/src/networks/donkey/donkeyProtoOvernet.ml  Thu Jul  7 00:25:46 2005
@@ -185,14 +185,14 @@
             Field_UNKNOWN "loc" ->
               for_string_tag tag (fun bcp ->
                   if !verbose_overnet then
-                  lprintf "loc tag : [%s]\n" 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 "FIXME: Received BCP type 2 %s\n"
+                          lprintf_nl "FIXME: Received BCP type 2 %s"
                             bcp;
 
 (* FIXME: A firewalled peer... 
@@ -205,14 +205,14 @@
                         peer_tcpport := int_of_string port;
                     | _ ->
                        if !verbose_overnet then
-                          lprintf "Ill formed bcp: [%s]\n" bcp;
+                          lprintf_nl "Ill formed bcp: [%s]" bcp;
                   else
                    if !verbose_overnet then
-                      lprintf "Ill formed bcp: [%s]\n" bcp;
+                      lprintf "Ill formed bcp: [%s]" bcp;
               )
           | _ ->
             if !verbose_overnet then
-              lprintf "Unused source tag [%s]\n"
+              lprintf_nl "Unused source tag [%s]"
                 (escaped_string_of_field tag)
       ) r_tags;
       {
@@ -321,7 +321,9 @@
         | 21 ->
 (* idem as 33, but IP seem to be a low ID *)
             if !verbose_overnet then begin
-                lprintf "Received code %d message.\nDump: " opcode; dump s; 
lprint_newline ();
+                lprintf_nl "Received code %d message.\nDump:" opcode;
+                dump s;
+                lprintf_nl "";
               end;
             
             let peer, _ = get_peer s 0 in
@@ -329,57 +331,57 @@
         
         | 24 ->
             if !verbose_overnet then
-              lprintf "RCVD: OVERNET FIREWALL CONNECTION (24)\n";
+              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 "RCVD: OVERNET FIREWALL CONNECTION ACK (25)\n";
+              lprintf_nl "RCVD: OVERNET FIREWALL CONNECTION ACK (25)";
             let md4 = get_md4 s 0 in
             OvernetFirewallConnectionACK(md4)
         
         | 26 ->
             if !verbose_overnet then
-              lprintf "RCVD: OVERNET FIREWALL CONNECTION NACK (26)\n";
+              lprintf_nl "RCVD: OVERNET FIREWALL CONNECTION NACK (26)";
             let md4 = get_md4 s 0 in
             OvernetFirewallConnectionNACK(md4)
         
         | 27 ->
             if !verbose_overnet then
-              lprintf "RCVD: GETMYIP MESSAGE (27)\n";
+              lprintf_nl "RCVD: GETMYIP MESSAGE (27)";
             OvernetGetMyIP (get_int16 s 0)
         | 28 -> 
             if !verbose_overnet then
-              lprintf "RCVD: GETMYIPRESULT MESSAGE (28)\n";
+              lprintf_nl "RCVD: GETMYIPRESULT MESSAGE (28)";
             let ip = get_ip s 0 in
             OvernetGetMyIPResult (ip)
         | 29 -> 
             if !verbose_overnet then
-              lprintf "RCVD: GETMYIPDONE MESSAGE (29)\n";
+              lprintf_nl "RCVD: GETMYIPDONE MESSAGE (29)";
             OvernetGetMyIPDone
         
         | 33 ->
             if !verbose_overnet then
-              lprintf "RCVD: PEER NOT FOUND (33)\n";
+              lprintf_nl "RCVD: PEER NOT FOUND (33)";
             let peer, _ = get_peer s 0 in
             OvernetPeerNotFound peer
         
         | _ ->
             if !verbose_unknown_messages then
               begin
-                lprintf "UNKNOWN: opcode %d\n" opcode;
+                lprintf_nl "UNKNOWN: opcode %d" opcode;
                 dump s;
-                lprint_newline ();
+                lprintf_nl "";
               end;
             OvernetUnknown (opcode, s)
       with e ->
           if !verbose_hidden_errors then
             begin
-              lprintf "Error %s while parsing opcode %d\n" 
(Printexc2.to_string e) opcode;
+              lprintf_nl "Error %s while parsing opcode %d" 
(Printexc2.to_string e) opcode;
               dump s;
-              lprint_newline ();
+              lprintf_nl "";
             end;
           OvernetUnknown (opcode, s)
     
@@ -394,7 +396,7 @@
                   int_of_char pbuf.[0] <> 227 then 
                   begin
                     if !verbose_unknown_messages then begin
-                        lprintf "Received unknown UDP packet\n";
+                        lprintf_nl "Received unknown UDP packet";
                         dump pbuf;
                       end
                   end 
@@ -412,10 +414,10 @@
                   end
               with e ->
                 if !verbose_hidden_errors then begin
-                  lprintf "Error %s in udp_handler, dump of packet:\n"
+                  lprintf_nl "Error %s in udp_handler, dump of packet:"
                     (Printexc2.to_string e); 
                   dump p.UdpSocket.udp_content;
-                  lprint_newline ()
+                  lprintf_nl ""
                 end
           );
       | _ -> ()
@@ -436,15 +438,15 @@
         let s = Buffer.contents udp_buf in
         if !verbose_overnet then 
           begin            
-            lprintf "Sending UDP to %s:%d (0x%02X)\n" 
+            lprintf_nl "Sending UDP to %s:%d (0x%02X)"
               (Ip.to_string ip) port (get_uint8 s 1);
-            lprintf "  %s\n"  (message_to_string msg)
+            lprintf_nl "  %s"  (message_to_string msg)
 (*dump s; lprint_newline ();*)
           end;
         let len = String.length s in
         UdpSocket.write sock ping s ip port
       with e ->
-          lprintf "Exception %s in udp_send\n" (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
@@ -516,7 +518,7 @@
             assert (port = !!overnet_port)
         | _ -> failwith "Bad socket address"
       with e ->
-          lprintf "Could not affect a TCP port %d for Overnet\n" 
!!overnet_port;
+          lprintf_nl "Could not assign TCP port %d for Overnet\n" 
!!overnet_port;
           tcp_sock := None
     
     let disable () =