diff options
Diffstat (limited to 'bgpd/bgp_updgrp_packet.c')
| -rw-r--r-- | bgpd/bgp_updgrp_packet.c | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/bgpd/bgp_updgrp_packet.c b/bgpd/bgp_updgrp_packet.c index c3edb9e9a4..866bf8178a 100644 --- a/bgpd/bgp_updgrp_packet.c +++ b/bgpd/bgp_updgrp_packet.c @@ -575,7 +575,7 @@ struct stream *bpacket_reformat_for_peer(struct bpacket *pkt, } if (IN6_IS_ADDR_UNSPECIFIED(mod_v6nhg)) { - if (peer->nexthop.v4.s_addr) { + if (peer->nexthop.v4.s_addr != INADDR_ANY) { ipv4_to_ipv4_mapped_ipv6(mod_v6nhg, peer->nexthop.v4); } @@ -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, |