shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-26 14:04:03 +03:00
Code

sd-dhcp6-client: make state transition stricter

Browse Source
This commit is contained in:
Yu Watanabe 2022-02-07 01:24:01 +09:00
parent c2c878d806
commit f814cd80de
1 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/libsystemd-network/sd-dhcp6-client.c
View File

@ -1328,7 +1328,26 @@ static int client_set_state(sd_dhcp6_client *client, DHCP6State state) {
assert_return(client, -EINVAL); assert_return(client, -EINVAL);
assert_return(client->event, -EINVAL); assert_return(client->event, -EINVAL);
assert_return(client->ifindex > 0, -EINVAL); assert_return(client->ifindex > 0, -EINVAL);
assert_return(client->state != state, -EINVAL);
switch (state) {
case DHCP6_STATE_INFORMATION_REQUEST:
case DHCP6_STATE_SOLICITATION:
assert(client->state == DHCP6_STATE_STOPPED);
break;
case DHCP6_STATE_REQUEST:
assert(client->state == DHCP6_STATE_SOLICITATION);
break;
case DHCP6_STATE_RENEW:
assert(client->state == DHCP6_STATE_BOUND);
break;
case DHCP6_STATE_REBIND:
assert(IN_SET(client->state, DHCP6_STATE_BOUND, DHCP6_STATE_RENEW));
break;
case DHCP6_STATE_STOPPED:
case DHCP6_STATE_BOUND:
default:
assert_not_reached();
}
(void) event_source_disable(client->timeout_resend_expire); (void) event_source_disable(client->timeout_resend_expire);
(void) event_source_disable(client->timeout_resend); (void) event_source_disable(client->timeout_resend);
@ -1357,27 +1376,7 @@ static int client_set_state(sd_dhcp6_client *client, DHCP6State state) {
goto error; goto error;
} }
switch (state) { client->state = state;
case DHCP6_STATE_SOLICITATION:
client->state = DHCP6_STATE_SOLICITATION;
break;
case DHCP6_STATE_INFORMATION_REQUEST:
case DHCP6_STATE_REQUEST:
case DHCP6_STATE_RENEW:
case DHCP6_STATE_REBIND:
client->state = state;
break;
case DHCP6_STATE_STOPPED:
case DHCP6_STATE_BOUND:
default:
assert_not_reached();
}
client->transaction_id = random_u32() & htobe32(0x00ffffff); client->transaction_id = random_u32() & htobe32(0x00ffffff);
client->transaction_start = time_now; client->transaction_start = time_now;