From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Fri, 1 Oct 2021 12:34:59 +0000 (+0900)
Subject: network: address-generation: use in6_addr_hash_ops_free
X-Git-Tag: v250-rc1~552^2~8
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d207581fc580abbe7c335d12125f48cfe64a21ea;p=thirdparty%2Fsystemd.git

network: address-generation: use in6_addr_hash_ops_free

Also, downgrade error level, and caller logs the error.
---

diff --git a/src/network/networkd-address-generation.c b/src/network/networkd-address-generation.c
index 3b807dbcfa7..50ae8bcc9df 100644
--- a/src/network/networkd-address-generation.c
+++ b/src/network/networkd-address-generation.c
@@ -151,7 +151,7 @@ static int generate_stable_private_address(
 }
 
 int ndisc_router_generate_addresses(Link *link, struct in6_addr *prefix, uint8_t prefixlen, Set **ret) {
-        _cleanup_set_free_free_ Set *addresses = NULL;
+        _cleanup_set_free_ Set *addresses = NULL;
         struct in6_addr masked;
         IPv6Token *j;
         int r;
@@ -164,61 +164,53 @@ int ndisc_router_generate_addresses(Link *link, struct in6_addr *prefix, uint8_t
         masked = *prefix;
         in6_addr_mask(&masked, prefixlen);
 
-        addresses = set_new(&in6_addr_hash_ops);
-        if (!addresses)
-                return log_oom();
-
         SET_FOREACH(j, link->network->ndisc_tokens) {
-                _cleanup_free_ struct in6_addr *new_address = NULL;
+                struct in6_addr addr, *copy;
+
+                switch (j->type) {
+                case ADDRESS_GENERATION_STATIC:
+                        memcpy(addr.s6_addr, masked.s6_addr, 8);
+                        memcpy(addr.s6_addr + 8, j->address.s6_addr + 8, 8);
+                        break;
 
-                if (j->type == ADDRESS_GENERATION_PREFIXSTABLE
-                    && (in6_addr_is_null(&j->address) || in6_addr_equal(&j->address, &masked))) {
-                        struct in6_addr addr;
+                case ADDRESS_GENERATION_PREFIXSTABLE:
+                        if (in6_addr_is_set(&j->address) && !in6_addr_equal(&j->address, &masked))
+                                continue;
 
                         if (generate_stable_private_address(link, &NDISC_APP_ID, &masked, &addr) < 0)
                                 continue;
 
-                        new_address = newdup(struct in6_addr, &addr, 1);
-                        if (!new_address)
-                                return log_oom();
-
-                } else if (j->type == ADDRESS_GENERATION_STATIC) {
-                        new_address = new(struct in6_addr, 1);
-                        if (!new_address)
-                                return log_oom();
+                        break;
 
-                        memcpy(new_address->s6_addr, masked.s6_addr, 8);
-                        memcpy(new_address->s6_addr + 8, j->address.s6_addr + 8, 8);
+                default:
+                        assert_not_reached();
                 }
 
-                if (new_address) {
-                        r = set_put(addresses, new_address);
-                        if (r < 0)
-                                return log_link_error_errno(link, r, "Failed to store SLAAC address: %m");
-                        else if (r == 0)
-                                log_link_debug_errno(link, r, "Generated SLAAC address is duplicated, ignoring.");
-                        else
-                                TAKE_PTR(new_address);
-                }
+                copy = newdup(struct in6_addr, &addr, 1);
+                if (!copy)
+                        return -ENOMEM;
+
+                r = set_ensure_consume(&addresses, &in6_addr_hash_ops_free, copy);
+                if (r < 0)
+                        return r;
         }
 
-        /* fall back to EUI-64 if no tokens provided addresses */
+        /* fall back to EUI-64 if no token is provided */
         if (set_isempty(addresses)) {
                 struct in6_addr *addr;
 
                 addr = new(struct in6_addr, 1);
                 if (!addr)
-                        return log_oom();
+                        return -ENOMEM;
 
                 generate_eui64_address(link, &masked, addr);
 
-                r = set_consume(addresses, addr);
+                r = set_ensure_consume(&addresses, &in6_addr_hash_ops_free, addr);
                 if (r < 0)
-                        return log_link_error_errno(link, r, "Failed to store SLAAC address: %m");
+                        return r;
         }
 
         *ret = TAKE_PTR(addresses);
-
         return 0;
 }
 
diff --git a/src/network/networkd-ndisc.c b/src/network/networkd-ndisc.c
index 95a8ad1e14a..cb3117a58b6 100644
--- a/src/network/networkd-ndisc.c
+++ b/src/network/networkd-ndisc.c
@@ -381,7 +381,7 @@ static int ndisc_router_process_default(Link *link, sd_ndisc_router *rt) {
 
 static int ndisc_router_process_autonomous_prefix(Link *link, sd_ndisc_router *rt) {
         uint32_t lifetime_valid, lifetime_preferred;
-        _cleanup_set_free_free_ Set *addresses = NULL;
+        _cleanup_set_free_ Set *addresses = NULL;
         struct in6_addr prefix, *a;
         unsigned prefixlen;
         usec_t time_now;
@@ -432,7 +432,7 @@ static int ndisc_router_process_autonomous_prefix(Link *link, sd_ndisc_router *r
 
         r = ndisc_router_generate_addresses(link, &prefix, prefixlen, &addresses);
         if (r < 0)
-                return r;
+                return log_link_error_errno(link, r, "Failed to generate SLAAC addresses: %m");
 
         SET_FOREACH(a, addresses) {
                 _cleanup_(address_freep) Address *address = NULL;