diff options
| author | Thomas Markwalder <tmark@isc.org> | 2019-06-07 08:16:15 -0400 |
|---|---|---|
| committer | Thomas Markwalder <tmark@isc.org> | 2019-06-07 08:16:15 -0400 |
| commit | 5918b493440f02987eca01fafc7630f365beb343 (patch) | |
| tree | 0e649be6bda35662fe5afab9fdcb8a5c955aa754 /server | |
| parent | e6eccd10a84909b14ec93ba06195512273a4a96e (diff) | |
| download | isc-dhcp-5918b493440f02987eca01fafc7630f365beb343.tar.gz | |
[#10,!6] Addressed review comments
server/dhcp.c
moved log message up
server/dhcpd.conf.5
fixed missing paragraph marker
Diffstat (limited to 'server')
| -rw-r--r-- | server/dhcp.c | 7 | ||||
| -rw-r--r-- | server/dhcpd.conf.5 | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/server/dhcp.c b/server/dhcp.c index 21bcd95c..0529662c 100644 --- 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 e41a6a4e..7bd99b8e 100644 --- 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 |