BIND 10 trac2490, updated. 648f693c9e524c49b0ad1e53096664fb5d162f4a [2490] Initialize standard option definitions on first attept to get them.
BIND 10 source code commits
bind10-changes at lists.isc.org
Mon Nov 19 11:54:01 UTC 2012
The branch, trac2490 has been updated
via 648f693c9e524c49b0ad1e53096664fb5d162f4a (commit)
from b24fd3ded0a466be9eac27617952728e44149695 (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 648f693c9e524c49b0ad1e53096664fb5d162f4a
Author: Marcin Siodelski <marcin at isc.org>
Date: Mon Nov 19 12:53:52 2012 +0100
[2490] Initialize standard option definitions on first attept to get them.
-----------------------------------------------------------------------
Summary of changes:
src/bin/dhcp6/dhcp6_srv.cc | 11 ----------
src/bin/dhcp6/dhcp6_srv.h | 11 ----------
src/bin/dhcp6/tests/config_parser_unittest.cc | 5 -----
src/lib/dhcp/libdhcp++.cc | 28 ++++++------------------
src/lib/dhcp/libdhcp++.h | 26 +++++-----------------
src/lib/dhcp/tests/libdhcp++_unittest.cc | 29 ++++++++++---------------
6 files changed, 25 insertions(+), 85 deletions(-)
-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/dhcp6_srv.cc b/src/bin/dhcp6/dhcp6_srv.cc
index 2a5798d..02c0dd0 100644
--- a/src/bin/dhcp6/dhcp6_srv.cc
+++ b/src/bin/dhcp6/dhcp6_srv.cc
@@ -56,12 +56,6 @@ Dhcpv6Srv::Dhcpv6Srv(uint16_t port, const char* dbconfig)
// Initialize objects required for DHCP server operation.
try {
- // Initialize standard DHCPv6 option definitions. This function
- // may throw bad_alloc if system goes out of memory during the
- // creation if option definitions. It may also throw isc::Unexpected
- // if definitions are wrong. This would mean error in implementation.
- initStdOptionDefs();
-
// Port 0 is used for testing purposes. It means that the server should
// not open any sockets at all. Some tests, e.g. configuration parser,
// require Dhcpv6Srv object, but they don't really need it to do
@@ -622,10 +616,5 @@ Dhcpv6Srv::serverReceivedPacketName(uint8_t type) {
return (UNKNOWN);
}
-void
-Dhcpv6Srv::initStdOptionDefs() {
- LibDHCP::initStdOptionDefs(Option::V6);
-}
-
};
};
diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index b4ce8b1..de9ee36 100644
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -241,17 +241,6 @@ protected:
/// interfaces for new DUID generation are detected.
void setServerID();
- /// @brief Initializes option definitions for standard options.
- ///
- /// Each standard option's format is described by the
- /// dhcp::OptionDefinition object. This function creates such objects
- /// for each standard DHCPv6 option.
- ///
- /// @todo list thrown exceptions.
- /// @todo extend this function to cover all standard options. Currently
- /// it is limited to critical options only.
- void initStdOptionDefs();
-
private:
/// @brief Allocation Engine.
/// Pointer to the allocation engine that we are currently using
diff --git a/src/bin/dhcp6/tests/config_parser_unittest.cc b/src/bin/dhcp6/tests/config_parser_unittest.cc
index 2064e72..4fd6baa 100644
--- a/src/bin/dhcp6/tests/config_parser_unittest.cc
+++ b/src/bin/dhcp6/tests/config_parser_unittest.cc
@@ -46,11 +46,6 @@ public:
// srv_(0) means to not open any sockets. We don't want to
// deal with sockets here, just check if configuration handling
// is sane.
-
- // Create instances of option definitions and put them into storage.
- // This is normally initialized by the server when calling run()
- // run() function.
- LibDHCP::initStdOptionDefs(Option::V6);
}
~Dhcp6ParserTest() {
diff --git a/src/lib/dhcp/libdhcp++.cc b/src/lib/dhcp/libdhcp++.cc
index 32d8a03..b2254c4 100644
--- a/src/lib/dhcp/libdhcp++.cc
+++ b/src/lib/dhcp/libdhcp++.cc
@@ -48,13 +48,11 @@ const OptionDefContainer&
LibDHCP::getOptionDefs(Option::Universe u) {
switch (u) {
case Option::V4:
- isc_throw(isc::InvalidOperation, "DHCPv4 option definitions not initialized."
- << " Call initStdOptionDefs first");
+ initStdOptionDefs4();
return (v4option_defs_);
case Option::V6:
if (v6option_defs_.size() == 0) {
- isc_throw(isc::InvalidOperation, "DHCPv6 option definitions not initialized."
- << " Call initStdOptionDefs first");
+ initStdOptionDefs6();
}
return (v6option_defs_);
default:
@@ -248,20 +246,6 @@ void LibDHCP::OptionFactoryRegister(Option::Universe u,
}
void
-LibDHCP::initStdOptionDefs(Option::Universe u) {
- switch (u) {
- case Option::V4:
- initStdOptionDefs4();
- break;
- case Option::V6:
- initStdOptionDefs6();
- break;
- default:
- isc_throw(isc::BadValue, "invalid universe " << u << " specified");
- }
-}
-
-void
LibDHCP::initStdOptionDefs4() {
isc_throw(isc::NotImplemented, "initStdOptionDefs4 is not implemented");
}
@@ -319,9 +303,11 @@ LibDHCP::initStdOptionDefs6() {
try {
definition->validate();
} catch (const Exception& ex) {
- isc_throw(isc::Unexpected, "internal server error: invalid definition of standard"
- << " DHCPv6 option (with code " << params[i].code << "): "
- << ex.what());
+ // Return empty set in an unlikely event of a validation error.
+ // We don't return exception here on error because it should
+ // not happen to the regular user. It is a programming error.
+ v6option_defs_.clear();
+ return;
}
v6option_defs_.push_back(definition);
}
diff --git a/src/lib/dhcp/libdhcp++.h b/src/lib/dhcp/libdhcp++.h
index 4db753c..cf6490c 100644
--- a/src/lib/dhcp/libdhcp++.h
+++ b/src/lib/dhcp/libdhcp++.h
@@ -33,11 +33,14 @@ public:
/// @brief Return collection of option definitions.
///
+ /// Method returns the collection of DHCP standard DHCP
+ /// option definitions.
+ /// @todo DHCPv4 option definitions are not implemented. For now
+ /// this function will throw isc::NotImplemented in case of attempt
+ /// to get option definitions for V4 universe.
+ ///
/// @param u universe of the options (V4 or V6).
///
- /// @throw isc::InvalidOperation if option definitions for a specified
- /// universe have not been initialized yet. initStdOptionDefs must
- /// be first called to avoid this error.
/// @return collection of option definitions.
static const OptionDefContainer& getOptionDefs(Option::Universe u);
@@ -117,21 +120,6 @@ public:
uint16_t type,
Option::Factory * factory);
- /// Initialize standard DHCP options (V4 or V6).
- ///
- /// The method creates option definitions for all options
- /// (DHCPv4 or DHCPv6 depending on universe specified).
- /// Currently DHCPv4 option definitions initialization is not
- /// implemented thus this function will throw isc::NotImplemented
- /// if V4 universe is specified.
- ///
- /// @param u universe
- /// @throw isc::Unexpected if internal error occured during option
- /// definitions creation.
- /// @throw std::bad_alloc if system went out of memory.
- /// @throw isc::NotImplemented when V4 universe specified.
- static void initStdOptionDefs(Option::Universe u);
-
private:
/// Initialize standard DHCPv4 option definitions.
@@ -148,8 +136,6 @@ private:
///
/// The method creates option definitions for all DHCPv6 options.
///
- /// @throw isc::Unexpected if internal error occured during option
- /// definitions creation.
/// @throw std::bad_alloc if system went out of memory.
static void initStdOptionDefs6();
diff --git a/src/lib/dhcp/tests/libdhcp++_unittest.cc b/src/lib/dhcp/tests/libdhcp++_unittest.cc
index 0a6c949..af3d6ca 100644
--- a/src/lib/dhcp/tests/libdhcp++_unittest.cc
+++ b/src/lib/dhcp/tests/libdhcp++_unittest.cc
@@ -39,12 +39,7 @@ using namespace isc::util;
namespace {
class LibDhcpTest : public ::testing::Test {
public:
- LibDhcpTest() {
- // @todo initialize standard DHCPv4 option definitions
-
- // Initialize DHCPv6 option definitions.
- LibDHCP::initStdOptionDefs(Option::V6);
- }
+ LibDhcpTest() { }
/// @brief Generic factory function to create any option.
///
@@ -68,7 +63,7 @@ public:
/// @param bug buffer to be used to create option instance.
/// @param expected_type type of the option created by the
/// factory function returned by the option definition.
- static void testInitOptionDefs6(const uint16_t code,
+ static void testStdOptionDefs6(const uint16_t code,
const OptionBuffer& buf,
const std::type_info& expected_type) {
// Get all option definitions, we will use them to extract
@@ -403,24 +398,24 @@ TEST_F(LibDhcpTest, unpackOptions4) {
// @todo Only limited number of option definitions are now created
// This test have to be extended once all option definitions are
// created.
-TEST_F(LibDhcpTest, initStdOptionDefs) {
- LibDhcpTest::testInitOptionDefs6(D6O_CLIENTID, OptionBuffer(14, 1),
+TEST_F(LibDhcpTest, stdOptionDefs6) {
+ LibDhcpTest::testStdOptionDefs6(D6O_CLIENTID, OptionBuffer(14, 1),
typeid(Option));
- LibDhcpTest::testInitOptionDefs6(D6O_SERVERID, OptionBuffer(14, 1),
+ LibDhcpTest::testStdOptionDefs6(D6O_SERVERID, OptionBuffer(14, 1),
typeid(Option));
- LibDhcpTest::testInitOptionDefs6(D6O_IA_NA, OptionBuffer(12, 1),
+ LibDhcpTest::testStdOptionDefs6(D6O_IA_NA, OptionBuffer(12, 1),
typeid(Option6IA));
- LibDhcpTest::testInitOptionDefs6(D6O_IAADDR, OptionBuffer(24, 1),
+ LibDhcpTest::testStdOptionDefs6(D6O_IAADDR, OptionBuffer(24, 1),
typeid(Option6IAAddr));
- LibDhcpTest::testInitOptionDefs6(D6O_ORO, OptionBuffer(10, 1),
+ LibDhcpTest::testStdOptionDefs6(D6O_ORO, OptionBuffer(10, 1),
typeid(Option6IntArray<uint16_t>));
- LibDhcpTest::testInitOptionDefs6(D6O_ELAPSED_TIME, OptionBuffer(2, 1),
+ LibDhcpTest::testStdOptionDefs6(D6O_ELAPSED_TIME, OptionBuffer(2, 1),
typeid(Option6Int<uint16_t>));
- LibDhcpTest::testInitOptionDefs6(D6O_STATUS_CODE, OptionBuffer(10, 1),
+ LibDhcpTest::testStdOptionDefs6(D6O_STATUS_CODE, OptionBuffer(10, 1),
typeid(Option));
- LibDhcpTest::testInitOptionDefs6(D6O_RAPID_COMMIT, OptionBuffer(),
+ LibDhcpTest::testStdOptionDefs6(D6O_RAPID_COMMIT, OptionBuffer(),
typeid(Option));
- LibDhcpTest::testInitOptionDefs6(D6O_NAME_SERVERS, OptionBuffer(32, 1),
+ LibDhcpTest::testStdOptionDefs6(D6O_NAME_SERVERS, OptionBuffer(32, 1),
typeid(Option6AddrLst));
}
More information about the bind10-changes
mailing list