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

fixed a few bugs in ban file list management

Browse source
This commit is contained in:
csoler 2018-08-25 20:52:06 +02:00
parent b5eabf7af7
commit 2fab33d37f
No known key found for this signature in database
GPG key ID: 7BCA522266C0804C
2 changed files with 18 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
libretroshare/src/file_sharing/p3filelists.cc
View file

@ -566,7 +566,7 @@ bool p3FileDatabase::loadList(std::list<RsItem *>& load)
if(fb) if(fb)
{ {
mPrimaryBanList = fb->primary_banned_files_list ; mPrimaryBanList = fb->primary_banned_files_list ;
mBannedFilesChanged = true; mBannedFileListNeedsUpdate = true;
mLastPrimaryBanListChangeTimeStamp = time(NULL); mLastPrimaryBanListChangeTimeStamp = time(NULL);
} }
@ -1918,6 +1918,7 @@ bool p3FileDatabase::banFile(const RsFileHash& real_file_hash, const std::string
mBannedFileList.insert(hash_of_hash) ; mBannedFileList.insert(hash_of_hash) ;
mLastPrimaryBanListChangeTimeStamp = time(NULL); mLastPrimaryBanListChangeTimeStamp = time(NULL);
mBannedFileListNeedsUpdate = true ;
} }
} }
@ -1933,6 +1934,7 @@ bool p3FileDatabase::unbanFile(const RsFileHash& real_file_hash)
RS_STACK_MUTEX(mFLSMtx) ; RS_STACK_MUTEX(mFLSMtx) ;
mPrimaryBanList.erase(real_file_hash) ; mPrimaryBanList.erase(real_file_hash) ;
mLastPrimaryBanListChangeTimeStamp = time(NULL); mLastPrimaryBanListChangeTimeStamp = time(NULL);
mBannedFileListNeedsUpdate = true ;
} }
IndicateConfigChanged(); IndicateConfigChanged();
@ -1977,7 +1979,7 @@ void p3FileDatabase::setTrustFriendNodesForBannedFiles(bool b)
if(b != mTrustFriendNodesForBannedFiles) if(b != mTrustFriendNodesForBannedFiles)
{ {
IndicateConfigChanged(); IndicateConfigChanged();
mBannedFilesChanged = true; mBannedFileListNeedsUpdate = true;
} }
RS_STACK_MUTEX(mFLSMtx) ; RS_STACK_MUTEX(mFLSMtx) ;
@ -1991,7 +1993,7 @@ void p3FileDatabase::checkSendBannedFilesInfo()
// 1 - compare records to list of online friends, send own info of not already // 1 - compare records to list of online friends, send own info of not already
#ifdef DEBUG_CONTENT_FILTERING #ifdef DEBUG_CONTENT_FILTERING
P3FILELISTS_DEBUG() << " Checking banned file list: " << std::endl; P3FILELISTS_DEBUG() << " Checking banned files information: " << std::endl;
#endif #endif
time_t now = time(NULL); time_t now = time(NULL);
@ -2039,12 +2041,12 @@ void p3FileDatabase::checkSendBannedFilesInfo()
// 3 - update list of banned hashes if it has changed somehow // 3 - update list of banned hashes if it has changed somehow
if(mBannedFilesChanged) if(mBannedFileListNeedsUpdate)
{ {
mBannedFileList.clear(); mBannedFileList.clear();
#ifdef DEBUG_CONTENT_FILTERING #ifdef DEBUG_CONTENT_FILTERING
P3FILELISTS_DEBUG() << " Creating banned file list: " << std::endl; P3FILELISTS_DEBUG() << " Creating local banned file list: " << std::endl;
#endif #endif
// Add all H(H(f)) from friends // Add all H(H(f)) from friends
@ -2075,15 +2077,22 @@ void p3FileDatabase::checkSendBannedFilesInfo()
#endif #endif
} }
mBannedFilesChanged = false ; mBannedFileListNeedsUpdate = false ;
} }
#ifdef DEBUG_CONTENT_FILTERING
P3FILELISTS_DEBUG() << " Final list of locally banned hashes contains: " << mBannedFileList.size() << " elements." << std::endl;
#endif
} }
void p3FileDatabase::locked_sendBanInfo(const RsPeerId& peer) void p3FileDatabase::locked_sendBanInfo(const RsPeerId& peer)
{ {
RsFileListsBannedHashesItem *item = NULL; RsFileListsBannedHashesItem *item = new RsFileListsBannedHashesItem ;
uint32_t session_id = RSRandom::random_u32(); uint32_t session_id = RSRandom::random_u32();
item->session_id = session_id ;
item->PeerId(peer);
for(auto it(mPrimaryBanList.begin());it!=mPrimaryBanList.end();++it) for(auto it(mPrimaryBanList.begin());it!=mPrimaryBanList.end();++it)
{ {
RsFileHash hash_of_hash ; RsFileHash hash_of_hash ;
@ -2139,6 +2148,6 @@ void p3FileDatabase::handleBannedFilesInfo(RsFileListsBannedHashesItem *item)
// 3 - tell the updater that the banned file list has changed // 3 - tell the updater that the banned file list has changed
mBannedFilesChanged = true ; mBannedFileListNeedsUpdate = true ;
} }

2
libretroshare/src/file_sharing/p3filelists.h
View file

@ -269,7 +269,7 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
std::map<RsPeerId,PeerBannedFilesEntry> mPeerBannedFiles ; // records of which files other peers ban, stored as H(H(f)) std::map<RsPeerId,PeerBannedFilesEntry> mPeerBannedFiles ; // records of which files other peers ban, stored as H(H(f))
std::set<RsFileHash> mBannedFileList ; // list of banned hashes. This include original hashs and H(H(f)) when coming from friends. std::set<RsFileHash> mBannedFileList ; // list of banned hashes. This include original hashs and H(H(f)) when coming from friends.
bool mTrustFriendNodesForBannedFiles ; bool mTrustFriendNodesForBannedFiles ;
bool mBannedFilesChanged; bool mBannedFileListNeedsUpdate;
time_t mLastPrimaryBanListChangeTimeStamp; time_t mLastPrimaryBanListChangeTimeStamp;
void locked_sendBanInfo(const RsPeerId& pid); void locked_sendBanInfo(const RsPeerId& pid);