Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-09 01:25:17 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvements to file transfer:

Browse source 
- corrected 2 potential flaws of swarming causing request of unavailable data (This should normally be taken care of on the server side!)
- improved swarming test code with fault simulation
- only ask CRC32 maps to peers that have a complete file.
 


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@4947 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-02-16 21:10:46 +00:00
parent 1fea734862
commit 2edb61758b
6 changed files with 85 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

27
libretroshare/src/ft/fttransfermodule.cc
View file

@ -598,6 +598,8 @@ bool ftTransferModule::checkFile()
return true ;
}
}
forceCheck() ;
return false ;
}
@ -699,18 +701,21 @@ bool ftTransferModule::checkCRC()
break ;
}
int n = rand()%(mFileSources.size()) ;
int p=0 ;
std::map<std::string,peerInfo>::const_iterator mit ;
for(mit = mFileSources.begin();mit != mFileSources.end() && p<n;++mit,++p) ;
bool found = false ;
#ifdef FT_DEBUG
std::cerr << "ftTransferModule::checkCRC(): sending CRC map request to source " << mit->first << std::endl ;
#endif
_crcmap_last_asked_time = now ;
_crcreq_source = mit->first ;
for(std::map<std::string,peerInfo>::const_iterator mit = mFileSources.begin();mit != mFileSources.end();++mit)
if(mFileCreator->sourceIsComplete(mit->first))
{
//#ifdef FT_DEBUG
std::cerr << "ftTransferModule::checkCRC(): sending CRC map request to source " << mit->first << std::endl ;
//#endif
_crcmap_last_asked_time = now ;
_crcreq_source = mit->first ;
mMultiplexor->sendCRC32MapRequest(mit->first,mHash);
mMultiplexor->sendCRC32MapRequest(mit->first,mHash);
found = true ;
break ;
}
}
break ;
@ -750,7 +755,7 @@ bool ftTransferModule::checkCRC()
{
// We do as if the file is not complete. This way, it finishes properly.
//
mFlag = FT_TM_FLAG_DOWNLOADING ;
mFlag = FT_TM_FLAG_COMPLETE ; // Transfer is complete.
mFileStatus.stat = ftFileStatus::PQIFILE_DOWNLOADING;
#ifdef FT_DEBUG
std::cerr << "ftTransferModule::checkCRC(): Done. CRC check is ok, file is complete." << std::endl ;