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

Major bugfixes and testing changes for ft.

Browse source 
It is now almost ready for integration with rs.

Added ftserver3test.cc which successfully tests:
	* Hashing of a directory.
	* Transfer of Cache Files.
	* Local Searching.
	* Remote Searching.
	* Download from multiple sources.




git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@773 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-10-29 20:58:23 +00:00
parent 889825b77e
commit 88ef2e0e34
17 changed files with 1010 additions and 106 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libretroshare/src/ft/ftfileprovider.cc
View file

@ -79,7 +79,8 @@ bool ftFileProvider::getFileData(uint64_t offset, uint32_t chunk_size, void *dat
*/
fseek(fd, base_loc, SEEK_SET);
void *data = malloc(chunk_size);
// Data space allocated by caller.
//void *data = malloc(chunk_size);
/*
* read the data
@ -117,7 +118,7 @@ int ftFileProvider::initializeFileAttrs()
{
std::cerr << "ftFileProvider::initializeFileAttrs() Filename: ";
std::cerr << file_name;
std::cerr << std::endl;
RsStackMutex stack(ftcMutex); /********** STACK LOCKED MTX ******/
if (fd)
@ -128,8 +129,8 @@ int ftFileProvider::initializeFileAttrs()
*/
{
std::cout <<
"ftFileProvider::initializeFileAttrs() Filename: " << file_name;
std::cerr << "ftFileProvider::initializeFileAttrs() trying (r+b) ";
std::cerr << std::endl;
}
/*
@ -139,8 +140,8 @@ int ftFileProvider::initializeFileAttrs()
fd = fopen(file_name.c_str(), "r+b");
if (!fd)
{
std::cout <<
"ftFileProvider::initializeFileAttrs() Failed to open (r+b): "<< file_name << std::endl;
std::cerr << "ftFileProvider::initializeFileAttrs() Failed to open (r+b): ";
std::cerr << file_name << std::endl;
return 0;
}