From 22debbce34b26a4a348d6bff46fde6059fad824e Mon Sep 17 00:00:00 2001 From: drbob Date: Wed, 13 Jul 2011 23:23:47 +0000 Subject: [PATCH] Turns out that the current implementation of p3NetMgr has NO dependancies on p3PeerMgrIMPL or p3LinkMgrIMPL. Infact, it doesn't use these two classes at all (so you could pass void in the init function)... - It should actually update p3PeerMgr when it detects a Net Address change (TODO). This means that there is potentially no need for a dummy object - p3NetMgrIMPL can be used almost as is! * changed p3PeerMgrIMPL & p3LinkMgrIMPL pointers back to p3PeerMgr and p3LinkMgr pointers. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4445 b45a01b8-16f6-495d-af2f-9b41ad6348cc --- libretroshare/src/pqi/p3netmgr.cc | 2 +- libretroshare/src/pqi/p3netmgr.h | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libretroshare/src/pqi/p3netmgr.cc b/libretroshare/src/pqi/p3netmgr.cc index aec2abade..00b19a35a 100644 --- a/libretroshare/src/pqi/p3netmgr.cc +++ b/libretroshare/src/pqi/p3netmgr.cc @@ -142,7 +142,7 @@ p3NetMgrIMPL::p3NetMgrIMPL() return; } -void p3NetMgrIMPL::setManagers(p3PeerMgrIMPL *peerMgr, p3LinkMgrIMPL *linkMgr) +void p3NetMgrIMPL::setManagers(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr) { mPeerMgr = peerMgr; mLinkMgr = linkMgr; diff --git a/libretroshare/src/pqi/p3netmgr.h b/libretroshare/src/pqi/p3netmgr.h index a04108454..8ba7ccee5 100644 --- a/libretroshare/src/pqi/p3netmgr.h +++ b/libretroshare/src/pqi/p3netmgr.h @@ -203,7 +203,7 @@ virtual bool getDHTEnabled(); /* Extra IMPL Functions (used by p3PeerMgr, p3NetMgr + Setup) */ /************************************************************************************************/ -void setManagers(p3PeerMgrIMPL *peerMgr, p3LinkMgrIMPL *linkMgr); +void setManagers(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr); void setAddrAssist(pqiAddrAssist *dhtStun, pqiAddrAssist *proxyStun); void tick(); @@ -307,8 +307,8 @@ private: std::list mNetListeners; - p3PeerMgrIMPL *mPeerMgr; - p3LinkMgrIMPL *mLinkMgr; + p3PeerMgr *mPeerMgr; + p3LinkMgr *mLinkMgr; //p3BitDht *mBitDht; pqiAddrAssist *mDhtStunner;