From 50e131a4ff0a583cb244678fc57271a079444121 Mon Sep 17 00:00:00 2001 From: Joseph Henry Date: Thu, 15 Sep 2022 15:56:23 -0700 Subject: [PATCH] Partial fix for discrepancy between docs and implementation --- node/Bond.cpp | 1 - node/Bond.hpp | 2 +- service/OneService.cpp | 5 +---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/node/Bond.cpp b/node/Bond.cpp index 42b9d6894..86a0d0f90 100644 --- a/node/Bond.cpp +++ b/node/Bond.cpp @@ -1808,7 +1808,6 @@ void Bond::setBondParameters(int policy, SharedPtr templateBond, bool useT _qw[ZT_QOS_PDV_IDX] = 0.3f; _qw[ZT_QOS_PLR_IDX] = 0.1f; _qw[ZT_QOS_PER_IDX] = 0.1f; - _qw[ZT_QOS_SCP_IDX] = 0.1f; _failoverInterval = ZT_BOND_FAILOVER_DEFAULT_INTERVAL; diff --git a/node/Bond.hpp b/node/Bond.hpp index 9b1ec29cf..3f2624f2f 100644 --- a/node/Bond.hpp +++ b/node/Bond.hpp @@ -28,7 +28,7 @@ /** * Indices for the path quality weight vector */ -enum ZT_BondQualityWeightIndex { ZT_QOS_LAT_IDX, ZT_QOS_LTM_IDX, ZT_QOS_PDV_IDX, ZT_QOS_PLR_IDX, ZT_QOS_PER_IDX, ZT_QOS_THR_IDX, ZT_QOS_THM_IDX, ZT_QOS_THV_IDX, ZT_QOS_AGE_IDX, ZT_QOS_SCP_IDX, ZT_QOS_WEIGHT_SIZE }; +enum ZT_BondQualityWeightIndex { ZT_QOS_LAT_IDX, ZT_QOS_LTM_IDX, ZT_QOS_PDV_IDX, ZT_QOS_PLR_IDX, ZT_QOS_PER_IDX, ZT_QOS_WEIGHT_SIZE }; /** * Multipath bonding policy diff --git a/service/OneService.cpp b/service/OneService.cpp index a9cb229ec..85ac56bc9 100644 --- a/service/OneService.cpp +++ b/service/OneService.cpp @@ -2078,16 +2078,13 @@ public: newTemplateBond->setMinAcceptableAllocation((float)OSUtils::jsonDouble(customPolicy["minAcceptableAllocation"],0)); // Quality weights json &qualityWeights = customPolicy["qualityWeights"]; - if (qualityWeights.size() == ZT_QOS_WEIGHT_SIZE) { // TODO: Generalize this + if (qualityWeights.size() == ZT_QOS_WEIGHT_SIZE) { float weights[ZT_QOS_WEIGHT_SIZE]; weights[ZT_QOS_LAT_IDX] = (float)OSUtils::jsonDouble(qualityWeights["lat"],0.0); weights[ZT_QOS_LTM_IDX] = (float)OSUtils::jsonDouble(qualityWeights["ltm"],0.0); weights[ZT_QOS_PDV_IDX] = (float)OSUtils::jsonDouble(qualityWeights["pdv"],0.0); weights[ZT_QOS_PLR_IDX] = (float)OSUtils::jsonDouble(qualityWeights["plr"],0.0); weights[ZT_QOS_PER_IDX] = (float)OSUtils::jsonDouble(qualityWeights["per"],0.0); - weights[ZT_QOS_THR_IDX] = (float)OSUtils::jsonDouble(qualityWeights["thr"],0.0); - weights[ZT_QOS_THM_IDX] = (float)OSUtils::jsonDouble(qualityWeights["thm"],0.0); - weights[ZT_QOS_THV_IDX] = (float)OSUtils::jsonDouble(qualityWeights["thv"],0.0); newTemplateBond->setUserQualityWeights(weights,ZT_QOS_WEIGHT_SIZE); } // Bond-specific properties