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

More bugfixes for file transfer stuff.

Browse source 
* Completed 2 basic tests (ftserver1test & ftserver2test)
 * Updated test notes.
 * debugging stderr output. 
 * fixed return code in ftfilesearch.cc
 * corrected ftcontroller run() to call fttransfermodule::tick()
 * fixed ONLINE status for OwnId (ftcontroller too)
 * corrected message sources for test harness.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@705 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-08-21 21:30:59 +00:00
parent 08285b512d
commit 7b7446c5b5
9 changed files with 518 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

17
libretroshare/src/ft/fttransfermodule.cc
View file

@ -131,16 +131,32 @@ bool ftTransferModule::recvFileData(std::string peerId, uint64_t offset,
void ftTransferModule::requestData(std::string peerId, uint64_t offset, uint32_t chunk_size)
{
std::cerr << "ftTransferModule::requestData()";
std::cerr << " peerId: " << peerId;
std::cerr << " offset: " << offset;
std::cerr << " chunk_size: " << chunk_size;
std::cerr << std::endl;
mMultiplexor->sendDataRequest(peerId, mHash, mSize, offset,chunk_size);
}
bool ftTransferModule::getChunk(uint64_t &offset, uint32_t &chunk_size)
{
std::cerr << "ftTransferModule::getChunk()";
std::cerr << " offset: " << offset;
std::cerr << " chunk_size: " << chunk_size;
std::cerr << std::endl;
return mFileCreator->getMissingChunk(offset, chunk_size);
}
bool ftTransferModule::storeData(uint64_t offset, uint32_t chunk_size,void *data)
{
std::cerr << "ftTransferModule::storeData()";
std::cerr << " offset: " << offset;
std::cerr << " chunk_size: " << chunk_size;
std::cerr << std::endl;
return mFileCreator -> addFileData(offset, chunk_size, data);
}
@ -150,6 +166,7 @@ void ftTransferModule::queryInactive()
std::ostringstream out;
out<<"ftTransferModule::queryInactive()";
out<<std:endl;
std::cerr << out.str();
#endif
int ts = time(NULL);