BIND 10 trac2414, updated. d9c1638e3498459671b8257a8c3529569a3a8fd9 [2414] Compilation fix on Mac OS

[BIND 10 source code commits]

The branch, trac2414 has been updated
       via  d9c1638e3498459671b8257a8c3529569a3a8fd9 (commit)
       via  b8b87c941fa3b5973dddd0e88220dd435bec699c (commit)
      from  f63a6cabd8ecfca7465f1856a3836bdd72ea34f3 (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 d9c1638e3498459671b8257a8c3529569a3a8fd9
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Wed Oct 31 18:33:53 2012 +0100

    [2414] Compilation fix on Mac OS

commit b8b87c941fa3b5973dddd0e88220dd435bec699c
Author: Tomek Mrugalski <tomasz at isc.org>
Date:   Wed Oct 31 18:33:39 2012 +0100

    [2414] Test for Dhcpv6Srv.createStatusCode() implemented

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

Summary of changes:
 src/bin/dhcp6/tests/dhcp6_srv_unittest.cc |   19 +++++++++++++++++--
 src/lib/dhcp/Makefile.am                  |    3 ++-
 2 files changed, 19 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
index 457be1c..ad1cbce 100644
--- a/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
+++ b/src/bin/dhcp6/tests/dhcp6_srv_unittest.cc
@@ -40,7 +40,7 @@ namespace {
 class NakedDhcpv6Srv: public Dhcpv6Srv {
     // "naked" Interface Manager, exposes internal fields
 public:
-    NakedDhcpv6Srv():Dhcpv6Srv(DHCP6_SERVER_PORT + 10000) { }
+    NakedDhcpv6Srv(uint16_t port):Dhcpv6Srv(port) { }
 
     boost::shared_ptr<Pkt6>
     processSolicit(boost::shared_ptr<Pkt6>& request) {
@@ -50,6 +50,8 @@ public:
     processRequest(boost::shared_ptr<Pkt6>& request) {
         return Dhcpv6Srv::processRequest(request);
     }
+
+    using Dhcpv6Srv::createStatusCode;
 };
 
 class Dhcpv6SrvTest : public ::testing::Test {
@@ -153,7 +155,7 @@ TEST_F(Dhcpv6SrvTest, DUID) {
 
 TEST_F(Dhcpv6SrvTest, Solicit_basic) {
     boost::scoped_ptr<NakedDhcpv6Srv> srv;
-    ASSERT_NO_THROW( srv.reset(new NakedDhcpv6Srv()) );
+    ASSERT_NO_THROW( srv.reset(new NakedDhcpv6Srv(0)) );
 
     // a dummy content for client-id
     OptionBuffer clntDuid(32);
@@ -269,4 +271,17 @@ TEST_F(Dhcpv6SrvTest, serverReceivedPacketName) {
     }
 }
 
+TEST_F(Dhcpv6SrvTest, StatusCode) {
+    boost::scoped_ptr<NakedDhcpv6Srv> srv;
+    ASSERT_NO_THROW( srv.reset(new NakedDhcpv6Srv(0)) );
+
+    // a dummy content for client-id
+    uint8_t expected[] = {0x0, 0x3, 0x41, 0x42, 0x43, 0x44, 0x45};
+    OptionBuffer exp(expected, expected + sizeof(expected));
+
+    OptionPtr status = srv->createStatusCode(3, "ABCDE");
+
+    EXPECT_TRUE(status->getData() == exp);
+}
+
 }   // end of anonymous namespace
diff --git a/src/lib/dhcp/Makefile.am b/src/lib/dhcp/Makefile.am
index 3829d31..5404aa7 100644
--- a/src/lib/dhcp/Makefile.am
+++ b/src/lib/dhcp/Makefile.am
@@ -47,7 +47,8 @@ libb10_dhcpsrv_la_SOURCES += addr_utilities.cc addr_utilities.h
 libb10_dhcpsrv_la_SOURCES += alloc_engine.cc alloc_engine.h
 libb10_dhcpsrv_la_CXXFLAGS = $(AM_CXXFLAGS)
 libb10_dhcpsrv_la_CPPFLAGS = $(AM_CPPFLAGS) $(LOG4CPLUS_INCLUDES)
-libb10_dhcpsrv_la_LIBADD   = $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
+libb10_dhcpsrv_la_LIBADD   = $(top_builddir)/src/lib/dhcp/libb10-dhcp++.la
+libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/asiolink/libb10-asiolink.la
 libb10_dhcpsrv_la_LIBADD  += $(top_builddir)/src/lib/util/libb10-util.la
 libb10_dhcpsrv_la_LDFLAGS  = -no-undefined -version-info 2:0:0