diff options
| author | Lou Berger <lberger@labn.net> | 2018-12-11 17:13:25 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-11 17:13:25 +0100 |
| commit | 9bdb632c68428cc20a92e00d593ae90cb94690ad (patch) | |
| tree | ce01e44e50fe0c627e51d4c1123a3c194fa30954 /bgpd/bgp_flowspec_vty.c | |
| parent | Merge pull request #3457 from opensourcerouting/keyless-lists (diff) | |
| parent | bgpd: Cleanup bgp_connected_set|get function names (diff) | |
| download | frr-9bdb632c68428cc20a92e00d593ae90cb94690ad.tar.xz frr-9bdb632c68428cc20a92e00d593ae90cb94690ad.zip | |
Merge pull request #3093 from donaldsharp/bgp_node_continued
Bgp node continued
Diffstat (limited to 'bgpd/bgp_flowspec_vty.c')
| -rw-r--r-- | bgpd/bgp_flowspec_vty.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/bgpd/bgp_flowspec_vty.c b/bgpd/bgp_flowspec_vty.c index 9c230d112..26f0fffb3 100644 --- a/bgpd/bgp_flowspec_vty.c +++ b/bgpd/bgp_flowspec_vty.c @@ -380,13 +380,14 @@ int bgp_show_table_flowspec(struct vty *vty, struct bgp *bgp, afi_t afi, return CMD_SUCCESS; for (rn = bgp_table_top(table); rn; rn = bgp_route_next(rn)) { - if (rn->info == NULL) + pi = bgp_node_get_bgp_path_info(rn); + if (pi == NULL) continue; if (use_json) { json_paths = json_object_new_array(); display = NLRI_STRING_FORMAT_JSON; } - for (pi = rn->info; pi; pi = pi->next) { + for (; pi; pi = pi->next) { total_count++; route_vty_out_flowspec(vty, &rn->p, pi, display, json_paths); @@ -543,11 +544,11 @@ extern int bgp_flowspec_display_match_per_ip(afi_t afi, struct bgp_table *rib, continue; if (bgp_flowspec_contains_prefix(prefix, match, prefix_check)) { - route_vty_out_flowspec(vty, &rn->p, - rn->info, use_json ? - NLRI_STRING_FORMAT_JSON : - NLRI_STRING_FORMAT_LARGE, - json_paths); + route_vty_out_flowspec( + vty, &rn->p, bgp_node_get_bgp_path_info(rn), + use_json ? NLRI_STRING_FORMAT_JSON + : NLRI_STRING_FORMAT_LARGE, + json_paths); display++; } } |