From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Thu, 6 Jul 2023 04:26:03 +0000 (+0900)
Subject: network/json: introduce PreferredLifetimeUSec and ValidLifetimeUSec
X-Git-Tag: v254-rc1~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=efa5521be832effb2c9ad8df92a6c13fa4fde295;p=thirdparty%2Fsystemd.git

network/json: introduce PreferredLifetimeUSec and ValidLifetimeUSec
---

diff --git a/src/network/networkd-json.c b/src/network/networkd-json.c
index da26f797fe4..d9679719938 100644
--- a/src/network/networkd-json.c
+++ b/src/network/networkd-json.c
@@ -52,8 +52,10 @@ static int address_build_json(Address *address, JsonVariant **ret) {
                                 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_FINITE_USEC("PreferredLifetimeUSec", address->lifetime_preferred_usec),
+                                JSON_BUILD_PAIR_FINITE_USEC("PreferredLifetimeUsec", address->lifetime_preferred_usec), /* for backward compat */
+                                JSON_BUILD_PAIR_FINITE_USEC("ValidLifetimeUSec", address->lifetime_valid_usec),
+                                JSON_BUILD_PAIR_FINITE_USEC("ValidLifetimeUsec", address->lifetime_valid_usec), /* for backward compat */
                                 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)));