SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

network: several follow-ups for recent changes (#38298)

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2025-07-23 17:16:17 +02:00
committed by GitHub
parent 7199811942 5bd37b352c
commit 5d9d774c8a
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-json.c
+1 -4
View File
@@ -846,14 +846,11 @@ static int sip_append_json(Link *link, sd_json_variant **v) {
union in_addr_union s;
int n_sip;
n_sip = sd_dhcp_lease_get_sip(link->dhcp_lease, &sip);
if (n_sip <= 0)
return 0;
r = sd_dhcp_lease_get_server_identifier(link->dhcp_lease, &s.in);
if (r < 0)
return r;
n_sip = sd_dhcp_lease_get_sip(link->dhcp_lease, &sip);
for (int i = 0; i < n_sip; i++) {
r = server_append_json_one_addr(AF_INET,
&(union in_addr_union) { .in = sip[i], },
src/network/networkd-state-file.c
+2 -5
View File
@@ -153,7 +153,7 @@ static int link_put_dns(Link *link, OrderedSet **s) {
sd_dns_resolver *resolvers;
r = sd_dhcp6_lease_get_dnr(link->dhcp6_lease, &resolvers);
if (r >= 0 ) {
if (r >= 0) {
struct in_addr_full **dot_servers;
size_t n = 0;
CLEANUP_ARRAY(dot_servers, n, in_addr_full_array_free);
@@ -643,10 +643,7 @@ static void serialize_resolvers(
int r;
r = sd_dhcp6_lease_get_dnr(lease6, &resolvers);
if (r < 0 && r != -ENODATA)
log_warning_errno(r, "Failed to get DNR from DHCPv6 lease, ignoring: %m");
if (r > 0) {
if (r >= 0) {
r = dns_resolvers_to_dot_strv(resolvers, r, &names);
if (r < 0)
return (void) log_warning_errno(r, "Failed to get DoT servers from DHCPv6 DNR, ignoring: %m");