From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sun, 6 Feb 2022 18:03:24 +0000 (+0900)
Subject: sd-dhcp6-client: use event_reset_time_relative() at one more place
X-Git-Tag: v251-rc1~291^2~29
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ec7baf998dbb404443a65d0d8dcfd1d7f1e9e245;p=thirdparty%2Fsystemd.git

sd-dhcp6-client: use event_reset_time_relative() at one more place
---

diff --git a/src/libsystemd-network/fuzz-dhcp6-client-send.c b/src/libsystemd-network/fuzz-dhcp6-client-send.c
index d05bb55c433..906c835b039 100644
--- a/src/libsystemd-network/fuzz-dhcp6-client-send.c
+++ b/src/libsystemd-network/fuzz-dhcp6-client-send.c
@@ -22,7 +22,6 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         _cleanup_(sd_event_unrefp) sd_event *e = NULL;
         _cleanup_(sd_dhcp6_client_unrefp) sd_dhcp6_client *client = NULL;
         struct in6_addr address = { { { 0xfe, 0x80, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x01 } } };
-        usec_t time_now;
         int r;
 
         if (size < sizeof(DHCP6Message))
@@ -46,13 +45,9 @@ int LLVMFuzzerTestOneInput(const uint8_t *data, size_t size) {
         if (r < 0)
                 goto cleanup;
 
-        r = sd_event_now(client->event, clock_boottime_or_monotonic(), &time_now);
-        if (r < 0)
-                goto cleanup;
-
         if (client->state != DHCP6_STATE_REQUEST)
                 client->state = DHCP6_STATE_SOLICITATION;
-        (void) client_send_message(client, time_now);
+        (void) client_send_message(client);
 cleanup:
         assert_se(sd_dhcp6_client_stop(client) >= 0);
         return 0;
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c
index c7aec08c7be..70eeb722324 100644
--- a/src/libsystemd-network/sd-dhcp6-client.c
+++ b/src/libsystemd-network/sd-dhcp6-client.c
@@ -690,7 +690,7 @@ static DHCP6MessageType client_message_type_from_state(sd_dhcp6_client *client)
         }
 }
 
-static int client_send_message(sd_dhcp6_client *client, usec_t time_now) {
+static int client_send_message(sd_dhcp6_client *client) {
         _cleanup_free_ DHCP6Message *message = NULL;
         struct in6_addr all_servers =
                 IN6ADDR_ALL_DHCP6_RELAY_AGENTS_AND_SERVERS_INIT;
@@ -698,11 +698,16 @@ static int client_send_message(sd_dhcp6_client *client, usec_t time_now) {
         struct sd_dhcp6_option *j;
         size_t len, optlen = 512;
         uint8_t *opt;
-        usec_t elapsed_usec;
+        usec_t elapsed_usec, time_now;
         be16_t elapsed_time;
         int r;
 
         assert(client);
+        assert(client->event);
+
+        r = sd_event_now(client->event, clock_boottime_or_monotonic(), &time_now);
+        if (r < 0)
+                return r;
 
         len = sizeof(DHCP6Message) + optlen;
 
@@ -944,7 +949,7 @@ error:
 
 static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userdata) {
         sd_dhcp6_client *client = ASSERT_PTR(userdata);
-        usec_t time_now, init_retransmit_time, max_retransmit_time;
+        usec_t init_retransmit_time, max_retransmit_time;
         int r;
 
         assert(s);
@@ -1000,44 +1005,32 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda
                 assert_not_reached();
         }
 
-        r = sd_event_now(client->event, clock_boottime_or_monotonic(), &time_now);
-        if (r < 0)
-                goto error;
-
-        r = client_send_message(client, time_now);
+        r = client_send_message(client);
         if (r >= 0)
                 client->retransmit_count++;
 
         if (client->retransmit_time == 0) {
-                client->retransmit_time =
-                        client_timeout_compute_random(init_retransmit_time);
+                client->retransmit_time = client_timeout_compute_random(init_retransmit_time);
 
                 if (client->state == DHCP6_STATE_SOLICITATION)
                         client->retransmit_time += init_retransmit_time / 10;
 
-        } else {
-                assert(max_retransmit_time > 0);
-                if (client->retransmit_time > max_retransmit_time / 2)
-                        client->retransmit_time = client_timeout_compute_random(max_retransmit_time);
-                else
-                        client->retransmit_time += client_timeout_compute_random(client->retransmit_time);
-        }
+        } else if (client->retransmit_time > max_retransmit_time / 2)
+                client->retransmit_time = client_timeout_compute_random(max_retransmit_time);
+        else
+                client->retransmit_time += client_timeout_compute_random(client->retransmit_time);
 
         log_dhcp6_client(client, "Next retransmission in %s",
                          FORMAT_TIMESPAN(client->retransmit_time, USEC_PER_SEC));
 
-        r = event_reset_time(client->event, &client->timeout_resend,
-                             clock_boottime_or_monotonic(),
-                             time_now + client->retransmit_time, 10 * USEC_PER_MSEC,
-                             client_timeout_resend, client,
-                             client->event_priority, "dhcp6-resend-timer", true);
+        r = event_reset_time_relative(client->event, &client->timeout_resend,
+                                      clock_boottime_or_monotonic(),
+                                      client->retransmit_time, 10 * USEC_PER_MSEC,
+                                      client_timeout_resend, client,
+                                      client->event_priority, "dhcp6-resend-timer", true);
         if (r < 0)
-                goto error;
-
-        return 0;
+                client_stop(client, r);
 
-error:
-        client_stop(client, r);
         return 0;
 }