summaryrefslogtreecommitdiffstats
path: root/bgpd
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@nvidia.com>2021-01-21 15:14:27 +0100
committerDonald Sharp <sharpd@nvidia.com>2021-01-21 15:14:27 +0100
commit11b228cdc4ffe3394d8e6ce91d85f9bb2a2fd8b8 (patch)
tree4d56981c01f2e04f7f9224ceafb32eb8fdcac85c /bgpd
parentMerge pull request #7891 from opensourcerouting/fr-bfd-prof (diff)
downloadfrr-11b228cdc4ffe3394d8e6ce91d85f9bb2a2fd8b8.tar.xz
frr-11b228cdc4ffe3394d8e6ce91d85f9bb2a2fd8b8.zip
bgpd: Add afi/safi info to debug processing data
When debugging in bgp is turned on for route-map processing it would be awful nice to know what afi-safi we are working on for the particular route-map. Especially when using a route-map across different peers and different afi/safi's Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'bgpd')
-rw-r--r--bgpd/bgp_routemap.c34
1 files changed, 20 insertions, 14 deletions
diff --git a/bgpd/bgp_routemap.c b/bgpd/bgp_routemap.c
index ceaf8c096..32af9ed02 100644
--- a/bgpd/bgp_routemap.c
+++ b/bgpd/bgp_routemap.c
@@ -3531,8 +3531,9 @@ static void bgp_route_map_process_peer(const char *rmap_name,
PEER_FLAG_SOFT_RECONFIG)) {
if (bgp_debug_update(peer, NULL, NULL, 1))
zlog_debug(
- "Processing route_map %s update on peer %s (inbound, soft-reconfig)",
- rmap_name, peer->host);
+ "Processing route_map %s(%s:%s) update on peer %s (inbound, soft-reconfig)",
+ rmap_name, afi2str(afi),
+ safi2str(safi), peer->host);
bgp_soft_reconfig_in(peer, afi, safi);
} else if (CHECK_FLAG(peer->cap,
@@ -3541,8 +3542,9 @@ static void bgp_route_map_process_peer(const char *rmap_name,
PEER_CAP_REFRESH_NEW_RCV)) {
if (bgp_debug_update(peer, NULL, NULL, 1))
zlog_debug(
- "Processing route_map %s update on peer %s (inbound, route-refresh)",
- rmap_name, peer->host);
+ "Processing route_map %s(%s:%s) update on peer %s (inbound, route-refresh)",
+ rmap_name, afi2str(afi),
+ safi2str(safi), peer->host);
bgp_route_refresh_send(
peer, afi, safi, 0, 0, 0,
BGP_ROUTE_REFRESH_NORMAL);
@@ -3681,8 +3683,9 @@ static void bgp_route_map_process_update(struct bgp *bgp, const char *rmap_name,
if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug(
- "Processing route_map %s update on table map",
- rmap_name);
+ "Processing route_map %s(%s:%s) update on table map",
+ rmap_name, afi2str(afi),
+ safi2str(safi));
if (route_update)
bgp_zebra_announce_table(bgp, afi, safi);
}
@@ -3709,8 +3712,9 @@ static void bgp_route_map_process_update(struct bgp *bgp, const char *rmap_name,
if (bgp_debug_zebra(bn_p))
zlog_debug(
- "Processing route_map %s update on static route %s",
- rmap_name,
+ "Processing route_map %s(%s:%s) update on static route %s",
+ rmap_name, afi2str(afi),
+ safi2str(safi),
inet_ntop(bn_p->family,
&bn_p->u.prefix, buf,
INET6_ADDRSTRLEN));
@@ -3760,8 +3764,9 @@ static void bgp_route_map_process_update(struct bgp *bgp, const char *rmap_name,
if (bgp_debug_zebra(bn_p))
zlog_debug(
- "Processing route_map %s update on aggregate-address route %s",
- rmap_name,
+ "Processing route_map %s(%s:%s) update on aggregate-address route %s",
+ rmap_name, afi2str(afi),
+ safi2str(safi),
inet_ntop(bn_p->family,
&bn_p->u.prefix, buf,
INET6_ADDRSTRLEN));
@@ -3796,8 +3801,9 @@ static void bgp_route_map_process_update(struct bgp *bgp, const char *rmap_name,
if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug(
- "Processing route_map %s update on redistributed routes",
- rmap_name);
+ "Processing route_map %s(%s:%s) update on redistributed routes",
+ rmap_name, afi2str(afi),
+ safi2str(safi));
bgp_redistribute_resend(bgp, afi, i,
red->instance);
@@ -3816,8 +3822,8 @@ static void bgp_route_map_process_update(struct bgp *bgp, const char *rmap_name,
if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug(
- "Processing route_map %s update on advertise type5 route command",
- rmap_name);
+ "Processing route_map %s(%s:%s) update on advertise type5 route command",
+ rmap_name, afi2str(afi), safi2str(safi));
if (route_update && advertise_type5_routes(bgp, afi)) {
bgp_evpn_withdraw_type5_routes(bgp, afi, safi);