diff options
| author | Philippe Guibert <philippe.guibert@6wind.com> | 2018-10-01 17:06:26 +0200 |
|---|---|---|
| committer | Philippe Guibert <philippe.guibert@6wind.com> | 2018-10-23 16:07:52 +0200 |
| commit | 625d293183355d04515b702a9a034c23c83bbc8a (patch) | |
| tree | 52219ccc45fd3458a8ac6e660da1968269f8de84 /bgpd | |
| parent | 25aea4b23107d9a64dfecef1c01b61063afbf3ed (diff) | |
bgpd: fill in prefix for flowspec entry when json format is requested
as prefix is opaque for flowspec, and json needs to have a non empty
full of meaning value in prefix, the proposal is to encode the
displayable form of flowspec entry.
Signed-off-by: Philippe Guibert <philippe.guibert@6wind.com>
Diffstat (limited to 'bgpd')
| -rw-r--r-- | bgpd/bgp_route.c | 35 |
1 files changed, 26 insertions, 9 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index bb6b8aab3c..20c8a57b97 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -8306,7 +8306,6 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi, unsigned long output_count = 0; unsigned long total_count = 0; struct prefix *p; - char buf[BUFSIZ]; char buf2[BUFSIZ]; json_object *json_paths = NULL; int first = 1; @@ -8527,14 +8526,32 @@ static int bgp_show_table(struct vty *vty, struct bgp *bgp, safi_t safi, continue; p = &rn->p; - sprintf(buf2, "%s/%d", - inet_ntop(p->family, &p->u.prefix, buf, BUFSIZ), - p->prefixlen); - if (first) - vty_out(vty, "\"%s\": ", buf2); - else - vty_out(vty, ",\"%s\": ", buf2); - + /* encode prefix */ + if (p->family == AF_FLOWSPEC) { + char retstr[BGP_FLOWSPEC_STRING_DISPLAY_MAX]; + + bgp_fs_nlri_get_string((unsigned char *) + p->u.prefix_flowspec.ptr, + p->u.prefix_flowspec + .prefixlen, + retstr, + NLRI_STRING_FORMAT_MIN, + NULL); + if (first) + vty_out(vty, "\"%s/%d\": ", + retstr, + p->u.prefix_flowspec.prefixlen); + else + vty_out(vty, ",\"%s/%d\": ", + retstr, + p->u.prefix_flowspec.prefixlen); + } else { + prefix2str(p, buf2, sizeof(buf2)); + if (first) + vty_out(vty, "\"%s\": ", buf2); + else + vty_out(vty, ",\"%s\": ", buf2); + } vty_out(vty, "%s", json_object_to_json_string(json_paths)); json_object_free(json_paths); |