[#278,!162] Addressed review comments

diff --git a/doc/devel/mainpage.dox b/doc/devel/mainpage.dox
index ee16bfb66a695334f157654a635a33d17323bc85..d2bb72bb3fae00482004a3b528f4342e1b79b7fb 100644 (file)
--- a/doc/devel/mainpage.dox
+++ b/doc/devel/mainpage.dox
@@ -78,6 +78,7 @@
  *   - @subpage dhcpv6ConfigBackend
  *   - @subpage dhcpv6SignalBasedReconfiguration
  *   - @subpage dhcpv6Other
+ *   - @subpage dhcpv4o6Dhcp6
  * - @subpage congestionHandling
  * - @subpage d2
  *   - @subpage d2ProcessDerivation

diff --git a/src/lib/dhcp/packet_queue.h b/src/lib/dhcp/packet_queue.h
index e02be0dd74f2524fa663760306a8c90c0514c4db..64d1302294f57b7871e53b4bee7132f158b6e0a7 100644 (file)
--- a/src/lib/dhcp/packet_queue.h
+++ b/src/lib/dhcp/packet_queue.h
@@ -41,8 +41,11 @@ enum class QueueEnd {
 /// This class serves as the abstract interface for packet queue
 /// implementations which may be used by @c IfaceMgr to store
 /// inbound packets until they are a dequeued for processing.
-/// @note Derivations of this class MUST BE thread-safe.
 ///
+/// @tparam PacktTypePtr Type of packet the queue contains.
+/// This expected to be either isc::dhcp::Pkt4Ptr or isc::dhcp::Pkt6Ptr
+///
+/// @note Derivations of this class MUST BE thread-safe.
 template<typename PacketTypePtr>
 class PacketQueue {
 public:

diff --git a/src/lib/dhcp/packet_queue_ring.h b/src/lib/dhcp/packet_queue_ring.h
index 4b66c5c1099784e662df01eb0af5648d1134a480..4108896c624a63051d2dd2eb7ea56f3d591acc94 100644 (file)
--- a/src/lib/dhcp/packet_queue_ring.h
+++ b/src/lib/dhcp/packet_queue_ring.h
@@ -18,7 +18,10 @@ namespace isc {
 
 namespace dhcp {
 
-/// @brief Provides an abstract ring-buffer implementation of the PacketQueue interface.
+/// @brief Provides a ring-buffer implementation of the PacketQueue interface.
+///
+/// @tparam PacktTypePtr Type of packet the queue contains.
+/// This expected to be either isc::dhcp::Pkt4Ptr or isc::dhcp::Pkt6Ptr
 template<typename PacketTypePtr>
 class PacketQueueRing : public PacketQueue<PacketTypePtr> {
 public:
@@ -66,11 +69,11 @@ public:
     /// @brief Determines if a packet should be discarded.
     ///
     /// This function is called in @c enqueuePackets for each packet
-    /// in its packet list. It provides an opportunity to examine the 
+    /// in its packet list. It provides an opportunity to examine the
     /// packet and its source and decide whether it should be dropped
-    /// or added to the queue. Derivations are expected to provide 
-    /// implementations based on their own requirements.  Bear in mind 
-    /// that the packet has NOT been unpacked at this point. The default 
+    /// or added to the queue. Derivations are expected to provide
+    /// implementations based on their own requirements.  Bear in mind
+    /// that the packet has NOT been unpacked at this point. The default
     /// implementation simply returns false (i.e. keep the packet).
     ///
     /// @return true if the packet should be dropped, false if it should be