summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Hopps <chopps@labn.net>2022-01-08 06:17:15 -0500
committerChristian Hopps <chopps@labn.net>2022-05-26 17:27:18 -0400
commit97385dddf1e955a428dc3396fb535c592b1f8c79 (patch)
treebe1e0b2e80e047fc7831b69fc8112d82342d96b8
parentdcf6441e3f277a3ceeae705232c90ac6345e1d14 (diff)
ospfd: cli: add opaque data to json output
Signed-off-by: Christian Hopps <chopps@labn.net>
-rw-r--r--ospfd/ospf_apiserver.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/ospfd/ospf_apiserver.c b/ospfd/ospf_apiserver.c
index 5229c6f44c..d6c1e28d41 100644
--- a/ospfd/ospf_apiserver.c
+++ b/ospfd/ospf_apiserver.c
@@ -2061,9 +2061,6 @@ void ospf_apiserver_show_info(struct vty *vty, struct json_object *json,
struct opaque_lsa *olsa;
int opaquelen;
- if (json)
- return;
-
olsa = (struct opaque_lsa *)lsa->data;
if (VALID_OPAQUE_INFO_LEN(lsa->data))
@@ -2072,7 +2069,10 @@ void ospf_apiserver_show_info(struct vty *vty, struct json_object *json,
opaquelen = 0;
/* Output information about opaque LSAs */
- if (vty != NULL) {
+ if (json)
+ json_object_string_addf(json, "opaqueData", "%*pHXn",
+ (int)opaquelen, olsa->data);
+ else if (vty != NULL) {
int i;
vty_out(vty,
" Added using OSPF API: %u octets of opaque data %s\n",