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

Call recordOutgoingPacket regardless of policy to generate sufficient entropy for bond layer

Browse Source
This commit is contained in:
Joseph Henry 2021-09-07 13:44:02 -07:00
parent 109252be4e
commit b6ed919fbc
No known key found for this signature in database
GPG Key ID: C45B33FF5EBC9344
3 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
node/Bond.cpp
View File

@ -1784,7 +1784,6 @@ void Bond::dumpInfo(int64_t now, bool force)
dumpPathStatus(now, i);
}
}
fprintf(stderr, "\n\n\n");
}
} // namespace ZeroTier

2
node/Constants.hpp
View File

@ -549,7 +549,7 @@
/**
* How often we emit a bond summary for each bond
*/
#define ZT_BOND_STATUS_INTERVAL 3000
#define ZT_BOND_STATUS_INTERVAL 30000
/**
* How long before we consider a path to be dead in the general sense. This is

15
node/Peer.cpp
View File

@ -573,27 +573,24 @@ void Peer::resetWithinScope(void *tPtr,InetAddress::IpScope scope,int inetAddres
void Peer::recordOutgoingPacket(const SharedPtr<Path> &path, const uint64_t packetId,
uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now)
{
if (!_shouldCollectPathStatistics || !_bond) {
return;
if (_localMultipathSupported && _bond) {
_bond->recordOutgoingPacket(path, packetId, payloadLength, verb, flowId, now);
}
_bond->recordOutgoingPacket(path, packetId, payloadLength, verb, flowId, now);
}
void Peer::recordIncomingInvalidPacket(const SharedPtr<Path>& path)
{
if (!_shouldCollectPathStatistics || !_bond) {
return;
if (_localMultipathSupported && _bond) {
_bond->recordIncomingInvalidPacket(path);
}
_bond->recordIncomingInvalidPacket(path);
}
void Peer::recordIncomingPacket(const SharedPtr<Path> &path, const uint64_t packetId,
uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now)
{
if (!_shouldCollectPathStatistics || !_bond) {
return;
if (_localMultipathSupported && _bond) {
_bond->recordIncomingPacket(path, packetId, payloadLength, verb, flowId, now);
}
_bond->recordIncomingPacket(path, packetId, payloadLength, verb, flowId, now);
}
} // namespace ZeroTier