Merge pull request #28976 from yuwata/network-ndisc-drop-on-zero-lifetime

network/ndisc: also drop configurations with infinite lifetime on RA …

diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index ae267ce5ca5131bed1e5b790920286b4ed5dc799..8e66d83fbb1749c249c55b806ea72600253010fd 100644 (file)
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -885,6 +885,9 @@ static int ndisc_router_process_captive_portal(Link *link, sd_ndisc_router *rt)
         if (r < 0)
                 return log_link_warning_errno(link, r, "Failed to get router address from RA: %m");
 
+        /* RFC 4861 section 4.2. states that the lifetime in the message header should be used only for the
+         * default gateway, but the captive portal option does not have a lifetime field, hence, we use the
+         * main lifetime for the portal. */
         r = sd_ndisc_router_get_lifetime(rt, &lifetime_sec);
         if (r < 0)
                 return log_link_warning_errno(link, r, "Failed to get lifetime of RA message: %m");
@@ -909,7 +912,19 @@ static int ndisc_router_process_captive_portal(Link *link, sd_ndisc_router *rt)
         if (!in_charset(captive_portal, URI_VALID))
                 return log_link_warning_errno(link, SYNTHETIC_ERRNO(EBADMSG), "Received invalid captive portal, ignoring.");
 
-        exist = set_get(link->ndisc_captive_portals, &(NDiscCaptivePortal) { .captive_portal = captive_portal });
+        if (lifetime_usec == 0) {
+                /* Drop the portal with zero lifetime. */
+                ndisc_captive_portal_free(set_remove(link->ndisc_captive_portals,
+                                                     &(NDiscCaptivePortal) {
+                                                             .captive_portal = captive_portal,
+                                                     }));
+                return 0;
+        }
+
+        exist = set_get(link->ndisc_captive_portals,
+                        &(NDiscCaptivePortal) {
+                                .captive_portal = captive_portal,
+                        });
         if (exist) {
                 /* update existing entry */
                 exist->router = router;
@@ -1004,7 +1019,7 @@ static int ndisc_router_process_options(Link *link, sd_ndisc_router *rt) {
         }
 }
 
-static int ndisc_drop_outdated(Link *link, usec_t timestamp_usec, const struct in6_addr *router) {
+static int ndisc_drop_outdated(Link *link, usec_t timestamp_usec) {
         bool updated = false;
         NDiscDNSSL *dnssl;
         NDiscRDNSS *rdnss;
@@ -1028,9 +1043,6 @@ static int ndisc_drop_outdated(Link *link, usec_t timestamp_usec, const struct i
                 if (route->lifetime_usec >= timestamp_usec)
                         continue; /* the route is still valid */
 
-                if (router && !in6_addr_equal(&route->provider.in6, router))
-                        continue;
-
                 k = route_remove_and_drop(route);
                 if (k < 0)
                         r = log_link_warning_errno(link, k, "Failed to remove outdated SLAAC route, ignoring: %m");
@@ -1043,9 +1055,6 @@ static int ndisc_drop_outdated(Link *link, usec_t timestamp_usec, const struct i
                 if (address->lifetime_valid_usec >= timestamp_usec)
                         continue; /* the address is still valid */
 
-                if (router && !in6_addr_equal(&address->provider.in6, router))
-                        continue;
-
                 k = address_remove_and_drop(address);
                 if (k < 0)
                         r = log_link_warning_errno(link, k, "Failed to remove outdated SLAAC address, ignoring: %m");
@@ -1055,9 +1064,6 @@ static int ndisc_drop_outdated(Link *link, usec_t timestamp_usec, const struct i
                 if (rdnss->lifetime_usec >= timestamp_usec)
                         continue; /* the DNS server is still valid */
 
-                if (router && !in6_addr_equal(&rdnss->router, router))
-                        continue;
-
                 free(set_remove(link->ndisc_rdnss, rdnss));
                 updated = true;
         }
@@ -1066,9 +1072,6 @@ static int ndisc_drop_outdated(Link *link, usec_t timestamp_usec, const struct i
                 if (dnssl->lifetime_usec >= timestamp_usec)
                         continue; /* the DNS domain is still valid */
 
-                if (router && !in6_addr_equal(&dnssl->router, router))
-                        continue;
-
                 free(set_remove(link->ndisc_dnssl, dnssl));
                 updated = true;
         }
@@ -1077,9 +1080,6 @@ static int ndisc_drop_outdated(Link *link, usec_t timestamp_usec, const struct i
                 if (cp->lifetime_usec >= timestamp_usec)
                         continue; /* the captive portal is still valid */
 
-                if (router && !in6_addr_equal(&cp->router, router))
-                        continue;
-
                 ndisc_captive_portal_free(set_remove(link->ndisc_captive_portals, cp));
                 updated = true;
         }
@@ -1100,7 +1100,7 @@ static int ndisc_expire_handler(sd_event_source *s, uint64_t usec, void *userdat
 
         assert_se(sd_event_now(link->manager->event, CLOCK_BOOTTIME, &now_usec) >= 0);
 
-        (void) ndisc_drop_outdated(link, now_usec, NULL);
+        (void) ndisc_drop_outdated(link, now_usec);
         (void) ndisc_setup_expire(link);
         return 0;
 }
@@ -1201,7 +1201,6 @@ static int ndisc_start_dhcp6_client(Link *link, sd_ndisc_router *rt) {
 }
 
 static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
-        uint16_t router_lifetime_sec;
         struct in6_addr router;
         usec_t timestamp_usec;
         int r;
@@ -1234,28 +1233,12 @@ static int ndisc_router_handler(Link *link, sd_ndisc_router *rt) {
                 log_link_debug(link, "Received RA without timestamp, ignoring.");
                 return 0;
         }
-
-        r = ndisc_drop_outdated(link, timestamp_usec, NULL);
         if (r < 0)
                 return r;
 
-        r = sd_ndisc_router_get_lifetime(rt, &router_lifetime_sec);
+        r = ndisc_drop_outdated(link, timestamp_usec);
         if (r < 0)
-                return log_link_warning_errno(link, r, "Failed to get lifetime of RA message: %m");
-
-         /* https://datatracker.ietf.org/doc/html/rfc4861
-          * Router Lifetime: A Lifetime of 0 indicates that the router is not a default router
-          * and SHOULD NOT appear on the default router list.
-          */
-        if (router_lifetime_sec == 0) {
-                log_link_debug(link, "Received RA with lifetime = 0, dropping configurations.");
-
-                r = ndisc_drop_outdated(link, USEC_INFINITY, &router);
-                if (r < 0)
-                        log_link_warning_errno(link, r, "Failed to process RA with zero lifetime, ignoring: %m");
-
-                return 0;
-        }
+                return r;
 
         r = ndisc_start_dhcp6_client(link, rt);
         if (r < 0)