[Mldonkey-commits] mldonkey distrib/ChangeLog src/networks/direct_...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       08/01/02 16:15:53

Modified files:
        distrib        : ChangeLog 
        src/networks/direct_connect: dcServers.ml dcShared.ml 

Log message:
        patch #6349

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1339&r2=1.1340
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcServers.ml?cvsroot=mldonkey&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/direct_connect/dcShared.ml?cvsroot=mldonkey&r1=1.1&r2=1.2

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1339
retrieving revision 1.1340
diff -u -b -r1.1339 -r1.1340
--- distrib/ChangeLog   2 Jan 2008 16:14:52 -0000       1.1339
+++ distrib/ChangeLog   2 Jan 2008 16:15:53 -0000       1.1340
@@ -15,6 +15,7 @@
 =========
 
 2008/01/02
+6349: DirectConnect: Correctly report total shared filesize to server (LuCasn)
 6360: BT: New command print_torrent <file_num>,
       new link in HTML, upstats to display .torrent details
 

Index: src/networks/direct_connect/dcServers.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcServers.ml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- src/networks/direct_connect/dcServers.ml    1 Jun 2007 19:31:09 -0000       
1.16
+++ src/networks/direct_connect/dcServers.ml    2 Jan 2008 16:15:53 -0000       
1.17
@@ -151,7 +151,7 @@
      conn_speed = !!client_speed;
      flag = time_flag;
      email = "";
-     sharesize = !nshared_bytes;
+     sharesize = DcShared.dc_updatesharesize ();
      bwlimit = !!max_hard_upload_rate;
    }
 

Index: src/networks/direct_connect/dcShared.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/direct_connect/dcShared.ml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- src/networks/direct_connect/dcShared.ml     1 Jun 2007 19:31:09 -0000       
1.1
+++ src/networks/direct_connect/dcShared.ml     2 Jan 2008 16:15:53 -0000       
1.2
@@ -314,6 +314,11 @@
                 (Printexc2.to_string e) dcsh.dc_shared_fullname ) )
   end
 
+let dc_updatesharesize () =
+  let dc_sharesize = ref Int64.zero in
+  Hashtbl.iter (fun _ dcsh ->
+    dc_sharesize := !dc_sharesize ++ dcsh.dc_shared_size) 
dc_shared_files_by_codedname;
+  !dc_sharesize
 
 let _ = 
   network.op_network_share <- (fun fullname codedname size -> (* this is 
called once/60s with all shared files *)