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

resolved: report svc params as a json object

Browse Source 
This representation is significantly more useful. The previous array
format omitted the svc param key, which is not very useful.
This commit is contained in:
Ronan Pigott
2024-07-24 08:18:47 +01:00
committed by Luca Boccassi
parent 0d45d0ec58
commit ddec353749
2 changed files with 13 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resolve/resolved-dns-rr.c
+10 -15
View File
@@ -2224,29 +2224,24 @@ finalize:
}
static int svc_params_to_json(DnsSvcParam *params, sd_json_variant **ret) {
sd_json_variant **elements = NULL;
size_t n = 0;
_cleanup_(sd_json_variant_unrefp) sd_json_variant *w = NULL;
int r;
assert(ret);
LIST_FOREACH(params, i, params) {
if (!GREEDY_REALLOC(elements, n + 1)) {
r = -ENOMEM;
goto finalize;
}
r = sd_json_variant_new_base64(elements + n, i->value, i->length);
_cleanup_(sd_json_variant_unrefp) sd_json_variant *v = NULL;
r = sd_json_variant_new_base64(&v, i->value, i->length);
if (r < 0)
goto finalize;
return r;
n++;
r = sd_json_variant_set_field(&w, FORMAT_DNS_SVC_PARAM_KEY(i->key), v);
if (r < 0)
return r;
}
r = sd_json_variant_new_array(ret, elements, n);
finalize:
sd_json_variant_unref_many(elements, n);
return r;
*ret = TAKE_PTR(w);
return 0;
}
int dns_resource_record_to_json(DnsResourceRecord *rr, sd_json_variant **ret) {
@@ -2436,7 +2431,7 @@ int dns_resource_record_to_json(DnsResourceRecord *rr, sd_json_variant **ret) {
SD_JSON_BUILD_PAIR("key", SD_JSON_BUILD_VARIANT(k)),
SD_JSON_BUILD_PAIR("priority", SD_JSON_BUILD_UNSIGNED(rr->svcb.priority)),
SD_JSON_BUILD_PAIR("target", SD_JSON_BUILD_STRING(rr->svcb.target_name)),
SD_JSON_BUILD_PAIR("params", SD_JSON_BUILD_VARIANT(p)));
SD_JSON_BUILD_PAIR("svcparams", SD_JSON_BUILD_VARIANT(p)));
}
case DNS_TYPE_CAA:
src/shared/varlink-io.systemd.Resolve.c
+3 -1
View File
@@ -61,7 +61,9 @@ SD_VARLINK_DEFINE_STRUCT_TYPE(
SD_VARLINK_DEFINE_FIELD(tag, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
SD_VARLINK_DEFINE_FIELD(value, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
SD_VARLINK_DEFINE_FIELD(target, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),
SD_VARLINK_DEFINE_FIELD(params, SD_VARLINK_STRING, SD_VARLINK_NULLABLE|SD_VARLINK_ARRAY),
/* This field is retired */
/* SD_VARLINK_DEFINE_FIELD(params, SD_VARLINK_STRING, SD_VARLINK_NULLABLE|SD_VARLINK_ARRAY), */
SD_VARLINK_DEFINE_FIELD(svcparams, SD_VARLINK_OBJECT, SD_VARLINK_NULLABLE),
SD_VARLINK_DEFINE_FIELD(order, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
SD_VARLINK_DEFINE_FIELD(preference, SD_VARLINK_INT, SD_VARLINK_NULLABLE),
SD_VARLINK_DEFINE_FIELD(naptrFlags, SD_VARLINK_STRING, SD_VARLINK_NULLABLE),