BIND 10 trac2902, updated. 9c2f41d0ce4250623b36966eb04698d55eac7509 [2902] Corrected some doxygen errors.

BIND 10 source code commits bind10-changes at lists.isc.org
Tue Apr 30 17:38:28 UTC 2013


The branch, trac2902 has been updated
       via  9c2f41d0ce4250623b36966eb04698d55eac7509 (commit)
       via  97e41248dcb4ec3285d1e5f6d0f7d922952c63a6 (commit)
      from  8f8bfc92e622717d75684b8bd36181b525a22309 (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 9c2f41d0ce4250623b36966eb04698d55eac7509
Author: Marcin Siodelski <marcin at isc.org>
Date:   Tue Apr 30 19:38:18 2013 +0200

    [2902] Corrected some doxygen errors.

commit 97e41248dcb4ec3285d1e5f6d0f7d922952c63a6
Author: Marcin Siodelski <marcin at isc.org>
Date:   Tue Apr 30 18:32:58 2013 +0200

    [2902] Include in_systm.h when ip.h is included.
    
    If in_systm.h is not included before ip.h it will cause compilation error
    on NetBSD and OpenBSD. Compiler will complain that n_time is undefined
    but used in ip.h.

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

Summary of changes:
 src/bin/dhcp4/dhcp4_srv.h                    |    3 ++-
 src/lib/dhcp/pkt_filter_lpf.h                |    2 +-
 src/lib/dhcp/protocol_util.cc                |    6 +++++-
 src/lib/dhcp/tests/protocol_util_unittest.cc |    6 ++++--
 4 files changed, 12 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/dhcp4/dhcp4_srv.h b/src/bin/dhcp4/dhcp4_srv.h
index 8c6b879..9d6bc96 100644
--- a/src/bin/dhcp4/dhcp4_srv.h
+++ b/src/bin/dhcp4/dhcp4_srv.h
@@ -71,7 +71,8 @@ class Dhcpv4Srv : public boost::noncopyable {
     /// @param dbconfig Lease manager configuration string.  The default
     ///        of the "memfile" manager is used for testing.
     /// @param use_bcast configure sockets to support broadcast messages.
-    /// @param specifies if it is desired to support direct V4 traffic.
+    /// @param direct_response_desired specifies if it is desired to
+    /// use direct V4 traffic.
     Dhcpv4Srv(uint16_t port = DHCP4_SERVER_PORT,
               const char* dbconfig = "type=memfile",
               const bool use_bcast = true,
diff --git a/src/lib/dhcp/pkt_filter_lpf.h b/src/lib/dhcp/pkt_filter_lpf.h
index ef2fa1c..d36719f 100644
--- a/src/lib/dhcp/pkt_filter_lpf.h
+++ b/src/lib/dhcp/pkt_filter_lpf.h
@@ -68,7 +68,7 @@ public:
 
     /// @brief Send packet over specified socket.
     ///
-    /// @oaram iface interface to be used to send packet
+    /// @param iface interface to be used to send packet
     /// @param sockfd socket descriptor
     /// @param pkt packet to be sent
     ///
diff --git a/src/lib/dhcp/protocol_util.cc b/src/lib/dhcp/protocol_util.cc
index 3c32bcd..704bc0e 100644
--- a/src/lib/dhcp/protocol_util.cc
+++ b/src/lib/dhcp/protocol_util.cc
@@ -13,9 +13,13 @@
 // PERFORMANCE OF THIS SOFTWARE.
 
 #include <asiolink/io_address.h>
-#include <dhcp/dhcp6.h> // defines HWTYPE_ETHERNET
+#include <dhcp/dhcp6.h>
 #include <dhcp/protocol_util.h>
 #include <boost/static_assert.hpp>
+// in_systm.h is required on some some BSD systems
+// complaining that n_time is undefined but used
+// in ip.h.
+#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
 using namespace isc::asiolink;
diff --git a/src/lib/dhcp/tests/protocol_util_unittest.cc b/src/lib/dhcp/tests/protocol_util_unittest.cc
index bb72be7..61bb6f6 100644
--- a/src/lib/dhcp/tests/protocol_util_unittest.cc
+++ b/src/lib/dhcp/tests/protocol_util_unittest.cc
@@ -18,9 +18,11 @@
 #include <dhcp/hwaddr.h>
 #include <dhcp/protocol_util.h>
 #include <util/buffer.h>
-
 #include <gtest/gtest.h>
-
+// in_systm.h is required on some some BSD systems
+// complaining that n_time is undefined but used
+// in ip.h.
+#include <netinet/in_systm.h>
 #include <netinet/ip.h>
 
 using namespace isc;



More information about the bind10-changes mailing list