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

Yet more cleanup to TCP logic, this time adding a master switch and adding UDP preference in send().

Browse source
This commit is contained in:
Adam Ierymenko 2014-04-09 17:08:35 -07:00
parent 73153b89b4
commit 8fb442d81a
6 changed files with 110 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

20
node/Peer.hpp
View file

@ -218,11 +218,20 @@ public:
}
/**
* @param _r Runtime environment
* @param now Current time
* @return True if the last ping is unanswered
* Get max timestamp of last ping and max timestamp of last receive in a single pass
*
* @param lp Last ping result parameter (init to 0 before calling)
* @param lr Last receive result parameter (init to 0 before calling)
*/
bool pingUnanswered(const RuntimeEnvironment *_r,uint64_t now);
inline void lastPingAndDirectReceive(uint64_t &lp,uint64_t &lr)
throw()
{
Mutex::Lock _l(_lock);
for(std::vector<Path>::const_iterator p(_paths.begin());p!=_paths.end();++p) {
lp = std::max(lp,p->lastPing());
lr = std::max(lr,p->lastReceived());
}
}
/**
* @return Time of most recent unicast frame received
@ -449,9 +458,6 @@ public:
}
private:
bool _isTcpFailoverTime(const RuntimeEnvironment *_r,uint64_t now) const
throw();
unsigned char _key[ZT_PEER_SECRET_KEY_LENGTH];
Identity _id;