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

Merge pull request #7716 from ton31337/fix/print_string_for_afi_safi_mp_bgp

Browse Source 
bgpd: Print afi/safi as strings for some zlog_debug outputs
This commit is contained in:
Donald Sharp 2020-12-11 20:40:25 -05:00 committed by GitHub
commit f23e82838b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
bgpd/bgp_packet.c
View File

@ -2219,12 +2219,13 @@ static int bgp_capability_msg_parse(struct peer *peer, uint8_t *pnt,
/* Address family check. */ /* Address family check. */
if (bgp_debug_neighbor_events(peer)) if (bgp_debug_neighbor_events(peer))
zlog_debug( zlog_debug(
"%s CAPABILITY has %s MP_EXT CAP for afi/safi: %u/%u", "%s CAPABILITY has %s MP_EXT CAP for afi/safi: %s/%s",
peer->host, peer->host,
action == CAPABILITY_ACTION_SET action == CAPABILITY_ACTION_SET
? "Advertising" ? "Advertising"
: "Removing", : "Removing",
pkt_afi, pkt_safi); iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi));
if (action == CAPABILITY_ACTION_SET) { if (action == CAPABILITY_ACTION_SET) {
peer->afc_recv[afi][safi] = 1; peer->afc_recv[afi][safi] = 1;

14
bgpd/bgp_updgrp_packet.c
View File

@ -888,9 +888,12 @@ struct bpacket *subgroup_update_packet(struct update_subgroup *subgrp)
pkt_afi = afi_int2iana(afi); pkt_afi = afi_int2iana(afi);
pkt_safi = safi_int2iana(safi); pkt_safi = safi_int2iana(safi);
zlog_debug( zlog_debug(
"u%" PRIu64 ":s%" PRIu64" send MP_REACH for afi/safi %d/%d", "u%" PRIu64 ":s%" PRIu64
" send MP_REACH for afi/safi %s/%s",
subgrp->update_group->id, subgrp->update_group->id,
subgrp->id, pkt_afi, pkt_safi); subgrp->id,
iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi));
} }
send_attr_printed = 1; send_attr_printed = 1;
@ -1046,9 +1049,12 @@ struct bpacket *subgroup_withdraw_packet(struct update_subgroup *subgrp)
if (bgp_debug_update(NULL, NULL, if (bgp_debug_update(NULL, NULL,
subgrp->update_group, 0)) subgrp->update_group, 0))
zlog_debug( zlog_debug(
"u%" PRIu64 ":s%" PRIu64" send MP_UNREACH for afi/safi %d/%d", "u%" PRIu64 ":s%" PRIu64
" send MP_UNREACH for afi/safi %s/%s",
subgrp->update_group->id, subgrp->update_group->id,
subgrp->id, pkt_afi, pkt_safi); subgrp->id,
iana_afi2str(pkt_afi),
iana_safi2str(pkt_safi));
} }
bgp_packet_mpunreach_prefix(s, dest_p, afi, safi, prd, bgp_packet_mpunreach_prefix(s, dest_p, afi, safi, prd,