[#964,!577] Two trivial fixes as a result of second review.

- Addeed asterisk in the changelog to mark it incompatible change.
- Fixed comma character in the new line.

diff --git a/ChangeLog b/ChangeLog
index 8c8025e4318391c271ba5b30d2476d8a6802d983..9a7056eb99323d2faabb5f27ef31d3175771789f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+1682.  [bug]*          tmark
+       Added logic to core code and HA hook lib to allow HA peers
+       to detect and handle out of bandwidth socket events.  This
+       corrects a defect introduced in Kea 1.6.0 that can cause
+       an HA server to become unresponsive when an HA socket has
+       been closed by a peer.  Note that there is a change to the
+       signature of the external socket callback handler invoked
+       by IfaceMgr.  Custome hook libraries happen register external
+       sockets with IfaceMgr will require modification and
+       recompilation.
+       (Gitlab #964)
+
 Kea 1.7.1 released on Oct 30, 2019
 
 1681.  [func]          fdupont

diff --git a/src/hooks/dhcp/high_availability/ha_service.h b/src/hooks/dhcp/high_availability/ha_service.h
index 68129f574419f1b6f268deb48a1009717f38876e..14486e1a80cf3ecee7fe31c44389905aec1d07f8 100644 (file)
--- a/src/hooks/dhcp/high_availability/ha_service.h
+++ b/src/hooks/dhcp/high_availability/ha_service.h
@@ -747,9 +747,9 @@ protected:
     /// The handler calls @ref HttpClient::closeIfOutOfBandwidth() to catch
     /// and close any sockets that have gone ready outside of transactions.
     ///
-    /// We do this in case the other peer closed the socket (e.g. idle timeout
-    /// for example), as this will cause the socket /appear ready to read to
-    /// the IfaceMgr::select(). If this happens while no transcations are
+    /// We do this in case the other peer closed the socket (e.g. idle timeout),
+    /// as this will cause the socket to appear ready to read to the
+    /// IfaceMgr::select(). If this happens while no transcations are
     /// in progess, we won't have anything to deal with the socket event.
     /// This causes IfaceMgr::select() to endlessly interrupt on the socket.
     ///