SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sd-dhcp6-client: prohibit spurious state transition

Browse Source 
Previously, `client_set_state(client, DHCP6_STATE_STOPPED)` might make
the client enter the SOLICIT state.
This commit is contained in:
Yu Watanabe
2022-02-14 14:45:14 +09:00
parent 220a88ca75
commit c2c878d806
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/libsystemd-network/sd-dhcp6-client.c
+5 -9
View File
@@ -1114,8 +1114,11 @@ static int client_process_information(
sd_dhcp6_lease_unref(client->lease);
client->lease = TAKE_PTR(lease);
(void) event_source_disable(client->timeout_resend);
client->state = DHCP6_STATE_STOPPED;
client_notify(client, SD_DHCP6_CLIENT_EVENT_INFORMATION_REQUEST);
return client_set_state(client, DHCP6_STATE_STOPPED);
return 0;
}
static int client_process_reply(
@@ -1355,14 +1358,6 @@ static int client_set_state(sd_dhcp6_client *client, DHCP6State state) {
}
switch (state) {
case DHCP6_STATE_STOPPED:
if (client->state == DHCP6_STATE_INFORMATION_REQUEST) {
client->state = DHCP6_STATE_STOPPED;
return 0;
}
_fallthrough_;
case DHCP6_STATE_SOLICITATION:
client->state = DHCP6_STATE_SOLICITATION;
@@ -1377,6 +1372,7 @@ static int client_set_state(sd_dhcp6_client *client, DHCP6State state) {
break;
case DHCP6_STATE_STOPPED:
case DHCP6_STATE_BOUND:
default:
assert_not_reached();
src/libsystemd-network/test-dhcp6-client.c
-1
View File
@@ -845,7 +845,6 @@ static void test_client_information_cb(sd_dhcp6_client *client, int event, void
assert_se(sd_dhcp6_lease_get_ntp_addrs(lease, &addrs) == 1);
assert_se(!memcmp(addrs, &msg_advertise[159], 16));
assert_se(sd_dhcp6_client_set_information_request(client, false) == -EBUSY);
assert_se(sd_dhcp6_client_set_callback(client, NULL, e) >= 0);
assert_se(sd_dhcp6_client_stop(client) >= 0);
assert_se(sd_dhcp6_client_set_information_request(client, false) >= 0);