mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-06 08:05:18 -04:00
* More bugfixes for file transfer.
* Added File Transfer / ExtraList to channels. * fixed mutex deadlock. * added slow transfer for background tf. * added checks to FileRequest to accumulate peers. * added ExtraList callback. * etc, etc. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@797 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
1e33267951
commit
aee6cb85b4
14 changed files with 385 additions and 51 deletions
|
@ -42,6 +42,7 @@ class ftFileCreator;
|
|||
class ftTransferModule;
|
||||
class ftFileProvider;
|
||||
class ftSearch;
|
||||
class ftExtraList;
|
||||
class ftDataMultiplex;
|
||||
|
||||
#include "dbase/cachestrapper.h"
|
||||
|
@ -55,7 +56,8 @@ class ftDataMultiplex;
|
|||
|
||||
|
||||
const uint32_t CB_CODE_CACHE = 0x0001;
|
||||
const uint32_t CB_CODE_MEDIA = 0x0002;
|
||||
const uint32_t CB_CODE_EXTRA = 0x0002;
|
||||
const uint32_t CB_CODE_MEDIA = 0x0004;
|
||||
|
||||
const uint32_t FC_TRANSFER_COMPLETE = 0x0001;
|
||||
|
||||
|
@ -91,7 +93,7 @@ class ftController: public CacheTransfer, public RsThread, public pqiMonitor, pu
|
|||
/* Setup */
|
||||
ftController(CacheStrapper *cs, ftDataMultiplex *dm, std::string configDir);
|
||||
|
||||
void setFtSearch(ftSearch *);
|
||||
void setFtSearchNExtra(ftSearch *, ftExtraList *);
|
||||
|
||||
virtual void run();
|
||||
|
||||
|
@ -152,6 +154,7 @@ bool completeFile(std::string hash);
|
|||
|
||||
ftSearch *mSearch;
|
||||
ftDataMultiplex *mDataplex;
|
||||
ftExtraList *mExtraList;
|
||||
|
||||
RsMutex ctrlMutex;
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue