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

Enabled new File Transfer Code in libretroshare.

Browse source 
NB: This is not yet working. so SVN is now officially broken :(
Hope to have the bugs ironed out soon.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-11-02 11:38:11 +00:00
parent 9f68fc5393
commit 0d96b43d34
29 changed files with 567 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

86
libretroshare/src/ft/ftcontroller.cc
View file

@ -96,8 +96,10 @@ void ftController::run()
sleep(1);
#endif
std::cerr << "ftController::run()";
std::cerr << std::endl;
#ifdef CONTROL_DEBUG
//std::cerr << "ftController::run()";
//std::cerr << std::endl;
#endif
/* tick the transferModules */
std::list<std::string> done;
@ -254,6 +256,7 @@ bool ftController::FileRequest(std::string fname, std::string hash,
/* check if we have the file */
FileInfo info;
std::list<std::string>::iterator it;
std::list<TransferInfo>::iterator pit;
#ifdef CONTROL_DEBUG
std::cerr << "ftController::FileRequest(" << fname << ",";
@ -313,17 +316,17 @@ bool ftController::FileRequest(std::string fname, std::string hash,
#endif
/* if the sources don't exist already - add in */
for(it = info.peerIds.begin(); it != info.peerIds.end(); it++)
for(pit = info.peers.begin(); pit != info.peers.end(); pit++)
{
std::cerr << "\tSource: " << *it;
std::cerr << "\tSource: " << pit->peerId;
std::cerr << std::endl;
if (srcIds.end() == std::find(
srcIds.begin(), srcIds.end(), *it))
srcIds.begin(), srcIds.end(), pit->peerId))
{
srcIds.push_back(*it);
srcIds.push_back(pit->peerId);
std::cerr << "\tAdding in: " << *it;
std::cerr << "\tAdding in: " << pit->peerId;
std::cerr << std::endl;
}
}
@ -563,6 +566,75 @@ bool ftController::FileDetails(std::string hash, FileInfo &info)
}
/* extract details */
info.hash = hash;
info.fname = it->second.mName;
/* get list of sources from transferModule */
std::list<std::string> peerIds;
std::list<std::string>::iterator pit;
it->second.mTransfer->getFileSources(peerIds);
double totalRate;
uint32_t tfRate;
uint32_t state;
bool isDownloading = false;
bool isSuspended = false;
for(pit = peerIds.begin(); pit != peerIds.end(); pit++)
{
if (it->second.mTransfer->getPeerState(*pit, state, tfRate))
{
TransferInfo ti;
switch(state)
{
case PQIPEER_INIT:
ti.status = FT_STATE_OKAY;
break;
case PQIPEER_NOT_ONLINE:
ti.status = FT_STATE_WAITING;
break;
case PQIPEER_DOWNLOADING:
isDownloading = true;
ti.status = FT_STATE_DOWNLOADING;
break;
case PQIPEER_IDLE:
ti.status = FT_STATE_OKAY;
break;
default:
case PQIPEER_SUSPEND:
isSuspended = true;
ti.status = FT_STATE_FAILED;
break;
}
ti.tfRate = tfRate / 1024.0;
ti.peerId = *pit;
info.peers.push_back(ti);
totalRate += tfRate / 1024.0;
}
}
if ((it->second).mCreator->finished())
{
info.downloadStatus = FT_STATE_COMPLETE;
}
else if (isDownloading)
{
info.downloadStatus = FT_STATE_DOWNLOADING;
}
else if (isSuspended)
{
info.downloadStatus = FT_STATE_FAILED;
}
else
{
info.downloadStatus = FT_STATE_WAITING;
}
info.tfRate = totalRate;
info.size = (it->second).mSize;
info.transfered = (it->second).mCreator->getRecvd();
return true;