From: Yu Watanabe Date: Fri, 4 Feb 2022 01:17:44 +0000 (+0900) Subject: sd-dhcp6-client: rename ia -> ia_na, pd -> ia_pd in sd_dhcp6_lease X-Git-Tag: v251-rc1~291^2~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c999d38fabb7ea8b589348499698f973b3447a2;p=thirdparty%2Fsystemd.git sd-dhcp6-client: rename ia -> ia_na, pd -> ia_pd in sd_dhcp6_lease The previous naming is quite misleading. --- diff --git a/src/libsystemd-network/dhcp6-lease-internal.h b/src/libsystemd-network/dhcp6-lease-internal.h index 8ae2ecd6d94..0e3540d95ee 100644 --- a/src/libsystemd-network/dhcp6-lease-internal.h +++ b/src/libsystemd-network/dhcp6-lease-internal.h @@ -23,8 +23,8 @@ struct sd_dhcp6_lease { triple_timestamp timestamp; struct in6_addr server_address; - DHCP6IA ia; - DHCP6IA pd; + DHCP6IA ia_na; + DHCP6IA ia_pd; DHCP6Address *addr_iter; DHCP6Address *prefix_iter; diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c index f84cebcef49..ae7e3bf446b 100644 --- a/src/libsystemd-network/sd-dhcp6-client.c +++ b/src/libsystemd-network/sd-dhcp6-client.c @@ -799,8 +799,8 @@ static int client_send_message(sd_dhcp6_client *client, usec_t time_now) { assert(client->lease); r = client_append_common_options_in_managed_mode(client, &opt, &optlen, - client->lease->ia.addresses ? &client->lease->ia : NULL, - client->lease->pd.addresses ? &client->lease->pd : NULL, + client->lease->ia_na.addresses ? &client->lease->ia_na : NULL, + client->lease->ia_pd.addresses ? &client->lease->ia_pd : NULL, NULL); if (r < 0) return r; @@ -971,7 +971,7 @@ static int client_timeout_resend(sd_event_source *s, uint64_t usec, void *userda if (event_source_is_enabled(client->timeout_resend_expire) <= 0) { uint32_t expire = 0; - r = dhcp6_lease_ia_rebind_expire(&client->lease->ia, &expire); + r = dhcp6_lease_ia_rebind_expire(&client->lease->ia_na, &expire); if (r < 0) { client_stop(client, r); return 0; @@ -1159,16 +1159,16 @@ int client_parse_message( if (r < 0) continue; - if (lease->ia.addresses) { + if (lease->ia_na.addresses) { log_dhcp6_client(client, "Received duplicate matching IA_NA option, ignoring."); continue; } - lease->ia = ia; + lease->ia_na = ia; ia = (DHCP6IA) {}; - lt_t1 = MIN(lt_t1, be32toh(lease->ia.ia_na.lifetime_t1)); - lt_t2 = MIN(lt_t2, be32toh(lease->ia.ia_na.lifetime_t2)); + lt_t1 = MIN(lt_t1, be32toh(lease->ia_na.ia_na.lifetime_t1)); + lt_t2 = MIN(lt_t2, be32toh(lease->ia_na.ia_na.lifetime_t2)); break; } @@ -1186,16 +1186,16 @@ int client_parse_message( if (r < 0) continue; - if (lease->pd.addresses) { + if (lease->ia_pd.addresses) { log_dhcp6_client(client, "Received duplicate matching IA_PD option, ignoring."); continue; } - lease->pd = ia; + lease->ia_pd = ia; ia = (DHCP6IA) {}; - lt_t1 = MIN(lt_t1, be32toh(lease->pd.ia_pd.lifetime_t1)); - lt_t2 = MIN(lt_t2, be32toh(lease->pd.ia_pd.lifetime_t2)); + lt_t1 = MIN(lt_t1, be32toh(lease->ia_pd.ia_pd.lifetime_t1)); + lt_t2 = MIN(lt_t2, be32toh(lease->ia_pd.ia_pd.lifetime_t2)); break; } @@ -1267,17 +1267,17 @@ int client_parse_message( return log_dhcp6_client_errno(client, r, "%s has no server id", dhcp6_message_type_to_string(message->type)); - if (!lease->ia.addresses && !lease->pd.addresses) + if (!lease->ia_na.addresses && !lease->ia_pd.addresses) return log_dhcp6_client_errno(client, SYNTHETIC_ERRNO(EINVAL), "No IA_PD prefix or IA_NA address received. Ignoring."); - if (lease->ia.addresses) { - lease->ia.ia_na.lifetime_t1 = htobe32(lt_t1); - lease->ia.ia_na.lifetime_t2 = htobe32(lt_t2); + if (lease->ia_na.addresses) { + lease->ia_na.ia_na.lifetime_t1 = htobe32(lt_t1); + lease->ia_na.ia_na.lifetime_t2 = htobe32(lt_t2); } - if (lease->pd.addresses) { - lease->pd.ia_pd.lifetime_t1 = htobe32(lt_t1); - lease->pd.ia_pd.lifetime_t2 = htobe32(lt_t2); + if (lease->ia_pd.addresses) { + lease->ia_pd.ia_pd.lifetime_t1 = htobe32(lt_t1); + lease->ia_pd.ia_pd.lifetime_t2 = htobe32(lt_t2); } } @@ -1540,16 +1540,16 @@ static int client_get_lifetime(sd_dhcp6_client *client, uint32_t *lifetime_t1, assert_return(client, -EINVAL); assert_return(client->lease, -EINVAL); - if (FLAGS_SET(client->request_ia, DHCP6_REQUEST_IA_NA) && client->lease->ia.addresses) { - *lifetime_t1 = be32toh(client->lease->ia.ia_na.lifetime_t1); - *lifetime_t2 = be32toh(client->lease->ia.ia_na.lifetime_t2); + if (FLAGS_SET(client->request_ia, DHCP6_REQUEST_IA_NA) && client->lease->ia_na.addresses) { + *lifetime_t1 = be32toh(client->lease->ia_na.ia_na.lifetime_t1); + *lifetime_t2 = be32toh(client->lease->ia_na.ia_na.lifetime_t2); return 0; } - if (FLAGS_SET(client->request_ia, DHCP6_REQUEST_IA_PD) && client->lease->pd.addresses) { - *lifetime_t1 = be32toh(client->lease->pd.ia_pd.lifetime_t1); - *lifetime_t2 = be32toh(client->lease->pd.ia_pd.lifetime_t2); + if (FLAGS_SET(client->request_ia, DHCP6_REQUEST_IA_PD) && client->lease->ia_pd.addresses) { + *lifetime_t1 = be32toh(client->lease->ia_pd.ia_pd.lifetime_t1); + *lifetime_t2 = be32toh(client->lease->ia_pd.ia_pd.lifetime_t2); return 0; } diff --git a/src/libsystemd-network/sd-dhcp6-lease.c b/src/libsystemd-network/sd-dhcp6-lease.c index a47e6a01992..4f5b5385b28 100644 --- a/src/libsystemd-network/sd-dhcp6-lease.c +++ b/src/libsystemd-network/sd-dhcp6-lease.c @@ -193,7 +193,7 @@ int sd_dhcp6_lease_get_address(sd_dhcp6_lease *lease, struct in6_addr *addr, void sd_dhcp6_lease_reset_address_iter(sd_dhcp6_lease *lease) { if (lease) - lease->addr_iter = lease->ia.addresses; + lease->addr_iter = lease->ia_na.addresses; } int sd_dhcp6_lease_get_pd(sd_dhcp6_lease *lease, struct in6_addr *prefix, @@ -224,7 +224,7 @@ int sd_dhcp6_lease_get_pd(sd_dhcp6_lease *lease, struct in6_addr *prefix, void sd_dhcp6_lease_reset_pd_prefix_iter(sd_dhcp6_lease *lease) { if (lease) - lease->prefix_iter = lease->pd.addresses; + lease->prefix_iter = lease->ia_pd.addresses; } int dhcp6_lease_add_dns(sd_dhcp6_lease *lease, const uint8_t *optval, size_t optlen) { @@ -402,8 +402,8 @@ static sd_dhcp6_lease *dhcp6_lease_free(sd_dhcp6_lease *lease) { free(lease->clientid); free(lease->serverid); - dhcp6_lease_free_ia(&lease->ia); - dhcp6_lease_free_ia(&lease->pd); + dhcp6_lease_free_ia(&lease->ia_na); + dhcp6_lease_free_ia(&lease->ia_pd); free(lease->dns); free(lease->fqdn); strv_free(lease->domains); @@ -425,7 +425,7 @@ int dhcp6_lease_new(sd_dhcp6_lease **ret) { lease->n_ref = 1; - LIST_HEAD_INIT(lease->ia.addresses); + LIST_HEAD_INIT(lease->ia_na.addresses); *ret = lease; return 0; diff --git a/src/libsystemd-network/test-dhcp6-client.c b/src/libsystemd-network/test-dhcp6-client.c index bcd0134a8d5..274109d13a8 100644 --- a/src/libsystemd-network/test-dhcp6-client.c +++ b/src/libsystemd-network/test-dhcp6-client.c @@ -527,7 +527,7 @@ static void test_advertise_option(sd_event *e) { val = htobe32(120); assert_se(!memcmp(optval + 8, &val, sizeof(val))); - assert_se(dhcp6_option_parse_ia(NULL, iaid, optcode, optlen, optval, &lease->ia) >= 0); + assert_se(dhcp6_option_parse_ia(NULL, iaid, optcode, optlen, optval, &lease->ia_na) >= 0); break; } @@ -708,7 +708,7 @@ static void test_client_verify_request(DHCP6Message *request, size_t len) { assert_se(!memcmp(optval + 8, &val, sizeof(val))); /* Then, this should refuse all addresses. */ - assert_se(dhcp6_option_parse_ia(NULL, test_iaid, optcode, optlen, optval, &lease->ia) == -ENODATA); + assert_se(dhcp6_option_parse_ia(NULL, test_iaid, optcode, optlen, optval, &lease->ia_na) == -ENODATA); break;