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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/01/02 12:08:14

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

Log message:
        patch #4749

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.645&tr2=1.646&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/commonShared.ml.diff?tr1=1.26&tr2=1.27&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiDecoding.ml.diff?tr1=1.47&tr2=1.48&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiEncoding.ml.diff?tr1=1.45&tr2=1.46&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiProto.ml.diff?tr1=1.20&tr2=1.21&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/daemon/common/guiTypes.ml.diff?tr1=1.23&tr2=1.24&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml.diff?tr1=1.73&tr2=1.74&r1=text&r2=text

Patches:
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.645 mldonkey/distrib/ChangeLog:1.646
--- mldonkey/distrib/ChangeLog:1.645    Sun Jan  1 19:37:52 2006
+++ mldonkey/distrib/ChangeLog  Mon Jan  2 12:08:14 2006
@@ -11,6 +11,9 @@
 To compile MLDonkey on MinGW follow this guide:
 http://mldonkey.berlios.de/modules.php?name=Wiki&pagename=Windows
 
+2006/01/02
+4749: GUI: send shared sub_files to gui (zet)
+
 2006/01/01
 4712: Change terminal color for command line from blue to cyan (romildo)
 4742: Log: remove verbosity "tor" & "file", improve verbosity "verb"
Index: mldonkey/src/daemon/common/commonShared.ml
diff -u mldonkey/src/daemon/common/commonShared.ml:1.26 
mldonkey/src/daemon/common/commonShared.ml:1.27
--- mldonkey/src/daemon/common/commonShared.ml:1.26     Sun Oct 16 20:42:50 2005
+++ mldonkey/src/daemon/common/commonShared.ml  Mon Jan  2 12:08:14 2006
@@ -345,6 +345,7 @@
     T.shared_uploaded = impl.impl_shared_uploaded;
     T.shared_requests = impl.impl_shared_requests; 
     T.shared_uids = [];
+    T.shared_sub_files = [];
   }
   
 let shared_info s =
Index: mldonkey/src/daemon/common/guiDecoding.ml
diff -u mldonkey/src/daemon/common/guiDecoding.ml:1.47 
mldonkey/src/daemon/common/guiDecoding.ml:1.48
--- mldonkey/src/daemon/common/guiDecoding.ml:1.47      Thu Dec 15 19:41:46 2005
+++ mldonkey/src/daemon/common/guiDecoding.ml   Mon Jan  2 12:08:14 2006
@@ -478,6 +478,13 @@
 let get_int_pos s pos =
   get_int s pos, pos + 4
   
+let get_sub_files s pos =
+  get_list (fun s pos ->
+    let name, pos = get_string s pos in
+    let size, pos = get_int64 s pos, pos+8 in
+    (name, size), pos
+  ) s pos
+  
 let get_file proto s pos = 
   let num = get_int s pos in
   let net = get_int s (pos+4) in
@@ -523,11 +530,7 @@
   in
   let sub_files, pos =
     if proto > 35 then
-      get_list (fun s pos ->
-          let name, pos = get_string s pos in
-          let size, pos = get_int64 s pos, pos+8 in
-          (name, size), pos
-      ) s pos
+      get_sub_files s pos
     else [], pos
   in
 
@@ -879,6 +882,7 @@
     shared_uploaded = uploaded;
     shared_requests = requests;
     shared_uids = [];
+    shared_sub_files = [];
   }
 
 let get_shared_info_version_10 proto s pos =
@@ -894,6 +898,11 @@
     else
       get_list get_uid s (pos+12)
   in
+  let sub_files, pos =
+    if proto > 36 then
+      get_sub_files s pos
+    else [], pos
+  in
   {
     shared_num = num;
     shared_network = network;
@@ -902,6 +911,7 @@
     shared_uploaded = uploaded;
     shared_requests = requests;
     shared_uids = uids;
+    shared_sub_files = sub_files;
   }
 
 
Index: mldonkey/src/daemon/common/guiEncoding.ml
diff -u mldonkey/src/daemon/common/guiEncoding.ml:1.45 
mldonkey/src/daemon/common/guiEncoding.ml:1.46
--- mldonkey/src/daemon/common/guiEncoding.ml:1.45      Thu Dec 15 19:41:46 2005
+++ mldonkey/src/daemon/common/guiEncoding.ml   Mon Jan  2 12:08:14 2006
@@ -519,6 +519,12 @@
       buf_int8 buf 18;
       buf_string buf x
     
+let buf_sub_files buf l =
+  buf_list buf (fun buf (name, size) ->
+    buf_string buf name;
+    buf_int64 buf size
+  ) l
+    
 let buf_file proto buf f =
   buf_int buf f.file_num;
   buf_int buf f.file_network;  
@@ -556,10 +562,7 @@
     if proto > 30 then
       buf_list buf buf_uid f.file_uids;
     if proto > 35 then
-      buf_list buf (fun buf (name, size) ->
-          buf_string buf name;
-          buf_int64 buf size
-      ) f.file_sub_files
+      buf_sub_files buf f.file_sub_files
       
 let buf_addr proto buf addr =
   (match addr with
@@ -690,7 +693,10 @@
         ) s.shared_uids;
       buf_md4 buf !md4
     else
-      buf_list buf buf_uid s.shared_uids
+      buf_list buf buf_uid s.shared_uids;
+  if proto > 36 then
+    buf_sub_files buf s.shared_sub_files
+
 
 (***************
 
Index: mldonkey/src/daemon/common/guiProto.ml
diff -u mldonkey/src/daemon/common/guiProto.ml:1.20 
mldonkey/src/daemon/common/guiProto.ml:1.21
--- mldonkey/src/daemon/common/guiProto.ml:1.20 Sat Nov 12 22:53:51 2005
+++ mldonkey/src/daemon/common/guiProto.ml      Mon Jan  2 12:08:14 2006
@@ -31,7 +31,7 @@
   
 let to_gui_last_opcode = 58
 let from_gui_last_opcode = 67
-let best_gui_version = 36
+let best_gui_version = 37
   
 (* I will try to report all changes to the protocol here: send me patches
 if I don't !
Index: mldonkey/src/daemon/common/guiTypes.ml
diff -u mldonkey/src/daemon/common/guiTypes.ml:1.23 
mldonkey/src/daemon/common/guiTypes.ml:1.24
--- mldonkey/src/daemon/common/guiTypes.ml:1.23 Sat Nov 12 22:53:51 2005
+++ mldonkey/src/daemon/common/guiTypes.ml      Mon Jan  2 12:08:14 2006
@@ -239,6 +239,7 @@
     mutable shared_uploaded : int64;
     mutable shared_requests : int;
     mutable shared_uids : Uid.t list; (* net file UID *)
+    mutable shared_sub_files : (string * int64) list;
   }
   
   
Index: mldonkey/src/networks/bittorrent/bTInteractive.ml
diff -u mldonkey/src/networks/bittorrent/bTInteractive.ml:1.73 
mldonkey/src/networks/bittorrent/bTInteractive.ml:1.74
--- mldonkey/src/networks/bittorrent/bTInteractive.ml:1.73      Sun Jan  1 
19:36:03 2006
+++ mldonkey/src/networks/bittorrent/bTInteractive.ml   Mon Jan  2 12:08:14 2006
@@ -1000,5 +1000,6 @@
             T.shared_network = network.network_num;
             T.shared_filename = file_best_name (as_file file);
             T.shared_uids = [Uid.create (Sha1 file.file_id)];
+            T.shared_sub_files = file.file_files;
             }
   )