From c9e2c2dae30dd3f7d8b5b38906944673ba6a551d Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Mon, 25 Oct 2021 04:32:05 +0900 Subject: [PATCH] network: radv: shorten default lifetime of prefix, route prefix, DNS, and domains See draft-ietf-6man-slaac-renum-02 section 4.1.1. --- man/systemd.network.xml | 14 ++++++-------- src/network/networkd-network.c | 2 +- src/network/networkd-radv.c | 10 +++++----- 3 files changed, 12 insertions(+), 14 deletions(-) diff --git a/man/systemd.network.xml b/man/systemd.network.xml index b263220e0ce..f7c4e3e49e8 100644 --- a/man/systemd.network.xml +++ b/man/systemd.network.xml @@ -2682,7 +2682,7 @@ Token=prefixstable:2002:da8:1:: Lifetime in seconds for the DNS server addresses listed in DNS= and search domains listed in Domains=. Defaults to - 604800 seconds (one week). + 3600 seconds (one hour). @@ -2721,10 +2721,9 @@ Token=prefixstable:2002:da8:1:: PreferredLifetimeSec= ValidLifetimeSec= - Preferred and valid lifetimes for the prefix measured in - seconds. PreferredLifetimeSec= defaults to 604800 - seconds (one week) and ValidLifetimeSec= defaults - to 2592000 seconds (30 days). + Preferred and valid lifetimes for the prefix measured in seconds. + PreferredLifetimeSec= defaults to 1800 seconds (30 minutes) and + ValidLifetimeSec= defaults to 3600 seconds (one hour). @@ -2775,9 +2774,8 @@ Token=prefixstable:2002:da8:1:: LifetimeSec= - Lifetime for the route prefix measured in - seconds. LifetimeSec= defaults to 604800 seconds (one week). - + Lifetime for the route prefix measured in seconds. + LifetimeSec= defaults to 3600 seconds (one hour). diff --git a/src/network/networkd-network.c b/src/network/networkd-network.c index d41253c3881..1c00b986603 100644 --- a/src/network/networkd-network.c +++ b/src/network/networkd-network.c @@ -423,7 +423,7 @@ int network_load_one(Manager *manager, OrderedHashmap **networks, const char *fi .dhcp_server_emit_timezone = true, .router_lifetime_usec = RADV_DEFAULT_ROUTER_LIFETIME_USEC, - .router_dns_lifetime_usec = 7 * USEC_PER_DAY, + .router_dns_lifetime_usec = RADV_DEFAULT_VALID_LIFETIME_USEC, .router_emit_dns = true, .router_emit_domains = true, diff --git a/src/network/networkd-radv.c b/src/network/networkd-radv.c index eda44e191ee..7b98251570a 100644 --- a/src/network/networkd-radv.c +++ b/src/network/networkd-radv.c @@ -105,8 +105,8 @@ static int prefix_new_static(Network *network, const char *filename, unsigned se .network = network, .section = TAKE_PTR(n), - .preferred_lifetime = 7 * USEC_PER_DAY, - .valid_lifetime = 30 * USEC_PER_DAY, + .preferred_lifetime = RADV_DEFAULT_PREFERRED_LIFETIME_USEC, + .valid_lifetime = RADV_DEFAULT_VALID_LIFETIME_USEC, .onlink = true, .address_auto_configuration = true, }; @@ -163,7 +163,7 @@ static int route_prefix_new_static(Network *network, const char *filename, unsig .network = network, .section = TAKE_PTR(n), - .lifetime = 7 * USEC_PER_DAY, + .lifetime = RADV_DEFAULT_VALID_LIFETIME_USEC, }; r = hashmap_ensure_put(&network->route_prefixes_by_section, &network_config_hash_ops, prefix->section, prefix); @@ -669,11 +669,11 @@ int radv_add_prefix( if (r < 0) return r; - r = sd_radv_prefix_set_preferred_lifetime(p, lifetime_preferred_usec, lifetime_preferred_usec); + r = sd_radv_prefix_set_preferred_lifetime(p, RADV_DEFAULT_PREFERRED_LIFETIME_USEC, lifetime_preferred_usec); if (r < 0) return r; - r = sd_radv_prefix_set_valid_lifetime(p, lifetime_valid_usec, lifetime_valid_usec); + r = sd_radv_prefix_set_valid_lifetime(p, RADV_DEFAULT_VALID_LIFETIME_USEC, lifetime_valid_usec); if (r < 0) return r; -- 2.47.3