Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-28 00:49:28 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

filter out disallowed direct sources from file request source list. Should systematically prevent unwanted direct transfers

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@6915 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-11-28 20:53:03 +00:00
parent 01588f6f53
commit f7a36d65a9
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libretroshare/src/ft/ftcontroller.cc
View File

@ -167,9 +167,9 @@ void ftController::addFileSource(const std::string& hash,const std::string& peer
std::map<std::string, ftFileControl*>::iterator it = mDownloads.find(hash);
#ifdef CONTROL_DEBUG
//#ifdef CONTROL_DEBUG
std::cerr << "ftController: Adding source " << peer_id << " to current download hash=" << hash ;
#endif
//#endif
if(it != mDownloads.end())
{
it->second->mTransfer->addFileSource(peer_id);
@ -1133,6 +1133,20 @@ bool ftController::FileRequest(const std::string& fname, const std::string& has
}
}
// remove the sources from the list, if they don't have clearance for direct transfer. This happens only for non cache files.
//
if(!(flags & RS_FILE_REQ_CACHE))
for(std::list<std::string>::iterator it = srcIds.begin(); it != srcIds.end(); )
if(!(rsPeers->servicePermissionFlags_sslid(*it) & RS_SERVICE_PERM_DIRECT_DL))
{
std::list<std::string>::iterator tmp(it) ;
++tmp ;
srcIds.erase(it) ;
it = tmp ;
}
else
++it ;
std::list<std::string>::const_iterator it;
std::list<TransferInfo>::const_iterator pit;
@ -1213,6 +1227,7 @@ bool ftController::FileRequest(const std::string& fname, const std::string& has
}
} /******* UNLOCKED ********/
if(!(flags & RS_FILE_REQ_NO_SEARCH))
{
/* do a source search - for any extra sources */