void/ZeroTierOne
2
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-05 03:53:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dev' of github.com:zerotier/ZeroTierOne into dev

Browse source
This commit is contained in:
Grant Limberg 2019-07-16 15:20:05 -07:00
commit 861a319014
2 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
controller/FileDB.cpp
View file

@ -86,25 +86,26 @@ FileDB::FileDB(EmbeddedNetworkController *const nc,const Identity &myId,const ch
FILE *f = fopen(p,"wb"); FILE *f = fopen(p,"wb");
if (f) { if (f) {
fprintf(f,"{"); fprintf(f,"{");
char *memberPrefix = ""; const char *memberPrefix = "";
for(auto m=nw->second.begin();m!=nw->second.end();++m) { for(auto m=nw->second.begin();m!=nw->second.end();++m) {
fprintf(f,"%s\"%.10llx\":{" ZT_EOL_S,memberPrefix,(unsigned long long)m->first); fprintf(f,"%s\"%.10llx\":{" ZT_EOL_S,memberPrefix,(unsigned long long)m->first);
memberPrefix = ","; memberPrefix = ",";
InetAddress lastAddr; InetAddress lastAddr;
char *timestampPrefix = " "; const char *timestampPrefix = " ";
int cnt = 0; int cnt = 0;
for(auto ts=m->second.rbegin();ts!=m->second.rend();++ts) { for(auto ts=m->second.rbegin();ts!=m->second.rend();) {
if (cnt < 25) { if (cnt < 25) {
if (lastAddr != ts->second) { if (lastAddr != ts->second) {
lastAddr = ts->second; lastAddr = ts->second;
fprintf(f,"%s\"%lld\":\"%s\"" ZT_EOL_S,timestampPrefix,(long long)ts->first,ts->second.toString(atmp)); fprintf(f,"%s\"%lld\":\"%s\"" ZT_EOL_S,timestampPrefix,(long long)ts->first,ts->second.toString(atmp));
timestampPrefix = ","; timestampPrefix = ",";
++cnt; ++cnt;
++ts;
} else { } else {
m->second.erase(ts.base()); // erase previous entries for same IP/port ts = std::map<int64_t,InetAddress>::reverse_iterator(m->second.erase(std::next(ts).base()));
} }
} else { } else {
m->second.erase(ts.base()); // erase entries beyond the 25 max written to log ts = std::map<int64_t,InetAddress>::reverse_iterator(m->second.erase(std::next(ts).base()));
} }
} }
fprintf(f,"}"); fprintf(f,"}");

6
node/IncomingPacket.cpp
View file

@ -502,8 +502,8 @@ bool IncomingPacket::_doOK(const RuntimeEnvironment *RR,void *tPtr,const SharedP
} }
} }
if (!hops() && (RR->node->getMultipathMode() != ZT_MULTIPATH_NONE)) { if (!hops()) {
_path->updateLatency((unsigned int)latency, RR->node->now()); _path->updateLatency((unsigned int)latency,RR->node->now());
} }
peer->setRemoteVersion(vProto,vMajor,vMinor,vRevision); peer->setRemoteVersion(vProto,vMajor,vMinor,vRevision);
@ -614,7 +614,7 @@ bool IncomingPacket::_doRENDEZVOUS(const RuntimeEnvironment *RR,void *tPtr,const
const unsigned int port = at<uint16_t>(ZT_PROTO_VERB_RENDEZVOUS_IDX_PORT); const unsigned int port = at<uint16_t>(ZT_PROTO_VERB_RENDEZVOUS_IDX_PORT);
const unsigned int addrlen = (*this)[ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRLEN]; const unsigned int addrlen = (*this)[ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRLEN];
if ((port > 0)&&((addrlen == 4)||(addrlen == 16))) { if ((port > 0)&&((addrlen == 4)||(addrlen == 16))) {
const InetAddress atAddr(field(ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRESS,addrlen),addrlen,port); InetAddress atAddr(field(ZT_PROTO_VERB_RENDEZVOUS_IDX_ADDRESS,addrlen),addrlen,port);
if (RR->node->shouldUsePathForZeroTierTraffic(tPtr,with,_path->localSocket(),atAddr)) { if (RR->node->shouldUsePathForZeroTierTraffic(tPtr,with,_path->localSocket(),atAddr)) {
const uint64_t junk = RR->node->prng(); const uint64_t junk = RR->node->prng();
RR->node->putPacket(tPtr,_path->localSocket(),atAddr,&junk,4,2); // send low-TTL junk packet to 'open' local NAT(s) and stateful firewalls RR->node->putPacket(tPtr,_path->localSocket(),atAddr,&junk,4,2); // send low-TTL junk packet to 'open' local NAT(s) and stateful firewalls