mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-03 06:35:08 -04:00
* Added Configurations to new file transfer.
* Enabled config in p3file-startup.cc * Enabled resumeTransfers * Added new RsFileConfigItem to serialiser. * extended ftFiMonitor to use Configuration. * bug fix to add/remove Shared Dirs. * Increased Channel/forum periods to 3/12 months. git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@806 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
941e59f6e9
commit
66bf56207d
18 changed files with 768 additions and 111 deletions
|
@ -723,6 +723,10 @@ int RsServer::StartupRetroShare(RsInit *config)
|
|||
mConfigMgr->addConfiguration("channels.cfg", mChannels);
|
||||
#endif
|
||||
|
||||
|
||||
ftserver->addConfiguration(mConfigMgr);
|
||||
|
||||
|
||||
/**************************************************************************/
|
||||
|
||||
|
||||
|
@ -836,6 +840,7 @@ int RsServer::StartupRetroShare(RsInit *config)
|
|||
/**************************************************************************/
|
||||
|
||||
ftserver->StartupThreads();
|
||||
ftserver->ResumeTransfers();
|
||||
|
||||
mDhtMgr->start();
|
||||
|
||||
|
@ -894,6 +899,7 @@ int RsServer::StartupRetroShare(RsInit *config)
|
|||
/* Startup this thread! */
|
||||
createThread(*this);
|
||||
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue