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

debugging tunnel handlign with permissions

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-FileSharingPermissions@5774 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-11-04 14:52:38 +00:00
parent 6b6f961e94
commit 997e833cc8
4 changed files with 16 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libretroshare/src/ft/ftdbase.cc
View file

@ -134,9 +134,6 @@ bool ftFiMonitor::search(const std::string &hash, FileSearchFlags hintflags, Fil
}
bool ftFiMonitor::search(const std::string &hash, FileSearchFlags hintflags, const std::string& peer_id,FileInfo &info) const
{
uint64_t fsize;
std::string path;
#ifdef DB_DEBUG
std::cerr << "ftFiMonitor::search(" << hash << "," << hintflags;
std::cerr << ")";
@ -149,7 +146,7 @@ bool ftFiMonitor::search(const std::string &hash, FileSearchFlags hintflags, con
FileSearchFlags flags = hintflags ;
flags &= (RS_FILE_HINTS_BROWSABLE | RS_FILE_HINTS_NETWORK_WIDE);
if(findLocalFile(hash, flags,peer_id,path, fsize))
if(findLocalFile(hash, flags,peer_id,info.path, info.size,info.storage_permission_flags,info.parent_groups))
{
/* fill in details */
#ifdef DB_DEBUG
@ -158,10 +155,7 @@ bool ftFiMonitor::search(const std::string &hash, FileSearchFlags hintflags, con
std::cerr << " = " << hash << "," << fsize;
std::cerr << std::endl;
#endif
info.size = fsize;
info.fname = RsDirUtil::getTopDir(path);
info.path = path;
info.fname = RsDirUtil::getTopDir(info.path);
return true;
}