Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-12 16:43:17 -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

57
libretroshare/src/pqi/p3peermgr.h
View file

@ -70,8 +70,6 @@ const uint32_t RS_NET_MODE_UDP = 0x0004;
const uint32_t RS_NET_MODE_UNREACHABLE = 0x0008;
/* flags of peerStatus */
const uint32_t RS_NET_FLAGS_USE_DISC = 0x0001;
const uint32_t RS_NET_FLAGS_USE_DHT = 0x0002;
@ -80,8 +78,6 @@ const uint32_t RS_NET_FLAGS_EXTERNAL_ADDR = 0x0008;
const uint32_t RS_NET_FLAGS_STABLE_UDP = 0x0010;
const uint32_t RS_NET_FLAGS_TRUSTS_ME = 0x0020;
const uint32_t RS_TCP_STD_TIMEOUT_PERIOD = 5; /* 5 seconds! */
class peerState
{
public:
@ -93,41 +89,17 @@ class peerState
uint32_t netMode; /* EXT / UPNP / UDP / INVALID */
uint32_t visState; /* STD, GRAY, DARK */
struct sockaddr_in localaddr, serveraddr;
struct sockaddr_in localaddr;
struct sockaddr_in serveraddr;
std::string dyndns;
//used to store current ip (for config and connection management)
struct sockaddr_in currentlocaladdr; /* Mandatory */
struct sockaddr_in currentserveraddr; /* Mandatory */
std::string dyndns;
time_t lastcontact;
time_t lastcontact;
/* list of addresses from various sources */
pqiIpAddrSet ipAddrs;
/***** Below here not stored permanently *****/
std::string name;
std::string location;
//uint32_t connecttype; // RS_NET_CONN_TCP_ALL / RS_NET_CONN_UDP_ALL
//time_t lastavailable;
//time_t lastattempt;
//uint32_t state;
//uint32_t actions;
//uint32_t source; /* most current source */
//peerAddrInfo dht;
//peerAddrInfo disc;
//peerAddrInfo peer;
/* a list of connect attempts to make (in order) */
//bool inConnAttempt;
//peerConnectAddress currentConnAddrAttempt;
//std::list<peerConnectAddress> connAddrs;
std::string name;
};
@ -136,23 +108,32 @@ class RsGroupInfo;
std::string textPeerState(peerState &state);
class p3LinkMgr;
class p3NetMgr;
class p3PeerMgr: public pqiConnectCb, public p3Config
class p3PeerMgr: public p3Config
{
public:
p3PeerMgr();
void setManagers(p3LinkMgr *linkMgr, p3NetMgr *netMgr);
void tick();
/*************** External Control ****************/
bool shutdown(); /* blocking shutdown call */
void setOwnNetConfig(uint32_t netMode, uint32_t visState);
void setOwnNetworkMode(uint32_t netMode);
void setOwnVisState(uint32_t visState);
bool setLocalAddress(const std::string &id, struct sockaddr_in addr);
bool setExtAddress(const std::string &id, struct sockaddr_in addr);
bool setDynDNS(const std::string &id, const std::string &dyndns);
bool updateAddressList(const std::string& id, const pqiIpAddrSet &addrs);
bool updateCurrentAddress(const std::string& id, const pqiIpAddress &addr);
bool setNetworkMode(const std::string &id, uint32_t netMode);
bool setVisState(const std::string &id, uint32_t visState);
@ -214,6 +195,12 @@ void tickMonitors();
virtual bool loadList(std::list<RsItem *>& load);
/*****************************************************************/
/* other important managers */
p3LinkMgr *mLinkMgr;
p3NetMgr *mNetMgr;
private:
RsMutex mPeerMtx; /* protects below */