Changeset 3fb1afe4edce3fd7fcf12e4a975e612089a8aebd

Timestamp:

02/04/12 22:46:40 (16 months ago)

Author:

mkvore-commit@…

Branches:

i2p.imule.v2

Children:

e44fc65862bdaea1e12d837635b4eef7910b9365

Parents:

183e411556713f7079dabf1e90a640900e5fb455

Message:

UploadClient? merged. Not compiled.

Files:

• src/UploadClient.cpp (modified) (39 diffs)

/src/UploadClient.cpp

@@ -24 +24 @@
 //
 
+#include "updownclient.h"       // Interface
+
+#include <protocol/Protocols.h>
+#include <protocol/ed2k/Client2Client/TCP.h>
+
 #include <zlib.h>
-#include <cmath>                // Needed for std::exp
-
-#include "OtherFunctions.h"     // Needed for nstrdup
-
-#include "ClientUDPSocket.h"    // Needed for CClientUDPSocket
+
 #include "ClientCredits.h"      // Needed for CClientCredits
 #include "Packet.h"             // Needed for CPacket
@@ -35 +36 @@
 #include "UploadQueue.h"        // Needed for CUploadQueue
 #include "DownloadQueue.h"      // Needed for CDownloadQueue
-#include "Preferences.h"        // Needed for CPreferences
-#include "OtherStructs.h"       // Needed for Requested_Block_Struct
-#include "ServerConnect.h"              // Needed for CServerConnect
 #include "PartFile.h"           // Needed for PR_POWERSHARE
-#include "KnownFile.h"          // Needed for CKnownFile
-#include "KnownFileList.h"              // Needed for CKnownFileLists
 #include "ClientTCPSocket.h"    // Needed for CClientTCPSocket
 #include "SharedFileList.h"     // Needed for CSharedFileList
 #include "imule.h"              // Needed for theApp
-#include "BarShader.h"          // Needed for CBarShader
-#include "updownclient.h"       // Needed for CUpDownClient
 #include "ClientList.h"
 #include "Statistics.h"         // Needed for theStats
-#include "GuiEvents.h"          // Needed for Nofify_... macros
 #include "Logger.h"
 #include <common/Format.h>
-#include "ScopedPtr.h"
-#include <protocol/ed2k/Constants.h>
-#include <protocol/ed2k/Client2Client/TCP.h>
+#include "ScopedPtr.h"          // Needed for CScopedArray
+#include "GuiEvents.h"          // Needed for Notify_*
+
 
 //      members of CUpDownClient
@@ -81 +74 @@
 
 #ifndef CLIENT_GUI
-uint32_t CUpDownClient::GetScore(bool sysvalue, bool isdownloading, bool onlybasevalue) const
-{
-        //TODO: complete this (friends, uploadspeed, imuleuser etc etc)
+uint32 CUpDownClient::GetScore(bool sysvalue, bool isdownloading, bool onlybasevalue) const
+{
+        //TODO: complete this (friends, uploadspeed, amuleuser etc etc)
         if (m_Username.IsEmpty()) {
                 return 0;
@@ -168 +161 @@
                 fBaseValue *= 0.5f;
         }
-        return (uint32_t)fBaseValue;
+        return (uint32)fBaseValue;
 }
 #endif
@@ -182 +175 @@
         
         // Check if we have good lists and proceed to check for different chunks
-        if (!m_BlockRequests_queue.empty() && !m_DoneBlocks_list.empty())
+        if ((!m_BlockRequests_queue.empty()) && !m_DoneBlocks_list.empty())
         {
                 Requested_Block_Struct* last_done_block = NULL;
@@ -191 +184 @@
                         
                 // Get last block and next pending
-        last_done_block = (Requested_Block_Struct*)m_DoneBlocks_list.front();
-        next_requested_block = (Requested_Block_Struct*)m_BlockRequests_queue.front(); 
+                last_done_block = m_DoneBlocks_list.front();
+                next_requested_block = m_BlockRequests_queue.front();
                         
                 // Calculate corresponding parts to blocks
@@ -201 +194 @@
                 if ( last_done_part != next_requested_part) { 
                         different_part = true;
-                        AddDebugLogLineM(false, logClient, CFormat(wxT("%x :Session ended due to new chunk.")) % (long) this);
+                        AddDebugLogLineM(false, logClient, wxT("Session ended due to new chunk."));
                 }
         
                 if (md4cmp(last_done_block->FileID, next_requested_block->FileID) != 0) { 
                         different_part = true;
-                        AddDebugLogLineM(false, logClient, CFormat(wxT("%x :Session ended due to different file.")) % (long) this);
+                        AddDebugLogLineM(false, logClient, wxT("Session ended due to different file."));
                 }
         } 
@@ -226 +219 @@
         try {
         // Buffer new data if current buffer is less than 100 KBytes
-        while (!m_BlockRequests_queue.empty() &&
+        while ((!m_BlockRequests_queue.empty()) &&
                (m_addedPayloadQueueSession <= GetQueueSessionPayloadUp() || m_addedPayloadQueueSession-GetQueueSessionPayloadUp() < 100*1024)) {
 
@@ -237 +230 @@
 
                         if (srcfile->IsPartFile() && ((CPartFile*)srcfile)->GetStatus() != PS_COMPLETE) {
-//TODO                          #warning This seems a good idea from eMule. We must import this.
+                                //#warning This seems a good idea from eMule. We must import this.
                                 #if 0
                                 // Do not access a part file, if it is currently moved into the incoming directory.
@@ -257 +250 @@
             }
                 
-                        size_t togo;
+                        uint64 togo;
             // THIS EndOffset points BEHIND the last byte requested
             // (other than the offsets used in the PartFile code)
@@ -265 +258 @@
                 throw wxString(wxT("Asked for invalid block (start > end)"));
             } else {
-                if (currentblock->EndOffset - currentblock->StartOffset >= (1<<sizeof(size_t)))
-                    throw wxString(wxT("Asked for a huge block"));
-                
-                togo = (size_t) (currentblock->EndOffset - currentblock->StartOffset);
+                                togo = currentblock->EndOffset - currentblock->StartOffset;
                 
                 if (srcfile->IsPartFile() && !((CPartFile*)srcfile)->IsComplete(currentblock->StartOffset,currentblock->EndOffset-1)) {
@@ -275 +265 @@
             }
 
-                        if (togo > (EMBLOCKSIZE * 3)) {
+                        if (togo > EMBLOCKSIZE * 3) {
                                 throw wxString(wxT("Client requested too large of a block."));
                         }
                         
-            CScopedArray<uint8_t> filedata(NULL);
+                        CScopedArray<byte> filedata(NULL);      
             if (!srcfile->IsPartFile()){
                 if ( !file.Open(fullname, CFile::read) ) {
@@ -292 +282 @@
                 file.Seek(currentblock->StartOffset, wxFromStart);
                 
-                filedata.reset(new uint8_t[togo + 500]);
+                                filedata.reset(new byte[togo + 500]);
                 file.Read(filedata.get(), togo);
                 file.Close();
@@ -299 +289 @@
                 partfile->m_hpartfile.Seek(currentblock->StartOffset);
                 
-                filedata.reset(new uint8_t[togo + 500]);
+                                filedata.reset(new byte[togo + 500]);
                 partfile->m_hpartfile.Read(filedata.get(), togo);
                 // Partfile should NOT be closed!!!
             }
 
-
-//TODO                  #warning Part of the above import.
+                        //#warning Part of the above import.
                         #if 0
                         if (lockFile.m_pObject){
@@ -335 +324 @@
                 return;
         } catch (const wxString& error) {
-                AddDebugLogLineM(false, logClient, CFormat(wxT("%x :Client '")) % (long) this + GetUserName() + wxT("' caused error while creating packet (") + error + wxT(") - disconnecting client"));
+                AddDebugLogLineM(false, logClient, wxT("Client '") + GetUserName() + wxT("' caused error while creating packet (") + error + wxT(") - disconnecting client"));
         } catch (const CIOFailureException& error) {
-                AddDebugLogLineM(true, logClient, CFormat(wxT("%x :IO failure while reading requested file: ")) % (long) this + error.what());
-        } catch (const CEOFException& error) {
+                AddDebugLogLineM(true, logClient, wxT("IO failure while reading requested file: ") + error.what());
+        } catch (const CEOFException& WXUNUSED(error)) {
                 AddDebugLogLineM(true, logClient, GetClientFullInfo() + wxT(" requested file-data at an invalid position - disconnecting"));
         }
@@ -347 +336 @@
 
 
-void CUpDownClient::CreateStandartPackets(const uint8_t* buffer, uint32_t togo, Requested_Block_Struct* currentblock)
-{
-        uint32_t nPacketSize;
-
-        CMemFile memfile((uint8_t*)buffer, togo);
+void CUpDownClient::CreateStandartPackets(const byte* buffer, uint32 togo, Requested_Block_Struct* currentblock)
+{
+        uint32 nPacketSize;
+
+        CMemFile memfile(buffer, togo);
         if (togo > 10240) {
-                nPacketSize = togo/(uint32_t)(togo/10240);
+                nPacketSize = togo/(uint32)(togo/10240);
         } else {
                 nPacketSize = togo;
@@ -366 +355 @@
                 togo -= nPacketSize;
                 
-                CMemFile data(nPacketSize+32);
+                uint64 endpos = (currentblock->EndOffset - togo);
+                uint64 startpos = endpos - nPacketSize;
+                
+                
+                CMemFile data(nPacketSize + 16 + 2 * (bLargeBlocks ? 8 :4));
                 data.WriteHash(GetUploadFileID());
-                data.WriteUInt64(((currentblock->EndOffset - togo) - nPacketSize));
-                data.WriteUInt64(((currentblock->EndOffset - togo)));
+                if (bLargeBlocks) {
+                        data.WriteUInt64(startpos);
+                        data.WriteUInt64(endpos);
+                } else {
+                        data.WriteUInt32(startpos);
+                        data.WriteUInt32(endpos);
+                }
                 char *tempbuf = new char[nPacketSize];
                 memfile.Read(tempbuf, nPacketSize);
                 data.Write(tempbuf, nPacketSize);
                 delete [] tempbuf;
-                CPacket* packet = new CPacket(data,OP_EDONKEYPROT,OP_SENDINGPART);
-        
-                theStats::AddUpOverheadFileRequest(24);
+                CPacket* packet = new CPacket(data, (bLargeBlocks ? OP_EMULEPROT : OP_EDONKEYPROT), (bLargeBlocks ? (uint8)OP_SENDINGPART_I64 : (uint8)OP_SENDINGPART));        
+                theStats::AddUpOverheadFileRequest(16 + 2 * (bLargeBlocks ? 8 :4));
                 theStats::AddUploadToSoft(GetClientSoft(), nPacketSize);
+                AddDebugLogLineM( false, logLocalClient, wxString::Format(wxT("Local Client: %s to "),(bLargeBlocks ? wxT("OP_SENDINGPART_I64") : wxT("OP_SENDINGPART"))) + GetFullIP() );
                 m_socket->SendPacket(packet,true,false, nPacketSize);
         }
@@ -383 +381 @@
 
 
-void CUpDownClient::CreatePackedPackets(const uint8_t* buffer, uint32_t togo, Requested_Block_Struct* currentblock)
-{
-        uint8_t* output = new uint8_t[togo+300];
+void CUpDownClient::CreatePackedPackets(const byte* buffer, uint32 togo, Requested_Block_Struct* currentblock)
+{
+        byte* output = new byte[togo+300];
         uLongf newsize = togo+300;
-        uint32_t result = compress2(output, &newsize, buffer, togo, 9);
-        wxASSERT( result <= (uint16_t) -1 );
+        uint16 result = compress2(output, &newsize, buffer, togo,9);
         if (result != Z_OK || togo <= newsize){
                 delete[] output;
@@ -397 +394 @@
         CMemFile memfile(output,newsize);
         
-        uint32_t totalPayloadSize = 0;
-        uint32_t oldSize = togo;
+        uint32 totalPayloadSize = 0;
+        uint32 oldSize = togo;
         togo = newsize;
-        uint32_t nPacketSize;
+        uint32 nPacketSize;
         if (togo > 10240) {
-                nPacketSize = togo/(uint32_t)(togo/10240);
+                nPacketSize = togo/(uint32)(togo/10240);
         } else {
                 nPacketSize = togo;
@@ -413 +410 @@
                 togo -= nPacketSize;
 
-                CMemFile data(nPacketSize+24);
+                
+                CMemFile data(nPacketSize + 16 + (isLargeBlock ? 12 : 8));
                 data.WriteHash(GetUploadFileID());
+                if (isLargeBlock) {
                 data.WriteUInt64(currentblock->StartOffset);
+                } else {
+                        data.WriteUInt32(currentblock->StartOffset);
+                }
                 data.WriteUInt32(newsize);                      
                 char *tempbuf = new char[nPacketSize];
@@ -421 +423 @@
                 data.Write(tempbuf,nPacketSize);
                 delete [] tempbuf;
-                CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_COMPRESSEDPART);
+                CPacket* packet = new CPacket(data, OP_EMULEPROT, (isLargeBlock ? OP_COMPRESSEDPART_I64 : OP_COMPRESSEDPART));
         
                 // approximate payload size
-                uint32_t payloadSize = nPacketSize*oldSize/newsize;
+                uint32 payloadSize = nPacketSize*oldSize/newsize;
 
                 if (togo == 0 && totalPayloadSize+payloadSize < oldSize) {
@@ -435 +437 @@
                 theStats::AddUpOverheadFileRequest(24);
                 theStats::AddUploadToSoft(GetClientSoft(), nPacketSize);
+                AddDebugLogLineM( false, logLocalClient, wxString::Format(wxT("Local Client: %s to "), (isLargeBlock ? wxT("OP_COMPRESSEDPART_I64") : wxT("OP_COMPRESSEDPART"))) + GetFullIP() );
                 m_socket->SendPacket(packet,true,false, payloadSize);                   
         }
@@ -471 +474 @@
         
                 try {
-                        uint16_t done = 0;
+                        uint16 done = 0;
                         while (done != m_upPartStatus.size()) {
-                                uint8_t toread = data->ReadUInt8();
-                                for (int32_t i = 0;i != 8;i++){
+                                uint8 toread = data->ReadUInt8();
+                                for (sint32 i = 0;i != 8;i++){
                                         m_upPartStatus[done] = (toread>>i)&1;
                                         //      We may want to use this for another feature..
@@ -493 +496 @@
 
                 if (GetExtendedRequestsVersion() > 1) {
-                        uint16_t nCompleteCountLast = GetUpCompleteSourcesCount();
-                        uint16_t nCompleteCountNew = data->ReadUInt16();
+                        uint16 nCompleteCountLast = GetUpCompleteSourcesCount();
+                        uint16 nCompleteCountNew = data->ReadUInt16();
                         SetUpCompleteSourcesCount(nCompleteCountNew);
                         if (nCompleteCountLast != nCompleteCountNew) {
@@ -572 +575 @@
 }
 
-uint32_t CUpDownClient::GetWaitStartTime() const
-{
-        uint32_t dwResult = 0;
+
+uint32 CUpDownClient::GetWaitStartTime() const
+{
+        uint32 dwResult = 0;
         
         if ( credits ) {
@@ -605 +609 @@
 
 
-uint32_t CUpDownClient::SendBlockData()
-{
-    uint32_t curTick = ::GetTickCount();
-    uint64_t sentBytesCompleteFile = 0;
-    uint64_t sentBytesPartFile = 0;
-    uint64_t sentBytesPayload = 0;
-
-        if ( m_socket )
-        {
+uint32 CUpDownClient::SendBlockData()
+{
+    uint32 curTick = ::GetTickCount();
+    uint64 sentBytesCompleteFile = 0;
+    uint64 sentBytesPartFile = 0;
+    uint64 sentBytesPayload = 0;
+
+    if (m_socket) {
                 CEMSocket* s = m_socket;
-        //              uint32_t uUpStatsPort = GetUserPort();
+//              uint32 uUpStatsPort = GetUserPort();
         
                 // Extended statistics information based on which client software and which port we sent this data to...
@@ -631 +634 @@
                 m_nCurQueueSessionPayloadUp += sentBytesPayload;
         
-                if ( theApp->uploadqueue->CheckForTimeOver ( this ) )
-                {
+        if (theApp->uploadqueue->CheckForTimeOver(this)) {
                         theApp->uploadqueue->RemoveFromUploadQueue ( this, true );
                         SendOutOfPartReqsAndAddToWaitingQueue();
-                }
-                else
-                {
+        } else {
                         // read blocks from file and put on socket
                         CreateNextBlockPackage();
@@ -644 +644 @@
         
         if ( sentBytesCompleteFile + sentBytesPartFile > 0 ||
-                m_AvarageUDR_list.size() == 0 || ( curTick - m_AvarageUDR_list.back().timestamp ) > 1*1000 )
-        {
+        m_AvarageUDR_list.empty() || (curTick - m_AvarageUDR_list.back().timestamp) > 1*1000) {
                 // Store how much data we've transferred this round,
                 // to be able to calculate average speed later
                 // keep sum of all values in list up to date
-                TransferredData newitem = { (uint32_t) (sentBytesCompleteFile + sentBytesPartFile), curTick};
+        TransferredData newitem = {sentBytesCompleteFile + sentBytesPartFile, curTick};
                 m_AvarageUDR_list.push_back ( newitem );
                 m_nSumForAvgUpDataRate += sentBytesCompleteFile + sentBytesPartFile;
         }
         
-        // remove too old values in list
+    // remove to old values in list
         while ( m_AvarageUDR_list.size() > 0 && ( curTick - m_AvarageUDR_list.front().timestamp ) > _average_period*1000 )
         {
@@ -663 +662 @@
         
         // Calculate average speed for this slot
-        if ( m_AvarageUDR_list.size() > 0 && ( curTick - m_AvarageUDR_list.front().timestamp ) > 0 && GetUpStartTimeDelay() > 2*1000 )
-        {
-                m_nUpDatarate = (uint32_t)
-                                (( m_nSumForAvgUpDataRate * (uint64_t)1000 ) /
-                                (uint64_t) ( curTick-m_AvarageUDR_list.front().timestamp ));
-        }
-        else
-        {
+    if ((!m_AvarageUDR_list.empty()) && (curTick - m_AvarageUDR_list.front().timestamp) > 0 && GetUpStartTimeDelay() > 2*1000) {
+        m_nUpDatarate = ((uint64)m_nSumForAvgUpDataRate*1000) / (curTick-m_AvarageUDR_list.front().timestamp);
+    } else {
                 // not enough values to calculate trustworthy speed. Use -1 to tell this
                 m_nUpDatarate = 0; //-1;
@@ -677 +671 @@
         // Check if it's time to update the display.
         m_cSendblock++;
-        if ( m_cSendblock == 30 )
-        {
+        if (m_cSendblock == 30){
                 m_cSendblock = 0;
                 Notify_UploadCtrlRefreshClient ( this );
         }
         
-        return (uint32_t) (sentBytesCompleteFile + sentBytesPartFile);
+    return sentBytesCompleteFile + sentBytesPartFile;
         }
 
@@ -698 +691 @@
         //I did some tests with eDonkey also and it seems to work well with them also..
         
-        AddDebugLogLineM(false, logLocalClient, CFormat(wxT("%x (%s --> %s): Local client %x : Sending OP_OUTOFPARTREQS")) % (long) m_socket % m_socket->GetLocal().humanReadable() % m_socket->GetPeer().humanReadable() % (long) this);
-        
         // Send this inmediately, don't queue.
-        CPacket* pPacket = new CPacket(OP_OUTOFPARTREQS, 0);
+        CPacket* pPacket = new CPacket(OP_OUTOFPARTREQS, 0, OP_EDONKEYPROT);
         theStats::AddUpOverheadFileRequest(pPacket->GetPacketSize());
+        AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_OUTOFPARTREQS to ") + GetFullIP() );
         SendPacket(pPacket, true, true);
         
@@ -754 +746 @@
                 data.WriteHash(file->GetPartHash(i));
         }
-        CPacket* packet = new CPacket(data);
-        packet->SetOpCode(OP_HASHSETANSWER);
+        CPacket* packet = new CPacket(data, OP_EDONKEYPROT, OP_HASHSETANSWER);  
         theStats::AddUpOverheadFileRequest(packet->GetPacketSize());
+        AddDebugLogLineM( false, logLocalClient, wxT("Local Client: OP_HASHSETANSWER to ") + GetFullIP());
         SendPacket(packet,true,true);
 }
@@ -774 +766 @@
         }
 
-        uint16_t nRank = theApp->uploadqueue->GetWaitingPosition(this);
+        uint16 nRank = theApp->uploadqueue->GetWaitingPosition(this);
         if (!nRank) {
                 return;
@@ -783 +775 @@
         // Kry: what are these zero bytes for. are they really correct?
         // Kry - Well, eMule does like that. I guess they're ok.
-        data.WriteUInt32(0); 
-        data.WriteUInt32(0); 
-        data.WriteUInt16(0);
-
-        AddDebugLogLineM(false, logLocalClient, CFormat(wxT("%x (%s --> %s): Local client %x : OP_QUEUERANKING ")) % (long) m_socket % m_socket->GetLocal().humanReadable() % m_socket->GetPeer().humanReadable() % (long) this);
-        CPacket* packet = new CPacket(data,OP_EMULEPROT);
-        packet->SetOpCode(OP_QUEUERANKING);
-        
+        data.WriteUInt32(0); data.WriteUInt32(0); data.WriteUInt16(0);
+        CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_QUEUERANKING);
         theStats::AddUpOverheadOther(packet->GetPacketSize());
+        AddDebugLogLineM(false, logLocalClient, wxT("Local Client: OP_QUEUERANKING to ") + GetFullIP());
         SendPacket(packet,true,true);
 }
@@ -803 +790 @@
         m_bCommentDirty = false;
 
-        // We used to limit the comment to 50 before, now we do not anymore.
-        const wxString& desc = file->GetFileComment();
-        uint8_t rating = file->GetFileRating();
+        // Truncate to max len.
+        wxString desc = file->GetFileComment().Left(MAXFILECOMMENTLEN);
+        uint8 rating = file->GetFileRating();
         
         if ( file->GetFileRating() == 0 && desc.IsEmpty() ) {
@@ -813 +800 @@
         CMemFile data(256);
         data.WriteUInt8(rating);
-        data.WriteString(desc, GetUnicodeSupport(), 4 /* size it's uint32_t */);
-        
-        AddDebugLogLineM(false, logLocalClient, CFormat(wxT("%x (%s --> %s): Local client %x : OP_FILEDESC")) % (long) m_socket % m_socket->GetLocal().humanReadable() % m_socket->GetPeer().humanReadable() % (long) this);    
-        CPacket* packet = new CPacket(data,OP_EMULEPROT);
-        packet->SetOpCode(OP_FILEDESC);
+        data.WriteString(desc, GetUnicodeSupport(), 4 /* size it's uint32 */);
+        
+        CPacket* packet = new CPacket(data, OP_EMULEPROT, OP_FILEDESC);
         theStats::AddUpOverheadOther(packet->GetPacketSize());
+        AddDebugLogLineM(false, logLocalClient, wxT("Local Client: OP_FILEDESC to ") + GetFullIP());    
         SendPacket(packet,true);
 }
@@ -837 +823 @@
         theApp->clientlist->AddBannedClient( GetTCPDest/*IP*/() );
         
-        AddDebugLogLineM( false, logClient, CFormat(wxT("%x :Client '")) % (long) this + GetUserName() + wxT("' seems to be an aggressive client and is banned from the uploadqueue"));
+        AddDebugLogLineM( false, logClient, wxT("Client '") + GetUserName() + wxT("' seems to be an aggressive client and is banned from the uploadqueue"));
         
         SetUploadState(US_BANNED);
@@ -852 +838 @@
 void CUpDownClient::CheckForAggressive()
 {
-        uint32_t cur_time = ::GetTickCount();
+        uint32 cur_time = ::GetTickCount();
         
         // First call, initalize
@@ -862 +848 @@
         // Is this an aggressive request?
         if ( ( cur_time - m_LastFileRequest ) < MIN_REQUESTTIME ) {
-                m_Aggressiveness = (uint16_t) (m_Aggressiveness + 3);
+                m_Aggressiveness += 3;
                 
                 // Is the client EVIL?