- added debug ifdef to GRouter code

- switched turtle router and grouter to use service control


git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7216 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2014-03-29 23:03:04 +00:00
parent 600639db51
commit d340440998
5 changed files with 145 additions and 83 deletions

View file

@ -50,7 +50,7 @@ class RsGRouterACKItem ;
class p3GRouter: public RsGRouter, public p3Service, public p3Config
{
public:
p3GRouter(p3LinkMgr *lm) ;
p3GRouter(p3ServiceControl *sc,p3LinkMgr *lm) ;
//===================================================//
// Router clients business //
@ -226,7 +226,8 @@ class p3GRouter: public RsGRouter, public p3Service, public p3Config
// Pointers to other RS objects
//
p3LinkMgr *mLinkMgr ;
p3ServiceControl *mServiceControl ;
p3LinkMgr *mLinkMgr ;
// Multi-thread protection mutex.
//