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

fixed up a few debug messages in p3filelists

Browse Source
This commit is contained in:
csoler 2016-09-25 18:51:33 +02:00
parent bb4b577768
commit 068955d419
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libretroshare/src/file_sharing/dir_hierarchy.cc
View File

@ -982,7 +982,7 @@ bool InternalFileHierarchyStorage::load(const std::string& fname)
mNodes.clear(); mNodes.clear();
mNodes.resize(n_nodes,NULL) ; mNodes.resize(n_nodes,NULL) ;
for(uint32_t i=0;i<mNodes.size();++i) for(uint32_t i=0;i<mNodes.size() && buffer_offset < buffer_size;++i) // only the 2nd condition really is needed. The first one ensures that the loop wont go forever.
{ {
unsigned char *node_section_data = NULL ; unsigned char *node_section_data = NULL ;
uint32_t node_section_size = 0 ; uint32_t node_section_size = 0 ;

12
libretroshare/src/file_sharing/filelist_io.cc
View File

@ -151,7 +151,7 @@ bool FileListIO::saveEncryptedDataToFile(const std::string& fname,const unsigned
if(!AuthSSL::getAuthSSL()->encrypt( encryptedData, encDataLen, data,total_size, AuthSSL::getAuthSSL()->OwnId())) if(!AuthSSL::getAuthSSL()->encrypt( encryptedData, encDataLen, data,total_size, AuthSSL::getAuthSSL()->OwnId()))
{ {
std::cerr << "Cannot encrypt hash cache. Something's wrong." << std::endl; std::cerr << "Cannot encrypt encrypted file. Something's wrong." << std::endl;
return false; return false;
} }
@ -159,14 +159,14 @@ bool FileListIO::saveEncryptedDataToFile(const std::string& fname,const unsigned
if(!F) if(!F)
{ {
std::cerr << "Cannot open encrypted file cache for writing: " << fname+".tmp" << std::endl; std::cerr << "Cannot open encrypted file for writing: " << fname+".tmp" << std::endl;
free(encryptedData); free(encryptedData);
return false; return false;
} }
if(fwrite(encryptedData,1,encDataLen,F) != (uint32_t)encDataLen) if(fwrite(encryptedData,1,encDataLen,F) != (uint32_t)encDataLen)
{ {
std::cerr << "Could not write entire encrypted hash cache file. Out of disc space??" << std::endl; std::cerr << "Could not write entire encrypted file. Out of disc space??" << std::endl;
fclose(F) ; fclose(F) ;
free(encryptedData); free(encryptedData);
@ -190,7 +190,7 @@ bool FileListIO::loadEncryptedDataFromFile(const std::string& fname,unsigned cha
if(!RsDirUtil::checkFile( fname,file_size,false ) ) if(!RsDirUtil::checkFile( fname,file_size,false ) )
{ {
std::cerr << "Encrypted hash cache file not present." << std::endl; std::cerr << "Encrypted file " << fname << " not available." << std::endl;
return false; return false;
} }
@ -204,7 +204,7 @@ bool FileListIO::loadEncryptedDataFromFile(const std::string& fname,unsigned cha
FILE *F = fopen( fname.c_str(),"rb") ; FILE *F = fopen( fname.c_str(),"rb") ;
if (!F) if (!F)
{ {
std::cerr << "Cannot open file for reading encrypted file cache, filename " << fname << std::endl; std::cerr << "Cannot open encrypted file, filename " << fname << std::endl;
return false; return false;
} }
if(fread(buffer,1,file_size,F) != file_size) if(fread(buffer,1,file_size,F) != file_size)
@ -221,7 +221,7 @@ bool FileListIO::loadEncryptedDataFromFile(const std::string& fname,unsigned cha
if(!AuthSSL::getAuthSSL()->decrypt(decrypted_data, decrypted_data_size, buffer, file_size)) if(!AuthSSL::getAuthSSL()->decrypt(decrypted_data, decrypted_data_size, buffer, file_size))
{ {
std::cerr << "Cannot decrypt encrypted file cache. Something's wrong." << std::endl; std::cerr << "Cannot decrypt encrypted file. Something's wrong." << std::endl;
return false; return false;
} }

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

@ -1262,7 +1262,9 @@ void p3FileDatabase::handleDirSyncResponse(RsFileListsSyncResponseItem *sitem)
RS_STACK_MUTEX(mFLSMtx) ; RS_STACK_MUTEX(mFLSMtx) ;
fi = locked_getFriendIndex(item->PeerId()); fi = locked_getFriendIndex(item->PeerId());
std::cerr << " friend index is " << fi ; #ifdef DEBUG_P3FILELISTS
P3FILELISTS_DEBUG() << " friend index is " << fi ;
#endif
// make sure we have a remote directory for that friend. // make sure we have a remote directory for that friend.