BIND 10 pd-ietf-demo, updated. 237e964ef04f1531efcb31cd015648f5d2be85fa [pd-ietf-demo] DHCPv4 PRL option is encapsulated by OptionUint8Array class.

BIND 10 source code commits bind10-changes at lists.isc.org
Thu Oct 17 07:48:46 UTC 2013


The branch, pd-ietf-demo has been updated
       via  237e964ef04f1531efcb31cd015648f5d2be85fa (commit)
      from  67975b73c1123195b06b43062481599818b13a79 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 237e964ef04f1531efcb31cd015648f5d2be85fa
Author: Marcin Siodelski <marcin at isc.org>
Date:   Thu Oct 17 09:48:37 2013 +0200

    [pd-ietf-demo] DHCPv4 PRL option is encapsulated by OptionUint8Array class.

-----------------------------------------------------------------------

Summary of changes:
 src/lib/dhcp/option_definition.cc        |    6 ++++--
 src/lib/dhcp/tests/libdhcp++_unittest.cc |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/lib/dhcp/option_definition.cc b/src/lib/dhcp/option_definition.cc
index 9b93a8e..8c1cad0 100644
--- a/src/lib/dhcp/option_definition.cc
+++ b/src/lib/dhcp/option_definition.cc
@@ -124,12 +124,14 @@ OptionDefinition::optionFactory(Option::Universe u, uint16_t type,
             return (factoryGeneric(u, type, begin, end));
 
         case OPT_UINT8_TYPE:
-            return (array_type_ ? factoryGeneric(u, type, begin, end) :
+            return (array_type_ ?
+                    factoryIntegerArray<uint8_t>(u, type, begin, end) :
                     factoryInteger<uint8_t>(u, type, getEncapsulatedSpace(),
                                             begin, end, callback));
 
         case OPT_INT8_TYPE:
-            return (array_type_ ? factoryGeneric(u, type, begin, end) :
+            return (array_type_ ?
+                    factoryIntegerArray<int8_t>(u, type, begin, end) :
                     factoryInteger<int8_t>(u, type, getEncapsulatedSpace(),
                                            begin, end, callback));
 
diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc
index 085ff0b..776b084 100644
--- a/src/lib/dhcp/tests/libdhcp++_unittest.cc
+++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc
@@ -706,7 +706,7 @@ TEST_F(LibDhcpTest, stdOptionDefs4) {
                                     typeid(OptionCustom));
 
     LibDhcpTest::testStdOptionDefs4(DHO_DHCP_PARAMETER_REQUEST_LIST, begin, end,
-                                    typeid(Option));
+                                    typeid(OptionUint8Array));
 
     LibDhcpTest::testStdOptionDefs4(DHO_DHCP_MESSAGE, begin, end,
                                     typeid(OptionString));



More information about the bind10-changes mailing list