Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

* removed self from channel download requests.

Browse Source 
* enabled (limited) debug messages to check!.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3859 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2010-11-23 00:08:30 +00:00
parent bb102750f3
commit 80de6ccdb4
1 changed files with 14 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libretroshare/src/services/p3channels.cc
View File

@ -644,11 +644,20 @@ bool p3Channels::locked_eventDuplicateMsg(GroupInfo *grp, RsDistribMsg *msg, std
/* request the files /* request the files
* NB: This will result in duplicates. * NB: This will result in duplicates.
* it is upto ftserver/ftcontroller/ftextralist * it is upto ftserver/ftcontroller/ftextralist to handle this!
* */ * */
bool download = (grp->flags & RS_DISTRIB_SUBSCRIBED); bool download = (grp->flags & RS_DISTRIB_SUBSCRIBED);
if (id == mOwnId)
{
download = false;
//#ifdef CHANNEL_DEBUG
std::cerr << "p3Channels::locked_eventDuplicateMsg() msg from self - not downloading";
std::cerr << std::endl;
//#endif
}
/* check subscribed */ /* check subscribed */
if (!download) if (!download)
{ {
@ -678,7 +687,6 @@ bool p3Channels::locked_eventDuplicateMsg(GroupInfo *grp, RsDistribMsg *msg, std
RS_FILE_HINTS_NETWORK_WIDE; RS_FILE_HINTS_NETWORK_WIDE;
std::list<std::string> srcIds; std::list<std::string> srcIds;
srcIds.push_back(id); srcIds.push_back(id);
/* download it ... and flag for ExtraList /* download it ... and flag for ExtraList
@ -687,10 +695,12 @@ bool p3Channels::locked_eventDuplicateMsg(GroupInfo *grp, RsDistribMsg *msg, std
* FileRequest will ignore request if file is already indexed. * FileRequest will ignore request if file is already indexed.
*/ */
#ifdef CHANNEL_DEBUG //#ifdef CHANNEL_DEBUG
std::cerr << "p3Channels::locked_eventDuplicateMsg() " << " Downloading: " << fname; std::cerr << "p3Channels::locked_eventDuplicateMsg() " << " Downloading: " << fname;
std::cerr << " to: " << localpath << " from: " << id << std::endl; std::cerr << " to: " << localpath << " from: " << id << std::endl;
#endif //#endif
if(size < MAX_AUTO_DL) if(size < MAX_AUTO_DL)
mRsFiles->FileRequest(fname, hash, size, mRsFiles->FileRequest(fname, hash, size,