morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

network: use dns_name_hash_ops_free to manage domains

Browse Source
This commit is contained in:
Yu Watanabe
2025-06-14 00:08:41 +09:00
parent 38de38a70d
commit 2c154c54e1
3 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/networkd-dns.c
View File

@@ -200,7 +200,7 @@ int config_parse_domains(
}
OrderedSet **set = is_route ? &n->route_domains : &n->search_domains;
r = ordered_set_put_strdup(set, domain);
r = ordered_set_put_strdup_full(set, &dns_name_hash_ops_free, domain);
if (r == -EEXIST)
continue;
if (r < 0)

6
src/network/networkd-link-bus.c
View File

@@ -197,11 +197,13 @@ int bus_link_method_set_domains(sd_bus_message *message, void *userdata, sd_bus_
if (r < 0)
return r;
search_domains = ordered_set_new(&string_hash_ops_free);
/* The method accepts an empty strv, to override the domains set in .network.
* Hence, we need to explicitly allocate empty sets here. */
search_domains = ordered_set_new(&dns_name_hash_ops_free);
if (!search_domains)
return -ENOMEM;
route_domains = ordered_set_new(&string_hash_ops_free);
route_domains = ordered_set_new(&dns_name_hash_ops_free);
if (!route_domains)
return -ENOMEM;

13
src/network/networkd-state-file.c
View File

@@ -8,6 +8,7 @@
#include "sd-dhcp6-lease.h"
#include "alloc-util.h"
#include "dns-domain.h"
#include "dns-resolver-internal.h"
#include "errno-util.h"
#include "escape.h"
@@ -280,9 +281,9 @@ static int link_put_domains(Link *link, bool is_route, OrderedSet **s) {
use_domains = is_route ? USE_DOMAINS_ROUTE : USE_DOMAINS_YES;
if (link_domains)
return ordered_set_put_string_set(s, link_domains);
return ordered_set_put_string_set_full(s, &dns_name_hash_ops_free, link_domains);
r = ordered_set_put_string_set(s, network_domains);
r = ordered_set_put_string_set_full(s, &dns_name_hash_ops_free, network_domains);
if (r < 0)
return r;
@@ -292,14 +293,14 @@ static int link_put_domains(Link *link, bool is_route, OrderedSet **s) {
r = sd_dhcp_lease_get_domainname(link->dhcp_lease, &domainname);
if (r >= 0) {
r = ordered_set_put_strdup(s, domainname);
r = ordered_set_put_strdup_full(s, &dns_name_hash_ops_free, domainname);
if (r < 0)
return r;
}
r = sd_dhcp_lease_get_search_domains(link->dhcp_lease, &domains);
if (r >= 0) {
r = ordered_set_put_strdupv(s, domains);
r = ordered_set_put_strdupv_full(s, &dns_name_hash_ops_free, domains);
if (r < 0)
return r;
}
@@ -310,7 +311,7 @@ static int link_put_domains(Link *link, bool is_route, OrderedSet **s) {
r = sd_dhcp6_lease_get_domains(link->dhcp6_lease, &domains);
if (r >= 0) {
r = ordered_set_put_strdupv(s, domains);
r = ordered_set_put_strdupv_full(s, &dns_name_hash_ops_free, domains);
if (r < 0)
return r;
}
@@ -320,7 +321,7 @@ static int link_put_domains(Link *link, bool is_route, OrderedSet **s) {
NDiscDNSSL *a;
SET_FOREACH(a, link->ndisc_dnssl) {
r = ordered_set_put_strdup(s, ndisc_dnssl_domain(a));
r = ordered_set_put_strdup_full(s, &dns_name_hash_ops_free, ndisc_dnssl_domain(a));
if (r < 0)
return r;
}