diff options
| author | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-11-18 10:57:40 +0200 |
|---|---|---|
| committer | Donatas Abraitis <donatas.abraitis@gmail.com> | 2021-11-18 18:45:39 +0200 |
| commit | 20308be31788362e19f5fbb24ac3323e4af2f61c (patch) | |
| tree | abf903bb057ff05916064b3564fc462f347e5810 /ospfd/ospf_sr.c | |
| parent | e46a4ac958dc14e4db64c90b71a458e68042811d (diff) | |
ospfd: Replace inet_ntop to %pI4/6 for JSON outputs
Signed-off-by: Donatas Abraitis <donatas.abraitis@gmail.com>
Diffstat (limited to 'ospfd/ospf_sr.c')
| -rw-r--r-- | ospfd/ospf_sr.c | 35 |
1 files changed, 12 insertions, 23 deletions
diff --git a/ospfd/ospf_sr.c b/ospfd/ospf_sr.c index 9a9e64cc23..4328efa28c 100644 --- a/ospfd/ospf_sr.c +++ b/ospfd/ospf_sr.c @@ -2674,10 +2674,8 @@ static void show_sr_prefix(struct sbuf *sbuf, struct json_object *json, srp->nhlfe.label_out); json_object_string_add(json_obj, "interface", itf ? itf->name : "-"); - json_object_string_add( - json_obj, "nexthop", - inet_ntop(AF_INET, &srp->nhlfe.nexthop, - buf, sizeof(buf))); + json_object_string_addf(json_obj, "nexthop", "%pI4", + &srp->nhlfe.nexthop); json_object_array_add(json_route, json_obj); } else { sbuf_push(sbuf, 0, "%20s %9s %15s\n", @@ -2712,10 +2710,8 @@ static void show_sr_prefix(struct sbuf *sbuf, struct json_object *json, path->srni.label_out); json_object_string_add(json_obj, "interface", itf ? itf->name : "-"); - json_object_string_add( - json_obj, "nexthop", - inet_ntop(AF_INET, &path->nexthop, - buf, sizeof(buf))); + json_object_string_addf(json_obj, "nexthop", "%pI4", + &path->nexthop); json_object_array_add(json_route, json_obj); } else { sbuf_push(sbuf, indent, "%20s %9s %15s\n", @@ -2755,9 +2751,8 @@ static void show_sr_node(struct vty *vty, struct json_object *json, if (json) { json_node = json_object_new_object(); - json_object_string_add(json_node, "routerID", - inet_ntop(AF_INET, &srn->adv_router, - buf, sizeof(buf))); + json_object_string_addf(json_node, "routerID", "%pI4", + &srn->adv_router); json_object_int_add(json_node, "srgbSize", srn->srgb.range_size); json_object_int_add(json_node, "srgbLabel", @@ -2846,10 +2841,8 @@ static void show_sr_node(struct vty *vty, struct json_object *json, srl->nhlfe[0].label_out); json_object_string_add(json_obj, "interface", itf ? itf->name : "-"); - json_object_string_add( - json_obj, "nexthop", - inet_ntop(AF_INET, &srl->nhlfe[0].nexthop, - buf, sizeof(buf))); + json_object_string_addf(json_obj, "nexthop", "%pI4", + &srl->nhlfe[0].nexthop); json_object_array_add(json_link, json_obj); /* Backup Link */ json_obj = json_object_new_object(); @@ -2862,10 +2855,8 @@ static void show_sr_node(struct vty *vty, struct json_object *json, srl->nhlfe[1].label_out); json_object_string_add(json_obj, "interface", itf ? itf->name : "-"); - json_object_string_add( - json_obj, "nexthop", - inet_ntop(AF_INET, &srl->nhlfe[1].nexthop, - buf, sizeof(buf))); + json_object_string_addf(json_obj, "nexthop", "%pI4", + &srl->nhlfe[1].nexthop); json_object_array_add(json_link, json_obj); } else { sbuf_push(&sbuf, 0, "%18s %21s %20s %9s %15s\n", @@ -2937,10 +2928,8 @@ DEFUN (show_ip_opsf_srdb, if (uj) { json = json_object_new_object(); json_node_array = json_object_new_array(); - json_object_string_add( - json, "srdbID", - inet_ntop(AF_INET, &OspfSR.self->adv_router, - buf, sizeof(buf))); + json_object_string_addf(json, "srdbID", "%pI4", + &OspfSR.self->adv_router); json_object_object_add(json, "srNodes", json_node_array); } else { vty_out(vty, |