[Mldonkey-commits] mldonkey distrib/ChangeLog src/daemon/common/co...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    05/12/13 14:33:34

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: commonOptions.ml guiDecoding.ml 
                           guiEncoding.ml 
        src/networks/bittorrent: bTInteractive.ml 

Log message:
        patch #4700

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.609&tr2=1.610&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonOptions.ml.diff?tr1=1.104&tr2=1.105&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiDecoding.ml.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiEncoding.ml.diff?tr1=1.42&tr2=1.43&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.68&tr2=1.69&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.609 mldonkey/distrib/ChangeLog:1.610
--- mldonkey/distrib/ChangeLog:1.609    Tue Dec 13 12:43:47 2005
+++ mldonkey/distrib/ChangeLog  Tue Dec 13 14:33:33 2005
@@ -12,6 +12,7 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2005/12/13
+4700: Log: New verbosity option "gui" to debug GUI protocol
 4696: Fix some C compiler warnings
 
 2005/12/10
Index: mldonkey/src/daemon/common/commonOptions.ml
diff -u mldonkey/src/daemon/common/commonOptions.ml:1.104 
mldonkey/src/daemon/common/commonOptions.ml:1.105
--- mldonkey/src/daemon/common/commonOptions.ml:1.104   Sat Dec  3 16:20:26 2005
+++ mldonkey/src/daemon/common/commonOptions.ml Tue Dec 13 14:33:33 2005
@@ -1446,6 +1446,7 @@
   verb : debug other
   sm : debug source management
   net : debug net
+  gui : debug gui
   do : some download warnings
   up : some upload warnings
   unk : unknown messages
@@ -1698,6 +1699,7 @@
           | "verb" -> verbose := true
           | "sm" -> incr verbose_sources
           | "net" -> BasicSocket.debug := true; TcpServerSocket.debug := true; 
UdpSocket.debug := true
+          | "gui" -> GuiProto.verbose_gui_decoding := true
           | "do" -> verbose_download := true
           | "up" -> verbose_upload := true
           | "unk" -> verbose_unknown_messages := true
Index: mldonkey/src/daemon/common/guiDecoding.ml
diff -u mldonkey/src/daemon/common/guiDecoding.ml:1.44 
mldonkey/src/daemon/common/guiDecoding.ml:1.45
--- mldonkey/src/daemon/common/guiDecoding.ml:1.44      Tue Dec  6 19:34:04 2005
+++ mldonkey/src/daemon/common/guiDecoding.ml   Tue Dec 13 14:33:33 2005
@@ -916,7 +916,7 @@
 
     let proto = if opcode > from_gui_last_opcode then 0 else proto.(opcode) in
     if !verbose_gui_decoding then
-      lprintf_nl "FROM GUI: Opcode %d" opcode; 
+      lprintf_nl "[gDe] FROM_GUI: Opcode %d %s" opcode (String.escaped s);
     match opcode with
       0 -> GuiProtocol (get_int s 2)
 
@@ -949,7 +949,7 @@
         Download_query (list, result_num, false)
 
     | 8 -> let string, pos = get_string s 2 in
-        lprintf_nl "Received string: [%s]" (String.escaped string);
+        lprintf_nl "[gDe] Received string: [%s]" (String.escaped string);
         Url string 
 
     | 9 -> let int = get_int s 2 in RemoveServer_query int
@@ -1229,7 +1229,7 @@
     let proto = if opcode > to_gui_last_opcode then 0 else proto.(opcode) in
     
     if !verbose_gui_decoding then
-      lprintf_nl "TO GUI: Opcode %d" opcode;
+      lprintf_nl "[gDe] TO GUI: Opcode %d" opcode;
     match opcode with
     | 0 ->
         let version = get_int s 2 in
Index: mldonkey/src/daemon/common/guiEncoding.ml
diff -u mldonkey/src/daemon/common/guiEncoding.ml:1.42 
mldonkey/src/daemon/common/guiEncoding.ml:1.43
--- mldonkey/src/daemon/common/guiEncoding.ml:1.42      Mon Nov 28 14:32:28 2005
+++ mldonkey/src/daemon/common/guiEncoding.ml   Tue Dec 13 14:33:33 2005
@@ -702,7 +702,7 @@
   try
     let buf_opcode buf opcode =
        if !verbose_gui_decoding then
-         lprintf "TO_GUI: %d %s\n" opcode (GuiProto.string_of_to_gui t);
+         lprintf_nl "[gEn] TO_GUI: %d %s" opcode (GuiProto.string_of_to_gui t);
        buf_int16 buf opcode
     in
     match t with
@@ -979,7 +979,7 @@
   try
     let buf_opcode buf opcode =
        if !verbose_gui_decoding then
-         lprintf "FROM_GUI: %d %s\n" opcode (GuiProto.string_of_from_gui t);
+         lprintf_nl "[gEn] FROM_GUI: %d %s" opcode 
(GuiProto.string_of_from_gui t);
        buf_int16 buf opcode
     in
     match t with
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.68 
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.69
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.68      Tue Dec  6 
19:34:05 2005
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml   Tue Dec 13 14:33:34 2005
@@ -930,8 +930,7 @@
     0 ->
       let text = String.sub s 2 (String.length s - 2) in
       if !verbose_torrent then lprintf_nl () "received torrent from gui...";
-      let _ = load_torrent_string text in
-      ()
+      ignore (load_torrent_string text)
   | 1 -> (* 34+ *)
       let n = get_int s 2 in
       let a, pos = get_string s 6 in