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

Merge pull request #1984 from G10h4ck/already_have_files_extra

Browse Source 
RsFiles::alreadyHaveFile look into extra list too
This commit is contained in:
G10h4ck 2020-05-29 12:20:55 +02:00 committed by GitHub
commit 3f7bfdfbb5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libretroshare/src/file_sharing/p3filelists.cc
View File

@ -1424,9 +1424,15 @@ int p3FileDatabase::SearchBoolExp(RsRegularExpression::Expression *exp, std::lis
return !results.empty() ; return !results.empty() ;
} }
bool p3FileDatabase::search(const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const
bool p3FileDatabase::search(
const RsFileHash &hash, FileSearchFlags hintflags, FileInfo &info) const
{ {
RS_STACK_MUTEX(mFLSMtx) ; RS_STACK_MUTEX(mFLSMtx);
if( (hintflags & RS_FILE_HINTS_EXTRA) &&
mExtraFiles->search(hash, hintflags, info) )
return true;
if(hintflags & RS_FILE_HINTS_LOCAL) if(hintflags & RS_FILE_HINTS_LOCAL)
{ {

3
libretroshare/src/ft/ftserver.cc
View File

@ -293,7 +293,8 @@ bool ftServer::getFileData(const RsFileHash& hash, uint64_t offset, uint32_t& re
bool ftServer::alreadyHaveFile(const RsFileHash& hash, FileInfo &info) bool ftServer::alreadyHaveFile(const RsFileHash& hash, FileInfo &info)
{ {
return mFileDatabase->search(hash, RS_FILE_HINTS_LOCAL, info); return mFileDatabase->search(
hash, RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_LOCAL, info );
} }
bool ftServer::FileRequest( bool ftServer::FileRequest(