diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2020-12-11 20:40:25 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-11 20:40:25 -0500 |
| commit | f23e82838bcc53b19b21c280e50c94ab1f8afdfa (patch) | |
| tree | aa49ae9b152ce7930b1f6c186e90884f50450671 | |
| parent | 7212e176ba0f0c8f61ad80229a2072b9bca5206a (diff) | |
| parent | adf086ec581e25adc8e70375046f7ffb7ac94e4f (diff) | |
Merge pull request #7716 from ton31337/fix/print_string_for_afi_safi_mp_bgp
bgpd: Print afi/safi as strings for some zlog_debug outputs
| -rw-r--r-- | bgpd/bgp_packet.c | 5 | ||||
| -rw-r--r-- | bgpd/bgp_updgrp_packet.c | 14 |
2 files changed, 13 insertions, 6 deletions
diff --git a/bgpd/bgp_packet.c b/bgpd/bgp_packet.c index cf7a265b11..dfc64c043b 100644 --- a/bgpd/bgp_packet.c +++ b/bgpd/bgp_packet.c @@ -2219,12 +2219,13 @@ static int bgp_capability_msg_parse(struct peer *peer, uint8_t *pnt, /* Address family check. */ if (bgp_debug_neighbor_events(peer)) 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, action == CAPABILITY_ACTION_SET ? "Advertising" : "Removing", - pkt_afi, pkt_safi); + iana_afi2str(pkt_afi), + iana_safi2str(pkt_safi)); if (action == CAPABILITY_ACTION_SET) { peer->afc_recv[afi][safi] = 1; diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c index c3edb9e9a4..ec80aa4226 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -888,9 +888,12 @@ struct bpacket *subgroup_update_packet(struct update_subgroup *subgrp) pkt_afi = afi_int2iana(afi); pkt_safi = safi_int2iana(safi); 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->id, pkt_afi, pkt_safi); + subgrp->id, + iana_afi2str(pkt_afi), + iana_safi2str(pkt_safi)); } send_attr_printed = 1; @@ -1046,9 +1049,12 @@ struct bpacket *subgroup_withdraw_packet(struct update_subgroup *subgrp) if (bgp_debug_update(NULL, NULL, subgrp->update_group, 0)) 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->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, |