ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-02-21 10:01:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Build fix on Linux with G++.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-02-11 23:09:53 +00:00
parent 0ad84b8723
commit 9acfd3eb73
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
node/EthernetTap.cpp
View File

@ -251,7 +251,7 @@ EthernetTap::EthernetTap(
bool recalledDevice = false; bool recalledDevice = false;
if ((tag)&&(tag[0])) { if ((tag)&&(tag[0])) {
Utils::scopy(ifr.ifr_name,sizeof(ifr.ifr_name),tag); Utils::scopy(ifr.ifr_name,sizeof(ifr.ifr_name),tag);
Utils::snprintf(procpath,sizeof(procpath),"/proc/sys/net/ipv4/conf/%s",ifr.fr_name); Utils::snprintf(procpath,sizeof(procpath),"/proc/sys/net/ipv4/conf/%s",ifr.ifr_name);
recalledDevice = (stat(procpath,&sbuf) != 0); recalledDevice = (stat(procpath,&sbuf) != 0);
} }
if (!recalledDevice) { if (!recalledDevice) {

9
node/Topology.cpp
View File

@ -134,8 +134,9 @@ void Topology::saveIdentity(const Identity &id)
SharedPtr<Peer> Topology::getBestSupernode(const Address *avoid,unsigned int avoidCount,bool strictAvoid) const SharedPtr<Peer> Topology::getBestSupernode(const Address *avoid,unsigned int avoidCount,bool strictAvoid) const
{ {
SharedPtr<Peer> bestSupernode; SharedPtr<Peer> bestSupernode;
unsigned int bestSupernodeLatency = 65536; unsigned int l,bestSupernodeLatency = 65536;
uint64_t now = Utils::now(); uint64_t now = Utils::now();
uint64_t lds,ldr;
Mutex::Lock _l(_supernodes_m); Mutex::Lock _l(_supernodes_m);
@ -150,13 +151,13 @@ SharedPtr<Peer> Topology::getBestSupernode(const Address *avoid,unsigned int avo
} }
// Skip possibly comatose or unreachable relays // Skip possibly comatose or unreachable relays
uint64_t lds = (*sn)->lastDirectSend(); lds = (*sn)->lastDirectSend();
uint64_t ldr = (*sn)->lastDirectReceive(); ldr = (*sn)->lastDirectReceive();
if ((lds)&&(lds > ldr)&&((lds - ldr) > ZT_PEER_RELAY_CONVERSATION_LATENCY_THRESHOLD)) if ((lds)&&(lds > ldr)&&((lds - ldr) > ZT_PEER_RELAY_CONVERSATION_LATENCY_THRESHOLD))
goto keep_searching_for_supernodes; goto keep_searching_for_supernodes;
if ((*sn)->hasActiveDirectPath(now)) { if ((*sn)->hasActiveDirectPath(now)) {
unsigned int l = (*sn)->latency(); l = (*sn)->latency();
if (bestSupernode) { if (bestSupernode) {
if ((l)&&(l < bestSupernodeLatency)) { if ((l)&&(l < bestSupernodeLatency)) {
bestSupernodeLatency = l; bestSupernodeLatency = l;