# HG changeset patch
# User Dremov Kirill (Nokia-D-MSW/Tampere) <kirill.dremov@nokia.com>
# Date 1284540759 -10800
# Node ID 22633ca47dfee29a2ae6349d07136a5dadc43d04
# Parent  3ba072830a8a61a0d900fd7ee15fa1db9291129d
Revision: 201034
Kit: 201036

diff -r 3ba072830a8a -r 22633ca47dfe nettools/conntest/Engine/HttpHandler.cpp
--- a/nettools/conntest/Engine/HttpHandler.cpp	Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/Engine/HttpHandler.cpp	Wed Sep 15 11:52:39 2010 +0300
@@ -382,7 +382,10 @@
 void CHttpClient::DisplayTimeElapsed()
 {
     // Throughput calculation
-    TInt size = OverallDataSize();
+    TUint64 packets = iSettingData->iPackets;
+    TUint64 packetSize = iSettingData->iPacketSize;
+    TUint64 size = packets*packetSize; 
+    
     TBuf8<128> b(_L8("Body sent\n"));
     Utils::CalculateThroughput(b, iLastTimeStamp, size);
     
diff -r 3ba072830a8a -r 22633ca47dfe nettools/conntest/inc/HttpHandler.h
--- a/nettools/conntest/inc/HttpHandler.h	Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/HttpHandler.h	Wed Sep 15 11:52:39 2010 +0300
@@ -159,7 +159,7 @@
     MHTTPDataSupplier*   iRespBody;
     MUINotify&           iConsole; // console for displaying text etc
     TTime                iStartTime;
-    TInt                 iBodySize;
+    TUint64              iBodySize;
     TBool                iDoPerformance;
 };
 
diff -r 3ba072830a8a -r 22633ca47dfe nettools/conntest/inc/SocketsEngine.h
--- a/nettools/conntest/inc/SocketsEngine.h	Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/SocketsEngine.h	Wed Sep 15 11:52:39 2010 +0300
@@ -402,7 +402,7 @@
 	TUint32						iStartTime; // for performance testing only
 	TTime                       iStartTTime; // for performance testing only
 	TTime						iThroughputStartTime; // for performance testing only
-	TInt                        iTroughputDataSize;
+	TUint64                     iTroughputDataSize;
     TCommDbConnPref             iPrefs;
     TConnPrefList*              iPrefsList;
     TExtendedConnPref*          iExtPrefs;
diff -r 3ba072830a8a -r 22633ca47dfe nettools/conntest/inc/SocketsRead.h
--- a/nettools/conntest/inc/SocketsRead.h	Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/SocketsRead.h	Wed Sep 15 11:52:39 2010 +0300
@@ -126,7 +126,7 @@
     MUINotify&              iConsole; // console for displaying text etc
     TBuf8<KReadDataSize>  iBuffer;  // buffer for receiving data
     TSockXfrLength          iDummyLength; // dummy - length of data read is written here
-    TInt                    iReceivedBytes; 
+    TUint64                 iReceivedBytes;
     TInt32					iUdpPacketCounter;
     TBool                   iDoCount; 
     TBool                   iDoPerformance; 
diff -r 3ba072830a8a -r 22633ca47dfe nettools/conntest/inc/SocketsWrite.h
--- a/nettools/conntest/inc/SocketsWrite.h	Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/SocketsWrite.h	Wed Sep 15 11:52:39 2010 +0300
@@ -160,7 +160,7 @@
     TUint                   iProtocol;
 	TInt                    iPackets;
 	TInt                    iPacketSize;
-    TInt                    iSentBytes;
+	TUint64                 iSentBytes;
 	TTime                   iStartTime;
 	TInt                    iDataChunkCount;
 	HBufC8*                 iReqBodySubmitBuffer;
diff -r 3ba072830a8a -r 22633ca47dfe nettools/conntest/inc/Utils.h
--- a/nettools/conntest/inc/Utils.h	Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/inc/Utils.h	Wed Sep 15 11:52:39 2010 +0300
@@ -42,7 +42,7 @@
     /**
     * Calculate throughput
     */
-	static void CalculateThroughput(TDes8& aBuffer, TTime aStartTime, TInt aSize);
+    static void CalculateThroughput(TDes8& aBuffer, TTime aStartTime, TUint64 aSize);
 
     /**
     * Set IapId value into connection preferences table.
diff -r 3ba072830a8a -r 22633ca47dfe nettools/conntest/src/Utils.cpp
--- a/nettools/conntest/src/Utils.cpp	Wed Sep 01 12:33:27 2010 +0100
+++ b/nettools/conntest/src/Utils.cpp	Wed Sep 15 11:52:39 2010 +0300
@@ -57,13 +57,13 @@
 // Calculate throughput
 // ----------------------------------------------------------------------------
 //
-void Utils::CalculateThroughput( TDes8& aBuffer, TTime aStartTime, TInt aSize )
+void Utils::CalculateThroughput( TDes8& aBuffer, TTime aStartTime, TUint64 aSize )
     {
     TTime now;
     now.UniversalTime();
     TTimeIntervalMicroSeconds interval;
     interval = now.MicroSecondsFrom( aStartTime );
-    TInt num = I64INT(interval.Int64());
+    TUint64 num = interval.Int64();
     
     if (num != 0)
         {