diff options
| -rw-r--r-- | src/libsystemd-network/sd-dhcp6-client.c | 14 | ||||
| -rw-r--r-- | src/libsystemd-network/test-dhcp6-client.c | 1 |
2 files changed, 5 insertions, 10 deletions
diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index d88b7ec236..0ca1be86b6 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -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(); diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c index 03862bd5ac..60bb7f0ca8 100644 --- a/src/libsystemd-network/test-dhcp6-client.c +++ b/src/libsystemd-network/test-dhcp6-client.c @@ -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); |