mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-05 08:25:16 +00:00
Code Issues Releases Wiki Activity

[#248] using same add/get class interface

Browse Source
This commit is contained in:
Razvan Becheriu
2022-09-30 20:14:22 +03:00
parent 033cc7bd7c
commit 5da3798bf3
9 changed files with 53 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/bin/dhcp4/dhcp4_srv.cc
View File

@@ -1772,7 +1772,7 @@ Dhcpv4Srv::buildCfgOptionList(Dhcpv4Exchange& ex) {
}
// Each class in the incoming packet
const ClientClasses& classes = ex.getQuery()->getClassesAndTemplates();
const ClientClasses& classes = ex.getQuery()->getClasses();
for (ClientClasses::const_iterator cclass = classes.cbegin();
cclass != classes.cend(); ++cclass) {
// Find the client class definition for this class
@@ -3121,7 +3121,7 @@ Dhcpv4Srv::setFixedFields(Dhcpv4Exchange& ex) {
// Step 2: Try to set the values based on classes.
// Any values defined in classes will override those from subnet level.
const ClientClasses classes = query->getClassesAndTemplates();
const ClientClasses classes = query->getClasses();
if (!classes.empty()) {
// Let's get class definitions
@@ -3906,7 +3906,7 @@ Dhcpv4Srv::acceptServerId(const Pkt4Ptr& query) const {
}
// Check if the server identifier is configured at client class level.
const ClientClasses& classes = query->getClassesAndTemplates();
const ClientClasses& classes = query->getClasses();
for (ClientClasses::const_iterator cclass = classes.cbegin();
cclass != classes.cend(); ++cclass) {
// Find the client class definition for this class
@@ -3986,7 +3986,7 @@ void Dhcpv4Srv::classifyPacket(const Pkt4Ptr& pkt) {
void Dhcpv4Srv::requiredClassify(Dhcpv4Exchange& ex) {
// First collect required classes
Pkt4Ptr query = ex.getQuery();
ClientClasses classes = query->getClassesAndTemplates(true);
ClientClasses classes = query->getClasses(true);
Subnet4Ptr subnet = ex.getContext()->subnet_;
if (subnet) {
@@ -4080,7 +4080,7 @@ Dhcpv4Srv::deferredUnpack(Pkt4Ptr& query) {
BOOST_FOREACH(const uint16_t& code, query->getDeferredOptions()) {
OptionDefinitionPtr def;
// Iterate on client classes
const ClientClasses& classes = query->getClassesAndTemplates();
const ClientClasses& classes = query->getClasses();
for (ClientClasses::const_iterator cclass = classes.cbegin();
cclass != classes.cend(); ++cclass) {
// Get the client class definition for this class