From: Francis Dupont <fdupont@isc.org>
Date: Sat, 25 Jun 2016 18:50:32 +0000 (+0200)
Subject: [4523] Added missing appendRequestedVendorOptions()
X-Git-Tag: trac4551_base~26^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a9ee6313296cc35c76c870f03ba699f3580f1dd;p=thirdparty%2Fkea.git

[4523] Added missing appendRequestedVendorOptions()
---

diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 0948cb1e2e..ed10bc2bcc 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -2327,6 +2327,7 @@ Dhcpv6Srv::processRenew(const Pkt6Ptr& renew) {
     buildCfgOptionList(renew, ctx, co_list);
     appendDefaultOptions(renew, reply, co_list);
     appendRequestedOptions(renew, reply, co_list);
+    appendRequestedVendorOptions(renew, reply, ctx, co_list);
 
     processClientFqdn(renew, reply, ctx);
     extendLeases(renew, reply, ctx);
@@ -2352,6 +2353,7 @@ Dhcpv6Srv::processRebind(const Pkt6Ptr& rebind) {
     buildCfgOptionList(rebind, ctx, co_list);
     appendDefaultOptions(rebind, reply, co_list);
     appendRequestedOptions(rebind, reply, co_list);
+    appendRequestedVendorOptions(rebind, reply, ctx, co_list);
 
     processClientFqdn(rebind, reply, ctx);
     extendLeases(rebind, reply, ctx);
@@ -2385,6 +2387,7 @@ Dhcpv6Srv::processConfirm(const Pkt6Ptr& confirm) {
     buildCfgOptionList(confirm, ctx, co_list);
     appendDefaultOptions(confirm, reply, co_list);
     appendRequestedOptions(confirm, reply, co_list);
+    appendRequestedVendorOptions(confirm, reply, ctx, co_list);
     // 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
     // or no IAAddr options and that client's message has to be discarded.
@@ -2784,6 +2787,9 @@ Dhcpv6Srv::processInfRequest(const Pkt6Ptr& inf_request) {
     // Try to assign options that were requested by the client.
     appendRequestedOptions(inf_request, reply, co_list);
 
+    // Try to assigne vendor options that were requested by the client.
+    appendRequestedVendorOptions(inf_request, reply, ctx, co_list);
+
     return (reply);
 }