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

[#2517] Adding multiple requested vendor options

Browse Source
This commit is contained in:
Francis Dupont
2022-07-31 21:16:53 +02:00
parent db67edd009
commit a63c5824e0
1 changed files with 37 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/bin/dhcp6/dhcp6_srv.cc
View File

@@ -1523,7 +1523,7 @@ Dhcpv6Srv::appendRequestedOptions(const Pkt6Ptr& question, Pkt6Ptr& answer,
} }
} }
// Special cases for vendor class. Vendor options are done later. // Special cases for vendor class and options.
if (requested_opts.count(D6O_VENDOR_CLASS) > 0) { if (requested_opts.count(D6O_VENDOR_CLASS) > 0) {
set<uint32_t> vendor_ids; set<uint32_t> vendor_ids;
for (auto opt : answer->getOptions(D6O_VENDOR_CLASS)) { for (auto opt : answer->getOptions(D6O_VENDOR_CLASS)) {
@@ -1559,6 +1559,42 @@ Dhcpv6Srv::appendRequestedOptions(const Pkt6Ptr& question, Pkt6Ptr& answer,
} }
} }
} }
if (requested_opts.count(D6O_VENDOR_OPTS) > 0) {
set<uint32_t> vendor_ids;
for (auto opt : answer->getOptions(D6O_VENDOR_OPTS)) {
if (opt.first != D6O_VENDOR_OPTS) {
continue;
}
OptionVendorPtr vendor_opts;
vendor_opts = boost::dynamic_pointer_cast<OptionVendor>(opt.second);
if (vendor_opts) {
int32_t vendor_id = vendor_opts->getVendorId();
static_cast<void>(vendor_ids.insert(vendor_id));
}
}
// Iterate on the configured option list
for (CfgOptionList::const_iterator copts = co_list.begin();
copts != co_list.end(); ++copts) {
for (OptionDescriptor desc : (*copts)->getList(DHCP6_OPTION_SPACE,
D6O_VENDOR_OPTS)) {
if (!desc.option_) {
continue;
}
OptionVendorPtr vendor_opts =
boost::dynamic_pointer_cast<OptionVendor>(desc.option_);
if (!vendor_opts) {
continue;
}
// Is the vendor id already in the response?
if (vendor_ids.count(vendor_opts->getVendorId()) > 0) {
continue;
}
// Got it: add it.
answer->addOption(desc.option_);
}
}
}
} }
void void