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

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); dumpPathStatus(now, i);
} }
} }
fprintf(stderr, "\n\n\n");
} }
} // namespace ZeroTier } // namespace ZeroTier

2
node/Constants.hpp
View file

@ -549,7 +549,7 @@
/** /**
* How often we emit a bond summary for each bond * 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 * 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, 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) uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now)
{ {
if (!_shouldCollectPathStatistics || !_bond) { if (_localMultipathSupported && _bond) {
return; _bond->recordOutgoingPacket(path, packetId, payloadLength, verb, flowId, now);
} }
_bond->recordOutgoingPacket(path, packetId, payloadLength, verb, flowId, now);
} }
void Peer::recordIncomingInvalidPacket(const SharedPtr<Path>& path) void Peer::recordIncomingInvalidPacket(const SharedPtr<Path>& path)
{ {
if (!_shouldCollectPathStatistics || !_bond) { if (_localMultipathSupported && _bond) {
return; _bond->recordIncomingInvalidPacket(path);
} }
_bond->recordIncomingInvalidPacket(path);
} }
void Peer::recordIncomingPacket(const SharedPtr<Path> &path, const uint64_t packetId, 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) uint16_t payloadLength, const Packet::Verb verb, const int32_t flowId, int64_t now)
{ {
if (!_shouldCollectPathStatistics || !_bond) { if (_localMultipathSupported && _bond) {
return; _bond->recordIncomingPacket(path, packetId, payloadLength, verb, flowId, now);
} }
_bond->recordIncomingPacket(path, packetId, payloadLength, verb, flowId, now);
} }
} // namespace ZeroTier } // namespace ZeroTier