Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-05-10 01:55:19 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

More bugfixes ... got the basic channels file transfer working.

Browse source 
* Create channels directory correctly.
 * added File Transfers to Config List.
 * connected statusChange() monitor callback.
 * fixed file sources in transfermodule.
 * fixed up transfer restarts / sleeps.
 * enabled opening files read only.
 * disabled some of the debug.



git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@799 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2008-11-13 23:03:46 +00:00
parent b0d462c93e
commit fce83cb232
16 changed files with 322 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

24
libretroshare/src/rsserver/p3face-server.cc
View file

@ -27,10 +27,6 @@
#include "rsserver/p3face.h"
#ifdef USE_OLD_FT
#include "rsserver/p3files.h" // TMP FOR HACK!
#endif
#include "tcponudp/tou.h"
#include <sstream>
@ -121,11 +117,7 @@ void RsServer::run()
/******************************** RUN SERVER *****************/
lockRsCore();
#ifdef USE_OLD_FT
int moreToTick = server -> tick();
#else
int moreToTick = ftserver -> tick();
#endif
#ifdef DEBUG_TICK
std::cerr << "RsServer::run() ftserver->tick(): moreToTick: " << moreToTick << std::endl;
@ -201,16 +193,6 @@ void RsServer::run()
// currently Dummy Functions.
//std::cerr << "RsServer::run() UpdateAllTransfers()" << std::endl;
#ifdef USE_OLD_FT
//
// TMP HACK.
p3Files *p3f = (p3Files *) rsFiles;
if (p3f)
{
p3f -> UpdateAllTransfers();
}
#endif
//std::cerr << "RsServer::run() ";
//std::cerr << "UpdateRemotePeople()"<<std::endl;
//UpdateRemotePeople();
@ -258,12 +240,8 @@ void RsServer::run()
{
loop = 0;
/* force saving FileTransferStatus */
#ifdef USE_OLD_FT
ftserver->saveFileTransferStatus();
#else
/* force saving FileTransferStatus TODO */
//ftserver->saveFileTransferStatus();
#endif
/* see if we need to resave certs */
mAuthMgr->CheckSaveCertificates();