mirror of
https://git.proxmox.com/git/mirror_frr
synced 2025-08-15 04:47:05 +00:00
Merge pull request #2745 from adharkar/frr-filtered_route
bgpd: Show routes filtered by prefix-list in filter-routes command
This commit is contained in:
commit
f503378408
@ -10098,6 +10098,7 @@ static void show_adj_route(struct vty *vty, struct peer *peer, afi_t afi,
|
|||||||
json_object *json_ocode = NULL;
|
json_object *json_ocode = NULL;
|
||||||
json_object *json_ar = NULL;
|
json_object *json_ar = NULL;
|
||||||
struct peer_af *paf;
|
struct peer_af *paf;
|
||||||
|
bool route_filtered;
|
||||||
|
|
||||||
if (use_json) {
|
if (use_json) {
|
||||||
json_scode = json_object_new_object();
|
json_scode = json_object_new_object();
|
||||||
@ -10220,17 +10221,27 @@ static void show_adj_route(struct vty *vty, struct peer *peer, afi_t afi,
|
|||||||
}
|
}
|
||||||
|
|
||||||
bgp_attr_dup(&attr, ain->attr);
|
bgp_attr_dup(&attr, ain->attr);
|
||||||
|
route_filtered = false;
|
||||||
|
|
||||||
|
/* Filter prefix using distribute list,
|
||||||
|
* filter list or prefix list
|
||||||
|
*/
|
||||||
|
if ((bgp_input_filter(peer, &rn->p, &attr, afi,
|
||||||
|
safi)) == FILTER_DENY)
|
||||||
|
route_filtered = true;
|
||||||
|
|
||||||
|
/* Filter prefix using route-map */
|
||||||
ret = bgp_input_modifier(peer, &rn->p, &attr,
|
ret = bgp_input_modifier(peer, &rn->p, &attr,
|
||||||
afi, safi, rmap_name);
|
afi, safi, rmap_name);
|
||||||
|
|
||||||
if (type == bgp_show_adj_route_filtered
|
if (type == bgp_show_adj_route_filtered &&
|
||||||
&& ret != RMAP_DENY) {
|
!route_filtered && ret != RMAP_DENY) {
|
||||||
bgp_attr_undup(&attr, ain->attr);
|
bgp_attr_undup(&attr, ain->attr);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (type == bgp_show_adj_route_received
|
if (type == bgp_show_adj_route_received &&
|
||||||
&& ret == RMAP_DENY)
|
(route_filtered || ret == RMAP_DENY))
|
||||||
filtered_count++;
|
filtered_count++;
|
||||||
|
|
||||||
route_vty_out_tmp(vty, &rn->p, &attr, safi,
|
route_vty_out_tmp(vty, &rn->p, &attr, safi,
|
||||||
|
Loading…
Reference in New Issue
Block a user