dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Bunch more cleanup, improvements to NAT traversal logic, finished updating Switch.

Browse source
This commit is contained in:
Adam Ierymenko 2015-04-03 16:52:53 -07:00
parent ee0f56355b
commit 6eb9289367
11 changed files with 161 additions and 141 deletions
Download patch file Download diff file Expand all files Collapse all files

13
node/Switch.hpp
View file

@ -134,8 +134,9 @@ public:
*
* @param peer Peer to contact
* @param atAddr Address of peer
* @param linkDesperation Attempt up to given max desperation
*/
void contact(const SharedPtr<Peer> &peer,const InetAddress &atAddr);
void contact(const SharedPtr<Peer> &peer,const InetAddress &atAddr,unsigned int maxDesperation);
/**
* Request WHOIS on a given address
@ -241,14 +242,20 @@ private:
struct ContactQueueEntry
{
ContactQueueEntry() {}
ContactQueueEntry(const SharedPtr<Peer> &p,uint64_t ft,const InetAddress &a) :
ContactQueueEntry(const SharedPtr<Peer> &p,uint64_t ft,const InetAddress &a,unsigned int md) :
peer(p),
fireAtTime(ft),
inaddr(a) {}
inaddr(a),
maxDesperation(md),
currentDesperation(0),
strategyIteration(1) {} // start with 2nd strategy, zero desperation, since we've already tried 0/0
SharedPtr<Peer> peer;
uint64_t fireAtTime;
InetAddress inaddr;
unsigned int maxDesperation;
unsigned int currentDesperation;
unsigned int strategyIteration;
};
std::list<ContactQueueEntry> _contactQueue;
Mutex _contactQueue_m;