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

made file transfer a service. Removed all the old FT code from pqiHandler, and got rid of deprecated CRC32 computation/exchange methods

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-initdev@6782 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2013-10-01 08:11:15 +00:00
parent 4e4b4f0822
commit 8e7fe9f79b
26 changed files with 1505 additions and 3197 deletions
Download patch file Download diff file Expand all files Collapse all files

1
libretroshare/src/rsserver/p3face-config.cc
View file

@ -85,7 +85,6 @@ void RsServer::rsGlobalShutDown()
mNetMgr->shutdown(); /* Handles UPnP */
join();
ftserver->StopThreads();
mPluginsManager->stopPlugins();

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

@ -54,7 +54,7 @@ int rsserverzone = 101;
RsServer::RsServer(NotifyBase &callback)
:RsControl(callback), coreMutex("RsServer")
{
ftserver = NULL;
//ftserver = NULL;
mPeerMgr = NULL;
mLinkMgr = NULL;
@ -163,7 +163,8 @@ void RsServer::run()
/******************************** RUN SERVER *****************/
lockRsCore();
int moreToTick = ftserver -> tick();
//int moreToTick = ftserver -> tick();
int moreToTick = pqih->tick();
#ifdef DEBUG_TICK
std::cerr << "RsServer::run() ftserver->tick(): moreToTick: " << moreToTick << std::endl;

2
libretroshare/src/rsserver/p3face.h
View file

@ -159,7 +159,7 @@ class RsServer: public RsControl, public RsThread
// The real Server Parts.
//filedexserver *server;
ftServer *ftserver;
//ftServer *ftserver;
p3PeerMgrIMPL *mPeerMgr;
p3LinkMgrIMPL *mLinkMgr;

4
libretroshare/src/rsserver/rsinit.cc
View file

@ -2177,8 +2177,7 @@ int RsServer::StartupRetroShare()
//pqih = new pqipersongrpDummy(none, flags);
/****** New Ft Server **** !!! */
ftserver = new ftServer(mPeerMgr, mLinkMgr);
ftserver->setP3Interface(pqih);
ftServer *ftserver = new ftServer(mPeerMgr, mLinkMgr);
ftserver->setConfigDirectory(RsInitConfig::configDir);
ftserver->SetupFtServer(&(getNotify()));
@ -2254,6 +2253,7 @@ int RsServer::StartupRetroShare()
p3turtle *tr = new p3turtle(mLinkMgr) ;
rsTurtle = tr ;
pqih -> addService(tr);
pqih -> addService(ftserver);
ftserver->connectToTurtleRouter(tr) ;
chatSrv->connectToTurtleRouter(tr) ;