From: Marcin Siodelski <marcin@isc.org>
Date: Mon, 18 Aug 2014 08:33:39 +0000 (+0200)
Subject: [3478] Addressed review comments.
X-Git-Tag: trac3482_base~35^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8274d8244b7b461618daa10e8811a880c06585a6;p=thirdparty%2Fkea.git

[3478] Addressed review comments.
---

diff --git a/src/lib/dhcp/iface_mgr.cc b/src/lib/dhcp/iface_mgr.cc
index b466aa6dc6..3486201050 100644
--- a/src/lib/dhcp/iface_mgr.cc
+++ b/src/lib/dhcp/iface_mgr.cc
@@ -944,7 +944,7 @@ IfaceMgr::receive4(uint32_t timeout_sec, uint32_t timeout_usec /* = 0 */) {
         // an error because of a signal being received  or for some other
         // reasaon. This is because DHCP servers use signals to trigger
         // certain actions, like reconfiguration or graceful shutdown.
-        // By cacthing a dedicated exception the caller will know if the
+        // By catching a dedicated exception the caller will know if the
         // error returned by the function is due to the reception of the
         // signal or for some other reason.
         if (errno == EINTR) {
@@ -1059,7 +1059,7 @@ Pkt6Ptr IfaceMgr::receive6(uint32_t timeout_sec, uint32_t timeout_usec /* = 0 */
         // an error because of a signal being received  or for some other
         // reasaon. This is because DHCP servers use signals to trigger
         // certain actions, like reconfiguration or graceful shutdown.
-        // By cacthing a dedicated exception the caller will know if the
+        // By catching a dedicated exception the caller will know if the
         // error returned by the function is due to the reception of the
         // signal or for some other reason.
         if (errno == EINTR) {
diff --git a/src/lib/dhcp/iface_mgr.h b/src/lib/dhcp/iface_mgr.h
index 0221ea2ebb..22a6771d6d 100644
--- a/src/lib/dhcp/iface_mgr.h
+++ b/src/lib/dhcp/iface_mgr.h
@@ -612,6 +612,9 @@ public:
     /// sockets. If reception is successful and all information about its
     /// sender is obtained, Pkt6 object is created and returned.
     ///
+    /// This method also checks if data arrived over registered external socket.
+    /// This data may be of a different protocol family than AF_INET6.
+    ///
     /// @param timeout_sec specifies integral part of the timeout (in seconds)
     /// @param timeout_usec specifies fractional part of the timeout
     /// (in microseconds)
@@ -631,6 +634,9 @@ public:
     /// IPv4 sockets. If reception is successful and all information about
     /// its sender is obtained, Pkt4 object is created and returned.
     ///
+    /// This method also checks if data arrived over registered external socket.
+    /// This data may be of a different protocol family than AF_INET.
+    ///
     /// @param timeout_sec specifies integral part of the timeout (in seconds)
     /// @param timeout_usec specifies fractional part of the timeout
     /// (in microseconds)