Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-17 18:40:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed p3ConnectMgr. Replaced it with p3LinkMgr, p3NetMgr and p3PeerMgr.

Browse source 
Updated references in other classes.
 * Most classes need p3LinkMgr, and only use two functions: OwnId() and getOnlineList()




git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4416 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
drbob 2011-07-09 18:39:34 +00:00
parent 21487bfdf6
commit f6f721a492
55 changed files with 1226 additions and 1044 deletions
Download patch file Download diff file Expand all files Collapse all files

32
libretroshare/src/pqi/p3netmgr.h
View file

@ -35,8 +35,6 @@
#include "pqi/p3cfgmgr.h"
#include "pqi/p3peermgr.h"
#include "util/rsthreads.h"
class ExtAddrFinder ;
@ -80,12 +78,22 @@ class pqiNetStatus
}
};
class p3PeerMgr;
class p3LinkMgr;
class rsUdpStack;
class UdpStunner;
class p3BitDht;
class UdpRelayReceiver;
class p3NetMgr
{
public:
p3NetMgr(p3PeerMgr *peerMgr);
p3NetMgr();
void setManagers(p3PeerMgr *peerMgr, p3LinkMgr *linkMgr);
void tick();
@ -181,8 +189,6 @@ void netUnreachableCheck();
void networkConsistencyCheck();
protected:
private:
// These should have there own Mutex Protection,
ExtAddrFinder *mExtAddrFinder ;
@ -193,7 +199,21 @@ private:
std::list<pqiNetListener *> mNetListeners;
p3PeerMgr *mPeerMgr; // Feedback about Network Addresses.
p3PeerMgr *mPeerMgr;
p3LinkMgr *mLinkMgr;
/* UDP Stack - managed here */
rsUdpStack *mDhtStack;
UdpStunner *mDhtStunner;
p3BitDht *mBitDht;
UdpRelayReceiver *mRelay;
// No Pointer to UdpPeerReceiver.
// 2ND Stack.
rsUdpStack *mProxyStack;
UdpStunner *mProxyStunner;
// No Pointer to UdpPeerReceiver.
RsMutex mNetMtx; /* protects below */