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

Remove (some) debug tracing in Bond which may cause a segfault

Browse Source
This commit is contained in:
Joseph Henry 2020-10-21 18:40:55 -07:00
parent 3da8f5f053
commit 1331739ee4
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
node/Bond.cpp
View File

@ -1617,11 +1617,6 @@ void Bond::processActiveBackupTasks(void *tPtr, const int64_t now)
void Bond::setReasonableDefaults(int policy, SharedPtr<Bond> templateBond, bool useTemplate) void Bond::setReasonableDefaults(int policy, SharedPtr<Bond> templateBond, bool useTemplate)
{ {
// TODO: Remove for production
_header=false;
_lastLogTS = RR->node->now();
_lastPrintTS = RR->node->now();
// If invalid bonding policy, try default // If invalid bonding policy, try default
int _defaultBondingPolicy = BondController::defaultBondingPolicy(); int _defaultBondingPolicy = BondController::defaultBondingPolicy();
if (policy <= ZT_BONDING_POLICY_NONE || policy > ZT_BONDING_POLICY_BALANCE_AWARE) { if (policy <= ZT_BONDING_POLICY_NONE || policy > ZT_BONDING_POLICY_BALANCE_AWARE) {
@ -1780,20 +1775,6 @@ void Bond::setReasonableDefaults(int policy, SharedPtr<Bond> templateBond, bool
_qosCutoffCount = 0; _qosCutoffCount = 0;
throughputMeasurementInterval = _ackSendInterval * 2; throughputMeasurementInterval = _ackSendInterval * 2;
_defaultPathRefractoryPeriod = 8000; _defaultPathRefractoryPeriod = 8000;
char traceMsg[256];
sprintf(traceMsg, "%s (bond) Bond to peer %llx is configured as (monStrat=%d, fi= %d, bmi= %d, qos= %d, ack= %d, estimateInt= %d, refractory= %d, ud= %d, dd= %d)",
OSUtils::humanReadableTimestamp().c_str(), _peer->_id.address().toInt(),
_linkMonitorStrategy,
_failoverInterval,
_bondMonitorInterval,
_qosSendInterval,
_ackSendInterval,
_qualityEstimationInterval,
_defaultPathRefractoryPeriod,
_upDelay,
_downDelay);
RR->t->bondStateMessage(NULL, traceMsg);
} }
void Bond::setUserQualityWeights(float weights[], int len) void Bond::setUserQualityWeights(float weights[], int len)