summaryrefslogtreecommitdiff
path: root/src/network/networkd-json.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2021-11-26 19:44:22 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2021-11-26 20:20:06 +0900
commit46c31852f19f0ed9fd191d9ee9f6ddcea3426870 (patch)
tree0b16e6c9194ed8fcd22a741fb3d1d37036fcc896 /src/network/networkd-json.c
parentde045939ad2320c148018686e83c59570a551ba3 (diff)
downloadsystemd-46c31852f19f0ed9fd191d9ee9f6ddcea3426870.tar.gz
network: json: append DNSSEC negative trust anchors
Diffstat (limited to 'src/network/networkd-json.c')
-rw-r--r--src/network/networkd-json.c62
1 files changed, 62 insertions, 0 deletions
diff --git a/src/network/networkd-json.c b/src/network/networkd-json.c
index 1a3afc5665..315d06a091 100644
--- a/src/network/networkd-json.c
+++ b/src/network/networkd-json.c
@@ -1002,6 +1002,58 @@ finalize:
return r;
}
+static int nta_build_json(const char *nta, NetworkConfigSource s, JsonVariant **ret) {
+ assert(nta);
+ assert(ret);
+
+ return json_build(ret, JSON_BUILD_OBJECT(
+ JSON_BUILD_PAIR_STRING("DNSSECNegativeTrustAnchor", nta),
+ JSON_BUILD_PAIR_STRING("ConfigSource", network_config_source_to_string(s))));
+}
+
+static int ntas_build_json(Link *link, JsonVariant **ret) {
+ JsonVariant **elements = NULL;
+ const char *nta;
+ size_t n = 0;
+ int r;
+
+ assert(link);
+ assert(ret);
+
+ if (!link->network) {
+ *ret = NULL;
+ return 0;
+ }
+
+ SET_FOREACH(nta, link->dnssec_negative_trust_anchors ?: link->network->dnssec_negative_trust_anchors) {
+ if (!GREEDY_REALLOC(elements, n + 1)) {
+ r = -ENOMEM;
+ goto finalize;
+ }
+
+ r = nta_build_json(nta,
+ link->dnssec_negative_trust_anchors ? NETWORK_CONFIG_SOURCE_RUNTIME : NETWORK_CONFIG_SOURCE_STATIC,
+ elements + n);
+ if (r < 0)
+ goto finalize;
+
+ n++;
+ }
+
+ if (n == 0) {
+ *ret = NULL;
+ return 0;
+ }
+
+ r = json_build(ret, JSON_BUILD_OBJECT(JSON_BUILD_PAIR("DNSSECNegativeTrustAnchors",
+ JSON_BUILD_VARIANT_ARRAY(elements, n))));
+
+finalize:
+ json_variant_unref_many(elements, n);
+ free(elements);
+ return r;
+}
+
int link_build_json(Link *link, JsonVariant **ret) {
_cleanup_(json_variant_unrefp) JsonVariant *v = NULL, *w = NULL;
_cleanup_free_ char *type = NULL, *flags = NULL;
@@ -1127,6 +1179,16 @@ int link_build_json(Link *link, JsonVariant **ret) {
w = json_variant_unref(w);
+ r = ntas_build_json(link, &w);
+ if (r < 0)
+ return r;
+
+ r = json_variant_merge(&v, w);
+ if (r < 0)
+ return r;
+
+ w = json_variant_unref(w);
+
r = addresses_build_json(link->addresses, &w);
if (r < 0)
return r;