- 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

@ -216,7 +216,7 @@ class TurtleHashInfo
class p3turtle: public p3Service, public RsTurtle, public p3Config
{
public:
p3turtle(p3LinkMgr *lm) ;
p3turtle(p3ServiceControl *sc,p3LinkMgr *lm) ;
virtual RsServiceInfo getServiceInfo();
// Enables/disable the service. Still ticks, but does nothing. Default is true.
@ -375,8 +375,10 @@ class p3turtle: public p3Service, public RsTurtle, public p3Config
//--------------------------- Local variables --------------------------------//
/* data */
p3LinkMgr *mLinkMgr;
p3ServiceControl *mServiceControl;
p3LinkMgr *mLinkMgr;
RsTurtleSerialiser *_serialiser ;
RsPeerId _own_id ;
mutable RsMutex mTurtleMtx;