ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-06-02 15:30:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix erroneous listpeers last send and receive values

Browse Source
This commit is contained in:
Joseph Henry 2021-08-04 12:16:26 -07:00
parent 613d7b5ece
commit 2053415418
No known key found for this signature in database
GPG Key ID: C45B33FF5EBC9344
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
one.cpp
View File

@ -393,7 +393,9 @@ static int cli(int argc,char **argv)
char tmp[256]; char tmp[256];
std::string addr = path["address"]; std::string addr = path["address"];
const int64_t now = OSUtils::now(); const int64_t now = OSUtils::now();
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%s;%lld;%lld",addr.c_str(),now - (int64_t)path["lastSend"],now - (int64_t)path["lastReceive"]); int64_t lastSendDiff = (uint64_t)path["lastSend"] ? now - (uint64_t)path["lastSend"] : -1;
int64_t lastReceiveDiff = (uint64_t)path["lastReceive"] ? now - (uint64_t)path["lastReceive"] : -1;
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%s;%lld;%lld",addr.c_str(),lastSendDiff,lastReceiveDiff);
bestPath = tmp; bestPath = tmp;
break; break;
} }
@ -460,7 +462,9 @@ static int cli(int argc,char **argv)
char tmp[256]; char tmp[256];
std::string addr = path["address"]; std::string addr = path["address"];
const int64_t now = OSUtils::now(); const int64_t now = OSUtils::now();
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%-8lld %-8lld %s",now - (int64_t)path["lastSend"],now - (int64_t)path["lastReceive"],addr.c_str()); int64_t lastSendDiff = (uint64_t)path["lastSend"] ? now - (uint64_t)path["lastSend"] : -1;
int64_t lastReceiveDiff = (uint64_t)path["lastReceive"] ? now - (uint64_t)path["lastReceive"] : -1;
OSUtils::ztsnprintf(tmp,sizeof(tmp),"%-8lld %-8lld %s",lastSendDiff,lastReceiveDiff,addr.c_str());
bestPath = std::string("DIRECT ") + tmp; bestPath = std::string("DIRECT ") + tmp;
break; break;
} }