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

Merge pull request #30702 from yuwata/sd-dhcp-client-id

Browse Source 
dhcp: introduce sd_dhcp_client_id and relevant functions
This commit is contained in:
Yu Watanabe
2024-01-03 15:10:46 +09:00
committed by GitHub
parent 778823fd52 d59a2b3bf5
commit 12fb1fc5dd
11 changed files with 332 additions and 202 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkctl.c
+4 -5
View File
@@ -1458,7 +1458,7 @@ static int dump_dhcp_leases(Table *table, const char *prefix, sd_bus *bus, const
if (r < 0)
return bus_log_parse_error(r);
r = sd_dhcp_client_id_to_string(client_id, client_id_sz, &id);
r = sd_dhcp_client_id_to_string_from_raw(client_id, client_id_sz, &id);
if (r < 0)
return bus_log_parse_error(r);
@@ -2271,8 +2271,7 @@ static int link_status_one(
}
if (lease) {
const void *client_id;
size_t client_id_len;
const sd_dhcp_client_id *client_id;
const char *tz;
r = sd_dhcp_lease_get_timezone(lease, &tz);
@@ -2284,11 +2283,11 @@ static int link_status_one(
return table_log_add_error(r);
}
r = sd_dhcp_lease_get_client_id(lease, &client_id, &client_id_len);
r = sd_dhcp_lease_get_client_id(lease, &client_id);
if (r >= 0) {
_cleanup_free_ char *id = NULL;
r = sd_dhcp_client_id_to_string(client_id, client_id_len, &id);
r = sd_dhcp_client_id_to_string(client_id, &id);
if (r >= 0) {
r = table_add_many(table,
TABLE_FIELD, "DHCP4 Client ID",