From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Tue, 23 Apr 2024 04:14:21 +0000 (+0900)
Subject: sd-radv: use in6_addr_prefix_intersect()
X-Git-Tag: v256-rc1~34^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c7c56724a5d7cc2b6b0d9d5f95b1055811014843;p=thirdparty%2Fsystemd.git

sd-radv: use in6_addr_prefix_intersect()
---

diff --git a/src/libsystemd-network/sd-radv.c b/src/libsystemd-network/sd-radv.c
index 6dc4f9be29b..b8c5d1fbfd1 100644
--- a/src/libsystemd-network/sd-radv.c
+++ b/src/libsystemd-network/sd-radv.c
@@ -626,19 +626,16 @@ int sd_radv_add_prefix(sd_radv *ra, sd_radv_prefix *p) {
         const char *addr_p = IN6_ADDR_PREFIX_TO_STRING(&p->opt.in6_addr, p->opt.prefixlen);
 
         LIST_FOREACH(prefix, cur, ra->prefixes) {
-                r = in_addr_prefix_intersect(AF_INET6,
-                                             (const union in_addr_union*) &cur->opt.in6_addr,
-                                             cur->opt.prefixlen,
-                                             (const union in_addr_union*) &p->opt.in6_addr,
-                                             p->opt.prefixlen);
+                r = in6_addr_prefix_intersect(&cur->opt.in6_addr, cur->opt.prefixlen,
+                                              &p->opt.in6_addr, p->opt.prefixlen);
                 if (r < 0)
                         return r;
                 if (r == 0)
-                        continue;
+                        continue; /* no intersection */
 
                 if (cur->opt.prefixlen == p->opt.prefixlen) {
                         found = cur;
-                        break;
+                        break; /* same prefix */
                 }
 
                 return log_radv_errno(ra, SYNTHETIC_ERRNO(EEXIST),