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

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Changes by:     spiralvoice <spiralvoice>       06/10/08 14:02:05

Modified files:
        distrib        : ChangeLog 
        src/networks/bittorrent: bTGlobals.ml bTInteractive.ml 
                                 bTTypes.ml 

Log message:
        patch #5444

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/distrib/ChangeLog?cvsroot=mldonkey&r1=1.1043&r2=1.1044
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTGlobals.ml?cvsroot=mldonkey&r1=1.68&r2=1.69
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTInteractive.ml?cvsroot=mldonkey&r1=1.115&r2=1.116
http://cvs.savannah.gnu.org/viewcvs/mldonkey/src/networks/bittorrent/bTTypes.ml?cvsroot=mldonkey&r1=1.38&r2=1.39

Patches:
Index: distrib/ChangeLog
===================================================================
RCS file: /sources/mldonkey/mldonkey/distrib/ChangeLog,v
retrieving revision 1.1043
retrieving revision 1.1044
diff -u -b -r1.1043 -r1.1044
--- distrib/ChangeLog   8 Oct 2006 14:01:03 -0000       1.1043
+++ distrib/ChangeLog   8 Oct 2006 14:02:05 -0000       1.1044
@@ -15,6 +15,8 @@
 =========
 
 2006/10/08
+5444: BT: Correctly display client connected time,
+      also allow correct upload speed calculation (tradie)
 5443: BT: do not allow connections with ourselves (tradie)
 
 2006/10/06

Index: src/networks/bittorrent/bTGlobals.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTGlobals.ml,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- src/networks/bittorrent/bTGlobals.ml        1 Oct 2006 17:47:11 -0000       
1.68
+++ src/networks/bittorrent/bTGlobals.ml        8 Oct 2006 14:02:05 -0000       
1.69
@@ -749,7 +749,7 @@
           client_downloaded = zero;
           client_upload_rate = Rate.new_rate ();
           client_downloaded_rate = Rate.new_rate ();
-          client_optimist_time=0;
+          client_connect_time = last_time ();
           client_blocks_sent = [];
           client_new_chunks = [];
           client_good = false;

Index: src/networks/bittorrent/bTInteractive.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTInteractive.ml,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -b -r1.115 -r1.116
--- src/networks/bittorrent/bTInteractive.ml    6 Oct 2006 15:57:18 -0000       
1.115
+++ src/networks/bittorrent/bTInteractive.ml    8 Oct 2006 14:02:05 -0000       
1.116
@@ -392,7 +392,7 @@
         ( "0", "srh ar", "Incoming [T]rue, [F]alse", "I" );
         ( "0", "srh br ar", "Registered bitfield [T]rue, [F]alse", "B" );
 
-        ( "0", "srh ar", "Optimist Time", "O" );
+        ( "0", "srh ar", "Connect Time", "T" );
         ( "0", "srh ar", "Last optimist", "L.Opt" );
         ( "0", "srh br ar", "Num try", "N" );
 
@@ -447,7 +447,7 @@
             ("", "sr", (btos c.client_incoming));
             ("", "br sr", (btos c.client_registered_bitfield));
 
-            ("", "sr", Printf.sprintf "%d" c.client_optimist_time);
+            ("", "sr", Printf.sprintf "%d" c.client_connect_time);
             ("", "ar sr", string_of_date c.client_last_optimist);
             ("", "br sr", Printf.sprintf "%d" c.client_num_try);
 
@@ -851,6 +851,7 @@
     P.client_downloaded = c.client_downloaded;
     P.client_uploaded = c.client_uploaded;
     P.client_upload = Some (c.client_file.file_name);
+    P.client_connect_time = c.client_connect_time;
 
   }
 

Index: src/networks/bittorrent/bTTypes.ml
===================================================================
RCS file: /sources/mldonkey/mldonkey/src/networks/bittorrent/bTTypes.ml,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- src/networks/bittorrent/bTTypes.ml  25 Sep 2006 23:19:08 -0000      1.38
+++ src/networks/bittorrent/bTTypes.ml  8 Oct 2006 14:02:05 -0000       1.39
@@ -227,7 +227,7 @@
     mutable client_downloaded_rate :  Rate.t;
     mutable client_downloaded : int64;
     mutable client_uploaded : int64;
-    mutable client_optimist_time : int;
+    mutable client_connect_time : int;
 
     mutable client_blocks_sent : int list;
     mutable client_good : bool;