[#10,!6] Addressed review comments

server/dhcp.c
    moved log message up

server/dhcpd.conf.5
    fixed missing paragraph marker

diff --git a/server/dhcp.c b/server/dhcp.c
index 21bcd95cc5da9f1c86dc218cb1d63c3fba92d3d4..0529662c89b33307d7eccc58f1d00bdb07817f13 100644 (file)
--- a/server/dhcp.c
+++ b/server/dhcp.c
@@ -3704,9 +3704,6 @@ int do_ping_check(struct packet* packet, struct lease_state* state,
        tv.tv_sec = cur_tv.tv_sec + timeout_secs;
        tv.tv_usec = cur_tv.tv_usec + (timeout_ms * 1000);
 
-       add_timeout (&tv, lease_ping_timeout, lease, (tvref_t)lease_reference,
-                    (tvunref_t)lease_dereference);
-
 #ifdef DEBUG
        log_debug ("Pinging:%s, state: %d, same client? %s, "
                   " orig_cltt %s, elasped: %ld, timeout in: %d.%d secs" ,
@@ -3718,6 +3715,10 @@ int do_ping_check(struct packet* packet, struct lease_state* state,
                   timeout_secs, timeout_ms);
 
 #endif
+
+       add_timeout (&tv, lease_ping_timeout, lease, (tvref_t)lease_reference,
+                    (tvunref_t)lease_dereference);
+
        return (1);
 }
 

diff --git a/server/dhcpd.conf.5 b/server/dhcpd.conf.5
index e41a6a4e60829f3b47ae665846a888773a868487..7bd99b8e42095fd0e6998fd745330d13b2c925e4 100644 (file)
--- a/server/dhcpd.conf.5
+++ b/server/dhcpd.conf.5
@@ -3073,6 +3073,7 @@ heard, the lease is abandoned, and the server does not respond to the client.
 If no value is set, ping-timeout defaults to 1 second. (See also ping-timeout-ms
 below)
 .RE
+.PP
 The
 .I ping-timeout-ms
 statement