]> git.ipfire.org Git - thirdparty/dhcp.git/commitdiff
Addressed comments list
authorFrancis Dupont <fdupont@isc.org>
Tue, 29 Dec 2020 15:48:04 +0000 (16:48 +0100)
committerFrancis Dupont <fdupont@isc.org>
Tue, 29 Dec 2020 15:48:04 +0000 (16:48 +0100)
RELNOTES
client/dhclient.c

index 158676423358e6fc92b0edee6e9819e6c4a6f516..7ed1f37da5eb7bc58e7b900372e896a50fb511bd 100644 (file)
--- a/RELNOTES
+++ b/RELNOTES
@@ -105,9 +105,9 @@ by Eric Young (eay@cryptsoft.com).
 
                Changes since 4.4.2 (New Features)
 
-- Added support of the new DHCPv4 option v6-only-preferred specified in
-RFC 8925. A new reason V6ONLY was added to the client script and the
-client Linux script sample was updated.
+- Added support of the new DHCPv4 option v6-only-preferred specified
+in RFC 8925. A new reason code, V6ONLY, was added to the client script
+and the client Linux script sample was updated.
   [Gitlab #132]
 
                Changes since 4.4.2 (Bug Fixes)
index 42d098ab99268045aa0df7fa8731b2076238d7c7..0a4fa312076cd2665380fef86c260a7834d4d2dd 100644 (file)
@@ -1285,7 +1285,7 @@ uint32_t check_v6only(packet, client)
        if (evaluate_option_cache(&data, packet, (struct lease *)0, client,
                                  packet->options, (struct option_state *)0,
                                  &global_scope, oc, MDL)) {
-               if (data.len > 3) {
+               if (data.len == 4) {
                        v6only_wait = getULong(data.data);
                        if (v6only_wait < MIN_V6ONLY_WAIT)
                                v6only_wait = MIN_V6ONLY_WAIT;
@@ -1475,7 +1475,7 @@ void dhcpack (packet)
        /* Check v6only first. */
        v6only_wait = check_v6only(packet, client);
        if (v6only_wait > 0) {
-               log_info("v6 only preferred for %lu.",
+               log_info("v6 only preferred for %lu seconds.",
                         (long unsigned)v6only_wait);
                cancel_timeout(send_request, client);
                start_v6only(client, v6only_wait);