From 2d1b0a7436653f6eb9e6d2777802b4ae912183b2 Mon Sep 17 00:00:00 2001 From: Jordan Augé Date: Mon, 2 Dec 2019 14:28:22 +0100 Subject: [HICN-419] Expose facelet id in facelet_list(_json) in facemgr API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ibce2e82ba125ca2e927cd270a8c45855384cd7fa Signed-off-by: Jordan Augé --- ctrl/facemgr/src/facelet.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'ctrl') diff --git a/ctrl/facemgr/src/facelet.c b/ctrl/facemgr/src/facelet.c index 929005f57..a6231f457 100644 --- a/ctrl/facemgr/src/facelet.c +++ b/ctrl/facemgr/src/facelet.c @@ -998,7 +998,8 @@ facelet_snprintf(char * s, size_t size, const facelet_t * facelet) assert(facelet); /* Header + key attributes (netdevice + family) */ - rc = snprintf(cur, s + size - cur, "id, facelet_status_str[facelet->status], facelet_get_error(facelet) ? "/!\\" : "", (facelet->family == AF_INET) ? "AF_INET" : @@ -1208,6 +1209,15 @@ int facelet_snprintf_json(char * s, size_t size, const facelet_t * facelet, int if (cur >= s + size) return cur - s; + /* id */ + rc = snprintf(cur, s + size - cur, "%*s%s: %d,\n", 4 * (indent+1), "", "\"id\"", + facelet->id); + if (rc < 0) + return rc; + cur += rc; + if (cur >= s + size) + return cur - s; + /* Status */ rc = snprintf(cur, s + size - cur, "%*s%s: \"%s\",\n", 4 * (indent+1), "", "\"status\"", facelet_status_str[facelet->status]); -- cgit 1.2.3-korg