mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-05-20 15:00:36 -04:00
started implementation of new Global Router model. Switched msg service to use it (much simpler now!), and updated GUI. Implemented half the tunnel management logic.
git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-NewGRouterModel@7838 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
41a5c48243
commit
e8f5f44318
22 changed files with 1091 additions and 1488 deletions
|
@ -1449,7 +1449,7 @@ int RsServer::StartupRetroShare()
|
|||
mStatusSrv = new p3StatusService(serviceCtrl);
|
||||
|
||||
#ifdef ENABLE_GROUTER
|
||||
p3GRouter *gr = new p3GRouter(serviceCtrl,mLinkMgr) ;
|
||||
p3GRouter *gr = new p3GRouter(serviceCtrl,mGxsIdService) ;
|
||||
rsGRouter = gr ;
|
||||
pqih->addService(gr,true) ;
|
||||
#endif
|
||||
|
@ -1466,6 +1466,7 @@ int RsServer::StartupRetroShare()
|
|||
|
||||
ftserver->connectToTurtleRouter(tr) ;
|
||||
chatSrv->connectToTurtleRouter(tr) ;
|
||||
gr->connectToTurtleRouter(tr) ;
|
||||
#ifdef ENABLE_GROUTER
|
||||
msgSrv->connectToGlobalRouter(gr) ;
|
||||
#endif
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue