diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-11-14 14:56:23 +0900 |
---|---|---|
committer | Yu Watanabe <watanabe.yu+github@gmail.com> | 2021-11-25 22:35:35 +0900 |
commit | 5ee3ab4d3a3cc08ebc4b1a6181369ce0161cf176 (patch) | |
tree | 034ead266a0f3328abc2ebbe5585add73bdd7e1c | |
parent | 385f2512d52e02612ccde7aafbb0c6757cdca7c4 (diff) | |
download | systemd-5ee3ab4d3a3cc08ebc4b1a6181369ce0161cf176.tar.gz |
network: json: append address information
-rw-r--r-- | src/network/networkd-json.c | 87 |
1 files changed, 87 insertions, 0 deletions
diff --git a/src/network/networkd-json.c b/src/network/networkd-json.c index c5486dd0b5..05f3384851 100644 --- a/src/network/networkd-json.c +++ b/src/network/networkd-json.c @@ -1,12 +1,89 @@ /* SPDX-License-Identifier: LGPL-2.1-or-later */ #include "netif-util.h" +#include "networkd-address.h" #include "networkd-json.h" #include "networkd-link.h" #include "networkd-manager.h" #include "networkd-network.h" +#include "networkd-route-util.h" #include "sort-util.h" +static int address_build_json(Address *address, JsonVariant **ret) { + _cleanup_(json_variant_unrefp) JsonVariant *v = NULL; + _cleanup_free_ char *scope = NULL, *flags = NULL, *state = NULL; + int r; + + assert(address); + assert(ret); + + r = route_scope_to_string_alloc(address->scope, &scope); + if (r < 0) + return r; + + r = address_flags_to_string_alloc(address->flags, address->family, &flags); + if (r < 0) + return r; + + r = network_config_state_to_string_alloc(address->state, &state); + if (r < 0) + return r; + + r = json_build(&v, JSON_BUILD_OBJECT( + JSON_BUILD_PAIR_INTEGER("Family", address->family), + JSON_BUILD_PAIR_IN_ADDR("Address", &address->in_addr, address->family), + JSON_BUILD_PAIR_IN_ADDR_NON_NULL("Peer", &address->in_addr_peer, address->family), + JSON_BUILD_PAIR_IN4_ADDR_NON_NULL("Broadcast", &address->broadcast), + JSON_BUILD_PAIR_UNSIGNED("PrefixLength", address->prefixlen), + JSON_BUILD_PAIR_UNSIGNED("Scope", address->scope), + JSON_BUILD_PAIR_STRING("ScopeString", scope), + JSON_BUILD_PAIR_UNSIGNED("Flags", address->flags), + JSON_BUILD_PAIR_STRING("FlagsString", flags), + JSON_BUILD_PAIR_STRING_NON_EMPTY("Label", address->label), + JSON_BUILD_PAIR_FINITE_USEC("PreferredLifetimeUsec", address->lifetime_preferred_usec), + JSON_BUILD_PAIR_FINITE_USEC("ValidLifetimeUsec", address->lifetime_valid_usec), + JSON_BUILD_PAIR_STRING("ConfigSource", network_config_source_to_string(address->source)), + JSON_BUILD_PAIR_STRING("ConfigState", state), + JSON_BUILD_PAIR_IN_ADDR_NON_NULL("ConfigProvider", &address->provider, address->family))); + if (r < 0) + return r; + + *ret = TAKE_PTR(v); + return 0; +} + +static int addresses_build_json(Set *addresses, JsonVariant **ret) { + JsonVariant **elements; + Address *address; + size_t n = 0; + int r; + + assert(ret); + + if (set_isempty(addresses)) { + *ret = NULL; + return 0; + } + + elements = new(JsonVariant*, set_size(addresses)); + if (!elements) + return -ENOMEM; + + SET_FOREACH(address, addresses) { + r = address_build_json(address, elements + n); + if (r < 0) + goto finalize; + n++; + } + + r = json_build(ret, JSON_BUILD_OBJECT(JSON_BUILD_PAIR("Addresses", JSON_BUILD_VARIANT_ARRAY(elements, n)))); + +finalize: + json_variant_unref_many(elements, n); + free(elements); + return r; +} + static int network_build_json(Network *network, JsonVariant **ret) { assert(ret); @@ -91,6 +168,16 @@ int link_build_json(Link *link, JsonVariant **ret) { if (r < 0) return r; + w = json_variant_unref(w); + + r = addresses_build_json(link->addresses, &w); + if (r < 0) + return r; + + r = json_variant_merge(&v, w); + if (r < 0) + return r; + *ret = TAKE_PTR(v); return 0; } |