Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

added sending of banned file info

Browse Source
This commit is contained in:
csoler 2018-08-20 23:30:05 +02:00
parent e5e566051b
commit 0b176a0fe5
No known key found for this signature in database
GPG Key ID: 7BCA522266C0804C
4 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1415,8 +1415,8 @@ void p3FileDatabase::tickRecv()
{ {
switch(item->PacketSubType()) switch(item->PacketSubType())
{ {
case RS_PKT_SUBTYPE_FILELISTS_SYNC_REQ_ITEM: handleDirSyncRequest( dynamic_cast<RsFileListsSyncRequestItem*>(item) ) ; case RS_PKT_SUBTYPE_FILELISTS_SYNC_REQ_ITEM: handleDirSyncRequest( dynamic_cast<RsFileListsSyncRequestItem*>(item) ) ; break ;
break ; case RS_PKT_SUBTYPE_FILELISTS_BANNED_HASHES_ITEM : handleBannedFilesInfo( dynamic_cast<RsFileListsBannedHashesItem*>(item) ) ; break ;
case RS_PKT_SUBTYPE_FILELISTS_SYNC_RSP_ITEM: case RS_PKT_SUBTYPE_FILELISTS_SYNC_RSP_ITEM:
{ {
RsFileListsSyncResponseItem *sitem = dynamic_cast<RsFileListsSyncResponseItem*>(item); RsFileListsSyncResponseItem *sitem = dynamic_cast<RsFileListsSyncResponseItem*>(item);
@ -1969,6 +1969,7 @@ void p3FileDatabase::checkSendBannedFilesInfo()
// Add all H(H(f)) from friends // Add all H(H(f)) from friends
if(mTrustFriendNodesForBannedFiles)
for(auto it(mPeerBannedFiles.begin());it!=mPeerBannedFiles.end();++it) for(auto it(mPeerBannedFiles.begin());it!=mPeerBannedFiles.end();++it)
for(auto it2(it->second.mBannedHashOfHash.begin());it2!=it->second.mBannedHashOfHash.end();++it2) for(auto it2(it->second.mBannedHashOfHash.begin());it2!=it->second.mBannedHashOfHash.end();++it2)
mBannedFileList.insert(*it2); mBannedFileList.insert(*it2);
@ -1989,10 +1990,47 @@ void p3FileDatabase::checkSendBannedFilesInfo()
} }
} }
void p3FileDatabase::locked_sendBanInfo(const RsPeerId& peer) void p3FileDatabase::locked_sendBanInfo(const RsPeerId& peer)
{ {
#warning TODO: add code to send ban info to friends RsFileListsBannedHashesItem *item = NULL;
uint32_t session_id = RSRandom::random_u32();
for(auto it(mPrimaryBanList.begin());it!=mPrimaryBanList.end();++it)
{
RsFileHash hash_of_hash ;
ftServer::encryptHash(it->first,hash_of_hash) ;
if(!item)
{
RsFileListsBannedHashesItem *item = new RsFileListsBannedHashesItem ;
item->PeerId(peer);
item->session_id = session_id ;
}
item->encrypted_hashes.insert(hash_of_hash) ;
if(item->encrypted_hashes.size() >= 200)
{
sendItem(item);
item = NULL ;
}
}
if(item)
sendItem(item);
} }
void p3FileDatabase::handleBannedFilesInfo(RsFileListsBannedHashesItem *item)
{
RS_STACK_MUTEX(mFLSMtx) ;
// 1 - localize the friend in the banned file map
// 2 - replace/update the list, depending on the session_id
// 3 - tell the updater that the banned file list has changed
#warning missing code here!
}

6
libretroshare/src/file_sharing/p3filelists.h
View File

@ -62,13 +62,14 @@ class LocalDirectoryStorage ;
class RsFileListsSyncRequestItem ; class RsFileListsSyncRequestItem ;
class RsFileListsSyncResponseItem ; class RsFileListsSyncResponseItem ;
class RsFileListsBannedHashesItem ;
class HashStorage ; class HashStorage ;
struct PeerBannedFilesEntry struct PeerBannedFilesEntry
{ {
std::set<RsFileHash> mBannedHashOfHash; std::set<RsFileHash> mBannedHashOfHash;
uint32_t mRecordNumber ; // used for when a friend sends multiple packets in separate items. uint32_t mSessionId ; // used for when a friend sends multiple packets in separate items.
time_t mLastSent; time_t mLastSent;
}; };
@ -260,7 +261,7 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
time_t mLastCleanupTime; time_t mLastCleanupTime;
time_t mLastDataRecvTS ; time_t mLastDataRecvTS ;
// file filtering. Not explicitly related to shared files, but // file filtering. Not explicitly related to shared files, but has its place here
// //
std::map<RsFileHash,BannedFileEntry> mPrimaryBanList ; // primary list (user controlled) of files banned from FT search and forwarding. map<real hash, BannedFileEntry> std::map<RsFileHash,BannedFileEntry> mPrimaryBanList ; // primary list (user controlled) of files banned from FT search and forwarding. map<real hash, BannedFileEntry>
@ -270,5 +271,6 @@ class p3FileDatabase: public p3Service, public p3Config, public ftSearch //, pub
bool mBannedFilesChanged; bool mBannedFilesChanged;
void locked_sendBanInfo(const RsPeerId& pid); void locked_sendBanInfo(const RsPeerId& pid);
void handleBannedFilesInfo(RsFileListsBannedHashesItem *item);
}; };

1
libretroshare/src/file_sharing/rsfilelistitems.cc
View File

@ -43,6 +43,7 @@ void RsFileListsSyncResponseItem::serial_process(RsGenericSerializer::SerializeJ
} }
void RsFileListsBannedHashesItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx) void RsFileListsBannedHashesItem::serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx)
{ {
RsTypeSerializer::serial_process(j,ctx,session_id ,"session_id") ;
RsTypeSerializer::serial_process(j,ctx,encrypted_hashes,"encrypted_hashes") ; RsTypeSerializer::serial_process(j,ctx,encrypted_hashes,"encrypted_hashes") ;
} }

1
libretroshare/src/file_sharing/rsfilelistitems.h
View File

@ -110,6 +110,7 @@ public:
virtual void clear() { encrypted_hashes.clear(); } virtual void clear() { encrypted_hashes.clear(); }
virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx); virtual void serial_process(RsGenericSerializer::SerializeJob j,RsGenericSerializer::SerializeContext& ctx);
uint32_t session_id ; // used to allow to send in multiple parts.
std::set<RsFileHash> encrypted_hashes ;// hash of hash for each banned file. std::set<RsFileHash> encrypted_hashes ;// hash of hash for each banned file.
}; };