Browse Source

[2994] Comments fixes in Dhcpv4Srv and AllocEngine code.

Tomek Mrugalski 12 years ago
parent
commit
ecd9691c17
2 changed files with 5 additions and 4 deletions
  1. 1 0
      src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
  2. 4 4
      src/lib/dhcpsrv/alloc_engine.cc

+ 1 - 0
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc

@@ -1626,6 +1626,7 @@ TEST_F(Dhcpv4SrvTest, ServerID) {
 /// selectSubnetAddr, selectSubnetIface, selectSubnetRelayLinkaddr,
 /// selectSubnetRelayInterfaceId. Note that the concept of interface-id is not
 /// present in the DHCPv4, so not everything is applicable directly.
+/// See ticket #3057
 
 // Checks if hooks are registered properly.
 TEST_F(Dhcpv4SrvTest, Hooks) {

+ 4 - 4
src/lib/dhcpsrv/alloc_engine.cc

@@ -518,7 +518,7 @@ Lease6Ptr AllocEngine::reuseExpiredLease(Lease6Ptr& expired,
 
         // Callouts decided to skip the action. This means that the lease is not
         // assigned, so the client will get NoAddrAvail as a result. The lease
-        // won't be inserted into the
+        // won't be inserted into the database.
         if (callout_handle->getSkip()) {
             LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_HOOKS, DHCPSRV_HOOK_LEASE6_SELECT_SKIP);
             return (Lease6Ptr());
@@ -596,7 +596,7 @@ Lease4Ptr AllocEngine::reuseExpiredLease(Lease4Ptr& expired,
 
         // Callouts decided to skip the action. This means that the lease is not
         // assigned, so the client will get NoAddrAvail as a result. The lease
-        // won't be inserted into the
+        // won't be inserted into the database.
         if (callout_handle->getSkip()) {
             LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_HOOKS, DHCPSRV_HOOK_LEASE4_SELECT_SKIP);
             return (Lease4Ptr());
@@ -655,7 +655,7 @@ Lease6Ptr AllocEngine::createLease6(const Subnet6Ptr& subnet,
 
         // Callouts decided to skip the action. This means that the lease is not
         // assigned, so the client will get NoAddrAvail as a result. The lease
-        // won't be inserted into the
+        // won't be inserted into the database.
         if (callout_handle->getSkip()) {
             LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_HOOKS, DHCPSRV_HOOK_LEASE6_SELECT_SKIP);
             return (Lease6Ptr());
@@ -746,7 +746,7 @@ Lease4Ptr AllocEngine::createLease4(const SubnetPtr& subnet,
 
         // Callouts decided to skip the action. This means that the lease is not
         // assigned, so the client will get NoAddrAvail as a result. The lease
-        // won't be inserted into the
+        // won't be inserted into the database.
         if (callout_handle->getSkip()) {
             LOG_DEBUG(dhcpsrv_logger, DHCPSRV_DBG_HOOKS, DHCPSRV_HOOK_LEASE4_SELECT_SKIP);
             return (Lease4Ptr());