mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-06-27 07:41:08 -04:00
More bugfixes for file transfer stuff.
* 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:
parent
08285b512d
commit
7b7446c5b5
9 changed files with 518 additions and 44 deletions
|
@ -119,14 +119,12 @@ void ftServer::SetupFtServer(NotifyBase *cb)
|
|||
CachePair cp(mFiMon, mFiStore, CacheId(RS_SERVICE_TYPE_FILE_INDEX, 0));
|
||||
mCacheStrapper -> addCachePair(cp);
|
||||
|
||||
|
||||
/* complete search setup */
|
||||
mFtSearch->addSearchMode(mCacheStrapper, RS_FILE_HINTS_CACHE);
|
||||
mFtSearch->addSearchMode(mFtExtra, RS_FILE_HINTS_EXTRA);
|
||||
mFtSearch->addSearchMode(mFiMon, RS_FILE_HINTS_LOCAL);
|
||||
mFtSearch->addSearchMode(mFiStore, RS_FILE_HINTS_REMOTE);
|
||||
|
||||
|
||||
mConnMgr->addMonitor(mFtController);
|
||||
mConnMgr->addMonitor(mCacheStrapper);
|
||||
|
||||
|
@ -257,7 +255,7 @@ bool ftServer::FileDetails(std::string hash, uint32_t hintflags, FileInfo &info)
|
|||
|
||||
if (!found)
|
||||
{
|
||||
mFtSearch->search(hash, 0, hintflags, info);
|
||||
found = mFtSearch->search(hash, 0, hintflags, info);
|
||||
}
|
||||
return found;
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue