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

fixed a few bugs in internal directory storage structure

Browse source
This commit is contained in:
mr-alice 2016-08-16 13:46:55 +02:00
parent 2668b6da1c
commit ca8f95c7f7
5 changed files with 59 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -203,21 +203,16 @@ void p3FileDatabase::cleanup()
//
for(std::set<RsPeerId>::const_iterator it(friend_set.begin());it!=friend_set.end();++it)
{
P3FILELISTS_DEBUG() << " adding missing remote dir entry for friend " << *it << std::endl;
// Check if a remote directory exists for that friend, possibly creating the index.
uint32_t i;
for(i=0;i<mDirectories.size() && mDirectories[i] != NULL;++i);
uint32_t friend_index = getFriendIndex(*it) ;
if(i == mDirectories.size())
mDirectories.push_back(NULL) ;
if(mDirectories.size() > friend_index && mDirectories[friend_index] != NULL)
continue ;
mDirectories[i] = new RemoteDirectoryStorage(*it,makeRemoteFileName(*it));
P3FILELISTS_DEBUG() << " adding missing remote dir entry for friend " << *it << ", with index " << friend_index << std::endl;
if(mFriendIndexTab.size() <= i)
mFriendIndexTab.resize(i+1) ;
mFriendIndexTab[i] = *it ;
mFriendIndexMap[*it] = i;
mDirectories[friend_index] = new RemoteDirectoryStorage(*it,makeRemoteFileName(*it));
mUpdateFlags |= P3FILELISTS_UPDATE_FLAG_REMOTE_MAP_CHANGED ;
}
@ -249,19 +244,33 @@ uint32_t p3FileDatabase::getFriendIndex(const RsPeerId& pid)
if(!found)
{
std::cerr << "(EE) FriendIndexTab is full. This is weird. Do you really have more than 1024 friends??" << std::endl;
return 1024 ;
found = mFriendIndexTab.size();
mFriendIndexTab.push_back(pid);
}
if(mFriendIndexTab.size() >= (1 << NB_FRIEND_INDEX_BITS) )
{
std::cerr << "(EE) FriendIndexTab is full. This is weird. Do you really have more than " << (1<<NB_FRIEND_INDEX_BITS) << " friends??" << std::endl;
return 1 << NB_FRIEND_INDEX_BITS ;
}
mFriendIndexTab[found] = pid ;
mFriendIndexMap[pid] = found;
if(mDirectories.size() <= found)
mDirectories.resize(found+1,NULL) ;
IndicateConfigChanged();
return found ;
}
else
{
if(mDirectories.size() <= it->second)
mDirectories.resize(it->second+1,NULL) ;
return it->second;
}
}
const RsPeerId& p3FileDatabase::getFriendFromIndex(uint32_t indx) const