diff options
| -rw-r--r-- | ChangeLog | 14 | ||||
| -rw-r--r-- | src/lib/dhcpsrv/alloc_engine.h | 4 | ||||
| -rw-r--r-- | src/lib/hooks/hooks_manager.h | 4 | ||||
| -rw-r--r-- | src/lib/util/tests/unlock_guard_unittests.cc | 2 |
4 files changed, 15 insertions, 9 deletions
@@ -1,8 +1,14 @@ 1830. [bug] razvan - Fixed the DHCPv6 server implementation of out-of-pool flag to - match the DHCPv4 one. The in pool reservations search is now - skipped and the reserved addresses are no longer assigned to - the clients, but can be assigned dynamically to any client. + Fixed the DHCPv6 server implementation of the + reservations-out-of-pool flag to match the DHCPv4 one. When the + flag is true: + * the server assumes that all reserved address do not belong to + the dynamic pool. + * the server will not assign reserved addresses that are inside + the dynamic pool to the respective clients. + * addresses matching the respective reservations from inside + the dynamic pools (if any) can be dynamically assigned to any + client. (Gitlab #1550) 1829. [func] fdupont, razvan diff --git a/src/lib/dhcpsrv/alloc_engine.h b/src/lib/dhcpsrv/alloc_engine.h index 1022183825..f95898edfa 100644 --- a/src/lib/dhcpsrv/alloc_engine.h +++ b/src/lib/dhcpsrv/alloc_engine.h @@ -942,7 +942,7 @@ public: /// Attempts to find appropriate host reservation in HostMgr. If found, it /// is set in the @ref ClientContext6::hosts_. /// - /// @node When the out-of-pool flag is enabled, because the function is + /// @note When the out-of-pool flag is enabled, because the function is /// called only once per DHCP message, the reservations that are in-subnet /// are not filtered out as there is no sufficient information regarding the /// selected subnet, shared network or lease types, but will be filtered out @@ -1584,7 +1584,7 @@ public: /// Attempts to find appropriate host reservation in HostMgr. If found, it /// is set in the @ref ClientContext4::hosts_. /// - /// @node When the out-of-pool flag is enabled, because the function is + /// @note When the out-of-pool flag is enabled, because the function is /// called only once per DHCP message, the reservations that are in-subnet /// are not filtered out as there is no sufficient information regarding the /// selected subnet or shared network, but will be filtered out at diff --git a/src/lib/hooks/hooks_manager.h b/src/lib/hooks/hooks_manager.h index ea61daf26a..7cda194bbb 100644 --- a/src/lib/hooks/hooks_manager.h +++ b/src/lib/hooks/hooks_manager.h @@ -478,12 +478,12 @@ private: /// Set of library managers. /// - /// @node: This should never be null. + /// @note: This should never be null. boost::shared_ptr<LibraryManagerCollection> lm_collection_; /// Callout manager for the set of library managers. /// - /// @node: This should never be null. + /// @note: This should never be null. boost::shared_ptr<CalloutManager> callout_manager_; /// Test flag to keep @ref callout_manager_ when calling @ref loadLibraries diff --git a/src/lib/util/tests/unlock_guard_unittests.cc b/src/lib/util/tests/unlock_guard_unittests.cc index 1c55fa4eb7..c64caa425a 100644 --- a/src/lib/util/tests/unlock_guard_unittests.cc +++ b/src/lib/util/tests/unlock_guard_unittests.cc @@ -21,7 +21,7 @@ namespace { /// @brief test mutex class used to check the internal state of a 'fictional' /// mutex so that the functionality of the UnlockGuard can be tested -/// @node the test mutex can be recursive which means that a lock can be called +/// @note the test mutex can be recursive which means that a lock can be called /// on the same thread and not resulting in a dead lock class TestMutex { public: |