Skip to content

Commit 8e560cd

Browse files
authored
Merge pull request systemd#21532 from yuwata/network-json-more
network: add more json entries
2 parents 08e70b4 + b707e43 commit 8e560cd

File tree

6 files changed

+754
-17
lines changed

6 files changed

+754
-17
lines changed

src/libsystemd-network/sd-dhcp-lease.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,12 +105,13 @@ int sd_dhcp_lease_get_servers(
105105
assert_return(lease, -EINVAL);
106106
assert_return(what >= 0, -EINVAL);
107107
assert_return(what < _SD_DHCP_LEASE_SERVER_TYPE_MAX, -EINVAL);
108-
assert_return(addr, -EINVAL);
109108

110109
if (lease->servers[what].size <= 0)
111110
return -ENODATA;
112111

113-
*addr = lease->servers[what].addr;
112+
if (addr)
113+
*addr = lease->servers[what].addr;
114+
114115
return (int) lease->servers[what].size;
115116
}
116117

src/libsystemd-network/sd-dhcp6-lease.c

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -239,12 +239,13 @@ int dhcp6_lease_add_dns(sd_dhcp6_lease *lease, const uint8_t *optval, size_t opt
239239

240240
int sd_dhcp6_lease_get_dns(sd_dhcp6_lease *lease, const struct in6_addr **ret) {
241241
assert_return(lease, -EINVAL);
242-
assert_return(ret, -EINVAL);
243242

244243
if (!lease->dns)
245244
return -ENOENT;
246245

247-
*ret = lease->dns;
246+
if (ret)
247+
*ret = lease->dns;
248+
248249
return lease->dns_count;
249250
}
250251

@@ -337,16 +338,17 @@ int dhcp6_lease_add_sntp(sd_dhcp6_lease *lease, const uint8_t *optval, size_t op
337338

338339
int sd_dhcp6_lease_get_ntp_addrs(sd_dhcp6_lease *lease, const struct in6_addr **ret) {
339340
assert_return(lease, -EINVAL);
340-
assert_return(ret, -EINVAL);
341341

342342
if (lease->ntp) {
343-
*ret = lease->ntp;
343+
if (ret)
344+
*ret = lease->ntp;
344345
return lease->ntp_count;
345346
}
346347

347348
if (lease->sntp && !lease->ntp_fqdn) {
348349
/* Fallback to the deprecated SNTP option. */
349-
*ret = lease->sntp;
350+
if (ret)
351+
*ret = lease->sntp;
350352
return lease->sntp_count;
351353
}
352354

@@ -355,12 +357,12 @@ int sd_dhcp6_lease_get_ntp_addrs(sd_dhcp6_lease *lease, const struct in6_addr **
355357

356358
int sd_dhcp6_lease_get_ntp_fqdn(sd_dhcp6_lease *lease, char ***ret) {
357359
assert_return(lease, -EINVAL);
358-
assert_return(ret, -EINVAL);
359360

360361
if (!lease->ntp_fqdn)
361362
return -ENOENT;
362363

363-
*ret = lease->ntp_fqdn;
364+
if (ret)
365+
*ret = lease->ntp_fqdn;
364366
return strv_length(lease->ntp_fqdn);
365367
}
366368

0 commit comments

Comments
 (0)