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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    05/12/15 19:41:47

Modified files:
        distrib        : ChangeLog 
        src/daemon/common: guiDecoding.ml guiEncoding.ml 
        src/networks/bittorrent: bTProtocol.ml 
        src/networks/donkey: donkeyPandora.ml donkeyProtoClient.ml 
                             donkeyProtoKademlia.ml 
                             donkeyProtoOvernet.ml 
        src/networks/fasttrack: fasttrackProto.ml 
        src/networks/gnutella: gnutellaProto.ml 
        src/networks/gnutella2: g2Proto.ml 
        src/utils/cdk  : zip.ml 
        src/utils/mp3tagui: mp3_info.ml 
        src/utils/net  : cobs.ml 

Log message:
        patch #4710

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.618&tr2=1.619&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiDecoding.ml.diff?tr1=1.46&tr2=1.47&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiEncoding.ml.diff?tr1=1.44&tr2=1.45&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTProtocol.ml.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyPandora.ml.diff?tr1=1.5&tr2=1.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyProtoClient.ml.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyProtoKademlia.ml.diff?tr1=1.16&tr2=1.17&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/donkey/donkeyProtoOvernet.ml.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/fasttrack/fasttrackProto.ml.diff?tr1=1.14&tr2=1.15&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella/gnutellaProto.ml.diff?tr1=1.10&tr2=1.11&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/gnutella2/g2Proto.ml.diff?tr1=1.12&tr2=1.13&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/cdk/zip.ml.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/mp3tagui/mp3_info.ml.diff?tr1=1.2&tr2=1.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/net/cobs.ml.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.618 mldonkey/distrib/ChangeLog:1.619
--- mldonkey/distrib/ChangeLog:1.618    Thu Dec 15 18:38:52 2005
+++ mldonkey/distrib/ChangeLog  Thu Dec 15 19:41:46 2005
@@ -12,6 +12,7 @@
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
 2005/12/15
+4710: Re-add some protocol information as comments removed by patch 4694
 4709: Fix zip file extract broken due to patch 4694 (Ocaml 3.09)
 4707: Fix recover_temp broken by patch 4674 (force_download)
 
Index: mldonkey/src/daemon/common/guiDecoding.ml
diff -u mldonkey/src/daemon/common/guiDecoding.ml:1.46 
mldonkey/src/daemon/common/guiDecoding.ml:1.47
--- mldonkey/src/daemon/common/guiDecoding.ml:1.46      Wed Dec 14 21:17:46 2005
+++ mldonkey/src/daemon/common/guiDecoding.ml   Thu Dec 15 19:41:46 2005
@@ -392,6 +392,7 @@
 
 let get_result proto s pos =
   let num  = get_int s pos in
+(*  let net = get_int s (pos+4) in *)
   let names, pos = get_list get_string s (pos+8) in
   let uids, pos = 
     if proto < 27 then
Index: mldonkey/src/daemon/common/guiEncoding.ml
diff -u mldonkey/src/daemon/common/guiEncoding.ml:1.44 
mldonkey/src/daemon/common/guiEncoding.ml:1.45
--- mldonkey/src/daemon/common/guiEncoding.ml:1.44      Wed Dec 14 21:17:46 2005
+++ mldonkey/src/daemon/common/guiEncoding.ml   Thu Dec 15 19:41:46 2005
@@ -960,6 +960,7 @@
         buf_opcode buf 57; buf_search buf_string proto buf s
     
     | Version s ->
+(*        let proto = proto.(58) in *)
         buf_opcode buf 58; buf_string buf s
     
     | GiftServerAttach _ -> assert false
Index: mldonkey/src/networks/bittorrent/bTProtocol.ml
diff -u mldonkey/src/networks/bittorrent/bTProtocol.ml:1.24 
mldonkey/src/networks/bittorrent/bTProtocol.ml:1.25
--- mldonkey/src/networks/bittorrent/bTProtocol.ml:1.24 Wed Dec 14 21:17:46 2005
+++ mldonkey/src/networks/bittorrent/bTProtocol.ml      Thu Dec 15 19:41:46 2005
@@ -534,6 +534,7 @@
                  peer_id is not fetched here because
                  it might be late or not present
                  *)
+(*           let proto = String.sub b.buf (b.pos+1) slen in *)
               let file_id = Sha1.direct_of_string
                 (String.sub b.buf (b.pos+9+slen) 20) in
               let proto,pos = get_string8 b.buf b.pos in
Index: mldonkey/src/networks/donkey/donkeyPandora.ml
diff -u mldonkey/src/networks/donkey/donkeyPandora.ml:1.5 
mldonkey/src/networks/donkey/donkeyPandora.ml:1.6
--- mldonkey/src/networks/donkey/donkeyPandora.ml:1.5   Wed Dec 14 21:17:46 2005
+++ mldonkey/src/networks/donkey/donkeyPandora.ml       Thu Dec 15 19:41:46 2005
@@ -200,6 +200,7 @@
       
       
       let b = Buffer.create 100 in
+      let _ = DonkeyProtoClient.write emule b t in
       let ss = Buffer.contents b in
       if ss <> s then begin
           if opcode = 212 then begin
Index: mldonkey/src/networks/donkey/donkeyProtoClient.ml
diff -u mldonkey/src/networks/donkey/donkeyProtoClient.ml:1.31 
mldonkey/src/networks/donkey/donkeyProtoClient.ml:1.32
--- mldonkey/src/networks/donkey/donkeyProtoClient.ml:1.31      Wed Dec 14 
21:17:46 2005
+++ mldonkey/src/networks/donkey/donkeyProtoClient.ml   Thu Dec 15 19:41:46 2005
@@ -655,6 +655,7 @@
       let len = get_int16 s 1 in
       let md4 = get_md4 s 3 in
       let list = ref [] in
+(*      let pos = 19 in *)
       for i = 0 to len - 1 do
         list := (get_ip s (19 + 10 * i), get_port s (23 + 10 * i),
           get_ip  s (25 + 10 * i)) :: !list;
@@ -1142,6 +1143,7 @@
 
 (*        lprintf "MULTI EMULE VERSION %d"
           (extendedrequest emule); print_newline (); *)
+(*        let pos = 17 in *)
         let rec iter pos =
           if pos < len then
             let opcode = get_uint8 s pos in
Index: mldonkey/src/networks/donkey/donkeyProtoKademlia.ml
diff -u mldonkey/src/networks/donkey/donkeyProtoKademlia.ml:1.16 
mldonkey/src/networks/donkey/donkeyProtoKademlia.ml:1.17
--- mldonkey/src/networks/donkey/donkeyProtoKademlia.ml:1.16    Wed Dec 14 
21:17:46 2005
+++ mldonkey/src/networks/donkey/donkeyProtoKademlia.ml Thu Dec 15 19:41:46 2005
@@ -226,6 +226,7 @@
       let ip = get_ip s (pos+16) in
       let udp_port = get_int16 s (pos + 20) in
       let tcp_port = get_int16 s (pos + 22) in
+(*       let kind = get_uint8 s (pos + 24) in *)
       {
         peer_md4 = md4;
         peer_ip = ip;
@@ -282,6 +283,7 @@
           OvernetConnect p
 
       | 0x08 ->
+(*       let n = get_int16 s 0 in *)
           let peers, pos = get_list16 get_peer s 0 in
           OvernetConnectReply peers
 
Index: mldonkey/src/networks/donkey/donkeyProtoOvernet.ml
diff -u mldonkey/src/networks/donkey/donkeyProtoOvernet.ml:1.24 
mldonkey/src/networks/donkey/donkeyProtoOvernet.ml:1.25
--- mldonkey/src/networks/donkey/donkeyProtoOvernet.ml:1.24     Wed Dec 14 
21:17:46 2005
+++ mldonkey/src/networks/donkey/donkeyProtoOvernet.ml  Thu Dec 15 19:41:46 2005
@@ -51,6 +51,7 @@
       let md4 = get_md4 s pos in
       let ip = get_ip s (pos+16) in
       let port = get_int16 s (pos+20) in
+(*      let kind = get_uint8 s (pos+22) in *)
       {
         peer_md4 = md4;
         peer_ip = ip;
@@ -236,6 +237,7 @@
             let md4 = get_md4 s 0 in
             let ip = get_ip s 16 in
             let port = get_int16 s 20 in
+(*         let kind = get_uint8 s 22 in *)
             OvernetConnect {
               peer_md4 = md4;
               peer_ip = ip;
@@ -253,6 +255,7 @@
             let md4 = get_md4 s 0 in
             let ip = get_ip s 16 in
             let port = get_int16 s 20 in
+(*         let kind = get_uint8 s 22 in *)
             OvernetPublicize {
               peer_md4 = md4;
               peer_ip = ip;
Index: mldonkey/src/networks/fasttrack/fasttrackProto.ml
diff -u mldonkey/src/networks/fasttrack/fasttrackProto.ml:1.14 
mldonkey/src/networks/fasttrack/fasttrackProto.ml:1.15
--- mldonkey/src/networks/fasttrack/fasttrackProto.ml:1.14      Wed Dec 14 
21:17:46 2005
+++ mldonkey/src/networks/fasttrack/fasttrackProto.ml   Thu Dec 15 19:41:46 2005
@@ -990,7 +990,7 @@
             let my_port = get_int16 m 4 in
 
             let bandwidth = get_int8 m 6 in
-
+(*         let next_byte = get_int8 m 7 in *)
             let client_name = String.sub m 8 (String.length m - 8) in
 
             NodeInfoReq (my_ip, my_port, bandwidth, client_name)
Index: mldonkey/src/networks/gnutella/gnutellaProto.ml
diff -u mldonkey/src/networks/gnutella/gnutellaProto.ml:1.10 
mldonkey/src/networks/gnutella/gnutellaProto.ml:1.11
--- mldonkey/src/networks/gnutella/gnutellaProto.ml:1.10        Wed Dec 14 
21:17:47 2005
+++ mldonkey/src/networks/gnutella/gnutellaProto.ml     Thu Dec 15 19:41:46 2005
@@ -375,6 +375,7 @@
       let files, pos  = iter_files nfiles s 11 [] in
       
       let vendor = String.sub s pos 4 in
+(*      let vendor_len = get_uint8 s (pos+4) in *)
       let byte5 = get_uint8 s (pos+5) in
       let byte6 = get_uint8 s (pos+6) in
       
Index: mldonkey/src/networks/gnutella2/g2Proto.ml
diff -u mldonkey/src/networks/gnutella2/g2Proto.ml:1.12 
mldonkey/src/networks/gnutella2/g2Proto.ml:1.13
--- mldonkey/src/networks/gnutella2/g2Proto.ml:1.12     Wed Dec 14 21:17:47 2005
+++ mldonkey/src/networks/gnutella2/g2Proto.ml  Thu Dec 15 19:41:46 2005
@@ -1044,6 +1044,7 @@
   let nSequence = LittleEndian.get_int16 buf 4 in
   let nCount = get_uint8 buf 7 in
   let nFlags = get_uint8 buf 3 in
+(*  let ack_me = nFlags land 2 <> 0 in *)
 (* Contribute:
   - deflating
   - multi-parts message
@@ -1440,6 +1441,8 @@
   
   if update_table then cached_qrt_table := "";
   let table_size = 20 in
+(*  let infinity = 7 in
+  let table_length = 1 lsl table_size in *)
   server_send_qrt_reset s;
   
   if !cached_qrt_table = "" then 
@@ -1470,8 +1473,10 @@
   if String.sub buf 0 3 <> "GND" then
     lprintf "Not a GNUTELLA2 packet (no GND)\n"
   else
+(*  let nSequence = LittleEndian.get_int16 buf 4 in *)
   let nCount = get_uint8 buf 7 in
   let nFlags = get_uint8 buf 3 in
+(*  let ack_me = nFlags land 2 <> 0 in *)
 (* Contribute:
   - deflating
   - multi-parts message
Index: mldonkey/src/utils/cdk/zip.ml
diff -u mldonkey/src/utils/cdk/zip.ml:1.4 mldonkey/src/utils/cdk/zip.ml:1.5
--- mldonkey/src/utils/cdk/zip.ml:1.4   Thu Dec 15 18:39:15 2005
+++ mldonkey/src/utils/cdk/zip.ml       Thu Dec 15 19:41:46 2005
@@ -10,7 +10,7 @@
 (*                                                                     *)
 (***********************************************************************)
 
-(* $Id: zip.ml,v 1.4 2005/12/15 18:39:15 spiralvoice Exp $ *)
+(* $Id: zip.ml,v 1.5 2005/12/15 19:41:46 spiralvoice Exp $ *)
 
 (* Module [Zip]: reading and writing ZIP archives *)
 
@@ -143,9 +143,9 @@
   let magic = read4 ic in
   let disk_no = read2 ic in
   let cd_disk_no = read2 ic in
-  let _ = read2 ic in
+  let _ = read2 ic in (* disk_entries*)
   let cd_entries = read2 ic in
-  let _ = read4_int ic in
+  let _ = read4_int ic in (* cd_size *)
   let cd_offset = read4_int ic in
   let comment_len = read2 ic in
   let comment = readstring ic comment_len in
@@ -162,8 +162,8 @@
     let e = ref [] in
     for num_entry = 1 to cd_entries do
       let magic = read4 ic in
-      let _ = read2 ic in
-      let _ = read2 ic in
+      let _ = read2 ic in (* version_made_by *)
+      let _ = read2 ic in (* version_needed *)
       let flags = read2 ic in
       let methd = read2 ic in
       let lastmod_time = read2 ic in
@@ -174,9 +174,9 @@
       let name_len = read2 ic in
       let extra_len = read2 ic in
       let comment_len = read2 ic in
-      let _ = read2 ic in
-      let _ = read2 ic in
-      let _ = read4 ic in
+      let _ = read2 ic in (* disk_number *)
+      let _ = read2 ic in (* internal_attr *)
+      let _ = read4 ic in (* external_attr *)
       let header_offset = read4_int ic in
       let name = readstring ic name_len in
       let extra = readstring ic extra_len in
@@ -238,14 +238,14 @@
     let ic = ifile.if_channel in
     seek_in ic e.file_offset;
     let magic = read4 ic in
-    let _ = read2 ic in
-    let _ = read2 ic in
-    let _ = read2 ic in
-    let _ = read2 ic in
-    let _ = read2 ic in
-    let _ = read4 ic in
-    let _ = read4_int ic in
-    let _ = read4_int ic in
+    let _ = read2 ic in (* version_needed *)
+    let _ = read2 ic in (* flags *)
+    let _ = read2 ic in (* methd *)
+    let _ = read2 ic in (* lastmod_time *)
+    let _ = read2 ic in (* lastmod_date *)
+    let _ = read4 ic in (* crc *)
+    let _ = read4_int ic in (* compr_size  *)
+    let _ = read4_int ic in (* uncompr_size *)
     let filename_len = read2 ic in
     let extra_len = read2 ic in
     if magic <> 0x04034b50l then
Index: mldonkey/src/utils/mp3tagui/mp3_info.ml
diff -u mldonkey/src/utils/mp3tagui/mp3_info.ml:1.2 
mldonkey/src/utils/mp3tagui/mp3_info.ml:1.3
--- mldonkey/src/utils/mp3tagui/mp3_info.ml:1.2 Wed Dec 14 21:17:47 2005
+++ mldonkey/src/utils/mp3tagui/mp3_info.ml     Thu Dec 15 19:41:47 2005
@@ -112,6 +112,7 @@
   let sample_rate =
     mpg123_freqs.(sampling_frequency) in
   let bitrate_index = (header lsr 12) land 0xF in
+(*  let padding = (header lsr 9) land 1 in *)
   let mode =
     match (header lsr 6) land 3 with
       0 -> Stereo | 1 -> Joint_stereo | 2 -> Dual_channel_stereo | _ -> Mono in
Index: mldonkey/src/utils/net/cobs.ml
diff -u mldonkey/src/utils/net/cobs.ml:1.4 mldonkey/src/utils/net/cobs.ml:1.5
--- mldonkey/src/utils/net/cobs.ml:1.4  Wed Dec 14 21:17:47 2005
+++ mldonkey/src/utils/net/cobs.ml      Thu Dec 15 19:41:47 2005
@@ -146,10 +146,15 @@
   if pos = len then list
   else
   let flags = int_of_char s.[pos] in
+(*  let last = (flags land (1 lsl 7)) <> 0 in *)
   let cobs_encoded = (flags land (1 lsl 6)) <> 0 in
+(*  lprintf "cobs_encoded %b\n" cobs_encoded; *)
+(*  let compressed = (flags land (1 lsl 5)) <> 0 in *)
+(*  lprintf "compressed %b\n" compressed; *)
   let id_len = flags land 7 in
   let id = String.sub s (pos+1) id_len in
   let data_len, pos = get_len s (pos+1+id_len) 0 in
+(*  lprintf "data_len %d,pos %d, len %d\n" data_len pos len; *)
   let data = String.sub s pos data_len in
   let data = 
     if cobs_encoded then decode data else data in