mirror of
https://github.com/RetroShare/RetroShare.git
synced 2025-08-18 19:08:35 -04:00
Added Exclusive Proxy Lock for DETERMINISTIC SYM Nats.
* tweaked time periods as these type of connections take longer. * added NatHoleType() to ConnectStateBox logic - as its required for ProxyPort Determination. * added ConnectStateBox::getNetState() so we can work out if in ExclusiveNat mode. * added ExclusiveLock checks at Connection Initiation / Proxy Connection Auth & Connection Ends. * added Simulation of Symmetric / Exclusive Nat to UdpStunner. * exported ExclusiveProxyLock for GUI display. git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.5-netupgrade@4457 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
parent
a5c77d02e7
commit
181ad06e33
9 changed files with 338 additions and 78 deletions
|
@ -71,6 +71,8 @@ class DhtPeerDetails
|
|||
time_t mPeerConnectTS;
|
||||
time_t mPeerConnectClosedTS;
|
||||
|
||||
bool mExclusiveProxyLock;
|
||||
|
||||
/* keeping the PeerCbMsg, as we will need it for debugging */
|
||||
/* don't think this data is ever used for decisions??? */
|
||||
|
||||
|
@ -109,6 +111,7 @@ class PeerAction
|
|||
uint32_t mMode;
|
||||
uint32_t mPoint;
|
||||
uint32_t mAnswer;
|
||||
uint32_t mDelayOrBandwidth;
|
||||
};
|
||||
|
||||
|
||||
|
@ -226,9 +229,12 @@ void ConnectCalloutRelay(const std::string &peerId, struct sockaddr_in srcaddr,
|
|||
|
||||
void Feedback_Connected(std::string pid);
|
||||
void Feedback_ConnectionFailed(std::string pid);
|
||||
void UdpConnectionFailed_locked(DhtPeerDetails *dpd);
|
||||
void Feedback_ConnectionClosed(std::string pid);
|
||||
|
||||
void UdpConnectionFailed_locked(DhtPeerDetails *dpd);
|
||||
void ReleaseProxyExclusiveMode_locked(DhtPeerDetails *dpd);
|
||||
|
||||
|
||||
|
||||
/***********************************************************************************************
|
||||
************************** Internal Accounting (p3bitdht_peers.cc) ****************************
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue