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

resolve: use JSON_BUILD_PAIR_TRISTATE_NON_NULL for default_route

Browse Source
This commit is contained in:
Yu Watanabe
2025-11-07 01:21:56 +09:00
parent a45bc4a1be
commit a37239d05f
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/resolve/resolved-manager.c
View File

@@ -2156,9 +2156,7 @@ static int dns_configuration_json_append(
JSON_BUILD_PAIR_STRING_NON_EMPTY("ifname", ifname),
SD_JSON_BUILD_PAIR_CONDITION(ifindex > 0, "ifindex", SD_JSON_BUILD_UNSIGNED(ifindex)),
JSON_BUILD_PAIR_STRING_NON_EMPTY("delegate", delegate),
JSON_BUILD_PAIR_CONDITION_BOOLEAN(ifindex > 0 || !!delegate,
"defaultRoute",
default_route > 0),
JSON_BUILD_PAIR_TRISTATE_NON_NULL("defaultRoute", default_route),
JSON_BUILD_PAIR_VARIANT_NON_NULL("currentServer", current_dns_server_json),
JSON_BUILD_PAIR_VARIANT_NON_NULL("servers", dns_servers_json),
JSON_BUILD_PAIR_VARIANT_NON_NULL("fallbackServers", fallback_dns_servers_json),
@@ -2189,7 +2187,7 @@ static int global_dns_configuration_json_append(Manager *m, sd_json_variant **co
/* ifname = */ NULL,
/* ifindex = */ 0,
/* delegate = */ NULL,
/* default_route = */ 0,
/* default_route = */ -1,
manager_get_dns_server(m),
m->dns_servers,
m->fallback_dns_servers,
@@ -2275,7 +2273,7 @@ static int delegate_dns_configuration_json_append(DnsDelegate *d, sd_json_varian
/* ifname = */ NULL,
/* ifindex = */ 0,
d->id,
d->default_route,
d->default_route > 0, /* Defaults to false. See dns_scope_is_default_route(). */
dns_delegate_get_dns_server(d),
d->dns_servers,
/* fallback_dns_servers = */ NULL,