mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-30 21:45:37 +00:00
Code Issues Releases Wiki Activity

[4097a] Removed no longer used argument

Browse Source
This commit is contained in:
Francis Dupont
2015-11-22 18:39:23 +01:00
parent c50a482e47
commit 09df1b387a
2 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -921,7 +921,6 @@ Dhcpv6Srv::buildCfgOptionList(const Pkt6Ptr& question,
void void
Dhcpv6Srv::appendRequestedOptions(const Pkt6Ptr& question, Pkt6Ptr& answer, Dhcpv6Srv::appendRequestedOptions(const Pkt6Ptr& question, Pkt6Ptr& answer,
AllocEngine::ClientContext6& ctx,
const CfgOptionList& co_list) { const CfgOptionList& co_list) {
// Client requests some options using ORO option. Try to // Client requests some options using ORO option. Try to
@@ -2324,7 +2323,7 @@ Dhcpv6Srv::processSolicit(const Pkt6Ptr& solicit) {
CfgOptionList co_list; CfgOptionList co_list;
buildCfgOptionList(solicit, ctx, co_list); buildCfgOptionList(solicit, ctx, co_list);
appendDefaultOptions(solicit, response, co_list); appendDefaultOptions(solicit, response, co_list);
appendRequestedOptions(solicit, response, ctx, co_list); appendRequestedOptions(solicit, response, co_list);
appendRequestedVendorOptions(solicit, response, ctx, co_list); appendRequestedVendorOptions(solicit, response, ctx, co_list);
processClientFqdn(solicit, response, ctx); processClientFqdn(solicit, response, ctx);
@@ -2353,7 +2352,7 @@ Dhcpv6Srv::processRequest(const Pkt6Ptr& request) {
CfgOptionList co_list; CfgOptionList co_list;
buildCfgOptionList(request, ctx, co_list); buildCfgOptionList(request, ctx, co_list);
appendDefaultOptions(request, reply, co_list); appendDefaultOptions(request, reply, co_list);
appendRequestedOptions(request, reply, ctx, co_list); appendRequestedOptions(request, reply, co_list);
appendRequestedVendorOptions(request, reply, ctx, co_list); appendRequestedVendorOptions(request, reply, ctx, co_list);
processClientFqdn(request, reply, ctx); processClientFqdn(request, reply, ctx);
@@ -2378,7 +2377,7 @@ Dhcpv6Srv::processRenew(const Pkt6Ptr& renew) {
CfgOptionList co_list; CfgOptionList co_list;
buildCfgOptionList(renew, ctx, co_list); buildCfgOptionList(renew, ctx, co_list);
appendDefaultOptions(renew, reply, co_list); appendDefaultOptions(renew, reply, co_list);
appendRequestedOptions(renew, reply, ctx, co_list); appendRequestedOptions(renew, reply, co_list);
processClientFqdn(renew, reply, ctx); processClientFqdn(renew, reply, ctx);
extendLeases(renew, reply, ctx); extendLeases(renew, reply, ctx);
@@ -2402,7 +2401,7 @@ Dhcpv6Srv::processRebind(const Pkt6Ptr& rebind) {
CfgOptionList co_list; CfgOptionList co_list;
buildCfgOptionList(rebind, ctx, co_list); buildCfgOptionList(rebind, ctx, co_list);
appendDefaultOptions(rebind, reply, co_list); appendDefaultOptions(rebind, reply, co_list);
appendRequestedOptions(rebind, reply, ctx, co_list); appendRequestedOptions(rebind, reply, co_list);
processClientFqdn(rebind, reply, ctx); processClientFqdn(rebind, reply, ctx);
extendLeases(rebind, reply, ctx); extendLeases(rebind, reply, ctx);
@@ -2434,7 +2433,7 @@ Dhcpv6Srv::processConfirm(const Pkt6Ptr& confirm) {
CfgOptionList co_list; CfgOptionList co_list;
buildCfgOptionList(confirm, ctx, co_list); buildCfgOptionList(confirm, ctx, co_list);
appendDefaultOptions(confirm, reply, co_list); appendDefaultOptions(confirm, reply, co_list);
appendRequestedOptions(confirm, reply, ctx, co_list); appendRequestedOptions(confirm, reply, co_list);
// Indicates if at least one address has been verified. If no addresses // Indicates if at least one address has been verified. If no addresses
// are verified it means that the client has sent no IA_NA options // are verified it means that the client has sent no IA_NA options
// or no IAAddr options and that client's message has to be discarded. // or no IAAddr options and that client's message has to be discarded.
@@ -2829,7 +2828,7 @@ Dhcpv6Srv::processInfRequest(const Pkt6Ptr& inf_request) {
appendDefaultOptions(inf_request, reply, co_list); appendDefaultOptions(inf_request, reply, co_list);
// Try to assign options that were requested by the client. // Try to assign options that were requested by the client.
appendRequestedOptions(inf_request, reply, ctx, co_list); appendRequestedOptions(inf_request, reply, co_list);
return (reply); return (reply);
} }

2
src/bin/dhcp6/dhcp6_srv.h
View File

@@ -459,10 +459,8 @@ protected:
/// ///
/// @param question client's message /// @param question client's message
/// @param answer server's message (options will be added here) /// @param answer server's message (options will be added here)
/// @param ctx client context (contains subnet, duid and other parameters)
/// @param co_list configured option list /// @param co_list configured option list
void appendRequestedOptions(const Pkt6Ptr& question, Pkt6Ptr& answer, void appendRequestedOptions(const Pkt6Ptr& question, Pkt6Ptr& answer,
AllocEngine::ClientContext6& ctx,
const CfgOptionList& co_list); const CfgOptionList& co_list);
/// @brief Appends requested vendor options to server's answer. /// @brief Appends requested vendor options to server's answer.