shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-11 09:18:07 +03:00
Code

Merge pull request #34848 from yuwata/network-dhcpv6-do-not-request-ia-pd-on-info-req

Browse Source 
network/dhcp6: do not request IA_PD on information requesting mode
This commit is contained in:
Lennart Poettering 2024-10-22 18:00:12 +02:00 committed by GitHub
commit 119252343e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 42 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
man/systemd.network.xml
View File

@ -6275,13 +6275,19 @@ DHCP=ipv6
#SubnetId=0
#Announce=no
# If the upstream network does not provides any Router Advertisement (RA) messages
# or provides an RA with both Managed and Other-information bits unset, then
# uncomment the lines below.
# If the upstream network does not provides any Router Advertisement (RA) messages,
# then uncomment the lines below to make the DHCPv6 client forcibly started in the
# manageed mode.
#[Network]
#IPv6AcceptRA=no
#[DHCPv6]
#WithoutRA=solicit</programlisting>
#WithoutRA=solicit
# If the upstream network provides Router Advertisement (RA) messages with the
# Managed bit unset, then uncomment the lines below to make the DHCPv6 client
# forcibly started in the managed mode when an RA is received.
#[IPv6AcceptRA]
#DHCPv6Client=always</programlisting>
<programlisting># /etc/systemd/network/55-dhcpv6-pd-downstream.network
[Match]

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

@ -767,14 +767,6 @@ int dhcp6_client_send_message(sd_dhcp6_client *client) {
switch (client->state) {
case DHCP6_STATE_INFORMATION_REQUEST:
/* RFC 7084 section 4.2 (https://datatracker.ietf.org/doc/html/rfc7084#section-4.2)
* WPD-4: By default, the IPv6 CE router MUST initiate DHCPv6 prefix delegation when either
* the M or O flags are set to 1 in a received Router Advertisement (RA) message. */
if (FLAGS_SET(client->request_ia, DHCP6_REQUEST_IA_PD)) {
r = dhcp6_option_append_ia(&buf, &offset, (client->lease ? client->lease->ia_pd : NULL) ?: &client->ia_pd);
if (r < 0)
return r;
}
break;
case DHCP6_STATE_SOLICITATION:

40
src/libsystemd-network/sd-dhcp6-lease.c
View File

@ -72,32 +72,6 @@ static void dhcp6_lease_set_lifetime(sd_dhcp6_lease *lease) {
lease->lifetime_t2 = t2;
}
static void dhcp6_client_set_information_refresh_time(sd_dhcp6_client *client, sd_dhcp6_lease *lease, usec_t irt) {
usec_t t1 = USEC_INFINITY, t2 = USEC_INFINITY, min_valid_lt = USEC_INFINITY;
if (lease->ia_pd) {
t1 = be32_sec_to_usec(lease->ia_pd->header.lifetime_t1, /* max_as_infinity = */ true);
t2 = be32_sec_to_usec(lease->ia_pd->header.lifetime_t2, /* max_as_infinity = */ true);
LIST_FOREACH(addresses, a, lease->ia_pd->addresses)
min_valid_lt = MIN(min_valid_lt, be32_sec_to_usec(a->iapdprefix.lifetime_valid, /* max_as_infinity = */ true));
if (t2 == 0 || t2 > min_valid_lt) {
/* If T2 is zero or longer than the minimum valid lifetime of the prefixes,
* then adjust lifetime with it. */
t1 = min_valid_lt / 2;
t2 = min_valid_lt / 10 * 8;
}
/* Adjust the received information refresh time with T1. */
irt = MIN(irt, t1);
}
client->information_refresh_time_usec = MAX(irt, IRT_MINIMUM);
log_dhcp6_client(client, "New information request will be refused in %s.",
FORMAT_TIMESPAN(client->information_refresh_time_usec, USEC_PER_SEC));
}
#define DEFINE_GET_TIME_FUNCTIONS(name, val) \
int sd_dhcp6_lease_get_##name( \
sd_dhcp6_lease *lease, \
@ -888,6 +862,11 @@ static int dhcp6_lease_parse_message(
case SD_DHCP6_OPTION_IA_PD: {
_cleanup_(dhcp6_ia_freep) DHCP6IA *ia = NULL;
if (client->state == DHCP6_STATE_INFORMATION_REQUEST) {
log_dhcp6_client(client, "Ignoring IA PD option in information requesting mode.");
break;
}
r = dhcp6_option_parse_ia(client, client->ia_pd.header.id, optcode, optlen, optval, &ia);
if (r == -ENOMEM)
return log_oom_debug();
@ -993,9 +972,12 @@ static int dhcp6_lease_parse_message(
"The client ID in %s message does not match. Ignoring.",
dhcp6_message_type_to_string(message->type));
if (client->state == DHCP6_STATE_INFORMATION_REQUEST)
dhcp6_client_set_information_refresh_time(client, lease, irt);
else {
if (client->state == DHCP6_STATE_INFORMATION_REQUEST) {
client->information_refresh_time_usec = MAX(irt, IRT_MINIMUM);
log_dhcp6_client(client, "New information request will be refused in %s.",
FORMAT_TIMESPAN(client->information_refresh_time_usec, USEC_PER_SEC));
} else {
r = dhcp6_lease_get_serverid(lease, NULL, NULL);
if (r < 0)
return log_dhcp6_client_errno(client, r, "%s has no server id",

5
src/libsystemd-network/test-dhcp6-client.c
View File

@ -490,11 +490,6 @@ static const uint8_t msg_information_request[] = {
DHCP6_MESSAGE_INFORMATION_REQUEST,
/* Transaction ID */
0x0f, 0xb4, 0xe5,
/* IA_PD */
0x00, SD_DHCP6_OPTION_IA_PD, 0x00, 0x0c,
IA_ID_BYTES,
0x00, 0x00, 0x00, 0x00, /* lifetime T1 */
0x00, 0x00, 0x00, 0x00, /* lifetime T2 */
/* MUD URL */
/* ORO */
0x00, SD_DHCP6_OPTION_ORO, 0x00, 0x0c,

23
src/network/networkd-dhcp6.c
View File

@ -297,7 +297,7 @@ static int dhcp6_request_hostname(Link *link) {
return 0;
}
static int dhcp6_lease_acquired(sd_dhcp6_client *client, Link *link) {
static int dhcp6_lease_ip_acquired(sd_dhcp6_client *client, Link *link) {
_cleanup_(sd_dhcp6_lease_unrefp) sd_dhcp6_lease *lease_old = NULL;
sd_dhcp6_lease *lease;
int r;
@ -341,6 +341,22 @@ static int dhcp6_lease_acquired(sd_dhcp6_client *client, Link *link) {
link_set_state(link, LINK_STATE_CONFIGURING);
link_check_ready(link);
return 0;
}
static int dhcp6_lease_information_acquired(sd_dhcp6_client *client, Link *link) {
sd_dhcp6_lease *lease;
int r;
assert(client);
assert(link);
r = sd_dhcp6_client_get_lease(client, &lease);
if (r < 0)
return log_link_error_errno(link, r, "Failed to get DHCPv6 lease: %m");
unref_and_replace_full(link->dhcp6_lease, lease, sd_dhcp6_lease_ref, sd_dhcp6_lease_unref);
link_dirty(link);
return 0;
}
@ -385,8 +401,11 @@ static void dhcp6_handler(sd_dhcp6_client *client, int event, void *userdata) {
break;
case SD_DHCP6_CLIENT_EVENT_IP_ACQUIRE:
r = dhcp6_lease_ip_acquired(client, link);
break;
case SD_DHCP6_CLIENT_EVENT_INFORMATION_REQUEST:
r = dhcp6_lease_acquired(client, link);
r = dhcp6_lease_information_acquired(client, link);
break;
default: