mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-04 07:55:18 +00:00
Code Issues Releases Wiki Activity

[#1065] addressed review

Browse Source
This commit is contained in:
Razvan Becheriu
2020-07-27 19:25:32 +03:00
parent d923476b1d
commit c7df9d5dde
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/hooks/dhcp/lease_cmds/lease_cmds.cc
View File

@@ -428,6 +428,8 @@ LeaseCmdsImpl::updateStatsOnAdd(const Lease6Ptr& lease) {
lease->type_ == Lease::TYPE_NA ? lease->type_ == Lease::TYPE_NA ?
"assigned-nas" : "assigned-pds"), "assigned-nas" : "assigned-pds"),
int64_t(1)); int64_t(1));
// @node current code does not check for declined PD
// code must be updated in parser (see @todo in lease_parser.cc)
if (lease->stateDeclined()) { if (lease->stateDeclined()) {
StatsMgr::instance().addValue("declined-addresses", int64_t(1)); StatsMgr::instance().addValue("declined-addresses", int64_t(1));
@@ -450,7 +452,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& existing,
"assigned-addresses"), "assigned-addresses"),
int64_t(-1)); int64_t(-1));
} }
if (existing->stateDeclined()) { if (existing->stateDeclined() && !lease->stateDeclined()) {
// old lease is declined // old lease is declined
StatsMgr::instance().addValue("declined-addresses", int64_t(-1)); StatsMgr::instance().addValue("declined-addresses", int64_t(-1));
@@ -467,7 +469,7 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& existing,
"assigned-addresses"), "assigned-addresses"),
int64_t(1)); int64_t(1));
} }
if (lease->stateDeclined()) { if (lease->stateDeclined() && !existing->stateDeclined()) {
// new lease is declined // new lease is declined
StatsMgr::instance().addValue("declined-addresses", int64_t(1)); StatsMgr::instance().addValue("declined-addresses", int64_t(1));
@@ -485,7 +487,6 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease4Ptr& existing,
StatsMgr::generateName("subnet", lease->subnet_id_, StatsMgr::generateName("subnet", lease->subnet_id_,
"assigned-addresses"), "assigned-addresses"),
int64_t(1)); int64_t(1));
if (lease->stateDeclined()) { if (lease->stateDeclined()) {
// new lease is declined // new lease is declined
StatsMgr::instance().addValue("declined-addresses", int64_t(1)); StatsMgr::instance().addValue("declined-addresses", int64_t(1));
@@ -511,7 +512,9 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing,
"assigned-nas" : "assigned-pds"), "assigned-nas" : "assigned-pds"),
int64_t(-1)); int64_t(-1));
} }
if (existing->stateDeclined()) { // @node current code does not check for declined PD
// code must be updated in parser (see @todo in lease_parser.cc)
if (existing->stateDeclined() && !lease->stateDeclined()) {
// old lease is declined // old lease is declined
StatsMgr::instance().addValue("declined-addresses", int64_t(-1)); StatsMgr::instance().addValue("declined-addresses", int64_t(-1));
@@ -529,7 +532,9 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing,
"assigned-nas" : "assigned-pds"), "assigned-nas" : "assigned-pds"),
int64_t(1)); int64_t(1));
} }
if (lease->stateDeclined()) { // @node current code does not check for declined PD
// code must be updated in parser (see @todo in lease_parser.cc)
if (lease->stateDeclined() && !existing->stateDeclined()) {
// new lease is declined // new lease is declined
StatsMgr::instance().addValue("declined-addresses", int64_t(1)); StatsMgr::instance().addValue("declined-addresses", int64_t(1));
@@ -548,7 +553,8 @@ LeaseCmdsImpl::updateStatsOnUpdate(const Lease6Ptr& existing,
lease->type_ == Lease::TYPE_NA ? lease->type_ == Lease::TYPE_NA ?
"assigned-nas" : "assigned-pds"), "assigned-nas" : "assigned-pds"),
int64_t(1)); int64_t(1));
// @node current code does not check for declined PD
// code must be updated in parser (see @todo in lease_parser.cc)
if (lease->stateDeclined()) { if (lease->stateDeclined()) {
// new lease is declined // new lease is declined
StatsMgr::instance().addValue("declined-addresses", int64_t(1)); StatsMgr::instance().addValue("declined-addresses", int64_t(1));
@@ -588,6 +594,8 @@ LeaseCmdsImpl::updateStatsOnDelete(const Lease6Ptr& lease) {
lease->type_ == Lease::TYPE_NA ? lease->type_ == Lease::TYPE_NA ?
"assigned-nas" : "assigned-pds"), "assigned-nas" : "assigned-pds"),
int64_t(-1)); int64_t(-1));
// @node current code does not check for declined PD
// code must be updated in parser (see @todo in lease_parser.cc)
if (lease->stateDeclined()) { if (lease->stateDeclined()) {
StatsMgr::instance().addValue("declined-addresses", int64_t(-1)); StatsMgr::instance().addValue("declined-addresses", int64_t(-1));