diff options
| author | Andrew Zaborowski <andrew.zaborowski@intel.com> | 2022-10-04 00:28:43 +0200 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2022-10-04 12:42:41 -0500 |
| commit | fc7b878ecdb73e530b3ad71040ea89d471f6d6e2 (patch) | |
| tree | 7e425f4e16d86ceb617f97519690bb33db93d4bd | |
| parent | 39c7dd519f31d6142e3fdc2ebdf08458d04f4753 (diff) | |
dhcp6: Fix emitting LEASE_OBTAINED in stateless mode
Make sure we emit the LEASE_OBTAINED and not LEASE_RENEWED event after
obtaining a reply to an Information-Request. Only set
client->request_na in stateful mode so as not to require the NA in the
lease object when we're later validating it. Fix switching to BOUND
state after dhcp6_client_receive_reply() returns BOUND.
| -rw-r--r-- | ell/dhcp6.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ell/dhcp6.c b/ell/dhcp6.c index 2792ff29..3dbd0cd9 100644 --- a/ell/dhcp6.c +++ b/ell/dhcp6.c @@ -971,8 +971,9 @@ static void dhcp6_client_setup_lease(struct l_dhcp6_client *client, client->lease->start_time = timestamp; /* TODO: Emit IP_CHANGED if any addresses were removed / added */ - if (client->state == DHCP6_STATE_REQUESTING || - client->state == DHCP6_STATE_SOLICITING) + if (L_IN_SET(client->state, DHCP6_STATE_REQUESTING, + DHCP6_STATE_SOLICITING, + DHCP6_STATE_REQUESTING_INFORMATION)) event = L_DHCP6_CLIENT_EVENT_LEASE_OBTAINED; else event = L_DHCP6_CLIENT_EVENT_LEASE_RENEWED; @@ -1385,7 +1386,8 @@ static void dhcp6_client_rx_message(const void *data, size_t len, case DHCP6_STATE_BOUND: return; case DHCP6_STATE_REQUESTING_INFORMATION: - if (dhcp6_client_receive_reply(client, message, len) < 0) + r = dhcp6_client_receive_reply(client, message, len); + if (r < 0) return; break; @@ -1527,7 +1529,6 @@ LIB_EXPORT struct l_dhcp6_client *l_dhcp6_client_new(uint32_t ifindex) client->state = DHCP6_STATE_INIT; client->ifindex = ifindex; - client->request_na = true; client->icmp6 = l_icmp6_client_new(ifindex); l_icmp6_client_add_event_handler(client->icmp6, @@ -1803,6 +1804,8 @@ LIB_EXPORT bool l_dhcp6_client_start(struct l_dhcp6_client *client) else client_duid_generate_addr_plus_time(client); + client->request_na = !client->stateless; + if (!client->transport) { client->transport = _dhcp6_default_transport_new(client->ifindex, |