[#2536] Fixing DNRv4 Option unpack

diff --git a/src/lib/dhcp/option4_dnr.cc b/src/lib/dhcp/option4_dnr.cc
index f8d196dbc5c8d19d5c3b53611798af25a99ad7c9..d7afbdb6010c53fec7dc5ef16646ff807815aa19 100644 (file)
--- a/src/lib/dhcp/option4_dnr.cc
+++ b/src/lib/dhcp/option4_dnr.cc
@@ -140,6 +140,7 @@ Option4Dnr::unpack(OptionBufferConstIter begin, OptionBufferConstIter end) {
             std::string svc_params = dnr_instance.getSvcParams();
             svc_params.assign(begin + offset, dnr_instance_end);
             dnr_instance.checkSvcParams();
+            offset += svc_params_length;
         }
 
         addDnrInstance(dnr_instance);

diff --git a/src/lib/dhcp/option6_dnr.cc b/src/lib/dhcp/option6_dnr.cc
index 89266857f7e212e26bad74e7d15476fd8429e7b8..6eca714f3ba54ced62b1cd7d177deebbd38b584e 100644 (file)
--- a/src/lib/dhcp/option6_dnr.cc
+++ b/src/lib/dhcp/option6_dnr.cc
@@ -11,8 +11,6 @@
 #include <dhcp/dhcp6.h>
 #include <dhcp/opaque_data_tuple.h>
 #include <dhcp/option6_dnr.h>
-#include <dns/labelsequence.h>
-#include <set>
 
 using namespace isc::asiolink;
 

diff --git a/src/lib/dhcp/option6_dnr.h b/src/lib/dhcp/option6_dnr.h
index 9c3be4a8fbb2dd18411b47ef8b320dc992e7565b..8df2c0a5a59edbc40075be137d9b5048eb3c61fd 100644 (file)
--- a/src/lib/dhcp/option6_dnr.h
+++ b/src/lib/dhcp/option6_dnr.h
@@ -7,10 +7,8 @@
 #ifndef OPTION6_DNR_H
 #define OPTION6_DNR_H
 
-#include <asiolink/io_address.h>
 #include <dhcp/option.h>
 #include <dhcp/option4_dnr.h>
-#include <dns/name.h>
 
 namespace isc {
 namespace dhcp {