Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-16 01:54:52 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

fixed swarming with encrypted end-to-end tunnels

Browse source
This commit is contained in:
mr-alice 2016-11-01 11:57:25 +01:00
parent c6df59a421
commit ffdac640d8
1 changed files with 50 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

44
libretroshare/src/ft/ftserver.cc
View file

@ -546,8 +546,11 @@ void ftServer::removeVirtualPeer(const TurtleFileHash& hash,const TurtleVirtualP
bool ftServer::handleTunnelRequest(const RsFileHash& hash,const RsPeerId& peer_id) bool ftServer::handleTunnelRequest(const RsFileHash& hash,const RsPeerId& peer_id)
{ {
FileInfo info ; FileInfo info ;
bool res = FileDetails(hash, RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_LOCAL | RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_SPEC_ONLY, info); RsFileHash real_hash ;
bool found = false ;
if(FileDetails(hash, RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_LOCAL | RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_SPEC_ONLY, info))
{
if(info.transfer_info_flags & RS_FILE_REQ_ENCRYPTED) if(info.transfer_info_flags & RS_FILE_REQ_ENCRYPTED)
{ {
#ifdef SERVER_DEBUG #ifdef SERVER_DEBUG
@ -556,9 +559,27 @@ bool ftServer::handleTunnelRequest(const RsFileHash& hash,const RsPeerId& peer_i
RS_STACK_MUTEX(srvMutex) ; RS_STACK_MUTEX(srvMutex) ;
mEncryptedHashes[hash] = info.hash; mEncryptedHashes[hash] = info.hash;
real_hash = info.hash ;
} }
#warning needs to tweak for swarming with encrypted FT else
if( (!res) && FileDetails(hash,RS_FILE_HINTS_DOWNLOAD,info)) real_hash = hash ;
found = true ;
}
else // try to see if we're already swarming the file
{
{
RS_STACK_MUTEX(srvMutex) ;
std::map<RsFileHash,RsFileHash>::const_iterator it = mEncryptedHashes.find(hash) ;
if(it != mEncryptedHashes.end())
real_hash = it->second ;
else
real_hash = hash ;
}
if(FileDetails(real_hash,RS_FILE_HINTS_DOWNLOAD,info))
{ {
// This file is currently being downloaded. Let's look if we already have a chunk or not. If not, no need to // This file is currently being downloaded. Let's look if we already have a chunk or not. If not, no need to
// share the file! // share the file!
@ -568,20 +589,25 @@ bool ftServer::handleTunnelRequest(const RsFileHash& hash,const RsPeerId& peer_i
for(uint32_t i=0;i<info2.chunks.size();++i) for(uint32_t i=0;i<info2.chunks.size();++i)
if(info2.chunks[i] == FileChunksInfo::CHUNK_DONE) if(info2.chunks[i] == FileChunksInfo::CHUNK_DONE)
{ {
res = true ; found = true ;
if(info.transfer_info_flags & RS_FILE_REQ_ANONYMOUS_ROUTING)
info.storage_permission_flags = DIR_FLAGS_ANONYMOUS_DOWNLOAD ; // this is to allow swarming
break ; break ;
} }
} }
}
#ifdef SERVER_DEBUG #ifdef SERVER_DEBUG
FTSERVER_DEBUG() << "ftServer: performing local hash search for hash " << hash << std::endl; FTSERVER_DEBUG() << "ftServer: performing local hash search for hash " << hash << std::endl;
if(res) if(found)
{ {
FTSERVER_DEBUG() << "Found hash: " << std::endl; FTSERVER_DEBUG() << "Found hash: " << std::endl;
FTSERVER_DEBUG() << " hash = " << hash << std::endl; FTSERVER_DEBUG() << " hash = " << real_hash << std::endl;
FTSERVER_DEBUG() << " peer = " << peer_id << std::endl; FTSERVER_DEBUG() << " peer = " << peer_id << std::endl;
FTSERVER_DEBUG() << " flags = " << info.storage_permission_flags << std::endl; FTSERVER_DEBUG() << " flags = " << info.storage_permission_flags << std::endl;
FTSERVER_DEBUG() << " local = " << rsFiles->FileDetails(hash, RS_FILE_HINTS_NETWORK_WIDE | RS_FILE_HINTS_LOCAL | RS_FILE_HINTS_EXTRA | RS_FILE_HINTS_SPEC_ONLY | RS_FILE_HINTS_DOWNLOAD, info) << std::endl;
FTSERVER_DEBUG() << " groups= " ; FTSERVER_DEBUG() << " groups= " ;
for(std::list<RsNodeGroupId>::const_iterator it(info.parent_groups.begin());it!=info.parent_groups.end();++it) for(std::list<RsNodeGroupId>::const_iterator it(info.parent_groups.begin());it!=info.parent_groups.end();++it)
FTSERVER_DEBUG() << (*it) << ", " ; FTSERVER_DEBUG() << (*it) << ", " ;
@ -593,9 +619,9 @@ bool ftServer::handleTunnelRequest(const RsFileHash& hash,const RsPeerId& peer_i
// The call to computeHashPeerClearance() return a combination of RS_FILE_HINTS_NETWORK_WIDE and RS_FILE_HINTS_BROWSABLE // The call to computeHashPeerClearance() return a combination of RS_FILE_HINTS_NETWORK_WIDE and RS_FILE_HINTS_BROWSABLE
// This is an additional computation cost, but the way it's written here, it's only called when res is true. // This is an additional computation cost, but the way it's written here, it's only called when res is true.
// //
res = res && (RS_FILE_HINTS_NETWORK_WIDE & rsPeers->computePeerPermissionFlags(peer_id,info.storage_permission_flags,info.parent_groups)) ; found = found && (RS_FILE_HINTS_NETWORK_WIDE & rsPeers->computePeerPermissionFlags(peer_id,info.storage_permission_flags,info.parent_groups)) ;
return res ; return found ;
} }
/***************************************************************/ /***************************************************************/