From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Wed, 20 Sep 2023 04:37:53 +0000 (+0900)
Subject: sd-dhcp-client: split out client_enter_requesting()
X-Git-Tag: v255-rc1~453^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2ff1e23036b9496b86302f3279a8ccf21d331ff4;p=thirdparty%2Fsystemd.git

sd-dhcp-client: split out client_enter_requesting()

No functional change, just refactoring and preparation for later
commits.
---

diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c
index 1bd5315c8a3..03e7c728428 100644
--- a/src/libsystemd-network/sd-dhcp-client.c
+++ b/src/libsystemd-network/sd-dhcp-client.c
@@ -1598,6 +1598,20 @@ static int client_handle_offer(sd_dhcp_client *client, DHCPMessage *offer, size_
         return 0;
 }
 
+static int client_enter_requesting(sd_dhcp_client *client) {
+        assert(client);
+
+        client_set_state(client, DHCP_STATE_REQUESTING);
+        client->attempt = 0;
+
+        return event_reset_time_relative(client->event, &client->timeout_resend,
+                                         CLOCK_BOOTTIME,
+                                         0, 0,
+                                         client_timeout_resend, client,
+                                         client->event_priority, "dhcp4-resend-timer",
+                                         /* force_reset = */ true);
+}
+
 static int client_handle_forcerenew(sd_dhcp_client *client, DHCPMessage *force, size_t len) {
         int r;
 
@@ -1854,14 +1868,7 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, i
                 if (r < 0)
                         goto error;
 
-                client_set_state(client, DHCP_STATE_REQUESTING);
-                client->attempt = 0;
-
-                r = event_reset_time(client->event, &client->timeout_resend,
-                                     CLOCK_BOOTTIME,
-                                     0, 0,
-                                     client_timeout_resend, client,
-                                     client->event_priority, "dhcp4-resend-timer", true);
+                r = client_enter_requesting(client);
                 break;
 
         case DHCP_STATE_REBOOTING: