]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
sd-ndisc: allow to call sd_ndisc_router_get_lifetime() with NULL for 'ret'
authorYu Watanabe <watanabe.yu+github@gmail.com>
Mon, 19 Feb 2024 01:00:33 +0000 (10:00 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Tue, 20 Feb 2024 06:31:39 +0000 (15:31 +0900)
src/libsystemd-network/sd-ndisc-router.c

index fa22368c8f012df7b058ac7dffff2072c3ce88a8..536ee8cdf22f801cacaa284cf52e753f1905e4e5 100644 (file)
@@ -303,10 +303,11 @@ int sd_ndisc_router_get_flags(sd_ndisc_router *rt, uint64_t *ret) {
 
 int sd_ndisc_router_get_lifetime(sd_ndisc_router *rt, uint64_t *ret) {
         assert_return(rt, -EINVAL);
-        assert_return(ret, -EINVAL);
 
-        *ret = rt->lifetime_usec;
-        return 0;
+        if (ret)
+                *ret = rt->lifetime_usec;
+
+        return rt->lifetime_usec > 0; /* Indicate if the router is still valid or not. */
 }
 
 int sd_ndisc_router_get_preference(sd_ndisc_router *rt, unsigned *ret) {