diff options
Diffstat (limited to 'bgpd/bgp_route.c')
| -rw-r--r-- | bgpd/bgp_route.c | 117 |
1 files changed, 63 insertions, 54 deletions
diff --git a/bgpd/bgp_route.c b/bgpd/bgp_route.c index fabe4483e5..e3f63f11b6 100644 --- a/bgpd/bgp_route.c +++ b/bgpd/bgp_route.c @@ -1710,8 +1710,7 @@ int subgroup_announce_check(struct bgp_node *rn, struct bgp_info *ri, * Note: 3rd party nexthop currently implemented for * IPv4 only. */ - SUBGRP_FOREACH_PEER(subgrp, paf) - { + SUBGRP_FOREACH_PEER (subgrp, paf) { if (bgp_multiaccess_check_v4(riattr->nexthop, paf->peer)) break; @@ -10110,60 +10109,70 @@ static void show_adj_route(struct vty *vty, struct peer *peer, afi_t afi, } } else { for (adj = rn->adj_out; adj; adj = adj->next) - SUBGRP_FOREACH_PEER(adj->subgroup, paf) - if (paf->peer == peer) { - if (header1) { - if (use_json) { - json_object_int_add( - json, "bgpTableVersion", - table->version); - json_object_string_add( - json, - "bgpLocalRouterId", - inet_ntoa( - bgp->router_id)); - json_object_object_add( - json, "bgpStatusCodes", - json_scode); - json_object_object_add( - json, "bgpOriginCodes", - json_ocode); - } else { - vty_out(vty, - "BGP table version is %" PRIu64 - ", local router ID is %s\n", - table->version, - inet_ntoa( - bgp->router_id)); - vty_out(vty, - BGP_SHOW_SCODE_HEADER); - vty_out(vty, - BGP_SHOW_OCODE_HEADER); - } - header1 = 0; - } + SUBGRP_FOREACH_PEER (adj->subgroup, paf) + if (paf->peer == peer) { + if (header1) { + if (use_json) { + json_object_int_add( + json, + "bgpTableVersion", + table->version); + json_object_string_add( + json, + "bgpLocalRouterId", + inet_ntoa( + bgp->router_id)); + json_object_object_add( + json, + "bgpStatusCodes", + json_scode); + json_object_object_add( + json, + "bgpOriginCodes", + json_ocode); + } else { + vty_out(vty, + "BGP table version is %" PRIu64 + ", local router ID is %s\n", + table->version, + inet_ntoa( + bgp->router_id)); + vty_out(vty, + BGP_SHOW_SCODE_HEADER); + vty_out(vty, + BGP_SHOW_OCODE_HEADER); + } + header1 = 0; + } - if (header2) { - if (!use_json) - vty_out(vty, BGP_SHOW_HEADER); - header2 = 0; - } + if (header2) { + if (!use_json) + vty_out(vty, + BGP_SHOW_HEADER); + header2 = 0; + } - if (adj->attr) { - bgp_attr_dup(&attr, adj->attr); - ret = bgp_output_modifier( - peer, &rn->p, &attr, afi, safi, - rmap_name); - if (ret != RMAP_DENY) { - route_vty_out_tmp(vty, &rn->p, - &attr, safi, - use_json, - json_ar); - output_count++; - } else - filtered_count++; - } - } + if (adj->attr) { + bgp_attr_dup(&attr, + adj->attr); + ret = bgp_output_modifier( + peer, &rn->p, + &attr, afi, + safi, + rmap_name); + if (ret != RMAP_DENY) { + route_vty_out_tmp( + vty, + &rn->p, + &attr, + safi, + use_json, + json_ar); + output_count++; + } else + filtered_count++; + } + } } } if (use_json) |