First commit for the turtle download. It works without perturbating RS traffic, but still needs some (internal) smoothing

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1275 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2009-05-26 21:42:45 +00:00
parent c298de7f15
commit 1046bdd846
18 changed files with 1603 additions and 806 deletions

View file

@ -61,7 +61,7 @@ RsTurtle *rsTurtle = NULL ;
#include "services/p3channels.h"
#include "services/p3status.h"
#include "services/p3Qblog.h"
#include "services/p3turtle.h"
#include "turtle/p3turtle.h"
#include <list>
#include <string>
@ -171,10 +171,6 @@ RsControl *createRsControl(RsIface &iface, NotifyBase &notify)
// delete config;
//}
static std::string getHomePath();
void RsInit::InitRsConfig()
{
load_trustedpeer = false;
@ -699,7 +695,7 @@ int RsServer::StartupRetroShare()
ftserver->setP3Interface(pqih);
ftserver->setConfigDirectory(RsInit::basedir);
ftserver->SetupFtServer(&(getNotify()));
ftserver->SetupFtServer(&(getNotify()));
CacheStrapper *mCacheStrapper = ftserver->getCacheStrapper();
CacheTransfer *mCacheTransfer = ftserver->getCacheTransfer();
@ -720,9 +716,10 @@ int RsServer::StartupRetroShare()
msgSrv = new p3MsgService(mConnMgr);
chatSrv = new p3ChatService(mConnMgr);
p3turtle *tr = new p3turtle(mConnMgr) ;
p3turtle *tr = new p3turtle(mConnMgr,ftserver) ;
rsTurtle = tr ;
pqih -> addService(tr);
ftserver->connectToTurtleRouter(tr) ;
pqih -> addService(ad);
pqih -> addService(msgSrv);