proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-05-29 15:07:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #7900 from donaldsharp/afi_route_map

Browse Source 
bgpd: Add afi/safi info to debug processing data
This commit is contained in:
Donatas Abraitis 2021-01-21 19:25:58 +02:00 committed by GitHub
commit aa0f811f22
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bgpd/bgp_routemap.c
View File

@ -3531,8 +3531,9 @@ static void bgp_route_map_process_peer(const char *rmap_name,
PEER_FLAG_SOFT_RECONFIG)) { PEER_FLAG_SOFT_RECONFIG)) {
if (bgp_debug_update(peer, NULL, NULL, 1)) if (bgp_debug_update(peer, NULL, NULL, 1))
zlog_debug( zlog_debug(
"Processing route_map %s update on peer %s (inbound, soft-reconfig)", "Processing route_map %s(%s:%s) update on peer %s (inbound, soft-reconfig)",
rmap_name, peer->host); rmap_name, afi2str(afi),
safi2str(safi), peer->host);
bgp_soft_reconfig_in(peer, afi, safi); bgp_soft_reconfig_in(peer, afi, safi);
} else if (CHECK_FLAG(peer->cap, } 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)) { PEER_CAP_REFRESH_NEW_RCV)) {
if (bgp_debug_update(peer, NULL, NULL, 1)) if (bgp_debug_update(peer, NULL, NULL, 1))
zlog_debug( zlog_debug(
"Processing route_map %s update on peer %s (inbound, route-refresh)", "Processing route_map %s(%s:%s) update on peer %s (inbound, route-refresh)",
rmap_name, peer->host); rmap_name, afi2str(afi),
safi2str(safi), peer->host);
bgp_route_refresh_send( bgp_route_refresh_send(
peer, afi, safi, 0, 0, 0, peer, afi, safi, 0, 0, 0,
BGP_ROUTE_REFRESH_NORMAL); 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)) if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug( zlog_debug(
"Processing route_map %s update on table map", "Processing route_map %s(%s:%s) update on table map",
rmap_name); rmap_name, afi2str(afi),
safi2str(safi));
if (route_update) if (route_update)
bgp_zebra_announce_table(bgp, afi, safi); 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)) if (bgp_debug_zebra(bn_p))
zlog_debug( zlog_debug(
"Processing route_map %s update on static route %s", "Processing route_map %s(%s:%s) update on static route %s",
rmap_name, rmap_name, afi2str(afi),
safi2str(safi),
inet_ntop(bn_p->family, inet_ntop(bn_p->family,
&bn_p->u.prefix, buf, &bn_p->u.prefix, buf,
INET6_ADDRSTRLEN)); 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)) if (bgp_debug_zebra(bn_p))
zlog_debug( zlog_debug(
"Processing route_map %s update on aggregate-address route %s", "Processing route_map %s(%s:%s) update on aggregate-address route %s",
rmap_name, rmap_name, afi2str(afi),
safi2str(safi),
inet_ntop(bn_p->family, inet_ntop(bn_p->family,
&bn_p->u.prefix, buf, &bn_p->u.prefix, buf,
INET6_ADDRSTRLEN)); 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)) if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug( zlog_debug(
"Processing route_map %s update on redistributed routes", "Processing route_map %s(%s:%s) update on redistributed routes",
rmap_name); rmap_name, afi2str(afi),
safi2str(safi));
bgp_redistribute_resend(bgp, afi, i, bgp_redistribute_resend(bgp, afi, i,
red->instance); 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)) if (BGP_DEBUG(zebra, ZEBRA))
zlog_debug( zlog_debug(
"Processing route_map %s update on advertise type5 route command", "Processing route_map %s(%s:%s) update on advertise type5 route command",
rmap_name); rmap_name, afi2str(afi), safi2str(safi));
if (route_update && advertise_type5_routes(bgp, afi)) { if (route_update && advertise_type5_routes(bgp, afi)) {
bgp_evpn_withdraw_type5_routes(bgp, afi, safi); bgp_evpn_withdraw_type5_routes(bgp, afi, safi);