mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-30 11:24:24 -04:00
More Improvements to FileTransfer:
* Added TlvShallowClear() to serialisers * Added RsQueueThread for periodic queue processes. * Completed ftDataMultiplex which replaces ftServer/ClientModules. * Added Server Queue / Thread to ftDataMultiplex. * Added ftdataplextest to exercise ftDataMultiplex. * Generalised ftFileSearch to handle an array of ftSearch classes. * Tweaked rsfiles.h #defines to match new ftFileSearch scheme. * Added Generic ftData Interfaces for Testing. * added ftDataSend/Recv Interfaces to ftServer + ftDataMultiplex respectively. * Completed much of ftServer (External Interface), but not yet done. * Extra debugging and small changes to ftExtraList * Integrated new ftTransferModule with minor interface changes. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@660 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
d584516859
commit
5c6e558942
22 changed files with 1355 additions and 326 deletions
|
@ -29,36 +29,31 @@
|
|||
/*
|
||||
* ftFileSearch
|
||||
*
|
||||
* This is actually implements the ftSearch Interface.
|
||||
* This is implements an array of ftSearch Interfaces.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ft/ftsearch.h"
|
||||
#include <vector>
|
||||
|
||||
class CacheStrapper;
|
||||
class ftExtraList;
|
||||
class FileIndexMonitor;
|
||||
class FileIndexStore;
|
||||
#include "ft/ftsearch.h"
|
||||
|
||||
class ftFileSearch: public ftSearch
|
||||
{
|
||||
|
||||
public:
|
||||
|
||||
ftFileSearch(CacheStrapper *c, ftExtraList *x, FileIndexMonitor *m, FileIndexStore *s)
|
||||
:mCacheStrapper(c), mExtraList(x), mFileMonitor(m), mFileStore(s) { return; }
|
||||
ftFileSearch();
|
||||
|
||||
virtual bool search(std::string hash, uint64_t size, uint32_t hintflags, FileInfo &info);
|
||||
bool addSearchMode(ftSearch *search, uint32_t hintflags);
|
||||
virtual bool search(std::string hash, uint64_t size, uint32_t hintflags, FileInfo &info) const;
|
||||
|
||||
private:
|
||||
|
||||
CacheStrapper *mCacheStrapper;
|
||||
ftExtraList *mExtraList;
|
||||
FileIndexMonitor *mFileMonitor;
|
||||
FileIndexStore *mFileStore;
|
||||
// should have a mutex to protect vector....
|
||||
// but not really necessary as it is const most of the time.
|
||||
|
||||
std::vector<ftSearch *> mSearchs;
|
||||
};
|
||||
|
||||
|
||||
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue