From 35333d7ca55dd0b3d9cab19ef28f407acb792bde Mon Sep 17 00:00:00 2001
From: Piotrek Zadroga <piotrek@isc.org>
Date: Wed, 19 Apr 2023 01:26:09 +0200
Subject: [PATCH] [#2536] Fixing DNRv4 Option unpack

---
 src/lib/dhcp/option4_dnr.cc | 1 +
 src/lib/dhcp/option6_dnr.cc | 2 --
 src/lib/dhcp/option6_dnr.h  | 2 --
 3 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/lib/dhcp/option4_dnr.cc b/src/lib/dhcp/option4_dnr.cc
index f8d196dbc5..d7afbdb601 100644
--- 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 89266857f7..6eca714f3b 100644
--- 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 9c3be4a8fb..8df2c0a5a5 100644
--- 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 {
-- 
2.47.2