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

networkd: Adding DHCPv4 private options to D-BUS

Browse Source 
Currently DHCPv4 private options are not exposed in D-BUS.
This change is to include those private options into D-BUS
This commit is contained in:
Nandakumar Raghavan
2024-01-18 09:41:23 +01:00
committed by Lennart Poettering
parent e7f2eef411
commit ee8f3e489e
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/network/networkd-json.c
+28
View File
@@ -2,6 +2,7 @@
#include <linux/nexthop.h>
#include "dhcp-lease-internal.h"
#include "dhcp-server-lease-internal.h"
#include "dhcp6-internal.h"
#include "dhcp6-lease-internal.h"
@@ -1170,6 +1171,29 @@ static int dhcp_client_pd_append_json(Link *link, JsonVariant **v) {
return json_variant_set_field_non_null(v, "6rdPrefix", array);
}
static int dhcp_client_private_options_append_json(Link *link, JsonVariant **v) {
_cleanup_(json_variant_unrefp) JsonVariant *array = NULL;
int r;
assert(link);
assert(v);
if (!link->dhcp_lease)
return 0;
LIST_FOREACH(options, option, link->dhcp_lease->private_options) {
r = json_variant_append_arrayb(
&array,
JSON_BUILD_OBJECT(
JSON_BUILD_PAIR_UNSIGNED("Option", option->tag),
JSON_BUILD_PAIR_HEX("PrivateOptionData", option->data, option->length)));
if (r < 0)
return 0;
}
return json_variant_set_field_non_null(v, "PrivateOptions", array);
}
static int dhcp_client_append_json(Link *link, JsonVariant **v) {
_cleanup_(json_variant_unrefp) JsonVariant *w = NULL;
int r;
@@ -1188,6 +1212,10 @@ static int dhcp_client_append_json(Link *link, JsonVariant **v) {
if (r < 0)
return r;
r = dhcp_client_private_options_append_json(link, &w);
if (r < 0)
return r;
return json_variant_set_field_non_null(v, "DHCPv4Client", w);
}